diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index dac2f324..68e85738 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -103,7 +103,7 @@ export const routes: Routes = [ import('pages/elections/upcoming/elections-schedule.component').then( m => m.ElectionsScheduleComponent ), - title: makeTitle('Elections'), + title: makeTitle('Election Schedule'), data: { description: 'View upcoming, current, and past elections.' } @@ -114,7 +114,7 @@ export const routes: Routes = [ import('./pages/elections/election-speeches/election-speeches.component').then( m => m.ElectionSpeechesComponent ), - title: makeTitle('Elections'), + title: makeTitle('Speeches'), data: { description: 'Learn more about the candidates who want to make our society a better place.' } diff --git a/src/app/pages/elections/upcoming/elections-schedule.component.html b/src/app/pages/elections/upcoming/elections-schedule.component.html index 7c684f64..79a80e54 100644 --- a/src/app/pages/elections/upcoming/elections-schedule.component.html +++ b/src/app/pages/elections/upcoming/elections-schedule.component.html @@ -10,7 +10,7 @@

Scheduled

Director of Multi-Media


-

Nominations End: December 7th, 2025

+

Nominations Deadline: December 7th, 2025

Election Day: December 13th, 2025

Duties

+
+
+ +
diff --git a/src/app/pages/elections/upcoming/elections-schedule.component.ts b/src/app/pages/elections/upcoming/elections-schedule.component.ts index 611ce462..163e9a56 100644 --- a/src/app/pages/elections/upcoming/elections-schedule.component.ts +++ b/src/app/pages/elections/upcoming/elections-schedule.component.ts @@ -1,13 +1,22 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; +import { Router } from '@angular/router'; import { ArticleComponent } from '@csss-code/article/article.component'; +import { ButtonComponent } from '@csss-code/button/button.component'; +import { SiteRoute } from 'app/app.routes'; @Component({ selector: 'cs-upcoming', - imports: [ArticleComponent], + imports: [ArticleComponent, ButtonComponent], templateUrl: './elections-schedule.component.html', styleUrl: './elections-schedule.component.scss', changeDetection: ChangeDetectionStrategy.OnPush }) // FIXME: Make this dynamic -// eslint-disable-next-line @typescript-eslint/no-extraneous-class -export class ElectionsScheduleComponent {} +export class ElectionsScheduleComponent { + private router = inject(Router); + + navigate(): void { + console.log(SiteRoute.ElectionsSpeeches); + this.router.navigate([SiteRoute.ElectionsSpeeches]); + } +} diff --git a/src/app/pages/home/home.component.scss b/src/app/pages/home/home.component.scss index b8f9e0ef..09daa8f6 100644 --- a/src/app/pages/home/home.component.scss +++ b/src/app/pages/home/home.component.scss @@ -16,6 +16,10 @@ h2 { font-size: 1.5rem; } + + code-button { + color: white; + } } @keyframes pulse { diff --git a/src/app/services/application/applications.ts b/src/app/services/application/applications.ts index 9106c109..39cabad1 100644 --- a/src/app/services/application/applications.ts +++ b/src/app/services/application/applications.ts @@ -123,9 +123,9 @@ export const routeApplicationMap: Map = new Map([ 8, { id: 8, - label: 'Upcoming', + label: 'Schedule', activityKey: '', - key: 'elections-upcoming', + key: 'elections-schedule', route: SiteRoute.ElectionsSchedule } ], diff --git a/src/ui/csss-code/button/button.component.scss b/src/ui/csss-code/button/button.component.scss index dc43372c..cfae922c 100644 --- a/src/ui/csss-code/button/button.component.scss +++ b/src/ui/csss-code/button/button.component.scss @@ -1,20 +1,14 @@ -@use 'theme'; @use 'globals' as g; button { @include g.no-select; - --border-cfg: 1px solid #adadad; - border-top: var(--border-cfg); - border-left: var(--border-cfg); - border-right: var(--border-cfg); - border-radius: 5px; - padding: 1rem; + padding: 0.5rem; background-color: #111111; transition: transform 0.1s ease; &:hover { - background-color: #222222; + background-color: g.$accent2; } &:active {