Merge pull request #56 from Sybit-Education/fix/error-messages

fix: console errors
Sybit-Education · Aug 4, 2023 · 1167a7b · 1167a7b
2 parents 04bfebf + 7a6214a
commit 1167a7b
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 35 deletions.
diff --git a/src/app/bedroom/bedroom.component.ts b/src/app/bedroom/bedroom.component.ts
@@ -15,18 +15,20 @@ export class BedroomComponent implements OnInit{
     this.store.select(selectSygotchi)
         .subscribe(
           syGotchi => {
-            this.isAsleep = syGotchi.sleeping
+            if(syGotchi) {
+              this.isAsleep = syGotchi.sleeping
+            }
           }
         )
   }
   left(){
-    if(this.isAsleep == false){
+    if(!this.isAsleep){
       this.router.navigate(['/bathroom'])
     }
   }
   right(){
-    if(this.isAsleep == false){
+    if(!this.isAsleep){
       this.router.navigate(['/gym'])
     }
   }
-}
+}
diff --git a/src/app/clean-function/clean-function.component.ts b/src/app/clean-function/clean-function.component.ts
@@ -20,8 +20,10 @@ export class CleanFunctionComponent implements OnInit {
 
   ngOnInit(): void {
       this.store.select(selectSygotchi).subscribe(SyGotchi => {
-        this.isDirty = SyGotchi.dirty
-        this.sygotchi = SyGotchi
+        if(SyGotchi) {
+          this.isDirty = SyGotchi.dirty
+          this.sygotchi = SyGotchi
+        }
       })
   }
   clean(){
@@ -34,14 +36,14 @@ export class CleanFunctionComponent implements OnInit {
       () => {
         this.message.Error = true
         this.message.text = "Sygotchi ist nicht dreckig genug!"
-        this.messageHandler()      
+        this.messageHandler()
       }
 
       )
     }else{
       this.message.Error = true
         this.message.text = "Sygotchi ist nicht dreckig genug!"
-        this.messageHandler()  
+        this.messageHandler()
     }
   }
   messageHandler() {

diff --git a/src/app/gym-function/gym-function.component.ts b/src/app/gym-function/gym-function.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import { SyGotchi } from '../entities/syGotchi';
 import { ActionsService } from '../services/actions.service';
 import { Store } from '@ngrx/store';
@@ -10,24 +10,26 @@ import { setSygotchi } from '../store/sygotchi.actions';
   templateUrl: './gym-function.component.html',
   styleUrls: ['./gym-function.component.scss']
 })
-export class GymFunctionComponent {
+export class GymFunctionComponent implements OnInit {
   isTired: number = 0
   isBored: number
-  cooldown: number
   message = {text: '', error: false}
   sygotchi: SyGotchi
   showMessage: boolean = false
+  cooldown: number
 
   constructor(private actionsService: ActionsService, private store: Store) {}
 
   ngOnInit() {
     this.store.select(selectSygotchi)
       .subscribe(
         syGotchi => {
-          this.isTired = syGotchi.tired
-          this.isBored = syGotchi.bored
-          this.cooldown = syGotchi.playCooldown
-          this.sygotchi = syGotchi
+          if(syGotchi) {
+            this.isTired = syGotchi.tired
+            this.isBored = syGotchi.bored
+            this.cooldown = syGotchi.playCooldown
+            this.sygotchi = syGotchi
+          }
         }
       )
   }
@@ -51,13 +53,13 @@ export class GymFunctionComponent {
           this.messageHandler()
         })
       }
-      
+
     }else{
       this.message.error = true
         this.message.text = 'Dein Sygotchi ist zu müde und kann nicht mehr trainieren.'
         this.messageHandler()
+      }
     }
-  }
 
   messageHandler() {
     this.showMessage = true

diff --git a/src/app/kitchen-function/kitchen-function.component.ts b/src/app/kitchen-function/kitchen-function.component.ts
@@ -25,16 +25,18 @@ export class KitchenFunctionComponent implements OnInit{
     this.store.select(selectSygotchi)
       .subscribe(
         syGotchi => {
-          this.isHungry = syGotchi.hunger
-          this.isThirsty = syGotchi.thirst
-          this.feedCooldown = syGotchi.feedCooldown
-          this.drinkCooldown = syGotchi.drinkCooldown
-          this.sygotchi = syGotchi
+          if(syGotchi) {
+            this.isHungry = syGotchi.hunger
+            this.isThirsty = syGotchi.thirst
+            this.feedCooldown = syGotchi.feedCooldown
+            this.drinkCooldown = syGotchi.drinkCooldown
+            this.sygotchi = syGotchi
+          }
         }
       )
   }
   feed(){
-    
+
     if(this.isHungry <= 90){
       if(this.feedCooldown > -1){
         this.message.error = true
@@ -55,7 +57,7 @@ export class KitchenFunctionComponent implements OnInit{
           this.messageHandler()
       })
       }
-      
+
     }else{
       this.message.error = true
       this.message.text = 'Sygotchi hat keinen Hunger!'
@@ -82,7 +84,7 @@ export class KitchenFunctionComponent implements OnInit{
           this.messageHandler()
       })
       }
-      
+
     }else{
       this.message.error = true
           this.message.text = 'Sygotchi hat keinen Durst!'
@@ -92,9 +94,10 @@ export class KitchenFunctionComponent implements OnInit{
   messageHandler() {
     if(!this.showMessage){
       this.showMessage = true
+      console.log(this.showMessage)
       setTimeout(() => {
         this.showMessage = false
       }, 7000)
     }
   }
-}
+}
diff --git a/src/app/needs/needs.component.html b/src/app/needs/needs.component.html
@@ -1,6 +1,6 @@
 <div class="center">
   <div class="row w-100">
-    <div class="text-center h3">
+    <div class="text-center h3" *ngIf="sygotchi">
       <a>{{sygotchi.name}}</a>
     </div>
     <div class="col-6 mb-3">
@@ -35,8 +35,8 @@
           </span>
         </label>
         <br>
-        <label>
-          <span>Score:
+        <label>Score:
+          <span *ngIf="sygotchi">
             {{ sygotchi.score}}
             <i class="fa-solid fa-bank"></i>
           </span>

diff --git a/src/app/needs/needs.component.ts b/src/app/needs/needs.component.ts
@@ -38,10 +38,6 @@ export class NeedsComponent {
     })
   }
 
-  open(content) {
-    this.modalService.open(content)
-  }
-
   private moodIconSelector(mood: string) {
     switch (mood) {
       case Mood.HAPPY:

diff --git a/src/app/sleep-scene/sleep-scene.component.ts b/src/app/sleep-scene/sleep-scene.component.ts
@@ -22,8 +22,10 @@ export class SleepSceneComponent implements OnInit {
     this.store.select(selectSygotchi)
       .subscribe(
         syGotchi => {
-          this.isAsleep = syGotchi?.sleeping ? true : false
-          this.sygotchi = syGotchi
+          if(syGotchi) {
+            this.isAsleep = syGotchi.sleeping
+            this.sygotchi = syGotchi
+          }
         }
       )
   }
@@ -65,6 +67,7 @@ export class SleepSceneComponent implements OnInit {
   messageHandler() {
     if(!this.showMessage){
       this.showMessage = true
+      console.log(this.showMessage)
       setTimeout(() => {
         this.showMessage = false
       }, 7000)