From f6a9728bb0cf4a8ae9687371e6996604e5835eb1 Mon Sep 17 00:00:00 2001 From: sajjad Date: Thu, 31 Mar 2022 20:18:03 +0430 Subject: [PATCH] fix --- .../repository/sportCategoryRepository.js | 8 +++++++- src/abstraction/resources/programResource.js | 3 +-- src/abstraction/resources/sportCategoryResource.js | 1 - src/components/ProgramSeries/Item.vue | 5 +++-- src/components/Programs/Add.vue | 14 ++++++-------- src/store/modules/sportCategories/actions.js | 8 +++++--- src/store/modules/sportCategories/getters.js | 1 + src/store/modules/sportCategories/mutations.js | 3 +++ src/store/modules/sportCategories/state.js | 3 ++- 9 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/abstraction/repository/sportCategoryRepository.js b/src/abstraction/repository/sportCategoryRepository.js index 893e3c2..6b5a6ce 100644 --- a/src/abstraction/repository/sportCategoryRepository.js +++ b/src/abstraction/repository/sportCategoryRepository.js @@ -2,7 +2,13 @@ import axios from "axios"; import url from "@/router/url"; import { getArray, getJson } from "../resources/sportCategoryResource"; export default class SportCategoryRepository { - async index() { + async index(data) { + let response = await axios.get(url("indexSportCategories"), { params: data }); + if (response.status === 200) { + return getArray(response.data); + } + } + async trainerIndex() { let response = await axios.get(url("indexClientSportCategories")); if (response.status === 200) { return getArray(response.data); diff --git a/src/abstraction/resources/programResource.js b/src/abstraction/resources/programResource.js index 87f6d62..e14f0b8 100644 --- a/src/abstraction/resources/programResource.js +++ b/src/abstraction/resources/programResource.js @@ -7,7 +7,7 @@ export const getJson = (data) => ({ trainer_id: data.trainer_id, sport_category: data.trainer ? getJsonSportCategory(data.trainer) : {}, sport_category_id: data.sport_category_id, - workout_category_id: data.workout_category?.id, + program_category_id: data.sport_category?.parent?.id, thumbnail: data.thumbnail, verified: data.verified, status: data.status, @@ -22,7 +22,6 @@ export const getJson = (data) => ({ }); export const setData = (data) => ({ sport_category_id: data.sport_category_id, - workout_category_id: data.workout_category_id, title: data.title, description: data.description, tags: data.tags, diff --git a/src/abstraction/resources/sportCategoryResource.js b/src/abstraction/resources/sportCategoryResource.js index 3d79bef..6f27d58 100644 --- a/src/abstraction/resources/sportCategoryResource.js +++ b/src/abstraction/resources/sportCategoryResource.js @@ -9,4 +9,3 @@ export const getArray = ({ data }) => { data = data.map((category) => getJson(category)); return { data }; }; - diff --git a/src/components/ProgramSeries/Item.vue b/src/components/ProgramSeries/Item.vue index 995b89e..9391057 100644 --- a/src/components/ProgramSeries/Item.vue +++ b/src/components/ProgramSeries/Item.vue @@ -11,7 +11,7 @@
-
+
series {{ seriesNumber }}: {{ series.name }}
@@ -49,6 +49,7 @@ width="48" class="ml-1 custom-btn" icon="WMi-pencil" + @click.native.prevent="$_openModal('add_series', { data: series })" /> \ No newline at end of file + diff --git a/src/components/Programs/Add.vue b/src/components/Programs/Add.vue index c87d3dc..9c316db 100644 --- a/src/components/Programs/Add.vue +++ b/src/components/Programs/Add.vue @@ -35,7 +35,7 @@ item-value="id" label="program category" :items="getSportCategories" - v-model="form.sport_category_id" + v-model="form.program_category_id" @change="changeSportCategories" > @@ -46,8 +46,8 @@ item-text="name" item-value="id" label="workout subcategory" - :items="getWorkoutCategories" - v-model="form.workout_category_id" + :items="getSubSportCategories" + v-model="form.sport_category_id" > state.sportCategories, + getSubSportCategories: state => state.subSportCategories, getSportCategory: state => state.sportCategory, } \ No newline at end of file diff --git a/src/store/modules/sportCategories/mutations.js b/src/store/modules/sportCategories/mutations.js index 4dff62a..b1f1d94 100644 --- a/src/store/modules/sportCategories/mutations.js +++ b/src/store/modules/sportCategories/mutations.js @@ -3,6 +3,9 @@ export default { SET_SPORT_CATEGORIES(state, payload) { Vue.set(state, "sportCategories", payload); }, + SET_SUB_SPORT_CATEGORIES(state, payload) { + Vue.set(state, "subSportCategories", payload); + }, SET_SPORT_CATEGORY(state, payload) { Vue.set(state, "sportCategory", payload); }, diff --git a/src/store/modules/sportCategories/state.js b/src/store/modules/sportCategories/state.js index 187970d..559d94a 100644 --- a/src/store/modules/sportCategories/state.js +++ b/src/store/modules/sportCategories/state.js @@ -1,4 +1,5 @@ export default { sportCategories: [], - sportCategory: [] + subSportCategories: [], + sportCategory: [], };