diff --git a/client/package.json b/client/package.json index 560a240..f8f9943 100644 --- 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 index c6d0198..a93e950 100644 --- 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 index 6b7f9aa..3f3c59f 100644 --- a/client/src/app/view/about/about.component.html +++ b/client/src/app/view/about/about.component.html @@ -32,8 +32,8 @@

About Us

Latest System Releases: {{Version}}

-

Front-End: v1.0.5

-

Back-End: v1.0.5

+

Front-End: v1.0.6

+

Back-End: v1.0.6

Latest Commit: {{commit}}

diff --git a/client/src/app/view/about/about.component.ts b/client/src/app/view/about/about.component.ts index 3c2bba3..93471ee 100644 --- a/client/src/app/view/about/about.component.ts +++ b/client/src/app/view/about/about.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import {VersionService} from "../../service/version.service"; +import {Meta,Title} from "@angular/platform-browser"; @Component({ selector: 'app-about', @@ -9,12 +10,19 @@ import {VersionService} from "../../service/version.service"; export class AboutComponent implements OnInit { constructor( - private versionService:VersionService + private versionService:VersionService, + private titleService:Title, + private metaService:Meta ) { } commit:any; Version:string; ngOnInit() { + this.titleService.setTitle('About Us - Starry Sea Volunteers Association'); + this.metaService.updateTag({content:'/assets/icons/starrysea-512x512.png'}, "property='og:image'"); + this.metaService.updateTag({content: 'About Us - Starry Sea Volunteers Association'}, "property='og:title'"); + this.metaService.updateTag({content: 'About Starry Sea Volunteers Association'}, "property='og:description'"); + this.metaService.updateTag({content: 'About Starry Sea Volunteers Association'}, "name='description'"); this.versionService.getLatestCommit() .subscribe(data=>{ if(data.json().success){ diff --git a/client/src/app/view/activity-detail/activity-detail.component.ts b/client/src/app/view/activity-detail/activity-detail.component.ts index 6143f99..a8000da 100644 --- a/client/src/app/view/activity-detail/activity-detail.component.ts +++ b/client/src/app/view/activity-detail/activity-detail.component.ts @@ -3,6 +3,7 @@ import {ActivityService} from "../../service/activity.service"; import {ActivatedRoute, Router} from "@angular/router"; import {FundingService} from "../../service/funding.service"; import {environment} from "../../../environments/environment"; +import {Meta, Title} from "@angular/platform-browser"; @Component({ selector: 'app-activity-detail', @@ -16,6 +17,8 @@ export class ActivityDetailComponent implements OnInit { private fundingService:FundingService, private route:ActivatedRoute, private router:Router, + private metaService:Meta, + private titleService:Title ) { } activityId:string; @@ -30,6 +33,11 @@ export class ActivityDetailComponent implements OnInit { if(data.json().success){ this.activityData = data.json().response; this.content = data.json().response.content.replace(/\n/g, "
"); + this.titleService.setTitle(data.json().response.name+' - Starry Sea Volunteers Association'); + this.metaService.updateTag({content: environment.apiBase+'/static/activity/'+data.json().response.cover}, "property='og:image'"); + this.metaService.updateTag({content: data.json().response.name+' - Starry Sea Volunteers Association'}, "property='og:title'"); + this.metaService.updateTag({content: data.json().response.summary}, "property='og:description'"); + this.metaService.updateTag({content: data.json().response.summary}, "name='description'"); this.fundingService.fetchFundingList(this.activityId) .subscribe(funding=>{ this.fundArr = funding.json().response.record; diff --git a/client/src/app/view/activity/activity.component.html b/client/src/app/view/activity/activity.component.html index 800cc8a..1b8f439 100644 --- a/client/src/app/view/activity/activity.component.html +++ b/client/src/app/view/activity/activity.component.html @@ -18,4 +18,3 @@

Activities

- diff --git a/client/src/app/view/activity/activity.component.ts b/client/src/app/view/activity/activity.component.ts index 3798500..9c22639 100644 --- a/client/src/app/view/activity/activity.component.ts +++ b/client/src/app/view/activity/activity.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import {ActivityService} from "../../service/activity.service"; import {environment} from "../../../environments/environment"; +import {Meta, Title} from "@angular/platform-browser"; @Component({ selector: 'app-activity', @@ -10,12 +11,19 @@ import {environment} from "../../../environments/environment"; export class ActivityComponent implements OnInit { constructor( - private activityService:ActivityService + private activityService:ActivityService, + private metaService:Meta, + private titleService:Title ) { } activityArr:Array; apiBase:string = environment.apiBase; ngOnInit() { + this.titleService.setTitle('Activities - Starry Sea Volunteers Association'); + this.metaService.updateTag({content:'/assets/icons/starrysea-512x512.png'}, "property='og:image'"); + this.metaService.updateTag({content: 'Activities - Starry Sea Volunteers Association'}, "property='og:title'"); + this.metaService.updateTag({content: 'All Activities from Starry Sea'}, "property='og:description'"); + this.metaService.updateTag({content: 'All Activities from Starry Sea'}, "name='description'"); this.activityService.fetchActivityList(1,99) .subscribe(data=>{ this.activityArr = data.json().response diff --git a/client/src/app/view/home/home.component.html b/client/src/app/view/home/home.component.html index 73aa815..e20f90a 100644 --- a/client/src/app/view/home/home.component.html +++ b/client/src/app/view/home/home.component.html @@ -19,4 +19,3 @@

Dedicated to delivering the best of LoveLiv About us

- diff --git a/client/src/app/view/home/home.component.ts b/client/src/app/view/home/home.component.ts index 33fd770..618d39e 100644 --- a/client/src/app/view/home/home.component.ts +++ b/client/src/app/view/home/home.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import {Meta, Title} from "@angular/platform-browser"; @Component({ selector: 'app-home', @@ -7,9 +8,17 @@ import { Component, OnInit } from '@angular/core'; }) export class HomeComponent implements OnInit { - constructor() { } + constructor( + private titleService:Title, + private metaService:Meta + ) { } ngOnInit() { + 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: '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/qa/qa.component.ts b/client/src/app/view/qa/qa.component.ts index ee31ab3..78f7265 100644 --- a/client/src/app/view/qa/qa.component.ts +++ b/client/src/app/view/qa/qa.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import {QaService} from "../../service/qa.service"; +import {Meta, Title} from "@angular/platform-browser"; declare var swal:any; @Component({ selector: 'app-qa', @@ -9,7 +10,9 @@ declare var swal:any; export class QaComponent implements OnInit { constructor( - private qaService:QaService + private qaService:QaService, + private titleService:Title, + private metaService:Meta ) { } QaList:Array; @@ -19,6 +22,11 @@ export class QaComponent implements OnInit { .subscribe(data=>{ this.QaList = data.json().response; }) + this.titleService.setTitle('Question & Answer - Starry Sea Volunteers Association'); + this.metaService.updateTag({content:'/assets/icons/starrysea-512x512.png'}, "property='og:image'"); + this.metaService.updateTag({content: 'Question & Answer - Starry Sea Volunteers Association'}, "property='og:title'"); + this.metaService.updateTag({content: 'Question & Answer from Starry Sea'}, "property='og:description'"); + this.metaService.updateTag({content: 'Question & Answer from Starry Sea'}, "name='description'"); } askQuestion() { diff --git a/client/src/app/view/work-detail/work-detail.component.ts b/client/src/app/view/work-detail/work-detail.component.ts index 2594aae..f42968b 100644 --- a/client/src/app/view/work-detail/work-detail.component.ts +++ b/client/src/app/view/work-detail/work-detail.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import {WorkService} from "../../service/work.service"; import {ActivatedRoute, Router} from "@angular/router"; import {environment} from "../../../environments/environment"; +import {Meta, Title} from "@angular/platform-browser"; @Component({ selector: 'app-work-detail', @@ -13,7 +14,9 @@ export class WorkDetailComponent implements OnInit { constructor( private workService:WorkService, private route:ActivatedRoute, - private router:Router + private router:Router, + private titleService:Title, + private metaService:Meta ) { } workId:string; @@ -26,6 +29,11 @@ export class WorkDetailComponent implements OnInit { .subscribe(data=>{ if(data.json().success){ this.workData = data.json().response; + this.titleService.setTitle(data.json().response.name+' - Starry Sea Volunteers Association'); + this.metaService.updateTag({content: environment.apiBase+'/static/work/'+data.json().response.file.cover}, "property='og:image'"); + this.metaService.updateTag({content: data.json().response.name+' - Starry Sea Volunteers Association'}, "property='og:title'"); + this.metaService.updateTag({content: data.json().response.summary}, "property='og:description'"); + this.metaService.updateTag({content: data.json().response.summary}, "name='description'"); }else{ this.router.navigate(['/','404']) } diff --git a/client/src/app/view/work/work.component.html b/client/src/app/view/work/work.component.html index 61861ab..9d6e045 100644 --- a/client/src/app/view/work/work.component.html +++ b/client/src/app/view/work/work.component.html @@ -1,6 +1,6 @@
-

Works Galley

+

Works Gallery

@@ -18,4 +18,3 @@

Works Galley

- diff --git a/client/src/app/view/work/work.component.ts b/client/src/app/view/work/work.component.ts index f9449b7..0436021 100644 --- a/client/src/app/view/work/work.component.ts +++ b/client/src/app/view/work/work.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import {WorkService} from "../../service/work.service"; import {environment} from "../../../environments/environment"; +import {Meta, Title} from "@angular/platform-browser"; @Component({ selector: 'app-work', @@ -10,14 +11,21 @@ import {environment} from "../../../environments/environment"; export class WorkComponent implements OnInit { constructor( - private workService:WorkService + private workService:WorkService, + private titleService:Title, + private metaService:Meta ) { } workArr: Array; apiBase: string = environment.apiBase; ngOnInit() { - this.workService.fetchWorkList(1,10) + 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: '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 }) diff --git a/client/src/index.html b/client/src/index.html index a391f9b..b011bca 100644 --- a/client/src/index.html +++ b/client/src/index.html @@ -7,13 +7,18 @@ Starry Sea Volunteers Association - + - + + + + - + + + @@ -25,7 +30,7 @@ - +