From 4bc533a6569e92f21d4108bcb767f0eedcf2e778 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Wed, 29 Jun 2022 12:54:11 +0200 Subject: [PATCH] Add new client pages --- client/package.json | 5 +- client/src/components/MainNavigationBar.vue | 73 +++++++++++++------ client/src/components/icons/IconVbv.vue | 22 ++++++ client/src/input.css | 0 client/src/router/index.ts | 24 ++++-- client/src/stores/user.ts | 3 + client/src/views/DashboardView.vue | 19 +++++ client/src/views/HomeView.vue | 4 +- client/src/views/MediaView.vue | 19 +++++ client/src/views/ProfileView.vue | 41 ++++------- client/src/views/ShopView.vue | 19 +++++ client/src/views/StyelGuideView.vue | 10 +++ .../vbv_lernwelt/core/create_default_users.py | 5 +- .../static/icons/icon-vbv-pos.svg | 37 ++++++++++ server/vbv_lernwelt/static/icons/icon-vbv.svg | 37 ++++++++++ 15 files changed, 256 insertions(+), 62 deletions(-) create mode 100644 client/src/components/icons/IconVbv.vue create mode 100644 client/src/input.css create mode 100644 client/src/views/DashboardView.vue create mode 100644 client/src/views/MediaView.vue create mode 100644 client/src/views/ShopView.vue create mode 100644 server/vbv_lernwelt/static/icons/icon-vbv-pos.svg create mode 100644 server/vbv_lernwelt/static/icons/icon-vbv.svg diff --git a/client/package.json b/client/package.json index 2eb81179..c64f788f 100644 --- a/client/package.json +++ b/client/package.json @@ -33,18 +33,19 @@ "@vue/eslint-config-typescript": "^10.0.0", "@vue/test-utils": "^2.0.0-rc.18", "@vue/tsconfig": "^0.1.3", - "autoprefixer": "^10.4.4", + "autoprefixer": "^10.4.7", "cypress": "^9.5.3", "eslint": "^8.5.0", "eslint-plugin-cypress": "^2.12.1", "eslint-plugin-vue": "^8.2.0", "happy-dom": "^5.3.1", - "postcss": "^8.4.12", + "postcss": "^8.4.14", "postcss-import": "^14.1.0", "prettier": "^2.5.1", "sass": "^1.50.1", "sass-loader": "^12.6.0", "start-server-and-test": "^1.14.0", + "tailwindcss": "^3.1.4", "typescript": "~4.6.3", "vite": "^2.9.1", "vitest": "^0.15.1", diff --git a/client/src/components/MainNavigationBar.vue b/client/src/components/MainNavigationBar.vue index 9e73317d..dcb80409 100644 --- a/client/src/components/MainNavigationBar.vue +++ b/client/src/components/MainNavigationBar.vue @@ -1,7 +1,12 @@ + + + + diff --git a/client/src/views/HomeView.vue b/client/src/views/HomeView.vue index 7b72def6..a641128a 100644 --- a/client/src/views/HomeView.vue +++ b/client/src/views/HomeView.vue @@ -11,8 +11,8 @@ import MainNavigationBar from '@/components/MainNavigationBar.vue'; Styelguide Login - Lernpfad "Versicherungsvermittlerin" (Login benötigt) - Circle "Analyse" (Login benötigt) + Lernpfad "Versicherungsvermittlerin" + Circle "Analyse" diff --git a/client/src/views/MediaView.vue b/client/src/views/MediaView.vue new file mode 100644 index 00000000..02bf8a26 --- /dev/null +++ b/client/src/views/MediaView.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/client/src/views/ProfileView.vue b/client/src/views/ProfileView.vue index c5f45614..e174c0de 100644 --- a/client/src/views/ProfileView.vue +++ b/client/src/views/ProfileView.vue @@ -1,34 +1,19 @@ - + - diff --git a/client/src/views/ShopView.vue b/client/src/views/ShopView.vue new file mode 100644 index 00000000..f2eb17b8 --- /dev/null +++ b/client/src/views/ShopView.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/client/src/views/StyelGuideView.vue b/client/src/views/StyelGuideView.vue index 8fb83e88..d3aea4d8 100644 --- a/client/src/views/StyelGuideView.vue +++ b/client/src/views/StyelGuideView.vue @@ -168,6 +168,16 @@ function colorBgClass(color: string, value: number) { +
+ vbv + +
+ +
+ vbv-pos + +
+ diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py index 41f8be4f..cab5e08b 100644 --- a/server/vbv_lernwelt/core/create_default_users.py +++ b/server/vbv_lernwelt/core/create_default_users.py @@ -30,6 +30,7 @@ def create_default_users(user_model=User, group_model=Group, default_password=No admin_user.is_staff = True admin_user.first_name = first_name admin_user.last_name = last_name + admin_user.avatar_url = avatar_url admin_user.groups.add(admin_group) admin_user.save() @@ -65,14 +66,14 @@ def create_default_users(user_model=User, group_model=Group, default_password=No email='axel.manderbach@lernetz.ch', first_name='Axel', last_name='Manderbach', - avatar_url='/static/avatars/avatar_axel.png' + avatar_url='/static/avatars/avatar_axel.jpg' ) _create_student_user( email='christoph.bosshard@vbv-afa.ch', first_name='Christoph', last_name='Bosshard', - avatar_url='/static/avatars/avatar_christoph.png' + avatar_url='/static/avatars/avatar_christoph.jpg' ) diff --git a/server/vbv_lernwelt/static/icons/icon-vbv-pos.svg b/server/vbv_lernwelt/static/icons/icon-vbv-pos.svg new file mode 100644 index 00000000..12aa3e79 --- /dev/null +++ b/server/vbv_lernwelt/static/icons/icon-vbv-pos.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + diff --git a/server/vbv_lernwelt/static/icons/icon-vbv.svg b/server/vbv_lernwelt/static/icons/icon-vbv.svg new file mode 100644 index 00000000..e4b14657 --- /dev/null +++ b/server/vbv_lernwelt/static/icons/icon-vbv.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + +