Commit Graph

341 Commits

Author SHA1 Message Date
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
Daniel Egger 15edbede8f Simple loading state for circle view and app transitions 2022-07-06 09:30:47 +02:00
Daniel Egger 724b8a8cb1 Add convenience features 2022-07-06 09:19:34 +02:00
Daniel Egger 8edea0b92f Add page cache for learningpath pages 2022-07-05 15:44:11 +02:00
Lorenz Padberg 026fbf243a fixed willkommen zurück responsive 2022-07-05 15:36:19 +02:00
Lorenz Padberg ec2560f88c made topic lines and circle names hidden in small screens 2022-07-05 15:19:22 +02:00
Daniel Egger 2daf659d71 Small fixes 2022-07-05 07:40:26 +02:00
Lorenz Padberg 1699852eda fixed topic line position 2022-07-04 18:29:59 +02:00
Lorenz Padberg abea407523 Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop 2022-07-04 17:24:43 +02:00
Lorenz Padberg dcbef8efed Fixed topics rendering 2022-07-04 17:12:30 +02:00
Daniel Egger c8a291e26c Add click to CircleDiagram to scroll to LearningSequence 2022-07-04 17:04:41 +02:00
Daniel Egger 1753ce0de4 Fix learningPath and topics loading 2022-07-04 16:38:56 +02:00
Daniel Egger dc0c12a347 Fix render onMounter for CircleDiagram 2022-07-04 15:05:19 +02:00
Daniel Egger e0c43b7247 Make reactive 2022-07-04 14:20:50 +02:00
Lorenz Padberg ad9c495c9c Merge remote-tracking branch 'origin/develop' into develop 2022-07-04 12:23:16 +02:00
Lorenz Padberg 5f39cfb2e9 fixed learning path text wrapping 2022-07-04 12:22:38 +02:00
Daniel Egger 2557d478c9 Show finished learningSequences in LearningPathDiagram 2022-07-04 12:15:49 +02:00
Daniel Egger cbbf4e42a2 Refactor learningPath views 2022-07-04 11:52:05 +02:00
Daniel Egger 7022827cf3 Refactor circle code to Circle class 2022-07-04 10:51:49 +02:00
Daniel Egger cc293400b4 More (copied) content for learningpath 2022-07-04 09:37:26 +02:00
Daniel Egger 988dd7c0de VBV-85: Update Navigation 2022-06-30 17:40:59 +02:00
Lorenz Padberg 30ef9c9c39 Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop 2022-06-30 15:20:08 +02:00
Lorenz Padberg ca7ff385f9 added type for circle diagram 2022-06-30 15:19:53 +02:00
Daniel Egger 4e7ca3bd1a Toggle MainNavigationBar 2022-06-30 14:11:22 +02:00
Daniel Egger d679eeb17d VBV-78: WBT in Circle eingebaut 2022-06-30 14:11:22 +02:00
Daniel Egger 76349ffc7e Add more menu entries 2022-06-30 14:11:22 +02:00
Daniel Egger 9e9476f9a4 Refactor tailwind configuration 2022-06-30 14:11:22 +02:00
Daniel Egger 4bc533a656 Add new client pages 2022-06-30 14:11:22 +02:00
Daniel Egger 2af7439b97 VBV-76: Refactor user and login handling 2022-06-30 14:11:21 +02:00
Lorenz Padberg 71c3deba47 excluded media from gitignore 2022-06-30 11:03:20 +02:00
Lorenz Padberg c9cc2c2cb6 first viable version 2022-06-30 11:02:52 +02:00
Lorenz Padberg 20c85dc6fc frist reactive version 2022-06-30 10:41:50 +02:00
Lorenz Padberg 91f09beede added done state (not yet reactive) 2022-06-28 17:12:59 +02:00
Lorenz Padberg 463fd5eee7 removed last arrow 2022-06-28 14:59:57 +02:00
Lorenz Padberg 9319aa2b16 add hover transition 2022-06-28 14:34:09 +02:00
Lorenz Padberg e8dcd231f2 added done status 2022-06-28 13:49:12 +02:00
Lorenz Padberg a8a239e395 added arrows correctly 2022-06-28 13:31:50 +02:00
Lorenz Padberg 1af338c889 rotated learning sequences 2022-06-27 18:23:48 +02:00
Lorenz Padberg bb24161f4b with real data from store 2022-06-27 18:11:11 +02:00