Commit Graph

1131 Commits

Author SHA1 Message Date
Ramon Wenger 41c6346136 Add favicon 2022-12-08 17:06:04 +01:00
Daniel Egger 0cbce3c42b Load separate competence profile for every user 2022-12-02 17:49:40 +01:00
Daniel Egger 0adf734846 Url handling 2022-12-02 17:10:57 +01:00
Daniel Egger 5aa73e4997 Fix problem in competence pages 2022-12-02 16:57:44 +01:00
Daniel Egger 218756e3dc Add drf view to request completion data for user 2022-12-02 14:53:49 +01:00
Daniel Egger 48cf9026d9 Add cockpit store 2022-12-02 14:24:02 +01:00
Daniel Egger 963250a8da Add role to course session user 2022-12-02 13:59:27 +01:00
Daniel Egger 205cb3c1d4 Add view for course session members 2022-12-02 13:44:28 +01:00
Daniel Egger 00d2527b29 Refactor urls for courses, learning paths and competence profile 2022-12-02 11:18:56 +01:00
Daniel Egger cb9505b54c Add some more demo users 2022-12-02 10:27:27 +01:00
Christian Cueni d9390ef82d Add basic cockpit page 2022-12-01 16:02:43 +00:00
Ramon Wenger 84d17ff732 Add urql to frontend 2022-11-22 16:18:52 +01:00
Ramon Wenger c694b1d3e5 Add GraphQL config 2022-11-21 12:06:33 +01:00
Ramon Wenger cb7b00ff40 Add GraphQL urls 2022-11-21 12:04:57 +01:00
Christian Cueni dc59b41455 Update video content 2022-11-21 10:37:02 +00:00
Ramon Wenger 3eb6664f03 Add script for updating requirements 2022-11-17 15:21:16 +01:00
Ramon Wenger 7b4860f170 Add settings for S3 storage and Grapple/GraphQL 2022-11-17 15:19:27 +01:00
Christian Cueni 2313587f6a Update text 2022-11-15 13:02:37 +01:00
Daniel Egger a3c3e60763 Show only uniqe courses (not course sessions) on Dashboar 2022-11-14 11:20:37 +01:00
Daniel Egger 64b6356ef5 Add more test users 2022-11-11 11:22:41 +01:00
Daniel Egger 2295ede996 Add python unit tests 2022-11-09 12:40:01 +01:00
Daniel Egger 6f6fbc3cf8 Replace email from Bianca 2022-11-09 12:40:01 +01:00
Daniel Egger 93a0fdaadb Add ÜK1 course 2022-11-09 12:40:01 +01:00
Daniel Egger e6e5b77d0e Create default `CourseSessionUser`s 2022-11-09 12:40:01 +01:00
Daniel Egger efd8892d6a Select Circle expert/trainer on the admin field (not dynamic) 2022-11-09 12:40:01 +01:00
Daniel Egger a119cc122d Add CourseSession admin model 2022-11-09 12:40:01 +01:00
Daniel Egger 17eaf80d2c Add CourseSession serializer and view 2022-11-09 12:40:00 +01:00
Daniel Egger 05e02449c8 Refactor course access check 2022-11-09 12:40:00 +01:00
Daniel Egger b36b0e8d96 Fix test by assigning admin user 2022-11-09 12:40:00 +01:00
Daniel Egger c61ea10c7d Format code 2022-11-09 12:40:00 +01:00
Daniel Egger d8577c70d5 Limit page access to users which can access course 2022-11-09 12:40:00 +01:00
Daniel Egger d8148158a1 Refactor serialization code 2022-11-09 12:40:00 +01:00
Daniel Egger f8d00040f6 Add basic model 2022-11-09 12:40:00 +01:00
Ramon Wenger 5cfce209b6 Re-add reading of local .env file 2022-11-09 10:52:23 +01:00
Christian Cueni 50da271ea4 Merge branch 'feature/i18n' into develop 2022-11-08 16:05:18 +01:00
Christian Cueni 25749bf915 Fix video location 2022-11-08 16:05:14 +01:00
Christian Cueni 03bbd26774 Add translations strings 2022-11-08 15:05:54 +01:00
Christian Cueni f3c5999cad Make changes for demo 2022-11-08 14:40:57 +01:00
Christian Cueni 2015ab25de Update WBTs 2022-11-08 08:28:26 +01:00
Christian Cueni ff088257ce Add video in Einstieg 2022-11-07 13:24:19 +01:00
Christian Cueni 9a2675cd16 Use HF detail image from backend 2022-11-07 11:39:25 +01:00
Christian Cueni c9a5fd573c Add learning module 2022-11-05 17:59:06 +01:00
Christian Cueni 44d8c1645e Add new types, update name 2022-11-03 07:15:36 +01:00
Christian Cueni 1d7816f664 Show all Hfs 2022-11-02 21:52:33 +01:00
Christian Cueni bd520134f1 Add changes for demo
New user name
Hide unfinished HFs
Make unfinished HFs in path placeholders
2022-11-01 21:25:45 +01:00
Christian Cueni 3608156353 WIP: Setup i18n 2022-10-27 16:09:06 +02:00
Christian Cueni 6254e63d01 Don't show "in Umsetzung" labels, add demo user 2022-10-27 12:45:43 +02:00
Christian Cueni 5ce25fe4da Add new icons 2022-10-25 13:19:07 +02:00
Christian Cueni 4626065b7c Add fake landing page 2022-10-25 09:35:32 +02:00
Daniel Egger 579865d478 Fix python tests 2022-10-21 18:05:37 +02:00
Daniel Egger 924bf6f140 Fix `npm run test` 2022-10-21 18:00:22 +02:00
Daniel Egger e8386a71a8 Remove hiredis dependency 2022-10-21 17:16:00 +02:00
Daniel Egger c8824763f6 Refactor types 2022-10-21 13:44:11 +02:00
Christian Cueni e653f915fe Update HF icons 2022-10-19 12:01:30 +02:00
Christian Cueni 7fbac1aaea Rename Profil to Navi 2022-10-18 15:56:25 +02:00
Christian Cueni 566e7bc6d0 Use email as username if no username available 2022-10-18 11:01:03 +02:00
Daniel Egger bb1db2d845 Add Beispiel Transferauftrag 2022-10-14 18:10:07 +02:00
Daniel Egger 4d24d3b295 Add "Beenden" content 2022-10-14 14:43:23 +02:00
Daniel Egger 189cfcde3f Weitere Circle-Texte übernommen 2022-10-14 12:57:34 +02:00
Daniel Egger 06d78d5bdb Add player-0.0.11.min.js files 2022-10-13 14:47:45 +02:00
Daniel Egger c9bf1d2753 Add wbt files to git lfs 2022-10-12 17:22:03 +02:00
Daniel Egger 126f0de318 Anpassungen Mobile 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 cf873e6f23 Add circles to competence api json 2022-10-11 16:46:53 +02:00
Daniel Egger be68854545 Enable django watchfiles runserver reloader 2022-10-11 16:46:53 +02:00
Daniel Egger a2bb4aeb18 Upgrade some python packages 2022-10-11 16:46:53 +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 dc3b1a4ca6 Add backend data to competence profile 2022-10-07 11:35:43 +02:00
Daniel Egger 115c512e84 Fix reset_schema script used by caprover 2022-10-05 17:09:42 +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 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 dec1b874a7 Add Performance Criteria for oktober demo 2022-10-05 11:16:52 +02:00
Daniel Egger 647631491d Add Performance Criteria for oktober demo 2022-10-04 17:37:30 +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 a33c161231 Add learning path data for oktober demo 2022-10-04 15:48:53 +02:00
Daniel Egger 17eb308f6e Add data for mediathek "Reisen" und "Fahrzeug" 2022-10-04 14:43:06 +02:00
Daniel Egger e95086850b Default data for mediathek 2022-10-04 14:42:34 +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
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 3bd604215a Fix cypress tests 2022-09-28 17:55:47 +02:00
Daniel Egger bdae082550 Fix self-evalution checkboxes 2022-09-28 16:19:01 +02:00
Daniel Egger e230c0b8e5 Fix python tests 2022-09-28 15:34:07 +02:00
Daniel Egger 8ab17f9370 Readd completion code 2022-09-28 15:11:08 +02:00
Daniel Egger b5804c2696 Fix test lerngang 2022-09-28 14:52:25 +02:00
Daniel Egger d5e484a6c7 Add CompetencePage 2022-09-28 13:09:36 +02:00
Daniel Egger 9be2fa0d3a Serialize LearningPath with PerformanceCriteria 2022-09-28 13:09:34 +02:00
Daniel Egger 5284d6f1cf Serialize LearningPath with PerformanceCriteria 2022-09-27 17:53:22 +02:00
Daniel Egger 8cfde35704 Serializer for CompetenceProfile 2022-09-27 17:19:47 +02:00
Daniel Egger 46998668d8 Add course_category to LearningUnit 2022-09-27 16:41:54 +02:00
Daniel Egger 9c77526646 Add initial competence django app 2022-09-27 15:57:17 +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 8941f4ad24 Merge branch 'feature/mediathek-server' into feature/mediathek-frontend 2022-09-23 16:17:02 +02:00
Daniel Egger a7f0d79c0f Add serializer for media_library models 2022-09-23 15:38:06 +02:00
Daniel Egger 79c0fb8b11 Refactor 2022-09-23 15:14:42 +02:00
Daniel Egger 5425c1b22c Add content collections with create_default script 2022-09-23 14:55:21 +02:00
Daniel Egger f9c3e82b66 Adapt LearningPath to new course model 2022-09-23 14:55:21 +02:00
Daniel Egger ee4f6fb565 Add course app with default course model 2022-09-23 14:55:21 +02:00
Daniel Egger a75a29f57c Squashed commit of feature/Mediathek from Renzo
commit ac0707296df479c0de5399b8adcccc24da749810
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Thu Sep 15 11:39:01 2022 +0200

    Revert "Upgrade to Wagtail 4.0"

    This reverts commit e6f43f6b11e91a923badbaec33ab460a3cfac60e.

