Stable

.github/ISSUE_TEMPLATE/working_on.md

@@ -4,22 +4,15 @@ about: Indicate a feature or bug that you will be working towards implementing
 title: ''
 labels: ''
 assignees: ''
-
----
-
----
-name: Stand-up
-about: Indicate a feature or bug that you will be working towards implementing
-labels: enhancement
 ---
 
 # Working-On
 
 ## Description
 
-- [ ] item 1
-- [ ] item 2
+[Write a description of what you will be working on]
 
-## Additional Information
+## Checklist
 
-[Any additional details or context that might be helpful.]
+- [ ] item 1
+- [ ] item 2

.github/pull_request_template.md

@@ -16,10 +16,6 @@
 - [ ] Refactoring
 - [ ] Documentation Update
 
-**Testing Instructions:**
-
-[Provide clear and concise instructions on how to test your changes.]
-
 **Additional Notes:**
 
 [Any additional information that may be helpful for reviewers.]

.github/workflows/linter.yml

@@ -1,4 +1,4 @@
-name: Run ESLint on Push and Pull Requests
+name: Run Linter
 on:
   push:
     branches:
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    name: Run ESLint
+    name: ESLint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -23,13 +23,7 @@ jobs:
           bun-version: latest
       - name: Install dependencies for the frontend
         run: bun install
-        working-directory: src/client
-      - name: Install dependencies for the backend
-        run: bun install
-        working-directory: src/server/workspace
+        working-directory: src
       - name: Run Frontend Linters
         run: bun run lint
-        working-directory: src/client
-      - name: Run Backend Linters
-        run: bun run lint
-        working-directory: src/server/workspace
+        working-directory: src

.github/workflows/frontend-tests.yml → .github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Run Frontend Tests
+name: Run Tests
 on:
     push:
       branches:
@@ -10,7 +10,7 @@ on:
         - develop
 jobs:
   build:
-    name: Frontend tests
+    name: Unit
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -22,17 +22,17 @@ jobs:
             bun-version: latest
       - name: Create .env file
         run: |
-            echo AUTH_SECRET=${{ secrets.AUTH_SECRET }} >> src/client/.env
-            echo TEST_PASSWORD=${{ secrets.TEST_PASSWORD }} >> src/client/.env
-            echo SENDGRID_RECOVERY=${{ secrets.SENDGRID_RECOVERY }} >> src/client/.env
-            echo SENDGRID_API_KEY=${{ secrets.SENDGRID_API_KEY }} >> src/client/.env
-            echo FROM_EMAIL=${{ secrets.FROM_EMAIL }} >> src/client/.env
+            echo AUTH_SECRET=${{ secrets.AUTH_SECRET }} >> src/.env
+            echo TEST_PASSWORD=${{ secrets.TEST_PASSWORD }} >> src/.env
+            echo SENDGRID_RECOVERY=${{ secrets.SENDGRID_RECOVERY }} >> src/.env
+            echo SENDGRID_API_KEY=${{ secrets.SENDGRID_API_KEY }} >> src/.env
+            echo FROM_EMAIL=${{ secrets.FROM_EMAIL }} >> src/.env
       - name: Install dependencies for the frontend
         run: bun install
-        working-directory: src/client
+        working-directory: src
       - name: Run Frontend Tests
-        run: npm run test
-        working-directory: src/client
+        run: bun run test:coverage
+        working-directory: src
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
         with:

.gitignore

@@ -1,30 +1,10 @@
-# Node.js
-node_modules/
-npm-debug.log
-yarn-error.log
-
-# SvelteKit
-/build
-
-# NestJS
+# Files
 .env
-.env.*
-
-.aws.*
-.aws
-
-.npm
-
-.amplify-hosting
-
-# IDEs and editors
-/.vscode
-.idea
-*.swp
-*.swo
 
+# Directories
+build
+.vscode
 .vercel
-
-# OS generated files
-.DS_Store
-Thumbs.db
+coverage
+.svelte-kit
+node_modules

README.md

@@ -1,6 +1,6 @@
 <div align="center">
 <h1>ClassConnect</h1>
-  <img src="./resources/images/class-connect-logo.png" alt="class-connect logo"/>
+  <img src="./images/class-connect-logo.png" alt="class-connect logo"/>
 
   [![Issue Tracking](https://img.shields.io/badge/Issue_Tracking-GitHub_Issues-yellow)](https://github.com/COS301-SE-2024/ClassConnect/issues)
   [![Build Status](https://img.shields.io/badge/Build_Status-GitHub_Actions-brightgreen)](https://github.com/COS301-SE-2024/ClassConnect/actions/workflows/linter.yml)
@@ -92,17 +92,17 @@ For any additional documentation please have look at our [Wiki](https://github.c
 
 | Name           | Profile Picture                                                                                                    | Role              | Socials                                                                                                                                                                                           |
 | -------------- | ------------------------------------------------------------------------------------------------------------------ | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Joshua Wereley** | <img src="./resources/images/joshua.jpeg" alt="Joshua's Profile Picture" width="200"> | Project Manager   | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
-| **Ashley Kapaso**  | <img src="./resources/images/ashley.jpeg" alt="Ashley's Profile Picture" width="200"> | Architect         | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
-| **Eugene Mpande**  | <img src="./resources/images/eugene.jpeg" alt="Eugene's Profile Picture" width="200"> | DevOps Engineer   | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
-| **Lunga Ndlovu**   | <img src="./resources/images/lunga.jpeg" alt="Lunga's Profile Picture" width="200">   | Frontend Engineer | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
-| **Ayanda Juqu**    | <img src="./resources/images/ayanda.jpeg" alt="Ayanda's Profile Picture" width="200"> | Backend Engineer  | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
+| **Joshua Wereley** | <img src="./images/joshua.jpeg" alt="Joshua's Profile Picture" width="200"> | Project Manager   | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
+| **Ashley Kapaso**  | <img src="./images/ashley.jpeg" alt="Ashley's Profile Picture" width="200"> | Architect         | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
+| **Eugene Mpande**  | <img src="./images/eugene.jpeg" alt="Eugene's Profile Picture" width="200"> | DevOps Engineer   | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
+| **Lunga Ndlovu**   | <img src="./images/lunga.jpeg" alt="Lunga's Profile Picture" width="200">   | Frontend Engineer | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
+| **Ayanda Juqu**    | <img src="./images/ayanda.jpeg" alt="Ayanda's Profile Picture" width="200"> | Backend Engineer  | <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=github" alt="GitHub"></a> <a href="#" target="_blank"><img src="https://skillicons.dev/icons?i=linkedin" alt="LinkedIn"></a> |
 
 <h2>✉️ Contact</h2>
 
 <div align="center">
   <h3>[email protected]</h3>
   <br>
-  <img src="./resources/images/phantom-works-logo.jpg" alt="phantom-works logo" height="300" width="300" />
+  <img src="./images/phantom-works-logo.jpg" alt="phantom-works logo" height="300" width="300" />
 </div>
 

scripts/boot.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Start up the frontend
-cd ../src/client || exit
+cd ../src || exit
 bun run dev &
 
 # Store the process ID (PID) of the server

src/client/.gitignore → src/.eslintignore

@@ -3,7 +3,9 @@
 
 # Directories
 build
-coverage
+static
+.vercel
 .vscode
+coverage
 .svelte-kit
 node_modules