Merge pull request #446 from sinfo/staging

Update 2.4.0
sinfo · Apr 14, 2024 · 95141e6 · 95141e6
2 parents 3657b1c + 262e24c
commit 95141e6
Show file tree

Hide file tree

Showing 28 changed files with 307 additions and 200 deletions.
diff --git a/Dockerfile_staging b/Dockerfile_staging
@@ -1,4 +1,4 @@
-FROM node:21-alpine as builder
+FROM node:18-alpine as builder
 
 COPY package.json package-lock.json ./
 

diff --git a/src/app/auth/login/login.component.html b/src/app/auth/login/login.component.html
@@ -18,7 +18,7 @@ <h3>Login</h3>
 <div class="new-align-center" *ngIf="!submitting">
   <div id="google-button"></div>
   <a href="{{ linkedinUrlAuth }}" class="buttons btn-linkedin">
-    <i class="fa fa-linkedin"></i>
+    <i class="fa fa-linkedin text-white"></i>
     Sign in with LinkedIn
   </a>
   <a href="{{ fenixUrlAuth }}" class="buttons btn-fenix">

diff --git a/src/app/landing-page/feedback/feedback.component.html b/src/app/landing-page/feedback/feedback.component.html
@@ -3,9 +3,8 @@
     <span class="icon section-icon icon-badges-votes-10"></span>
     <h3>Testimonials</h3>
     <br />
-    <br />
 
-    <div id="feedbackSlideshow" class="carousel slide" data-ride="carousel">
+    <div id="feedbackSlideshow" class="carousel slide w-75 mx-auto" data-ride="carousel">
 
       <ol class="carousel-indicators">
         <li data-target="#feedbackSlideshow" data-slide-to="0" class="active"></li>
@@ -17,43 +16,19 @@ <h3>Testimonials</h3>
       <div class="carousel-inner">
 
         <div class="item active">
-          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/diana_feedback.jpeg'" alt="Diana Kelley" style="width:100%;">
-          <div class="carousel-caption">
-            <h5 class="title">Diana Kelley</h5>
-            <p class="feedbackField">"The SINFO conference team is top notch, amazing that it is all student run! From
-              organizational
-              efficiency to speaker quality to level of technical content - SINFO is one of the better tech
-              conferences
-              I've been to."</p>
-          </div>
+          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/quoteMarcelo.webp'" alt="Marcelo" style="width:100%;">
         </div>
 
         <div class="item">
-          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/kevlin_feedback.jpeg'" alt="Kevlin Henney" style="width:100%;">
-          <div class="carousel-caption">
-            <h5 class="title">Kevlin Henney</h5>
-            <p class="feedbackField">"SINFO is a great opportunity for attendees - great organizers and well
-              organised,
-              with an excellent speaker line-up to match."</p>
-          </div>
+          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/quoteRogerio.webp'" alt="Rogério Colaço" style="width:100%;">
         </div>
 
         <div class="item">
-          <img [src]="'../../assets/img/feedback/philippe_feedback.jpg'" alt="Philippe Renaud" style="width:100%;">
-          <div class="carousel-caption">
-            <h5 class="title">Philippe Renaud</h5>
-            <p class="feedbackField">"SINFO takes great care of its speakers, the event was well structured, the venue
-              was nice and the organizers showed us a good time. I recommend it."</p>
-          </div>
+          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/quoteJackie.webp'" alt="Jackie" style="width:100%;">
         </div>
 
         <div class="item">
-          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/arlindo_feedback.jpeg'" alt="Arlindo Oliveira" style="width:100%;">
-          <div class="carousel-caption">
-            <h5 class="title">Arlindo Oliveira</h5>
-            <p class="feedbackField">"This is an outstanding event, ambitious and well organized. It was a great
-              experience to talk to a crowd of interested and smart people. Good questions and feedback."</p>
-          </div>
+          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/quoteDimitri.webp'" alt="Dimitri" style="width:100%;">
         </div>
       </div>
 

