diff --git a/package-lock.json b/package-lock.json index a9576d7..173205f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -481,9 +481,9 @@ "integrity": "sha512-DyUDGxp4kF4majcm9COVzu/9wzmgnfj+d6GUEjYkbqSH9QP05LonJ6wHMNxNMN6qMfawdCxDe0TnNDRPmHUj9w==" }, "@angular/router": { - "version": "9.1.7", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.7.tgz", - "integrity": "sha512-ycrkhkCbfOMCe9PngFjnyk8nH5jt0Kyb2NPtjmaGOtSCuZBZ0kOU0rQGmQnj3d2PiT0Yir59S8eEAf3Fh0iDuw==" + "version": "9.1.11", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.11.tgz", + "integrity": "sha512-D6CCDeSK/F6dWSB/a1g/zB072xG5LadLSV8afQ57oX1KHePx21LcoRG4tUtFMMHh/jZXRc9pMQIR1/9FrrXF3Q==" }, "@babel/code-frame": { "version": "7.8.3", diff --git a/package.json b/package.json index 0ecadd8..ea2cc21 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@angular/forms": "~9.1.7", "@angular/platform-browser": "~9.1.7", "@angular/platform-browser-dynamic": "~9.1.7", - "@angular/router": "~9.1.7", + "@angular/router": "^9.1.11", "bootstrap": "^4.5.0", "rxjs": "~6.5.4", "tslib": "^1.10.0", diff --git a/src/app/app.component.html b/src/app/app.component.html index 4cc7554..ad6d01d 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,3 +1,6 @@ - + + + + diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a2762e9..5ca25f4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,10 +4,14 @@ import { NgModule } from '@angular/core'; import { AppComponent } from './app.component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import { NavbarComponent } from './navbar/navbar.component'; +import { NavbarComponent } from './components/navbar/navbar.component'; import { HeaderComponent } from './components/header/header.component'; import { FooterComponent } from './components/footer/footer.component'; import { BlogCreateComponent } from './components/blog-create/blog-create.component'; +import { AppRoutingModule } from './app-routing.module'; +import { Einkaufszettel1Component } from './components/einkaufszettel1/einkaufszettel1.component'; +import { HomeComponent } from './components/home/home.component'; +import { Einkaufszettel2Component } from './components/einkaufszettel2/einkaufszettel2.component'; @NgModule({ declarations: [ @@ -16,12 +20,16 @@ import { BlogCreateComponent } from './components/blog-create/blog-create.compon NavbarComponent, HeaderComponent, FooterComponent, - BlogCreateComponent + BlogCreateComponent, + Einkaufszettel1Component, + HomeComponent, + Einkaufszettel2Component ], imports: [ BrowserModule, FormsModule, - ReactiveFormsModule + ReactiveFormsModule, + AppRoutingModule, ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/components/blog-create/blog-create.component.html b/src/app/components/blog-create/blog-create.component.html index 087da6f..2a86a28 100644 --- a/src/app/components/blog-create/blog-create.component.html +++ b/src/app/components/blog-create/blog-create.component.html @@ -1,4 +1,3 @@ -

Einkaufszettel1

Neuen Einkaufszettel Eintrag anlegen:

diff --git a/src/app/navbar/navbar.component.css b/src/app/components/einkaufszettel2/einkaufszettel2.component.css similarity index 100% rename from src/app/navbar/navbar.component.css rename to src/app/components/einkaufszettel2/einkaufszettel2.component.css diff --git a/src/app/components/einkaufszettel2/einkaufszettel2.component.html b/src/app/components/einkaufszettel2/einkaufszettel2.component.html new file mode 100644 index 0000000..e53b254 --- /dev/null +++ b/src/app/components/einkaufszettel2/einkaufszettel2.component.html @@ -0,0 +1,3 @@ +

Einkaufszettel2

+ + diff --git a/src/app/components/einkaufszettel2/einkaufszettel2.component.spec.ts b/src/app/components/einkaufszettel2/einkaufszettel2.component.spec.ts new file mode 100644 index 0000000..b5f4e76 --- /dev/null +++ b/src/app/components/einkaufszettel2/einkaufszettel2.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { Einkaufszettel2Component } from './einkaufszettel2.component'; + +describe('Einkaufszettel2Component', () => { + let component: Einkaufszettel2Component; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ Einkaufszettel2Component ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(Einkaufszettel2Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/einkaufszettel2/einkaufszettel2.component.ts b/src/app/components/einkaufszettel2/einkaufszettel2.component.ts new file mode 100644 index 0000000..06c2a32 --- /dev/null +++ b/src/app/components/einkaufszettel2/einkaufszettel2.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-einkaufszettel2', + templateUrl: './einkaufszettel2.component.html', + styleUrls: ['./einkaufszettel2.component.css'] +}) +export class Einkaufszettel2Component implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/components/home/home.component.css b/src/app/components/home/home.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html new file mode 100644 index 0000000..acfa950 --- /dev/null +++ b/src/app/components/home/home.component.html @@ -0,0 +1,10 @@ + diff --git a/src/app/components/home/home.component.spec.ts b/src/app/components/home/home.component.spec.ts new file mode 100644 index 0000000..490e81b --- /dev/null +++ b/src/app/components/home/home.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HomeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/home/home.component.ts b/src/app/components/home/home.component.ts new file mode 100644 index 0000000..007fef0 --- /dev/null +++ b/src/app/components/home/home.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.css'] +}) +export class HomeComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/components/navbar/navbar.component.css b/src/app/components/navbar/navbar.component.css new file mode 100644 index 0000000..76189eb --- /dev/null +++ b/src/app/components/navbar/navbar.component.css @@ -0,0 +1,3 @@ +.nav-link { + color: red +} diff --git a/src/app/components/navbar/navbar.component.html b/src/app/components/navbar/navbar.component.html new file mode 100644 index 0000000..0ef0a8a --- /dev/null +++ b/src/app/components/navbar/navbar.component.html @@ -0,0 +1,17 @@ + diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/components/navbar/navbar.component.spec.ts similarity index 100% rename from src/app/navbar/navbar.component.spec.ts rename to src/app/components/navbar/navbar.component.spec.ts diff --git a/src/app/navbar/navbar.component.ts b/src/app/components/navbar/navbar.component.ts similarity index 100% rename from src/app/navbar/navbar.component.ts rename to src/app/components/navbar/navbar.component.ts diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html deleted file mode 100644 index bd989ca..0000000 --- a/src/app/navbar/navbar.component.html +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/src/index.html b/src/index.html index 91d008f..37dc9bb 100644 --- a/src/index.html +++ b/src/index.html @@ -8,6 +8,6 @@ - +