Commit Graph

379 Commits

Author SHA1 Message Date
Daniel Egger d93e3f132a Mobile Anpassungen 2022-10-11 16:46:53 +02:00
Daniel Egger 7939867aa9 Add context dependent back link from media category page 2022-10-11 16:46:53 +02:00
Daniel Egger 126f0de318 Anpassungen Mobile 2022-10-11 16:46:53 +02:00
Daniel Egger f78fabbb47 Changes according to Stephs tests 2022-10-11 16:46:53 +02:00
Daniel Egger 34a21eeed3 Use <router-link> instead of <a> for internal links 2022-10-11 16:46:53 +02:00
Daniel Egger 64b5c5a825 Use circle filter on competence page 2022-10-11 16:46:53 +02:00
Christian Cueni 871c69c0a9 Fix stuck no-scroll class on modal close 2022-10-11 15:57:32 +02:00
Daniel Egger d9d741f4c6 Add back links to media library frontend 2022-10-07 17:33:15 +02:00
Daniel Egger 3c386f31ca Add linking to `evaluate_url` for learning unit 2022-10-07 17:22:28 +02:00
Daniel Egger ebfeec4184 Refactor competence profile 2022-10-07 17:08:55 +02:00
Daniel Egger d42b32ef30 Refactor navigation with competence profile 2022-10-07 16:41:16 +02:00
Daniel Egger 6f491ef661 Refactor competence main view 2022-10-07 16:32:07 +02:00
Daniel Egger f4dafef005 Refactor competence detail view 2022-10-07 15:11:22 +02:00
Daniel Egger 999a916427 Add backend data to competence profile main page 2022-10-07 14:50:52 +02:00
Daniel Egger 46ad6cab36 Completion data in Performance Criteria view 2022-10-07 14:20:42 +02:00
Daniel Egger dc3b1a4ca6 Add backend data to competence profile 2022-10-07 11:35:43 +02:00
Daniel Egger 22e3fce59e Reformat code 2022-10-07 10:12:52 +02:00
Christian Cueni 3fa0521623 Style competence mobile views 2022-10-07 10:07:42 +02:00
Christian Cueni 9fe5c689a3 WIP: Add criteria page 2022-10-07 10:07:42 +02:00
Christian Cueni 31331f9d16 WIP: Use real criteria data structure 2022-10-07 10:07:40 +02:00
Christian Cueni b78cf5ffd0 WIP: Add arrow animation 2022-10-07 10:07:29 +02:00
Christian Cueni 9756902ce2 WIP: Add competence detail view 2022-10-07 10:07:28 +02:00
Christian Cueni c96fa96a24 WIP: Add LK row 2022-10-07 10:07:18 +02:00
Christian Cueni 7d7a5c198f WIP: Add self assesment 2022-10-07 10:07:18 +02:00
Christian Cueni f9f213231b WIP: Add competence page and progress 2022-10-07 10:07:17 +02:00
Daniel Egger 998001df14 Fix cypress tests 2022-10-05 17:02:17 +02:00
Daniel Egger 22b2491136 Scroll behaviour in Lernpfad 2022-10-05 16:44:04 +02:00
Daniel Egger 7872125167 Fix npm build error 2022-10-05 15:56:42 +02:00
Daniel Egger df6f331811 Anpassung "Verankerung im Lernpfad" 2022-10-05 15:29:29 +02:00
Daniel Egger 914223bc77 Adapt design of media library 2022-10-05 14:12:03 +02:00
Daniel Egger 6abeb6a2b1 Refactor some layouts 2022-10-05 13:32:03 +02:00
Daniel Egger b7e4d83e76 Add wbts to lernfpad oktober demo 2022-10-05 12:15:26 +02:00
Daniel Egger 3bf9e75714 Add urls to media_libraries in Lernpfad 2022-10-05 11:32:40 +02:00
Daniel Egger dbf3db3d23 Add more circle data 2022-10-04 16:55:48 +02:00
Daniel Egger ad532dc50d Add placeholder learning content 2022-10-04 16:26:34 +02:00
Daniel Egger 17eb308f6e Add data for mediathek "Reisen" und "Fahrzeug" 2022-10-04 14:43:06 +02:00
Daniel Egger fd6c15c282 Fix cypress tests 2022-10-04 14:42:34 +02:00
Daniel Egger a8e7b6f433 Add learn media page 2022-10-04 14:42:34 +02:00
Daniel Egger 63a5039134 Work on media library frontend 2022-10-04 14:42:34 +02:00
Daniel Egger cbdbdba6b8 Add `frontend_url` field to wagtail pages 2022-10-04 14:42:34 +02:00
Daniel Egger 5b3a751704 Load media items from backend to show in frontend 2022-10-04 14:42:34 +02:00
Daniel Egger 71b072ade2 Refactor media content data models 2022-10-04 14:42:34 +02:00
Lorenz Padberg 87ab5ae194 Fix Bug of multiple circles over each other. 2022-10-04 11:18:11 +02:00
Daniel Egger 5a4ff1cfda Rename "circle" folder to "learningPath" folder 2022-09-30 17:58:32 +02:00
Daniel Egger 9d1eff5a42 Rename "Media Center" to "Media Library" 2022-09-30 17:55:35 +02:00
Daniel Egger 827e7a0fc0 Add code formatting with prettier and black 2022-09-30 17:43:06 +02:00
Daniel Egger 03e82fadb7 Fix lowercase mediacenter for build in cypress 2022-09-28 20:48:11 +02:00
Daniel Egger 6cf7d97771 Fix js tests 2022-09-28 18:10:38 +02:00
Daniel Egger 659684f25b Fix some type errors 2022-09-28 16:51:10 +02:00
Daniel Egger bdae082550 Fix self-evalution checkboxes 2022-09-28 16:19:01 +02:00
Daniel Egger c0e7662c8f Merge branch 'develop' into feature/mediathek-frontend 2022-09-27 15:01:47 +02:00
Elia Bieri 129507bf6e Merged in feature/vbv-132-learning-content-badges-20220921 (pull request #9)
Implement learning content type badges
2022-09-27 08:37:46 +00:00
Daniel Egger 5667921518 Take MediaCategoryDetail data from api 2022-09-23 17:47:19 +02:00
Daniel Egger 18c3e28ba1 Load MediaCenter data from api 2022-09-23 16:49:00 +02:00
Daniel Egger 8941f4ad24 Merge branch 'feature/mediathek-server' into feature/mediathek-frontend 2022-09-23 16:17:02 +02:00
Daniel Egger 79c0fb8b11 Refactor 2022-09-23 15:14:42 +02:00
Daniel Egger f9c3e82b66 Adapt LearningPath to new course model 2022-09-23 14:55:21 +02:00
Elia Bieri 722b9f7937 Merged in feature/vbv-148-human-readable-duration (pull request #8)
Implement human readable durations

* Implement duration formatting for humans

* Add UTs

* Rework rounding and formatting

* Rename function
2022-09-20 11:12:05 +00:00
Christian Cueni 442ee3e4da Add basic mediacenter store 2022-09-19 14:40:06 +02:00
Christian Cueni f7b0140eec Make grids mobile-ish 2022-09-19 14:40:06 +02:00
Christian Cueni 6d5823eb06 Add Dropdown to Mediathek 2022-09-19 14:40:06 +02:00
Christian Cueni c35b5cce70 Make DropdownSelect component 2022-09-19 14:40:06 +02:00
Christian Cueni 1a41fe4f10 WIP: Add "Alles zeigen" link 2022-09-19 14:40:06 +02:00
Christian Cueni d38e7eee38 WIP: Add media link component 2022-09-19 14:40:06 +02:00
Christian Cueni a198da395a Use layout for Handlungsfelder 2022-09-19 14:40:06 +02:00
Christian Cueni a0ea8a18a6 WIP: Add basic Handlungsfeld page 2022-09-19 14:40:06 +02:00
Christian Cueni 43c311145e Add basic styles to Handlungsfelder 2022-09-19 14:38:50 +02:00
Christian Cueni 070c79a0d9 WIP: Add icons to safelist 2022-09-19 14:38:50 +02:00
Christian Cueni 23f6c43352 WIP: Add OverviewCard 2022-09-19 14:38:50 +02:00
Christian Cueni 31eb779ce5 Add basic routing and container 2022-09-19 14:38:50 +02:00
Daniel Egger d8959a8d0c Add total circle duration to circle view 2022-09-15 07:55:53 +02:00
Daniel Egger 18f87cbd5a fix flaky test 2022-09-14 18:43:33 +02:00
Daniel Egger b7eb88e4d5 Cypress tests 2022-09-14 15:52:44 +02:00
Daniel Egger a3171da28d Dynamic "Weiter gehts" "Leider gehts" 2022-09-14 15:52:44 +02:00
Daniel Egger edc0b3aeb2 Design Anpassungen 2022-09-14 15:52:44 +02:00
Daniel Egger 20a3de4d80 VBV-144: enable `hyphens: auto` on body tag 2022-09-14 15:52:44 +02:00
Daniel Egger 0c01d39fb3 VBV-88: LearningPathView vertical 2022-09-14 15:52:44 +02:00
Daniel Egger a57ef84ed8 VBV-80: Umgesetzt Circle-Ansicht "weiter gehts" 2022-09-09 18:06:38 +02:00
Daniel Egger 6b0cf9effd Refactor LearningContent routing 2022-09-09 17:47:27 +02:00
Daniel Egger dc5adb6214 Refactor SelfEvaluation to its own route 2022-09-09 16:57:39 +02:00
Daniel Egger 5d6e94ebd6 Refactor LearningContent to its own route 2022-09-09 16:15:08 +02:00
Daniel Egger ac268907bf VBV-143: "git revision hash" und Build-Datum anzeigen 2022-09-09 11:56:51 +02:00
Daniel Egger 3ff2b23cf7 VBV-142: move "/media" to "/static/media" 2022-09-09 11:56:49 +02:00
Daniel Egger 2e59d2464c Add parent prefix to slugs 2022-09-02 17:42:14 +02:00
Daniel Egger d5f4b37cfe VBV-102: refactor server urls 2022-09-02 14:33:38 +02:00
Daniel Egger 26f373afe2 Add e2e test for "weiter gehts"-button 2022-08-31 18:36:10 +02:00
Daniel Egger 18acf10c9a Refactor to new url structure for learningPath and circle 2022-08-31 15:28:17 +02:00
Daniel Egger 0acdab60cd Add vitest tests to bitbucket pipelines 2022-08-31 13:42:22 +02:00
Daniel Egger 911b974360 Fix some typescript warnings 2022-08-31 12:23:05 +02:00
Daniel Egger 2316150375 Update `nextLearningContent` dynamically 2022-08-30 17:47:32 +02:00
Daniel Egger a32c8ccbff VBV-80: Refactor next learning content 2022-08-30 17:34:29 +02:00
Daniel Egger 97f01e0a08 Refactor LearningPath class 2022-08-30 15:59:30 +02:00
Daniel Egger b404578926 Upgrade client libraries 2022-08-30 15:56:54 +02:00
Daniel Egger 26139304a3 Generate additional simple learningPath for development 2022-08-30 15:56:54 +02:00
Daniel Egger eaa06719d6 Update styleguide colors 2022-08-30 15:56:54 +02:00
Lorenz Padberg dd18cf895b Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop
# Conflicts:
#	client/src/views/LearningPathView.vue
2022-08-30 14:53:20 +02:00
Lorenz Padberg a2a027d1c8 Merge branch 'feature/weiter-gehts' into develop 2022-08-30 14:51:14 +02:00
Lorenz Padberg a560d86061 Add detetecion for last learning unit 2022-08-30 14:50:31 +02:00
Lorenz Padberg eceeff559a Added get last completed functionality 2022-08-30 13:51:05 +02:00
Lorenz Padberg 508cf4e967 Add Weiter gehts to learning path overview 2022-08-30 11:52:57 +02:00
Daniel Egger 8b79201ba6 Refactor color values to json file 2022-08-30 11:07:30 +02:00
Daniel Egger 13f1154a94 Access tailwind theme from within custom CSS 2022-08-29 18:30:56 +02:00
Daniel Egger b6751adea5 VBV-67: Circle Ansicht Design Anpassungen 2022-08-29 18:23:33 +02:00
Daniel Egger 919edf1a24 Add cypress tests for circle page 2022-08-29 16:22:31 +02:00
Daniel Egger 3189e1cb7f Add cypress tests for learningPath view 2022-08-29 14:10:55 +02:00
Daniel Egger 52632708db Make cypress tests run on bitbucket 2022-08-26 18:18:32 +02:00
Daniel Egger ebce0a3a34 Cypress login with helper function 2022-08-26 15:52:34 +02:00
Daniel Egger 33757aa77e Add second cypress test 2022-08-26 15:12:03 +02:00
Daniel Egger 75a209e04f Upgrade to Cypress 10, add first login test 2022-08-26 15:06:22 +02:00
Lorenz Padberg ec479235f7 Add exercise url as wbt 2022-08-24 17:04:36 +02:00
Lorenz Padberg 8eafb48bf6 Fix Bug learning path not visible 2022-08-23 14:51:34 +02:00
Christian Cueni 38d5fc3369 Add logout 2022-08-18 11:09:38 +02:00
Christian Cueni 6ec987110a Add sso login link 2022-08-18 09:21:22 +02:00
Christian Cueni 95a0e0f1a7 Fix main navigation bar issues 2022-08-18 09:13:29 +02:00
Christian Cueni df903f2663 Add back link, remove unused code, fix mobile menu margins 2022-08-17 15:59:01 +02:00
Christian Cueni 66a41ff85b Refactor active link function 2022-08-17 09:22:22 +02:00
Christian Cueni ec5b659ff0 Fix background scroll on modal 2022-08-16 15:43:30 +02:00
Lorenz Padberg 67545f474a Added green state to learning path diagramm 2022-08-15 15:51:51 +02:00
Lorenz Padberg 3767edce04 Add half done to circle diagramm 2022-08-11 17:11:29 +02:00
Lorenz Padberg 2ad392f4c4 Fix responsive hidden attributes 2022-08-11 15:38:34 +02:00
Lorenz Padberg 5350f624c9 Restyling 2022-08-11 15:15:52 +02:00
Lorenz Padberg bc971065e3 Remove console logs 2022-08-11 15:00:03 +02:00
Lorenz Padberg 9566c69450 Add vertical Learning path diagramm to modal 2022-08-11 14:54:14 +02:00
Lorenz Padberg a3266aac14 Fix topic titles 2022-08-10 14:19:51 +02:00
Lorenz Padberg 1209a57e87 Merge branch 'develop' into feature/responsive-learnpfad
# Conflicts:
#	.dockerignore
2022-08-10 10:44:57 +02:00
Lorenz Padberg 16b87380d8 Use Variables for spaces between objects 2022-08-10 10:16:57 +02:00
Christian Cueni 22e9fcaed4 Add missing prop 2022-08-10 07:15:00 +02:00
Christian Cueni 737ceb6fd4 Merge branch 'feature/vbv-90-new-main-navigation' into develop 2022-08-10 07:10:39 +02:00
Lorenz Padberg c7622f7ed6 Make vertical alignment of diagram 2022-08-09 16:44:42 +02:00
Christian Cueni 0a7feea30c Add font classes 2022-08-08 10:48:05 +02:00
Daniel Egger 10d7632bfe VBV-86: Update base font styles 2022-08-08 10:48:05 +02:00
Christian Cueni 7acf115372 Close MobileMenu on click 2022-08-08 10:40:22 +02:00
Christian Cueni 75fc75616d Style mobile menu 2022-08-08 09:56:28 +02:00
Christian Cueni 1e2bc078cd WIP: Add mobile modal, refactor modal 2022-08-04 17:44:50 +02:00
Christian Cueni 03cd0fd32b WIP: Add dummy mobile nav 2022-08-04 15:38:45 +02:00
Christian Cueni 01b042f01f Add vbv link 2022-08-04 15:38:45 +02:00
Christian Cueni 2c4695222b Add dropdown to navigation 2022-08-04 15:38:45 +02:00
Christian Cueni 5ed546412f Add align option 2022-08-04 15:38:45 +02:00
Christian Cueni 15adae1b30 Add icon, style dropdown 2022-08-04 15:38:45 +02:00
Christian Cueni 6007ad8576 Add dropdown functionality 2022-08-04 15:38:45 +02:00
Christian Cueni 13c691c3c9 Show correct links in navigation 2022-08-04 15:38:41 +02:00
Christian Cueni d45530c2dd Fix width on big screens 2022-08-04 15:28:17 +02:00
Christian Cueni d93090f43b Make div a button 2022-08-04 15:28:17 +02:00
Christian Cueni 53f01701ad Add animation 2022-08-04 15:28:17 +02:00
Christian Cueni a9ab3ef2fc Fix modal 2022-08-04 15:28:17 +02:00
Christian Cueni 9f263ec657 Fix iframe height for WBT 2022-08-04 15:28:17 +02:00
Christian Cueni 9a7b858cf3 Add missing packages to client 2022-08-04 15:28:17 +02:00
Christian Cueni d91293338d Fix black 2022-08-04 11:01:26 +02:00
Christian Cueni 019c7a9f91 Update colors 2022-08-02 11:42:23 +02:00
Daniel Egger 987eeb9def Style LearningUnit in Wagtail 2022-07-14 16:08:18 +02:00