wip(elections): route updates to elections and events archives

* updated the route to Events Archives from 'event-archive' to
  'events/archives'
* enabled the 'upcoming' and 'speeches' navbar entries

Author: jbriones1

src/app/app.routes.ts

@@ -1,6 +1,19 @@
 import { Routes } from '@angular/router';
 import { HomeComponent } from 'pages/home/home.component';
 
+export enum SiteRoute {
+  ReadMe = '/readme',
+  Officers = '/officers',
+  Committees = '/committees',
+  Affiliates = '/affiliates',
+  CommonRoom = '/common-room',
+  Events = '/events',
+  EventsArchives = '/events/archives',
+  Elections = '/elections',
+  ElectionsUpcoming = '/elections/upcoming',
+  ElectionsSpeeches = '/elections/speeches'
+}
+
 /**
  * Formats the title on the web browser's tab/window.
  * @param pageTitle - Title of the page
@@ -66,7 +79,7 @@ export const routes: Routes = [
     }
   },
   {
-    path: 'events/archive',
+    path: 'events/archives',
     loadComponent: () =>
       import('pages/event-archives/event-archives.component').then(m => m.EventArchivesComponent),
     title: makeTitle('Event Archives'),

src/app/components/nav-bar/nav-bar.component.html

@@ -37,17 +37,18 @@ <h1 class="navbar__heading">SFU CSSS</h1>
                 [routerLinkActiveOptions]="{ exact: true }"
               >
                 @if (subItem.route) {
+                  <!-- For routes on the site -->
                   <a
                     class="nav-entry"
                     (click)="navigate(subItem)"
                     [routerLink]="subItem.route"
                     [class.clickable]="!subItem.isDisabled"
-                    routerLinkActive="active"
                   >
                     <fa-icon class="nav-entry__icon" [icon]="subItem.icon" [fixedWidth]="true" />
                     <span>{{ subItem.label }}</span>
                   </a>
                 } @else {
+                  <!-- For external links -->
                   <a class="nav-entry clickable" [href]="subItem.href" target="_blank">
                     <fa-icon class="nav-entry__icon" [icon]="subItem.icon" [fixedWidth]="true" />
                     <span>{{ subItem.label }}</span>

src/app/components/nav-bar/nav-entries.ts

@@ -4,9 +4,9 @@ import {
   faBook,
   faChevronRight,
   faFile,
-  faRoadBarrier,
   faUpRightFromSquare
 } from '@fortawesome/free-solid-svg-icons';
+import { SiteRoute } from 'app/app.routes';
 import { EXTERNAL_LINKS } from 'components/url/links.data';
 
 export interface NavItem extends CodeListItem<NavItem> {
@@ -27,31 +27,31 @@ export const NAVBAR_ENTRIES: NavItem[] = [
         key: 'readme',
         label: 'README',
         icon: faFile,
-        route: '/readme'
+        route: SiteRoute.ReadMe
       },
       {
         key: 'officers',
         label: 'Officers',
         icon: faFile,
-        route: '/officers'
+        route: SiteRoute.Officers
       },
       {
         key: 'committees',
         label: 'Committees',
         icon: faFile,
-        route: '/committees'
+        route: SiteRoute.Committees
       },
       {
         key: 'common-room',
         label: 'Common Room',
         icon: faFile,
-        route: '/common-room'
+        route: SiteRoute.CommonRoom
       },
       {
         key: 'affiliates',
         label: 'Affiliates',
         icon: faFile,
-        route: '/affiliates'
+        route: SiteRoute.Affiliates
       }
     ]
   },
@@ -65,7 +65,7 @@ export const NAVBAR_ENTRIES: NavItem[] = [
         key: 'events.about',
         label: 'About',
         icon: faFile,
-        route: '/events'
+        route: SiteRoute.Events
       },
       {
         key: 'events.tech-fair',
@@ -95,7 +95,7 @@ export const NAVBAR_ENTRIES: NavItem[] = [
         key: 'events.archives',
         label: 'Archives',
         icon: faBook,
-        route: '/event-archives'
+        route: SiteRoute.EventsArchives
       }
     ]
   },
@@ -109,21 +109,19 @@ export const NAVBAR_ENTRIES: NavItem[] = [
         key: 'elections.about',
         label: 'About',
         icon: faFile,
-        route: '/elections'
+        route: SiteRoute.Elections
       },
       {
         key: 'elections.upcoming',
         label: 'Upcoming',
-        icon: faRoadBarrier,
-        route: '/upcoming-elections',
-        isDisabled: true
+        icon: faFile,
+        route: SiteRoute.ElectionsUpcoming
       },
       {
         key: 'elections.speeches',
         label: 'Speeches',
-        icon: faRoadBarrier,
-        route: '/speeches',
-        isDisabled: true
+        icon: faFile,
+        route: SiteRoute.ElectionsSpeeches
       }
     ]
   },

src/app/services/application/applications.ts

@@ -1,3 +1,5 @@
+import { SiteRoute } from 'app/app.routes';
+
 /**
  * Interface representing an Application that is registered to run.
  * Each application will be run in an activity.
@@ -23,14 +25,14 @@ export interface AppInfo {
   /**
    * The key of the application.
    * This should be unique to each activity.
-   * Routes should be in the form `/<activity>/<application>` or `/<application>` to successfully launch apps.
    */
   key: string;
 
   /**
    * Route to access the application.
+   * Routes should be in the form `/<activity>/<application>` or `/<application>` to successfully launch apps.
    */
-  route: string;
+  route: SiteRoute;
 }
 
 /**
@@ -44,7 +46,7 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
       label: 'README',
       activityKey: '',
       key: 'readme',
-      route: '/readme'
+      route: SiteRoute.ReadMe
     }
   ],
   [
@@ -54,7 +56,7 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
       label: 'Officers',
       activityKey: '',
       key: 'officers',
-      route: '/officers'
+      route: SiteRoute.Officers
     }
   ],
   [
@@ -64,7 +66,7 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
       label: 'Committees',
       activityKey: '',
       key: 'committees',
-      route: '/committees'
+      route: SiteRoute.Committees
     }
   ],
   [
@@ -74,7 +76,7 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
       label: 'Affiliates',
       activityKey: '',
       key: 'affiliates',
-      route: '/affiliates'
+      route: SiteRoute.Affiliates
     }
   ],
   [
@@ -84,7 +86,7 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
       label: 'Common Room',
       activityKey: '',
       key: 'common-room',
-      route: '/common-room'
+      route: SiteRoute.CommonRoom
     }
   ],
   [
@@ -94,17 +96,17 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
       label: 'Events',
       activityKey: '',
       key: 'events',
-      route: '/events'
+      route: SiteRoute.Events
     }
   ],
   [
     6,
     {
       id: 6,
-      label: 'Event Archives',
+      label: 'Events Archives',
       activityKey: '',
       key: 'event-archives',
-      route: '/event-archives'
+      route: SiteRoute.EventsArchives
     }
   ],
   [
@@ -114,7 +116,27 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
       label: 'Elections',
       activityKey: '',
       key: 'elections',
-      route: '/elections'
+      route: SiteRoute.Elections
+    }
+  ],
+  [
+    8,
+    {
+      id: 8,
+      label: 'Upcoming',
+      activityKey: '',
+      key: 'elections-upcoming',
+      route: SiteRoute.ElectionsUpcoming
+    }
+  ],
+  [
+    9,
+    {
+      id: 9,
+      label: 'Speeches',
+      activityKey: '',
+      key: 'elections-speeches',
+      route: SiteRoute.ElectionsSpeeches
     }
   ]
 ]);