diff --git a/src/app/app.component.html b/src/app/app.component.html index a60b9a2..65b9297 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/src/app/app.component.scss b/src/app/app.component.scss index c7b7994..8d60fc6 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,4 +1,4 @@ main { - margin-top: 5rem; + margin-top: 60.2px; min-height: calc(100vh - 45px - 275px); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 77ce6e4..352741d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -2,15 +2,15 @@ import {isDevMode, NgModule} from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { AppComponent } from './app.component'; -import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http"; -import {AuthInterceptor} from "./misc/auth.interceptor"; +import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http"; +import { AuthInterceptor } from "./misc/auth.interceptor"; import { AuthPageComponent } from './auth-page/auth-page.component'; -import {RouterModule, RouterOutlet} from "@angular/router"; -import {ReactiveFormsModule} from "@angular/forms"; -import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; -import {APP_ROUTES} from "./misc/app.routes"; -import {StoreModule} from "@ngrx/store"; -import {sygotchiReducer} from "./store/sygotchi.reducer"; +import { RouterModule, RouterOutlet } from "@angular/router"; +import { ReactiveFormsModule } from "@angular/forms"; +import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; +import { APP_ROUTES } from "./misc/app.routes"; +import { StoreModule } from "@ngrx/store"; +import { sygotchiReducer } from "./store/sygotchi.reducer"; import { LogoComponent } from './logo/logo.component'; import { TeamSComponent } from './team-s/team-s.component'; import { DsgvoPageComponent } from './dsgvo-page/dsgvo-page.component'; @@ -30,6 +30,8 @@ import { ErrorPageComponent } from './error-page/error-page.component'; import { CleanFunctionComponent } from './clean-function/clean-function.component'; import { KitchenFunctionComponent } from './kitchen-function/kitchen-function.component'; import { BedroomComponent } from './bedroom/bedroom.component'; +import { GymComponent } from './gym/gym.component'; +import { GymFunctionComponent } from './gym-function/gym-function.component'; @NgModule({ declarations: [ @@ -47,12 +49,15 @@ import { BedroomComponent } from './bedroom/bedroom.component'; KitchenComponent, SygotchiCleanComponent, FooterComponent, - ErrorPageComponent, CleanFunctionComponent, KitchenFunctionComponent, BedroomComponent, HowToPlayComponent, - LeaderboardComponent + LeaderboardComponent, + LeaderboardComponent, + ErrorPageComponent, + GymComponent, + GymFunctionComponent ], imports: [ BrowserModule, diff --git a/src/app/bedroom/bedroom.component.scss b/src/app/bedroom/bedroom.component.scss index 0d4e1f9..85f0f86 100644 --- a/src/app/bedroom/bedroom.component.scss +++ b/src/app/bedroom/bedroom.component.scss @@ -19,7 +19,7 @@ align-items: center; } .needs{ - height: 33vh; + height: 30vh; } } @media screen and (orientation:landscape) { diff --git a/src/app/clean-function/clean-function.component.html b/src/app/clean-function/clean-function.component.html index 135a2ad..732a17a 100644 --- a/src/app/clean-function/clean-function.component.html +++ b/src/app/clean-function/clean-function.component.html @@ -1 +1,6 @@ +
+
+ {{message.text}} +
+
\ No newline at end of file diff --git a/src/app/clean-function/clean-function.component.scss b/src/app/clean-function/clean-function.component.scss index e69de29..61ddf0a 100644 --- a/src/app/clean-function/clean-function.component.scss +++ b/src/app/clean-function/clean-function.component.scss @@ -0,0 +1,3 @@ +.message{ + height: 24px; +} \ No newline at end of file diff --git a/src/app/clean-function/clean-function.component.ts b/src/app/clean-function/clean-function.component.ts index abb8f02..482d9f7 100644 --- a/src/app/clean-function/clean-function.component.ts +++ b/src/app/clean-function/clean-function.component.ts @@ -38,12 +38,19 @@ export class CleanFunctionComponent implements OnInit { } ) + }else{ + this.message.Error = true + this.message.text = "Sygotchi ist nicht dreckig genug!" + this.messageHandler() } } messageHandler() { - this.showMessage = true - setTimeout(() => { - this.showMessage = false - }, 7000) + if(!this.showMessage){ + this.showMessage = true + console.log(this.showMessage) + setTimeout(() => { + this.showMessage = false + }, 7000) + } } } diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 4e35ec2..aff34a3 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -1,4 +1,4 @@ -