From 0f7d7f88186fab26fdfe99e91946ccceddeed8bf Mon Sep 17 00:00:00 2001
From: condyl <Condyl678@gmail.com>
Date: Fri, 24 Oct 2025 17:04:54 -0400
Subject: [PATCH 1/7] content: remove icpc from links page

---
 src/app/views/links/links.component.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/app/views/links/links.component.html b/src/app/views/links/links.component.html
index d39c79b..bf164e9 100644
--- a/src/app/views/links/links.component.html
+++ b/src/app/views/links/links.component.html
@@ -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')"

From 83a96a3bb4241649a09a2e38a82d1457d85b1824 Mon Sep 17 00:00:00 2001
From: Turband <turband@hotmail.com>
Date: Tue, 25 Nov 2025 04:41:21 +0000
Subject: [PATCH 2/7] Add Merch link to navigation component

---
 src/app/core/nav/nav.component.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/core/nav/nav.component.ts b/src/app/core/nav/nav.component.ts
index 5526c6c..178f0a4 100644
--- a/src/app/core/nav/nav.component.ts
+++ b/src/app/core/nav/nav.component.ts
@@ -48,10 +48,10 @@ export class NavComponent implements OnInit {
       href: '/events',
       desc: 'Events',
     },
-    // {
-    //   href: '/merch',
-    //   desc: 'Merch',
-    // },
+    {
+       href: 'https://merch.brockcsc.ca',
+       desc: 'Merch',
+    },
     // {
     //   href: '/services',
     //   desc: 'Services',

From 49e868ee80fe13e63bfcec37178d5caf0669398c Mon Sep 17 00:00:00 2001
From: Turband <turband@hotmail.com>
Date: Tue, 25 Nov 2025 04:58:19 +0000
Subject: [PATCH 3/7] Add isExternal property to CS Guide navigation item

---
 src/app/core/nav/nav.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/core/nav/nav.component.ts b/src/app/core/nav/nav.component.ts
