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 ./ 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
- - +
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/schedule/schedule.component.ts b/src/app/landing-page/schedule/schedule.component.ts index 25dfe3b2..879e3626 100644 --- a/src/app/landing-page/schedule/schedule.component.ts +++ b/src/app/landing-page/schedule/schedule.component.ts @@ -85,11 +85,23 @@ export class ScheduleComponent implements OnInit, OnChanges { }) tempSchedule.forEach(day => { - day.sessions.Workshop.all.sort((a, b) => { - a.date < b.date + day.sessions.Keynote.sort(function(a, b) { + if (a.date <= b.date) return -1; + else return 1; }) - day.sessions.Presentation.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.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.localeCompare(b.place); }) }) 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 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 ; 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
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/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', 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%;