diff --git a/src/abstraction/resources/profileResource.js b/src/abstraction/resources/profileResource.js
index b667161..0cea76c 100644
--- a/src/abstraction/resources/profileResource.js
+++ b/src/abstraction/resources/profileResource.js
@@ -1,4 +1,5 @@
import { objectToFormData } from "@/utils/objectToFormData";
+import { getJson as getJsonCountry } from "./countryResource";
export const getJson = (data) => ({
id: data.id,
first_name: data.first_name,
@@ -13,9 +14,7 @@ export const getJson = (data) => ({
address: data.address,
email: data.email,
cell_number: data.cell_number,
- is_admin: data.is_admin,
- is_trainer: data.is_trainer,
- country: data?.country,
+ country: data.country ? getJsonCountry(data?.country) : {},
country_id: data.country?.id,
created_courses_count: data.created_courses_count,
joined_courses_count: data.joined_courses_count,
diff --git a/src/abstraction/resources/userResource.js b/src/abstraction/resources/userResource.js
index 6477e21..d96e8c7 100644
--- a/src/abstraction/resources/userResource.js
+++ b/src/abstraction/resources/userResource.js
@@ -1,4 +1,5 @@
import { SetPagination, SetQueriesObject } from "@/utils/setQueriesObject";
+import { getJson as getJsonCountry } from "./countryResource";
export const getJson = (data) => {
let role_id = null;
data.roles.map(x => role_id = x.id);
@@ -23,8 +24,12 @@ export const getJson = (data) => {
role: role,
roles: data.roles,
role_id: role_id,
+ country: data.country ? getJsonCountry(data.country) : {},
created_courses_count: data.created_courses_count,
- joined_courses_count: data.joined_courses_count
+ joined_courses_count: data.joined_courses_count,
+ created_at: data.created_at,
+ // joined_date -> The correct format of created_at
+ joined_date: data.created_at?.slice(0, 10),
})
};
export const getArray = ({ data, meta }) => {
diff --git a/src/components/Users/Modals/Detail.vue b/src/components/Users/Modals/Detail.vue
index 57642e1..809c2ed 100644
--- a/src/components/Users/Modals/Detail.vue
+++ b/src/components/Users/Modals/Detail.vue
@@ -41,7 +41,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
diff --git a/src/components/Workouts/Modals/Detail.vue b/src/components/Workouts/Modals/Detail.vue
index 22179a7..b615d0f 100644
--- a/src/components/Workouts/Modals/Detail.vue
+++ b/src/components/Workouts/Modals/Detail.vue
@@ -52,7 +52,7 @@
-
+
-
+