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

Project editor #319

Merged
merged 18 commits into from
Apr 18, 2024
Merged

Project editor #319

merged 18 commits into from
Apr 18, 2024

Conversation

EwoutV
Copy link
Contributor

@EwoutV EwoutV commented Apr 16, 2024

  • Added an editor component for course and project descriptions
  • Added an extra field excerpt for courses, containing a short version of the HTML description
  • Added nh3 for HTML sanitization in the backend
  • Improved the project list, added another kind of project card

closes #250

@EwoutV EwoutV added feature A new feature containing functionality frontend Issues regarding the frontend backend labels Apr 16, 2024
@EwoutV EwoutV added this to the Frontend milestone milestone Apr 16, 2024
@EwoutV EwoutV self-assigned this Apr 16, 2024
EwoutV added 5 commits April 16, 2024 18:15
# Conflicts:
#	backend/api/serializers/project_serializer.py
#	frontend/src/assets/lang/en.json
#	frontend/src/assets/lang/nl.json
#	frontend/src/components/projects/ProjectList.vue
#	frontend/src/composables/services/assistant.service.ts
#	frontend/src/composables/services/teacher.service.ts
#	frontend/src/test/unit/services/project_service.test.ts
#	frontend/src/types/Project.ts
#	frontend/src/views/calendar/CalendarView.vue
#	frontend/src/views/dashboard/roles/StudentDashboardView.vue
# Conflicts:
#	backend/api/fixtures/small/small.json
#	backend/poetry.lock
Copy link
Contributor

@BramMeir BramMeir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long wait, but looks very clean!

frontend/src/assets/lang/nl.json Show resolved Hide resolved
frontend/src/composables/services/assistant.service.ts Outdated Show resolved Hide resolved
@EwoutV EwoutV requested a review from BramMeir April 18, 2024 07:16
@BramMeir BramMeir merged commit c8edaa6 into development Apr 18, 2024
3 checks passed
@BramMeir BramMeir deleted the project-editor branch April 18, 2024 08:06
BramMeir added a commit that referenced this pull request Apr 18, 2024
* test: cleanup type test structure

* test: student type

* test: teacher type

* test: user test]

* test: course type

* test: faculty type

* test: group type

* test: project type

* test: response type

* test: structureCheck type

* test: submissionStatus type

* test: submission type

