Skip to content

Commit

Permalink
REAL working staging build! (#1094)
Browse files Browse the repository at this point in the history
- pushed all deps to latest

- removed frontend slices in favour of backend state

- added new page for guiding the login flow

- fixed a couple of bugs in degree wizard

- improved caching on graphical selector

- used a more generic antd theme instead of our highly custom one
  • Loading branch information
Peedee2002 authored Feb 4, 2024
1 parent e996e57 commit a5e25f1
Show file tree
Hide file tree
Showing 235 changed files with 974,059 additions and 331,948 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,24 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: csesoc/deployment
token: ${{ secrets.GH_TOKEN }}
ref: migration
- name: Install yq - portable yaml processor
uses: mikefarah/yq@v4.27.5
uses: mikefarah/yq@v4.35.2
- name: Update deployment
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
run: |
git config user.name "CSESoc CD"
git config user.email "[email protected]"
git checkout -b update/circles/${{ github.sha }}
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/circles-frontend:${{ github.sha }}"' apps/projects/circles/deploy-frontend.yml
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/circles-backend:${{ github.sha }}"' apps/projects/circles/deploy-backend.yml
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/circles-frontend:${{ github.sha }}"' projects/circles/deploy-frontend.yml
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/circles-backend:${{ github.sha }}"' projects/circles/deploy-backend.yml
git add .
git commit -m "feat(circles): update images"
git push -u origin update/circles/${{ github.sha }}
gh pr create --title "feat(circles): update image" --body "Updates the image for the circles deployment to commit csesoc/circles@${{ github.sha }}." > URL
gh pr create -B migration --title "feat(circles): update image" --body "Updates the image for the circles deployment to commit csesoc/circles@${{ github.sha }}." > URL
gh pr merge $(cat URL) --squash -d
13 changes: 3 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,18 @@
"eslint.workingDirectories": [
"frontend"
],
"VitestRunner.executionArg": "npx --prefix frontend",
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"python.testing.cwd": "${workspaceFolder}/backend",
"mypy.configFile": "./backend/mypy.ini",
"files.exclude": {
"**/__pycache__": true,
"**/.hypothesis": true,
"**/.pytest_cache": true
},
"python.linting.pylintEnabled": true,
"python.linting.pylintArgs": [
"--rcfile=${workspaceFolder}/.github/workflows/.pylintrc"
],
"python.linting.mypyEnabled": true,
"python.linting.mypyArgs": [
"--config-file=${workspaceFolder}/backend/mypy.ini"
],
"python.analysis.typeCheckingMode": "basic",
"[python]": {
"editor.formatOnSave": false
}
},
"python.analysis.autoImportCompletions": true
}
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![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/csesoc/Circles/actions/workflows/ci_FE.yml/badge.svg)](https://github.com/csesoc/Circles/actions/workflows/ci_FE.yml)
[![Backend Tests](https://github.com/csesoc/Circles/actions/workflows/ci_BE.yml/badge.svg)](https://github.com/csesoc/Circles/actions/workflows/ci_BE.yml)
[![Pylint](https://github.com/csesoc/Circles/actions/workflows/pylinter.yml/badge.svg)](https://github.com/csesoc/Circles/actions/workflows/pylinter.yml)
![Lines of code](https://img.shields.io/tokei/lines/github/csesoc/Circles)
![GitHub Repo Size](https://img.shields.io/github/repo-size/csesoc/Circles)
[![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)
[![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)

# Circles

Expand All @@ -16,9 +16,9 @@ You can find a live build of Circles at [https://circles.csesoc.app](https://cir

## Features

![Features Help Image](https://raw.githubusercontent.com/csesoc/Circles/dev/frontend/src/assets/infographic.png)
![Features Help Image](https://raw.githubusercontent.com/devsoc-unsw/Circles/dev/frontend/src/assets/infographic.png)

NOTE: we currently only support the Computer Science (3778) degree - but we will add more!
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!

- Adaptive course selector:
- Allows you to explore your currently unlocked courses
Expand All @@ -30,13 +30,14 @@ NOTE: we currently only support the Computer Science (3778) degree - but we will
- 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:
- 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

## Future Plans

This project is rapidly expanding and our roadmap includes features such as:

- 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
- Graphical view:
- A graphical model of your degree plan, to show you a beautiful dependency tree of courses relevant to your degree
- Will adapt to your degree structure
Expand Down
Loading

0 comments on commit a5e25f1

Please sign in to comment.