From 2d56fa2f1eb1498c72974019ef02bc8b869f329c Mon Sep 17 00:00:00 2001 From: CatarinaBeirolas Date: Sat, 13 Apr 2024 00:18:05 +0100 Subject: [PATCH 01/18] Changed CV message to let user know they need to visit 5 stands --- src/app/user/cv/cv.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/user/cv/cv.component.html b/src/app/user/cv/cv.component.html index 3b73cc7a..ea92b5f6 100644 --- a/src/app/user/cv/cv.component.html +++ b/src/app/user/cv/cv.component.html @@ -6,7 +6,7 @@

Upload CV

-
Submit or update your CV and enable yourself to win prizes!
+
Submit or update your CV, visit at least the stands of 5 companies and enable yourself to win a big prize!
From 05f4c48ed13bc8780a363332cd952f08181958e9 Mon Sep 17 00:00:00 2001 From: Guilherme Domingos Baracho Date: Sat, 13 Apr 2024 17:11:31 +0100 Subject: [PATCH 02/18] Fixed qrcode-reader reading the same qrcode several times. Closes issue #376. Added messages on validate card. --- .../qr-code-scanner.component.ts | 2 +- .../validate-card/validate-card.component.ts | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) 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 index de588ee4..96b18c90 100644 --- 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/user/validate-card/validate-card.component.ts b/src/app/user/validate-card/validate-card.component.ts index 1e025c33..61be3c6d 100644 --- a/src/app/user/validate-card/validate-card.component.ts +++ b/src/app/user/validate-card/validate-card.component.ts @@ -47,13 +47,13 @@ export class ValidateCardComponent implements OnInit { panelClass: ['mat-toolbar', 'mat-primary'], duration: 2000 }) - /* this.messageService.add({ + this.messageService.add({ origin: 'Validate card', showAlert: true, - text: `Validated ${user.name}'s card`, + text: `Validated ${data.user.name}'s card`, type: Type.success, timeout: 7000 - }) */ + }) }, error => { if (error.error.statusCode === 409) { @@ -61,26 +61,26 @@ export class ValidateCardComponent implements OnInit { panelClass: ['mat-toolbar', 'mat-warn'], duration: 2000 }) - /* this.messageService.add({ + this.messageService.add({ origin: 'Validate card', showAlert: true, - text: `${user.name}'s card is already validated`, + text: `${data.user.name}'s card is already validated`, type: Type.warning, timeout: 7000 - }) */ + }) } else if (error.error.statusCode === 404 || error.error.statusCode === 422) { this.snackbar.open(`Not enough signatures on ${data.user.name}'s card`, "Yikes", { panelClass: ['mat-toolbar', 'mat-warn'], duration: 2000 } ) - /* this.messageService.add({ + this.messageService.add({ origin: 'Validate card', showAlert: true, - text: `Not enough signatures on ${user.name}'s card`, + text: `Not enough signatures on ${data.user.name}'s card`, type: Type.warning, timeout: 7000 - }) */ + }) } }) From 3dbb5b7ca7d121c711dd17d7e93766e6114764e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 14 Apr 2024 06:25:54 +0100 Subject: [PATCH 03/18] visually changes the side bar --- .../achievements/achievements.component.html | 4 +- .../user/link/my-links/my-links.component.css | 5 + .../link/my-links/my-links.component.html | 8 +- src/app/user/user.component.css | 5 + src/app/user/user.component.html | 199 ++++++++++-------- 5 files changed, 130 insertions(+), 91 deletions(-) diff --git a/src/app/user/achievements/achievements.component.html b/src/app/user/achievements/achievements.component.html index f5ab9b50..ba694df3 100644 --- a/src/app/user/achievements/achievements.component.html +++ b/src/app/user/achievements/achievements.component.html @@ -12,8 +12,8 @@

Achievements

