From e9787aac2730f94cf273afd47e48220f562c8488 Mon Sep 17 00:00:00 2001 From: Karen Yao Date: Sun, 5 Apr 2026 11:09:38 -0700 Subject: [PATCH 1/3] Feature: Update landing page closes #218 feat(home): add discord link to landing page style(home): match button to match rest of website --- src/app/pages/home/home.component.html | 1 + src/app/pages/home/home.component.ts | 6 ++++++ src/ui/csss-code/button/button.component.scss | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 8d094a88..f0b5ded1 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -6,5 +6,6 @@

Computing Science Student Society

Please read and accept the terms of condition below.

diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 99941207..b89956a2 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -2,6 +2,7 @@ import { Component, inject } from '@angular/core'; import { Router } from '@angular/router'; import { ButtonComponent } from '@csss-code/button/button.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { faDiscord } from '@fortawesome/free-brands-svg-icons'; import { faFile, faSquare } from '@fortawesome/free-solid-svg-icons'; import { csssLogo } from 'assets/icons/csss-logo'; import { RainbowDirective } from './directives/rainbow.directive'; @@ -16,10 +17,15 @@ export class HomeComponent { csssIcon = csssLogo; squareIcon = faSquare; fileIcon = faFile; + discordIcon = faDiscord; private router = inject(Router); readmeAction(): void { this.router.navigate(['/readme']); } + + discordAction(): void { + window.open('https://discord.gg/sfucsss', '_blank'); + } } diff --git a/src/ui/csss-code/button/button.component.scss b/src/ui/csss-code/button/button.component.scss index cfae922c..f5e90bc8 100644 --- a/src/ui/csss-code/button/button.component.scss +++ b/src/ui/csss-code/button/button.component.scss @@ -3,7 +3,7 @@ button { @include g.no-select; padding: 0.5rem; - background-color: #111111; + background-color: g.$accent; transition: transform 0.1s ease; From 8dce9beb6a2f9fc90f810c10a5616bccdb42c453 Mon Sep 17 00:00:00 2001 From: Karen Yao Date: Sun, 5 Apr 2026 12:11:00 -0700 Subject: [PATCH 2/3] style(elections): format election test files - fix automated formatter --- .../election-speeches/election-speeches.component.spec.ts | 3 +-- .../elections/upcoming/elections-schedule.component.spec.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/pages/elections/election-speeches/election-speeches.component.spec.ts b/src/app/pages/elections/election-speeches/election-speeches.component.spec.ts index 534b56db..b5c21839 100644 --- a/src/app/pages/elections/election-speeches/election-speeches.component.spec.ts +++ b/src/app/pages/elections/election-speeches/election-speeches.component.spec.ts @@ -9,8 +9,7 @@ describe('ElectionSpeechesComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ElectionSpeechesComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(ElectionSpeechesComponent); component = fixture.componentInstance; diff --git a/src/app/pages/elections/upcoming/elections-schedule.component.spec.ts b/src/app/pages/elections/upcoming/elections-schedule.component.spec.ts index 35825e1d..bb5c1fb1 100644 --- a/src/app/pages/elections/upcoming/elections-schedule.component.spec.ts +++ b/src/app/pages/elections/upcoming/elections-schedule.component.spec.ts @@ -9,8 +9,7 @@ describe('UpcomingComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ElectionsScheduleComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(ElectionsScheduleComponent); component = fixture.componentInstance; From 2506eaa6fe52102dd5994ee390f220a734007867 Mon Sep 17 00:00:00 2001 From: Karen Yao Date: Sun, 5 Apr 2026 19:48:53 -0700 Subject: [PATCH 3/3] fix(button colour): match colour of theme --- src/ui/csss-code/button/button.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/csss-code/button/button.component.scss b/src/ui/csss-code/button/button.component.scss index f5e90bc8..a0ce87e6 100644 --- a/src/ui/csss-code/button/button.component.scss +++ b/src/ui/csss-code/button/button.component.scss @@ -3,12 +3,12 @@ button { @include g.no-select; padding: 0.5rem; - background-color: g.$accent; + background-color: #111111; transition: transform 0.1s ease; &:hover { - background-color: g.$accent2; + background-color: g.$accent; } &:active {