diff --git a/public/images/affiliates/alumni.png b/public/images/affiliates/alumni.png new file mode 100644 index 00000000..cc13316d Binary files /dev/null and b/public/images/affiliates/alumni.png differ diff --git a/public/images/affiliates/competitive-programming.png b/public/images/affiliates/competitive-programming.png index 09adab54..27518ad3 100644 Binary files a/public/images/affiliates/competitive-programming.png and b/public/images/affiliates/competitive-programming.png differ diff --git a/public/images/affiliates/csga.png b/public/images/affiliates/csga.png new file mode 100644 index 00000000..01051729 Binary files /dev/null and b/public/images/affiliates/csga.png differ diff --git a/public/images/affiliates/dns.png b/public/images/affiliates/dns.png new file mode 100644 index 00000000..84b13ef2 Binary files /dev/null and b/public/images/affiliates/dns.png differ diff --git a/public/images/affiliates/dsss.png b/public/images/affiliates/dsss.png index bf4114c9..ff4a2d68 100644 Binary files a/public/images/affiliates/dsss.png and b/public/images/affiliates/dsss.png differ diff --git a/public/images/affiliates/esss.png b/public/images/affiliates/esss.png index f91f0652..5c9f8c35 100644 Binary files a/public/images/affiliates/esss.png and b/public/images/affiliates/esss.png differ diff --git a/public/images/affiliates/game-dev-club.png b/public/images/affiliates/game-dev-club.png new file mode 100644 index 00000000..d8280baf Binary files /dev/null and b/public/images/affiliates/game-dev-club.png differ diff --git a/public/images/affiliates/msess.png b/public/images/affiliates/msess.png index 677073cd..99abb8e7 100644 Binary files a/public/images/affiliates/msess.png and b/public/images/affiliates/msess.png differ diff --git a/public/images/affiliates/osdev.png b/public/images/affiliates/osdev.png new file mode 100644 index 00000000..b87e2566 Binary files /dev/null and b/public/images/affiliates/osdev.png differ diff --git a/public/images/affiliates/seess.png b/public/images/affiliates/seess.png index e1ce8dd9..be756c11 100644 Binary files a/public/images/affiliates/seess.png and b/public/images/affiliates/seess.png differ diff --git a/public/images/affiliates/surge.png b/public/images/affiliates/surge.png new file mode 100644 index 00000000..bb5c3ea2 Binary files /dev/null and b/public/images/affiliates/surge.png differ diff --git a/public/images/affiliates/sus.png b/public/images/affiliates/sus.png index cb387a0a..66ee5744 100644 Binary files a/public/images/affiliates/sus.png and b/public/images/affiliates/sus.png differ diff --git a/public/images/affiliates/wie.png b/public/images/affiliates/wie.png index b9c8e60a..9190595f 100644 Binary files a/public/images/affiliates/wie.png and b/public/images/affiliates/wie.png differ diff --git a/src/app/components/url/email-link/email-link.component.spec.ts b/src/app/components/url/email-link/email-link.component.spec.ts index 8d5f8d5b..dacc9c35 100644 --- a/src/app/components/url/email-link/email-link.component.spec.ts +++ b/src/app/components/url/email-link/email-link.component.spec.ts @@ -9,8 +9,7 @@ describe('EmailLinkComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [EmailLinkComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(EmailLinkComponent); component = fixture.componentInstance; diff --git a/src/app/components/url/route-link/route-link.component.spec.ts b/src/app/components/url/route-link/route-link.component.spec.ts index 71034fa3..1c512b23 100644 --- a/src/app/components/url/route-link/route-link.component.spec.ts +++ b/src/app/components/url/route-link/route-link.component.spec.ts @@ -9,8 +9,7 @@ describe('RouteLinkComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [RouteLinkComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(RouteLinkComponent); component = fixture.componentInstance; diff --git a/src/app/pages/affiliates/affiliates.component.scss b/src/app/pages/affiliates/affiliates.component.scss index 5f9af06b..155c4d68 100644 --- a/src/app/pages/affiliates/affiliates.component.scss +++ b/src/app/pages/affiliates/affiliates.component.scss @@ -34,6 +34,13 @@ code-card { @include g.no-select; top: 0; text-align: center; + + backdrop-filter: brightness(50%); + background-color: transparent; + + > p { + margin: 0; + } } .card-footer { diff --git a/src/app/pages/affiliates/affiliates.ts b/src/app/pages/affiliates/affiliates.ts index f4a1d6e3..28b61818 100644 --- a/src/app/pages/affiliates/affiliates.ts +++ b/src/app/pages/affiliates/affiliates.ts @@ -14,10 +14,27 @@ export interface Affiliate { */ export const AFFILIATES: Affiliate[] = [ // Student Unions + { + label: 'CS Alumni Group', + imgName: 'alumni', + websiteUrl: 'www.sfu.ca/alumni', + discordUrl: 'discord.gg/fZ8xVw3PtN', + fullName: 'Computing Science Alumni Group', + type: 'union' + }, + { + label: 'CSGSA', + imgName: 'csga', + websiteUrl: 'www.sfu.ca/csgsa', + discordUrl: 'discord.gg/DEkf7Bp', + fullName: 'Computing Science Graduate Student Association', + type: 'union' + }, { label: 'DSSS', imgName: 'dsss', - discordUrl: 'https://discord.gg/rcUvvYBUSF', + websiteUrl: 'www.facebook.com/sfudsss', + discordUrl: 'discord.gg/rcUvvYBUSF', fullName: 'Data Science Student Society', type: 'union' }, @@ -25,7 +42,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'ESSS', imgName: 'esss', websiteUrl: 'www.sfu.ca/esss/?page=home', - discordUrl: 'https://discord.gg/7gZGQJ6', + discordUrl: 'discord.gg/7gZGQJ6', fullName: 'Engineering Science Student Society', type: 'union' }, @@ -33,7 +50,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'MSESS', imgName: 'msess', websiteUrl: 'msess.ca', - discordUrl: 'https://discord.gg/zpXtC57', + discordUrl: 'discord.gg/zpXtC57', fullName: 'Mechatronic Systems Engineering Student Society', type: 'union' }, @@ -41,6 +58,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'MSU', imgName: 'msu', websiteUrl: 'sfumsu.github.io', + discordUrl: 'discord.gg/nYXZYNTE4G', fullName: 'Mathematics Student Union', type: 'union' }, @@ -48,6 +66,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'SEESS', imgName: 'seess', websiteUrl: 'seess.ca', + discordUrl: 'discord.gg/w9vpfvHhVY', fullName: 'Sustainable Energy Engineering Student Society', type: 'union' }, @@ -55,7 +74,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'SSSS', imgName: 'ssss', websiteUrl: 'sfussss.org', - discordUrl: 'https://discord.gg/hY7WjXt', + discordUrl: 'discord.gg/hY7WjXt', fullName: 'Software Systems Student Society', type: 'union' }, @@ -63,7 +82,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'SUS', imgName: 'sus', websiteUrl: 'sfususwebmaster.wordpress.com', - discordUrl: 'https://discord.gg/pKPdMjPZTb', + discordUrl: 'discord.gg/pKPdMjPZTb', fullName: 'Science Undergraduate Society', type: 'union' }, @@ -71,6 +90,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'WiCS', imgName: 'wics', websiteUrl: 'www.sfu.ca/computing/wics', + discordUrl: 'discord.gg/gEct3gUKbu', fullName: 'Women in Computing Science', type: 'union' }, @@ -78,6 +98,7 @@ export const AFFILIATES: Affiliate[] = [ label: 'WiE', imgName: 'wie', websiteUrl: 'www.sfu.ca/clubs/wie.html', + discordUrl: 'discord.com/invite/UKf4WupZBC', fullName: 'Women in Engineering', type: 'union' }, @@ -85,9 +106,41 @@ export const AFFILIATES: Affiliate[] = [ { label: 'Competitive Programming', imgName: 'competitive-programming', - websiteUrl: 'https://go.sfss.ca/clubs/857/info', - discordUrl: 'https://discord.gg/2mFZD2F', + websiteUrl: 'go.sfss.ca/clubs/857/info', + discordUrl: 'discord.gg/2mFZD2F', fullName: 'Competitive Programming', type: 'club' + }, + { + label: 'DNS', + imgName: 'dns', + websiteUrl: 'sfudns.co', + discordUrl: 'discord.gg/cWV8PktVXR', + fullName: 'Developers & Systems Club', + type: 'club' + }, + { + label: 'Game Dev Club', + imgName: 'game-dev-club', + websiteUrl: 'sfugamedev.club', + discordUrl: 'discord.gg/7JJDDyX', + fullName: 'Game Developers Club', + type: 'club' + }, + { + label: 'Open Source Dev Club', + imgName: 'osdev', + websiteUrl: 'sfuosdev.com', + discordUrl: 'discord.com/invite/8CSRTyPXJ4', + fullName: 'Open Source Dev Club', + type: 'club' + }, + { + label: 'Surge', + imgName: 'surge', + websiteUrl: 'sfusurge.com/', + discordUrl: 'discord.com/invite/xu7CqKc', + fullName: 'Surge', + type: 'club' } ]; diff --git a/src/app/pages/event-archives/event-archives.component.spec.ts b/src/app/pages/event-archives/event-archives.component.spec.ts index aa5b9eee..c91d9758 100644 --- a/src/app/pages/event-archives/event-archives.component.spec.ts +++ b/src/app/pages/event-archives/event-archives.component.spec.ts @@ -9,8 +9,7 @@ describe('EventsArchiveComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [EventArchivesComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(EventArchivesComponent); component = fixture.componentInstance; diff --git a/src/app/pages/not-found/not-found.component.spec.ts b/src/app/pages/not-found/not-found.component.spec.ts index 5b65d9ea..bd6ffb75 100644 --- a/src/app/pages/not-found/not-found.component.spec.ts +++ b/src/app/pages/not-found/not-found.component.spec.ts @@ -9,8 +9,7 @@ describe('NotFoundComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [NotFoundComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(NotFoundComponent); component = fixture.componentInstance; diff --git a/src/assets/icons/fall-hacks-icon/fall-hacks-icon.component.spec.ts b/src/assets/icons/fall-hacks-icon/fall-hacks-icon.component.spec.ts index 0ba72262..368b29d7 100644 --- a/src/assets/icons/fall-hacks-icon/fall-hacks-icon.component.spec.ts +++ b/src/assets/icons/fall-hacks-icon/fall-hacks-icon.component.spec.ts @@ -9,8 +9,7 @@ describe('FallHacksIconComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [FallHacksIconComponent] - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(FallHacksIconComponent); component = fixture.componentInstance;