Skip to content

Commit

Permalink
Merge pull request #426 from sinfo/staging
Browse files Browse the repository at this point in the history
Update 2.3.12
  • Loading branch information
PMax5 authored Apr 10, 2024
2 parents 802e3de + 5eca113 commit 4624483
Show file tree
Hide file tree
Showing 14 changed files with 127 additions and 134 deletions.
2 changes: 1 addition & 1 deletion Dockerfile_staging
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-alpine as builder
FROM node:21-alpine as builder

COPY package.json package-lock.json ./

Expand Down
3 changes: 1 addition & 2 deletions src/app/landing-page/landing-page.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,7 @@ <h6 class="thin base-font align-center">Biggest
<mat-divider></mat-divider>

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

Expand Down
2 changes: 1 addition & 1 deletion src/app/landing-page/partners/partners.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h3 (click)="showAll = !showAll">Partners<mat-icon [class.chev-open]="!showAll"


<div class="row" *ngIf="partners">
<mat-card class="example-card speaker-card silver" *ngFor="let partner of partners"
<mat-card class="example-card speaker-card silver" *ngFor="let partner of partners" (click)="onSelect(partner)"
[ngStyle]="{'background-image': 'url(' + partner.img + ')' }">
</mat-card>
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/app/landing-page/partners/partners.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
}
20 changes: 16 additions & 4 deletions src/app/landing-page/schedule/schedule.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
})
})

Expand Down
1 change: 1 addition & 0 deletions src/app/landing-page/sponsors/sponsor.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export class Sponsor {
id: string
img: string
name: string
site?: string
description: string
advertisementLvl: string
updated: string
Expand Down
1 change: 1 addition & 0 deletions src/app/landing-page/stands/stands.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}

.carousel-inner img {
padding-top: 15dvh;
background-color: white;
max-height: 80dvh
;
Expand Down
10 changes: 5 additions & 5 deletions src/app/landing-page/stands/stands.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h3>Stands</h3>

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

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

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

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

<div class="item">
<img appImage
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/30-sinfo/standDays/day5.webp'"
[url]="'https://sinfo.ams3.cdn.digitaloceanspaces.com/static/31-sinfo/websiteImages/venue/day5.webp'"
alt="Friday">
<div class="carousel-caption">
<h5 class="title">Friday</h5>
Expand Down
34 changes: 1 addition & 33 deletions src/app/partials/footer/footer.component.css
Original file line number Diff line number Diff line change
@@ -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;
}
}
144 changes: 75 additions & 69 deletions src/app/partials/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -1,75 +1,81 @@
<footer class="footer">
<div class="footer-base">
<div class="container">

<div class="col-md-3">
<ul class="footer-nav">
<li class="footer-nav-item">
<a routerLink="/privacy-policy">Privacy policy</a>
</li>
<li class="footer-nav-item">
<a routerLink="/coc">Code of Conduct</a>
</li>
</ul>
<!-- Main footer content -->
<div class="container text-center text-sm-start">
<div class="row">
<div class="col-12 col-sm-6 d-flex justify-content-center">
<ul class="footer-nav">
<li class="footer-nav-item">
<a routerLink="/privacy-policy">Privacy policy</a>
</li>
<li class="footer-nav-item">
<a routerLink="/coc">Code of Conduct</a>
</li>
</ul>
</div>

<div class="col-12 col-sm-6 d-flex justify-content-center">
<ul>
<li>
<i class="fa fa-envelope"></i>&nbsp;&nbsp;&nbsp;
<a href="mailto:[email protected]">
[email protected]
</a>
</li>
<li>
&nbsp;<i class="fa fa-map-marker"></i>&nbsp;&nbsp;&nbsp;
<a href="https://maps.app.goo.gl/aWyFo6cyreD8k8nLA" target="_blank">
Técnico Innovation Center, Lisbon
</a>
</li>
</ul>
</div>
</div>
</div>

<!-- <div class="col-md-6">
<ul class="socials-nav">
<li class="socials-nav-item first">
<a href="https://twitter.com/sinfoist" target="_blank" aria-label="Twitter">
<span class="fa fa-twitter"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.facebook.com/sinfoist/" target="_blank" aria-label="Facebook">
<span class="fa fa-facebook"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://github.com/sinfo" target="_blank" aria-label="Github">
<span class="fa fa-github"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.instagram.com/sinfoist/" target="_blank" aria-label="Instagram">
<span class="fa fa-instagram"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.youtube.com/user/sinfoist" target="_blank" aria-label="Youtube">
<span class="fa fa-youtube"></span>
<!-- Open source code link -->
<div class="container mt-3">
<p class="col-12 text-alt text-center">
<small>
Made with ♥ at SINFO -
<a href="https://github.com/sinfo/ng-sinfo-webapp" target="_blank">
Open Source Code
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.linkedin.com/company/2760221" target="_blank" aria-label="Linkedin">
<span class="fa fa-linkedin"></span>
</a>
</li>
</ul>
</div> -->

<div class="col-md-3">
<ul class="list">
<li class="">
<i class="fa fa-map-marker"></i><a href="https://maps.app.goo.gl/aWyFo6cyreD8k8nLA" target="_blank">Técnico Innovation Center, Lisbon</a>
</li>
<li class="">
<i class="fa fa-envelope"></i>
<a href="mailto:[email protected]">[email protected]</a>
</li>
</ul>
</div>
</small>
</p>
</div>
</footer>


<div class="container">
<div class="col-md-12">
<p class="text-alt" style="text-align: center">
<small>Made with ♥ at SINFO - <a href="https://github.com/sinfo/ng-sinfo-webapp" target="_blank">Open source
code</a>
</small>
</p>
</div>
</div>
</div>
</footer>
<!-- <div class="col-md-6">
<ul class="socials-nav">
<li class="socials-nav-item first">
<a href="https://twitter.com/sinfoist" target="_blank" aria-label="Twitter">
<span class="fa fa-twitter"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.facebook.com/sinfoist/" target="_blank" aria-label="Facebook">
<span class="fa fa-facebook"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://github.com/sinfo" target="_blank" aria-label="Github">
<span class="fa fa-github"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.instagram.com/sinfoist/" target="_blank" aria-label="Instagram">
<span class="fa fa-instagram"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.youtube.com/user/sinfoist" target="_blank" aria-label="Youtube">
<span class="fa fa-youtube"></span>
</a>
</li>
<li class="socials-nav-item">
<a href="https://www.linkedin.com/company/2760221" target="_blank" aria-label="Linkedin">
<span class="fa fa-linkedin"></span>
</a>
</li>
</ul>
</div> -->
7 changes: 7 additions & 0 deletions src/environments/environment.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
7 changes: 7 additions & 0 deletions src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
7 changes: 7 additions & 0 deletions src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
19 changes: 0 additions & 19 deletions src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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%;
Expand Down

0 comments on commit 4624483

Please sign in to comment.