- Earn entries by completing achievements. -
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. +
If you found a secret QR code, scan it to unlock a hidden achievement!
diff --git a/src/app/user/link/my-links/my-links.component.css b/src/app/user/link/my-links/my-links.component.css index 2afc0d25..3bb47646 100644 --- a/src/app/user/link/my-links/my-links.component.css +++ b/src/app/user/link/my-links/my-links.component.css @@ -205,3 +205,8 @@ img.portrait { .black-text { color: black; } + +h6.lead{ + margin-bottom: 40px; + text-align: center; +} \ No newline at end of file diff --git a/src/app/user/link/my-links/my-links.component.html b/src/app/user/link/my-links/my-links.component.html index 7c80dad4..cdba61a5 100644 --- a/src/app/user/link/my-links/my-links.component.html +++ b/src/app/user/link/my-links/my-links.component.html @@ -30,11 +30,13 @@

My Links

-
+
-
+
Looks like you have not made any links yet. -
You can link with {{me.role === "company" ? "attendees" : "companies"}} +
+
+ You can link with {{me.role === "company" ? "attendees" : "companies"}} here.
diff --git a/src/app/user/user.component.css b/src/app/user/user.component.css index 82f3491c..cded0729 100644 --- a/src/app/user/user.component.css +++ b/src/app/user/user.component.css @@ -132,6 +132,7 @@ display: flex; flex-direction: column; justify-content: end; + padding-bottom: 3dvh; } .fab { @@ -170,4 +171,8 @@ justify-content: space-between; width: 100%; height: 100%; +} + +.navlist { + height: -webkit-fill-available !important; } \ No newline at end of file diff --git a/src/app/user/user.component.html b/src/app/user/user.component.html index 9b7908bb..6b603241 100644 --- a/src/app/user/user.component.html +++ b/src/app/user/user.component.html @@ -48,12 +48,12 @@ QR Code
- Staff Options +
- account_box - account_box - Upload CV + verified_user + Promote
Validate Card
- -
- verified_user - Promote -
- + + + + +
+ cake + Pick Winner + keyboard_arrow_right +
+ + + + +
+ cake + Prizes +
+ + +
+ cake + Pick Winner +
+ + + + + +

Company Options

done_outline - {{(user.role === 'company' ? "Sign and ": "" )}}Link Card + Sign and Link Card
My links - - +
- business - Workshops + get_app + Download CVs
- +
- business - Workshops + get_app + CV Downloads keyboard_arrow_right
- -
- business - Workshops -
- - -
- info - Workshop Status -
- -
- event - Validate Workshop -
- - - - - - - -
- cake - Pick Winner - keyboard_arrow_right + get_app + Download CVs
- - -
- cake - Prizes + get_app + Create Endpoints
-
- cake - Pick Winner + get_app + Endpoints Status
+ + +

Atendee Options

+ + +
+ account_box + account_box + Upload CV +
+ + + + +
+ forum + My links +
+ + +
+ business + Workshops +
+ + +
- get_app - CV Downloads + business + Workshops keyboard_arrow_right
- +
- get_app - Download CVs + business + Workshops
-
- get_app - Create Endpoints + info + Workshop Status
-
- get_app - Endpoints Status + event + Validate Workshop
- + - -
- get_app - Download CVs -
- + @@ -241,27 +267,28 @@ stars Secret Codes --> -
stars Redeem Achievement
- + --> + + (click)="sidenav.toggle()" class="mat-list-item-custom">
receipt Promo Codes
-
star_border Add achievement
- + -->
Date: Sun, 14 Apr 2024 14:27:17 +0100 Subject: [PATCH 04/18] Added the right rendering to keynotes on website. --- .../schedule/schedule.component.html | 11 ++++++----- .../schedule/schedule.component.ts | 7 +++++++ src/app/session/session.component.css | 8 ++++++++ src/app/session/session.component.html | 18 ++++++++++-------- src/app/session/session.component.ts | 10 +++++++--- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/app/landing-page/schedule/schedule.component.html b/src/app/landing-page/schedule/schedule.component.html index f45cd8bf..649750a6 100644 --- a/src/app/landing-page/schedule/schedule.component.html +++ b/src/app/landing-page/schedule/schedule.component.html @@ -94,16 +94,17 @@
Keynotes
-

{{session.speakers[0].name}}

+ +

{{session.speakers.length > 1 ? '' : session.speakers[0].name}}
- - {{session.name.split(' - ')[0]}} - - -- {{session.name.split(' - ')[1]}} + {{session.name}}
diff --git a/src/app/landing-page/schedule/schedule.component.ts b/src/app/landing-page/schedule/schedule.component.ts index 06fbcb19..ec024443 100644 --- 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/session/session.component.css b/src/app/session/session.component.css index 25ffebe3..04242fec 100644 --- 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 index 65ec831d..13d04412 100644 --- a/src/app/session/session.component.html +++ b/src/app/session/session.component.html @@ -64,14 +64,16 @@

{{session.kind}}

