diff --git a/angular.json b/angular.json index 2771ae0..7544246 100644 --- a/angular.json +++ b/angular.json @@ -17,6 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:application", "options": { + "localize": true, "outputPath": "dist/marc-en-tineke-2024", "index": "src/index.html", "browser": "src/main.ts", @@ -100,6 +101,14 @@ "scripts": [] } } + }, + "i18n": { + "sourceLocale": "nl-NL", + "locales": { + "en-US": { + "translation": "messages-en.json" + } + } } } } diff --git a/messages-en.json b/messages-en.json new file mode 100644 index 0000000..ac8ac51 --- /dev/null +++ b/messages-en.json @@ -0,0 +1,13 @@ +{ + "locale": "en-US", + "translations": { + "mailTitleWholeDay": "RSVP Trouwen 2024", + "mailTitleEvening": "RSVP Trouwen 2024 Evening", + "whenOptionCeremony": "Ceremony", + "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" + } +} diff --git a/messages-nl.json b/messages-nl.json new file mode 100644 index 0000000..ff061fb --- /dev/null +++ b/messages-nl.json @@ -0,0 +1,13 @@ +{ + "locale": "nl-NL", + "translations": { + "mailTitleWholeDay": "RSVP Trouwen 2024", + "mailTitleEvening": "RSVP Trouwen 2024 Avond", + "whenOptionCeremony": "Ceremonie", + "whenOptionCake": "Taart & Bubbels", + "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" + } +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f67ac41..a717ea5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,6 +27,7 @@ "@angular-devkit/build-angular": "^17.3.7", "@angular/cli": "^17.3.7", "@angular/compiler-cli": "^17.3.0", + "@angular/localize": "^17.3.9", "@types/express": "^4.17.17", "@types/jasmine": "~5.1.0", "@types/node": "^18.18.0", @@ -463,6 +464,75 @@ "rxjs": "^6.5.3 || ^7.4.0" } }, + "node_modules/@angular/localize": { + "version": "17.3.9", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.9.tgz", + "integrity": "sha512-ECWWw6GoJh2laopHIf+QT4bDDpSWwQJk95SGPI5mQIEXZXw6w9ms05Sfb8KJTNRXs9kcotloIGK9YanFZxzK1g==", + "dev": true, + "dependencies": { + "@babel/core": "7.23.9", + "@types/babel__core": "7.20.5", + "fast-glob": "3.3.2", + "yargs": "^17.2.1" + }, + "bin": { + "localize-extract": "tools/bundles/src/extract/cli.js", + "localize-migrate": "tools/bundles/src/migrate/cli.js", + "localize-translate": "tools/bundles/src/translate/cli.js" + }, + "engines": { + "node": "^18.13.0 || >=20.9.0" + }, + "peerDependencies": { + "@angular/compiler": "17.3.9", + "@angular/compiler-cli": "17.3.9" + } + }, + "node_modules/@angular/localize/node_modules/@babel/core": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", + "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.9", + "@babel/parser": "^7.23.9", + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@angular/localize/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/@angular/localize/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@angular/platform-browser": { "version": "17.3.9", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.9.tgz", @@ -3854,6 +3924,47 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.20.7" + } + }, "node_modules/@types/body-parser": { "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", diff --git a/package.json b/package.json index b86628f..d9f4696 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test", - "serve:ssr:marc-en-tineke-2024": "node dist/marc-en-tineke-2024/server/server.mjs" + "serve:ssr:marc-en-tineke-2024": "node dist/marc-en-tineke-2024/server/server.mjs", + "i18n": "ng extract-i18n --format=json --out-file=messages-nl.json" }, "private": true, "dependencies": { @@ -30,6 +31,7 @@ "@angular-devkit/build-angular": "^17.3.7", "@angular/cli": "^17.3.7", "@angular/compiler-cli": "^17.3.0", + "@angular/localize": "^17.3.9", "@types/express": "^4.17.17", "@types/jasmine": "~5.1.0", "@types/node": "^18.18.0", @@ -41,4 +43,4 @@ "karma-jasmine-html-reporter": "~2.1.0", "typescript": "~5.4.2" } -} \ No newline at end of file +} diff --git a/src/app/app.component.html b/src/app/app.component.html index 18f21b0..0680b43 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,32 +1 @@ -

TINEKE & MARC

-20 september 2024 -
- -
-
-
-

RSVP

- Voor 10 augustus -
- -
-

Laat ons weten of je komt!

- Stuur een mail -
- -
-

Dieetwensen

- Laat het ons weten, dan kunnen we er rekening mee houden. -
- -
-

Stukjes/inzendingen

- Via de ceremoniemeester Lianne Fokkert -
- -
-

Cadeautip

- Envelop -
-
- + diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 0e1ccf2..e69de29 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,55 +0,0 @@ -@use "../styles/variables"; - -h1, { - font-size: 34px; - font-weight: bold; - - .small { - font-family: "beautifully-delicious", serif; - font-size: 60px; - font-style: italic; - } -} - -h1, .subtitle { - font-family: variables.$tan-moncheri; - text-align: center; -} - -.heart { - text-align: center; -} - -.subtitle { - display: block; - font-size: 22px; -} - -h2, h3 { - font-weight: normal; -} - -p, h2, h3, .schedule { - font-family: variables.$playfair-display; -} - -.schedule { - margin-top: 16px; - text-align: center; - - - .item { - h3 { - margin-bottom: 0; - } - - a { - color: black; - } - - } -} - -p { - margin-bottom :0; -} diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index dc39edb..d8bbb5f 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -1,3 +1,21 @@ import { Routes } from '@angular/router'; +import {AppComponent} from "./app.component"; +import {DirectionsPageComponent} from "./directions-page/directions-page.component"; +import {LandingPageComponent} from "./landing-page/landing-page.component"; -export const routes: Routes = []; +export const routes: Routes = [ + + { + path: 'directions', + component: DirectionsPageComponent + }, + { + path: '', + component: LandingPageComponent, + pathMatch: 'full' + }, + { + path: '**', + redirectTo: '' + } +]; diff --git a/src/app/directions-page/directions-page.component.html b/src/app/directions-page/directions-page.component.html new file mode 100644 index 0000000..5af7e21 --- /dev/null +++ b/src/app/directions-page/directions-page.component.html @@ -0,0 +1 @@ +

directions-page works!

diff --git a/src/app/directions-page/directions-page.component.scss b/src/app/directions-page/directions-page.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/directions-page/directions-page.component.spec.ts b/src/app/directions-page/directions-page.component.spec.ts new file mode 100644 index 0000000..e636575 --- /dev/null +++ b/src/app/directions-page/directions-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DirectionsPageComponent } from './directions-page.component'; + +describe('DirectionsPageComponent', () => { + let component: DirectionsPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [DirectionsPageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DirectionsPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/directions-page/directions-page.component.ts b/src/app/directions-page/directions-page.component.ts new file mode 100644 index 0000000..4b941b5 --- /dev/null +++ b/src/app/directions-page/directions-page.component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-directions-page', + standalone: true, + imports: [], + templateUrl: './directions-page.component.html', + styleUrl: './directions-page.component.scss' +}) +export class DirectionsPageComponent { + +} diff --git a/src/app/heart/heart.component.scss b/src/app/heart/heart.component.scss index be4af67..a19043d 100644 --- a/src/app/heart/heart.component.scss +++ b/src/app/heart/heart.component.scss @@ -1,3 +1,11 @@ svg { height: 10px; } + + :host { + margin-top: 24px; + margin-bottom: 24px; + + display: flex; + justify-content: center; + } diff --git a/src/app/landing-page/landing-page.component.html b/src/app/landing-page/landing-page.component.html new file mode 100644 index 0000000..4e003a3 --- /dev/null +++ b/src/app/landing-page/landing-page.component.html @@ -0,0 +1,36 @@ +

TINEKE & MARC

+Nodigen jullie uit voor hun bruiloft op +

20 september 2024

+
+
+

RSVP

+ Voor 10 augustus +
+ +
+

Laat ons weten of je komt!

+ Stuur een mail +
+ + +
+

Dieetwensen

+ Laat het ons weten, dan kunnen we er rekening mee houden. +
+ +
+

Stukjes/inzendingen

+ Via de ceremoniemeester Lianne Fokkert +
+ +
+

Cadeautip

+ Envelope +
+ +
+

Adressen

+ Klik +
+
+ diff --git a/src/app/landing-page/landing-page.component.scss b/src/app/landing-page/landing-page.component.scss new file mode 100644 index 0000000..94620fe --- /dev/null +++ b/src/app/landing-page/landing-page.component.scss @@ -0,0 +1,81 @@ +@use "../../styles/variables"; + + + +h1.names, { + font-size: 34px; + font-weight: bold; + + display: flex; + justify-content: center; + + .small { + font-family: "beautifully-delicious", serif; + font-size: 60px; + font-style: italic; + + height: 48px; + line-height: 29px; + padding-left: 18px; + padding-right: 18px; + } +} + +h1, .subtitle { + font-family: variables.$tan-moncheri; + text-align: center; +} + +.subtitle { + display: block; + font-size: 24px; + margin-bottom: 60px; +} + + +.invite-text { + display: flex; + justify-content: center; + + margin-top: -24px; + font-size: 16px; +} + + + +h2, h3 { + font-weight: normal; +} + +p, h2, h3, .schedule { + font-family: variables.$playfair-display; +} + +.schedule { + margin-top: 16px; + text-align: center; + + .item { + h3 { + margin-bottom: 0; + } + + a { + color: rgb(48, 77, 42);; + + &:hover { + color: black; + } + } + + } +} + +p { + margin-bottom :0; +} + +img.envelope { + width: 64px; + margin-top: 8px; +} diff --git a/src/app/landing-page/landing-page.component.spec.ts b/src/app/landing-page/landing-page.component.spec.ts new file mode 100644 index 0000000..70960d7 --- /dev/null +++ b/src/app/landing-page/landing-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LandingPageComponent } from './landing-page.component'; + +describe('LandingPageComponent', () => { + let component: LandingPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [LandingPageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(LandingPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/landing-page/landing-page.component.ts b/src/app/landing-page/landing-page.component.ts new file mode 100644 index 0000000..c014665 --- /dev/null +++ b/src/app/landing-page/landing-page.component.ts @@ -0,0 +1,54 @@ +import {Component} from '@angular/core'; +import {HeartComponent} from "../heart/heart.component"; +import {RouterLink} from "@angular/router"; + +@Component({ + selector: 'app-landing-page', + standalone: true, + imports: [ + HeartComponent, + RouterLink + ], + templateUrl: './landing-page.component.html', + styleUrl: './landing-page.component.scss' +}) +export class LandingPageComponent { + title = 'marc-en-tineke-2024'; + + mailTitleWholeDay = $localize`:@@mailTitleWholeDay:RSVP Trouwen 2024`; + mailTitleEvening = $localize`:@@mailTitleEvening:RSVP Trouwen 2024 Avond`; + + whenQuestionOptionsWholeDay = [ + $localize`:@@whenOptionCeremony:Ceremonie`, + $localize`:@@whenOptionCake:Taart & Bubbels`, + $localize`:@@whenOptionDinner:Diner`, + $localize`:@@whenOptionChurch:Kerkdienst`, + $localize`:@@whenOptionParty:Feest` + ] + + whenQuestionOptionsEvening = [ + $localize`:@@whenOptionChurch:Kerkdienst`, + $localize`:@@whenOptionParty:Feest` + ] + + mailBody = $localize`:@@mailBody:Wat fijn dat je ons laat weten of je er bij bent!%0D%0A +Ik kom met: %0D%0A +- X personen%0D%0A %0D%0A +Ik ben er bij met (verwijder als je niet aanwezig bent): +%0D%0A +${this.getWhenQuestions()}%0D%0A +%0D%0AVerdere opmerkingen/dieetwensen` + + + getWhenQuestions() { + return this.whenQuestionOptionsWholeDay.map(item => `- ${encodeURIComponent(item)}`).join('%0D%0A'); + } + + getMailToLink() { + return `mailto:marcentinekegaantrouwen@xz1.nl?subject=${this.mailTitleWholeDay}&body=${this.mailBody}`.replace('\n', '%0D%0A'); + } + + goToAddressesPage() { + + } +} diff --git a/src/assets/images/envelope.png b/src/assets/images/envelope.png new file mode 100644 index 0000000..b0c7831 Binary files /dev/null and b/src/assets/images/envelope.png differ diff --git a/src/assets/images/heart.svg b/src/assets/images/heart.svg deleted file mode 100644 index 3ec035c..0000000 --- a/src/assets/images/heart.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main.ts b/src/main.ts index 35b00f3..ee35435 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,3 +1,5 @@ +/// + import { bootstrapApplication } from '@angular/platform-browser'; import { appConfig } from './app/app.config'; import { AppComponent } from './app/app.component'; diff --git a/src/styles.scss b/src/styles.scss index f4cec9a..2242b99 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,3 +1,7 @@ /* You can add global styles to this file, and also import other style files */ @import "./styles/fonts"; + +html { + color: rgb(48, 77, 42); +} diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index fd2a7c8..19a4208 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -1,2 +1,7 @@ $playfair-display: "playfair-display", serif; $tan-moncheri: "tan-moncheri", sans-serif; + + +$font-sizes: ( + "h1": "96px;" +) diff --git a/tsconfig.app.json b/tsconfig.app.json index 7dc7284..3544763 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -4,7 +4,8 @@ "compilerOptions": { "outDir": "./out-tsc/app", "types": [ - "node" + "node", + "@angular/localize" ] }, "files": [ diff --git a/tsconfig.spec.json b/tsconfig.spec.json index be7e9da..c63b698 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -4,7 +4,8 @@ "compilerOptions": { "outDir": "./out-tsc/spec", "types": [ - "jasmine" + "jasmine", + "@angular/localize" ] }, "include": [