From 7bcc9b3efc868f9bd827e65f8bbe3751ce8612c0 Mon Sep 17 00:00:00 2001
From: sajjad <talkhabisajad10@gmail.com>
Date: Sun, 28 Nov 2021 16:05:25 +0330
Subject: [PATCH] fix

---
 .../ProgramSeries/Modals/AddSeriesModal.vue   |  2 +-
 .../Users/Modals/ChangeRoleModal.vue          |  2 +-
 .../Workouts/Modals/FiltersModal.vue          |  2 +-
 src/components/WorkoutsSeries/Main.vue        |  3 +-
 .../WorkoutsSeries/Modals/AddWorkoutModal.vue | 65 ++++++++++++++-----
 src/store/modules/workoutToSeries/actions.js  | 10 +--
 6 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/src/components/ProgramSeries/Modals/AddSeriesModal.vue b/src/components/ProgramSeries/Modals/AddSeriesModal.vue
index 27e0bf3..9c24fad 100644
--- a/src/components/ProgramSeries/Modals/AddSeriesModal.vue
+++ b/src/components/ProgramSeries/Modals/AddSeriesModal.vue
@@ -56,7 +56,7 @@
     <template #footer>
       <v-spacer></v-spacer>
       <div
-        class="d-flex justify-space-between align-items-center w-100 px-4 pb-10"
+        class="d-flex justify-space-between align-items-center w-100 pb-10"
       >
         <RectangleButton
           class="btn__modal--cancel pl-0"
diff --git a/src/components/Users/Modals/ChangeRoleModal.vue b/src/components/Users/Modals/ChangeRoleModal.vue
index 79097f3..76f5a61 100644
--- a/src/components/Users/Modals/ChangeRoleModal.vue
+++ b/src/components/Users/Modals/ChangeRoleModal.vue
@@ -30,7 +30,7 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100 px-4">
+      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
diff --git a/src/components/Workouts/Modals/FiltersModal.vue b/src/components/Workouts/Modals/FiltersModal.vue
index 97ebdf5..951599b 100644
--- a/src/components/Workouts/Modals/FiltersModal.vue
+++ b/src/components/Workouts/Modals/FiltersModal.vue
@@ -51,7 +51,7 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100 px-4">
+      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="clear"
diff --git a/src/components/WorkoutsSeries/Main.vue b/src/components/WorkoutsSeries/Main.vue
index 7fd3c90..74eb48a 100644
--- a/src/components/WorkoutsSeries/Main.vue
+++ b/src/components/WorkoutsSeries/Main.vue
@@ -39,7 +39,7 @@
       </div>
     </main-back>
     <div class="text-center">
-      <AddWorkoutModal />
+      <AddWorkoutModal v-if="isModal('modal_add_workout')" />
     </div>
   </div>
 </template> 
