Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit 4624483

Browse files
PMax5PMax5
authored
Merge pull request #426 from sinfo/staging
Update 2.3.12
2 parents 802e3de + 5eca113 commit 4624483

14 files changed

+127
-134
lines changed

‎Dockerfile_staging‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18-alpine as builder
1+
FROM node:21-alpine as builder
22

33
COPY package.json package-lock.json ./
44

‎src/app/landing-page/landing-page.component.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@ <h6 class="thin base-font align-center">Biggest
189189
<mat-divider></mat-divider>
190190

191191
<div #stands>
192-
<!-- TODO: Change false to event ID when stands are updated-->
193-
<app-stands *ngIf="false" [eventId]="eventId"></app-stands>
192+
<app-stands *ngIf="eventId" [eventId]="eventId"></app-stands>
194193
</div>
195194
<mat-divider></mat-divider>
196195

‎src/app/landing-page/partners/partners.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h3 (click)="showAll = !showAll">Partners<mat-icon [class.chev-open]="!showAll"
1818

1919

2020
<div class="row" *ngIf="partners">
21-
<mat-card class="example-card speaker-card silver" *ngFor="let partner of partners"
21+
<mat-card class="example-card speaker-card silver" *ngFor="let partner of partners" (click)="onSelect(partner)"
2222
[ngStyle]="{'background-image': 'url(' + partner.img + ')' }">
2323
</mat-card>
2424
</div>

‎src/app/landing-page/partners/partners.component.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,8 @@ export class PartnersComponent implements OnInit, OnChanges {
5050
return sponsor.advertisementLvl === 'other'
5151
})
5252
}
53+
54+
onSelect(partner: Sponsor) {
55+
if (partner.site) window.open(partner.site, '_blank')
56+
}
5357
}

‎src/app/landing-page/schedule/schedule.component.ts‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,23 @@ export class ScheduleComponent implements OnInit, OnChanges {
8585
})
8686

