diff --git a/client/src/router/index.ts b/client/src/router/index.ts index f821c851..1342c3e2 100644 --- a/client/src/router/index.ts +++ b/client/src/router/index.ts @@ -38,6 +38,9 @@ const router = createRouter({ { path: '/styleguide', component: () => import('../views/StyelGuideView.vue'), + meta: { + public: true + } }, { path: '/:pathMatch(.*)*', diff --git a/client/src/views/404View.vue b/client/src/views/404View.vue index 4437a8d1..d6a6a096 100644 --- a/client/src/views/404View.vue +++ b/client/src/views/404View.vue @@ -1,11 +1,18 @@ + + + - - diff --git a/client/src/views/CircleView.vue b/client/src/views/CircleView.vue index 7912e36d..1edf5a73 100644 --- a/client/src/views/CircleView.vue +++ b/client/src/views/CircleView.vue @@ -77,7 +77,7 @@ export default {
-
+

{{ circleData.title }}

diff --git a/client/src/views/HomeView.vue b/client/src/views/HomeView.vue index 7fb5eee8..51752302 100644 --- a/client/src/views/HomeView.vue +++ b/client/src/views/HomeView.vue @@ -7,7 +7,7 @@ import MainNavigationBar from '@/components/MainNavigationBar.vue';

myVBV Start Page

-
+
Styelguide Login Circle "Analyse" (Login benötigt) diff --git a/client/src/views/StyelGuideView.vue b/client/src/views/StyelGuideView.vue index 731bf25f..204fb30c 100644 --- a/client/src/views/StyelGuideView.vue +++ b/client/src/views/StyelGuideView.vue @@ -41,7 +41,7 @@ function colorBgClass(color: string, value: number) {

Icons

-
+
IconMessage @@ -95,7 +95,7 @@ function colorBgClass(color: string, value: number) {
-
+
IconLsApply @@ -132,7 +132,7 @@ function colorBgClass(color: string, value: number) {
-
+
IconSmileyHappy @@ -188,7 +188,7 @@ function colorBgClass(color: string, value: number) {

Buttons

-
+
Primary Link diff --git a/prepare_server.sh b/prepare_server.sh index 81a13cf0..b9d2fc36 100755 --- a/prepare_server.sh +++ b/prepare_server.sh @@ -1,5 +1,8 @@ #!/bin/bash +# set location to script directory +cd "${0%/*}" + if [ -z "$CI" ]; then # kill all subprocess on exit so that Bitbucket Pipelines process will not hang @@ -46,6 +49,8 @@ mypsql() { if [ "$SKIP_SETUP" = false ]; then # TODO: in heroku we must do a `pg:resets` to reset the db + echo "Check postgres connection" + mypsql -c "SELECT 1" echo "Drop all connections to $POSTGRES_DB" mypsql -c "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$POSTGRES_DB' AND pid <> pg_backend_pid();" > /dev/null 2>&1 echo "Drop database: $POSTGRES_DB" diff --git a/prepare_server_cypress.sh b/prepare_server_cypress.sh index fa2e45ce..f8fb3dd3 100755 --- a/prepare_server_cypress.sh +++ b/prepare_server_cypress.sh @@ -1,3 +1,8 @@ +#!/bin/bash + +# set location to script directory +cd "${0%/*}" + export IT_APP_ENVIRONMENT=development export DJANGO_SETTINGS_MODULE=config.settings.test_cypress export DJANGO_PORT=8001 diff --git a/server/config/settings/base.py b/server/config/settings/base.py index 15a65c39..91369c6a 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -80,9 +80,6 @@ THIRD_PARTY_APPS = [ "drf_spectacular", "django_htmx", - "grapple", - "graphene_django", - 'wagtail.contrib.forms', 'wagtail.contrib.redirects', 'wagtail.embeds', diff --git a/server/vbv_lernwelt/templates/learnpath/circle.html b/server/vbv_lernwelt/templates/learnpath/circle.html index 057b190d..7fac7fec 100644 --- a/server/vbv_lernwelt/templates/learnpath/circle.html +++ b/server/vbv_lernwelt/templates/learnpath/circle.html @@ -1,104 +1,12 @@ {% extends "base.html" %} -{% load wagtailcore_tags %} - -{% block body_class %}template-cicle{% endblock %} - -{% block content %} -
-
- - -
- - - - - - - - -
-

{{ page.title }}

-
{{ page.description }}
-
{{ page.goals }}
-
- -
- {% for learning_sequence in page.learning_sequences.all %} -
-

{{ learning_sequence.title }}

- {% for learning_unit in learning_sequence.learning_units.all %} - - {% endfor %} -
- {% endfor %} -
-
- - -{% endblock %} +{% block inline_javascript %} + +{% endblock inline_javascript %} diff --git a/server/vbv_lernwelt/templates/wagtailadmin/pages/index.html b/server/vbv_lernwelt/templates/wagtailadmin/pages/index.html new file mode 100644 index 00000000..337de9c8 --- /dev/null +++ b/server/vbv_lernwelt/templates/wagtailadmin/pages/index.html @@ -0,0 +1,14 @@ +{% extends "wagtailadmin/pages/index.html" %} +{% load wagtailadmin_tags i18n %} + +{% block extra_js %} + {{ block.super }} + + +{% endblock %}