update homepage navbar

ssysm · Feb 24, 2018 · 28cdd3b · 28cdd3b
1 parent 01ef150
commit 28cdd3b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/client/.angular-cli.json b/client/.angular-cli.json
@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "name": "client"
+    "name": "starrysea-nextgen"
   },
   "apps": [
     {

diff --git a/client/src/app/common/guard/admin-guard.service.ts b/client/src/app/common/guard/admin-guard.service.ts
@@ -13,11 +13,11 @@ 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 || localStorage.getItem('loggedIn') == 'true'){
+    let token_name = the_cookie[0].split("=")[1];
+    if(token_name === "token" || localStorage.getItem('loggedIn') == 'true'){
       return true
     }else{
-      this.router.navigate(['/']);
+      this.router.navigate(['/404']);
       return false;
     }
 

diff --git a/client/src/app/view/home/home.component.css b/client/src/app/view/home/home.component.css
@@ -12,6 +12,12 @@
   }
 }
 
+@media screen and (max-width: 991px) {
+  .title{
+    font-size: 2.54rem!important;
+  }
+}
+
 .intro{
   clear: both;
   background: #000000;

diff --git a/client/src/app/view/partical/navbar/navbar.component.css b/client/src/app/view/partical/navbar/navbar.component.css
@@ -1,6 +1,4 @@
 .navbar{
-  background: url("/assets/img/navbar.jpg") no-repeat fixed;
-  background-size: 100%;
   width: 100%;
 }
 
@@ -12,14 +10,14 @@
     background-color: rgba(255,255,255,0.7);
   }
   .navbar{
-    font-size: xx-large;
+    font-size: 24px;
+    font-weight: 400;
   }
 }
 @media screen and (max-width: 992px) {
   .navbar-toggler-icon {
     background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E");
   }
-
 }
 
 .navbar-logo{

diff --git a/client/src/app/view/partical/navbar/navbar.component.html b/client/src/app/view/partical/navbar/navbar.component.html
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-light navbar-toggleable-sm  navbar-expand-lg">
+<nav class="navbar navbar-light navbar-toggleable-md  navbar-expand-lg py-0">
   <a class="navbar-brand" routerLink="/"><img src="/assets/img/starsea.png" class="navbar-logo" alt="Logo"></a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>