-
-
- -
- -
-
{{speaker.name}}
-
{{speaker.title}}
+
+
+
+ +
+ +
+
{{speaker.name}}
+
{{speaker.title}}
+
diff --git a/src/app/session/session.component.ts b/src/app/session/session.component.ts index fb7fec5e..7f44ffe7 100644 --- a/src/app/session/session.component.ts +++ b/src/app/session/session.component.ts @@ -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 { From 489503f48ea694eb75e14f649245d83484db6ffd Mon Sep 17 00:00:00 2001 From: Anees Asghar Date: Sun, 14 Apr 2024 14:36:37 +0100 Subject: [PATCH 05/18] changed linkedin icon color in login component --- src/app/auth/login/login.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/auth/login/login.component.html b/src/app/auth/login/login.component.html index 54290c53..173e9caa 100644 --- a/src/app/auth/login/login.component.html +++ b/src/app/auth/login/login.component.html @@ -18,7 +18,7 @@

Login

 - + Sign in with LinkedIn From 5cc1c6db125a57b02d9658527cd42e62d23b8c48 Mon Sep 17 00:00:00 2001 From: Anees Asghar Date: Sun, 14 Apr 2024 14:36:57 +0100 Subject: [PATCH 06/18] fix sidenav ui issues --- src/app/user/user.component.html | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/user/user.component.html b/src/app/user/user.component.html index 6b603241..a21bc328 100644 --- a/src/app/user/user.component.html +++ b/src/app/user/user.component.html @@ -2,7 +2,7 @@
- +
cake Pick Winner - keyboard_arrow_right
@@ -136,13 +135,12 @@

Compa - +
get_app CV Downloads - keyboard_arrow_right
@@ -209,13 +207,12 @@

Atend - +
business Workshops - keyboard_arrow_right
From 550f82e1efa6202d2bd90b041759f6d497b1657a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 14 Apr 2024 11:33:28 +0100 Subject: [PATCH 07/18] fix typo --- src/app/landing-page/landing-page.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/landing-page/landing-page.component.html b/src/app/landing-page/landing-page.component.html index 7335a907..8ab5c6a4 100644 --- a/src/app/landing-page/landing-page.component.html +++ b/src/app/landing-page/landing-page.component.html @@ -157,7 +157,7 @@
- Técnico, Lisbon + Técnico Innovation Center, Lisbon From 22d087938ff400918d94ff2cbab086793748483e Mon Sep 17 00:00:00 2001 From: Anees Asghar Date: Sun, 14 Apr 2024 14:27:26 +0100 Subject: [PATCH 08/18] fix my card error and rename 'My card' to 'My Activity' --- src/app/user/my-card/my-card.component.html | 8 ++++---- src/app/user/user.component.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/user/my-card/my-card.component.html b/src/app/user/my-card/my-card.component.html index 2423fa63..725c3942 100644 --- a/src/app/user/my-card/my-card.component.html +++ b/src/app/user/my-card/my-card.component.html @@ -3,7 +3,7 @@

- {{signatures.day | date:'EEEE':'+0100'}}'s card + {{signatures.day | date:'EEEE':'+0100'}}'s Activity

Already redeemed your prize. @@ -16,10 +16,10 @@
-
+
Earn prizes - : Visit 10 companies and get the chance to spin the wheel of fortune at SINFO stand. - now: You can now spin the wheel of fortune at SINFO stand. + : Visit 10 companies and get the chance to spin the wheel of fortune at the frontdesk. + now: You can now spin the wheel of fortune at the frontdesk.
diff --git a/src/app/user/user.component.html b/src/app/user/user.component.html index a21bc328..f851203b 100644 --- a/src/app/user/user.component.html +++ b/src/app/user/user.component.html @@ -255,8 +255,8 @@

Atend
- school - My card + timelapse + My Activity
  • Event @@ -69,11 +69,11 @@ Speakers
    • -
  • +
  • Event @@ -154,27 +154,23 @@
    -
    - - - Técnico Innovation Center, Lisbon - - - -
    - - 15th - 19th of April 2024 -     +
    + + 15th - 19th of April 2024 +
    +
    + + Técnico Innovation Center, Lisbon
    SINFO logo -
    Biggest - free tech conference in Portugal +
    + Biggest free tech conference in Portugal
    -
    +
    From d2557982636d5e0563cd1a1dd6e38852a7043a1c Mon Sep 17 00:00:00 2001 From: Nuno Alves Date: Sun, 14 Apr 2024 20:43:03 +0100 Subject: [PATCH 15/18] fix: change indigo-pink css theme --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 2d2f595b..fa22b5f0 100644 --- a/src/index.html +++ b/src/index.html @@ -60,7 +60,7 @@ - + From 27fca79c36e9c5c6b5c472d9af0085c1deac2cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 14 Apr 2024 21:53:39 +0100 Subject: [PATCH 16/18] adds search field to promote --- src/app/user/promote/promote.component.html | 5 +++-- src/app/user/promote/promote.component.ts | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/app/user/promote/promote.component.html b/src/app/user/promote/promote.component.html index 2c8f316b..93804c85 100644 --- a/src/app/user/promote/promote.component.html +++ b/src/app/user/promote/promote.component.html @@ -62,8 +62,9 @@
    Search for company - - + + + {{ comp.name }} diff --git a/src/app/user/promote/promote.component.ts b/src/app/user/promote/promote.component.ts index f23e379f..aabe7dbd 100644 --- a/src/app/user/promote/promote.component.ts +++ b/src/app/user/promote/promote.component.ts @@ -26,6 +26,7 @@ export class PromoteComponent implements OnInit { userReadCompany: Company companies: Company[] + selectedCompanies: Company[] searchedCompany: Company me: User @@ -124,9 +125,12 @@ export class PromoteComponent implements OnInit { //Filtering companies from companies and partners array let companies = companiesPartners.filter((company) => { return company.advertisementLvl != "other"; + }).sort((a, b) => { + return a.name.localeCompare(b.name) }); this.companies = companies + this.selectedCompanies = companies; }) } @@ -172,8 +176,15 @@ export class PromoteComponent implements OnInit { this.userRead = user this.receiveUser({user:user, company:null}) - }) } + onKey(value) { + this.selectedCompanies = this.search(value); + } + + search(value: string) { + let filter = value.toLowerCase(); + return this.companies.filter(comp => comp.name.toLowerCase().includes(filter)); + } } From 432eee5eb3ffc4b9efe4e8e5f72e2c5ee37ed070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 14 Apr 2024 23:43:59 +0100 Subject: [PATCH 17/18] fix --- angular.json | 4 ++-- src/app/user/promote/promote.component.html | 4 ++-- src/app/user/promote/promote.component.ts | 6 +++--- src/environments/environment.dev.ts | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/angular.json b/angular.json index 7da1aa3c..1b015861 100644 --- a/angular.json +++ b/angular.json @@ -55,14 +55,14 @@ ] }, "staging": { - "optimization": true, + "optimization": false, "outputHashing": "all", "sourceMap": false, "namedChunks": false, "aot": true, "extractLicenses": true, "vendorChunk": false, - "buildOptimizer": true, + "buildOptimizer": false, "fileReplacements": [ { "replace": "src/environments/environment.ts", diff --git a/src/app/user/promote/promote.component.html b/src/app/user/promote/promote.component.html index 93804c85..735ca059 100644 --- a/src/app/user/promote/promote.component.html +++ b/src/app/user/promote/promote.component.html @@ -62,9 +62,9 @@
    Search for company - + - + {{ comp.name }} diff --git a/src/app/user/promote/promote.component.ts b/src/app/user/promote/promote.component.ts index aabe7dbd..62fc97aa 100644 --- a/src/app/user/promote/promote.component.ts +++ b/src/app/user/promote/promote.component.ts @@ -180,11 +180,11 @@ export class PromoteComponent implements OnInit { } onKey(value) { - this.selectedCompanies = this.search(value); + this.selectedCompanies = this.search(value.name); } - search(value: string) { - let filter = value.toLowerCase(); + search(value: Company) { + let filter = value.name.toLowerCase(); return this.companies.filter(comp => comp.name.toLowerCase().includes(filter)); } } diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 67845a34..74d7d0a5 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -1,6 +1,7 @@ export const environment = { production: true, - cannonUrl: 'https://cannon-staging.sinfo.org', + //cannonUrl: 'https://cannon-staging.sinfo.org', + cannonUrl: 'http://localhost:8090', url_to_id: { '28-sinfo': '28-sinfo', '27-sinfo': '27-sinfo', From 262e24cfa641102626dc4bd7a7b7482663893fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Sun, 14 Apr 2024 23:59:31 +0100 Subject: [PATCH 18/18] revert --- angular.json | 4 ++-- src/environments/environment.dev.ts | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/angular.json b/angular.json index 1b015861..7da1aa3c 100644 --- a/angular.json +++ b/angular.json @@ -55,14 +55,14 @@ ] }, "staging": { - "optimization": false, + "optimization": true, "outputHashing": "all", "sourceMap": false, "namedChunks": false, "aot": true, "extractLicenses": true, "vendorChunk": false, - "buildOptimizer": false, + "buildOptimizer": true, "fileReplacements": [ { "replace": "src/environments/environment.ts", diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 74d7d0a5..67845a34 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -1,7 +1,6 @@ export const environment = { production: true, - //cannonUrl: 'https://cannon-staging.sinfo.org', - cannonUrl: 'http://localhost:8090', + cannonUrl: 'https://cannon-staging.sinfo.org', url_to_id: { '28-sinfo': '28-sinfo', '27-sinfo': '27-sinfo',