diff --git a/src/app/landing-page/landing-page.component.html b/src/app/landing-page/landing-page.component.html
@@ -15,11 +15,11 @@
             Speakers
           </a>
         </li>
-        <li class="socials-nav-item">
+        <!-- <li class="socials-nav-item">
           <a (click)="scroll(stands)" class="navigation-link" aria-label="Venue">
             Venue
           </a>
-        </li>
+        </li> -->
         <li class="socials-nav-item">
           <a (click)="scroll(event)" class="navigation-link" aria-label="Event">
             Event
@@ -69,11 +69,11 @@
             Speakers
           </a>
         </li>
-        <li class="socials-nav-item">
+        <!-- <li class="socials-nav-item">
           <a (click)="scroll(stands);toggleDropdown()" class="navigation-link" aria-label="Venue">
             Venue
           </a>
-        </li>
+        </li> -->
         <li class="socials-nav-item">
           <a (click)="scroll(event);toggleDropdown()" class="navigation-link" aria-label="Event">
             Event
@@ -154,27 +154,23 @@
 
         <div class="sinfo-intro-wrapper heading-block">
           <div class="container">
-            <h5 class="heading-alt">
-              <span>
-                <span class="fa fa-map-marker base-clr-txt" style="margin-left: 14px;"></span>
-                Técnico, Lisbon
-              </span>
-
-              <span>
-                <br class="visible-xs">
-                <span class="fa fa-calendar-o base-clr-txt"></span>
-                15th - 19th of April 2024
-              </span>
+            <h5 class="heading-alt text-center">
+              <i class="fa fa-calendar-o base-clr-txt"></i>
+              15th - 19th of April 2024
+            </h5>
+            <h5 class="heading-alt text-center mt-2">
+              <i class="fa fa-map-marker base-clr-txt"></i>
+              Técnico Innovation Center, Lisbon
             </h5>
             <img class="logo-hero" src="assets/img/logo-branco2.png" alt="SINFO logo">
-            <h6 class="thin base-font align-center">Biggest
-              <strong>free tech conference</strong> in Portugal
+            <h6 class="thin base-font align-center">
+              Biggest free tech conference in Portugal
             </h6>
 
             <app-livestream *ngIf="isLive"></app-livestream>
           </div>
         </div>
-        <div class="intro cursor-pointer">
+        <div class="intro cursor-pointer mb-3">
           <a (click)="scroll(schedule)">
             <i class="fa fa-chevron-down" aria-hidden="true" aria-label="Scroll down"></i>
           </a>

diff --git a/src/app/landing-page/schedule/schedule.component.html b/src/app/landing-page/schedule/schedule.component.html
@@ -94,16 +94,17 @@ <h6 class="highlight">Keynotes</h6>
                         </strong>
                       </mat-card-title>
                       <mat-card-subtitle *ngIf="session.speakers.length > 0 && session.speakers[0]">
-                        <p>{{session.speakers[0].name}}</p>
+                        <!-- FIXME
+                        -- Every check for session.speakers.length > 1 is checking if a keynote is a panel
+                        -- For keynotes with more than 1 speaker and arent a panel this needs to be revisited
+                        -->
+                        <p>{{session.speakers.length > 1 ? '' : session.speakers[0].name}}</p>
                       </mat-card-subtitle>
                     </mat-card-header>
 
                     <mat-card-content>
                       <h6 class=" title">
-                        <strong *ngFor="let speaker of session.speakers" class="highlight speaker-name">
-                          {{session.name.split(' - ')[0]}}
-                        </strong>
-                        -- {{session.name.split(' - ')[1]}}
+                        {{session.name}}
                       </h6>
                       <div class="panel-collapse collapse in schedule-item-body">
                         <article>

