Bring to dev

.github/workflows/docker.yml

@@ -18,7 +18,7 @@ jobs:
           - component: frontend
             dockerfile: production.dockerfile
             args: |
-              "API_URL=https://circlesapi.csesoc.app"
+              "API_URL=https://circlesapi.devsoc.app"
           - component: backend
             dockerfile: production.dockerfile
     steps:

.tokeignore

@@ -0,0 +1 @@
+**.json

CODEOWNERS

@@ -1,5 +1,4 @@
-.github/ @csesoc/technical
-renovate.json @csesoc/technical
+*              @devsoc-unsw/circles-leads
 
-backend/ @imagine-hussain
-frontend/ @leonardo-fan
+.github/       @devsoc-unsw/platform
+renovate.json  @devsoc-unsw/platform

LICENSE

@@ -1,44 +1,44 @@
-Circles 
+Circles
 
-Copyright (C) 2023 CSESoc UNSW 
+Copyright (C) 2024 DevSoc UNSW
 
-This program is free software: you can redistribute it and/or modify it under 
-the terms of the GNU Affero General Public License as published by the Free 
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU Affero General Public License as published by the Free
 Software Foundation at version 3 of the License.
 
-This program is distributed in the hope that it will be useful, but WITHOUT ANY 
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. 
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>. 
+You should have received a copy of the GNU Affero General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# AGPL-v3 License Extension 
+# AGPL-v3 License Extension
 
-1. You may use, copy, modify, and distribute this software under the terms of 
-the AGPL-v3 license, provided that you include this license extension in all 
-copies or substantial portions of the software. 
+1. You may use, copy, modify, and distribute this software under the terms of
+the AGPL-v3 license, provided that you include this license extension in all
+copies or substantial portions of the software.
 
-2. You may not use this software for commercial purposes, including but not 
-limited to selling, renting, or licensing the software or any derivative works 
-thereof. 
+2. You may not use this software for commercial purposes, including but not
+limited to selling, renting, or licensing the software or any derivative works
+thereof.
 
-3. If you distribute this software, you must make the source code available 
-under the AGPL-v3 license and this license extension, and must include a copy 
-of this license extension with any binary distribution. 
+3. If you distribute this software, you must make the source code available
+under the AGPL-v3 license and this license extension, and must include a copy
+of this license extension with any binary distribution.
 
-4. If you modify this software, you must indicate in the source code that 
-changes have been made and provide the modified source code under the terms of 
-the AGPL-v3 license and this license extension. 
+4. If you modify this software, you must indicate in the source code that
+changes have been made and provide the modified source code under the terms of
+the AGPL-v3 license and this license extension.
 
 5. This license extension applies to the entire software, including any third-
-party components included in the software. 
+party components included in the software.
 
 6. If you use this software in a product that is freely available to the
 public, you must give full credit to the original authors of the software by
 prominently displaying the following attribution in the product: "This product
-includes software developed by CSESoc UNSW."
+includes software developed by DevSoc UNSW."
 
-7. This license extension shall not be interpreted to affect the validity or 
-enforceability of the AGPL-v3 license. 
+7. This license extension shall not be interpreted to affect the validity or
+enforceability of the AGPL-v3 license.
 

README.md

