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

To main we go #431

Merged
merged 104 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
71a2224
chore: hardcoded variable gone
Topvennie Apr 18, 2024
fe09813
chore: admin panel route guard #199
bsilkyn Apr 19, 2024
d1094eb
chore: random excerpt
Topvennie Apr 19, 2024
846ce27
chore: new fixtures
Topvennie Apr 19, 2024
3a7576c
chore: change default page size (#352)
Topvennie Apr 19, 2024
caa8d69
fix: translation
BramMeir Apr 19, 2024
1767fe0
Merge pull request #353 from SELab-2/fix-translation
tyboro2002 Apr 19, 2024
c1059a1
Merge pull request #351 from SELab-2/seed
tyboro2002 Apr 19, 2024
a307ec8
build: change setup python action version
francisvaut Apr 19, 2024
b7b7ee9
Merge pull request #357 from SELab-2/update-actions
tyboro2002 Apr 19, 2024
c853106
chore: add admin guard file that I forgot to add #199
bsilkyn Apr 20, 2024
c20671c
Merge pull request #350 from SELab-2/admin-guard
francisvaut Apr 20, 2024
10be8b6
chore: commit before merge
DeLany123 Apr 20, 2024
474ec00
Merge remote-tracking branch 'origin/development' into development
DeLany123 Apr 20, 2024
115add6
build: add coverage as backend dependency (#359)
bsilkyn Apr 21, 2024
734ea61
Choose card fix (#360)
DeLany123 Apr 21, 2024
be953ba
fix: Admin panel fix (#364)
bsilkyn Apr 24, 2024
7e57b82
Roles course (#365)
BramMeir Apr 25, 2024
fd51d0f
chore: fixed some layout issues
EwoutV Apr 25, 2024
6ad6762
chore: project card fixes
EwoutV Apr 25, 2024
b6751a6
chore: seperated course cards
EwoutV Apr 25, 2024
63dbc76
chore: linting
EwoutV Apr 25, 2024
ba91907
chore: changes to make bram happy
EwoutV Apr 26, 2024
7e78c8d
chore: fixed translatiosn
EwoutV Apr 26, 2024
fbc59ad
chore: fixed some layout issues (#368)
EwoutV Apr 26, 2024
981a944
chore: deployment improvements (#372)
Topvennie Apr 27, 2024
10df4a5
Group creation (#374)
BramMeir Apr 27, 2024
43b41ec
Frontend tests fix (#375)
francisvaut Apr 27, 2024
35d350c
Merge remote-tracking branch 'origin/development' into development
DeLany123 Apr 28, 2024
b66df40
feat: Admin docker images (#345)
bsilkyn May 1, 2024
1a99af7
Private courses with sharing link (#387)
BramMeir May 1, 2024
80abef5
chore: more layout fixes
EwoutV May 1, 2024
89c5570
chore: added course list empty slot
EwoutV May 1, 2024
f982588
Merge branch 'refs/heads/development' into layout-fixes
EwoutV May 1, 2024
ac42125
chore: linting
EwoutV May 1, 2024
d3800a3
chore: error template slots (#388)
EwoutV May 1, 2024
6846276
fix: past deadlines message, eager load submission status on projects
EwoutV May 2, 2024
1bdb668
chore: linting
EwoutV May 2, 2024
443dd0c
Fix empty search message (#389)
BramMeir May 2, 2024
195f93f
fix: added backend files
EwoutV May 2, 2024
1c32415
chore: fixed backend tests
EwoutV May 2, 2024
a164f55
test: comment failing frontend tests
francisvaut May 2, 2024
79964d2
Merge branch 'better-deadline' of github.com:SELab-2/UGent-7 into bet…
francisvaut May 2, 2024
78a4f05
fix: linting errors
francisvaut May 2, 2024
d2d860b
fix: comment linting error
francisvaut May 2, 2024
731e021
Merge pull request #391 from SELab-2/better-deadline
francisvaut May 2, 2024
97455f3
Merge remote-tracking branch 'origin/development' into development
DeLany123 May 2, 2024
c619218
fix project.service.ts which Francis destroyed on purpose
DeLany123 May 2, 2024
0fa3158
chore: student help pages (#394)
tyboro2002 May 2, 2024
a9efaa7
Course link refactor (#403)
BramMeir May 5, 2024
6539841
chore: rework the admin panel navigation system
bsilkyn Apr 24, 2024
1d6587f
chore: lint fixes
bsilkyn Apr 28, 2024
fed5d32
chore: remove abstraction of header and restore previous state
bsilkyn Apr 30, 2024
cb56a10
chore: lint fixes
bsilkyn Apr 30, 2024
d17f5b3
chore: add docker images tab in header items
bsilkyn May 2, 2024
63b9837
chore: lint fix
bsilkyn May 2, 2024
48b50d6
chore: cleanup
EwoutV May 2, 2024
01a4a28
chore: lint fix + remove unnecessary loading and empty template in Us…
bsilkyn May 2, 2024
9d49255
chore: backend lint fix
bsilkyn May 2, 2024
890e256
chore: adjust flake8 to ignore W503, since it's conflicting with W504
bsilkyn May 2, 2024
fd44bdd
chore: I mean to ignore W504 instead of W503
bsilkyn May 2, 2024
d5eebe0
fix: remove defineExpose from import
bsilkyn May 2, 2024
0ca385b
chore: rework the admin panel navigation system
bsilkyn Apr 24, 2024
c5fec0e
chore: lint fixes
bsilkyn Apr 28, 2024
bc5a82c
chore: remove abstraction of header and restore previous state
bsilkyn Apr 30, 2024
8e9042d
chore: backend lint fix
bsilkyn May 2, 2024
22ef7ca
chore: adjust flake8 to ignore W503, since it's conflicting with W504
bsilkyn May 2, 2024
c0a436d
chore: revert tsconfig, code that updated it, is removed anyways + ad…
bsilkyn May 3, 2024
da07af2
chore: lint fix
bsilkyn May 3, 2024
5820760
Merge pull request #381 from SELab-2/admin-panel-fix
bsilkyn May 5, 2024
003c32e
chore: fix package lock
tyboro2002 May 6, 2024
eab8735
chore: to js we go
Topvennie May 6, 2024
6755a59
Run checks (#397)
Topvennie May 6, 2024
5816fbc
build(deps): bump jinja2 from 3.1.3 to 3.1.4 in /backend
dependabot[bot] May 6, 2024
6dd71ab
Merge pull request #404 from SELab-2/dependabot/pip/backend/jinja2-3.1.4
bsilkyn May 8, 2024
ced2428
chore: deploy (#406)
Topvennie May 9, 2024
c46cd7c
Help (#410)
tyboro2002 May 10, 2024
2ea676f
test: Login/logout tests (#408)
bsilkyn May 13, 2024
29c73f1
Realistic fixtures (#415)
Topvennie May 13, 2024
def84ab
Extra checks frontend (#417)
BramMeir May 13, 2024
c08540f
chore: readded tests (#419)
Topvennie May 13, 2024
d3762e4
chore: fix tests
Topvennie May 13, 2024
89128c6
chore: fix fixtures
Topvennie May 13, 2024
6a402b1
feat: Project "Download grades as a CSV file" button (#402)
bsilkyn May 13, 2024
b8bcf11
Help pages (#414)
tyboro2002 May 13, 2024
2dde1fe
Layout changes extra checks selector (#420)
BramMeir May 13, 2024
6f6aba3
Download files (#416)
Topvennie May 13, 2024
b695f02
chore: better submission status
francisvaut May 13, 2024
33d118d
Revert "chore: better submission status"
francisvaut May 13, 2024
3a58f86
fix: docker image owner
Topvennie May 14, 2024
968bf1b
fix: cypress tests
Topvennie May 14, 2024
4fc0cae
chore: reduce docker image size
Topvennie May 14, 2024
0d316df
chore: npm install cypress
Topvennie May 14, 2024
51809de
Merge pull request #425 from SELab-2/cypress_fix
bsilkyn May 15, 2024
f94c421
fix: crash from partial update
Topvennie May 15, 2024
087a8f4
chore: allow owner updates
Topvennie May 15, 2024
cac233a
chore: cleanup my booboo
Topvennie May 15, 2024
8a4f1e3
chore: docker images permissions
Topvennie May 15, 2024
9fffc21
Merge pull request #424 from SELab-2/image_owner
francisvaut May 15, 2024
143c994
chore: better submission status (#421)
francisvaut May 16, 2024
dda6010
feat: artifacts (#422)
Topvennie May 16, 2024
863b692
chore: went through some todos (#426)
Topvennie May 16, 2024
2024d88
Merge remote-tracking branch 'origin/main' into development
Topvennie May 16, 2024
f9353d6
Revert "Merge remote-tracking branch 'origin/main' into development"
Topvennie May 16, 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
5 changes: 3 additions & 2 deletions .dev.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@ TZ=Europe/Brussels
DATA_DIR="./data"
BACKEND_DIR="./backend"
FRONTEND_DIR="./frontend"
DOCS_DIR="./docs"
SSL_DIR="./data/nginx/ssl"

# Redis
REDIS_IP=192.168.90.10
REDIS_PORT=6379

# Django
DJANGO_SECRET_KEY=""
DJANGO_ROOT_DIR=""
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_HOST="redis"
DJANGO_REDIS_PORT=${REDIS_PORT}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.tool-versions
.env
.venv
.idea
Expand All @@ -21,3 +20,6 @@ frontend/cypress/videos/*
!data/nginx/nginx.dev.conf
!data/nginx/nginx.test.conf
!data/nginx/nginx.prod.conf

docs/.vitepress/dist
docs/.vitepress/cache
8 changes: 4 additions & 4 deletions .prod.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ TZ=Europe/Brussels
DATA_DIR="./data"
BACKEND_DIR="./backend"
FRONTEND_DIR="./frontend"
DOCS_DIR="./docs"
SSL_DIR=""

# Postgress DB
POSTGRES_IP=192.168.90.9
POSTGRES_PORT=5432
POSTGRES_DB=selab
POSTGRES_USER=selab_user
POSTGRES_PASSWORD=""

# Redis
REDIS_IP=192.168.90.10
REDIS_PORT=6379

# Django
DJANGO_SECRET_KEY=""
DJANGO_ROOT_DIR=""
DJANGO_DEBUG=False
DJANGO_DOMAIN_NAME=""
DJANGO_CAS_URL_PREFIX=""
Expand All @@ -30,7 +30,7 @@ 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_HOST="postgres"
DJANGO_DB_PORT=${POSTGRES_PORT}
DJANGO_REDIS_HOST=${REDIS_IP}
DJANGO_REDIS_HOST="redis"
DJANGO_REDIS_PORT=${REDIS_PORT}
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
python 3.11.8
nodejs 18.17.1
18 changes: 10 additions & 8 deletions backend/.flake8
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
[flake8]

# Ignore unused imports
ignore = F401
# Ignore unused imports; W503 and W504 conflict with each-other
ignore = F401
W504
W503
C901

max-line-length = 125

max-complexity = 10

exclude = .git,
__pycache__,
.venv,
venv,
migrations

exclude = .git,
__pycache__,
.venv,
venv,
migrations
19 changes: 14 additions & 5 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
FROM python:3.11.4-alpine3.18
FROM python:3.11.4-alpine3.18 as requirements

RUN apk update && apk add --no-cache gettext libintl && pip install -U poetry
RUN poetry config virtualenvs.create false
RUN pip install poetry-plugin-export

WORKDIR /code

COPY pyproject.toml poetry.lock ./
RUN poetry install --only main

COPY . ./
RUN poetry export --without-hashes --format=requirements.txt > requirements.txt


FROM python:3.11.4-alpine3.18

RUN apk add --no-cache gettext libintl

WORKDIR /code

COPY --from=requirements /code/requirements.txt .

RUN pip install -r requirements.txt --no-cache-dir
2 changes: 1 addition & 1 deletion backend/api/fixtures/large/large.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion backend/api/fixtures/medium/medium.json

Large diffs are not rendered by default.

Loading