diff --git a/ui/package-lock.json b/ui/package-lock.json index 48bd39e..0b9bc91 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -24,6 +24,7 @@ "bootstrap": "^4.6.0", "rxjs": "~7.4.0", "tslib": "^2.3.0", + "typeface-josefin-sans": "^1.1.13", "zone.js": "~0.11.4" }, "devDependencies": { @@ -11871,6 +11872,11 @@ "integrity": "sha512-5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g==", "dev": true }, + "node_modules/typeface-josefin-sans": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/typeface-josefin-sans/-/typeface-josefin-sans-1.1.13.tgz", + "integrity": "sha512-RyUjn3ncgiB+MW0LcDTSVSOYKDzuOy5lq0yIdp6XYzlQeLf5PLF4UU4a/4Crjy3sZqkcHUvNq+4HMaapO4sUsA==" + }, "node_modules/typescript": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz", @@ -21371,6 +21377,11 @@ "integrity": "sha512-5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g==", "dev": true }, + "typeface-josefin-sans": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/typeface-josefin-sans/-/typeface-josefin-sans-1.1.13.tgz", + "integrity": "sha512-RyUjn3ncgiB+MW0LcDTSVSOYKDzuOy5lq0yIdp6XYzlQeLf5PLF4UU4a/4Crjy3sZqkcHUvNq+4HMaapO4sUsA==" + }, "typescript": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz", diff --git a/ui/package.json b/ui/package.json index f157d72..5933908 100644 --- a/ui/package.json +++ b/ui/package.json @@ -26,6 +26,7 @@ "bootstrap": "^4.6.0", "rxjs": "~7.4.0", "tslib": "^2.3.0", + "typeface-josefin-sans": "^1.1.13", "zone.js": "~0.11.4" }, "devDependencies": { @@ -42,4 +43,4 @@ "karma-jasmine-html-reporter": "~1.7.0", "typescript": "~4.5.2" } -} \ No newline at end of file +} diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts index 910e19f..7f590b7 100644 --- a/ui/src/app/app-routing.module.ts +++ b/ui/src/app/app-routing.module.ts @@ -1,12 +1,16 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { BesucherComponent } from './besucher/besucher.component'; +import { ContactComponent } from './contact/contact.component'; import { HomeComponent } from './home/home.component'; +import { LocationComponent } from './location/location.component'; const routes: Routes = [ { path: '', redirectTo: '/home',pathMatch:'full'}, { path: 'home', component: HomeComponent}, - { path: 'besucher',component: BesucherComponent} + { path: 'besucher',component: BesucherComponent}, + { path: 'unserfest',component: LocationComponent}, + { path:'contact', component: ContactComponent} ]; @NgModule({ diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index eac2858..2fe8cc4 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -13,6 +13,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { CountdownComponent } from './countdown/countdown.component'; import { NavbarComponent } from './navbar/navbar.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { LocationComponent } from './location/location.component'; +import { ContactComponent } from './contact/contact.component'; +import { DisclaimerComponent } from './disclaimer/disclaimer.component'; @NgModule({ declarations: [ @@ -20,7 +23,10 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; HomeComponent, BesucherComponent, CountdownComponent, - NavbarComponent + NavbarComponent, + LocationComponent, + ContactComponent, + DisclaimerComponent ], imports: [ BrowserModule, diff --git a/ui/src/app/contact/contact.component.css b/ui/src/app/contact/contact.component.css new file mode 100644 index 0000000..e69de29 diff --git a/ui/src/app/contact/contact.component.html b/ui/src/app/contact/contact.component.html new file mode 100644 index 0000000..f9e5a6a --- /dev/null +++ b/ui/src/app/contact/contact.component.html @@ -0,0 +1,20 @@ +

Zum An und Abmelden

+

+
+ Telefonisch: 01512 - 7124430
+ gerne auch über Whatsapp oder SMS
+ Email: hochzeit@cosysda.de
+ Online +

+
+
+ +

Bei Fragen zur organisatorische Ablauf

+

+ von den Feierlichkeiten
+ steht gerne
+ Jenny
+ unter der Nummer
+ 0176 - 81224197
+ zur Verfügung. +

diff --git a/ui/src/app/contact/contact.component.spec.ts b/ui/src/app/contact/contact.component.spec.ts new file mode 100644 index 0000000..2f386db --- /dev/null +++ b/ui/src/app/contact/contact.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ContactComponent } from './contact.component'; + +describe('ContactComponent', () => { + let component: ContactComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ContactComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ContactComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ui/src/app/contact/contact.component.ts b/ui/src/app/contact/contact.component.ts new file mode 100644 index 0000000..bdb4bda --- /dev/null +++ b/ui/src/app/contact/contact.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-contact', + templateUrl: './contact.component.html', + styleUrls: ['./contact.component.css'] +}) +export class ContactComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/ui/src/app/disclaimer/disclaimer.component.css b/ui/src/app/disclaimer/disclaimer.component.css new file mode 100644 index 0000000..e69de29 diff --git a/ui/src/app/disclaimer/disclaimer.component.html b/ui/src/app/disclaimer/disclaimer.component.html new file mode 100644 index 0000000..cb054f2 --- /dev/null +++ b/ui/src/app/disclaimer/disclaimer.component.html @@ -0,0 +1 @@ +

disclaimer works!

diff --git a/ui/src/app/disclaimer/disclaimer.component.spec.ts b/ui/src/app/disclaimer/disclaimer.component.spec.ts new file mode 100644 index 0000000..d05bd29 --- /dev/null +++ b/ui/src/app/disclaimer/disclaimer.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DisclaimerComponent } from './disclaimer.component'; + +describe('DisclaimerComponent', () => { + let component: DisclaimerComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DisclaimerComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(DisclaimerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ui/src/app/disclaimer/disclaimer.component.ts b/ui/src/app/disclaimer/disclaimer.component.ts new file mode 100644 index 0000000..2911ab4 --- /dev/null +++ b/ui/src/app/disclaimer/disclaimer.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-disclaimer', + templateUrl: './disclaimer.component.html', + styleUrls: ['./disclaimer.component.css'] +}) +export class DisclaimerComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/ui/src/app/location/location.component.css b/ui/src/app/location/location.component.css new file mode 100644 index 0000000..e69de29 diff --git a/ui/src/app/location/location.component.html b/ui/src/app/location/location.component.html new file mode 100644 index 0000000..974bbbb --- /dev/null +++ b/ui/src/app/location/location.component.html @@ -0,0 +1,30 @@ +

Unser Fest

+

+ Wir heiraten am 20.08.2022
+ und würden uns freuen,
+ wenn Ihr diesen besonderen Tag
+ mit uns feiern würdet. +

+ + +

+ Wir werden gemeinsam in
+ Landgasthof Dockemeyer
+ Hauptstraße 433
+ 26683 Ramsloh
+ um 19 Uhr auf diesen Tag anstoßen.
+ Wegbeschreibung +

+ +

+ Die Standesamtliche Trauung
+ findet um 13 Uhr in der
Mühle Scharrel statt.
+ Wegbeschreibung +

+ +

+ Bitte lasst uns bis zum
20.06.2022
wissen, ob wir Euch als unsere Gäste
empfangen dürfen
Kontaktmöglichkeiten +

+ +
+

Wir freuen uns auf Euch

diff --git a/ui/src/app/location/location.component.spec.ts b/ui/src/app/location/location.component.spec.ts new file mode 100644 index 0000000..2d39690 --- /dev/null +++ b/ui/src/app/location/location.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LocationComponent } from './location.component'; + +describe('LocationComponent', () => { + let component: LocationComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ LocationComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(LocationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ui/src/app/location/location.component.ts b/ui/src/app/location/location.component.ts new file mode 100644 index 0000000..aa38241 --- /dev/null +++ b/ui/src/app/location/location.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-location', + templateUrl: './location.component.html', + styleUrls: ['./location.component.css'] +}) +export class LocationComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/ui/src/app/navbar/navbar.component.html b/ui/src/app/navbar/navbar.component.html index f62d286..98a4e33 100644 --- a/ui/src/app/navbar/navbar.component.html +++ b/ui/src/app/navbar/navbar.component.html @@ -1,13 +1,16 @@ \ No newline at end of file diff --git a/ui/src/styles.css b/ui/src/styles.css index 7a49997..0df0071 100644 --- a/ui/src/styles.css +++ b/ui/src/styles.css @@ -1,10 +1,14 @@ /* You can add global styles to this file, and also import other style files */ - +@import "~typeface-josefin-sans/index.css"; html { width: 100%; + } body { - font-family: Roboto, "Helvetica Neue", sans-serif; - font-size: 15px; + /*font-family: Roboto, "Helvetica Neue", sans-serif;*/ + font-family: 'Josefin Sans'; + font-size: 22px; + background-color: #c6ac87; } +