From 12d3f7b42465b2f5ca408ca6ea405e8dff6db17f Mon Sep 17 00:00:00 2001
From: sajjad <sajjad.t.dev@gmail.com>
Date: Sat, 26 Mar 2022 20:31:28 +0430
Subject: [PATCH] fix

---
 src/components/Global/Misc/Loading.vue |  8 +++++---
 src/components/Programs/Add.vue        | 14 +++++++++++---
 src/components/Users/Items.vue         |  6 +++++-
 src/components/Workouts/Add.vue        | 14 +++++++++++---
 src/styles/vuetify/_modify.scss        |  6 +++++-
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/components/Global/Misc/Loading.vue b/src/components/Global/Misc/Loading.vue
index 6d62b64..fba964d 100644
--- a/src/components/Global/Misc/Loading.vue
+++ b/src/components/Global/Misc/Loading.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import Idefault from '@/assets/Spinner.svg'
+import Idefault from "@/assets/Spinner.svg";
 export default {
   props: {
     src: {
@@ -29,9 +29,11 @@ export default {
 .loading-container {
   text-align: center;
 }
-.loading__title,
+.loading__title {
+  font-family: "Team-america", sans-serif;
+}
 .loading__message {
-  font-family: "Barlow-EL", sans-serif;
+  font-family: "montserrat-regular", sans-serif;
 }
 .loading__title {
   letter-spacing: 2px;
diff --git a/src/components/Programs/Add.vue b/src/components/Programs/Add.vue
index edd3d59..7a64dc3 100644
--- a/src/components/Programs/Add.vue
+++ b/src/components/Programs/Add.vue
@@ -11,7 +11,7 @@
             subTitle="what we perpared for people"
           />
         </div>
-        <v-form @submit.prevent="submit">
+        <v-form @submit.prevent="submit" ref="form">
           <v-row class="mt-4">
             <v-col cols="3">
               <div class="h-100">
@@ -38,12 +38,13 @@
                     v-model="form.sport_category_id"
                   ></v-autocomplete>
                 </v-col>
-                <v-col cols="8"
+                <v-col cols="3"
                   ><v-text-field
                     v-model="form.period"
                     label="program duration (day)"
-                    class="no-error-msg pt-0 mt-0"
+                    class="pt-0 mt-0"
                     dark
+                    :rules="numericalRules"
                   ></v-text-field
                 ></v-col>
               </v-row>
@@ -164,12 +165,19 @@ export default {
     programId() {
       return this.$route.params.id;
     },
+    numericalRules() {
+      return [
+        (v) => !!v || "This field is required.",
+        (v) => /^\d+$/.test(v) || "you should enter just digit.",
+      ];
+    },
   },
   methods: {
     ...mapActions("sportCategories", ["loadSportCategories"]),
     ...mapActions("programs", ["addProgram", "updateProgram", "loadProgram"]),
     async submit() {
       try {
+        if (!this.$refs.form.validate()) return;
         let repository = new FileRepository();
         if (this.programId) {
           if (
diff --git a/src/components/Users/Items.vue b/src/components/Users/Items.vue
index eccce27..b813547 100644
--- a/src/components/Users/Items.vue
+++ b/src/components/Users/Items.vue
@@ -9,7 +9,11 @@
               link="dashboard"
               icon="WMi-left-open"
               :title="role === 'admin' ? 'users' : 'my trainees'"
-              subTitle="let us know you better, it comes handy."
+              :subTitle="
+                role === 'admin'
+                  ? 'let us know you better, it comes handy.'
+                  : 'Who attended to your programs'
+              "
             />
           </div>
           <div>
diff --git a/src/components/Workouts/Add.vue b/src/components/Workouts/Add.vue
index 2aafb82..9587fff 100644
--- a/src/components/Workouts/Add.vue
+++ b/src/components/Workouts/Add.vue
@@ -12,7 +12,7 @@
           />
         </div>
           <loading v-if="loading" class="loading-data" />
-        <v-form @submit.prevent="submit" :class="{ 'loading-form': loading }">
+        <v-form @submit.prevent="submit" :class="{ 'loading-form': loading }" ref="form">
           <v-row class="mt-4">
             <v-col cols="3">
               <div class="pb-14 h-100">
@@ -92,16 +92,18 @@
                   ><v-text-field
                     dark
                     label="suggested course time?"
-                    class="no-error-msg pt-0 mt-0"
+                    class="pt-0 mt-0"
                     v-model="form.suggested_set"
+                    :rules="numericalRules"
                   ></v-text-field
                 ></v-col>
                 <v-col cols="2"
                   ><v-text-field
                     dark
                     label="suggested times each course?"
-                    class="no-error-msg pt-0 mt-0"
+                    class="pt-0 mt-0"
                     v-model="form.suggested_per_set"
+                    :rules="numericalRules"
                   ></v-text-field
                 ></v-col>
                 <v-col cols="2">
@@ -208,6 +210,11 @@ export default {
     workoutId() {
       return this.$route.params.id;
     },
+    numericalRules() {
+      return [
+        (v) => /^\d+$/.test(v) || "you should enter just digit.",
+      ];
+    },
   },
   watch: {
     "form.name"(val) {
@@ -223,6 +230,7 @@ export default {
     ...mapActions("sportCategories", ["loadSportCategories"]),
     async submit() {
       try {
+         if (!this.$refs.form.validate()) return;
         let repository = new FileRepository();
         if (this.workoutId) {
           if (
diff --git a/src/styles/vuetify/_modify.scss b/src/styles/vuetify/_modify.scss
index 92af455..8c13e36 100644
--- a/src/styles/vuetify/_modify.scss
+++ b/src/styles/vuetify/_modify.scss
@@ -309,7 +309,7 @@ input::placeholder {
 }
 
 .willaToast.willaToast-color-black>.willaToast-body .willaToast-title {
-    font-family: "cizel" !important;
+    font-family: "Team-america" !important;
     color: var(--color-social-yellow) !important;
 }
 
@@ -318,6 +318,10 @@ input::placeholder {
     position: relative;
 }
 
+.loading-container .loading img {
+    width: 140px;
+}
+
 .loading-data {
     position: absolute;
     top: 50%;