fix bugs

src/abstraction/resources/profileResource.js

@@ -9,7 +9,7 @@ export const getJson = (data) => ({
     arm_diameter: data.arm_diameter,
     leg_diameter: data.leg_diameter,
     details: data.details,
-    profile: data.profile,
+    profile: data.profile ? data.profile : 'https://via.placeholder.com/600',
     address: data.address,
     email: data.email,
     cell_number: data.cell_number,

src/components/Dashboard/Main.vue

@@ -10,7 +10,7 @@
           <v-col cols="12">
             <div>
               <div class="text-left description">
-                here is dashboard home, feel free navigate from right side menu or choose
+                here is dashboard home, feel free navigate from left side menu or choose
                 from shortcuts we prepared for you.
               </div>
             </div>
@@ -79,7 +79,7 @@
           <v-col cols="12">
             <div class="">
               <div class="text-left description">
-                here is your dashboard home, feel free navigate from right side menu or
+                here is your dashboard home, feel free navigate from left side menu or
                 choose from shortcuts we prepared for you.
               </div>
             </div>
@@ -141,7 +141,7 @@
           <v-col cols="12">
             <div class="">
               <div class="text-left description">
-                here is your dashboard home, feel free navigate from right side menu or
+                here is your dashboard home, feel free navigate from left side menu or
                 choose from shortcuts we prepared for you.
               </div>
             </div>

src/components/Global/Section/AuthBasic.vue

@@ -3,8 +3,8 @@
     <main-back height="500px">
       <v-row class="px-16 py-10 h-100">
         <slot name="auth"></slot>
-        <v-col cols="1" class="text-center">
-          <v-divider vertical dark></v-divider>
+        <v-col cols="1" class="text-center pl-0">
+          <v-divider vertical dark class="mr-1"></v-divider>
         </v-col>
         <v-col cols="5">
           <div class="wa__f__m__eb auth__text">

src/components/Products/Add.vue

@@ -128,7 +128,7 @@
                 ></v-col>
                 <v-col cols="6"
                   ><v-text-field
-                    label="vintroduction video link"
+                    label="introduction video link"
                     class="no-error-msg pt-0 mt-0"
                     dark
                     v-model="form.video_link"

src/components/Profile/Profile.vue

@@ -90,7 +90,7 @@
                 <v-col cols="3"></v-col>
               </v-row>
               <v-divider dark></v-divider>
-              <v-row class="w-100">
+              <v-row>
                 <v-col cols="3"
                   ><v-text-field
                     label="weight"

src/components/Programs/Add.vue

@@ -41,7 +41,7 @@
                 <v-col cols="8"
                   ><v-text-field
                     v-model="form.period"
-                    label="period"
+                    label="program duration (day)"
                     class="no-error-msg pt-0 mt-0"
                     dark
                   ></v-text-field

src/components/Users/Item.vue

@@ -2,7 +2,7 @@
   <div class="user__card">
     <v-row>
       <v-col cols="3">
-        <div class="d-flex align-center h-100" style="overflow: hidden">
+        <div class="d-flex align-center mt-1 h-100" style="overflow: hidden">
           <div style="line-height: 14px">
             <div class="user__name wa__f__m__eb">
               {{ user.first_name }} {{ user.last_name }}
@@ -43,7 +43,7 @@
           <RectangleButton
             height="35"
             width="48"
-            class="ml-1 custom-btn custom-icon"
+            class="ml-1 custom-btn custom-icon"   
             icon="WMi-gold-medal"
             @click.native="chageRole"
             v-if="role === 'admin'"

src/styles/vuetify/_modify.scss

@@ -8,26 +8,33 @@
     background-position: center !important;
     background-attachment: fixed !important;
 }
+
 .wa__f__m__eb {
     font-family: "Montserrat-extrabold", sans-serif !important;
 }
+
 .wa__f__ta {
-    font-family: "Team-america", sans-serif !important ;
+    font-family: "Team-america", sans-serif !important;
 }
+
 ul {
     list-style-type: none;
 }
+
 a {
     text-decoration: none !important;
 }
+
 .wa__link a {
     text-decoration: none;
     display: block;
     color: initial !important;
 }
+
 .mt-40 {
     margin-top: 40px !important;
 }
+
 .v-input .v-label {
     font-family: "Montserrat-light" !important;
     font-size: 14px !important;
@@ -36,11 +43,13 @@ a {
     text-transform: uppercase !important;
     letter-spacing: 1px !important;
 }
-.theme--light.v-text-field > .v-input__control > .v-input__slot:before,
-.theme--dark.v-text-field > .v-input__control > .v-input__slot:before {
+
+.theme--light.v-text-field>.v-input__control>.v-input__slot:before,
+.theme--dark.v-text-field>.v-input__control>.v-input__slot:before {
     background-color: var(--color-light-gray) !important;
     border-color: var(--color-light-gray);
 }
+
 .v-text-field__slot input,
 .v-select__selections .v-select__selection,
 textarea {
@@ -48,16 +57,23 @@ textarea {
     font-size: 16px;
     margin-bottom: 0 !important;
 }
+
 .v-input--is-focused .v-text-field__slot input::placeholder {
     color: #acacac;
     text-transform: uppercase;
 }
+
 .v-list-item__content,
 .v-select__slot input {
     font-family: "Montserrat-light";
 }
+
 .v-label--active {
-    top: 13px !important;
+    top: 12px !important;
+}
+
+.v-textarea .v-label--active {
+    top: 8px !important;
 }
 
 .multiple .v-input__control .v-input__slot .v-select__slot .v-label {
@@ -118,29 +134,34 @@ textarea {
     display: none !important;
 }
 
-.v-text-field.no-error-msg + .validation__error {
+.v-text-field.no-error-msg+.validation__error {
     display: none;
 }
 
 .v-text-field.no-error-msg .v-input__slot {
     margin-bottom: 0px;
 }
+
 .no-error-msg .v-input .v-input__control .v-text-field__details {
     display: none;
 }
+
 /* ---------------------------------- textfields ------------------------------*/
 .prefix .v-input__slot {
     padding-right: 0px !important;
     // overflow: hidden;
     font-weight: 300;
 }
+
 .v-text-field.large-label .v-label {
     font-size: 12px !important;
 }
+
 .prefix.custom-input .v-label,
 .custom-combobox .v-label {
     right: 0px !important;
 }
+
 .prefix .v-text-field__prefix {
     background-color: #ecd9b5;
     min-width: 70px;
@@ -152,6 +173,7 @@ textarea {
     align-items: center;
     justify-content: center;
 }
+
 .prefix input {
     padding-right: 10px;
 }
@@ -159,12 +181,15 @@ textarea {
 .prefix input:focus .v-text-field__prefix {
     color: black !important;
 }
+
 .prefix .v-input__icon {
     height: 100%;
 }
+
 .custom-input.prefix.primary--text {
     color: black !important;
 }
+
 .custom-input.prefix .primary--text {
     color: black !important;
     font-weight: 800;
@@ -185,18 +210,22 @@ textarea {
 .v-textarea.no-error-msg .v-text-field__details {
     display: none !important;
 }
+
 .v-text-field__suffix {
     font-size: 10px !important;
     color: var(--color-gray);
     text-transform: uppercase !important;
 }
+
 .v-text-field input {
     padding: 8px 0 2px !important;
 }
+
 /* ----------------------------------- selects ----------------------------------------------  */
 .custom-combobox {
     height: 55.99px;
 }
+
 .custom-checkbox.v-input--checkbox .v-label {
     font-size: 13px !important;
 }
@@ -232,6 +261,7 @@ textarea {
     margin-top: 0px !important;
     padding-top: 10px !important;
 }
+
 .v-input--checkbox .v-label {
     font-size: 14px !important;
 }
@@ -240,13 +270,16 @@ textarea {
     font-size: 40px !important;
     font-family: "montserrat-extrabold";
 }
+
 .wa__modal.v-card.v-sheet.theme--dark,
 .d-flex.align-center.v-card.v-card--link.v-sheet.theme--dark {
     background-color: rgba(0, 0, 0, 0.966) !important;
 }
+
 input::placeholder {
     text-transform: uppercase;
 }
+
 /* -------------------- button on modal ------------------------------*/
 .close__modal {
     position: absolute;
@@ -254,23 +287,28 @@ input::placeholder {
     right: 0;
     cursor: pointer;
 }
+
 .btn__modal--cancel {
     font-family: "montserrat-medium" !important;
     font-size: 14px !important;
 }
+
 .btn__modal--confirm {
     padding: 0 65px !important;
     font-size: 14px !important;
 }
+
 .btn__modal--execute {
     padding: 0 45px !important;
     font-size: 14px !important;
 }
+
 /* -------------------- toast ------------------------------*/
 .willaToast-message {
     font-family: "Montserrat-regular" !important;
 }
-.willaToast.willaToast-color-black > .willaToast-body .willaToast-title {
+
+.willaToast.willaToast-color-black>.willaToast-body .willaToast-title {
     font-family: "cizel" !important;
     color: var(--color-social-yellow) !important;
-}
+}

src/views/Login.vue

@@ -68,9 +68,11 @@
                   <div class="wa__link">
                     <router-link :to="{ name: 'passwordReset' }">
                       <RectangleButton
+                        icon="WMi-asterisk"
                         class="w-100"
                         :text-mode="true"
-                        text="* forgot password"
+                        size="x-small"
+                        text="forgot password"
                       />
                     </router-link>
                   </div>

src/views/Register.vue

@@ -100,7 +100,9 @@
                       <RectangleButton
                         class="w-100"
                         :text-mode="true"
-                        text="* forgot password"
+                        text="forgot password"
+                        icon="WMi-asterisk"
+                        size="x-small"
                       />
                     </router-link>
                   </div>