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

:recycle: cleaning up match view

tags/0.0.1
j 4 лет назад
Родитель
Сommit
455e5d7536

+ 8
- 6
frontend/.prettierrc Просмотреть файл

@@ -1,6 +1,8 @@
1
-trailingComma: "all"
2
-tabWidth: 4
3
-semi: false
4
-singleQuote: true
5
-bracketSpacing: true
6
-arrowParens: "avoid"
1
+{
2
+    "trailingComma": "all",
3
+    "tabWidth": 4,
4
+    "semi": false,
5
+    "singleQuote": true,
6
+    "bracketSpacing": true,
7
+    "arrowParens": "avoid"
8
+}

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

@@ -1,5 +1,5 @@
1
-<template>
2
-  <div class="icon"></div>
1
+<template lang="pug">
2
+.icon
3 3
 </template>
4 4
 
5 5
 <script>
@@ -8,16 +8,14 @@ export default {
8 8
 }
9 9
 </script>
10 10
 
11
-<style scoped>
12
-.icon {
13
-  display: block;
14
-  border-radius: 50%;
15
-  width: 48px;
16
-  height: 48px;
17
-  background-image: url('https://i.imgur.com/WFqSBgc.png');
18
-  background-color: rgba(20,20,20,0.3);
19
-  background-position: 50% 0;
20
-  background-size: auto 125%;
21
-  /* margin: 12px auto; */
22
-}
11
+<style lang="postcss">
12
+.icon
13
+  display: block
14
+  border-radius: 50%
15
+  width: 48px
16
+  height: 48px
17
+  background-image: url('https://i.imgur.com/WFqSBgc.png')
18
+  background-color: rgba(20,20,20,0.3)
19
+  background-position: 50% 0
20
+  background-size: auto 125%
23 21
 </style>

+ 0
- 1
frontend/src/views/Chat.vue Просмотреть файл

@@ -18,7 +18,6 @@
18 18
 
19 19
   </div>
20 20
 
21
-
22 21
 </template>
23 22
 
24 23
 <script>

+ 40
- 105
frontend/src/views/Match.vue Просмотреть файл

@@ -1,124 +1,59 @@
1 1
 <template>
2
-  <div class="match">
2
+<div class="match">
3 3
     <div class="matches">
4
-      <h1>Matches</h1>
5
-      <!-- <n-button>naive-ui</n-button> -->
6
-      <div class="row">
7
-        <card />
8
-        <card />
9
-        <card />
10
-        <!-- <card /> -->
11
-      </div>
4
+        <h1>Matches</h1>
5
+        <div class="row">
6
+            <card />
7
+            <card />
8
+            <card />
9
+        </div>
12 10
     </div>
13 11
 
14 12
     <div class="messages">
15
-      <h2>Messages</h2>
16
-      <div class="matched active">
17
-        <div class="icon">
18
-          <Icon />
19
-        </div>
20
-        <div class="messagecontent">
21
-            <h3>NSE Tropical</h3>
22
-            <span>
23
-              Recently active, match now!
24
-            </span>
13
+        <h2>Messages</h2>
14
+        <div class="matched active">
15
+            <icon />
16
+            <div class="messagecontent">
17
+                <h3>NSE Tropical</h3>
18
+                Recently active, match now!
19
+            </div>
25 20
         </div>
26
-            <!-- <template #cover>
27
-            
28
-            </template> -->
29
-
30
-      </div>
31 21
 
32
-      <div class="matched">
33
-        <div class="icon">
34
-          <Icon />
22
+        <div class="matched">
23
+            <icon />
24
+            <div class="messagecontent">
25
+                <h3>Golden Communications</h3>
26
+                Click to match now!
27
+            </div>
35 28
         </div>
36
-        <div class="messagecontent">
37
-            <h3>Golden Communications</h3>
38
-            Click to match now!
39
-        </div>
40
-      </div>
41 29
 
42
-      <div class="matched">
43
-        <div class="icon">
44
-          <Icon />
45
-        </div>
46
-        <div class="messagecontent">
47
-            <h3>Mojo Solutions</h3>
48
-            Click to match now!
30
+        <div class="matched">
31
+            <icon />
32
+            <div class="messagecontent">
33
+                <h3>Mojo Solutions</h3>
34
+                Click to match now!
35
+            </div>
49 36
         </div>
50
-      </div>
51 37
     </div>
52
-
53
-  </div>
54
-
55
-
38
+</div>
56 39
 </template>
57 40
 
58 41
 <script>
59
-  import icon from '@/components/icon'
60
-  import card from '@/components/card'
61
-  import { defineComponent } from 'vue'
62
-  import { NButton } from 'naive-ui'
42
+import { defineComponent } from 'vue'
63 43
 
64
-  export default defineComponent({
65
-    components: {
66
-      NButton,
67
-      card,
68
-      icon
69
-    }
70
-  })
71
-</script>
44
+import icon from '@/components/icon.vue'
45
+import card from '@/components/card.vue'
72 46
 
73
-<style scoped>
74
-h3 {
75
-  margin: 0;
76
-}
77
-  .match {
78
-    width: 100%;
79
-    display: flex;
80
-    flex-direction: column;
81
-    padding: 20px;
82
-    text-align: left;
83
-  }
84
-
85
-  .row {
86
-    display: flex;
87
-    flex-direction: row;
88
-    /* width: 100vw; */
89
-    overflow:scroll;
90
-  }
91
-
92
-  .messagecontent {
93
-    width: 100%;
94
-    display: block;
95
-    text-align: left;
96
-    /* margin-bottom: 10px; */
97
-    background-color: transparent;
98
-    border: 0;
99
-    padding: 12px;
100
-    
101
-  }
102
-  .n-card__content {
103
-    padding-top: 0;
104
-  }
105
-
106
-  .matched {
107
-    display: flex;
108
-    flex-direction: row;
109
-    background-color: rgba(0,0,0,0.0);
110
-    margin-bottom: 12px;
111
-    border-bottom: 1px solid rgba(150,150,150,0.25);
47
+export default defineComponent({
48
+  components: {
49
+    card,
50
+    icon
112 51
   }
52
+})
53
+</script>
113 54
 
114
-  .icon {
115
-    /* display: inline-block; */
116
-    padding: 8px 12px;
117
-    margin: -1px;
118
-    /* flex-grow: 0; */
119
-    border-bottom: 1px solid rgba(250,250,250,0.95);
120
-  }
121
-  .active {
122
-    /* background-color: rgba(250,50,50,0.3); */
123
-  }
55
+<style lang="postcss">
56
+.row
57
+    display: flex
58
+    flex-direction: row
124 59
 </style>

+ 2
- 1
frontend/src/views/home.vue Просмотреть файл

@@ -8,7 +8,8 @@
8 8
 <script>
9 9
 // @ is an alias to /src
10 10
 import HelloWorld from '@/components/HelloWorld.vue'
11
-  import { NButton } from 'naive-ui'
11
+import { NButton } from 'naive-ui'
12
+
12 13
 export default {
13 14
   name: 'Home',
14 15
   components: {

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