index 178f0a4..842583f 100644
--- a/src/app/core/nav/nav.component.ts
+++ b/src/app/core/nav/nav.component.ts
@@ -59,6 +59,7 @@ export class NavComponent implements OnInit {
     {
       href: '/guide',
       desc: 'CS Guide',
+      isExternal: true,
     },
     // {
     //   href: '/exec-application',

From b62f1ebec04edd3e8d796a062a449e76a0e910b6 Mon Sep 17 00:00:00 2001
From: Turband <turband@hotmail.com>
Date: Tue, 25 Nov 2025 05:01:17 +0000
Subject: [PATCH 4/7] Remove isExternal from CS Guide navigation item

Removed isExternal property from CS Guide link.
---
 src/app/core/nav/nav.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/nav/nav.component.ts b/src/app/core/nav/nav.component.ts
index 842583f..2a3db0e 100644
--- a/src/app/core/nav/nav.component.ts
+++ b/src/app/core/nav/nav.component.ts
@@ -51,6 +51,7 @@ export class NavComponent implements OnInit {
     {
        href: 'https://merch.brockcsc.ca',
        desc: 'Merch',
+       isExternal: true,
     },
     // {
     //   href: '/services',
@@ -59,7 +60,6 @@ export class NavComponent implements OnInit {
     {
       href: '/guide',
       desc: 'CS Guide',
-      isExternal: true,
     },
     // {
     //   href: '/exec-application',

From f834213eafbcbd2e0e7d4df3430cd67d0a7fe4aa Mon Sep 17 00:00:00 2001
From: jayshah2005 <jayshah3616@gmail.com>
Date: Mon, 1 Dec 2025 18:55:03 -0500
Subject: [PATCH 5/7] Remove BUSU mentions

---
 package-lock.json                         | 116 +++++++++++++---------
 src/app/core/footer/footer.component.html |   1 -
 src/app/core/footer/footer.component.scss |   6 +-
 src/app/core/footer/footer.component.ts   |   5 -
 src/app/views/home/home.component.html    |   2 +-
 src/app/views/links/links.component.html  |  12 ---
 6 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ca9933..c3b4591 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -434,6 +434,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.0.5.tgz",
       "integrity": "sha512-sGtrS0SqkcBvyuv0QkIfyadwPgDhMroz1r51lMh1hwzJaJ0LNuVMLviEeYIybeBnvAdp9YvYC8I1WgB/FUEFBw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ajv": "8.13.0",
         "ajv-formats": "3.0.1",
@@ -527,6 +528,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.0.5.tgz",
       "integrity": "sha512-hZwAq3hwuJzCuh7uqO/7T9IMERhYVxz+ganJlEykpyr58o0IjUM1Q4ZSH5UOYlGRPdBCZJbfiafZ0Sg5w5xBww==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@angular-devkit/core": "18.0.5",
         "jsonc-parser": "3.2.1",
@@ -716,6 +718,7 @@
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.0.4.tgz",
       "integrity": "sha512-xbdtBUvpTGEmVQkCoOad26LBMRy9ddM9pvCidMZBWXiM7NEuc3dfVT99a1cU4MZFiJeiQEvOWQn03iXskbBMGQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1171,6 +1174,7 @@
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.0.4.tgz",
       "integrity": "sha512-7WxZKLzSu5QtyLGrtlZrtUQlP3WfDR++yHr5jF9DJZ3IY35UutwiPCegCcq4Qh5X2xWqnRKGm20TLlKVoj0t5Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1192,6 +1196,7 @@
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.0.4.tgz",
       "integrity": "sha512-OVPXtJo5SkGQUCioCVxKcRfEw48tz8xCtJGDXjVKWtyOkXnmWl8Y/e54mteiJd1KybXHvPLW0LPtWZYB06Qy7g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1213,6 +1218,7 @@
       "integrity": "sha512-pUv664JCZHKHsLDvO8iNjWXVHOB2ggKxVoxiowOMNpR4dqxrK/oOLGkPGltYUW/xF6Eajc7Zs0lK/R5uljoYQg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/core": "7.24.7",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -1297,6 +1303,7 @@
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.0.4.tgz",
       "integrity": "sha512-k0AUZbJc0eyzRexvKlR1sR0qNhe54Om9ln6lRn7y1+gAsg+OwFDyF427fFuzqpZVe/MmpvX3CXWdl0twZAYEiA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1477,6 +1484,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.0.4.tgz",
       "integrity": "sha512-8TJEPzIRV89s1ZP9T+7g9K7PFNfec+4Xyw5BLaTRBOqjXHmMzk+miRx0L18Lr66rp5r2vbNEE9vojMVHQRwhVA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1499,6 +1507,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.0.4.tgz",
       "integrity": "sha512-K36/gamqs8etGlmWew7IwZ/bDJdI5ZeUqvOUmkKjJ9F2I/g5P/zZrB1qExwN/zsxzxd9idkvEhwY+YDeiZEEJg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1575,6 +1584,7 @@
       "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.24.7",
@@ -4198,6 +4208,7 @@
       "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.5.tgz",
       "integrity": "sha512-iY/fNot+hWPk9sTX8aHMqlcX9ynRvpGkskWAdUZ2eQQdLo8d1hSFYcYNwPv0Q/frGMasw8udKWMcFOEpC9fG8g==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@firebase/component": "0.6.7",
         "@firebase/logger": "0.4.2",
@@ -4267,6 +4278,7 @@
       "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.35.tgz",
       "integrity": "sha512-vgay/WRjeH0r97/Q6L6df2CMx7oyNFDsE5yPQ9oR1G+zx2eT0s8vNNh0WlKqQxUEWaOLRnXhQ8gy7uu0cBgTRg==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@firebase/app": "0.10.5",
         "@firebase/component": "0.6.7",
@@ -4285,7 +4297,8 @@
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.2.tgz",
       "integrity": "sha512-oMEZ1TDlBz479lmABwWsWjzHwheQKiAgnuKxE0pz0IXCVx7/rtlkx1fQ6GfgK24WCrxDKMplZrT50Kh04iMbXQ==",
-      "license": "Apache-2.0"
+      "license": "Apache-2.0",
+      "peer": true
     },
     "node_modules/@firebase/app/node_modules/tslib": {
       "version": "2.5.0",
@@ -4815,6 +4828,7 @@
       "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.6.tgz",
       "integrity": "sha512-IBr1MZbp4d5MjBCXL3TW1dK/PDXX4yOGbiwRNh1oAbE/+ci5Uuvy9KIrsFYY80as1I0iOaD5oOMA9Q8j4TJWcw==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -5152,6 +5166,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.2.tgz",
       "integrity": "sha512-GtNwOs4hcVS2GIbqRUf42rUuX07oLB92cj7cqxZb0ZGWwcwhnmSW0TFLAkNafXmqn9ug4VTpNvcJSUdiuECVKg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/core": "^0.16.2"
@@ -5191,6 +5206,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.2.tgz",
       "integrity": "sha512-Z31rRfV80gC/r+B/bOPSVVpJEWXUV248j7MdnMOFLu4vr8DMqXVo9jYqvwU/s4LSTMAMXqm4Jg6E/jQfadPKAg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.2"
@@ -5204,6 +5220,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.2.tgz",
       "integrity": "sha512-ShkJCAzRI+1fAKPuLLgEkixpSpVmKTYaKEFROUcgmrv9AansDXGNCupchqVMTdxf8zPyW8rR1ilvG3OJobufLQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.2"
@@ -5230,6 +5247,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.2.tgz",
       "integrity": "sha512-6oBV0g0J17/7E+aTquvUsgSc85nUbUi+64tIK5eFIDzvjhlqhjGNJYlc46KJMCWIs61qRJayQoZdL/iT/iQuGQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.2",
@@ -5276,6 +5294,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.2.tgz",
       "integrity": "sha512-qCd3hfMEE+Z2EuuyXewgXRTtKJGIerWzc1zLEJztsUkPz5i73IGgkOL+mrNutZwGaXZbm+8SwUaGb46sxAO6Tw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.2"
@@ -5409,6 +5428,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.2.tgz",
       "integrity": "sha512-gE4N9l6xuwzacFZ2EPCGZCJ/xR+aX2V7GdMndIl/6kYIw5/eib1SFuF9AZLvIPSFuE1FnGo8+vT0pr++SSbhYg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.2"
@@ -5422,6 +5442,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.2.tgz",
       "integrity": "sha512-/CTEYkR1HrgmnE0VqPhhbBARbDAfFX590LWGIpxcYIYsUUGQCadl+8Qo4UX13FH0Nt8UHEtPA+O2x08uPYg9UA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.2"
@@ -5438,6 +5459,7 @@
       "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.2.tgz",
       "integrity": "sha512-3inuxfrlquyLaqFdiiiQNJUurR0WbvN5wAf1qcYX2LubG1AG8grayYD6H7XVoxfUGTZXh1kpmeirEYlqA2zxcw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.16.2"
@@ -8365,6 +8387,7 @@
       "integrity": "sha512-1ELDPlnLvDQ5ybTSrMhRTFDfOQEOXNM+eP+3HT/Yq7ruWpciQw+Avi73pdEbA4SooCawEWo3dtYbF68gN7Ed1A==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "7.13.1",
         "@typescript-eslint/types": "7.13.1",
@@ -8530,6 +8553,7 @@
       "integrity": "sha512-h5MzFBD5a/Gh/fvNdp9pTfqJAbuQC4sCN2WzuXme71lqFJsZtLbjxfSk4r3p02WIArOF9N94pdsLiGutpDbrXQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@typescript-eslint/scope-manager": "7.13.1",
@@ -8819,6 +8843,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
       "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -8922,6 +8947,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -9911,6 +9937,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001629",
         "electron-to-chromium": "^1.4.796",
@@ -10136,6 +10163,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
       "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
@@ -10511,6 +10539,7 @@
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -10531,7 +10560,8 @@
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
       "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/color": {
       "version": "3.2.1",
@@ -11264,16 +11294,6 @@
       "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
       "dev": true
     },
-    "node_modules/cytoscape": {
-      "version": "3.29.2",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.29.2.tgz",
-      "integrity": "sha512-2G1ycU28Nh7OHT9rkXRLpCDP30MKH1dXJORZuBhtEhEW7pKwgPi77ImqlCWinouyE1PNepIOGZBOrE84DG7LyQ==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/cytoscape-cose-bilkent": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz",
@@ -11691,16 +11711,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/d3-selection": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
-      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-      "license": "ISC",
-      "optional": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/d3-shape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
@@ -11958,6 +11968,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
@@ -12355,27 +12366,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
-    "node_modules/encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -12533,6 +12523,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
       "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.4"
@@ -12545,6 +12536,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -12652,6 +12644,7 @@
       "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -13563,6 +13556,7 @@
       "resolved": "https://registry.npmjs.org/firebase/-/firebase-10.12.2.tgz",
       "integrity": "sha512-ZxEdtSvP1I9su1yf32D8TIdgxtPgxwr6z3jYAR1TXS/t+fVfpoPc/N1/N2bxOco9mNjUoc+od34v5Fn4GeKs6Q==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@firebase/analytics": "0.10.4",
         "@firebase/analytics-compat": "0.2.10",
@@ -13820,6 +13814,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13854,6 +13849,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
       "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -14114,6 +14110,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3"
@@ -14257,6 +14254,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
@@ -14269,6 +14267,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -14280,6 +14279,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -14304,6 +14304,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -15794,7 +15795,8 @@
       "version": "2.99.1",
       "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
       "integrity": "sha512-ra97U4qu3OCcIxvN6eg3kyy8bLrID/TgxafSGMMICg3SFx5C/sUfDPpiOh7yoIsHdtjrOVdtT9rieYhqOsh9Ww==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/jasmine-spec-reporter": {
       "version": "4.2.1",
@@ -16081,6 +16083,7 @@
       "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz",
       "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@colors/colors": "1.5.0",
         "body-parser": "^1.19.0",
@@ -16350,6 +16353,7 @@
       "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "copy-anything": "^2.0.1",
         "parse-node-version": "^1.0.1",
@@ -16989,7 +16993,8 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
       "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
       "dev": true,
-      "license": "0BSD"
+      "license": "0BSD",
+      "peer": true
     },
     "node_modules/meow": {
       "version": "3.7.0",
@@ -18503,6 +18508,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@nrwl/tao": "19.3.1",
         "@yarnpkg/lockfile": "^1.1.0",
@@ -18814,6 +18820,7 @@
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
       "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -19653,6 +19660,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
@@ -19856,6 +19864,7 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
       "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==",
       "dev": true,
+      "peer": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -20138,6 +20147,7 @@
       "integrity": "sha512-UqkFjivi4GcvUQYzqGYNe0mLzfn5jiLmO8w9nMhQoJRLhy2grJonpga2IWhI6yJO30LibWXJJtA4MOIZD2GgZw==",
       "deprecated": "We have news to share - Protractor is deprecated and will reach end-of-life by Summer 2023. To learn more and find out about other options please refer to this post on the Angular blog. Thank you for using and contributing to Protractor. https://goo.gle/state-of-e2e-in-angular",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@types/q": "^0.0.32",
         "@types/selenium-webdriver": "^3.0.0",
@@ -20591,6 +20601,7 @@
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
       "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -21250,6 +21261,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
       "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -21447,6 +21459,7 @@
       "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "json-schema-traverse": "^1.0.0",
@@ -21788,6 +21801,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
@@ -21861,6 +21875,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -23219,7 +23234,8 @@
     "node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "peer": true
     },
     "node_modules/tslint": {
       "version": "6.1.3",
@@ -23227,6 +23243,7 @@
       "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
       "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
@@ -23400,6 +23417,7 @@
       "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -23790,6 +23808,7 @@
       "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.20.1",
         "postcss": "^8.4.38",
@@ -24347,6 +24366,7 @@
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
       "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.5",
@@ -24425,6 +24445,7 @@
       "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/bonjour": "^3.5.13",
         "@types/connect-history-api-fallback": "^1.5.4",
@@ -25098,7 +25119,8 @@
       "version": "0.14.7",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.7.tgz",
       "integrity": "sha512-0w6DGkX2BPuiK/NLf+4A8FLE43QwBfuqz2dVgi/40Rj1WmqUskCqj329O/pwrqFJLG5X8wkeG2RhIAro441xtg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     }
   }
 }
diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
index f825bfa..1003098 100644
--- a/src/app/core/footer/footer.component.html
+++ b/src/app/core/footer/footer.component.html
@@ -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>
diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss
index cc952d7..3e47966 100644
--- a/src/app/core/footer/footer.component.scss
+++ b/src/app/core/footer/footer.component.scss
@@ -22,9 +22,9 @@
       justify-content: center;
     }
 
-    ::ng-deep .busu-icon img {
-      border-radius: 15%;
-    }
+    // ::ng-deep .busu-icon img {
+    //   border-radius: 15%;
+    // }
 
     &:last-child {
       margin-right: 0%;
diff --git a/src/app/core/footer/footer.component.ts b/src/app/core/footer/footer.component.ts
index e9f760a..22254e3 100644
--- a/src/app/core/footer/footer.component.ts
+++ b/src/app/core/footer/footer.component.ts
@@ -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,
diff --git a/src/app/views/home/home.component.html b/src/app/views/home/home.component.html
index 0824555..59bb407 100644
--- a/src/app/views/home/home.component.html
+++ b/src/app/views/home/home.component.html
@@ -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.
diff --git a/src/app/views/links/links.component.html b/src/app/views/links/links.component.html
index bf164e9..86d9ddb 100644
--- a/src/app/views/links/links.component.html
+++ b/src/app/views/links/links.component.html
@@ -13,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')"

From 3f4432aac56b26213f45abd0716c23df3fa21056 Mon Sep 17 00:00:00 2001
From: condyl <Condyl678@gmail.com>
Date: Mon, 1 Dec 2025 19:14:14 -0500
Subject: [PATCH 6/7] fix: remove commented-out BUSU icon styles from footer
 component SCSS

---
 src/app/core/footer/footer.component.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss
index 3e47966..dc01f6f 100644
--- a/src/app/core/footer/footer.component.scss
+++ b/src/app/core/footer/footer.component.scss
@@ -22,10 +22,6 @@
       justify-content: center;
     }
 
-    // ::ng-deep .busu-icon img {
-    //   border-radius: 15%;
-    // }
-
     &:last-child {
       margin-right: 0%;
     }

From 83ae103ae543d0d3a5301b2643938c1bcd319de2 Mon Sep 17 00:00:00 2001
From: condyl <Condyl678@gmail.com>
Date: Sat, 7 Mar 2026 11:21:49 -0500
Subject: [PATCH 7/7] chore: remove merch from navbar (merch sales closed)

---
 src/app/core/nav/nav.component.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/core/nav/nav.component.ts b/src/app/core/nav/nav.component.ts
index 2a3db0e..2f50fa9 100644
--- a/src/app/core/nav/nav.component.ts
+++ b/src/app/core/nav/nav.component.ts
@@ -48,11 +48,12 @@ export class NavComponent implements OnInit {
       href: '/events',
       desc: 'Events',
     },
-    {
-       href: 'https://merch.brockcsc.ca',
-       desc: 'Merch',
-       isExternal: true,
-    },
+
+    //{
+    //   href: 'https://merch.brockcsc.ca',
+    //   desc: 'Merch',
+    //   isExternal: true,
+    // },
     // {
     //   href: '/services',
     //   desc: 'Services',