Merge pull request tapixhx#82 from tapixhx/tapish

Login bug fix
Arnavjain1703 · Jun 12, 2020 · 4561c50 · 4561c50
2 parents eca567e + ff8d02b
commit 4561c50
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/chat-client/.firebase/hosting.ZGlzdA.cache b/chat-client/.firebase/hosting.ZGlzdA.cache
@@ -33,8 +33,8 @@ assets/images/video-off.png,1591039185876,2c2181a809d88330d0fbcd92c50f1a8239a741
 assets/images/video.png,1591039185876,bbb674752a337e00ada8e91df3473895c07f36ed41603d03aab16637974e1fa5
 assets/images/wfh_9.svg,1591039185876,a573c47f40be1ceb7ef984f3a88d613fa8633d4448fc5e3f9b31f1f022e0bdbe
 assets/images/whitesilogo.png,1591039185880,6038d1b0b17297494d7514156f344909aacb645d0dc4318038adde39f7454b29
-index.html,1591792827536,b4c09e550c9b5b862af28e599b6e3fe41e825572f8b960446fc917e7067a3ed3
-styles.3a946b3bdfde9236886d.css,1591792812011,634e3f22c9bd603f775b75bff756796d15ffd4860b2c2e823159c47f7d912c2d
-3rdpartylicenses.txt,1591792812010,0694dce82e2bc3026d2a194a72a896b3d1faaae09afcffdc0508f80c7a7fbde6
-main-es2015.db3e200640b811d4d260.js,1591792825529,784c7d1bb11c0466a5f617fb8951b0d1cbb0a7f08082acb2e35515a948d0f34f
-main-es5.db3e200640b811d4d260.js,1591792823627,b353b822c597dbdff03e1fff36a240002963eb5f1405ec22e7ea39df4bddae7f
+index.html,1591876115860,2f8c10568ef65bb589dceb40ac8adc120a540ff7b92dff4e4b6f0e02594e409a
+styles.3a946b3bdfde9236886d.css,1591876094220,634e3f22c9bd603f775b75bff756796d15ffd4860b2c2e823159c47f7d912c2d
+3rdpartylicenses.txt,1591876094220,0694dce82e2bc3026d2a194a72a896b3d1faaae09afcffdc0508f80c7a7fbde6
+main-es2015.e2ea85ca40b004a532fd.js,1591876113814,c48e7507f7537b417c5db8d695206df5f333508b6b37f9b4b283123393a4a727
+main-es5.e2ea85ca40b004a532fd.js,1591876111974,4fff7cdf6c3fcbd07192b5ec31188d22679c0ee8b18a49313aa354d5bebd7f78
diff --git a/chat-client/src/app/app.component.ts b/chat-client/src/app/app.component.ts
@@ -28,21 +28,19 @@ export class AppComponent implements OnInit {
   }
 
   error(message) {
-    alert(message)
-  if(message=="jwt expired")
-  {
-    this.changeService.loginopen()
-  }
-  else 
-  {
-
-    Swal.fire(
-      'Please try again!',
-      message,  
-      'error'
-    )
-
-}
+    if(message=="jwt expired")
+    {
+      this.changeService.loginopen()
+    }
+    else 
+    {
+
+      Swal.fire(
+        'Please try again!',
+        message,  
+        'error'
+      )
+    }
   }
 
 

diff --git a/chat-client/src/app/navbar/navbar.component.ts b/chat-client/src/app/navbar/navbar.component.ts
@@ -100,7 +100,9 @@ export class NavbarComponent implements OnInit {
             this.router.navigate(['/verify', error.error.userId]);
             this.wnt_login = false;
           }
-          this.appcomponent.error(error.error.error);
+          else {
+            this.appcomponent.error(error.error.error);
+          }
         }
       )
   }