Merge branch 'master' of https://github.com/CarletonComputerScienceSo…

…ciety/website

.github/workflows/hugo-preview.yml

@@ -0,0 +1,39 @@
+name: Build and Deploy PR Preview to surge
+# testing
+on:
+  pull_request:
+
+jobs:
+  build_preview:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup Hugo
+      uses: peaceiris/actions-hugo@v2
+      with:
+        hugo-version: '0.83.1'
+        extended: true
+
+    - name: Setup base URL env var
+      run: |
+        export PRNUMBER=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") 
+        echo BASEURL="https://rmoff-rmoff-blog-build_preview-pr-"$PRNUMBER".surge.sh/" >> $GITHUB_ENV
+
+    - name: Report base URL env var
+      run: echo "${{ env.BASEURL }}" 
+
+    - name: Build                                
+      run: hugo --baseURL "${{ env.BASEURL }}"
+
+    - name: Deploy to surge                            
+      uses: afc163/surge-preview@v1
+      id: preview_step
+      with:
+        surge_token: "1f147e7d61488c3db6957c80ab45939f"
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        dist: public
+        failOnError: false
+        teardown: true
+        build: |
+          echo Deploying to surge.sh

assets/scss/components/_footer.scss

@@ -1,12 +1,12 @@
 .footer {
   background-color: black;
-  height: 15vh;
   color: white;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
   border-top: 2px solid #c40729;
+  padding-bottom: 2rem;
 
   a {
     color: inherit;
@@ -18,5 +18,16 @@
   justify-content: space-between;
   width: 14rem;
   font-size: 1.5rem;
-  margin-bottom: 1.2rem;
+  margin-bottom: 0.6rem;
+  margin-top: 0.1rem;
+  // this margin just makes the spacing look better
+  // can probs play around with it more
+}
+
+.footer-text {
+  text-align: center;
+  font-size: 1rem;
+  b {
+    font-size: 1.25rem;
+  }
 }

assets/scss/components/_navbar.scss

@@ -516,7 +516,8 @@ $navNumOfItemBlocks: 4;
 }
 
 .header .menu-btn:checked ~ .menu {
-  max-height: 420px;
+  // if adding list items from menu, update below
+  max-height: 600px;
 }
 
 .header .menu-btn:checked ~ .menu-icon .navicon {

assets/scss/components/_overlaypost.scss

@@ -39,10 +39,16 @@
   h1 {
     margin-top: 1.5rem;
     margin-bottom: 1.5rem;
+    font-size: 1.75em;
   }
 
   h2 {
-    margin-top: 3rem;
+    margin-top: 1.5rem;
+    font-size: 1.65em;
+  }
+
+  h3 {
+    font-size: 1.5em;
   }
   p,
   ul,

content/events/2023-2024/2023-06-24-course-registration-+-Q&A.md

@@ -13,6 +13,8 @@ location: "Zoom"
 location_link: "https://forms.gle/YB3Ky9nnaJk3LLz26"
 background: "images/orientation2018-min.jpeg"
 publishdate: 2023-06-05
+tags:
+- talks
 ---
 * How to plan your schedule
 * Elective suggestions

content/events/2023-2024/2023-09-12-git-workshop.md

@@ -15,6 +15,7 @@ background: "images/orientation2018-min.jpeg"
 publishdate: 2023-08-25
 tags:
 - weekofawesome2023
+- talks
 ---
 ## Slides
 The presentation slides can be viewed [here!](/pdfs/2023-2024/Git-Workshop.pdf).

content/events/2023-2024/2023-09-12-shit-i-wish-i-knew.md

@@ -15,6 +15,7 @@ background: "images/orientation2018-min.jpeg"
 publishdate: 2023-09-01
 tags:
   - weekofawesome2023
+  - talks
 ---
 
 ## Slides

content/events/2023-2024/2023-09-13-finding-an-internship-in-the-united-states.md

@@ -14,6 +14,7 @@ background: "images/orientation2018-min.jpeg"
 publishdate: 2023-09-01
 tags:
   - weekofawesome2023
+  - talks
 ---
 ## Slides
 The presentation slides can be viewed [here!](/pdfs/2023-2024/Internship-Presentation.pdf).

data/faq.yml

@@ -1,7 +1,5 @@
 - question: "How do I join the Carleton Computer Science Society?"
   answer: "The Carleton Computer Science Society represents all students within Carleton's Computer Science programs. That means that if you're in CS, you're already a member!"
-- question: "Will there be in person events in the 2022–2023 academic year?"
-  answer: "Yes! We will be operating both in person and online during the Fall 2022 academic term."
 - question: "Is the CCSS an official Carleton club / society?"
   answer: "The CCSS is recognized and funded by the School of Computer Science, however, it is not registered as a CUSA club or society."
 - question: "Can I attend events if I'm not a Computer Science student?"

data/organizations.yml

@@ -1,26 +1,26 @@
 - name: cuHacking
-  description: "Students, just like you! We come from various disciplines and backgrounds, and we aim to help foster the skills and crafts of all those involved in our community. We do this through evolving challenges and events which bring out the hidden talents of everyone around us."
-  website: https://cuhacking.com/
+  description: "cuHacking is Carleton University's official hackathon event. Participants come together to innovate,collaborate and create solutions to various challenges"
+  website: https://cuhacking.ca/
   discord: https://discord.com/invite/TGvYPnD
   github: https://github.com/cuhacking
   instagram: https://www.instagram.com/cuHacking/
   twitter: https://twitter.com/cuhacking
   linkedin: https://www.linkedin.com/company/cuhacking/
   facebook: https://www.facebook.com/cuhacking/
-  image: images/organizations/cuHacking.jpg
+  image: images/organizations/cuHackinglogo2.jpg
 
-- name: SCESoc
-  description: "The goal of SCESoc is to enhance the overall experience of students in and outside of the Systems and Computer Engineering (SCE) Department of Carleton."
-  website: https://www.scesoc.ca/
-  instagram: https://www.instagram.com/cuscesoc/?hl=en
-  twitter: https://twitter.com/cuscesoc?lang=en
-  linkedin: https://www.linkedin.com/company/cuscesoc/about/
-  facebook: https://www.facebook.com/SCESoc/
-  image: images/organizations/scesoc.jpg
+- name: MathSoc
+  description: "The Math Society is dedicated to bringing together students and faculty from the School of Mathematics at Carleton. We provide social opportunities for students of all years to form new friendships, and we organize enrichment opportunities that encourage enthusiasm for mathematics. You can look forward to lots of great events."
+  website: https://cumathsoc.github.io/
+  discord: https://discord.gg/4ttYNMWkVw
+  instagram: 
+  twitter: 
+  facebook: 
+  image: images/organizations/mathsoc.jpg
 
 - name: Women in Computer Science
   description: "Women in Computer Science (WiCS) is a group organized by the School of Computer Science, Carleton University with the mission of establishing a positive environment for women in computing at all academic levels. Our goal is to develop a network of females in computing at Carleton that would allow them to share experiences and learn from each other."
-  website: https://wics.scs.carleton.ca/
+  website: https://www.instagram.com/carleton_wics/
   instagram: https://www.instagram.com/carleton_wics/?utm_medium=copy_link
   linkedin: https://www.linkedin.com/company/carleton-women-in-computer-science/
   facebook: https://www.facebook.com/CarletonWiCS/
@@ -39,42 +39,52 @@
 
 - name: CU Blueprint
   description: "We're a team of students at Carleton University that develops pro-bono apps for nonprofits and promotes tech for social good."
+  website: https://linktr.ee/cublueprint
   instagram: https://www.instagram.com/cublueprint/
   twitter: https://twitter.com/cublueprint?lang=en
   linkedin: https://www.linkedin.com/company/cublueprint/
   facebook: https://www.facebook.com/cublueprint/
   image: images/organizations/blueprint.jpg
 
-- name: Technolgap
-  description: "Technolgap is Ottawa’s community for female post-secondary students in tech. Our slack group of over 100 members is a space to share internships, opportunities, and course resources, ask for career advice, and get involved in the community! All self-identifying female computer science students are welcome to join!"
-  website: https://www.notion.so/technolgap/We-are-Technolgap-d83090d62cb844aaa26064e978282507
-  instagram: https://www.instagram.com/technolgap
-  twitter: https://twitter.com/technolgap
-  linkedin: https://www.linkedin.com/company/technolgap/?originalSubdomain=ca
-  facebook: https://www.facebook.com/technolgap
-  image: images/organizations/technolgap.jpg
+#- name: Technolgap
+#  description: "Technolgap is Ottawa’s community for female post-secondary students in tech. Our slack group of over 100 members is a space to share internships, opportunities, and course resources, ask for career advice, and get involved in the community! All self-identifying female computer science students are welcome to join!"
+#  website: https://www.notion.so/technolgap/We-are-Technolgap-d83090d62cb844aaa26064e978282507
+#  instagram: https://www.instagram.com/technolgap
+#  twitter: https://twitter.com/technolgap
+#  linkedin: https://www.linkedin.com/company/technolgap/?originalSubdomain=ca
+#  facebook: https://www.facebook.com/technolgap
+#  image: images/organizations/technolgap.jpg
 
-- name: Carleton Web Dev Club
-  description: "The CWDC was formed with the intention to build a community of students/faculty at Carleton interested in furthering their study of web development and related areas. The club aims to bring together students interested in web development to work on projects together, organize and take part in hackathons and other challenges, produce knowledge within the web domain, and assist in career development and industry connections. Past experience with web development is not a requirement. Any motivated students interested in web development are encouraged to take part."
-  website: https://carleton-web-dev-club.github.io/club-site/#/
-  discord: https://discord.gg/6yGwvZC2tM
-  github: https://github.com/Carleton-Web-Dev-Club
-  image: images/organizations/webdev.jpg
+#- name: Carleton Web Dev Club
+#  description: "The CWDC was formed with the intention to build a community of students/faculty at Carleton interested in furthering their study of web development and related areas. The club aims to bring together students interested in web development to work on projects together, organize and take part in hackathons and other challenges, produce knowledge within the web domain, and assist in career development and industry connections. Past experience with web development is not a requirement. Any motivated students interested in web development are encouraged to take part."
+#  website: https://carleton-web-dev-club.github.io/club-site/#/
+#  discord: https://discord.gg/6yGwvZC2tM
+#  github: https://github.com/Carleton-Web-Dev-Club
+#  image: images/organizations/webdev.jpg
 
-- name: Carleton eggX
-  description: "Carleton eggX gathers people who want to create something that benefits themselves and the people around them by making coding more approachable to all kinds of students."
-  website: https://eggx.io/
-  discord: https://discord.com/invite/D9jKXkp
-  github: https://github.com/eggx-io
-  instagram: https://instagram.com/cu_eggx
-  twitter: https://twitter.com/cu_eggx
-  linkedin: https://www.linkedin.com/company/carleton-computer-science-entrepreneurs/
-  facebook: https://www.facebook.com/cueggx/
-  image: images/organizations/eggx.jpg
+#- name: Carleton eggX
+#  description: "Carleton eggX gathers people who want to create something that benefits themselves and the people around them by making coding more approachable to all kinds of students."
+#  website: https://eggx.io/
+#  discord: https://discord.com/invite/D9jKXkp
+#  github: https://github.com/eggx-io
+#  instagram: https://instagram.com/cu_eggx
+#  twitter: https://twitter.com/cu_eggx
+#  linkedin: https://www.linkedin.com/company/carleton-computer-science-entrepreneurs/
+#  facebook: https://www.facebook.com/cueggx/
+#  image: images/organizations/eggx.jpg
+
+- name: SCESoc
+  description: "The goal of SCESoc is to enhance the overall experience of students in and outside of the Systems and Computer Engineering (SCE) Department of Carleton."
+  website: https://www.scesoc.ca/
+  instagram: https://www.instagram.com/cuscesoc/?hl=en
+  twitter: https://twitter.com/cuscesoc?lang=en
+  linkedin: https://www.linkedin.com/company/cuscesoc/about/
+  facebook: https://www.facebook.com/SCESoc/
+  image: images/organizations/scesoc.jpg
 
 - name: Carleton Cyber Security club
   description: "If you're interested in learning more about Cyber Security and getting hands-on experience come and join the Carleton Cyber Security Club! We host weekly sessions that involved workshops, hacking activities and tech talks from guest speakers with industry or academic experience."
-  website: "#"
+  website: "https://linktr.ee/CarletonCyberSecurityClub"
   discord: https://discord.gg/ADV5Zvn
   instagram: https://www.instagram.com/carletoncybersecurityclub/?hl=en
   image: images/organizations/carletoncybersecurity.jpg
@@ -91,7 +101,7 @@
 
 - name: Computing Councils of Canada
   description: "The Computing Councils of Canada, also known as C^3 (or CCubed), is a national organization of students aiming to create and foster an inclusive community for all students in computing-related fields across Canada."
-  website: https://ccubed.dev/
+  website: https://linktr.ee/ccubed.dev
   discord: https://discord.com/invite/477KvYukHf
   github: https://github.com/ccubed-dev
   instagram: https://www.instagram.com/ccubed_dev/
@@ -109,12 +119,4 @@
   facebook: https://www.facebook.com/CarletonSciSoc/
   image: images/organizations/scisoc.jpg
 
-- name: MathSoc
-  description: "The Math Society is dedicated to bringing together students and faculty from the School of Mathematics at Carleton. We provide social opportunities for students of all years to form new friendships, and we organize enrichment opportunities that encourage enthusiasm for mathematics. You can look forward to lots of great events."
-  website: https://cumathsoc.github.io/
-  discord: https://discord.gg/4ttYNMWkVw
-  instagram: 
-  twitter: 
-  facebook: 
-  image: images/organizations/mathsoc.jpg
 

layouts/_default/baseof.html

@@ -3,6 +3,7 @@
   {{- partial "head.html" . -}}
   <body>
     {{- block "main" . }}{{- end }}
+    {{/*
     <noscript>
       <img
         src="https://shynet.carletoncomputersciencesociety.ca/ingress/79c3a476-4406-4560-aad3-92fca8d6d106/pixel.gif"
@@ -12,6 +13,7 @@
       defer
       src="https://shynet.carletoncomputersciencesociety.ca/ingress/79c3a476-4406-4560-aad3-92fca8d6d106/script.js"
     ></script>
+    */}}
   </body>
   {{- partial "footer.html" . -}}
 </html>

layouts/partials/footer.html

@@ -1,4 +1,13 @@
 <div class="footer">
+  <div class="footer-text">
+    <p>
+      <b>Carleton Computer Science Society</b><br />
+      4135 Herzberg Laboratories<br />
+      1125 Colonel By Drive,<br />
+      Ottawa, ON K1S 5B6<br /><br />
+      email: <a href="mailto:[email protected]">[email protected]</a>
+    </p>
+  </div>
   <div class="footer-socials">
     <a href="http://discord.carletoncomputersciencesociety.ca"
       ><i class="fab fa-discord"></i
@@ -16,12 +25,7 @@
   </div>
   <!--Added dynamic date updating with JavaScript-->
   <div class="footer-copyright">
-    ©
-    <script>
-      document.write(new Date().getFullYear());
-    </script>
-    <span> </span>
-    Carleton Computer Science Society
+    © {{ now.Year }} Carleton Computer Science Society
   </div>
 </div>
 

layouts/partials/header.html

@@ -46,10 +46,15 @@
       <a href="/about"
         >{{- partial "button.html" (dict "label" "Learn More") -}}</a
       >
-      <div class="home-header-discord">
-        Discord
-        <div class="fa fa-external-link-alt home-header-discord-arrow"></div>
-      </div>
+      <a
+        style="text-decoration: none"
+        href="http://discord.carletoncomputersciencesociety.ca"
+      >
+        <div class="home-header-discord">
+          Discord
+          <div class="fa fa-external-link-alt home-header-discord-arrow"></div>
+        </div>
+      </a>
     </div>
   </div>
 </div>

layouts/partials/navbar_temp.html

@@ -61,6 +61,10 @@
         <li>
           <a href="/volunteer">VOLUNTEER</a>
         </li>
+
+        <li>
+          <a href="https://resources.carletoncomputerscience.ca/">RESOURCES</a>
+        </li>
       </ul>
       <div class="mobile-hamburger"><i class="fas fa-bars"></i></div>
     </div>
@@ -91,5 +95,8 @@
     <li><a href="/news">NEWS</a></li>
     <li><a href="/blog">BLOG</a></li>
     <li><a href="/volunteer">VOLUNTEER</a></li>
+    <li>
+      <a href="https://resources.carletoncomputerscience.ca/">RESOURCES</a>
+    </li>
   </ul>
 </header>

layouts/partials/organization_card.html

@@ -54,7 +54,6 @@
           ></a>
         {{ end }}
       </div>
-      -->
-    </div>
+    --></div>
   </div>
 </div>