From 71c339a40c365043feedba40636ba9fbf90a9b8b Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 21 Aug 2018 14:37:15 +0200 Subject: [PATCH] Add room page and widgets --- .gitignore | 1 - client/src/App.vue | 4 +- client/src/components/RoomWidget.vue | 40 ------- client/src/components/images/Add.vue | 8 ++ client/src/components/images/Cards.vue | 6 + client/src/components/images/Ellipses.vue | 7 ++ client/src/components/images/Group.vue | 13 +++ client/src/components/rooms/AddRoom.vue | 35 ++++++ client/src/components/rooms/RoomWidget.vue | 122 +++++++++++++++++++++ client/src/pages/rooms.vue | 40 ++++++- client/src/styles/_mixins.scss | 5 + 11 files changed, 232 insertions(+), 49 deletions(-) delete mode 100644 client/src/components/RoomWidget.vue create mode 100644 client/src/components/images/Add.vue create mode 100644 client/src/components/images/Cards.vue create mode 100644 client/src/components/images/Ellipses.vue create mode 100644 client/src/components/images/Group.vue create mode 100644 client/src/components/rooms/AddRoom.vue create mode 100644 client/src/components/rooms/RoomWidget.vue create mode 100644 client/src/styles/_mixins.scss diff --git a/.gitignore b/.gitignore index 5ac0760c..7bf2b432 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,5 @@ schema.json server/documents server/images server/original_images -images/ original_images/ server/media/ diff --git a/client/src/App.vue b/client/src/App.vue index c164b217..c1359c59 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -11,8 +11,8 @@ + + diff --git a/client/src/components/rooms/RoomWidget.vue b/client/src/components/rooms/RoomWidget.vue new file mode 100644 index 00000000..a13569a4 --- /dev/null +++ b/client/src/components/rooms/RoomWidget.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/client/src/pages/rooms.vue b/client/src/pages/rooms.vue index 803cdc65..a84690ea 100644 --- a/client/src/pages/rooms.vue +++ b/client/src/pages/rooms.vue @@ -1,17 +1,44 @@ @@ -21,8 +48,9 @@ display: grid; grid-template-columns: repeat(3, 1fr); grid-column-gap: 30px; + grid-row-gap: 30px; grid-auto-rows: 260px; - padding: 130px 45px; + padding: 50px 45px; max-width: 1440px; width: 100%; justify-self: center; diff --git a/client/src/styles/_mixins.scss b/client/src/styles/_mixins.scss new file mode 100644 index 00000000..64e1d05e --- /dev/null +++ b/client/src/styles/_mixins.scss @@ -0,0 +1,5 @@ +@mixin widget-shadow { + border-radius: 12px; + box-shadow: 0 3px 9px 0 rgba(0, 0, 0, 0.12); + +}