From ad7d63a8e9462b0a1bbe6f727410462ce1292412 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Tue, 14 Jun 2022 15:33:20 +0200 Subject: [PATCH] Copy icons directly as delivered from Steph --- client/src/views/StyelGuideView.vue | 29 +++++++++++++++---- server/vbv_lernwelt/completion/serializers.py | 8 ++++- server/vbv_lernwelt/completion/views.py | 7 ----- .../static/icons/icon-arrow-down.svg | 6 +--- .../static/icons/icon-arrow-left.svg | 6 +--- .../static/icons/icon-arrow-right.svg | 6 +--- .../static/icons/icon-arrow-up.svg | 7 ++--- .../vbv_lernwelt/static/icons/icon-check.svg | 6 +--- .../vbv_lernwelt/static/icons/icon-close.svg | 6 +--- .../vbv_lernwelt/static/icons/icon-info.svg | 6 +--- .../vbv_lernwelt/static/icons/icon-list.svg | 1 + .../static/icons/icon-ls-apply.svg | 6 +--- .../vbv_lernwelt/static/icons/icon-ls-end.svg | 9 +----- .../static/icons/icon-ls-network.svg | 13 +-------- .../static/icons/icon-ls-practice.svg | 6 +--- .../static/icons/icon-ls-start.svg | 9 +----- .../static/icons/icon-ls-test.svg | 6 +--- .../static/icons/icon-ls-watch.svg | 6 +--- .../vbv_lernwelt/static/icons/icon-menu.svg | 1 + .../static/icons/icon-message.svg | 7 ++--- .../static/icons/icon-smiley-happy.svg | 10 +------ .../static/icons/icon-smiley-neutral.svg | 10 +------ .../static/icons/icon-smiley-thinking.svg | 14 +-------- tailwind/input.css | 10 +++++-- 24 files changed, 61 insertions(+), 134 deletions(-) create mode 100644 server/vbv_lernwelt/static/icons/icon-list.svg create mode 100644 server/vbv_lernwelt/static/icons/icon-menu.svg diff --git a/client/src/views/StyelGuideView.vue b/client/src/views/StyelGuideView.vue index b8bcd549..2a0a814b 100644 --- a/client/src/views/StyelGuideView.vue +++ b/client/src/views/StyelGuideView.vue @@ -88,16 +88,14 @@ function colorBgClass(color: string, value: number) {
- checkbox-checked - + list +
- checkbox-unchecked - + menu +
- -
@@ -154,6 +152,25 @@ function colorBgClass(color: string, value: number) {
+
+
+ message big + +
+ +
+ ls-network big + +
+ +
+ close small + +
+ + +
+

Colors

diff --git a/server/vbv_lernwelt/completion/serializers.py b/server/vbv_lernwelt/completion/serializers.py index 983a033c..eaa5a4af 100644 --- a/server/vbv_lernwelt/completion/serializers.py +++ b/server/vbv_lernwelt/completion/serializers.py @@ -1,9 +1,15 @@ from rest_framework import serializers -from vbv_lernwelt.completion.models import UserCircleCompletion +from vbv_lernwelt.completion.models import UserCircleCompletion, LearningContentCompletion class UserCircleCompletionSerializer(serializers.ModelSerializer): class Meta: model = UserCircleCompletion fields = ['id', 'created_at', 'updated_at', 'user', 'circle_key', 'json_data'] + + +class LearningContentCompletionSerializer(serializers.ModelSerializer): + class Meta: + model = LearningContentCompletion + fields = ['id', 'created_at', 'updated_at', 'user', 'learning_content_key', 'circle_key', 'json_data'] diff --git a/server/vbv_lernwelt/completion/views.py b/server/vbv_lernwelt/completion/views.py index ed686656..98f7b708 100644 --- a/server/vbv_lernwelt/completion/views.py +++ b/server/vbv_lernwelt/completion/views.py @@ -41,13 +41,6 @@ def complete_learning_content(request): user=request.user, circle_key=circle_key, ) - - completed_learning_contents = ucc.json_data.get('completed_learning_contents', {}) - completed_learning_contents[learning_content_key] = { - 'learning_content_key': learning_content_key, - 'created_at': datetime.now().isoformat(), - } - ucc.json_data['completed_learning_contents'] = completed_learning_contents ucc.save() logger.debug( diff --git a/server/vbv_lernwelt/static/icons/icon-arrow-down.svg b/server/vbv_lernwelt/static/icons/icon-arrow-down.svg index ab374eca..64e642ef 100644 --- a/server/vbv_lernwelt/static/icons/icon-arrow-down.svg +++ b/server/vbv_lernwelt/static/icons/icon-arrow-down.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-arrow-left.svg b/server/vbv_lernwelt/static/icons/icon-arrow-left.svg index 3ba04ada..dcc9d009 100644 --- a/server/vbv_lernwelt/static/icons/icon-arrow-left.svg +++ b/server/vbv_lernwelt/static/icons/icon-arrow-left.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-arrow-right.svg b/server/vbv_lernwelt/static/icons/icon-arrow-right.svg index 00ee16e3..e4707d00 100644 --- a/server/vbv_lernwelt/static/icons/icon-arrow-right.svg +++ b/server/vbv_lernwelt/static/icons/icon-arrow-right.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-arrow-up.svg b/server/vbv_lernwelt/static/icons/icon-arrow-up.svg index 0a373e71..84bc8383 100644 --- a/server/vbv_lernwelt/static/icons/icon-arrow-up.svg +++ b/server/vbv_lernwelt/static/icons/icon-arrow-up.svg @@ -1,5 +1,4 @@ - - + + + diff --git a/server/vbv_lernwelt/static/icons/icon-check.svg b/server/vbv_lernwelt/static/icons/icon-check.svg index f06255f5..28f45bc9 100644 --- a/server/vbv_lernwelt/static/icons/icon-check.svg +++ b/server/vbv_lernwelt/static/icons/icon-check.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-close.svg b/server/vbv_lernwelt/static/icons/icon-close.svg index 66e7a261..ebc1e9f3 100644 --- a/server/vbv_lernwelt/static/icons/icon-close.svg +++ b/server/vbv_lernwelt/static/icons/icon-close.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-info.svg b/server/vbv_lernwelt/static/icons/icon-info.svg index f9defcae..364bba64 100644 --- a/server/vbv_lernwelt/static/icons/icon-info.svg +++ b/server/vbv_lernwelt/static/icons/icon-info.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-list.svg b/server/vbv_lernwelt/static/icons/icon-list.svg new file mode 100644 index 00000000..95aa0c74 --- /dev/null +++ b/server/vbv_lernwelt/static/icons/icon-list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-ls-apply.svg b/server/vbv_lernwelt/static/icons/icon-ls-apply.svg index 0748334c..1c9506ad 100644 --- a/server/vbv_lernwelt/static/icons/icon-ls-apply.svg +++ b/server/vbv_lernwelt/static/icons/icon-ls-apply.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-ls-end.svg b/server/vbv_lernwelt/static/icons/icon-ls-end.svg index f4f02153..6a659556 100644 --- a/server/vbv_lernwelt/static/icons/icon-ls-end.svg +++ b/server/vbv_lernwelt/static/icons/icon-ls-end.svg @@ -1,8 +1 @@ - - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-ls-network.svg b/server/vbv_lernwelt/static/icons/icon-ls-network.svg index 6f53b3bf..534b1879 100644 --- a/server/vbv_lernwelt/static/icons/icon-ls-network.svg +++ b/server/vbv_lernwelt/static/icons/icon-ls-network.svg @@ -1,12 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-ls-practice.svg b/server/vbv_lernwelt/static/icons/icon-ls-practice.svg index e316dcd3..6027e3d5 100644 --- a/server/vbv_lernwelt/static/icons/icon-ls-practice.svg +++ b/server/vbv_lernwelt/static/icons/icon-ls-practice.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-ls-start.svg b/server/vbv_lernwelt/static/icons/icon-ls-start.svg index f57084da..f554f302 100644 --- a/server/vbv_lernwelt/static/icons/icon-ls-start.svg +++ b/server/vbv_lernwelt/static/icons/icon-ls-start.svg @@ -1,8 +1 @@ - - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-ls-test.svg b/server/vbv_lernwelt/static/icons/icon-ls-test.svg index 47ee7de9..5d2b5110 100644 --- a/server/vbv_lernwelt/static/icons/icon-ls-test.svg +++ b/server/vbv_lernwelt/static/icons/icon-ls-test.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-ls-watch.svg b/server/vbv_lernwelt/static/icons/icon-ls-watch.svg index b2ce9c88..85ed9fd4 100644 --- a/server/vbv_lernwelt/static/icons/icon-ls-watch.svg +++ b/server/vbv_lernwelt/static/icons/icon-ls-watch.svg @@ -1,5 +1 @@ - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-menu.svg b/server/vbv_lernwelt/static/icons/icon-menu.svg new file mode 100644 index 00000000..b1a89411 --- /dev/null +++ b/server/vbv_lernwelt/static/icons/icon-menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-message.svg b/server/vbv_lernwelt/static/icons/icon-message.svg index 3bcbe525..40a0f10d 100644 --- a/server/vbv_lernwelt/static/icons/icon-message.svg +++ b/server/vbv_lernwelt/static/icons/icon-message.svg @@ -1,5 +1,4 @@ - - + + + diff --git a/server/vbv_lernwelt/static/icons/icon-smiley-happy.svg b/server/vbv_lernwelt/static/icons/icon-smiley-happy.svg index 70c4066a..0b60809c 100644 --- a/server/vbv_lernwelt/static/icons/icon-smiley-happy.svg +++ b/server/vbv_lernwelt/static/icons/icon-smiley-happy.svg @@ -1,9 +1 @@ - - - - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-smiley-neutral.svg b/server/vbv_lernwelt/static/icons/icon-smiley-neutral.svg index 0d08522d..eed327de 100644 --- a/server/vbv_lernwelt/static/icons/icon-smiley-neutral.svg +++ b/server/vbv_lernwelt/static/icons/icon-smiley-neutral.svg @@ -1,9 +1 @@ - - - - - - + \ No newline at end of file diff --git a/server/vbv_lernwelt/static/icons/icon-smiley-thinking.svg b/server/vbv_lernwelt/static/icons/icon-smiley-thinking.svg index 2974e1c5..a9a165e7 100644 --- a/server/vbv_lernwelt/static/icons/icon-smiley-thinking.svg +++ b/server/vbv_lernwelt/static/icons/icon-smiley-thinking.svg @@ -1,13 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/tailwind/input.css b/tailwind/input.css index cbea8416..4f68bab9 100644 --- a/tailwind/input.css +++ b/tailwind/input.css @@ -6,6 +6,10 @@ html { @apply text-gray-900 } +svg { + @apply fill-current +} + @layer base { h1 { @@ -46,21 +50,21 @@ html { @apply font-bold py-2 px-4 align-middle inline-block bg-blue-900 text-white border-2 border-blue-900 hover:bg-blue-700 hover:border-blue-700 - disabled:opacity-50 + disabled:opacity-50 disabled:cursor-not-allowed } .btn-secondary { @apply font-bold py-2 px-4 align-middle inline-block bg-white text-blue-900 border-2 border-blue-900 hover:bg-gray-100 - disabled:opacity-50 + disabled:opacity-50 disabled:cursor-not-allowed } .btn-blue { @apply font-bold py-2 px-4 align-middle inline-block bg-sky-500 text-blue-900 border-2 border-sky-500 hover:bg-sky-400 hover:border-sky-400 - disabled:opacity-50 + disabled:opacity-50 disabled:cursor-not-allowed } }