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

Calendar view improvements #257

Merged
merged 2 commits into from
Apr 9, 2024
Merged

Conversation

EwoutV
Copy link
Contributor

@EwoutV EwoutV commented Apr 9, 2024

  • Updated the layout to match our Figma design
  • Improved filters and pagination on courses search

closes #251

@EwoutV EwoutV added feature A new feature containing functionality frontend Issues regarding the frontend labels Apr 9, 2024
@EwoutV EwoutV added this to the Frontend milestone milestone Apr 9, 2024
@EwoutV EwoutV requested review from BramMeir and francisvaut April 9, 2024 08:31
@EwoutV EwoutV self-assigned this Apr 9, 2024
@EwoutV EwoutV force-pushed the calendar-view-improvements branch from eaa27d7 to 0cb4bc4 Compare April 9, 2024 08:32
@EwoutV EwoutV merged commit 00a9254 into development Apr 9, 2024
3 checks passed
@EwoutV EwoutV deleted the calendar-view-improvements branch April 9, 2024 08:34
EwoutV added a commit that referenced this pull request Apr 9, 2024
* chore: add make teacher script

* fix: added psychology faculty icon

---------

Co-authored-by: tyboro2002 <[email protected]>
EwoutV added a commit that referenced this pull request Apr 9, 2024
* chore: add make teacher script

* fix: added psychology faculty icon

* fix: faculty image filter

* chore: linting

* feat: role user mixin

