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 @@