diff --git a/src/app/landing-page/schedule/schedule.component.ts b/src/app/landing-page/schedule/schedule.component.ts
@@ -85,6 +85,13 @@ export class ScheduleComponent implements OnInit, OnChanges {
       }
 
       if (val.kind === 'Keynote') {
+        // FIXME
+        // Sets the session image to a static image in digital ocean for the panel (only case where seapers.len > 1 !!! FOR NOW !!!)
+        // Change this link if panel image changes
+        // If a normal talk has more than 1 speaker this need to be revisited
+        if (val.speakers.length > 1){
+          val.img = "https://static.sinfo.org/static/31-sinfo/websiteImages/panel-31.png"
+        }
         tempSchedule[registeredDays].sessions[val.kind].push(val)
       } else {
         let place = (val.place === 'Room 2') ? 'sala2' : 'sala1'

diff --git a/src/app/partials/qr-code-scanner/qr-code-scanner.component.ts b/src/app/partials/qr-code-scanner/qr-code-scanner.component.ts
@@ -153,7 +153,7 @@ export class QrcodeScannerComponent implements OnInit {
           }
           this.userRead = user
           this.lastUser = user
-          this.lastRaw = undefined
+          //this.lastRaw = undefined // Removed to prevent infinite reading of the same qrcode. Revisit if problem in reverse links appear
         }
       })
   }

diff --git a/src/app/session/session.component.css b/src/app/session/session.component.css
@@ -23,6 +23,14 @@ p {
   max-height: 300px;
 }
 
+.panelSpeaker-img {
+  border-radius: 15px;
+  max-height: 300px;
+  width: 20dvh;
+  height: 20dvh;
+  object-fit: cover;
+}
+
 .session-details h5 {
   margin: 15px auto;
 }

diff --git a/src/app/session/session.component.html b/src/app/session/session.component.html
@@ -64,14 +64,16 @@ <h3 class="title">{{session.kind}}</h3>
           </div>
         </div>
 
-        <div class="row session-details" *ngIf="session.kind === 'Keynote' && speaker">
-          <div class="col-sm-3 col-xs-12">
-            <img class="speaker-img" src='{{speaker.img}}'>
-          </div>
-
-          <div class="col-sm-9 col-xs-12 align-left justify">
-            <h5 class="name">{{speaker.name}}</h5>
-            <h5>{{speaker.title}}</h5>
+        <div class="row session-details" *ngIf="session.kind === 'Keynote' && speakers.length > 0">
+          <div *ngFor="let speaker of speakers; let iSession=index">
+            <div class="col-sm-3 col-xs-12">
+              <img [ngClass]="speakers.length > 1 ? 'panelSpeaker-img' : 'speaker-img'" src='{{speaker.img}}'>
+            </div>
+
+            <div class="col-sm-9 col-xs-12 align-left justify">
+              <h5 class="name">{{speaker.name}}</h5>
+              <h5>{{speaker.title}}</h5>
+            </div>
           </div>
         </div>
 

diff --git a/src/app/session/session.component.ts b/src/app/session/session.component.ts
@@ -6,7 +6,7 @@ import { SessionService } from './session.service'
 import { Session } from './session.model'
 import { SpeakerService } from '../speakers/speaker.service'
 import { Speaker } from '../speakers/speaker.model'