* Calendar view improvements (#257)

* chore: add make teacher script

* fix: added psychology faculty icon

---------

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

* chore: user permissions account for is_active

* chore: added role management tests, extracted common logic in helpers

* fix: student service parameter

* chore: linting

* chore: removed comment in seeder

---------

Co-authored-by: tyboro2002 <[email protected]>
EwoutV added a commit that referenced this pull request Apr 9, 2024
* chore: filter on deadline

* chore: fix project link data

* chore: refactor cards

* chore: add todo

* chore: use project with course context service

* test: write group service test

* test: adjust test names

* test: make intercept server group_id url more abstract

* frontent(ProjectView) chore: closes #185

* chore: did some cleanup + add test for group

* chore: add test for group

* chore: add test for faculty

* chore: add faculty tests

* chore: added course tests

* fix: cypress types

* feat(deployment): testing script

* chore: display dashboard data depending on role

* chore: correct projects + assistant view

* chore: update usage of service + using real user id

* chore: refactor using Lander's project cards

* chore: plus button based on role

* chore: add project service tests

* chore: add student service tests

* chore: start of course creation

* chore: fix merge

* chore: working create course, backend automatically add requesting teacher to course

* chore: rest of commit

* chore: init academic year button logic

* chore: add teacher service tests

* chore: add assistant service tests

* chore: add admin service tests + create time and last login and move faculties to user

* chore: refactor authentication user field

* chore: layout + logic academic year button

* chore: add structure check tests

* fix: fix packages

* chore: add structure check service tests

* chore: add submision service tests

* chore: add submisions by project service test

* chore: clean up

* chore: add extra service tests

* chore: add extra service tests

* chore: removed cypress screenshotsé

* fix: fix error

* fix: fix error

* fix: issues after merge

* fix: using services instead of hardcoded creating

* linting: restart from dev

* linting: autofix problems

* linting: action script

* linting: fix triple-slash-reference error

* linting: fix useless constructor errors

* linting: fix unused vars errors

* linting: fix no-unused-expressions errors

* linting: fix valid-v-for errors

* linting: fix vue/require-v-for-key errors

* linting: fix eqeqeq errors

* linting: fix vue/valid-attribute-name errors

* linting: fix vue/prefer-import-from-vue errors

* linting: no-empty-pattern errors

* linting: fix minor indent errors

* linting: fix strict-boolean-expressions errors

* linting: fix no-unsafe-argument errors

* linting: fix naming-convention errors

* linting: fix unbound-method errors

* linting: create return types for services

* linting: fix last return type errors

* build: edit frontend linting action script

* build: run linting checks on github server for now

* feat(deplyment): added poetry

* fix: merges add user.id's

* chore: dashboard & project cleanup

* chore: abstracted the dashboard as example for future views

* chore: linting

* chore: linting

* chore: add celery types

* fix: actions with poetry

* chore: added extra checks models

* fix: little fixes

* fix: linting

* chore: extra checks migration

* chore: setup.sh support poetry

* chore: run pip as root deal with it

* chore: delete unused package

* chore: fix some db issues

* chore: comment out failing tests

* chore: set up jdom in tests

* chore static import jsdom

* chore: dont mount app in tests

* chore: add admin to admins in setup

* chore: admin create test

* chore: assistant create test

* chore: student create test

* chore: course-faculty relation, faculty name translations

* chore: added debug option to echo user credentials upon login

* fix: debug parameter

* feat: course list

* fix: linting

* chore: async/await constructs, better user fetching

* feat: better error handling, linting

* fix: refresh user after enrollment

* feat: pagination

* chore: squash migrations

* fix: faculty tests

* fix: linting

* chore: pr comments

* chore: translations, test linting

* chore: frontend linting

* chore: init project creation from dashboard

* chore: project creation logic

* chore: add time selection to deadline

* chore: dashboard for every role

* chore: start form validation

* chore: create course validation + academic year display

* chore: error message component

* chore: merge

* fix: fix failing tests

* Frontend: leave/join groups

* fix: group join state

* chore: action test script

* chore: run test action as sudo

* chore: secret key test

* fix: action script syntax

* chore: run test action with c flag

* chore: remove backend tests action

* chore: remove cypress login test

* chore: add permission to remove previous action script directory

* chore: fix linting, tests

* chore: add dummy cypress test

* chore: linting autofix

* Frontend: styling Closes #184

* Backend: fix, updated group submission permission

* chore: try adding the seeder lib

* chore: add student provider

* chore: seed courses

* Frontend: ProjectView

* chore: seed assistants

* chore: seed assistants moved before courses

* Frontend: feat fileupload

* chore: seed teacherss

* chore: seed projects

* chore: seed groups

* chore: seed submissions

* chore: add error handling to the commands

* chore: make admin script take in username

* chore: provide structure_checks

* Frontend: feat FileUpload logic + styling

* Frontend: feat Add projects to navbar, closes #243

* Frontend: fix linting for #245

* fix: production down when tests being run

* chore: cleanup seeders and add students assistants and teachers to courses and students to groups

* Update project.service.ts #245

* chore: added ignored nginx conf

* fix: fix linting in makeAdmin.py

* fix: make backend tests work

* fix: fix linting in makeAdmin.py

* fix: fix linting in seedDb.py

* chore: fix linter warnings

* chore: fix linter warnings

* Extra checks (#238)

* docker_view

* chore: Added check views

* chore: dynamic file paths

* chore: type hints

* chore: views

* chore: file_path uuid

* chore: run checks when checks changes

* chore: remove prints

* chore: do todo's

* chore: fix tests by commenting them out

* chore: move signal

* chore: moved everything to signals

* chore: merge

* fix: fixture

---------

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

* feat: better calendar view

* Revert "feat: better calendar view"

This reverts commit 5caf521.

* chore: add make teacher script

* fix: added psychology faculty icon

* Calendar view improvements (#257)

* chore: add make teacher script

* fix: added psychology faculty icon

---------

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

* feat: better calendar view

* chore: linting

* Reduce container size (#259)

* Seeders (#248)

* chore: add make teacher script

* fix: makeTeacher command

* chore: add bulk adding to the types

* speed up seeders

---------

Co-authored-by: Bram Meir <[email protected]>

* Role management (#260)

* chore: add make teacher script

* fix: added psychology faculty icon

* fix: faculty image filter

* chore: linting

* feat: role user mixin

* Calendar view improvements (#257)

* chore: add make teacher script

* fix: added psychology faculty icon

---------

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

* chore: user permissions account for is_active

* chore: added role management tests, extracted common logic in helpers

* fix: student service parameter

* chore: linting

* chore: removed comment in seeder

---------

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

* chore: hotfix

* chore: hotfix (#267)

* chore: commit changes

* Project creation update (#271)

* chore: project creation faculty

* fix: faculty added when course created

* chore: start docker upload project creation

* chore: init upload zip structure

* chore: still issues with file-upload

* chore: fix uploaded zip file parsing

* fix: cleanup

* fix: linting

* fix: tests

* fix: hopefully last fix

* Course card improvements (#272)

* chore: start update course view + based on roles

* feat: more placeholder images

* chore: layout improvements, past deadline project filter

* chore: linting

---------

Co-authored-by: Bram Meir <[email protected]>

* fix: user creation

* chore: linting

---------

Co-authored-by: Bram Meir <[email protected]>
Co-authored-by: bsilkyn <[email protected]>
Co-authored-by: tyboro2002 <[email protected]>
Co-authored-by: lander <[email protected]>
Co-authored-by: Topvennie <[email protected]>
Co-authored-by: Bram Meir <[email protected]>
Co-authored-by: Francis Vauterin <[email protected]>
Co-authored-by: Tybo Verslype <[email protected]>
Co-authored-by: francis <[email protected]>
Co-authored-by: Lander Maes <[email protected]>
EwoutV added a commit that referenced this pull request Apr 9, 2024
* chore: filter on deadline

* chore: fix project link data

* chore: refactor cards

* chore: add todo

* chore: use project with course context service

* test: write group service test

* test: adjust test names

* test: make intercept server group_id url more abstract

* frontent(ProjectView) chore: closes #185

* chore: did some cleanup + add test for group

* chore: add test for group

* chore: add test for faculty

* chore: add faculty tests

* chore: added course tests

* fix: cypress types

* feat(deployment): testing script

* chore: display dashboard data depending on role

* chore: correct projects + assistant view

* chore: update usage of service + using real user id

* chore: refactor using Lander's project cards

* chore: plus button based on role

* chore: add project service tests

* chore: add student service tests

* chore: start of course creation

* chore: fix merge

* chore: working create course, backend automatically add requesting teacher to course

* chore: rest of commit

* chore: init academic year button logic

* chore: add teacher service tests

* chore: add assistant service tests

* chore: add admin service tests + create time and last login and move faculties to user

* chore: refactor authentication user field

* chore: layout + logic academic year button

* chore: add structure check tests

* fix: fix packages

* chore: add structure check service tests

* chore: add submision service tests

* chore: add submisions by project service test

* chore: clean up

* chore: add extra service tests

* chore: add extra service tests

* chore: removed cypress screenshotsé

* fix: fix error

* fix: fix error

* fix: issues after merge

* fix: using services instead of hardcoded creating

* linting: restart from dev

* linting: autofix problems

* linting: action script

* linting: fix triple-slash-reference error

* linting: fix useless constructor errors

* linting: fix unused vars errors

* linting: fix no-unused-expressions errors

* linting: fix valid-v-for errors

* linting: fix vue/require-v-for-key errors

* linting: fix eqeqeq errors

* linting: fix vue/valid-attribute-name errors

* linting: fix vue/prefer-import-from-vue errors

* linting: no-empty-pattern errors

* linting: fix minor indent errors

* linting: fix strict-boolean-expressions errors

* linting: fix no-unsafe-argument errors

* linting: fix naming-convention errors

* linting: fix unbound-method errors

* linting: create return types for services

* linting: fix last return type errors

* build: edit frontend linting action script

* build: run linting checks on github server for now

* feat(deplyment): added poetry

* fix: merges add user.id's

* chore: dashboard & project cleanup

* chore: abstracted the dashboard as example for future views

* chore: linting

* chore: linting

* chore: add celery types

* fix: actions with poetry

* chore: added extra checks models

* fix: little fixes

* fix: linting

* chore: extra checks migration

* chore: setup.sh support poetry

* chore: run pip as root deal with it

* chore: delete unused package

* chore: fix some db issues

* chore: comment out failing tests

* chore: set up jdom in tests

* chore static import jsdom

* chore: dont mount app in tests

* chore: add admin to admins in setup

* chore: admin create test

* chore: assistant create test

* chore: student create test

* chore: course-faculty relation, faculty name translations

* chore: added debug option to echo user credentials upon login

* fix: debug parameter

* feat: course list

* fix: linting

* chore: async/await constructs, better user fetching

* feat: better error handling, linting

* fix: refresh user after enrollment

* feat: pagination

* chore: squash migrations

* fix: faculty tests

* fix: linting

* chore: pr comments

* chore: translations, test linting

* chore: frontend linting

* chore: init project creation from dashboard

* chore: project creation logic

* chore: add time selection to deadline

* chore: dashboard for every role

* chore: start form validation

* chore: create course validation + academic year display

* chore: error message component

* chore: merge

* fix: fix failing tests

* Frontend: leave/join groups

* fix: group join state

* chore: action test script

* chore: run test action as sudo

* chore: secret key test

* fix: action script syntax

* chore: run test action with c flag

* chore: remove backend tests action

* chore: remove cypress login test

* chore: add permission to remove previous action script directory

* chore: fix linting, tests

* chore: add dummy cypress test

* chore: linting autofix

* Frontend: styling Closes #184

* Backend: fix, updated group submission permission

* chore: try adding the seeder lib

* chore: add student provider

* chore: seed courses

* Frontend: ProjectView

* chore: seed assistants

* chore: seed assistants moved before courses

* Frontend: feat fileupload

* chore: seed teacherss

* chore: seed projects

* chore: seed groups

* chore: seed submissions

* chore: add error handling to the commands

* chore: make admin script take in username

* chore: provide structure_checks

* Frontend: feat FileUpload logic + styling

* Frontend: feat Add projects to navbar, closes #243

* Frontend: fix linting for #245

* fix: production down when tests being run

* chore: cleanup seeders and add students assistants and teachers to courses and students to groups

* Update project.service.ts #245

* chore: added ignored nginx conf

* fix: fix linting in makeAdmin.py

* fix: make backend tests work

* fix: fix linting in makeAdmin.py

* fix: fix linting in seedDb.py

* chore: fix linter warnings

* chore: fix linter warnings

* Extra checks (#238)

* docker_view

* chore: Added check views

* chore: dynamic file paths

* chore: type hints

* chore: views

* chore: file_path uuid

* chore: run checks when checks changes

* chore: remove prints

* chore: do todo's

* chore: fix tests by commenting them out

* chore: move signal

* chore: moved everything to signals

* chore: merge

* fix: fixture

---------

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

* feat: better calendar view

* Revert "feat: better calendar view"

This reverts commit 5caf521.

* chore: add make teacher script

* fix: added psychology faculty icon

* Calendar view improvements (#257)

* chore: add make teacher script

* fix: added psychology faculty icon

---------

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

* feat: better calendar view

* chore: linting

* Reduce container size (#259)

* Seeders (#248)

* chore: add make teacher script

* fix: makeTeacher command

* chore: add bulk adding to the types

* speed up seeders

---------

Co-authored-by: Bram Meir <[email protected]>

* Role management (#260)

* chore: add make teacher script

* fix: added psychology faculty icon

* fix: faculty image filter

* chore: linting

* feat: role user mixin

* Calendar view improvements (#257)

* chore: add make teacher script

* fix: added psychology faculty icon

---------

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

* chore: user permissions account for is_active

* chore: added role management tests, extracted common logic in helpers

* fix: student service parameter

* chore: linting

* chore: removed comment in seeder

---------

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

* chore: hotfix

* chore: hotfix (#267)

* chore: commit changes

* Project creation update (#271)

* chore: project creation faculty

* fix: faculty added when course created

* chore: start docker upload project creation

* chore: init upload zip structure

* chore: still issues with file-upload

* chore: fix uploaded zip file parsing

* fix: cleanup

* fix: linting

* fix: tests

* fix: hopefully last fix

* Course card improvements (#272)

* chore: start update course view + based on roles

* feat: more placeholder images

* chore: layout improvements, past deadline project filter

* chore: linting

---------

Co-authored-by: Bram Meir <[email protected]>

* fix: user creation

* chore: linting

* chore: linting

---------

Co-authored-by: Bram Meir <[email protected]>
Co-authored-by: bsilkyn <[email protected]>
Co-authored-by: tyboro2002 <[email protected]>
Co-authored-by: lander <[email protected]>
Co-authored-by: Topvennie <[email protected]>
Co-authored-by: Bram Meir <[email protected]>
Co-authored-by: Francis Vauterin <[email protected]>
Co-authored-by: Tybo Verslype <[email protected]>
Co-authored-by: francis <[email protected]>
Co-authored-by: Lander Maes <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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: improve calendar view
2 participants