Просмотр исходного кода

Merge branch 'profile-styles' of fyindr/siimee into dev

tags/0.0.2
maeda 3 лет назад
Родитель
Сommit
8788bbdd68

+ 19
- 2
frontend/src/components/AspectBar.vue Просмотреть файл

@@ -1,8 +1,8 @@
1 1
 <template lang="pug">
2 2
 figure.w-flex.column
3 3
     figcaption.w-flex.xs12.justify-space-between.align-center
4
-        p(v-for="label in labels" :key="label").text-upper {{ label }}
5
-    w-progress(v-model="percentage" size="0.5em" round).mt4
4
+        p(v-for="(label, index) in labels" :key="label" :class="{ 'main': index === 1 }")  {{ label }}
5
+    w-progress(v-model="percentage" size="0.5em" round).mb7
6 6
 </template>
7 7
 
8 8
 <script>
@@ -21,3 +21,20 @@ export default {
21 21
     data: () => ({}),
22 22
 }
23 23
 </script>
24
+<style lang="sass">
25
+    figure
26
+        figcaption
27
+            font-family: Century Gothic, CenturyGothic, AppleGothic, sans-serif
28
+            text-transform: capitalize
29
+            .main
30
+                color: #4D9127
31
+                font-weight: bold
32
+                text-transform: uppercase
33
+
34
+
35
+        .w-progress
36
+            background-color: #4C5264
37
+            .w-progress__progress
38
+                color: #4D9127
39
+        
40
+</style>

+ 24
- 4
frontend/src/components/NamePlate.vue Просмотреть файл

@@ -5,8 +5,8 @@
5 5
             h1.text-capitalize {{ name }}
6 6
                 span O
7 7
             p.text-capitalize {{role}}&nbsp;
8
-                span.text-capitalize(v-if="isList") |&nbsp;
9
-                    span.text-capitalize location, st
8
+                span.text-capitalize(v-if="isList")
9
+                    span.text-capitalize Registered Nurse | Los Angeles, CA.
10 10
             p.text-capitalize(v-if="!isList") {{ pronouns }}&nbsp;
11 11
                 span.text-capitalize | ethnicity
12 12
 </template>