@@ -1,7 +1,6 @@
-[![CSEsoc](https://img.shields.io/badge/-CSESoc-blue)](https://www.csesoc.unsw.edu.au/)
-![Status](https://img.shields.io/website?label=status&up_message=online&url=https%3A%2F%2Fcircles.csesoc.unsw.edu.au%2F)
-[![Frontend Build](https://github.com/devsoc-unsw/Circles/actions/workflows/ci_FE.yml/badge.svg)](https://github.com/devsoc-unsw/Circles/actions/workflows/ci_FE.yml)
-[![Backend Tests](https://github.com/devsoc-unsw/Circles/actions/workflows/ci_BE.yml/badge.svg)](https://github.com/devsoc-unsw/Circles/actions/workflows/ci_BE.yml)
+[![DevSoc](https://img.shields.io/badge/Devsoc-dark?color=3c424b)](https://devsoc.app/)
+[![Status](https://img.shields.io/website?url=https%3A%2F%2Fcircles.devsoc.app%2F&up_message=online&label=status)](https://circles.devsoc.app/)
+[![Unit Tests](https://github.com/devsoc-unsw/Circles/actions/workflows/ci.yml/badge.svg)](https://github.com/devsoc-unsw/Circles/actions/workflows/ci.yml)
 [![Pylint](https://github.com/devsoc-unsw/Circles/actions/workflows/pylinter.yml/badge.svg)](https://github.com/devsoc-unsw/Circles/actions/workflows/pylinter.yml)
 ![Lines of code](https://img.shields.io/tokei/lines/github/devsoc-unsw/Circles)
 ![GitHub Repo Size](https://img.shields.io/github/repo-size/devsoc-unsw/Circles)
@@ -12,13 +11,13 @@ Tired of using a poorly laid out spreadsheet to cobble together a plan to follow
 
 Circles is a UNSW degree planner where you can explore and validate your degree structure.
 
-You can find a live build of Circles at [https://circles.csesoc.app](https://circles.csesoc.app/).
+You can find a live build of Circles at [https://circles.devsoc.app](https://circles.devsoc.app/).
 
 ## Features
 
-![Features Help Image](https://raw.githubusercontent.com/devsoc-unsw/Circles/dev/frontend/src/assets/infographic.png)
+![Features Help Image](./frontend/src/assets/infographic.png)
 
-NOTE: we currently only support a subset of courses that have the highest enrolments, such as Engineering, Commerce, Computer Science, and Science. We do plan to add more!
+NOTE: we currently only support a selection of degrees - but we will add more!
 
 - Adaptive course selector:
   - Allows you to explore your currently unlocked courses
@@ -30,7 +29,7 @@ NOTE: we currently only support a subset of courses that have the highest enrolm
   - Validates your progression to make sure you've met the requirements for future courses
   - Allows you to generate a saveable and sharable image of your plan
 
-- Progression checker:
+- Progression checker: (NEW PAGE!)
   - Lets you understand which requirements you have met and which you still need to complete
   - Shows you what courses you can do to complete your degree
 
@@ -44,8 +43,8 @@ This project is rapidly expanding and our roadmap includes features such as:
 
 # Our team
 
-We are a team that is part of CSESoc Projects! See [TEAM.md](./TEAM.md) for more information on the current and previous team that contributed to the development of Circles.
+We are a team that is part of DevSoc! See [TEAM.md](./TEAM.md) for more information on the current and previous team that contributed to the development of Circles.
 
 Also, special thanks to James Ji, Vincent Xiao, Hayes Choy for being the first team to work on and inspire Circles :)
 
-[For further development documentation, a linktree to our jira boards and more!](https://compclub.atlassian.net/wiki/spaces/C/pages/1664385928/About+Circles)
+[For further development documentation, visit our confluence page!](https://devsoc.atlassian.net/wiki/spaces/C/pages/756966/About+Circles)

backend/server/server.py

@@ -26,7 +26,7 @@
     "http://frontend:3000",
     "http://frontend:3001",
     "https://circles.csesoc.unsw.edu.au",
-    "https://circles.csesoc.app",
+    "https://circles.devsoc.app",
     "https://cselectives.staging.csesoc.unsw.edu.au",
     "https://cselectives.csesoc.unsw.edu.au",
 ]
@@ -59,4 +59,3 @@ async def index() -> str:
 def live_year() -> int:
     """ sanity check for the live year """
     return LIVE_YEAR
-

docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   mongodb:
-    image: mongo:6.0.5
+    image: mongo:6.0.14
     container_name: mongodb
     volumes:
       # Named volume to persist database

frontend/README.md

@@ -15,7 +15,7 @@
 
 If you are doing superficial work with the frontend and do not need to communicate with the backend, you can `cd` to the `frontend` folder, run `npm install` to install required packages locally, and then `npm start`. This is faster than running docker compose since you avoid having to set up the backend and mongodb containers.
 
-> NOTE: Your frontend requests will be fetching from `https://circlesapi.csesoc.app` and the production version of the Circles API will be used to handle your backend requests.
+> NOTE: Your frontend requests will be fetching from `https://circlesapi.devsoc.app` and the production version of the Circles API will be used to handle your backend requests.
 
 ### Option 2: Using Docker
 
@@ -46,7 +46,7 @@ In `frontend.env`, add:
 
 - `VITE_BACKEND_API_BASE_URL=http://localhost:8000/`
 
-> NOTE: The `VITE_BACKEND_API_BASE_URL` environment variable is the base url endpoint that the backend is running on. If the environment variable is not specified, the react application will default to using `https://circlesapi.csesoc.app/` as the base url when calling the API endpoint.
+> NOTE: The `VITE_BACKEND_API_BASE_URL` environment variable is the base url endpoint that the backend is running on. If the environment variable is not specified, the react application will default to using `https://circlesapi.devsoc.app/` as the base url when calling the API endpoint.
 
 Feel free to replace username and password to any value. The username and password in `backend.env` must match the values in `mongodb.env`. The `env` folder has been added to `.gitignore` and will not be committed to the repo.