Przeglądaj źródła

Merge branch 'pairs-view' of fyindr/siimee into dev

tags/0.0.2
maeda 3 lat temu
rodzic
commit
512c30db29

+ 1
- 0
frontend/assets/icons/calendar.svg Wyświetl plik

@@ -0,0 +1 @@
1
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M19.378,3.822H18.267V6.044H14.933V3.822H8.267V6.044H4.933V3.822H3.822A2.228,2.228,0,0,0,1.6,6.044V19.378A2.228,2.228,0,0,0,3.822,21.6H19.378A2.229,2.229,0,0,0,21.6,19.378V6.044a2.229,2.229,0,0,0-2.222-2.222Zm0,15.556H3.822V10.489H19.378ZM7.711,1.6H5.489V5.489H7.711Zm10,0H15.489V5.489h2.222Z" transform="translate(-1.6 -1.6)" fill="#fff"/></svg>

+ 1
- 0
frontend/assets/icons/chat.svg Wyświetl plik

@@ -0,0 +1 @@
1
+<svg xmlns="http://www.w3.org/2000/svg" width="27.778" height="25" viewBox="0 0 27.778 25"><path d="M8.056,17.156V8.544H2.778A2.786,2.786,0,0,0,0,11.322v8.333a2.786,2.786,0,0,0,2.778,2.778H4.167V26.6l4.167-4.167h6.944a2.786,2.786,0,0,0,2.778-2.778V17.128a1.328,1.328,0,0,1-.278.03l-9.722,0ZM25,1.6H12.5A2.786,2.786,0,0,0,9.722,4.378V15.489h9.722l4.167,4.167V15.489H25a2.785,2.785,0,0,0,2.778-2.778V4.378A2.786,2.786,0,0,0,25,1.6Z" transform="translate(0 -1.6)" fill="#fff"/></svg>

+ 1
- 0
frontend/assets/icons/close-icon.svg Wyświetl plik

@@ -0,0 +1 @@
1
+<svg xmlns="http://www.w3.org/2000/svg" width="17.414" height="17.414" viewBox="0 0 17.414 17.414"><g transform="translate(0.707 0.707)"><line x1="16" y1="16" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1"/><line y1="16" x2="16" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1"/></g></svg>

+ 1
- 0
frontend/assets/icons/options-icon.svg Wyświetl plik

@@ -0,0 +1 @@
1
+<svg xmlns="http://www.w3.org/2000/svg" width="19" height="5" viewBox="0 0 19 5"><g fill="none" stroke="#fff" stroke-width="1"><circle cx="2.5" cy="2.5" r="2.5" stroke="none"/><circle cx="2.5" cy="2.5" r="2" fill="none"/></g><g transform="translate(7)" fill="none" stroke="#fff" stroke-width="1"><circle cx="2.5" cy="2.5" r="2.5" stroke="none"/><circle cx="2.5" cy="2.5" r="2" fill="none"/></g><g transform="translate(14)" fill="none" stroke="#fff" stroke-width="1"><circle cx="2.5" cy="2.5" r="2.5" stroke="none"/><circle cx="2.5" cy="2.5" r="2" fill="none"/></g></svg>

+ 39
- 26
frontend/src/components/PairsList.vue Wyświetl plik

@@ -2,27 +2,30 @@
2 2
 section.pairs-list
3 3
     article(v-if='pairs.length')
4 4
         template(v-for='pair in pairs')
