diff --git a/src/abstraction/repository/statisticRepository.js b/src/abstraction/repository/statisticRepository.js
index 51165ec..c416e1b 100644
--- a/src/abstraction/repository/statisticRepository.js
+++ b/src/abstraction/repository/statisticRepository.js
@@ -3,7 +3,6 @@ import url from "@/router/url"
import { getJson } from "../resources/statisticResource";
export default class StatisticRepository {
async indexAdmin() {
- console.log('s');
let response = await axios.get(url("indexAdmin"));
if (response.status === 200) {
return getJson(response.data.data)
diff --git a/src/abstraction/resources/productResource.js b/src/abstraction/resources/productResource.js
index 1d39baf..2a7e58d 100644
--- a/src/abstraction/resources/productResource.js
+++ b/src/abstraction/resources/productResource.js
@@ -12,10 +12,10 @@ export const getJson = (data) => ({
video_link: data.video_link,
purchase_link: data.purchase_link,
price_unit: data.price,
- price: `${data.price.replace('$', '')}`,
+ price: `${data.price?.replace('$', '')}`,
weight_unit: data.weight,
- weight: `${data.weight.replace('kg', '')}`,
- dimensions_unit: `${data.dimensions.replace('cm', '')}`,
+ weight: `${data.weight?.replace('kg', '')}`,
+ dimensions_unit: `${data.dimensions?.replace('cm', '')}`,
dimensions: data.dimensions,
product_category: data.product_category,
product_categories_id: data.product_category?.parent?.id,
@@ -23,7 +23,6 @@ export const getJson = (data) => ({
});
export const setData = (data) => {
- console.log(data);
let formData = {
product_category_id: data.product_category_id,
title: data.title,
diff --git a/src/abstraction/resources/profileResource.js b/src/abstraction/resources/profileResource.js
index a4e7efe..b667161 100644
--- a/src/abstraction/resources/profileResource.js
+++ b/src/abstraction/resources/profileResource.js
@@ -22,7 +22,6 @@ export const getJson = (data) => ({
roles: data.roles
});
export const setData = (data, isUpdate = false) => {
- console.log(data);
let formData = {
first_name: data.first_name,
last_name: data.last_name,
diff --git a/src/abstraction/resources/userResource.js b/src/abstraction/resources/userResource.js
index 38eb42a..6477e21 100644
--- a/src/abstraction/resources/userResource.js
+++ b/src/abstraction/resources/userResource.js
@@ -2,10 +2,10 @@ import { SetPagination, SetQueriesObject } from "@/utils/setQueriesObject";
export const getJson = (data) => {
let role_id = null;
data.roles.map(x => role_id = x.id);
- let type = '';
+ let role = '';
let roles = data.roles.map(x => x.name);
- roles.includes('manager') ? type = "admin" : roles.includes("trainer") && !roles.includes('manager') ? type = 'trainer' : "trainee"
- !data.roles.length ? type = "trainee" : false;
+ roles.includes('manager') ? role = "admin" : roles.includes("trainer") && !roles.includes('manager') ? role = 'trainer' : "trainee"
+ !data.roles.length ? role = "trainee" : false;
return ({
id: data.id,
first_name: data.first_name,
@@ -20,8 +20,8 @@ export const getJson = (data) => {
address: data.address,
email: data.email,
cell_number: data.cell_number,
- type: type,
- role: data.roles,
+ role: role,
+ roles: data.roles,
role_id: role_id,
created_courses_count: data.created_courses_count,
joined_courses_count: data.joined_courses_count
diff --git a/src/components/Bookmarks/Main.vue b/src/components/Bookmarks/Items.vue
similarity index 100%
rename from src/components/Bookmarks/Main.vue
rename to src/components/Bookmarks/Items.vue
diff --git a/src/components/Dashboard/Main.vue b/src/components/Dashboard/Main.vue
index 0a8462b..6b10a6f 100644
--- a/src/components/Dashboard/Main.vue
+++ b/src/components/Dashboard/Main.vue
@@ -2,9 +2,9 @@
-
+
-
+
-
+
@@ -211,18 +211,18 @@ export default {
Notification,
},
data: () => ({
- type: UserStorage.get() ? UserStorage.get().type : null,
+ role: UserStorage.getRole() ? UserStorage.getRole() : null,
statistics: {},
}),
methods: {
async loadStatistic() {
let repository = new StatisticRepository();
this.statistics =
- this.type === "admin"
+ this.role === "admin"
? await repository.indexAdmin()
- : this.type === "trainer"
+ : this.role === "trainer"
? await repository.indexTrainer()
- : this.type === "trainee"
+ : this.role === "trainee"
? await repository.indexTrainee()
: false;
},
diff --git a/src/components/Global/Section/SideBar.vue b/src/components/Global/Section/SideBar.vue
index 838f534..ef6f7df 100644
--- a/src/components/Global/Section/SideBar.vue
+++ b/src/components/Global/Section/SideBar.vue
@@ -3,7 +3,7 @@
-
+
-
+
-
+
diff --git a/src/components/Programs/Item.vue b/src/components/Programs/Item.vue
index 2c3fb6c..087b68e 100644
--- a/src/components/Programs/Item.vue
+++ b/src/components/Programs/Item.vue
@@ -1,19 +1,19 @@
-->
+
@@ -16,20 +16,20 @@
Role:
- {{ user.type }}
+ {{ user.role }}
-
+
{{ user.created_courses_count ? user.created_courses_count : "0" }}
program created
-
+
{{ user.joined_courses_count ? user.joined_courses_count : "0" }}
@@ -46,6 +46,7 @@
class="ml-1 custom-btn custom-icon"
icon="WMi-gold-medal"
@click.native="chageRole"
+ v-if="role === 'admin'"
size="large"
/>
@@ -82,7 +83,7 @@ export default {
},
},
data: () => ({
- type: UserStorage.get() ? UserStorage.get().type : null,
+ role: UserStorage.getRole() ? UserStorage.getRole() : null,
}),
methods: {
...mapActions("users", ["deleteUser"]),
diff --git a/src/components/Users/Main.vue b/src/components/Users/Items.vue
similarity index 93%
rename from src/components/Users/Main.vue
rename to src/components/Users/Items.vue
index fa2a5ca..1173504 100644
--- a/src/components/Users/Main.vue
+++ b/src/components/Users/Items.vue
@@ -57,7 +57,7 @@ export default {
FiltersModal,
},
data: () => ({
- type: UserStorage.get() ? UserStorage.get().type : null,
+ role: UserStorage.getRole() ? UserStorage.getRole() : null,
id: null,
}),
computed: {
@@ -79,7 +79,7 @@ export default {
}
},
async load() {
- this.type === "admin" ? await this.loadUsers() : await this.loadTrainerTrainee();
+ this.role === "admin" ? await this.loadUsers() : await this.loadTrainerTrainee();
},
userId(id) {
this.id = id;
@@ -89,7 +89,7 @@ export default {
if (!this.$route.query.role_name) {
this.load();
}
- await this.laodRoles();
+ this.role === "admin" ? await this.laodRoles() : false;
this.getRoles.push({ id: 0, name: "trainee" });
},
};
diff --git a/src/components/AddWorkout/Main.vue b/src/components/Workouts/Add.vue
similarity index 100%
rename from src/components/AddWorkout/Main.vue
rename to src/components/Workouts/Add.vue
diff --git a/src/components/Workouts/Main.vue b/src/components/Workouts/Items.vue
similarity index 100%
rename from src/components/Workouts/Main.vue
rename to src/components/Workouts/Items.vue
diff --git a/src/components/WorkoutsSeries/Main.vue b/src/components/WorkoutsSeries/Items.vue
similarity index 92%
rename from src/components/WorkoutsSeries/Main.vue
rename to src/components/WorkoutsSeries/Items.vue
index 74eb48a..87b1831 100644
--- a/src/components/WorkoutsSeries/Main.vue
+++ b/src/components/WorkoutsSeries/Items.vue
@@ -31,9 +31,7 @@
class="mb-3"
v-for="(seriesWorkout, i) in getWorkouts"
:key="i"
- >
@@ -42,7 +40,7 @@
-
+
\ No newline at end of file
+
diff --git a/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue b/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue
index 3106196..7fb5d71 100644
--- a/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue
+++ b/src/components/WorkoutsSeries/Modals/AddWorkoutModal.vue
@@ -184,13 +184,11 @@ export default {
...mapActions("workoutToSeries", ["loadWorkoutsToSeries", "addWorkoutToSeries"]),
...mapMutations("workoutToSeries", ["SET_FILTER_WORKOUTS_TO_SERIES"]),
openModal() {
- console.log("s");
},
async joinWorkout(id) {
this.workoutId = id;
let repository = new WorkoutToSeriesRepository();
this.selectedWorkout = await repository.show(this.workoutId);
- console.log(this.selectedWorkout);
},
async WorkoutToSeries() {
if (this.workoutId) {
diff --git a/src/router/index.js b/src/router/index.js
index 3d4c27c..6e08e97 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -72,7 +72,7 @@ function beforeLoad() {
return next('/');
}
if (loggedIn && roles && Array.isArray(roles)) {
- const ownType = UserStorage.get() ? UserStorage.get().type : '';
+ const ownType = UserStorage.get() ? UserStorage.get().role : '';
if (!roles.includes(ownType)) {
router.push({ name: 'dashboard' });
}
diff --git a/src/router/path.js b/src/router/path.js
index ab4fa8a..0fb6646 100644
--- a/src/router/path.js
+++ b/src/router/path.js
@@ -97,8 +97,8 @@ export default [
},
{
path: '/trains-programs',
- view: 'TrainsPrograms',
- name: 'trainsPrograms',
+ view: 'TraineePrograms',
+ name: 'traineePrograms',
},
{
diff --git a/src/utils/storage.js b/src/utils/storage.js
index f204d5d..38f06aa 100644
--- a/src/utils/storage.js
+++ b/src/utils/storage.js
@@ -12,7 +12,6 @@ const TokenStorage = {
getToken() {
return localStorage.getItem(TOKEN_KEY);
},
-
saveToken(accessToken = null) {
localStorage.setItem(TOKEN_KEY, accessToken);
},
@@ -33,12 +32,13 @@ const UserStorage = {
}
return null;
},
-
+ getRole() {
+ return this.get().role;
+ },
save(user = null) {
user = qs.stringify(user);
localStorage.setItem(USER, user);
},
-
remove() {
localStorage.removeItem(USER);
},
diff --git a/src/views/AddProduct.vue b/src/views/AddProduct.vue
index 4e90a92..276858b 100644
--- a/src/views/AddProduct.vue
+++ b/src/views/AddProduct.vue
@@ -22,10 +22,10 @@
\ No newline at end of file
+
diff --git a/src/views/AddProgram.vue b/src/views/AddProgram.vue
index f19edbc..bf2c855 100644
--- a/src/views/AddProgram.vue
+++ b/src/views/AddProgram.vue
@@ -14,7 +14,7 @@
-
+
@@ -22,10 +22,10 @@
\ No newline at end of file
+
diff --git a/src/views/AddWorkout.vue b/src/views/AddWorkout.vue
index ad1449e..d18aec7 100644
--- a/src/views/AddWorkout.vue
+++ b/src/views/AddWorkout.vue
@@ -22,10 +22,10 @@
\ No newline at end of file
+
diff --git a/src/views/Bookmarks.vue b/src/views/Bookmarks.vue
index 368c89b..05dbc84 100644
--- a/src/views/Bookmarks.vue
+++ b/src/views/Bookmarks.vue
@@ -22,7 +22,7 @@
\ No newline at end of file
+
diff --git a/src/views/Programs.vue b/src/views/Programs.vue
index 7d60e93..bb869a3 100644
--- a/src/views/Programs.vue
+++ b/src/views/Programs.vue
@@ -22,7 +22,7 @@