Merge pull request #11 from ssysm/update

Update
ssysm · Feb 4, 2018 · 09bf938 · 09bf938
2 parents 222da08 + 1a4a2d8
commit 09bf938
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/client/src/app/common/admin-guard.service.ts b/client/src/app/common/admin-guard.service.ts
@@ -14,7 +14,7 @@ export class AdminGuardService {
   canActivate(route:ActivatedRouteSnapshot, state:RouterStateSnapshot):Observable<boolean>|boolean {
     let the_cookie = document.cookie.split(';');
     let token = the_cookie[0].split("=")[1];
-    if(token){
+    if(token || localStorage.getItem('loggedIn') == 'true'){
       return true
     }else{
       this.router.navigate(['/']);

diff --git a/client/src/app/view/about/about.component.html b/client/src/app/view/about/about.component.html
@@ -25,8 +25,8 @@ <h1 class="text-center introh1 h1">About Us</h1>
     <div class="col-md-6 col-sm-12">
       <p class="h5">Latest System Releases: <span class="badge badge-success">{{Version}}</span></p>
       <div style="display: inline">
-        <p style="display: inline">Front-End: <span class="badge badge-success">v1.0.4</span></p>
-        <p style="display: inline">Back-End: <span class="badge badge-success">v1.0.4</span></p>
+        <p style="display: inline">Front-End: <span class="badge badge-success">v1.0.5</span></p>
+        <p style="display: inline">Back-End: <span class="badge badge-success">v1.0.5</span></p>
         <p>Latest Commit: <span class="badge badge-info">{{commit}}</span></p>
       </div>
     </div>

diff --git a/client/src/index.html b/client/src/index.html
@@ -1,39 +1,33 @@
 <!doctype html>
 <html lang="en">
 <head>
+  <!--Init View-->
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Starry Sea Volunteers Association</title>
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <!--PWA Setting-->
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="theme-color" content="#409cc3">
-  <title>StarrySea</title>
-
-  <base href="/">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
   <link rel="manifest" href="/manifest.json">
-  <style>
-    .splash{
-      opacity: 0;
-      position: fixed;
-      height: 100%;
-      width: 100%;
-      margin-top: 15%;
-      text-align: center;
-      z-index: -1;
-      font-family: Arial,"Times New Roman", sans-serif
-    }
-    app-root:empty + .splash {
-      opacity: 1;
-      z-index: 100;
-    }
-  </style>
+  <style>.splash{opacity: 0;position: fixed;height: 100%;width: 100%;margin-top: 15%;text-align: center;z-index: -1;font-family: Arial,"Times New Roman", sans-serif}  app-root:empty + .splash {opacity: 1;z-index: 100;}</style>
+  <!--SEO-->
+  <meta name="description" content="Starry Sea Volunteers Association">
+  <meta name="keywords" content="Starrysea,星之海,Starry Sea,Starry Sea Volunteers Association">
+  <meta property="og:title" content="Starry Sea"/>
+  <meta property="og:site_name" content="Starry Sea Volunteers Association"/>
+  <!--Angular Routing-->
+  <base href="/">
 </head>
 <body>
   <app-root></app-root>
+  <!--PWA Loading-->
   <div class="splash">
     <img src="/assets/img/starsea.png" alt="Starrysea Logo" style="width: 348px;height: auto;">
     <h2>Starrysea International</h2>
     <h3>Loading...</h3>
   </div>
+  <!--No Script-->
   <noscript>
     <p>
       Sorry, JavaScript must be enabled to use this app