From f450d62edc4e9b7e6d1e7df175ee4321d631943d Mon Sep 17 00:00:00 2001 From: Marc Fokkert Date: Wed, 29 May 2024 22:10:01 +0200 Subject: [PATCH] Version 1! Missing EN translations and directions --- angular.json | 13 +++--- messages-en.json | 4 +- messages-nl.json | 2 +- .../landing-page/landing-page.component.html | 10 ++--- .../landing-page/landing-page.component.ts | 15 ++++--- src/app/shared/invite-type.service.ts | 39 ++++++++++++++++++ src/favicon.ico | Bin 15086 -> 15086 bytes src/index.html | 5 +-- 8 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 src/app/shared/invite-type.service.ts diff --git a/angular.json b/angular.json index 7544246..5a7ea9c 100644 --- a/angular.json +++ b/angular.json @@ -35,10 +35,7 @@ ], "scripts": [], "server": "src/main.server.ts", - "prerender": true, - "ssr": { - "entry": "server.ts" - } + "baseHref": "replaced-base-href" }, "configurations": { "production": { @@ -103,10 +100,14 @@ } }, "i18n": { - "sourceLocale": "nl-NL", + "sourceLocale": { + "code": "nl-NL", + "baseHref": "" + }, "locales": { "en-US": { - "translation": "messages-en.json" + "translation": "messages-en.json", + "baseHref": "" } } } diff --git a/messages-en.json b/messages-en.json index ac8ac51..f64cacd 100644 --- a/messages-en.json +++ b/messages-en.json @@ -7,7 +7,7 @@ "whenOptionCake": "Cake & Bubbles", "whenOptionDinner": "Dinner", "whenOptionChurch": "Church Ceremony", - "whenOptionParty": "Feest", - "mailBody": "Glad to hear you are attending! Please provide answers to the following questions:\n\nI will attend with: X persons\nI will be attending (please remove the events you will not attend):\n{$PH}\nNotes and dietary requirements" + "whenOptionParty": "Party", + "mailBody": "Glad to hear you are attending! Please provide answers to the following questions:%0D%0A\nI will attend with: X persons%0D%0A %0D%0A\nI will be attending (please remove the events you will not attend):\n%0D%0A\n{$PH}%0D%0A\n%0D%0ANotes and dietary requirements" } } diff --git a/messages-nl.json b/messages-nl.json index ff061fb..5d96288 100644 --- a/messages-nl.json +++ b/messages-nl.json @@ -8,6 +8,6 @@ "whenOptionDinner": "Diner", "whenOptionChurch": "Kerkdienst", "whenOptionParty": "Feest", - "mailBody": "Fijn dat je komt! Geef hieronder antwoord op de volgende vragen:\n\nIk kom met: X personen\nIk ben er bij met (verwijder als je niet aanwezig bent):\n{$PH}\nVerdere opmerkingen/dieetwensen" + "mailBody": "Wat fijn dat je ons laat weten of je er bij bent!%0D%0A\nIk kom met: %0D%0A\n- X personen%0D%0A %0D%0A\nIk ben er bij met (verwijder als je niet aanwezig bent):\n%0D%0A\n{$PH}%0D%0A\n%0D%0AVerdere opmerkingen/dieetwensen" } } \ No newline at end of file diff --git a/src/app/landing-page/landing-page.component.html b/src/app/landing-page/landing-page.component.html index 4e003a3..af4cf58 100644 --- a/src/app/landing-page/landing-page.component.html +++ b/src/app/landing-page/landing-page.component.html @@ -27,10 +27,10 @@

Cadeautip

Envelope - -
-

Adressen

- Klik -
+ + + + + diff --git a/src/app/landing-page/landing-page.component.ts b/src/app/landing-page/landing-page.component.ts index c014665..f662429 100644 --- a/src/app/landing-page/landing-page.component.ts +++ b/src/app/landing-page/landing-page.component.ts @@ -1,6 +1,7 @@ import {Component} from '@angular/core'; import {HeartComponent} from "../heart/heart.component"; import {RouterLink} from "@angular/router"; +import {InviteType, InviteTypeService} from "../shared/invite-type.service"; @Component({ selector: 'app-landing-page', @@ -13,6 +14,10 @@ import {RouterLink} from "@angular/router"; styleUrl: './landing-page.component.scss' }) export class LandingPageComponent { + constructor( + private inviteTypeService: InviteTypeService + ) { + } title = 'marc-en-tineke-2024'; mailTitleWholeDay = $localize`:@@mailTitleWholeDay:RSVP Trouwen 2024`; @@ -41,14 +46,14 @@ ${this.getWhenQuestions()}%0D%0A getWhenQuestions() { - return this.whenQuestionOptionsWholeDay.map(item => `- ${encodeURIComponent(item)}`).join('%0D%0A'); + const options = this.inviteTypeService.getInviteType() === InviteType.EVENING ? this.whenQuestionOptionsEvening : this.whenQuestionOptionsWholeDay; + + return options.map(item => `- ${encodeURIComponent(item)}`).join('%0D%0A'); } getMailToLink() { - return `mailto:marcentinekegaantrouwen@xz1.nl?subject=${this.mailTitleWholeDay}&body=${this.mailBody}`.replace('\n', '%0D%0A'); - } - - goToAddressesPage() { + const title = this.inviteTypeService.getInviteType() === InviteType.EVENING ? this.mailTitleEvening : this.mailTitleWholeDay; + return `mailto:marcentinekegaantrouwen@xz1.nl?subject=${title}&body=${this.mailBody}`.replace('\n', '%0D%0A'); } } diff --git a/src/app/shared/invite-type.service.ts b/src/app/shared/invite-type.service.ts new file mode 100644 index 0000000..09436fc --- /dev/null +++ b/src/app/shared/invite-type.service.ts @@ -0,0 +1,39 @@ +import {Inject, Injectable} from '@angular/core'; +import {DOCUMENT} from "@angular/common"; + +export enum InviteType { + FULL_DAY, + EVENING +} + +const inviteTypeMap = { + 'u7Tk3QvK': InviteType.EVENING, + 'AGr3ZfXM': InviteType.FULL_DAY, + 'ZXwfAK7g': InviteType.EVENING, + '5JnTf3NF': InviteType.FULL_DAY +} + +@Injectable({ + providedIn: 'root' +}) +export class InviteTypeService { + + + getInviteType() { + const inviteValue = this.getCookieValue('invite'); + + if (!inviteValue) { + return InviteType.EVENING; + } + + // @ts-ignore + return inviteTypeMap[inviteValue] + } + + private getCookieValue(name: string) { + return document.cookie + .split("; ") + .find((row) => row.startsWith(`${name}=`)) + ?.split("=")[1]; + } +} diff --git a/src/favicon.ico b/src/favicon.ico index 57614f9c967596fad0a3989bec2b1deff33034f6..5d240cf4e1a572838298924e63df957d76c5abea 100644 GIT binary patch literal 15086 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 literal 15086 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 Nr__JTFzvMr^FKp4S3v*( diff --git a/src/index.html b/src/index.html index 04205dd..9bdc470 100644 --- a/src/index.html +++ b/src/index.html @@ -2,12 +2,11 @@ - MarcEnTineke2024 - + Marc en Tineke 2024 - +