Skip to content

merge production back with development #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
condyl merged 12 commits into from
Mar 7, 2026
Merged

merge production back with development #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d2d87d
Merge pull request #184 from BrockCSC/development
AlaqmarG Oct 8, 2025
0f7d7f8
content: remove icpc from links page
condyl Oct 24, 2025
dc52865
Merge pull request #185 from BrockCSC/remove-icpc-from-links
condyl Oct 24, 2025
83a96a3
Add Merch link to navigation component
Turband Nov 25, 2025
49e868e
Add isExternal property to CS Guide navigation item
Turband Nov 25, 2025
b62f1eb
Remove isExternal from CS Guide navigation item
Turband Nov 25, 2025
2b09a00
Merge pull request #194 from BrockCSC/feat/add-merch-to-nav
AlaqmarG Nov 25, 2025
f834213
Remove BUSU mentions
jayshah2005 Dec 1, 2025
3f4432a
fix: remove commented-out BUSU icon styles from footer component SCSS
condyl Dec 2, 2025
f1bc36a
Merge pull request #196 from BrockCSC/remove_busu_mentions
jayshah2005 Dec 2, 2025
83ae103
chore: remove merch from navbar (merch sales closed)
condyl Mar 7, 2026
bff7c59
Merge pull request #197 from BrockCSC/cb/remove-merch-nav
condyl Mar 7, 2026
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
116 changes: 69 additions & 47 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/app/core/footer/footer.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
[height]="imageSize"
[style.width.px]="imageSize"
[style.height.px]="imageSize"
[class]="link.desc === 'BUSU' ? 'busu-icon' : ''"
></csc-img>
</a>
<a [href]="link.href" class="csc-social-desc">{{ link.desc }}</a>
Expand Down
4 changes: 0 additions & 4 deletions src/app/core/footer/footer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
justify-content: center;
}

::ng-deep .busu-icon img {
border-radius: 15%;
}

&:last-child {
margin-right: 0%;
}
Expand Down
5 changes: 0 additions & 5 deletions src/app/core/footer/footer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ export class FooterComponent implements OnInit, OnDestroy {
href: 'https://instagram.com/brockcsc',
desc: 'Instagram',
},
{
src: `${base}/busu.jpeg`,
href: 'https://www.brockbusu.ca/organisation/8492/',
desc: 'BUSU',
},
{
src: `${base}/discord.svg`,
href: DISCORD_LINK,
Expand Down
6 changes: 4 additions & 2 deletions src/app/core/nav/nav.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ export class NavComponent implements OnInit {
href: '/events',
desc: 'Events',
},
// {
// href: '/merch',

//{
// href: 'https://merch.brockcsc.ca',
// desc: 'Merch',
// isExternal: true,
// },
// {
// href: '/services',
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2 class="csc-header">Events</h2>
<h2 class="csc-header">About us</h2>
<div class="row">
<div class="col-8 col-m-12">
<p>We are the Brock Computer Science Club, a BUSU ratified club.</p>
<p>We are the Brock Computer Science Club.</p>
<p>
Our goal is to provide a community for all individuals who are
interested in Computer Science at Brock University.
Expand Down
19 changes: 0 additions & 19 deletions src/app/views/links/links.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ <h1>Our Links</h1>
</div>

<div class="links-list">
<button
class="link-button"
(click)="openLink('https://brockcsc.ca/events/-Oa1cJ_JZxT1FeYCp3uy')"
>
<img src="assets/icons/icpc.png" alt="ICPC Logo" class="icon" />
<span>ICPC Qualifiers Registration</span>
</button>
<button
class="link-button"
(click)="openLink('https://discord.gg/qsctEK2')"
Expand All @@ -20,18 +13,6 @@ <h1>Our Links</h1>
<span>Join our Discord</span>
</button>

<button
class="link-button"
(click)="openLink('https://www.brockbusu.ca/organisation/8492/')"
>
<img
src="assets/icons/busu.jpeg"
alt="BUSU icon"
class="icon rounded-icon"
/>
<span>BUSU Club Page</span>
</button>

<button
class="link-button"
(click)="openLink('https://experiencebu.brocku.ca/organization/brockcsc')"
Expand Down