@@ -42,12 +42,32 @@ export default {
42 42
         flex-direction: column
43 43
         align-items: center
44 44
         justify-content: center
45
-        padding: 15px 15px
45
+        padding: 15px
46 46
         min-height: 10vh
47 47
         width: 100%
48 48
         &.box
49
-            border: 1px black solid
49
+            background-color: #D5D5D5
50
+            border-radius: 6px
50 51
             height: 15vw
51 52
             width: 15vw
52 53
             text-align: center
54
+            font-family: Century Gothic, CenturyGothic, AppleGothic, sans-serif
55
+            h1
56
+                font-weight: bold
57
+                font-size: 1.619em
58
+                color: #183770
59
+            p
60
+                font-weight: bolder
61
+                font-size: 0.8095em
62
+                color: #183770
63
+        h1
64
+            font-weight: bold
65
+            font-size: 1.619em
66
+            color: #F7F5A6
67
+            text-align: center
68
+        p
69
+            font-weight: bolder
70
+            font-size: 1em
71
+            color: #F7F5A6
72
+            text-align: center
53 73
 </style>

+ 44
- 6
frontend/src/components/PairingButton.vue Просмотреть файл

@@ -1,16 +1,28 @@
1 1
 <template lang="pug">
2 2
 .pairing-button.w-flex.row
3
-    w-button.xs6.mt4.mb4(@click='pass' bg-color='red' color='white' xl)
4
-        p.pa4.text-upper pass
5
-    w-button.xs6.mt4.mb4(@click='pair' bg-color='green' color='mint-green' xl)
6
-        p.pa4.text-upper pair
3
+    template(v-if='status == "pristine"')
4
+        w-button(:class='status')(@click='pass')
5
+            p.pa4.text-upper pass
6
+        w-button(:class='status')(@click='pair')
7
+            p.pa4.text-upper pair
8
+    template(v-else-if='status == "pending"')
9
+        w-button(:class='status')
10
+            p.pa4.text-upper pending
11
+    template(v-else)
12
+        w-button(:class='status')
13
+            p.pa4.text-upper paired
7 14
 </template>
8 15
 
9 16
 <script>
10 17
 export default {
11
-    props: {},
18
+    props: {
19
+        status: {
20
+            required: false,
21
+            type: String,
22
+            default: 'pristine',
23
+        },
24
+    },
12 25
     emits: ['pair', 'pass'],
13
-    data: () => ({}),
14 26
     methods: {
15 27
         pair() {
16 28
             this.$emit('pair')
@@ -21,3 +33,29 @@ export default {
21 33
     },
22 34
 }
23 35
 </script>
36
+
37
+<style lang="sass">
38
+.w-button
39
+    p
40
+        font-size: 1.6em
41
+        font-weight: bold
42
+    &.pristine
43
+        background-color: #000
44
+        border: 2px solid #4D9127
45
+        max-width: 350px
46
+        width: 50%
47
+        margin: 11px 0
48
+        padding: 22px
49
+    &.pending
50
+        background-image: linear-gradient(to right, #4C5264, #A8A8A8)
51
+        min-width: 350px
52
+        width: 100%
53
+        margin: 11px 0
54
+        padding: 22px
55
+    &.paired
56
+        background: #8168F8
57
+        min-width: 350px
58
+        width: 100%
59
+        margin: 11px 0
60
+        padding: 22px
61
+</style>

+ 5
- 0
frontend/src/components/PairsList.vue Просмотреть файл

@@ -37,6 +37,11 @@ const props = defineProps({
37 37
 
38 38
 <style lang="sass">
39 39
 .pairs-list
40
+    background-color:#000
41
+    max-width: 450px
42
+    width: 100%
43
+    height: 100vh
44
+    margin: 0 auto
40 45
     article
41 46
         .dot--icon
42 47
             width:3vw

+ 12
- 2
frontend/src/components/ProfileCard.vue Просмотреть файл

@@ -32,8 +32,8 @@ w-card.profile-card-list--card.xs12
32 32
             v-if='!isPaired || isList'
33 33
         )
34 34
 
35
-    footer
36
-        .pa12(v-if='!isPaired && !isList')
35
+    footer(v-if='!isList && !isPaired')
36
+        .px3
37 37
             p {{ card.summary.about.tab }}
38 38
         PairingButton(@pair='onPair' @pass='onPass' v-if='!isPaired')
39 39
         w-button.text-upper.xs12.pa6(v-else-if='currentTab != 0')
@@ -120,7 +120,17 @@ const onPass = async () => {
120 120
 .profile-card-list--card
121 121
     background-color: #000
122 122
     color: #fff
123
+    width: 100%
124
+    max-width: 450px
125
+    margin: 11px auto
123 126
     header > .w-button
124 127
         background-color: #116006
125 128
         color: #fff
129
+    footer
130
+        margin-bottom: 22px
131
+        p
132
+            font-family: Century Gothic, CenturyGothic, AppleGothic, sans-serif
133
+            margin: 11px auto
134
+            padding: 0 7px
135
+            line-height: 1.619em
126 136
 </style>

+ 17
- 2
frontend/src/components/SummaryBar.vue Просмотреть файл

@@ -54,8 +54,9 @@ section.w-flex.column.pb5
54 54
                 li.w-flex.row(v-if='item !== "about"')
55 55
                     w-icon.mr1(xl) mdi mdi-heart
56 56
                     .w-flex.column.justify-start
57
-                        p {{ tabContent[item].matchPerc }}%
58
-                        p {{ item }}
57
+                        p 
58
+                            span {{ tabContent[item].matchPerc }}%
59
+                        p.text-capitalize {{ item }}
59 60
 </template>
60 61
 
61 62
 <script>
@@ -95,3 +96,17 @@ export default {
95 96
     },
96 97
 }
97 98
 </script>
99
+<style lang="sass">
100
+    section
101
+        font-family: Century Gothic, CenturyGothic, AppleGothic, sans-serif
102
+        ul
103
+            margin: 11px 0
104
+            li
105
+                margin: 0 7px
106
+                font-size: .8em
107
+                p > span
108
+                    font-weight: bold
109
+                    font-size: 1em
110
+            li:not(:last-child)
111
+                border-right: 1px solid #fff
112
+</style>

+ 22
- 6
frontend/src/components/TagList.vue Просмотреть файл

@@ -1,7 +1,6 @@
1 1
 <template lang="pug">
2
-section.w-flex.row.pb5
3
-    w-tag(v-for="tag in tags" color="pink-light1" bg-color="pink-light5").w-flex.grow.mr12.pa12
4
-        w-icon(v-if="icon" class="mr1" sm) {{ icon.family }} {{ icon.family }}-{{ icon.shape }}
2
+section.w-flex.row.wrap.pb5.justify-space-between
3
+    w-tag(v-for="tag in tags")
5 4
         p {{ tag }}
6 5
 </template>
7 6
 
@@ -12,9 +11,12 @@ export default {
12 11
             required: true,
13 12
             type: Array,
14 13
             default: () => [
15
-                'tag one',
16
-                'tag another thing',
17
-                'tag something long',
14
+                'California RN License',
15
+                'BSN',
16
+                'Patient Happiness',
17
+                'ACLS',
18
+                'Strong Communication',
19
+                'High Volume',
18 20
             ],
19 21
         },
20 22
         icon: {
@@ -24,3 +26,17 @@ export default {
24 26
     data: () => ({}),
25 27
 }
26 28
 </script>
29
+
30
+<style lang="sass">
31
+    section
32
+        min-height: 100%
33
+        .w-tag
34
+            background-color: #F7F5A6
35
+            margin: 3px 0
36
+            p
37
+                color: #183770
38
+                padding: 5px
39
+                font-size: 12px
40
+                font-weight: bolder
41
+                text-align: center
42
+</style>

+ 4
- 4
frontend/src/entities/card/card.js Просмотреть файл

@@ -1,10 +1,10 @@
1 1
 /** @module card/card */
2 2
 
3 3
 const DEFAULT_ABOUT =
4
-    'A really really really really really. Really really really really really really really really really really really long bio.'
4
+    'Hello! My name is L.L. and I am a nurse from New York. I have been in the healthcare industry for over 6 years.'
5 5
 
6 6
 class SummaryGroup {
7
-    constructor() {
7
+    constructor () {
8 8
         this.about = {
9 9
             tab: null,
10 10
             matchPerc: null,
@@ -40,7 +40,7 @@ class SummaryGroup {
40 40
 }
41 41
 
42 42
 class Aspect {
43
-    constructor({ name, labels, percentage = 50 }) {
43
+    constructor ({ name, labels, percentage = 50 }) {
44 44
         this.name = name
45 45
         this.labels = labels
46 46
         this.percentage = percentage
@@ -54,7 +54,7 @@ class Aspect {
54 54
  * card facade
55 55
  */
56 56
 class Card {
57
-    constructor({ pid, name, role }) {
57
+    constructor ({ pid, name, role }) {
58 58
         this.pid = pid
59 59
 
60 60
         /**  Fields */

+ 16
- 20
frontend/src/views/PairsView.vue Просмотреть файл

@@ -72,24 +72,20 @@ export default {
72 72
 }
73 73
 </script>
74 74
 
75
-<style>
76
-.select--matches {
77
-    display: flex;
78
-    justify-content: space-between;
79
-    margin: 0 25px;
80
-}
81
-.select--matches > div {
82
-    width: 100%;
83
-    text-align: center;
84
-    font-size: 16px;
85
-    line-height: 40px;
86
-}
87
-.active {
88
-    border-bottom: 3px solid #f2cd5c;
89
-    color: #f2cd5c;
90
-}
91
-.idle {
92
-    color: #bcc5d3;
93
-}
75
+<style lang="sass">
76
+.select--matches 
77
+    display: flex
78
+    justify-content: space-between
79
+    margin: 0 25px
80
+.select--matches > div 
81
+    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
90
+
94 91
 </style>
95
-s

Загрузка…
Отмена
Сохранить