Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
}
Expand All @@ -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.'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2>Scheduled</h2>
<div class="post">
<h2 class="post__title">Director of Multi-Media</h2>
<br />
<p><strong>Nominations End: </strong>December 7th, 2025</p>
<p><strong>Nominations Deadline: </strong>December 7th, 2025</p>
<p><strong>Election Day: </strong>December 13th, 2025</p>
<h3 class="post__title">Duties</h3>
<ul class="post__list">
Expand All @@ -20,6 +20,10 @@ <h3 class="post__title">Duties</h3>
</li>
<li>Sit on committees as necessary, or upon request.</li>
</ul>
<hr />
<div class="post__footer">
<code-button label="Speeches" (click)="navigate()"></code-button>
</div>
</div>
</section>
</header>
Expand Down
17 changes: 13 additions & 4 deletions src/app/pages/elections/upcoming/elections-schedule.component.ts
Original file line number Diff line number Diff line change
@@ -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]);
}
}
4 changes: 4 additions & 0 deletions src/app/pages/home/home.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
h2 {
font-size: 1.5rem;
}

code-button {
color: white;
}
}

@keyframes pulse {
Expand Down
4 changes: 2 additions & 2 deletions src/app/services/application/applications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ export const routeApplicationMap: Map<number, AppInfo> = new Map([
8,
{
id: 8,
label: 'Upcoming',
label: 'Schedule',
activityKey: '',
key: 'elections-upcoming',
key: 'elections-schedule',
route: SiteRoute.ElectionsSchedule
}
],
Expand Down
10 changes: 2 additions & 8 deletions src/ui/csss-code/button/button.component.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down