commit d5b28e362f604d17fed32fabe8295865b82350de
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Thu Sep 15 11:38:14 2022 +0200

    Add factories for category content

commit e6ebabc1c6b01ccbc14413bbe40e71a348dfa565
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Tue Sep 13 16:10:58 2022 +0200

    Simplify Mediathek models

commit b4dd179b891960babb8c26a70d3cecfcabb72264
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 15:53:00 2022 +0200

    Add Document and Link to Mediathek

commit 707ab8d9abc622f3ef5935472ddc7e7c74a352e6
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 14:16:49 2022 +0200

    Add Media Library Models, including factory and default data

commit e6f43f6b11e91a923badbaec33ab460a3cfac60e
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 11:09:46 2022 +0200

    Upgrade to Wagtail 4.0
2022-09-23 14:55:21 +02:00
Christian Cueni 442ee3e4da Add basic mediacenter store 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 070c79a0d9 WIP: Add icons to safelist 2022-09-19 14:38:50 +02:00
Daniel Egger 5663fe1a74 Try to make cypress tests less flaky 2022-09-14 16:29:41 +02:00
Daniel Egger a3171da28d Dynamic "Weiter gehts" "Leider gehts" 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 8dbec8b699 Use `runserver_plus` to minimize runserver cpu usage 2022-09-09 12:16:48 +02:00
Daniel Egger 48b143b99a Remove superfluous media files 2022-09-09 11:57:45 +02:00
Daniel Egger 3ff2b23cf7 VBV-142: move "/media" to "/static/media" 2022-09-09 11:56:49 +02:00
Lorenz Padberg 9c24ede7ab Add player from scormcontent 2022-09-08 14:32:17 +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 18acf10c9a Refactor to new url structure for learningPath and circle 2022-08-31 15:28:17 +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 919edf1a24 Add cypress tests for circle page 2022-08-29 16:22:31 +02:00
Daniel Egger 52632708db Make cypress tests run on bitbucket 2022-08-26 18:18:32 +02:00
Daniel Egger 75a209e04f Upgrade to Cypress 10, add first login test 2022-08-26 15:06:22 +02:00
Daniel Egger 01ff7c2f79 Fix trufflehog exclude patterns 2022-08-26 14:39:19 +02:00
Daniel Egger 0ad8706625 Fix unit tests 2022-08-26 10:47:01 +02:00
Daniel Egger c2e2d596b2 Add function to create simple learningpath for unit tests 2022-08-26 10:02:43 +02:00
Lorenz Padberg 78ec4569ad Merge branch 'feature/demodaten_anpassung' into develop 2022-08-25 11:30:18 +02:00
Christian Cueni ad4c8771a8 Fix Selbsteinschätzung in "testen" 2022-08-25 08:19:02 +02:00
Lorenz Padberg 7ba1857ee2 Add more content 2022-08-24 17:12:01 +02:00
Lorenz Padberg 422315e699 Add wbts to media folder  🔥 2022-08-24 17:05:16 +02:00
Lorenz Padberg ec479235f7 Add exercise url as wbt 2022-08-24 17:04:36 +02:00
Daniel Egger 742d527ffa VBV-133: Aufbau Stage- und Prod-Umgebung auf CapRover 2022-08-24 15:40:34 +02:00
Lorenz Padberg bef3b59188 test 2022-08-23 15:44:10 +02:00
Lorenz Padberg 5af1041a12 Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop 2022-08-18 15:27:30 +02:00
Lorenz Padberg 3c2d0a26db Add Document factories and Collections to test data 2022-08-18 15:27:18 +02:00
Lorenz Padberg 08d0245a04 Add media_library app 2022-08-18 11:35:59 +02:00
Christian Cueni 38d5fc3369 Add logout 2022-08-18 11:09:38 +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 3280fc44fa Fix get email, remove versions from deploy script 2022-08-16 08:00:05 +02:00
Christian Cueni 67b8aa9f8d Remove test data, read correct string 2022-08-15 15:51:36 +02:00
Christian Cueni b06db37d05 WIP: Add test url 2022-08-15 15:51:36 +02:00
Christian Cueni cd829a3c9a WIP: Update config 2022-08-15 15:51:36 +02:00
Christian Cueni 55592b1cc6 Fix oauth client selection 2022-08-10 17:09:30 +02:00
Christian Cueni 759dd97de4 Fix avatar url 2022-08-10 11:00:51 +02:00
Christian Cueni abdd91ae72 Add sso params 2022-08-10 09:45:02 +02:00
Christian Cueni 8bfd2ac953 Update sso settings, add user manager 2022-08-10 08:49:33 +02:00
Christian Cueni 75b5c5fd5c Allow other default passwords for users 2022-08-08 11:01:40 +02:00
Christian Cueni 63e12009ec Add new test users 2022-08-04 07:17:43 +02:00
Christian Cueni d5cea6b969 Update icons 2022-08-02 12:39:54 +02:00
Daniel Egger 987eeb9def Style LearningUnit in Wagtail 2022-07-14 16:08:18 +02:00
Daniel Egger 8edea0b92f Add page cache for learningpath pages 2022-07-05 15:44:11 +02:00
Daniel Egger 96020bf83d performance optimization to get full learningpath content 2022-07-05 13:11:45 +02:00
Daniel Egger 2daf659d71 Small fixes 2022-07-05 07:40:26 +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 cc293400b4 More (copied) content for learningpath 2022-07-04 09:37:26 +02:00
Daniel Egger b5e2f5af50 Filter to "de-CH" 2022-06-30 15:25:02 +02:00
Daniel Egger d679eeb17d VBV-78: WBT in Circle eingebaut 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
Daniel Egger 4b02991f0d Improve DB reset for caprover deployment 2022-06-30 14:11:21 +02:00
Daniel Egger ad380f741e Use wagtail-localize for translations 2022-06-30 14:11:21 +02:00
Lorenz Padberg 2c8baf21e4 added player 2022-06-29 14:01:45 +02:00
Lorenz Padberg e90790a006 added wbt 2022-06-29 13:56:12 +02:00
Daniel Egger 16a4c8ccb4 Make responsive 2022-06-23 19:06:52 +02:00
Daniel Egger 500ed0f111 Step through circle 2022-06-23 18:33:20 +02:00
Daniel Egger 3686924cfe Refactor completion api 2022-06-22 19:04:35 +02:00
Daniel Egger 12322638dc Add LearningUnitQuestion as custom model 2022-06-22 16:26:12 +02:00
Daniel Egger 7e5debb5ca update icon stuff 2022-06-22 11:21:28 +02:00
Daniel Egger 2c36ea9242 Add previous-/next- attributes to LearningContents 2022-06-21 18:23:35 +02:00
Daniel Egger b893dcbcc8 Add component for learning content 2022-06-21 15:58:05 +02:00
Daniel Egger 9d768c8205 Changes for deployment 2022-06-21 13:39:48 +02:00
Daniel Egger a27fa35fe3 Toggle learning contents 2022-06-14 16:41:21 +02:00
Daniel Egger ad7d63a8e9 Copy icons directly as delivered from Steph 2022-06-14 15:33:20 +02:00
Daniel Egger a83c2d808a Add `ItCheckbox` component 2022-06-14 14:15:37 +02:00
Daniel Egger 1705faee6e Reset migrations, remove APIFields 2022-06-14 10:56:32 +02:00
Daniel Egger c26a3091bb Show checkboxes correctly in circle 2022-06-14 10:42:29 +02:00
Daniel Egger 3019f34013 Add dropdown example 2022-06-14 10:42:29 +02:00
Daniel Egger 736ecb2449 Refactor client can complete learning contents 2022-06-14 10:42:29 +02:00
Daniel Egger c334c25f1c Client can complete learning contents 2022-06-14 10:42:29 +02:00
Daniel Egger 0d54437bf8 Add first api to complete learning contents 2022-06-14 10:42:29 +02:00
Daniel Egger 08e5672623 Add completion app 2022-06-14 10:42:29 +02:00
Daniel Egger ff23e3b4f7 Refactor circle data model 2022-06-14 10:42:23 +02:00
Lorenz Padberg 4cac282dc8 Merge remote-tracking branch 'origin/develop' into feature/learingpath-view
# Conflicts:
#	server/vbv_lernwelt/learnpath/urls.py
#	server/vbv_lernwelt/learnpath/views.py
2022-06-14 10:36:06 +02:00
Lorenz Padberg ed5e409992 added basic grafics to topics 2022-06-13 18:01:20 +02:00
Lorenz Padberg c3481c22d7 added dynamic number of learning sequences 2022-06-08 17:20:11 +02:00
Lorenz Padberg a39f5de67d added topics to learnpath visualisation 2022-06-08 12:06:47 +02:00
Daniel Egger d88d44ecb0 Refactor icons as Web Components 2022-06-08 12:03:47 +02:00
Daniel Egger 3a9ad53e7a Upgrade to Wagtail 3.0 2022-06-07 18:16:53 +02:00
Lorenz Padberg bfb34177a8 Added learning path api and view 2022-06-07 16:56:26 +02:00
Daniel Egger d02afcf501 Redirect to sorted cms index page 2022-06-07 14:56:30 +02:00
Daniel Egger 5fda07a5c2 Add workaround for vitejs resolving font path 2022-06-05 21:25:40 +02:00
Daniel Egger 20d10da944 Refactor Circle data model 2022-06-03 17:52:22 +02:00
Daniel Egger fd008be527 Style home page a bit 2022-06-03 10:12:52 +02:00
Daniel Egger 65ecf77a59 Update client with new api data model 2022-06-01 22:24:49 +02:00
Daniel Egger f480665537 Working serialization 2022-06-01 22:11:10 +02:00
Daniel Egger 4a2d049969 Refactor data model 2022-06-01 16:41:17 +02:00
Daniel Egger cd676bbe96 Update circle view 2022-06-01 11:29:19 +02:00
Daniel Egger 19cc0c2af3 Add Style Guide page 2022-06-01 10:41:14 +02:00
Daniel Egger 424af03ce1 Update scripts for building and deployment 2022-05-30 16:58:22 +02:00
Daniel Egger a431f35743 Update docs and scripts 2022-05-27 11:01:08 +02:00
Daniel Egger 5081ddf107 Rename env variable stuff 2022-05-25 18:31:43 +02:00
Daniel Egger 7d233f21ea Style learning sequence 2022-05-25 18:23:42 +02:00
Daniel Egger 49aaa526b5 Styling of circle page 2022-05-25 18:23:42 +02:00
Lorenz Padberg ba81ce2215 added content structure to the circle api fields 2022-05-25 15:40:54 +02:00
Daniel Egger be99631c9a Update tailwind 2022-05-23 14:45:49 +02:00
Lorenz Padberg 342d0bdd02 Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop
# Conflicts:
#	server/README.md
2022-05-23 14:40:21 +02:00
Lorenz Padberg 5af863fb6c added api stuff to readme 2022-05-23 14:35:05 +02:00
Lorenz Padberg 56a14d2942 removed graphql fields 2022-05-23 14:34:43 +02:00
Lorenz Padberg 23c1ccfe7a Added port info to site, so the links in api work 2022-05-23 11:31:23 +02:00
Daniel Egger c3f5e47be0 Add integrated tailwind support for client and server 2022-05-23 11:09:07 +02:00
Daniel Egger 740488cdeb Add example view to load data from wagtail API 2022-05-23 10:36:15 +02:00
Daniel Egger 532212bf03 Serve vue index page in development directly from vue 2022-05-23 09:23:35 +02:00
Lorenz Padberg 2a93c05bc2 added wagtail v2 api 2022-05-16 16:57:21 +02:00
Lorenz Padberg 515f01c450 fix cms admin page bug 2022-05-16 15:26:02 +02:00
Daniel Egger 95376290d6 Add local config 2022-05-16 14:42:03 +02:00
Lorenz Padberg 09fb27a48c added missing libraries 2022-05-16 11:48:41 +02:00
Lorenz Padberg 36ffd8ed6f Merge branch 'feature/graphql-api' into develop
# Conflicts:
#	server/config/settings/base.py
#	server/config/urls.py
#	server/example.env
#	server/requirements/requirements-dev.txt
#	server/requirements/requirements.txt
2022-05-16 11:37:29 +02:00
Lorenz Padberg 1df0f47966 added graphql fields for wagtail models 2022-05-12 17:15:09 +02:00
Lorenz Padberg cb0611ce6e added grapple and graphene 2022-05-12 17:14:34 +02:00
Lorenz Padberg 3de2c1a2c8 added competence models 2022-05-05 10:28:21 +02:00
Lorenz Padberg d4e6778259 removed django debug toolbar,because it makes wagtail slow 2022-05-03 16:29:25 +02:00
Lorenz Padberg fe3d5443a8 created new templates first version of models 2022-05-03 16:28:53 +02:00
Lorenz Padberg 19eafd8b35 Experiment with new model structure 2022-05-02 13:42:37 +02:00
Christian Cueni 65313668cc Fix typo, make linter happy 2022-04-21 15:57:59 +02:00
Christian Cueni 14965aa60b Add middleware and guards 2022-04-21 14:23:52 +02:00
Lorenz Padberg eb289ed729 added more features to topic 2022-04-20 15:36:33 +02:00
Christian Cueni 513b66ff31 Update env variable, add basic http util, remove html 2022-04-20 15:25:29 +02:00
Christian Cueni 3917def262 Use structlogger 2022-04-20 15:24:29 +02:00
Christian Cueni bc8d1b0a21 Update env variables, use env variables in vite.config.js 2022-04-20 15:23:10 +02:00
Christian Cueni 149ba17580 Update oauth redirects 2022-04-20 15:16:32 +02:00
Christian Cueni 616113aaf9 Login user 2022-04-20 15:16:32 +02:00
Christian Cueni 61b4e91d67 Add new redirect page 2022-04-20 15:16:32 +02:00
Christian Cueni 32182fab27 Add local login flag 2022-04-20 14:43:04 +02:00
Christian Cueni 29258c4348 Fix OpenId login 2022-04-20 14:43:04 +02:00
Christian Cueni c6adf1ca41 Fix sso 2022-04-20 14:43:04 +02:00
Christian Cueni 796db1e83b Remove models, update settings 2022-04-20 14:43:04 +02:00
Christian Cueni 95e1228269 Add app structure 2022-04-20 14:43:04 +02:00
Lorenz Padberg 5e1b5de187 small changes to template 2022-04-19 17:31:40 +02:00
Lorenz Padberg 589c8cfe84 Added example rise module to media 2022-04-19 16:14:48 +02:00
Lorenz Padberg daa51619dc added video and wbt learning unit content 2022-04-19 16:14:26 +02:00
Lorenz Padberg 53675aa69c Added category to learning sequence 2022-04-14 15:03:36 +02:00
Lorenz Padberg 25afc5d8a1 no chli figuretlet 2022-04-13 17:22:48 +02:00
Lorenz Padberg cd8fd49bb9 added circle 2022-04-13 15:06:17 +02:00
Lorenz Padberg ef81bee960 added basic styling to templates 2022-04-13 14:33:07 +02:00
Lorenz Padberg 024358917c refactored template 2022-04-12 16:41:46 +02:00
Lorenz Padberg a6f1b8572f added basic html templates 2022-04-12 16:24:26 +02:00
Lorenz Padberg cd4276a7a5 Added function to create testdata and DB 2022-04-12 14:53:50 +02:00
Lorenz Padberg 3496a20489 created learnpath factories 2022-04-05 11:07:03 +02:00
Lorenz Padberg 35d26276e1 fixed tests with multilanguage stuff 2022-04-04 16:01:02 +02:00
Lorenz Padberg 03640646be added locale test 2022-04-04 14:18:27 +02:00
Lorenz Padberg 1b3ce68885 added wagtail tests to requirements 2022-04-04 13:27:23 +02:00
Lorenz Padberg be76574eeb added multilanguage config to wagtail 2022-03-31 17:36:12 +02:00
Lorenz Padberg af3b7da461 fixed imports 2022-03-31 17:35:48 +02:00
Lorenz Padberg 18233aa4e6 added example tests 2022-03-31 15:17:32 +02:00
Lorenz Padberg 3c56ba308f added learningpath apps and fist tests 2022-03-30 15:10:02 +02:00
Lorenz Padberg f3a6946002 added wagtail to settings and urls 2022-03-29 09:16:51 +02:00
Lorenz Padberg 3ead803091 Added wagtail to requirements 2022-03-29 09:16:27 +02:00
Lorenz Padberg 45ab89ea07 added learnpath app 2022-03-28 17:41:58 +02:00
Daniel Egger 469f934fad Add log folder 2022-02-08 22:09:48 +01:00
Daniel Egger ca709c9766 Refactor logging config 2022-02-08 21:37:02 +01:00
Daniel Egger b5a243b141 Configure logging 2022-02-08 18:50:56 +01:00
Daniel Egger e4a04b8bdd Add configuration 2022-02-08 17:03:40 +01:00
Daniel Egger 7549d42e1e Add rate limit libraries 2022-02-08 16:16:12 +01:00
Daniel Egger 09b525eb15 Add cypress tests 2022-02-08 14:44:11 +01:00
Daniel Egger 8dd3316f8f Prepare django for cypress 2022-02-08 13:45:40 +01:00
Daniel Egger 11d2bc3ed5 Add coverage to python tests 2022-02-08 08:47:07 +01:00
Daniel Egger db291b50c0 Add simpletodo htmx example app 2022-02-08 08:37:51 +01:00
Daniel Egger 15bea892e4 Add simpletodo app 2022-02-03 21:37:43 +01:00
Daniel Egger d41e1da419 Add tests 2022-02-03 21:23:30 +01:00
Daniel Egger 0a7adb20db Add bitbucket pipelines 2022-02-03 19:13:10 +01:00
Daniel Egger aa476b4318 Improved logging 2022-02-03 18:38:53 +01:00
Daniel Egger 045391fc59 Code formatting 2022-02-03 17:52:21 +01:00
Daniel Egger 425273c5a3 Move django project to `server` directory 2022-02-03 17:33:59 +01:00