From 435c6b5f279e93a49eabcd8b18240c4788632217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 7 Apr 2024 18:56:45 +0100 Subject: [PATCH 1/9] improves schedule --- .../landing-page/schedule/schedule.component.ts | 15 +++++++++++---- src/environments/environment.dev.ts | 7 +++++++ src/environments/environment.prod.ts | 7 +++++++ src/environments/environment.ts | 7 +++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/app/landing-page/schedule/schedule.component.ts b/src/app/landing-page/schedule/schedule.component.ts index 25dfe3b2..d2da58c1 100644 --- a/src/app/landing-page/schedule/schedule.component.ts +++ b/src/app/landing-page/schedule/schedule.component.ts @@ -85,11 +85,18 @@ export class ScheduleComponent implements OnInit, OnChanges { }) tempSchedule.forEach(day => { - day.sessions.Workshop.all.sort((a, b) => { - a.date < b.date + day.sessions.Workshop.all.sort(function(a, b) { + if (a.date < b.date) return -1; + if (a.date > b.date) return 1; + // Dates are equal, sort by place + return a.place === 'Room 1' ? -1 : 1; }) - day.sessions.Presentation.all.sort((a, b) => { - a.date < b.date + + day.sessions.Presentation.all.sort(function(a, b) { + if (a.date < b.date) return -1; + if (a.date > b.date) return 1; + // Dates are equal, sort by place + return a.place === 'Room 1' ? -1 : 1; }) }) diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index e209e869..67845a34 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -18,6 +18,13 @@ export const environment = { '23-sinfo-conf': '23-sinfo' }, themes: { + '31': [ + 'Software Engineering', + 'Multimedia', + 'AI', + 'Games', + 'Tech Insights' + ], '30-sinfo': [ 'Software Engineering', 'Multimedia', diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 7d4aa1bf..7ed686b3 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -18,6 +18,13 @@ export const environment = { '23-sinfo-conf': '23-sinfo' }, themes: { + '31': [ + 'Software Engineering', + 'Multimedia', + 'AI', + 'Games', + 'Tech Insights' + ], '30-sinfo': [ 'Software Engineering', 'Multimedia', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 90f0dbd1..4bb46f27 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,6 +21,13 @@ export const environment = { '23-sinfo-conf': '23-sinfo' }, themes: { + '31': [ + 'Software Engineering', + 'Multimedia', + 'AI', + 'Games', + 'Tech Insights' + ], '30-sinfo': [ 'Software Engineering', 'Multimedia', From b113d10256f7140921d370bf1d5e46b1371bc631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 7 Apr 2024 19:00:52 +0100 Subject: [PATCH 2/9] order keynotes as well --- src/app/landing-page/schedule/schedule.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/landing-page/schedule/schedule.component.ts b/src/app/landing-page/schedule/schedule.component.ts index d2da58c1..ada21085 100644 --- a/src/app/landing-page/schedule/schedule.component.ts +++ b/src/app/landing-page/schedule/schedule.component.ts @@ -85,6 +85,11 @@ export class ScheduleComponent implements OnInit, OnChanges { }) tempSchedule.forEach(day => { + day.sessions.Keynote.sort(function(a, b) { + if (a.date <= b.date) return -1; + else return 1; + }) + day.sessions.Workshop.all.sort(function(a, b) { if (a.date < b.date) return -1; if (a.date > b.date) return 1; From 584c50768495158185eeb2b68222c40cc056dc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 7 Apr 2024 19:28:26 +0100 Subject: [PATCH 3/9] use localeCompare instead --- src/app/landing-page/schedule/schedule.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/landing-page/schedule/schedule.component.ts b/src/app/landing-page/schedule/schedule.component.ts index ada21085..879e3626 100644 --- a/src/app/landing-page/schedule/schedule.component.ts +++ b/src/app/landing-page/schedule/schedule.component.ts @@ -94,14 +94,14 @@ export class ScheduleComponent implements OnInit, OnChanges { if (a.date < b.date) return -1; if (a.date > b.date) return 1; // Dates are equal, sort by place - return a.place === 'Room 1' ? -1 : 1; + return a.place.localeCompare(b.place); }) day.sessions.Presentation.all.sort(function(a, b) { if (a.date < b.date) return -1; if (a.date > b.date) return 1; // Dates are equal, sort by place - return a.place === 'Room 1' ? -1 : 1; + return a.place.localeCompare(b.place); }) }) From d6c6bf8650f3efd8bd66dad6474c49c98493bfc7 Mon Sep 17 00:00:00 2001 From: Pedro Maximino Date: Sun, 7 Apr 2024 22:57:20 +0200 Subject: [PATCH 4/9] refact: Bump node version to 21 --- Dockerfile_staging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_staging b/Dockerfile_staging index 60ddfc3e..b6f63ed1 100644 --- a/Dockerfile_staging +++ b/Dockerfile_staging @@ -1,4 +1,4 @@ -FROM node:18-alpine as builder +FROM node:21-alpine as builder COPY package.json package-lock.json ./ From 9da09eb306097f1e34cd12248a94c928527c9458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 7 Apr 2024 22:16:21 +0100 Subject: [PATCH 5/9] adds venue to the website --- src/app/landing-page/stands/stands.component.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/landing-page/stands/stands.component.html b/src/app/landing-page/stands/stands.component.html index 1041ea5b..bb9a8cdc 100644 --- a/src/app/landing-page/stands/stands.component.html +++ b/src/app/landing-page/stands/stands.component.html @@ -21,7 +21,7 @@

Stands

Monday
Monday
@@ -30,7 +30,7 @@
Monday
Tuesday
Tuesday
@@ -39,7 +39,7 @@
Tuesday
Wednesday
Wednesday
@@ -48,7 +48,7 @@
Wednesday
Thursday
Thursday
@@ -57,7 +57,7 @@
Thursday
Friday
Friday
From 6399fc0a238ab14e7e4a23dbd0b760dccdc8b8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 7 Apr 2024 22:20:24 +0100 Subject: [PATCH 6/9] uncomment venue --- src/app/landing-page/landing-page.component.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/landing-page/landing-page.component.html b/src/app/landing-page/landing-page.component.html index 2cbcdf53..52a1484c 100644 --- a/src/app/landing-page/landing-page.component.html +++ b/src/app/landing-page/landing-page.component.html @@ -189,8 +189,7 @@
Biggest
- - +
From 1b1350d3bcce4c9259c382cb951f3921af440693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 7 Apr 2024 23:27:33 +0100 Subject: [PATCH 7/9] visual improvement --- src/app/landing-page/stands/stands.component.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/landing-page/stands/stands.component.css b/src/app/landing-page/stands/stands.component.css index 8192ec43..ad236ff6 100644 --- a/src/app/landing-page/stands/stands.component.css +++ b/src/app/landing-page/stands/stands.component.css @@ -32,6 +32,7 @@ } .carousel-inner img { + padding-top: 15dvh; background-color: white; max-height: 80dvh ; From 48bfd3cb2c2b7c725c11cfc633ce1730e56cbe82 Mon Sep 17 00:00:00 2001 From: Nuno Alves Date: Mon, 8 Apr 2024 22:46:34 +0100 Subject: [PATCH 8/9] feat: add partner site --- src/app/landing-page/partners/partners.component.html | 2 +- src/app/landing-page/partners/partners.component.ts | 4 ++++ src/app/landing-page/sponsors/sponsor.model.ts | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/landing-page/partners/partners.component.html b/src/app/landing-page/partners/partners.component.html index cb583aff..30fc952e 100644 --- a/src/app/landing-page/partners/partners.component.html +++ b/src/app/landing-page/partners/partners.component.html @@ -18,7 +18,7 @@

Partners -

diff --git a/src/app/landing-page/partners/partners.component.ts b/src/app/landing-page/partners/partners.component.ts index 9d8e8406..5bc2d4ad 100644 --- a/src/app/landing-page/partners/partners.component.ts +++ b/src/app/landing-page/partners/partners.component.ts @@ -50,4 +50,8 @@ export class PartnersComponent implements OnInit, OnChanges { return sponsor.advertisementLvl === 'other' }) } + + onSelect(partner: Sponsor) { + if (partner.site) window.open(partner.site, '_blank') + } } diff --git a/src/app/landing-page/sponsors/sponsor.model.ts b/src/app/landing-page/sponsors/sponsor.model.ts index 3e543081..55ce831a 100644 --- a/src/app/landing-page/sponsors/sponsor.model.ts +++ b/src/app/landing-page/sponsors/sponsor.model.ts @@ -2,6 +2,7 @@ export class Sponsor { id: string img: string name: string + site?: string description: string advertisementLvl: string updated: string From 21b201a98f57ad1bef81cf75ae03048691043e19 Mon Sep 17 00:00:00 2001 From: Anees Asghar Date: Tue, 9 Apr 2024 16:54:14 +0100 Subject: [PATCH 9/9] fix footer layout and refactor related style classes --- src/app/partials/footer/footer.component.css | 34 +---- src/app/partials/footer/footer.component.html | 144 +++++++++--------- src/styles.css | 19 --- 3 files changed, 76 insertions(+), 121 deletions(-) diff --git a/src/app/partials/footer/footer.component.css b/src/app/partials/footer/footer.component.css index a03c3a01..95e09bd7 100644 --- a/src/app/partials/footer/footer.component.css +++ b/src/app/partials/footer/footer.component.css @@ -1,42 +1,10 @@ .footer { - color: white !important; + padding: 30px 0 0 0; position: relative; z-index: 1; - margin-top: 5px } .footer i, .footer a { color: rgb(106, 213, 255); } - -.first { - margin-left: 0; -} - -.container { - text-align: center -} - -ul { - display: inline-block; - text-align: left; -} - -.footer-nav-item { - text-align: center; -} - -.list { - margin: 0; -} - - - -@media (min-width: 480px) { - .container { - display: flex; - justify-content: space-between; - align-items: center; - } -} \ No newline at end of file diff --git a/src/app/partials/footer/footer.component.html b/src/app/partials/footer/footer.component.html index 9764d43b..9c3a6e5a 100644 --- a/src/app/partials/footer/footer.component.html +++ b/src/app/partials/footer/footer.component.html @@ -1,75 +1,81 @@ - -
-
-

- Made with ♥ at SINFO - Open source - code - -

-
-
-
- \ No newline at end of file + diff --git a/src/styles.css b/src/styles.css index 69d1a532..21a28f14 100644 --- a/src/styles.css +++ b/src/styles.css @@ -7169,20 +7169,6 @@ div.clear input.btn:hover { background-color: black; } -.footer-base { - padding: 30px 0 30px; - text-align: left; -} - -.footer-nav>li { - margin-right: 25px; - display: inline-block; -} - -.footer-nav>li:last-child { - margin-right: 0; -} - .footer-nav>li a { font-family: "Roboto", "Helvetica Neue", Arial, Helvetica, sans-serif; font-size: 11px; @@ -7271,11 +7257,6 @@ div.clear input.btn:hover { } @media (max-width: 991px) { - .footer-nav>li { - margin-right: 0; - width: 100%; - } - .footer .socials-nav { margin: 20px 0 20px -12px; width: 100%;