8787
tempSchedule.forEach(day => {
88-
day.sessions.Workshop.all.sort((a, b) => {
89-
a.date < b.date
88+
day.sessions.Keynote.sort(function(a, b) {
89+
if (a.date <= b.date) return -1;
90+
else return 1;
9091
})
91-
day.sessions.Presentation.all.sort((a, b) => {
92-
a.date < b.date
92+
93+
day.sessions.Workshop.all.sort(function(a, b) {
94+
if (a.date < b.date) return -1;
95+
if (a.date > b.date) return 1;
96+
// Dates are equal, sort by place
97+
return a.place.localeCompare(b.place);
98+
})
99+
100+
day.sessions.Presentation.all.sort(function(a, b) {
101+
if (a.date < b.date) return -1;
102+
if (a.date > b.date) return 1;
103+
// Dates are equal, sort by place
104+
return a.place.localeCompare(b.place);
93105
})
94106
})
95107

‎src/app/landing-page/sponsors/sponsor.model.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export class Sponsor {
22
id: string
33
img: string
44
name: string
5+
site?: string
56
description: string
67
advertisementLvl: string
78
updated: string

‎src/app/landing-page/stands/stands.component.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
}
3333

3434
.carousel-inner img {
35+
padding-top: 15dvh;
3536
background-color: white;
3637
max-height: 80dvh
3738
;

‎src/app/landing-page/stands/stands.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h3>Stands</h3>
2121

2222
<div class="item active">
2323
<img appImage
24-
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/30-sinfo/standDays/day1.webp'"
24+
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/31-sinfo/websiteImages/venue/day1.webp'"
2525
alt="Monday">
2626
<div class="carousel-caption">
2727
<h5 class="title">Monday</h5>
@@ -30,7 +30,7 @@ <h5 class="title">Monday</h5>
3030

3131
<div class="item">
3232
<img appImage
33-
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/30-sinfo/standDays/day2.webp'"
33+
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/31-sinfo/websiteImages/venue/day2.webp'"
3434
alt="Tuesday">
3535
<div class="carousel-caption">
3636
<h5 class="title">Tuesday</h5>
@@ -39,7 +39,7 @@ <h5 class="title">Tuesday</h5>
3939

4040
<div class="item">
4141
<img appImage
42-
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/30-sinfo/standDays/day3.webp'"
42+
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/31-sinfo/websiteImages/venue/day3.webp'"
4343
alt="Wednesday">
4444
<div class="carousel-caption">
4545
<h5 class="title">Wednesday</h5>
@@ -48,7 +48,7 @@ <h5 class="title">Wednesday</h5>
4848

4949
<div class="item">
5050
<img appImage
51-
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/30-sinfo/standDays/day4.webp'"
51+
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/31-sinfo/websiteImages/venue/day4.webp'"
5252
alt="Thursday">
5353
<div class="carousel-caption">
5454
<h5 class="title">Thursday</h5>
@@ -57,7 +57,7 @@ <h5 class="title">Thursday</h5>
5757

5858
<div class="item">
5959
<img appImage
60-
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/30-sinfo/standDays/day5.webp'"
60+
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/31-sinfo/websiteImages/venue/day5.webp'"
6161
alt="Friday">
6262
<div class="carousel-caption">
6363
<h5 class="title">Friday</h5>

‎src/app/partials/footer/footer.component.css‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,10 @@
11
.footer {
2-
color: white !important;
2+
padding: 30px 0 0 0;
33
position: relative;
44
z-index: 1;
5-
margin-top: 5px
65
}
76

87
.footer i,
98
.footer a {
109
color: rgb(106, 213, 255);
1110
}
12-
13-
.first {
14-
margin-left: 0;
15-
}
16-
17-
.container {
18-
text-align: center
19-
}
20-
21-
ul {
22-
display: inline-block;
23-
text-align: left;
24-
}
25-
26-
.footer-nav-item {
27-
text-align: center;
28-
}
29-
30-
.list {
31-
margin: 0;
32-
}
33-
34-
35-
36-
@media (min-width: 480px) {
37-
.container {
38-
display: flex;
39-
justify-content: space-between;
40-
align-items: center;
41-
}
42-
}

‎src/app/partials/footer/footer.component.html‎

Lines changed: 75 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,81 @@
11
<footer class="footer">
2-
<div class="footer-base">
3-
<div class="container">
4-
5-
<div class="col-md-3">
6-
<ul class="footer-nav">
7-
<li class="footer-nav-item">
8-
<a routerLink="/privacy-policy">Privacy policy</a>
9-
</li>
10-
<li class="footer-nav-item">
11-
<a routerLink="/coc">Code of Conduct</a>
12-
</li>
13-
</ul>
2+
<!-- Main footer content -->
3+
<div class="container text-center text-sm-start">
4+
<div class="row">
5+
<div class="col-12 col-sm-6 d-flex justify-content-center">
6+
<ul class="footer-nav">
7+
<li class="footer-nav-item">
8+
<a routerLink="/privacy-policy">Privacy policy</a>
9+
</li>
10+
<li class="footer-nav-item">
11+
<a routerLink="/coc">Code of Conduct</a>
12+
</li>
13+
</ul>
14+
</div>
15+
16+
<div class="col-12 col-sm-6 d-flex justify-content-center">
17+
<ul>
18+
<li>
19+
<i class="fa fa-envelope"></i>&nbsp;&nbsp;&nbsp;
20+
<a href="mailto:[email protected]">
21+
[email protected]
22+
</a>
23+
</li>
24+
<li>
25+
&nbsp;<i class="fa fa-map-marker"></i>&nbsp;&nbsp;&nbsp;
26+
<a href="https://maps.app.goo.gl/aWyFo6cyreD8k8nLA" target="_blank">
27+
Técnico Innovation Center, Lisbon
28+
</a>
29+
</li>
30+
</ul>
31+
</div>
1432
</div>
33+
</div>
1534

16-
<!-- <div class="col-md-6">
17-
<ul class="socials-nav">
18-
<li class="socials-nav-item first">
19-
<a href="https://twitter.com/sinfoist" target="_blank" aria-label="Twitter">
20-
<span class="fa fa-twitter"></span>
21-
</a>
22-
</li>
23-
<li class="socials-nav-item">
24-
<a href="https://www.facebook.com/sinfoist/" target="_blank" aria-label="Facebook">
25-
<span class="fa fa-facebook"></span>
26-
</a>
27-
</li>
28-
<li class="socials-nav-item">
29-
<a href="https://github.com/sinfo" target="_blank" aria-label="Github">
30-
<span class="fa fa-github"></span>
31-
</a>
32-
</li>
33-
<li class="socials-nav-item">
34-
<a href="https://www.instagram.com/sinfoist/" target="_blank" aria-label="Instagram">
35-
<span class="fa fa-instagram"></span>
36-
</a>
37-
</li>
38-
<li class="socials-nav-item">
39-
<a href="https://www.youtube.com/user/sinfoist" target="_blank" aria-label="Youtube">
40-
<span class="fa fa-youtube"></span>
35+
<!-- Open source code link -->
36+
<div class="container mt-3">
37+
<p class="col-12 text-alt text-center">
38+
<small>
39+
Made with ♥ at SINFO -
40+
<a href="https://github.com/sinfo/ng-sinfo-webapp" target="_blank">
41+
Open Source Code
4142
</a>
42-
</li>
43-
<li class="socials-nav-item">
44-
<a href="https://www.linkedin.com/company/2760221" target="_blank" aria-label="Linkedin">
45-
<span class="fa fa-linkedin"></span>
46-
</a>
47-
</li>
48-
</ul>
49-
</div> -->
50-
51-
<div class="col-md-3">
52-
<ul class="list">
53-
<li class="">
54-
<i class="fa fa-map-marker"></i><a href="https://maps.app.goo.gl/aWyFo6cyreD8k8nLA" target="_blank">Técnico Innovation Center, Lisbon</a>
55-
</li>
56-
<li class="">
57-
<i class="fa fa-envelope"></i>
58-
<a href="mailto:[email protected]">[email protected]</a>
59-
</li>
60-
</ul>
61-
</div>
43+
</small>
44+
</p>
6245
</div>
46+
</footer>
6347

64-
65-
<div class="container">
66-
<div class="col-md-12">
67-
<p class="text-alt" style="text-align: center">
68-
<small>Made with ♥ at SINFO - <a href="https://github.com/sinfo/ng-sinfo-webapp" target="_blank">Open source
69-
code</a>
70-
</small>
71-
</p>
72-
</div>
73-
</div>
74-
</div>
75-
</footer>
48+
<!-- <div class="col-md-6">
49+
<ul class="socials-nav">
50+
<li class="socials-nav-item first">
51+
<a href="https://twitter.com/sinfoist" target="_blank" aria-label="Twitter">
52+
<span class="fa fa-twitter"></span>
53+
</a>
54+
</li>
55+
<li class="socials-nav-item">
56+
<a href="https://www.facebook.com/sinfoist/" target="_blank" aria-label="Facebook">
57+
<span class="fa fa-facebook"></span>
58+
</a>
59+
</li>
60+
<li class="socials-nav-item">
61+
<a href="https://github.com/sinfo" target="_blank" aria-label="Github">
62+
<span class="fa fa-github"></span>
63+
</a>
64+
</li>
65+
<li class="socials-nav-item">
66+
<a href="https://www.instagram.com/sinfoist/" target="_blank" aria-label="Instagram">
67+
<span class="fa fa-instagram"></span>
68+
</a>
69+
</li>
70+
<li class="socials-nav-item">
71+
<a href="https://www.youtube.com/user/sinfoist" target="_blank" aria-label="Youtube">
72+
<span class="fa fa-youtube"></span>
73+
</a>
74+
</li>
75+
<li class="socials-nav-item">
76+
<a href="https://www.linkedin.com/company/2760221" target="_blank" aria-label="Linkedin">
77+
<span class="fa fa-linkedin"></span>
78+
</a>
79+
</li>
80+
</ul>
81+
</div> -->

0 commit comments

Comments
 (0)