From 16f33fc8e4ef5e26951f9ba3eb2d79e8bfca2d52 Mon Sep 17 00:00:00 2001
From: "f.shokouhi" <fhshokouhi@gmail.com>
Date: Sat, 21 Sep 2019 10:04:36 +0430
Subject: [PATCH] icons

---
 resources/js/vue/styles/css/Assets/Main.scss  |  3 +++
 resources/js/vue/views/TestResult/AddEdit.vue | 17 +++++++++++------
 resources/js/vue/views/TestType/AddEdit.vue   | 14 ++++++++++++--
 resources/js/vue/views/User/MyInfo.vue        |  9 +++++----
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/resources/js/vue/styles/css/Assets/Main.scss b/resources/js/vue/styles/css/Assets/Main.scss
index 9451b6dc..faa1446d 100644
--- a/resources/js/vue/styles/css/Assets/Main.scss
+++ b/resources/js/vue/styles/css/Assets/Main.scss
@@ -24,6 +24,9 @@
   font-size: 20px !important;
   vertical-align: sub !important;
 }
+.fa, .fas {
+  font-size: 20px;
+}
 .headline {
   // letter-spacing : 7px;
 }
diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/views/TestResult/AddEdit.vue
index b8904066..7986b01c 100644
--- a/resources/js/vue/views/TestResult/AddEdit.vue
+++ b/resources/js/vue/views/TestResult/AddEdit.vue
@@ -4,7 +4,7 @@
 			<material-card color="black" title="Submit Test Result">
 				<v-layout  wrap class="px-5 my-3" v-if="!$route.params.testResult">
 					<v-flex xs12 md2 sm3 class="WM-FlexCenter">
-						<v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon>
+						<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
 						<v-autocomplete
 							:search-input.sync="searchInput"
 							:items="testTypeNames"
@@ -50,6 +50,7 @@
 							:label="device_label[formData.device_label]"
 							color="black"
 							class="pa-2"
+							prepend-icon="fas fa-sort-numeric-up"
 						></v-text-field>
 					</v-flex>
 					<v-flex xs12 sm2 md2>
@@ -62,7 +63,7 @@
 							class="pa-2"
 						>
 							<v-text-field style="padding-top:0 !important"
-								prepend-inner-icon="far fa-calendar-alt"
+								prepend-icon="far fa-calendar-alt"
 								required
 								slot="activator"
 								label="Date"
@@ -132,7 +133,7 @@
 										v-model="formData[item.name+'_'+item.id]"
 										:label="item.name"
 										color="black"
-										prepend-inner-icon="fa fa-align-left"
+										prepend-icon="fa fa-align-left"
 									></v-text-field>
 								</v-container>
 							</v-layout>
@@ -165,7 +166,7 @@
 									<v-flex xs12>
 										<v-select
 											multiple
-											prepend-inner-icon="fa fa-check"
+											prepend-icon="fa fa-check"
 											:items="item.options"
 											v-model="formData[item.name+'_'+item.id]"
 											:label="item.name"
@@ -243,6 +244,7 @@
 						:max="item.options[1].title"
 						thumb-label="always"
 						color="black"
+						prepend-icon="fa fa-sliders"
 					></v-slider>
 				</v-flex>
 				</v-container>
@@ -261,6 +263,7 @@
 								class="WM-Font-30"
 								mask="##:##"
 								color="black"
+								prepend-icon="fa fa-clock-o"
 							></v-text-field>
 						</v-flex>
 					</v-container>
@@ -282,7 +285,7 @@
 								<p>{{ children.name }}</p>
 									<v-flex xs12>
 										<v-text-field
-											prepend-inner-icon="fa fa-align-left"
+											prepend-icon="fa fa-align-left"
 											v-model="formData[children.name+'_'+children.id]"
 											:label="children.name"
 											color="black"
@@ -320,7 +323,7 @@
 									<v-flex xs12>
 										<v-select
 											multiple
-											prepend-inner-icon="fa fa-check"
+											prepend-icon="fa fa-check"
 											:items="children.options"
 											v-model="formData[children.name+'_'+children.id]"
 											:label="children.name"
@@ -373,6 +376,7 @@
 										:min="children.options[0].title"
 										:max="children.options[1].title"
 										thumb-label="always"
+										prepend-icon="fa fa-check"
 									></v-slider>
 								</v-flex>
 							</v-container>
@@ -384,6 +388,7 @@
 											:label="children.name"
 											class="WM-Font-30"
 											mask="##:##"
+											prepend-icon="fa fa-clock-o"
 										></v-text-field>
 								</v-flex>
 							</v-container>
diff --git a/resources/js/vue/views/TestType/AddEdit.vue b/resources/js/vue/views/TestType/AddEdit.vue
index c386a852..a6c34b73 100644
--- a/resources/js/vue/views/TestType/AddEdit.vue
+++ b/resources/js/vue/views/TestType/AddEdit.vue
@@ -46,7 +46,7 @@
                     :key="keyForm"
                     v-for="(info, keyForm) in form.info"
                 >
