Merge branch 'master' of https://github.com/ssss-sfu/ssss-sfu.github.io…

… into alumni_page/schmidt/combining
ssss-sfu · Oct 25, 2023 · 3153f76 · 3153f76
2 parents d2a2806 + ec41810
commit 3153f76
Show file tree

Hide file tree

Showing 45 changed files with 865 additions and 278 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,3 +1,3 @@
-/.github/ @KiaanCastillo @kylesaburao
-/CNAME @KiaanCastillo
-/.gitignore @KiaanCastillo
+/.github/ @KiaanCastillo @kylesaburao @brianrahadi
+/CNAME @KiaanCastillo @brianrahadi
+/.gitignore @KiaanCastillo @brianrahadi
diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml
@@ -0,0 +1,95 @@
+# Sample workflow for building and deploying a Next.js site to GitHub Pages
+#
+# To get started with Next.js see: https://nextjs.org/docs/getting-started
+#
+name: Deploy Next.js site to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Detect package manager
+        id: detect-package-manager
+        run: |
+          if [ -f "${{ github.workspace }}/yarn.lock" ]; then
+            echo "manager=yarn" >> $GITHUB_OUTPUT
+            echo "command=install" >> $GITHUB_OUTPUT
+            echo "runner=yarn" >> $GITHUB_OUTPUT
+            exit 0
+          elif [ -f "${{ github.workspace }}/package.json" ]; then
+            echo "manager=npm" >> $GITHUB_OUTPUT
+            echo "command=ci" >> $GITHUB_OUTPUT
+            echo "runner=npx --no-install" >> $GITHUB_OUTPUT
+            exit 0
+          else
+            echo "Unable to determine package manager"
+            exit 1
+          fi
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+          cache: ${{ steps.detect-package-manager.outputs.manager }}
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+        with:
+          # Automatically inject basePath in your Next.js configuration file and disable
+          # server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
+          #
+          # You may remove this line if you want to manage the configuration yourself.
+          static_site_generator: next
+      - name: Restore cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            .next/cache
+          # Generate a new cache whenever packages or source files change.
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
+          # If source files changed but packages didn't, rebuild from a prior cache.
+          restore-keys: |
+            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
+      - name: Install dependencies
+        run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
+      - name: Build with Next.js
+        run: ${{ steps.detect-package-manager.outputs.runner }} next build
+      - name: Static HTML export with Next.js
+        run: ${{ steps.detect-package-manager.outputs.runner }} next export
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: ./out
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
diff --git a/README.md b/README.md
@@ -6,25 +6,22 @@ Welcome to the Software Systems Student Society (SSSS) website repo. This projec
 
 To join the committee, go to the [SSSS Discord server](https://discord.gg/XZUd7amxPq), find the `#what-are-committees`, and claim the `@website` role.
 
-> **We hold meetings every 1st and 3rd Wednesday of the month at 7:30pm in the `#website` channel, feel free to join when you're available!**
-
-View the live site here: https://ssss-sfu.github.io/
+View the live site here: https://sfussss.org/
 
 ## Getting Started Contributing
 
 ### Contribute by reporting a bug/suggesting an enhancement
 
-1. Join our [Trello workspace](https://trello.com/invite/b/Qt4lRLAO/de5aad51b8e3ce5222c795090ab638e4/website-committee-summer-term)
+1. Navigate to the [issues](https://github.com/ssss-sfu/ssss-sfu.github.io/issues) page in this repository
 2. Add a new item to the `Backlog` board and give it a clear and concise title and description. Include any other information, images, etc. that may be needed.
 3. Give it an appropriate label
 4. Thank you for your contribution! Before your item is moved to the `Todo` board, the committee will first take a look.
 
 ### Contribute as a developer
 
 1. Get access to the repository as a contributor by contacting the website committee on our [our Discord server](https://discord.gg/XZUd7amxPq)
-2. Join our [Trello workspace](https://trello.com/invite/b/Qt4lRLAO/de5aad51b8e3ce5222c795090ab638e4/website-committee-summer-term)
-3. Claim a free task from the `Todo` board
-4. Set up your development environment (terminal instructions):
+2. Claim a free task from the open issues or suggest a new issue
+3. Set up your development environment (terminal instructions):
 
    a. Clone the repository locally in a folder of your choice
 
@@ -44,23 +41,23 @@ View the live site here: https://ssss-sfu.github.io/
    npm i
    ```
 
-   d. Switch to the `develop` branch (this is where we'll be doing most of our work so we need to branch off from here)
+   d. Create a new branch in this format:
 
    ```
-   git checkout develop
-   git pull
+   [computing ID or GitHub username]/[task-name-concise]
    ```
 
-   e. Create a new branch in this format:
+   e.g. `kiaanc/read-me-update`
 
    ```
-   [computing ID or GitHub username]/[task-name-concise]
+   git checkout -b kiaanc/read-me-update
    ```
 
-   e.g. `kiaanc/read-me-update`
+   This will create a new branch and check out instantly to that branch. Equivalent with:
 
    ```
-   git checkout -b kiaanc/read-me-update
+   git branch kiaanc/read-me-update
+   git checkout kiaanc/read-me-update
    ```
 
    f. Run the server locally
@@ -75,12 +72,12 @@ View the live site here: https://ssss-sfu.github.io/
    localhost:3000
    ```
 
-5. Start coding!
-6. Commit and push your changes
-7. Create a pull request with the following format:
+4. Start coding!
+5. Commit and push your changes
+6. Create a pull request with the following format:
 
    ```
-   Target Branch: develop
+   Target Branch: master
 
    Title: Clear and descriptive title relevant to the issue
 
@@ -93,14 +90,15 @@ View the live site here: https://ssss-sfu.github.io/
    - KiaanCastillo (Kiaan)
    ```
 
-8. Wait for one of the reviewers to take a look and make changes or merge accordingly.
+7. Wait for one of the reviewers to take a look and make changes or merge accordingly.
 
 Thanks for contributing!
 
 ## Past Developers
 
 |     | Version | Release Date      | Contributors   |
 | --- | ------- | ----------------- | -------------- |
-| ✅  | v3.0    | August 17, 2021   | Kiaan Castillo |
+| ✅  | v4.0    | September 9, 2023 | Brian Rahadi   |
+|     | v3.0    | August 17, 2021   | Kiaan Castillo |
 |     | v2.0    | November 17, 2020 | Andy Wang      |
 |     | v1.0    | January 27, 2020  | Amos Ko        |
diff --git a/components/EventsCalendar.jsx b/components/EventsCalendar.jsx
@@ -19,7 +19,7 @@ const localizer = dateFnsLocalizer({
 
 export default function EventsCalendar() {
   const calendarURL =
-    "https://clients6.google.com/calendar/v3/calendars/[email protected]/events?calendarId=j7qfcngd9crbhelib6tgdihi3k%40group.calendar.google.com&singleEvents=true&timeZone=America%2FVancouver&maxAttendees=1&maxResults=250&sanitizeHtml=true&timeMin=2023-03-26T00%3A00%3A00-07%3A00&timeMax=2023-05-07T00%3A00%3A00-07%3A00&key=AIzaSyBNlYH01_9Hc5S1J9vuFmu2nUqBZJNAXxs";
+    "https://clients6.google.com/calendar/v3/calendars/[email protected]/events?calendarId=j7qfcngd9crbhelib6tgdihi3k%40group.calendar.google.com&singleEvents=true&timeZone=America%2FVancouver&maxAttendees=1&maxResults=250&sanitizeHtml=true&timeMin=2023-03-26T00%3A00%3A00-07%3A00&timeMax=2024-05-07T00%3A00%3A00-07%3A00&key=AIzaSyBNlYH01_9Hc5S1J9vuFmu2nUqBZJNAXxs";
   const [events, setEvents] = useState([]);
 
   useEffect(() => {
@@ -43,7 +43,7 @@ export default function EventsCalendar() {
       <Calendar
         localizer={localizer}
         onSelectEvent={() => {
-          window.open("https://discord.com/invite/XZUd7amxPq", "_blank");
+          window.open("https://discord.com/invite/whdfmJbVF7", "_blank");
         }}
         events={events}
         startAccessor="start"

diff --git a/components/Footer.jsx b/components/Footer.jsx
@@ -5,6 +5,7 @@ import FacebookIcon from "@icons/facebook.svg";
 import InstagramIcon from "@icons/instagram.svg";
 import LinkedInIcon from "@icons/linkedin.svg";
 import DiscordIcon from "@icons/discord.svg";
+import GithubIcon from "@icons/github.svg";
 import OfficeBuildingIcon from "@icons/office-building.svg";
 import ContactUsIcon from "@icons/contact-us.svg";
 
@@ -36,8 +37,8 @@ export const Footer = () => {
               >
                 <strong>Software Systems Student Society</strong>
                 <br />
-                12450 102 Ave Unit 250, <br></br>
-                SUR 4016, Galleria 4<br></br>
+                250 - 13450 - 102nd Avenue, <br></br>
+                SYRC 4016, Galleria 4<br></br>
                 Surrey, BC V3T 0A3<br></br>
               </a>
             </address>
@@ -86,14 +87,22 @@ export const Footer = () => {
               alt="Instagram Icon"
             />
           </a>
-          <a href="https://discord.gg/XZUd7amxPq">
+          <a href="https://discord.com/invite/whdfmJbVF7">
             <Image
               src={DiscordIcon.src}
               height={24}
               width={24}
               alt="Discord Icon"
             />
           </a>
+          <a href="https://github.com/ssss-sfu">
+            <Image
+              src={GithubIcon.src}
+              alt="Github icon"
+              height={24}
+              width={24}
+            />
+          </a>
         </div>
       </div>
     </div>

diff --git a/components/HeaderNav.jsx b/components/HeaderNav.jsx
@@ -4,6 +4,7 @@ import FacebookIcon from "@icons/facebook.svg";
 import InstagramIcon from "@icons/instagram.svg";
 import LinkedInIcon from "@icons/linkedin.svg";
 import DiscordIcon from "@icons/discord.svg";
+import GithubIcon from "@icons/github.svg";
 import Link from "next/link";
 
 export const HeaderNav = () => {
@@ -31,7 +32,7 @@ export const HeaderNav = () => {
 
         <div className="content">
           <nav className="pages">
-            <Link href="/">
+            <Link href="/about">
               <a className="page-link">About</a>
             </Link>
             <Link href="/events">
@@ -73,14 +74,22 @@ export const HeaderNav = () => {
                 width={18}
               />
             </a>
-            <a href="https://discord.gg/XZUd7amxPq">
+            <a href="https://discord.com/invite/whdfmJbVF7">
               <Image
                 src={DiscordIcon.src}
                 alt="Discord icon"
                 height={18}
                 width={18}
               />
             </a>
+            <a href="https://github.com/ssss-sfu">
+              <Image
+                src={GithubIcon.src}
+                alt="Discord icon"
+                height={18}
+                width={18}
+              />
+            </a>
             <a href="mailto:[email protected]" rel="noreferrer">
               <Button label="Contact Us" />
             </a>

diff --git a/components/Helmet.jsx b/components/Helmet.jsx
@@ -1,10 +1,23 @@
 import Head from "next/head";
 
 export const Helmet = ({ pageTitle = "" }) => {
+  pageTitle = pageTitle.replace("/", "");
+  pageTitle = pageTitle.replace("-", " ");
+  pageTitle = capitalizeWords(pageTitle);
+
   const defaultTitle = "Software Systems Student Society";
-  const title = `${pageTitle} | ${defaultTitle}`;
+  const title = `${pageTitle} | SSSS`;
   const hasPageTitle = pageTitle.trim() !== "";
 
+  function capitalizeWords(item) {
+    return item
+      .split(" ")
+      .map(function (word) {
+        return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
+      })
+      .join(" ");
+  }
+
   return (
     <Head>
       <title>{hasPageTitle ? title : defaultTitle}</title>