Commit Graph

322 Commits

Author SHA1 Message Date
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
Lorenz Padberg 9f42138e66 add envrc to gitignore 2022-05-16 15:07:19 +02:00
Lorenz Padberg 23f34eb674 add vite stuff to my env 2022-05-16 15:06:24 +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 d7492500fc a 2022-05-16 11:27: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
Christian Cueni 4b8b29640a Add basic components 2022-05-05 15:35:03 +02:00
Lorenz Padberg 3de2c1a2c8 added competence models 2022-05-05 10:28:21 +02:00
Christian Cueni ffb617bd05 Remove unused component 2022-05-05 08:37:06 +02:00
Christian Cueni 25e6448aaa Add dummy sidebar 2022-05-05 08:32:30 +02:00
Christian Cueni e6d093a2cd Remove unused components, add dummies 2022-05-05 08:13:04 +02:00
Christian Cueni 35647cc533 Merge branch 'master' into feature/component 2022-05-05 07:17:27 +02:00
Christian Cueni 2104c8daac Fix typing 🤔 2022-05-04 15:42:53 +02:00
Christian Cueni 23fb7553ca Fix typing 🤔 2022-05-04 15:38:59 +02:00
Christian Cueni cc29f36230 Add path 2022-05-04 13:14:33 +02:00
Christian Cueni 49c8148fd2 Remove layouts 2022-05-04 13:09:56 +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
Christian Cueni 7b976a0097 Skip test 2022-04-21 08:45:15 +02:00
Christian Cueni 880014d65b Remove serif font 2022-04-21 08:39:37 +02:00
Christian Cueni 4c843333e7 Add basic fonts 2022-04-20 20:02:55 +02:00
Christian Cueni afebecb04d Use rollup-alias instead of resolve.alias 2022-04-20 16:03:17 +02:00
Christian Cueni d80f6b9b90 Remove optimization & router-link 2022-04-20 15:51:46 +02:00
Lorenz Padberg eb289ed729 added more features to topic 2022-04-20 15:36:33 +02:00
Christian Cueni 65b6984f72 Remove setting 2022-04-20 15:26:15 +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 2f8682163e Update prefix, make linter happy 2022-04-20 15:24:27 +02:00
Christian Cueni a619037fa7 Add prettier config 2022-04-20 15:23:56 +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 a2622d7c5b Add test page 2022-04-20 15:16:29 +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