rework comp. and clean up routing

ssysm · Feb 8, 2018 · a5bca80 · a5bca80
1 parent b02bd26
commit a5bca80
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "starrysea-client",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
@@ -95,7 +95,7 @@ const routes: Routes = [
   },
   {
     path:'**',
-    component:NotFoundComponent
+    redirectTo:'/404'
   }
 ];
 

diff --git a/client/src/app/view/about/about.component.html b/client/src/app/view/about/about.component.html
@@ -32,8 +32,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.5</span></p>
-        <p style="display: inline">Back-End: <span class="badge badge-success">v1.0.5</span></p>
+        <p style="display: inline">Front-End: <span class="badge badge-success">v1.0.6</span></p>
+        <p style="display: inline">Back-End: <span class="badge badge-success">v1.0.6</span></p>
         <p>Latest Commit: <span class="badge badge-info">{{commit}}</span></p>
       </div>
     </div>

diff --git a/client/src/app/view/activity/activity.component.html b/client/src/app/view/activity/activity.component.html
@@ -18,4 +18,3 @@ <h2 class="h1">Activities</h2>
     </div>
   </div>
 </div>
-<router-outlet></router-outlet>
diff --git a/client/src/app/view/home/home.component.html b/client/src/app/view/home/home.component.html
@@ -19,4 +19,3 @@ <h2 class="lead  text-center title2">Dedicated to delivering the best of LoveLiv
     <a routerLink="/about" class="btn btn-info btn-lg text-right" role="button">About us</a>
   </p>
 </div>
-<router-outlet></router-outlet>
diff --git a/client/src/app/view/home/home.component.ts b/client/src/app/view/home/home.component.ts
@@ -17,7 +17,7 @@ export class HomeComponent implements OnInit {
     this.titleService.setTitle('Starry Sea Volunteers Association');
     this.metaService.updateTag({content:'/assets/icons/starrysea-512x512.png'}, "property='og:image'");
     this.metaService.updateTag({content: 'Starry Sea Volunteers Association'}, "property='og:title'");
-    this.metaService.updateTag({content: ''}, "property='og:description'");
+    this.metaService.updateTag({content: 'We Are Starry Sea Volunteers Association'}, "property='og:description'");
     this.metaService.updateTag({content: 'We Are Starry Sea Volunteers Association'}, "name='description'");
   }
 

diff --git a/client/src/app/view/work/work.component.ts b/client/src/app/view/work/work.component.ts
@@ -23,9 +23,9 @@ export class WorkComponent implements OnInit {
     this.titleService.setTitle('Works Gallery - Starry Sea Volunteers Association');
     this.metaService.updateTag({content:'/assets/icons/starrysea-512x512.png'}, "property='og:image'");
     this.metaService.updateTag({content: 'Work Gallery - Starry Sea Volunteers Association'}, "property='og:title'");
-    this.metaService.updateTag({content: 'We Are Starry Sea Volunteers Association'}, "property='og:description'");
-    this.metaService.updateTag({content: 'We Are Starry Sea Volunteers Association'}, "name='description'");
-    this.workService.fetchWorkList(1,10)
+    this.metaService.updateTag({content: 'All Works from Starry Sea'}, "property='og:description'");
+    this.metaService.updateTag({content: 'All Works from Starry Sea'}, "name='description'");
+    this.workService.fetchWorkList(1,99)
       .subscribe(data=>{
         this.workArr = data.json().response
       })