From cf5a3f7d9df267ac7b61ac52f62fff7403da8d17 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Wed, 25 Aug 2021 14:22:20 +0200
Subject: [PATCH] Update add room entry button

---
 client/src/components/icons/PlusIcon.vue      |  9 ++++++
 .../components/rooms/AddRoomEntryButton.vue   | 18 +++++++----
 .../management/commands/data/user_data.py     | 32 +++++++++----------
 server/users/services.py                      |  5 +--
 4 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 client/src/components/icons/PlusIcon.vue

diff --git a/client/src/components/icons/PlusIcon.vue b/client/src/components/icons/PlusIcon.vue
new file mode 100644
index 00000000..343554ba
--- /dev/null
+++ b/client/src/components/icons/PlusIcon.vue
@@ -0,0 +1,9 @@
+<template>
+  <svg
+    viewBox="16 16 23 23"
+    xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M33.855 23.7749H26.215V16.1349C26.215 15.4584 25.6666 14.9099 24.99 14.9099C24.3135 14.9099 23.765 15.4584 23.765 16.1349V23.7749H16.125C15.4485 23.7749 14.9 24.3234 14.9 24.9999C14.9 25.6765 15.4485 26.2249 16.125 26.2249H23.765V33.8649C23.765 34.5415 24.3135 35.0899 24.99 35.0899C25.6666 35.0899 26.215 34.5415 26.215 33.8649V26.2249H33.855C34.5316 26.2249 35.08 25.6765 35.08 24.9999C35.08 24.3234 34.5316 23.7749 33.855 23.7749Z"
+    />
+  </svg>
+</template>
diff --git a/client/src/components/rooms/AddRoomEntryButton.vue b/client/src/components/rooms/AddRoomEntryButton.vue
index d5514bb4..1d32a2bb 100644
--- a/client/src/components/rooms/AddRoomEntryButton.vue
+++ b/client/src/components/rooms/AddRoomEntryButton.vue
@@ -3,18 +3,19 @@
     class="add-room-entry-button"
     data-cy="add-room-entry-button"
     @click="addRoomEntry">
-    <add-icon class="add-room-entry-button__icon"/>
+    <plus-icon class="add-room-entry-button__icon"/>
+    <span class="add-room-entry-button__text">Beitrag erfassen</span>
   </div>
 </template>
 
 <script>
-  import AddIcon from '@/components/icons/AddIcon';
+  import PlusIcon from '@/components/icons/PlusIcon';
 
   export default {
     props: ['parent'],
 
     components: {
-      AddIcon
+      PlusIcon
     },
 
     methods: {
@@ -26,8 +27,7 @@
 </script>
 
 <style scoped lang="scss">
-  @import "@/styles/_variables.scss";
-  @import "@/styles/_mixins.scss";
+  @import "~styles/helpers";
 
   .add-room-entry-button {
     border: 2px solid $color-white;
@@ -47,8 +47,14 @@
     }
 
     &__icon {
-      width: 80px;
+      width: 20px;
       fill: $color-white;
+      margin-right: $small-spacing;
+    }
+
+    &__text {
+      @include regular-text;
+      color: $color-white;
     }
   }
 </style>
diff --git a/server/core/management/commands/data/user_data.py b/server/core/management/commands/data/user_data.py
index 729693d2..f9a7af80 100644
--- a/server/core/management/commands/data/user_data.py
+++ b/server/core/management/commands/data/user_data.py
@@ -1,30 +1,30 @@
 user_data = [
     {
-        'teacher': ('Ross', 'Geller',),
+        'teacher': ('Ross', 'Geller', 'https://ucarecdn.com/fe10f9cc-a509-4170-9396-258abc418247/'),
         'class': 'Friends',
         'code': 'XXXX',
         'students': [
-            ('Rachel', 'Green'),
-            ('Monica', 'Geller'),
-            ('Chandler', 'Bing'),
-            ('Joey', 'Tribbiani'),
-            ('Phoebe', 'Buffay'),
+            ('Rachel', 'Green', 'https://ucarecdn.com/9652f8a6-c510-4ad9-94ad-93268ea1a1ef/'),
+            ('Monica', 'Geller', ''),
+            ('Chandler', 'Bing', ''),
+            ('Joey', 'Tribbiani', ''),
+            ('Phoebe', 'Buffay', ''),
         ]
     },
     {
-        'teacher': ('Michael', 'Scott',),
+        'teacher': ('Michael', 'Scott', ''),
         'class': 'Scranton',
         'code': 'YYYY',
         'students': [
-            ('Jim', 'Halpert'),
-            ('Pam', 'Beasley'),
-            ('Dwight', 'Schrute'),
-            ('Stanley', 'Hudson'),
-            ('Angela', 'Kinsey'),
-            ('Creed', 'Bratton'),
-            ('Toby', 'Flenderson'),
-            ('Kelly', 'Kapoor'),
-            ('Kevin', 'Malone'),
+            ('Jim', 'Halpert', ''),
+            ('Pam', 'Beasley', ''),
+            ('Dwight', 'Schrute', ''),
+            ('Stanley', 'Hudson', ''),
+            ('Angela', 'Kinsey', ''),
+            ('Creed', 'Bratton', ''),
+            ('Toby', 'Flenderson', ''),
+            ('Kelly', 'Kapoor', ''),
+            ('Kevin', 'Malone', ''),
         ]
     }
 ]
diff --git a/server/users/services.py b/server/users/services.py
index ad956135..6d895835 100644
--- a/server/users/services.py
+++ b/server/users/services.py
@@ -56,7 +56,7 @@ def create_users(data=None):
         hep_id = 1
 
         for school_class in data:
-            first, last = school_class.get('teacher')
+            first, last, avatar_url = school_class.get('teacher')
             teacher = UserFactory(
                 username='{}.{}'.format(first, last).lower(),
                 first_name=first,
@@ -64,7 +64,8 @@ def create_users(data=None):
                 email='{}.{}@skillbox.example'.format(first, last).lower(),
                 onboarding_visited=True,
                 license_expiry_date=in_a_week,
-                hep_id=hep_id
+                hep_id=hep_id,
+                avatar_url=avatar_url
             )
             UserRole.objects.create(user=teacher, role=teacher_role)