-import { EventService } from './../events/event.service'
+import { EventService } from '../events/event.service'
 import {
   trigger,
   style,
@@ -35,7 +35,7 @@ import { User } from '../user/user.model';
 
 export class SessionComponent implements OnInit {
   session: Session
-  speaker: Speaker
+  speakers: Speaker[] = []
   description: SafeHtml
   user: User
   showMore = false
@@ -80,8 +80,12 @@ export class SessionComponent implements OnInit {
   }
 
   getSpeaker(session: Session): void {
-    this.speakerService.getSpeaker(session.speakers[0]['id'])
-      .subscribe(speaker => this.speaker = speaker)
+    for(let sessionSpeaker of session.speakers){
+      this.speakerService.getSpeaker(sessionSpeaker['id'])
+      .subscribe(speaker => {
+        this.speakers.push(speaker);
+      })
+    }
   }
 
   onSelect(id: string): void {

diff --git a/src/app/sponsor/sponsor.component.ts b/src/app/sponsor/sponsor.component.ts
@@ -10,7 +10,7 @@ import { SessionService } from '../session/session.service';
 import { Session } from '../session/session.model'
 import { Company } from '../company/company.model';
 import { CompanyService } from '../company/company.service';
-import { EventService } from './../events/event.service'
+import { EventService } from '../events/event.service'
 import { Event } from '../events/event.model';
 import { Sponsor } from '../landing-page/sponsors/sponsor.model';
 

diff --git a/src/app/static/static.component.ts b/src/app/static/static.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { Title } from '@angular/platform-browser'
 
-import { EventService } from './../events/event.service'
+import { EventService } from '../events/event.service'
 
 @Component({
   selector: 'app-code-of-conduct',

diff --git a/src/app/user/achievements/achievements.component.html b/src/app/user/achievements/achievements.component.html
@@ -12,8 +12,8 @@ <h3 class="title">Achievements</h3>
   <div class="row">
     <div class="col-sm-12">
       <h6 class="lead">
-        Earn entries by completing achievements.
-        <br> Each entry increases your chance of being awarded a prize at the end of the day!
+        Get achievements to increase your chances of winning the daily prizes.
+        <br> If you found a secret QR code, <a routerLink="/user/redeem">scan it</a> to unlock a hidden achievement!
       </h6>
     </div>
   </div>

diff --git a/src/app/user/cv/cv.component.html b/src/app/user/cv/cv.component.html
@@ -6,7 +6,7 @@ <h3>Upload CV</h3>
   </div>
 
   <div class="row">
-    <h6>Submit or update your CV and enable yourself to win prizes!</h6>
+    <h6>Submit or update your CV, visit at least the stands of 5 companies and enable yourself to win a big prize!</h6>
   </div>
 
   <div id="info">

diff --git a/src/app/user/cv/cv.component.ts b/src/app/user/cv/cv.component.ts
@@ -5,7 +5,7 @@ import { HttpEventType, HttpResponse } from '@angular/common/http'
 import { EventService } from '../../events/event.service'
 import { UserService } from '../user.service'
 import { User } from '../user.model'
-import { environment } from './../../../environments/environment'
+import { environment } from '../../../environments/environment'
 import { AuthService } from '../../auth/auth.service'
 import { File as CV } from './file'
 import { MatDialog } from '@angular/material/dialog'

diff --git a/src/app/user/downloads/downloads.component.css b/src/app/user/downloads/downloads.component.css
@@ -1,11 +1,12 @@
 .btn {
-  margin: 0;
+  margin: 0 auto;
   margin-bottom: 10px;
   letter-spacing: 3px;
   min-width: 250px;
   padding: 15px;
-  font-size: 12px;;
+  font-size: 12px;
 }
+
 .btn-info {
   background-color: #428bca;
   border-color: #357ebd;

diff --git a/src/app/user/downloads/downloads.component.html b/src/app/user/downloads/downloads.component.html
@@ -30,17 +30,18 @@ <h6 class="lead">
 
     <div class="row">
       <div class="col-sm-12">
-        <a href="{{ cvsDownloadUrl }}" target="_blank" class="btn btn-info">
+        <button (click)="downloadCVs()" class="btn btn-info">
           <span class="glyphicon glyphicon-cloud-download"></span>
           Download CVs
-        </a>
+        </button>
       </div>
       <div *ngIf="me && me.role === 'company'" class="col-sm-12">
-        <a href="{{ linksCVsDownloadUrl }}" target="_blank" class="btn btn-info">
-          <span class="glyphicon glyphicon-link"></span>
-          Download Links' CVs
-        </a>
+          <button (click)="downloadLinksCVs()" class="btn btn-info">
+            <span class="glyphicon glyphicon-link"></span>
+            Download Links' CVs
+          </button>
       </div>
+
     </div>
 
   </div>