Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment #326

Merged
merged 56 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
3b70c59
test: cleanup type test structure
francisvaut Apr 13, 2024
6d18a65
test: student type
francisvaut Apr 13, 2024
87f7647
test: teacher type
francisvaut Apr 13, 2024
adde979
test: user test]
francisvaut Apr 13, 2024
6196dbb
test: course type
francisvaut Apr 13, 2024
ef8c571
test: faculty type
francisvaut Apr 13, 2024
1b19cc2
test: group type
francisvaut Apr 13, 2024
4c8ff01
test: project type
francisvaut Apr 13, 2024
3f388bf
test: response type
francisvaut Apr 13, 2024
95ce8d5
test: structureCheck type
francisvaut Apr 13, 2024
3530899
test: submissionStatus type
francisvaut Apr 13, 2024
c7b5c44
test: submission type
francisvaut Apr 13, 2024
054eaf9
Merge pull request #305 from SELab-2/service-tests
francisvaut Apr 14, 2024
000ac86
Cleanups (#307)
francisvaut Apr 15, 2024
efa6c9c
feat: make course cards clickable (#303)
EwoutV Apr 15, 2024
fdea911
Run extra checks (#309)
Topvennie Apr 15, 2024
14795ce
chore: redirect from dashboard, prevent authentication error
EwoutV Apr 15, 2024
16a556c
chore: login page styling fix
EwoutV Apr 15, 2024
0dbe20f
feat: endpoint for eagerly fetching all projects for students/teacher…
EwoutV Apr 15, 2024
4093b80
chore: linting
EwoutV Apr 15, 2024
c634e2e
fix: tests
EwoutV Apr 15, 2024
8afaa94
Merge pull request #310 from SELab-2/user-experience
francisvaut Apr 15, 2024
adb0248
Run actions on GitHub servers (#314)
francisvaut Apr 15, 2024
d1b7a09
chore: try making fixtures and load them
tyboro2002 Apr 11, 2024
e2059e3
chore: make fixtures a extra arg to development.sh
tyboro2002 Apr 11, 2024
09e8951
chore: fix loading isues
tyboro2002 Apr 12, 2024
40ad9f9
chore: fix loading isues with sleep
tyboro2002 Apr 12, 2024
8736d08
chore: improved loading by redirecting output to dev null
tyboro2002 Apr 12, 2024
d45aac3
fixed sleep
tyboro2002 Apr 13, 2024
349279b
chore: commit to make me able to restore in case of errors
tyboro2002 Apr 13, 2024
ba65cc9
chore: added create fixture script
tyboro2002 Apr 13, 2024
9767fd4
chore: fixed fixtures
tyboro2002 Apr 14, 2024
38c8509
chore: complete merge
tyboro2002 Apr 14, 2024
1451a1e
chore: fixed some concerns of vincent
tyboro2002 Apr 14, 2024
bcc6a9b
chore: re added enviroment line to development.yml backend container …
tyboro2002 Apr 14, 2024
97ff39a
chore: made fixtures that work (some extra need to be made for submis…
tyboro2002 Apr 14, 2024
77f3f95
chore: use sed
Topvennie Apr 15, 2024
47b8273
chore: change data option functionality
Topvennie Apr 15, 2024
199f46d
chore: add seeder support
Topvennie Apr 16, 2024
953a260
docs: Added comments
Topvennie Apr 16, 2024
33649e2
chore: remove old seeder file
Topvennie Apr 16, 2024
484c68d
chore: start
tyboro2002 Apr 16, 2024
20400ef
Revert "chore: start"
francisvaut Apr 16, 2024
469702d
chore: remove env variables
Topvennie Apr 16, 2024
a3316ac
Merge pull request #301 from SELab-2/seeder-improvements
tyboro2002 Apr 16, 2024
09eecf3
chore: add fixturew
Topvennie Apr 16, 2024
441ef50
Merge pull request #318 from SELab-2/seeder-improvements
tyboro2002 Apr 16, 2024
e7d8702
chore: fixed small errors and updated frontend tests
EwoutV Apr 16, 2024
8ef24ce
Run extra checks (#312)
Topvennie Apr 16, 2024
8871ccc
Run extra checks (#320)
Topvennie Apr 16, 2024
d03ca7a
Merge pull request #311 from SELab-2/projects-endpoint
BramMeir Apr 16, 2024
6663c01
Single course view (#315)
BramMeir Apr 16, 2024
7f9219a
Seeder improvements (#324)
Topvennie Apr 16, 2024
4bb0bc0
build(deps): bump gunicorn from 21.2.0 to 22.0.0 in /backend (#325)
dependabot[bot] Apr 17, 2024
c5dea3d
Admin panel (#321)
bsilkyn Apr 17, 2024
c8edaa6
Project editor (#319)
EwoutV Apr 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .dev.env
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ REDIS_IP=192.168.90.10
REDIS_PORT=6379

# Django
DJANGO_SECRET_KEY="" # Set to a random string
DJANGO_DEBUG=True # Django debug mode
DJANGO_DOMAIN_NAME=localhost # Domain name for the Django server
DJANGO_CAS_URL_PREFIX="" # URL prefix for the CAS server. Should be empty for development
DJANGO_CAS_PORT=8080 # Port for the CAS server. Should be 8080 if DJANGO_DOMAIN_NAME is localhost
DJANGO_DB_ENGINE=django.db.backends.sqlite3 # Database engine
DJANGO_REDIS_HOST=${REDIS_IP} # Redis configuration
DJANGO_SECRET_KEY=""
DJANGO_DEBUG=True
DJANGO_DOMAIN_NAME=localhost
DJANGO_CAS_URL_PREFIX=""
DJANGO_CAS_PORT=8080
DJANGO_DB_ENGINE="django.db.backends.sqlite3"
DJANGO_REDIS_HOST=${REDIS_IP}
DJANGO_REDIS_PORT=${REDIS_PORT}
9 changes: 4 additions & 5 deletions .github/workflows/backend-linting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@ on:

jobs:
test:
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
- name: Add permission to remove contents of previous action script
run: echo ${{ secrets.SUDO }} | sudo -S chown -R $USER:$USER /home/selab2/actions-runner/_work/UGent-7/
- uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: "3.11"
- name: Install dependencies
run: |
cd backend
python -m pip install --upgrade pip
pip install poetry
poetry install --directory=./backend
poetry install
- name: Execute linting checks
run: flake8 --config ./backend/.flake8 ./backend
run: cd backend; poetry run flake8 --config .flake8
6 changes: 2 additions & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ on:

jobs:
test:
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
- name: Add permission to remove contents of previous action script
run: echo ${{ secrets.SUDO }} | sudo -S chown -R $USER:$USER /home/selab2/actions-runner/_work/UGent-7/
- uses: actions/checkout@v4
- name: Run tests
run: echo ${{ secrets.SUDO }} | sudo -S ./test.sh -c
run: ./test.sh -c
16 changes: 8 additions & 8 deletions .prod.env
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ POSTGRES_IP=192.168.90.9
POSTGRES_PORT=5432
POSTGRES_DB=selab
POSTGRES_USER=selab_user
POSTGRES_PASSWORD="" # Set to desired password
POSTGRES_PASSWORD=""

# Redis
REDIS_IP=192.168.90.10
REDIS_PORT=6379

# Django
DJANGO_SECRET_KEY="" # Set to a random string
DJANGO_DEBUG=False # Django debug mode
DJANGO_DOMAIN_NAME="" # Domain name for the Django server
DJANGO_CAS_URL_PREFIX="" # URL prefix for the CAS server
DJANGO_CAS_PORT="" # Port for the CAS server
DJANGO_DB_ENGINE=django.db.backends.postgresql # Database engine configuration
DJANGO_SECRET_KEY=""
DJANGO_DEBUG=False
DJANGO_DOMAIN_NAME=""
DJANGO_CAS_URL_PREFIX=""
DJANGO_CAS_PORT=""
DJANGO_DB_ENGINE=django.db.backends.postgresql
DJANGO_DB_NAME=${POSTGRES_DB}
DJANGO_DB_USER=${POSTGRES_USER}
DJANGO_DB_PASSWORD=${POSTGRES_PASSWORD}
DJANGO_DB_HOST=${POSTGRES_IP}
DJANGO_DB_PORT=${POSTGRES_PORT}
DJANGO_REDIS_HOST=${REDIS_IP} # Redis configuration
DJANGO_REDIS_HOST=${REDIS_IP}
DJANGO_REDIS_PORT=${REDIS_PORT}
10 changes: 0 additions & 10 deletions backend/api/fixtures/assistants.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions backend/api/fixtures/checks.yaml

This file was deleted.

87 changes: 0 additions & 87 deletions backend/api/fixtures/courses.yaml

This file was deleted.

46 changes: 0 additions & 46 deletions backend/api/fixtures/groups.yaml

This file was deleted.

1 change: 1 addition & 0 deletions backend/api/fixtures/large/large.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions backend/api/fixtures/medium/medium.json

Large diffs are not rendered by default.

37 changes: 0 additions & 37 deletions backend/api/fixtures/projects.yaml

This file was deleted.

1 change: 1 addition & 0 deletions backend/api/fixtures/small/small.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"model": "api.dockerimage", "pk": 1, "fields": {"name": "far.gif", "file": "/population/huge/other/identify", "owner": "15", "public": true}}, {"model": "api.dockerimage", "pk": 2, "fields": {"name": "heart.gif", "file": "/treat/enjoy", "owner": "4", "public": true}}, {"model": "api.dockerimage", "pk": 3, "fields": {"name": "price.tiff", "file": "/thus/teacher/heart", "owner": "15", "public": true}}, {"model": "api.dockerimage", "pk": 4, "fields": {"name": "strategy.jpg", "file": "/always/a/born/wonder/yes", "owner": "12", "public": true}}, {"model": "api.dockerimage", "pk": 5, "fields": {"name": "religious.bmp", "file": "/every/great/whom", "owner": "10", "public": true}}, {"model": "api.fileextension", "pk": 1, "fields": {"extension": "bmp"}}, {"model": "api.fileextension", "pk": 2, "fields": {"extension": "gif"}}, {"model": "api.fileextension", "pk": 3, "fields": {"extension": "xls"}}, {"model": "api.fileextension", "pk": 4, "fields": {"extension": "mp4"}}, {"model": "api.fileextension", "pk": 5, "fields": {"extension": "wav"}}, {"model": "api.course", "pk": 1, "fields": {"name": "Stand-alone incremental function", "academic_startyear": 2024, "description": "Perform draw exactly they. Learn fact find read lay include.", "faculty": "Ingenieurswetenschappen_Architectuur", "parent_course": null}}, {"model": "api.course", "pk": 2, "fields": {"name": "Universal client-driven architecture", "academic_startyear": 2025, "description": "Peace sound shake ever current give.", "faculty": "Letteren_Wijsbegeerte", "parent_course": null}}, {"model": "api.course", "pk": 3, "fields": {"name": "Adaptive system-worthy instruction set", "academic_startyear": 2023, "description": "Wait specific new consider. Get natural early step their third there. A resource green follow mother.", "faculty": "Bio-ingenieurswetenschappen", "parent_course": null}}, {"model": "api.project", "pk": 1, "fields": {"name": "Organized grid-enabled analyzer", "description": "Process leave character improve almost something western. Character cut remain energy prepare political.", "visible": true, "archived": false, "locked_groups": false, "start_date": "2024-03-12T21:31:28.243Z", "deadline": "2024-05-22T21:31:28.243Z", "max_score": 72, "score_visible": false, "group_size": 15, "course": 1}}, {"model": "api.project", "pk": 2, "fields": {"name": "Front-line system-worthy database", "description": "Every stand memory machine culture expect reduce record. Actually because happy again admit. Serious feel property accept century up.", "visible": true, "archived": false, "locked_groups": true, "start_date": "2024-01-18T21:31:28.243Z", "deadline": "2024-06-22T21:31:28.243Z", "max_score": 47, "score_visible": true, "group_size": 9, "course": 3}}, {"model": "api.project", "pk": 3, "fields": {"name": "Integrated encompassing utilization", "description": "Area detail ahead win. Civil according she peace something front that lot. None food none structure want will.", "visible": true, "archived": false, "locked_groups": false, "start_date": "2024-01-19T21:31:28.243Z", "deadline": "2024-07-06T21:31:28.243Z", "max_score": 75, "score_visible": true, "group_size": 3, "course": 1}}, {"model": "api.project", "pk": 4, "fields": {"name": "De-engineered interactive info-mediaries", "description": "Central pull boy address feel recognize eat. Couple radio glass special free. Ago present air doctor husband worker beat attention. Like fight data lose south same summer population.", "visible": true, "archived": false, "locked_groups": false, "start_date": "2024-05-25T21:31:28.243Z", "deadline": "2024-06-22T21:31:28.243Z", "max_score": 50, "score_visible": false, "group_size": 13, "course": 2}}, {"model": "api.structurecheck", "pk": 0, "fields": {"name": "/go/hear/believe/role/alone/determine", "project": 3, "obligated_extensions": [2, 3, 4], "blocked_extensions": [4]}}, {"model": "api.structurecheck", "pk": 1, "fields": {"name": "/enough/model/station", "project": 3, "obligated_extensions": [3], "blocked_extensions": [2, 3, 5]}}, {"model": "api.extracheck", "pk": 1, "fields": {"project": 4, "docker_image": 1, "file": "/concern/energy/trouble/kitchen/suggest", "timeout": 276, "show_log": true}}, {"model": "api.student", "pk": "0", "fields": {"is_active": true, "student_id": "0", "courses": [1]}}, {"model": "api.student", "pk": "1", "fields": {"is_active": true, "student_id": "1", "courses": [1]}}, {"model": "api.student", "pk": "2", "fields": {"is_active": true, "student_id": "2", "courses": [1]}}, {"model": "api.student", "pk": "3", "fields": {"is_active": true, "student_id": "3", "courses": [1]}}, {"model": "api.student", "pk": "4", "fields": {"is_active": true, "student_id": "4", "courses": [1]}}, {"model": "api.student", "pk": "5", "fields": {"is_active": true, "student_id": "5", "courses": [1]}}, {"model": "api.student", "pk": "6", "fields": {"is_active": true, "student_id": "6", "courses": [1]}}, {"model": "api.student", "pk": "7", "fields": {"is_active": true, "student_id": "7", "courses": [1]}}, {"model": "api.student", "pk": "8", "fields": {"is_active": true, "student_id": "8", "courses": [1]}}, {"model": "api.student", "pk": "9", "fields": {"is_active": true, "student_id": "9", "courses": [1]}}, {"model": "api.group", "pk": 1, "fields": {"project": 3, "score": 50.0, "students": []}}, {"model": "api.group", "pk": 2, "fields": {"project": 1, "score": 8.0, "students": ["0", "1", "4", "5"]}}, {"model": "api.group", "pk": 3, "fields": {"project": 1, "score": 7.0, "students": ["2", "3", "6", "7"]}}, {"model": "api.group", "pk": 4, "fields": {"project": 2, "score": 5.0, "students": []}}, {"model": "api.group", "pk": 5, "fields": {"project": 3, "score": 18.0, "students": []}}, {"model": "api.group", "pk": 6, "fields": {"project": 1, "score": 66.0, "students": []}}, {"model": "api.group", "pk": 7, "fields": {"project": 1, "score": 34.0, "students": ["8", "9"]}}, {"model": "api.submission", "pk": 1, "fields": {"group": 1, "submission_number": null, "submission_time": "2024-04-03T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 2, "fields": {"group": 5, "submission_number": null, "submission_time": "2024-04-06T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 3, "fields": {"group": 6, "submission_number": null, "submission_time": "2024-04-15T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 4, "fields": {"group": 1, "submission_number": null, "submission_time": "2024-04-11T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 5, "fields": {"group": 7, "submission_number": null, "submission_time": "2024-04-09T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 6, "fields": {"group": 6, "submission_number": null, "submission_time": "2024-04-07T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 7, "fields": {"group": 3, "submission_number": null, "submission_time": "2024-04-12T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 8, "fields": {"group": 4, "submission_number": null, "submission_time": "2024-04-05T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 9, "fields": {"group": 5, "submission_number": null, "submission_time": "2024-04-09T00:00:00Z", "is_valid": true}}, {"model": "api.submission", "pk": 10, "fields": {"group": 6, "submission_number": null, "submission_time": "2024-04-04T00:00:00Z", "is_valid": true}}, {"model": "api.submissionfile", "pk": 1, "fields": {"submission": 10, "file": "/unit/political/training/control.jpg"}}, {"model": "api.checkresult", "pk": 289528, "fields": {"polymorphic_ctype": null, "submission": 9, "result": "FAILED", "error_message": "OBLIGATED_EXTENSION_NOT_FOUND"}}, {"model": "api.checkresult", "pk": 331891, "fields": {"polymorphic_ctype": null, "submission": 4, "result": "QUEUED", "error_message": null}}, {"model": "api.checkresult", "pk": 482730, "fields": {"polymorphic_ctype": null, "submission": 2, "result": "RUNNING", "error_message": null}}, {"model": "api.checkresult", "pk": 753267, "fields": {"polymorphic_ctype": null, "submission": 1, "result": "SUCCESS", "error_message": null}}, {"model": "api.checkresult", "pk": 762341, "fields": {"polymorphic_ctype": null, "submission": 2, "result": "FAILED", "error_message": "BLOCKED_EXTENSION"}}, {"model": "api.checkresult", "pk": 879866, "fields": {"polymorphic_ctype": null, "submission": 4, "result": "RUNNING", "error_message": null}}, {"model": "api.checkresult", "pk": 899073, "fields": {"polymorphic_ctype": null, "submission": 9, "result": "SUCCESS", "error_message": null}}, {"model": "api.checkresult", "pk": 906214, "fields": {"polymorphic_ctype": null, "submission": 1, "result": "QUEUED", "error_message": null}}, {"model": "api.structurecheckresult", "pk": 289528, "fields": {"structure_check": 1}}, {"model": "api.structurecheckresult", "pk": 331891, "fields": {"structure_check": 0}}, {"model": "api.structurecheckresult", "pk": 482730, "fields": {"structure_check": 0}}, {"model": "api.structurecheckresult", "pk": 753267, "fields": {"structure_check": 0}}, {"model": "api.structurecheckresult", "pk": 762341, "fields": {"structure_check": 1}}, {"model": "api.structurecheckresult", "pk": 879866, "fields": {"structure_check": 1}}, {"model": "api.structurecheckresult", "pk": 899073, "fields": {"structure_check": 0}}, {"model": "api.structurecheckresult", "pk": 906214, "fields": {"structure_check": 1}}, {"model": "api.assistant", "pk": "10", "fields": {"is_active": true, "courses": [2]}}, {"model": "api.assistant", "pk": "11", "fields": {"is_active": true, "courses": [2]}}, {"model": "api.assistant", "pk": "12", "fields": {"is_active": true, "courses": [1]}}, {"model": "api.assistant", "pk": "13", "fields": {"is_active": true, "courses": [1]}}, {"model": "api.assistant", "pk": "14", "fields": {"is_active": true, "courses": [1]}}, {"model": "api.teacher", "pk": "15", "fields": {"is_active": true, "courses": [1]}}, {"model": "api.teacher", "pk": "16", "fields": {"is_active": true, "courses": [1]}}, {"model": "api.teacher", "pk": "17", "fields": {"is_active": true, "courses": [2]}}]
18 changes: 0 additions & 18 deletions backend/api/fixtures/students.yaml

This file was deleted.

35 changes: 0 additions & 35 deletions backend/api/fixtures/submissions.yaml

This file was deleted.

Loading
Loading