From 65db63017ce308d3670a9b05dbfc09a32dbe51eb Mon Sep 17 00:00:00 2001 From: Jon Andre Briones Date: Fri, 12 Dec 2025 20:55:47 -0800 Subject: [PATCH 1/3] fix(elections): updated labels and tab titles --- src/app/app.routes.ts | 4 ++-- src/app/services/application/applications.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index dac2f32..68e8573 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/services/application/applications.ts b/src/app/services/application/applications.ts index 9106c10..39cabad 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 } ], From d04be193f7a65dada5d8a1c089ed5bb662e1ff89 Mon Sep 17 00:00:00 2001 From: Jon Andre Briones Date: Fri, 12 Dec 2025 21:03:03 -0800 Subject: [PATCH 2/3] fix: updated the styling of code-button * hover colour is now green * padding reduced from 2rem to 1rem * removed borders * no longer rounded --- .../upcoming/elections-schedule.component.html | 6 +++++- .../elections/upcoming/elections-schedule.component.ts | 3 ++- src/app/pages/home/home.component.scss | 4 ++++ src/ui/csss-code/button/button.component.scss | 10 ++-------- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/app/pages/elections/upcoming/elections-schedule.component.html b/src/app/pages/elections/upcoming/elections-schedule.component.html index 7c684f6..b12b18a 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

    @@ -20,6 +20,10 @@

    Duties

  • Sit on committees as necessary, or upon request.
+
+
+ +
diff --git a/src/app/pages/elections/upcoming/elections-schedule.component.ts b/src/app/pages/elections/upcoming/elections-schedule.component.ts index 611ce46..2623015 100644 --- a/src/app/pages/elections/upcoming/elections-schedule.component.ts +++ b/src/app/pages/elections/upcoming/elections-schedule.component.ts @@ -1,9 +1,10 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ArticleComponent } from '@csss-code/article/article.component'; +import { ButtonComponent } from '@csss-code/button/button.component'; @Component({ selector: 'cs-upcoming', - imports: [ArticleComponent], + imports: [ArticleComponent, ButtonComponent], templateUrl: './elections-schedule.component.html', styleUrl: './elections-schedule.component.scss', changeDetection: ChangeDetectionStrategy.OnPush diff --git a/src/app/pages/home/home.component.scss b/src/app/pages/home/home.component.scss index b8f9e0e..09daa8f 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/ui/csss-code/button/button.component.scss b/src/ui/csss-code/button/button.component.scss index dc43372..cfae922 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 { From a67eed96826cd674548dbbdde26c39e72c8c6106 Mon Sep 17 00:00:00 2001 From: Jon Andre Briones Date: Fri, 12 Dec 2025 21:08:03 -0800 Subject: [PATCH 3/3] feat(elections): added a button to jump to speeches from schedule page --- .../upcoming/elections-schedule.component.html | 2 +- .../upcoming/elections-schedule.component.ts | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/pages/elections/upcoming/elections-schedule.component.html b/src/app/pages/elections/upcoming/elections-schedule.component.html index b12b18a..79a80e5 100644 --- a/src/app/pages/elections/upcoming/elections-schedule.component.html +++ b/src/app/pages/elections/upcoming/elections-schedule.component.html @@ -22,7 +22,7 @@

Duties

- +
diff --git a/src/app/pages/elections/upcoming/elections-schedule.component.ts b/src/app/pages/elections/upcoming/elections-schedule.component.ts index 2623015..163e9a5 100644 --- a/src/app/pages/elections/upcoming/elections-schedule.component.ts +++ b/src/app/pages/elections/upcoming/elections-schedule.component.ts @@ -1,6 +1,8 @@ -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', @@ -10,5 +12,11 @@ import { ButtonComponent } from '@csss-code/button/button.component'; 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]); + } +}