Merge branch 'master' of https://git.lilianamodels.com/champya/champya-front

src/components/Profile/Profile.vue

@@ -120,7 +120,7 @@
                 ></v-col>
                 <v-col cols="3"
                   ><v-text-field
-                    label="lge diameter"
+                    label="leg diameter"
                     class="no-error-msg pt-0"
                     suffix="cm"
                     dark

src/components/Profile/TraineeProfile.vue

@@ -107,7 +107,7 @@
             ></v-col>
             <v-col cols="3"
               ><v-text-field
-                label="lge diameter"
+                label="leg diameter"
                 class="no-error-msg pt-0"
                 suffix="cm"
                 dark

src/components/ProgramSeries/Item.vue

@@ -42,7 +42,6 @@
             width="48"
             class="ml-1 custom-btn custom-icon"
             icon="WMi-yoga-posture"
-            @click.native.prevent=""
           />
           <RectangleButton
             size="large"
@@ -52,6 +51,7 @@
             icon="WMi-pencil"
           />
           <RectangleButton
+            v-if="role === 'admin'"
             size="large"
             height="35"
             width="48"
@@ -67,6 +67,7 @@
 </template>
 <script>
 import { mapActions, mapMutations } from "vuex";
+import { UserStorage } from "@/utils/storage";
 export default {
   props: {
     series: {
@@ -75,6 +76,9 @@ export default {
     seriesNumber: {},
     programId: {},
   },
+  data: () => ({
+    role: UserStorage.getRole(),
+  }),
   computed: {},
   methods: {
     ...mapActions("programSeries", ["deleteSeriesFromProgram"]),

src/components/Programs/Item.vue

@@ -12,19 +12,21 @@
       <img
         class="wa__program__image w-100"
         :src="
-          program.thumbnail ? program.thumbnail : 'https://via.placeholder.com/1280x720'
+          program.thumbnail
+            ? program.thumbnail
+            : 'https://via.placeholder.com/1280x720'
         "
         alt="product image"
       />
       <div class="wa__program__image__button">
         <div class="wa__program__image__button--icon">
           <RectangleButton
+            v-if="role === 'admin'"
             @click.native="verifyProgram(program.id)"
             size="large"
             class="custom-btn ml-1"
             height="32"
             :icon="program.verified ? 'WMi-cancel' : 'WMi-ok'"
-            v-if="role === 'admin'"
           />
           <router-link
             class="text-decoration-none"
@@ -51,6 +53,7 @@
             />
           </router-link>
           <RectangleButton
+            v-if="role === 'admin'"
             @click.native="removeProgram(program.id)"
             size="large"
             class="custom-btn ml-1"

src/components/Programs/Items.vue

@@ -8,7 +8,7 @@
               backText="home page"
               link="dashboard"
               icon="WMi-left-open"
-              title="my programs"
+              :title="role === 'admin' ? 'programs' : 'my programs'"
               subTitle="let us know you better, it comes handy."
             />
           </div>

src/components/TraineePrograms/Item.vue

@@ -41,7 +41,7 @@
             'program__done',
             {
               not__enf: program.schedule.done_percent < 50,
-              enf: program.schedule.done_percent > 50,
+              enf: program.schedule.done_percent >= 50,
             },
           ]"
         >
@@ -63,12 +63,13 @@ export default {
 </script>
 <style scoped>
 .program__card {
-  height: 111px;
+  /* height: 111px; */
   border-top: 1px solid var(--color-bg-black);
   border-bottom: 1px solid var(--color-bg-black);
   position: relative;
   display: flex;
   align-items: center;
+  padding: 24px 0;
 }
 .program__info {
   line-height: 18px;

src/components/Users/Items.vue

@@ -8,7 +8,7 @@
               backText="home page"
               link="dashboard"
               icon="WMi-left-open"
-              title="trainers"
+              :title="role==='admin' ? 'users' : 'my trainees'"
               subTitle="let us know you better, it comes handy."
             />
           </div>

src/components/Workouts/Add.vue

@@ -20,7 +20,10 @@
                     label="manager image"
                     :url.sync="form.thumbnail"
                     v-model="fileForm"
-                    :stencilProps="{ aspectRatio: 1280 / 720, checkImageOrigin: false }"
+                    :stencilProps="{
+                      aspectRatio: 1280 / 720,
+                      checkImageOrigin: false,
+                    }"
                   />
                 </div>
               </div>
@@ -191,7 +194,7 @@ export default {
     fileForm: {
       batch_id: RANDOM_TOKEN,
       collection: "main_image",
-      crop_data: {}
+      crop_data: {},
     },
   }),
   computed: {
@@ -218,7 +221,8 @@ export default {
       try {
         let repository = new FileRepository();
         if (this.workoutId) {
-          if (this.fileForm.file
+          if (
+            this.fileForm.file
             //  || !_.isEqual(this.fileForm.crop_data, this.perviousCropData)
           ) {
             await repository.store(this.fileForm);

src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue

@@ -4,7 +4,7 @@
     transition="slide-x-transition"
     tag="form"
     @submit="WorkoutToSeries"
-    @open="openModal"
+    @close="closeModal"
   >
     <template #header>
       <div class="close__modal">
@@ -44,7 +44,14 @@
                   class="mt-3"
                 /> -->
                 <div class="pb-3 align mt-2">
-                  <div class="series__workout__title wa__f__m__eb text-uppercase mb-2">
+                  <div
+                    class="
+                      series__workout__title
+                      wa__f__m__eb
+                      text-uppercase
+                      mb-2
+                    "
+                  >
                     {{ item.name }}
                   </div>
                   <div class="series__workout__description">
@@ -176,9 +183,14 @@ export default {
     },
   },
   methods: {
-    ...mapActions("workoutToSeries", ["loadWorkoutsToSeries", "addWorkoutToSeries"]),
+    ...mapActions("workoutToSeries", [
+      "loadWorkoutsToSeries",
+      "addWorkoutToSeries",
+    ]),
     ...mapMutations("workoutToSeries", ["SET_FILTER_WORKOUTS_TO_SERIES"]),
-    openModal() {},
+    closeModal() {
+      this.SET_FILTER_WORKOUTS_TO_SERIES({});
+    },
     async joinWorkout(id) {
       this.workoutId = id;
       let repository = new WorkoutToSeriesRepository();