Commit Graph

78 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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