5
-            router-link.pair.w-flex.align-center.justify-space-around(
6
-                :to='`/profile/${pair.profile.pid}`'
7
-                v-if='tabName == "pending"'
8
-            )
9
-            router-link.pair.w-flex.align-center.justify-space-around(
10
-                :to='`/chat/${pair.profile.pid}`'
11
-                v-else
12
-            )
13
-                .dot--icon
14
-                .avatar
15
-                .idCard
16
-                    p {{ pair.profile.name }}
17
-                    p {{ pair.profile.pid }}
18
-                    p since: {{ pair.grouping.createdAt }}
19
-                    p updated: {{ pair.grouping.lastUpdatedAt }}
20
-                    p paired: {{ pair.grouping.is_paired }}
21
-                    p revealed tags: {{ pair.grouping.tags }}
5
+            w-flex().align-center.flex-start
6
+                router-link.pair.w-flex.align-center.flex-start(
7
+    :to='`/profile/${pair.profile.pid}`')
8
+                    .dot--icon
9
+                    .avatar
10
+                    .idCard
11
+                        h3 {{ pair.profile.name }} {{ pair.profile.pid }}
12
+                        p registered nurse
13
+
14
+                w-menu( left v-model='showMenu')
15
+                    template(#activator)
16
+                        w-button.mr3(@click='showMenu = !showMenu' icon="mdi mdi-dots-horizontal")
17
+                    w-flex()
18
+                        router-link(
19
+                            :to='`/chat/${pair.profile.pid}`')
20
+                            w-button.mx2(@click='showMenu = false' bg-color="success" tile icon="mdi mdi-forum") Chat
21
+                        w-button.mx2(@click='showMenu = false' bg-color="info" tile icon="mdi mdi-calendar") Calendar
22
+                        w-button.mx2(@click='showMenu = false' bg-color="primary" icon="wi-cross")
23
+
22 24
     p(v-else) No {{ tabName }} profiles.
23 25
 </template>
24 26
 
25 27
 <script setup>
28
+import { ref } from 'vue'
26 29
 const props = defineProps({
27 30
     pairs: {
28 31
         type: [Object, Array],
@@ -33,23 +36,33 @@ const props = defineProps({
33 36
         default: 'paired',
34 37
     },
35 38
 })
39
+const showMenu = ref(false)
36 40
 </script>
37 41
 
38 42
 <style lang="sass">
39 43
 .pairs-list
40
-    background-color:#000
41
-    max-width: 450px
42
-    width: 100%
43
-    height: 100vh
44
-    margin: 0 auto
44
+    color: #fff
45 45
     article
46
+        font-family: 'Century Gothic'
46 47
         .dot--icon
47
-            width:3vw
48
-            height:3vw
48
+            width:12px
49
+            height:12px
50
+            margin: 11px
49 51
             border-radius:50%
50 52
             background-color:#60C3FF
51 53
         .avatar
52
-            width:10vw
53
-            height:10vw
54
+            width:40px
55
+            height:40px
56
+            margin: 11px
57
+            border-radius: 6px
54 58
             background-color:#D5D5D5
59
+        .idCard
60
+            color: #fff
61
+            margin: 11px
62
+            h3
63
+                font-size: 16px
64
+            p
65
+                font-size: 14px
66
+.w-menu--card
67
+    background-color: #000000 !important
55 68
 </style>

+ 1
- 1
frontend/src/components/ProfileCardList.vue Wyświetl plik

@@ -1,7 +1,7 @@
1 1
 <template lang="pug">
2 2
 section.profile-card-list.xs12.w-flex.column
3 3
     header.xs12.w-flex 
4
-        w-select(:items='["one", "two", "three"]' outline) Label
4
+        //- w-select(:items="['one', 'two', 'three']" outline) Label
5 5
 
6 6
     article
7 7
         ProfileCard.match-layout(

+ 0
- 22
frontend/src/views/HomeView.vue Wyświetl plik

@@ -6,28 +6,6 @@ main.view--home
6 6
     p(v-else-if='cards.length === 0') No profiles in match_queue.
7 7
     w-spinner(v-else bounce)
8 8
 
9
-    footer
10
-        w-form
11
-            w-input.mb2(
12
-                inner-icon-left='mdi mdi-account'
13
-                label='Full Name'
14
-                label-position='inside'
15
-                outline
16
-            )
17
-            w-input.mb2(
18
-                inner-icon-left='mdi mdi-mail'
19
-                label='E-mail'
20
-                label-position='inside'
21
-                outline
22
-            )
23
-            w-input.mb2(
24
-                inner-icon-left='mdi mdi-lock'
25
-                label='Password'
26
-                label-position='inside'
27
-                outline
28
-                type='password'
29
-            )
30
-
31 9
     MainNav
32 10
 </template>
33 11
 

+ 27
- 15
frontend/src/views/PairsView.vue Wyświetl plik

@@ -1,9 +1,9 @@
1 1
 <template lang="pug">
2 2
 main.view--pairs
3 3
     article(v-if='isLoggedIn')
4
-        w-tabs(:items='tabs' fill-bar)
4
+        w-tabs(:items='tabs' fill-bar slider-color='yellow')
5 5
             template(#item-title='{ item }')
6
-                span.green {{ item.title }}
6
+                span {{ item.title }}
7 7
             //- pending tab
8 8
             template(#item-content.1='{ item }')
9 9
                 PairsList(:pairs='pending' tab-name='pending')
@@ -73,19 +73,31 @@ export default {
73 73
 </script>
74 74
 
75 75
 <style lang="sass">
76
-.select--matches 
77
-    display: flex
78
-    justify-content: space-between
79
-    margin: 0 25px
80
-.select--matches > div 
76
+.view--pairs
77
+    max-width: 450px
81 78
     width: 100%
82
-    text-align: center
83
-    font-size: 16px
84
-    line-height: 40px
85
-.active 
86
-    border-bottom: 3px solid #f2cd5c
87
-    color: #f2cd5c
88
-.idle 
89
-    color: #bcc5d3
79
+    margin: 0 auto
80
+    background-color: #1F2024
81
+    .w-tabs__bar-item
82
+        height: 50px
83
+        font-family: 'Century Gothic'
84
+        color: #FFFFFF
85
+        &.w-tabs__bar-item--active
86
+        &.primary
87
+            color: #F2CD5C
88
+    .select--matches
89
+        display: flex
90
+        justify-content: space-between
91
+        margin: 0 25px
92
+        > div
93
+            width: 100%
94
+            text-align: center
95
+            font-size: 16px
96
+            line-height: 40px
97
+    .active
98
+        border-bottom: 3px solid #f2cd5c
99
+        color: #f2cd5c
90 100
 
101
+    .idle
102
+        color: #bcc5d3
91 103
 </style>

Ładowanie…
Anuluj
Zapisz