Merge pull request #198 from BrockCSC/production

merge production back with development

Author: condyl

package-lock.json

@@ -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>

src/app/core/footer/footer.component.html

@@ -22,10 +22,6 @@
       justify-content: center;
     }
 
-    ::ng-deep .busu-icon img {
-      border-radius: 15%;
-    }
-
     &:last-child {
       margin-right: 0%;
     }

src/app/core/footer/footer.component.scss

@@ -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,

src/app/core/footer/footer.component.ts

@@ -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',

src/app/core/nav/nav.component.ts

@@ -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.

src/app/views/home/home.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')"
@@ -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')"