* Cleanups (#307)

* chore: better namings

* chore: fix create user services

* chore: better file names

* fix: Project imports

* fix: linting errors

* feat: make course cards clickable (#303)

* Run extra checks (#309)

* chore: celery #206

* chore: Support partial update for project

* chore: support patch for project 2

* refactor!: rework checks and submissions

* chore: template run checks

* chore: for now set state to success

* chore: exclude 'polymorphic_ctype'

* chore: redirect from dashboard, prevent authentication error

* chore: login page styling fix

* feat: endpoint for eagerly fetching all projects for students/teachers/assistants

* chore: linting

* fix: tests

* Run actions on GitHub servers (#314)

* build: use github action runners

* build: should fix backend linting

* build: flake8 with poetry

* build: execute poetry commands in backend folder

* build: only run actions for dev or main

* chore: try making fixtures and load them

* chore: make fixtures a extra arg to development.sh

* chore: fix loading isues

* chore: fix loading isues with sleep

* chore: improved loading by redirecting output to dev null

* fixed sleep

* chore: commit to make me able to restore in case of errors

* chore: added create fixture script

* chore: fixed fixtures

* chore: complete merge

* chore: fixed some concerns of vincent

* chore: re added enviroment line to development.yml backend container otherwise i always got small

* chore: made fixtures that work (some extra need to be made for submissions)

* chore: use sed

* chore: change data option functionality

* chore: add seeder support

* docs: Added comments

* chore: remove old seeder file

* chore: start

* Revert "chore: start"

This reverts commit 484c68d.

* chore: remove env variables

* chore: add fixturew

* chore: fixed small errors and updated frontend tests

* Run extra checks (#312)

* chore: celery #206

* chore: support patch for project 2

* refactor!: rework checks and submissions

* chore: move is_valid to submission

* chore: hook structure checks

* chore: merge migrations

* Run extra checks (#320)

* chore: celery #206

* chore: support patch for project 2

* refactor!: rework checks and submissions

* chore: move is_valid to submission

* chore: hook structure checks

* chore: new fixtures

* chore: linting

---------

Co-authored-by: EwoutV <[email protected]>

* Single course view (#315)

* chore: start update course view + based on roles

* chore: clone button + skip project creation dialog if only one course

* chore: init cloning course

* chore: clone logic

* chore: link faculty to cloned course

* chore: make assistant + tooltip component

* chore: assistants + teacher display on course

* chore: init course users search

* chore: start user pagination

* chore: filter teachers

* chore: working teacher filtering

* chore: include assistants + join button

* fix: no course selection on detail view

* chore: add/remove teacher/assitant course

* chore: update course state when adding/removing assistant/teacher

* chore: display add/remove possibility depending on role

* fix: loading state when searching

* chore: leave button on course for student

* fix: dialog for editting users

* fix: permission search

* fix: backend permission + linting

* Run extra checks (#309)

* chore: celery #206

* chore: Support partial update for project

* chore: support patch for project 2

* refactor!: rework checks and submissions

* chore: template run checks

* chore: for now set state to success

* chore: exclude 'polymorphic_ctype'

* fix: print

* fix: backend tests

* fix: fixes pr

* fix: remove roles from backend search

* fix: backend permission

* chore: updated project list props

* chore: linting

---------

Co-authored-by: francis <[email protected]>
Co-authored-by: Vincent Vallaeys <[email protected]>
Co-authored-by: EwoutV <[email protected]>

* Seeder improvements (#324)

* fix: filling database

* fix: seeding

* chore: replace fixtures

* chore: redirect errors to dev/null

* build(deps): bump gunicorn from 21.2.0 to 22.0.0 in /backend (#325)

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 21.2.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@21.2.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Admin panel (#321)

* chore: add user service file #198

* chore: add user service file content #198

* chore: add endpoint for users in endpoint file #198

* chore: add admin header #198

* chore: add admin side bar #198

* chore: add admin layout #198

* chore: make base and admin directories to differentiate #198

* chore: update router.ts #198

* chore: add AdminView #198

* chore: add UsersView and update router #198

* chore: backend update for pagination + filtering of users #198

* chore: add import user_view #198

* chore: user filter #198

* chore: make all Role possibilities available as a list #198

* chore: blankUser function #198

* chore: update paginate and filter for UsersView #198

* chore: package-lock #198

* chore: update filters and pagination callbacks #198

* chore: english translations #198

* chore: dutch translations admin page #198

* chore: role updating remotely works properly #198

* chore: add beginning of admin patch endpoint #198

* chore: url update #198

* chore: removal of roles + creation activates again if already existing #198

* chore: remove unnecessary sidebar options #198

* chore: admin status can be switched on and off #198

* chore: add admin side bar #198

* chore: add admin layout #198

* chore: user filter #198

* chore: update paginate and filter for UsersView #198

* chore: update filters and pagination callbacks #198

* chore: filter for roles in admin panel #198

* chore: remove unnecessary sidebar options #198

* chore: remove debug prints + fix rebase mistake #198

* chore: remove debug prints + lint fixing #198

* chore: adjust search translations #198

* chore: lint fix #198

* chore: handler update to fix tests (tests failing wasn't my fault) #198

* chore: lint fixes test files I previously altered #198

* chore: revert overwrite of creation of roles in backend #198

* Project editor (#319)

* feat: endpoint for eagerly fetching all projects for students/teachers/assistants

* feat: editor for course description and editor, better project overview list

* chore: improved project progressbar, linting

* improvement: skeleton loaders for project list

* chore: better display of HTML description

---------

Co-authored-by: francis <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: francis <[email protected]>
Co-authored-by: Francis Vauterin <[email protected]>
Co-authored-by: Vincent Vallaeys <[email protected]>
Co-authored-by: tyboro2002 <[email protected]>
Co-authored-by: Tybo Verslype <[email protected]>
Co-authored-by: Bram Meir <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brent Silkyn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend feature A new feature containing functionality frontend Issues regarding the frontend
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Frontend: add markdown options to project and course description
3 participants