From 07d6a750075ccdc716e0841b42d679369e6f446f Mon Sep 17 00:00:00 2001 From: sajjad Date: Sun, 27 Mar 2022 20:43:27 +0430 Subject: [PATCH 01/16] fix --- .../Global/Button/RectangleButton.vue | 14 +---------- .../ProgramSeries/Modals/AddSeriesModal.vue | 4 +--- .../Programs/Modals/FiltersModal.vue | 4 +--- .../Users/Modals/ChangeRoleModal.vue | 4 +--- src/components/Users/Modals/FiltersModal.vue | 4 +--- .../Workouts/Modals/FiltersModal.vue | 4 +--- .../WorkoutsSeries/Modals/AddWorkoutModal.vue | 24 ++++--------------- 7 files changed, 11 insertions(+), 47 deletions(-) diff --git a/src/components/Global/Button/RectangleButton.vue b/src/components/Global/Button/RectangleButton.vue index baf5c56..6954e9b 100644 --- a/src/components/Global/Button/RectangleButton.vue +++ b/src/components/Global/Button/RectangleButton.vue @@ -13,12 +13,7 @@ :loading="loading" > - + diff --git a/src/components/Workouts/Modals/FiltersModal.vue b/src/components/Workouts/Modals/FiltersModal.vue index 42ed8be..f16bd2f 100644 --- a/src/components/Workouts/Modals/FiltersModal.vue +++ b/src/components/Workouts/Modals/FiltersModal.vue @@ -59,7 +59,7 @@ size="large" :is-modal="true" height="29" - @click.native="clearFilter" + @click="clearFilter" /> diff --git a/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue b/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue index ed788c4..708a773 100644 --- a/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue +++ b/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue @@ -121,7 +121,7 @@ size="large" :is-modal="true" height="29" - @click.native="$_closeModal()" + @click="$_closeModal()" /> From 095e1ae40b1d8af5932b48f1a2780818704a2c53 Mon Sep 17 00:00:00 2001 From: sajjad Date: Mon, 28 Mar 2022 20:38:53 +0430 Subject: [PATCH 06/16] fix --- src/abstraction/repository/userRepository.js | 8 +- .../resources/trainerProgramResource.js | 3 +- .../Global/Button/RectangleButton.vue | 4 +- src/components/Global/Section/Info.vue | 11 +- src/components/Programs/Item.vue | 13 +- src/components/Programs/Items.vue | 8 +- src/components/Programs/Modals/Detail.vue | 112 ++++++++++++++++++ src/components/Users/Modals/Detail.vue | 95 +++++++++++++++ src/components/Workouts/Item.vue | 13 +- src/components/Workouts/Modals/Detail.vue | 9 +- src/router/url.js | 1 + src/store/modules/users/actions.js | 5 + src/store/modules/users/getters.js | 1 + src/store/modules/users/mutations.js | 3 + src/store/modules/users/state.js | 1 + .../font/montserrat/Montserrat-ExtraLight.ttf | Bin 0 -> 242128 bytes src/styles/setup/_fonts.scss | 12 +- 17 files changed, 280 insertions(+), 19 deletions(-) create mode 100644 src/components/Programs/Modals/Detail.vue create mode 100644 src/components/Users/Modals/Detail.vue create mode 100644 src/styles/font/montserrat/Montserrat-ExtraLight.ttf diff --git a/src/abstraction/repository/userRepository.js b/src/abstraction/repository/userRepository.js index 283eed1..3d60935 100644 --- a/src/abstraction/repository/userRepository.js +++ b/src/abstraction/repository/userRepository.js @@ -1,6 +1,6 @@ import axios from "axios"; import url from "@/router/url"; -import { getArray, setQuery } from "../resources/userResource"; +import { getArray, setQuery, getJson } from "../resources/userResource"; import { getArray as getArrayTrainee } from "../resources/traineeResource"; export default class UserRepository { @@ -18,6 +18,12 @@ export default class UserRepository { return getArrayTrainee(response.data) } } + async show(userId) { + let response = await axios.get(url("showUser", { user: userId })); + if (response.status === 200) { + return getJson(response.data.data); + } + } async delete(userId) { await axios.delete(url("destroyUser", { user: userId })); } diff --git a/src/abstraction/resources/trainerProgramResource.js b/src/abstraction/resources/trainerProgramResource.js index 15541fe..de3bf0c 100644 --- a/src/abstraction/resources/trainerProgramResource.js +++ b/src/abstraction/resources/trainerProgramResource.js @@ -1,5 +1,6 @@ export const getJsonTrainer = (data) => ({ id: data.id, + name: data.name, first_name: data.first_name, last_name: data.last_name, birthday: data.birthday, @@ -12,6 +13,4 @@ export const getJsonTrainer = (data) => ({ address: data.address, email: data.email, cell_number: data.cell_number, - is_admin: data.is_admin, - is_trainer: data.is_trainer, }); \ No newline at end of file diff --git a/src/components/Global/Button/RectangleButton.vue b/src/components/Global/Button/RectangleButton.vue index f9b916b..06f61ff 100644 --- a/src/components/Global/Button/RectangleButton.vue +++ b/src/components/Global/Button/RectangleButton.vue @@ -4,7 +4,7 @@ depressed :height="height" :width="width" - :class="`color-${color} ${bgColor}`" + :class="`color-${color} bg-${bgColor}`" :type="type" :x-small="xs" :small="sm" @@ -85,7 +85,7 @@ export default { .v-btn.color-#{ "" + $color} { color: $value !important; } - .v-btn.#{"" + $color} { + .v-btn.bg-#{"" + $color} { background-color: $value !important; } } diff --git a/src/components/Global/Section/Info.vue b/src/components/Global/Section/Info.vue index 577073b..5b2f09c 100644 --- a/src/components/Global/Section/Info.vue +++ b/src/components/Global/Section/Info.vue @@ -2,15 +2,20 @@
{{ title }}
- + + +
-
+
{{ program.title }} @@ -92,7 +92,7 @@
diff --git a/src/components/Programs/Items.vue b/src/components/Programs/Items.vue index 5a8c0c5..4ebcce1 100644 --- a/src/components/Programs/Items.vue +++ b/src/components/Programs/Items.vue @@ -57,13 +57,17 @@
+ +
+ diff --git a/src/components/Users/Modals/Detail.vue b/src/components/Users/Modals/Detail.vue new file mode 100644 index 0000000..6b495ae --- /dev/null +++ b/src/components/Users/Modals/Detail.vue @@ -0,0 +1,95 @@ + + + diff --git a/src/components/Workouts/Item.vue b/src/components/Workouts/Item.vue index 820126a..8c20bb0 100644 --- a/src/components/Workouts/Item.vue +++ b/src/components/Workouts/Item.vue @@ -1,5 +1,5 @@ @@ -70,6 +66,7 @@ import SectionTitle from "../Global/Section/SectionTitle.vue"; import ChangeRoleModal from "./Modals/ChangeRoleModal.vue"; import FiltersModal from "./Modals/FiltersModal.vue"; +import UserDetailModal from "./Modals/Detail.vue"; import UserItem from "./Item.vue"; import { mapActions, mapGetters, mapMutations, mapState } from "vuex"; import { UserStorage } from "@/utils/storage"; @@ -80,6 +77,7 @@ export default { UserItem, ChangeRoleModal, FiltersModal, + UserDetailModal, }, data: () => ({ role: UserStorage.getRole() ? UserStorage.getRole() : null, diff --git a/src/components/Users/Modals/ChangeRoleModal.vue b/src/components/Users/Modals/ChangeRoleModal.vue index 9d7d9b3..9ad9870 100644 --- a/src/components/Users/Modals/ChangeRoleModal.vue +++ b/src/components/Users/Modals/ChangeRoleModal.vue @@ -11,7 +11,7 @@
- + ({ role_id: null, currectRoleId: null, changeRoleRequestLoading: false, + roles: null, }), computed: { form() { @@ -77,7 +75,8 @@ export default { }, methods: { ...mapActions("users", ["updateRole"]), - openModal({ role }) { + openModal({ role, roles }) { + this.roles = { ...roles }; this.currectRoleId = role ? role : 0; this.role_id = role ? role : 0; }, diff --git a/src/components/Users/Modals/Detail.vue b/src/components/Users/Modals/Detail.vue index 6b495ae..57642e1 100644 --- a/src/components/Users/Modals/Detail.vue +++ b/src/components/Users/Modals/Detail.vue @@ -18,7 +18,7 @@ user image diff --git a/src/components/Users/Modals/FiltersModal.vue b/src/components/Users/Modals/FiltersModal.vue index 130f14f..38f0f98 100644 --- a/src/components/Users/Modals/FiltersModal.vue +++ b/src/components/Users/Modals/FiltersModal.vue @@ -4,6 +4,7 @@ transition="slide-x-transition" tag="vee-form" @submit="filterUser" + @open="openModal" >