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
Binary file added public/images/affiliates/alumni.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/affiliates/competitive-programming.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/affiliates/csga.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/affiliates/dns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/affiliates/dsss.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/affiliates/esss.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/affiliates/game-dev-club.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/affiliates/msess.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/affiliates/osdev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/affiliates/seess.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/affiliates/surge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/affiliates/sus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/affiliates/wie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ describe('EmailLinkComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [EmailLinkComponent]
})
.compileComponents();
}).compileComponents();

fixture = TestBed.createComponent(EmailLinkComponent);
component = fixture.componentInstance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ describe('RouteLinkComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [RouteLinkComponent]
})
.compileComponents();
}).compileComponents();

fixture = TestBed.createComponent(RouteLinkComponent);
component = fixture.componentInstance;
Expand Down
7 changes: 7 additions & 0 deletions src/app/pages/affiliates/affiliates.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
67 changes: 60 additions & 7 deletions src/app/pages/affiliates/affiliates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,80 +14,133 @@ 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'
},
{
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'
},
{
label: 'MSESS',
imgName: 'msess',
websiteUrl: 'msess.ca',
discordUrl: 'https://discord.gg/zpXtC57',
discordUrl: 'discord.gg/zpXtC57',
fullName: 'Mechatronic Systems Engineering Student Society',
type: 'union'
},
{
label: 'MSU',
imgName: 'msu',
websiteUrl: 'sfumsu.github.io',
discordUrl: 'discord.gg/nYXZYNTE4G',
fullName: 'Mathematics Student Union',
type: 'union'
},
{
label: 'SEESS',
imgName: 'seess',
websiteUrl: 'seess.ca',
discordUrl: 'discord.gg/w9vpfvHhVY',
fullName: 'Sustainable Energy Engineering Student Society',
type: 'union'
},
{
label: 'SSSS',
imgName: 'ssss',
websiteUrl: 'sfussss.org',
discordUrl: 'https://discord.gg/hY7WjXt',
discordUrl: 'discord.gg/hY7WjXt',
fullName: 'Software Systems Student Society',
type: 'union'
},
{
label: 'SUS',
imgName: 'sus',
websiteUrl: 'sfususwebmaster.wordpress.com',
discordUrl: 'https://discord.gg/pKPdMjPZTb',
discordUrl: 'discord.gg/pKPdMjPZTb',
fullName: 'Science Undergraduate Society',
type: 'union'
},
{
label: 'WiCS',
imgName: 'wics',
websiteUrl: 'www.sfu.ca/computing/wics',
discordUrl: 'discord.gg/gEct3gUKbu',
fullName: 'Women in Computing Science',
type: 'union'
},
{
label: 'WiE',
imgName: 'wie',
websiteUrl: 'www.sfu.ca/clubs/wie.html',
discordUrl: 'discord.com/invite/UKf4WupZBC',
fullName: 'Women in Engineering',
type: 'union'
},
// Clubs
{
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'
}
];
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ describe('EventsArchiveComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [EventArchivesComponent]
})
.compileComponents();
}).compileComponents();

fixture = TestBed.createComponent(EventArchivesComponent);
component = fixture.componentInstance;
Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/not-found/not-found.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ describe('NotFoundComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [NotFoundComponent]
})
.compileComponents();
}).compileComponents();

fixture = TestBed.createComponent(NotFoundComponent);
component = fixture.componentInstance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ describe('FallHacksIconComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [FallHacksIconComponent]
})
.compileComponents();
}).compileComponents();

fixture = TestBed.createComponent(FallHacksIconComponent);
component = fixture.componentInstance;
Expand Down
Loading