Edit project #196
Merged
Edit project #196
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # frontend/src/queries/Project.ts # frontend/src/services/project.ts
# Conflicts: # frontend/src/queries/Project.ts # frontend/src/views/CreateProjectView.vue # frontend/src/views/ProjectView.vue
# Conflicts: # frontend/src/services/project.ts # frontend/src/views/CreateProjectView.vue
# Conflicts: # frontend/src/components/form_elements/FilesInput.vue
reyniersbram
requested changes
May 12, 2024
Co-authored-by: Pieter Janin <[email protected]>
Co-authored-by: Pieter Janin <[email protected]>
Co-authored-by: Pieter Janin <[email protected]>
This reverts commit 87ed142.
pieterjanin
reviewed
May 20, 2024
There was a problem hiding this comment.
Nog deze en in queries/Project.ts en services/project.ts de naamgeving ProjectFiles naar TestFiles veranderen, dan is het goed voor mij 👍
# Conflicts: # frontend/src/i18n/locales/en.ts # frontend/src/i18n/locales/nl.ts # frontend/src/views/CreateProjectView.vue
reyniersbram
requested changes
May 20, 2024
reyniersbram
force-pushed
the
edit_project
branch
from
107b09a to
2ea6979
Compare
reyniersbram
requested changes
May 21, 2024
reyniersbram
approved these changes
May 21, 2024
reyniersbram
added a commit
that referenced
this pull request
May 22, 2024
* sumbitpage + frontendtests * Update frontend/src/views/subject/SubjectView.vue Co-authored-by: Bram Reyniers <[email protected]> * Update frontend/src/views/subject/SubjectsView.vue Co-authored-by: Bram Reyniers <[email protected]> * Update frontend/src/views/subject/SubjectsView.vue Co-authored-by: Bram Reyniers <[email protected]> * Update frontend/src/components/subject/body/projects/SubjectProjectsPage.vue Co-authored-by: Bram Reyniers <[email protected]> * upgrade @vue/test-utils (#181) * sumbitpage + frontendtests * tests cleanup en router fix * layout rework * format * last test fix * more test cleanup * theme * small fix * adminpanel theme + tests (#177) * testen proberen fixen * admin frontend test * format * Groups (#182) * quick commit * quick commit * quick commit * almost finished * finished + linter :) * linter again :'( * linter again x2 :'( * groupsview fixes * groupview fixes * fix 'join group' button url * fix type imports * run formatter * small fix * linter :) --------- Co-authored-by: Bram Reyniers <[email protected]> * test * theme * test * names switch * requirements card * frontend testen + locale fix * project sidebar test * needhelpbutton test * linter * format * fixes #189 * beter zo * fix: #187 * wip * custom docker image tests * handle docker run crashes * autopep * fix test 1 * fix tests 2 * Implement show all students in groups * allow admin to set own teacher permissions * delete user (frontend) * delete user (frontend) * delete user (backend) * Add surname of users (#179) * save surname of user in database #144 * help automatic migration * run formatter * use surname on homescreen * run formatter * remove print statement * Update backend/src/auth/router.py Co-authored-by: Xander Bil <[email protected]> --------- Co-authored-by: Xander Bil <[email protected]> * cleanup test style * fix test runner * autopep * forcerm * ??? * handle container create fail * pyright * prune * rm prune * prune 2 * prune 3 * prune weer weg, zou in orde moeten zijn * button size * add tags for container management * navigation button to admin fix (#197) * adminbutton fix * Revert "adminbutton fix" This reverts commit 366156f. * same fix, with computed --------- Co-authored-by: Bram Reyniers <[email protected]> * test + internationalization + stling * Implement isTeacher correctly * implement surname where needed * test fixes * test fixes x2 * reroute whenever leaving/joining group * is teacher for new subject button visibility * buttons now only appearing when isTeacher/isInstructor * deleted announcements * removed intern skeleton loaders * fixed pylint docker * found another skeleton loader * styling * styling * groups page styling * group page style + redirects * refactored components structure and added icons for student/teacher subjects * made subjecticon component * deleted non used css class * test setup * oké rebase werkt eindelijk * move tests for consistency * groupsview frontend test * frontend testen * format * file extension warnings * reroute whenever leaving/joining group * cleanup * tests * fix backend tests * formatter * deleted tooltip + last refactoring before pull request * npm run format * refactored utils.py * Query refactor (#152) * fix useUserQuery * remove top level package lock * add some documentation to user queries * useUserQuery now accepts either a ref or a raw value * run formatter * changed enabled from computed to getter * update Subject queries, fixes: #143 * update mutation to register to subject * improved authorized_fetch * show projects on homescreen, fixes: #134 * run formatter * fix download_file util * clean up subject queries * clean up user services * clean up project queries and services * review group services * review submission services * refactor submission queries * optimistic updates for group queries * fix views using group/submission queries * try to fix some tests * run formatter * remove todo's * frontend warnings fix * fix subjects query * run formatter * fix useProjectGroupsQuery * fix tests * fix delete group mutation * fix leave and join group mutations * run formatter * fix user groups query not refreshing --------- Co-authored-by: Marieke <[email protected]> * refactored utils.py 2 * solved merge conflicts * fixed i18n * run formater, linter * refactored subject list into object with role * changing icon on subjects page (ugly solution bug with enums) * working on showing icon on subject page * fixed subject uuid query + user * linter + reformat * Projectspage testen + styling (#198) * projectspage theme and layout * frontend test * fix bug login not working on first ever login * vuetify 3.5 * package lock * undo backend response change * undo backend response change * register link button permissions * removed deleted import * fixed subject filter buttons * surname appears in subject header card * fixed some wishful filter behavior and no results * added i18n * fixed project title styling * added quil * fixed registerlinkbutton * deleted radius corners * run linter * run linter * refactored utils.py * custom fetcherror + group fix * status weg * fix tests * admin symbol when not student or instructor + fix edit subject button permission * fix student not allowed icon * linter * useProjectGroupQuery zoals in #214 * changed emits * fix width issue * implemented requested pr changes * run linter formater * Homescreen deadlines (#214) * filter and sort deadlines * i18n formatting for deadline date * show subject name instead of id * also show projects as instructor * project status on homescreen * improve used group/submission queries * Update frontend/src/queries/Submission.ts Co-authored-by: Pieter Janin <[email protected]> --------- Co-authored-by: Pieter Janin <[email protected]> * added router to create SubjectsView.vue * fix width issue fr * added first form elements * fixed academic year * remove announcements * frontend testen * added submit button * Fix projects page (#219) * fix #218 * fix tests * add instructor surname * format * create subject via frontend works * fix: patch requirements * Submission list voor een vak leerkracht of assistent (#190) * theme fixes * Implementing queries and views * Implement beautiful sql query * Finish frontend * Solve pr issues * feature: download all files from submission * rebase dev and fix conflicts * Fix: frontend tests * implemented search * Move submissions list to group page * add users to instructors * assign and delete users from instructors * sort instructors * import Co-authored-by: Bram Reyniers <[email protected]> * import Co-authored-by: Bram Reyniers <[email protected]> * begin styling create subject page * more styling * adding instsructors * remove instructors * assign yourself button works * emit cleanup * emitted events fixed * add instructors to db * form validation * implemented dialog * 404 not found + register to subject view: sytling + frontend tests (#213) * notfound and register view style + testen * notfound and register view style + testen * fix * already registered * already registered * change wording * added i18n * i18n bug fixed * styling details * redirect after hitting confirm * lint + format * Groep nummer ipv id (#221) * Add auto generated column to group: num * frontend: use group num instead of global id * fix alembic downgrade script --------- Co-authored-by: Bram Reyniers <[email protected]> * subjects overflow fix * subject title card scrollable * scrolling on overflow * added v-chips and sorted instructors on subjectpage * format + linter * style rollback subjects voor marieke * linter format * deleted bg container on create page for better designing patch * last changes on create subject * sort voor bram * testfix na query aanpassing * fix: #229 * fix tests * Download alle indieningen (files) + csv (met indieningen info) in 1 keer als zip (#228) * backend: implement project zip * backend: implement csv * frontend: download all submissions * grouppagina en submissions testen + styling (#224) * styling * styling * styling * styling * submissionslist test * meer testen * format * merge conflicts * lint + format * fix test after dev merge * Update frontend/src/i18n/locales/nl.ts Co-authored-by: Bram Reyniers <[email protected]> * fix test --------- Co-authored-by: Bram Reyniers <[email protected]> * allow teachers to get all users (#231) * email and email rules * added watcher * added emits * post mail fully functional * removed on search loaded * format linter * update mutations for create subject * Edit project (#196) * paar fixes alvast * almost * files uploaden werkt * formatting fixes * bugfixes + added date fields in db * formatting * background container gone + no instructors found fix * format * basic * temp * begint ergens op te trekken * update werkt! * small change * looking good * edit fixes (almost there) * files werken * edit (improvements) * updates * filestructure visible * werkt * af? * remove empty alembic revisions * docker terug ok * alert * route fix * linter * add publish_date to mock projects * reroute * bijna * requirements * editfiles werkt * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * few fixes * small time fix * i18n * format * formatting * final * final * vage fixes * vage fixes 2 * tijd update nu ook * test fix * format * schema optional added * fix voor tests not found * bram requests xoxo * whoops * Update frontend/src/components/RequirementsInput.vue Co-authored-by: Pieter Janin <[email protected]> * Update frontend/src/components/RequirementsInput.vue Co-authored-by: Pieter Janin <[email protected]> * Update frontend/src/queries/Project.ts Co-authored-by: Pieter Janin <[email protected]> * Update frontend/src/queries/Project.ts Co-authored-by: Pieter Janin <[email protected]> * Update frontend/src/components/RequirementsInput.vue Co-authored-by: Pieter Janin <[email protected]> * Update frontend/src/services/project.ts Co-authored-by: Pieter Janin <[email protected]> * Update frontend/src/components/project/DatePicker.vue Co-authored-by: Pieter Janin <[email protected]> * fixes * loading fix * Update frontend/src/components/project/DatePicker.vue Co-authored-by: Pieter Janin <[email protected]> * fixes vooral cleanup * fixes vooral cleanup * fixes vooral cleanup * Revert "upgrade @vue/test-utils (#181)" This reverts commit 87ed142. * luxon weg? * luxon echt weg? * luxon echt echt weg? * renaming + unused gone * some small fixes * bramfixes --------- Co-authored-by: Bram Reyniers <[email protected]> Co-authored-by: Pieter Janin <[email protected]> * Update README.md * Update README.md * fix broken link * Search users with throttle (#236) * search users with throttle * add throttle tests * increase wait time in a throttle test * algemene styling van website (#226) * style * style * temp * style * style * temp * more styling * testen * lint * format * styling * some styling en test fixes * backbuttons * subjects styling * subject styling * create project styling * create subjects styling * lint * format * format * requested changes * format * fix show group * more requested changes * small groups fix --------- Co-authored-by: Bram Reyniers <[email protected]> * Permission checks for pages (#166) * generic permission middleware * placeholder middleware implementations * implement isAdmin check * permissions on admin page + fix typo * logical functions for conditions * pass MiddlewareContext to conditions * permission to check if user is part of subject * permission to check if user can create a project for a subject * run formatter * restructure navigation guard middlewares * subject details permissions * project details permissions * go to /not-found instead of /forbidden * create project permissions * fix project permission checks * permissions for submit page * permissions for groups overview * permissions for group details * permissions for submission list of project * remove unused imports * Apply suggestions from code review Co-authored-by: Xander Bil <[email protected]> * permissions for new pages * allow admins to visit all pages --------- Co-authored-by: Xander Bil <[email protected]> * Submissions teacher testen (#238) * styling * styling * styling * styling * submissionslist test * meer testen * format * merge conflicts * lint + format * button verplaatsen * styling klaar * testen * fix test after dev merge * projectview test * more tests * SubmissionsTeacherView.spec.ts * button change position * format * change submissioncard * format * fix group id showing instead of num * Revert "fix group id showing instead of num" This reverts commit e84929e. * Bug fixes (#243) * fix: invalid redirect after create project * frontend fix: joining group when automatically now works * fix: register to subject both as student and instructor * fix submect mail is null * fix #185 * fix weird groups styling * fix broken router push * fix inconsistent academic year * fix: duplicates in files * format * fix year * fix test? * fix group id showing instead of num --------- Co-authored-by: Bram Reyniers <[email protected]> --------- Co-authored-by: Michaël Boelaert <[email protected]> Co-authored-by: Marieke <[email protected]> Co-authored-by: Mattis Cauwel <[email protected]> Co-authored-by: miboelae <[email protected]> Co-authored-by: Pieter Janin <[email protected]> Co-authored-by: Marieke Sinnaeve <[email protected]> Co-authored-by: Xander Bil <[email protected]> Co-authored-by: mattiscauwel <[email protected]> Co-authored-by: Xander Bil <[email protected]> Co-authored-by: drieshuybens <[email protected]>
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
edit project en fixt ook alle issues met create nog