@@ -57,6 +57,7 @@ export default {
   },
   computed: {
     ...mapGetters("workoutToSeries", ["getWorkouts"]),
+    ...mapGetters("modal", [ "isModal"]),
     seriesId() {
       return this.$route.params.seriesId;
     },
diff --git a/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue b/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue
index 3ad3cb8..3106196 100644
--- a/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue
+++ b/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue
@@ -4,6 +4,7 @@
     transition="slide-x-transition"
     tag="form"
     @submit="WorkoutToSeries"
+    @open="openModal"
   >
     <template #header>
       <div class="close__modal">
@@ -32,27 +33,39 @@
             :search-input.sync="search"
           >
             <template #item="{ item }">
-              <div class="dashfkl w-100">
-                <AddWorkoutsItem
-                  @click.native="joinWorkout(item.id)"
+              <div
+                class="w-100"
+                style="border-bottom: 1px solid white"
+                @click="joinWorkout(item.id)"
+              >
+                <!-- <AddWorkoutsItem
+                  
                   :addWorkout="item"
                   :add="true"
                   class="mt-3"
-                />
+                /> -->
+                <div class="pb-3 align mt-2">
+                  <div class="series__workout__title wa__f__m__eb text-uppercase mb-2">
+                    {{ item.title }}
+                  </div>
+                  <div class="series__workout__description">
+                    {{ item.description }}
+                  </div>
+                </div>
               </div>
             </template>
           </v-autocomplete>
         </div>
-        <template v-if="Object.keys(getWorkoutToSeries).length !== 0">
+        <template v-if="Object.keys(selectedWorkout).length !== 0">
           <v-divider class="mt-6"></v-divider>
           <v-row class="mt-1">
             <v-col cols="12"
-              ><AddWorkoutsItem :addWorkout="getWorkoutToSeries" :add="true"
+              ><AddWorkoutsItem :addWorkout="selectedWorkout" :add="true"
             /></v-col>
           </v-row>
         </template>
         <div class="mt-6">
-          <v-row :class="{ 'mt-9': Object.keys(getWorkoutToSeries).length === 0 }">
+          <v-row :class="{ 'mt-9': Object.keys(selectedWorkout).length === 0 }">
             <v-col cols="4">
               <v-text-field
                 dark
@@ -97,7 +110,7 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100 px-4">
+      <div class="d-flex justify-space-between align-items-center w-100">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
@@ -124,6 +137,8 @@ import AddWorkoutsItem from "../Item.vue";
 import { mapActions, mapGetters, mapMutations } from "vuex";
 import { cloneDeep } from "lodash";
 import toast from "@/utils/toast";
+import WorkoutToSeriesRepository from "@/abstraction/repository/workoutToSeriesRepository";
+
 let cancelId;
 const defaultFilter = {
   title: {
@@ -141,9 +156,10 @@ export default {
     isLoadingTimeout: null,
     form: {},
     workoutId: null,
+    selectedWorkout: {},
   }),
   computed: {
-    ...mapGetters("workoutToSeries", ["getWorkoutsToSeries", "getWorkoutToSeries"]),
+    ...mapGetters("workoutToSeries", ["getWorkoutsToSeries"]),
     ...mapGetters("programSeries", ["getCurrentSeriesId"]),
   },
   watch: {
@@ -165,15 +181,16 @@ export default {
     },
   },
   methods: {
-    ...mapActions("workoutToSeries", [
-      "loadWorkoutsToSeries",
-      "loadWorkoutToSeries",
-      "addWorkoutToSeries",
-    ]),
+    ...mapActions("workoutToSeries", ["loadWorkoutsToSeries", "addWorkoutToSeries"]),
     ...mapMutations("workoutToSeries", ["SET_FILTER_WORKOUTS_TO_SERIES"]),
+    openModal() {
+      console.log("s");
+    },
     async joinWorkout(id) {
       this.workoutId = id;
-      await this.loadWorkoutToSeries(this.workoutId);
+      let repository = new WorkoutToSeriesRepository();
+      this.selectedWorkout = await repository.show(this.workoutId);
+      console.log(this.selectedWorkout);
     },
     async WorkoutToSeries() {
       if (this.workoutId) {
@@ -182,6 +199,7 @@ export default {
           seriesId: Number(this.getCurrentSeriesId),
           workoutId: this.workoutId,
         });
+        this.isLoading = false;
         this.$_closeModal();
         return;
       }
@@ -197,4 +215,21 @@ export default {
 .theme--light.v-list {
   background-color: rgb(46, 45, 45) !important;
 }
+.series__workout__title {
+  letter-spacing: 4px;
+  color: var(--color-white);
+}
+.series__workout__description {
+  font-size: 10px;
+  text-align: left;
+  line-height: 10px;
+  color: #e3e3e3;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  overflow: hidden;
+}
+.align {
+  line-height: 4px;
+}
 </style>
diff --git a/src/store/modules/workoutToSeries/actions.js b/src/store/modules/workoutToSeries/actions.js
index 6a67fa8..302dee0 100644
--- a/src/store/modules/workoutToSeries/actions.js
+++ b/src/store/modules/workoutToSeries/actions.js
@@ -15,11 +15,11 @@ export default {
             return e;
         }
     },
-    async loadWorkoutToSeries({ commit }, workoutId) {
-        let repository = new WorkoutToSeriesRepository();
-        const resource = await repository.show(workoutId);
-        commit("SET_WORKOUT_TO_SERIES", resource);
-    },
+    // async loadWorkoutToSeries({ commit }, workoutId) {
+    //     let repository = new WorkoutToSeriesRepository();
+    //     const resource = await repository.show(workoutId);
+    //     commit("SET_WORKOUT_TO_SERIES", resource);
+    // },
     async addWorkoutToSeries({ commit }, data) {
         let repository = new WorkoutToSeriesRepository();
         const resource = await repository.store(data.data, data.seriesId, data.workoutId);