diff --git a/public/fonts/fira-code-regular.woff2 b/public/fonts/fira-code-regular.woff2 new file mode 100644 index 00000000..383fa3ab Binary files /dev/null and b/public/fonts/fira-code-regular.woff2 differ diff --git a/public/fonts/inter-regular.woff2 b/public/fonts/inter-regular.woff2 new file mode 100644 index 00000000..f15b025d Binary files /dev/null and b/public/fonts/inter-regular.woff2 differ diff --git a/public/fonts/montserrat-regular.woff2 b/public/fonts/montserrat-regular.woff2 new file mode 100644 index 00000000..6fbeafa9 Binary files /dev/null and b/public/fonts/montserrat-regular.woff2 differ diff --git a/public/static/fonts/DarumadropOne-Regular.ttf b/public/static/fonts/DarumadropOne-Regular.ttf deleted file mode 100644 index 0d924de3..00000000 Binary files a/public/static/fonts/DarumadropOne-Regular.ttf and /dev/null differ diff --git a/public/static/fonts/NotoSansGeorgian-Bold.ttf b/public/static/fonts/NotoSansGeorgian-Bold.ttf deleted file mode 100644 index cc088702..00000000 Binary files a/public/static/fonts/NotoSansGeorgian-Bold.ttf and /dev/null differ diff --git a/public/static/fonts/NotoSansGeorgian-Regular.ttf b/public/static/fonts/NotoSansGeorgian-Regular.ttf deleted file mode 100644 index 49163cc3..00000000 Binary files a/public/static/fonts/NotoSansGeorgian-Regular.ttf and /dev/null differ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 6554cc02..8b2bd13d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,10 +1,12 @@ -import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core'; +import { isPlatformBrowser } from '@angular/common'; +import { ChangeDetectionStrategy, Component, inject, OnInit, PLATFORM_ID } from '@angular/core'; import { Meta } from '@angular/platform-browser'; import { ActivatedRoute, Data, NavigationEnd, Router, RouterOutlet } from '@angular/router'; import { NavBarComponent } from 'components/nav-bar/nav-bar.component'; import { TabBarComponent } from 'components/tab-bar/tab-bar.component'; import { of } from 'rxjs'; import { filter, map, mergeMap } from 'rxjs/operators'; +import { SITE_URL } from 'site'; const DEFAULT_DESCRIPTION = "Site dedicated to and maintained by SFU's Computing Science Student Society"; @@ -20,8 +22,10 @@ export class AppComponent implements OnInit { private router = inject(Router); private route = inject(ActivatedRoute); private metaService = inject(Meta); + private platformId = inject(PLATFORM_ID); ngOnInit(): void { + // Updates the meta description tag and robots tag based on the route's data this.router.events .pipe( filter(event => event instanceof NavigationEnd), @@ -49,6 +53,18 @@ export class AppComponent implements OnInit { name: 'description', content: desc }); + + // Canonical URL + if (isPlatformBrowser(this.platformId)) { + const canonicalLink = `${SITE_URL}${this.router.url}`; + let link = document.querySelector("link[rel='canonical']"); + if (!link) { + link = document.createElement('link'); + link.setAttribute('rel', 'canonical'); + document.head.appendChild(link); + } + link.setAttribute('href', canonicalLink); + } }); } } diff --git a/src/app/components/nav-bar/nav-bar.component.html b/src/app/components/nav-bar/nav-bar.component.html index 0ef44516..3dc9be22 100644 --- a/src/app/components/nav-bar/nav-bar.component.html +++ b/src/app/components/nav-bar/nav-bar.component.html @@ -1,5 +1,5 @@