-                    <v-layout row wrap class="ma-2">
+                    <v-layout row wrap class="ma-2 WM-Width-Full">
                         <v-flex xs12 md3 sm3>
                             <v-text-field
                                 name="inputname"
@@ -55,6 +55,7 @@
                                 color="black"
                                 class="pa-2"
                                 :rules="[rules.required]"
+                                prepend-icon="fa fa-align-left"
                             ></v-text-field>
                         </v-flex>
                         <v-flex xs12 md3 sm3>
@@ -68,6 +69,7 @@
                                 single-line
                                 color="black"
                                 class="pa-2"
+                                prepend-icon="fa fa-filter"
                                 @change="changeType(keyForm, info.type)"
                             ></v-select>
                         </v-flex>
@@ -83,6 +85,7 @@
                                 single-line
                                 color="black"
                                 class="pa-2"
+                                prepend-icon="fa fa-sort-numeric-asc"
                             ></v-select>
                         </v-flex>
                     </v-layout>
@@ -114,6 +117,7 @@
                                     color="black"
                                     class="pa-2 Input"
                                     v-model="selectbox.title"
+                                    prepend-icon="fa fa-align-left"
                                 ></v-text-field>
                                 <v-btn
                                     absolute
@@ -165,6 +169,7 @@
                                     color="black"
                                     class="pa-2 Input"
                                     v-model="info['options'][0].title"
+                                    prepend-icon="fa fa-angle-right"
                                 ></v-text-field>
                             </v-flex>
                             <v-flex
@@ -180,6 +185,7 @@
                                     color="black"
                                     class="pa-2 Input"
                                     v-model="info['options'][1].title"
+                                    prepend-icon="fa fa-angle-right"
                                 ></v-text-field>
                             </v-flex>
                         </v-layout>
@@ -189,7 +195,7 @@
                         row
                         wrap
                         v-if="info.type === 'Form'"
-                        class="pa-3 my-4 mx-3 WM-Border WM-Border-Black WM-Relative"
+                        class="pa-3 my-4 mx-3 WM-Border WM-Border-Black WM-Relative WM-Width-Full"
                     >
                         <v-layout
                             row
@@ -206,6 +212,7 @@
                                     label="Input Name"
                                     color="black"
                                     class="pa-2"
+                                    prepend-icon="fa fa-align-left"
                                 ></v-text-field>
                             </v-flex>
                             <v-flex xs12 md3 sm3>
@@ -220,6 +227,7 @@
                                     color="black"
                                     class="pa-2"
                                     @change="changeTypeForm(keyForm, children.type, keychildren)"
+                                    prepend-icon="fa fa-filter"
                                 ></v-select>
                             </v-flex>
                             <v-flex xs12 md3 sm3>
@@ -233,6 +241,7 @@
                                     single-line
                                     color="black"
                                     class="pa-2"
+                                    prepend-icon="fa fa-sort-numeric-asc"
                                 ></v-select>
                             </v-flex>
                             <!-- Inner Form Selectbox Section  -->
@@ -263,6 +272,7 @@
                                             class="pa-2 Input"
                                             v-model="selectbox.title"
                                             :rules="[rules.required]"
+                                            prepend-icon="fa fa-align-left"
                                         ></v-text-field>
                                         <v-btn
                                             absolute
diff --git a/resources/js/vue/views/User/MyInfo.vue b/resources/js/vue/views/User/MyInfo.vue
index f6893b1a..6748cf49 100644
--- a/resources/js/vue/views/User/MyInfo.vue
+++ b/resources/js/vue/views/User/MyInfo.vue
@@ -15,7 +15,7 @@
             ></v-text-field>
           </v-flex>
           <v-flex xs12 sm4 md4 class="WM-FlexCenter pl-3">
-            <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
+            <v-icon class="fa fa-male mr-2 WM-Margin-B-8"></v-icon>
             <v-select
               :items="items"
               label="Gender"
@@ -34,14 +34,14 @@
               label="Cell Number"
               v-model="user.cell_number"
               color="black"
-              class="pa-2"
+              class="py-3 pr-3"
               disabled
             ></v-text-field>
           </v-flex>
         </v-layout>
         <v-layout align-center justify-center wrap class="px-5 mb-3">
           <v-flex xs12 sm4 md4 class="WM-FlexCenter pl-3">
-            <v-icon class="fa fa-phone mr-2 WM-Margin-B-8"></v-icon>
+            <v-icon class="fa fa-envelope mr-2 WM-Margin-B-8" style="margin-top:70px"></v-icon>
             <v-text-field
               name="emailaddress"
               label="Email Address"
@@ -49,11 +49,12 @@
               :rules="[rules.email]"
               class="px-2"
               color="black"
-              style="padding-top:75px"
+              style="margin-top:72px"
             ></v-text-field>
           </v-flex>
           <v-flex xs12 sm8 md8>
             <v-textarea
+              prepend-icon="fa fa-sort-amount-desc"
               color="black"
               :rules="[rules.counter]"
               v-model="user.address"