\ No newline at end of file
+
diff --git a/src/components/WorkoutsSeries/Item.vue b/src/components/WorkoutsSeries/Item.vue
index 5df7820..17e736b 100644
--- a/src/components/WorkoutsSeries/Item.vue
+++ b/src/components/WorkoutsSeries/Item.vue
@@ -93,6 +93,9 @@ export default {
});
},
},
+ created() {
+ console.log(this.seriesWorkout);
+ }
};
\ No newline at end of file
+
diff --git a/src/main.js b/src/main.js
index ed1561b..33dd71c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,10 +5,13 @@ import vuetify from './plugins/vuetify';
import router from './router';
import './utils/GlobalComponents';
import "./styles/global.scss";
-import './mixins/Global.js';
import ApiService from '@/utils/axios/api';
ApiService.init('https://app.champya-dev.ir');
import '@/utils/axios/errorHandler';
+/* mixins */
+import $_mixin from "./mixins/global";
+Vue.mixin($_mixin);
+
Vue.config.productionTip = false
new Vue({
diff --git a/src/mixins/Global.js b/src/mixins/Global.js
index 0d391a7..f1d2d8c 100644
--- a/src/mixins/Global.js
+++ b/src/mixins/Global.js
@@ -1,18 +1,27 @@
-import { mapActions } from "vuex";
-// import $_color from "@Global/utils/module-color";
-import Vue from 'vue';
+// import { mapActions } from "vuex";
+// // import $_color from "@Global/utils/module-color";
+// import backHome from "./backHome";
-const modal = {
- ...mapActions("modal", [
- "__openModal",
- "$_closeModal"
- ]),
- $_openModal(name, data = {}) {
- this.__openModal({ ...data, ...{ name } })
- },
-};
+// import Vue from 'vue';
+
+// const modal = {
+// ...mapActions("modal", [
+// "__openModal",
+// "$_closeModal"
+// ]),
+// $_openModal(name, data = {}) {
+// this.__openModal({ ...data, ...{ name } })
+// },
+// };
-Vue.mixin({
- methods: { ...modal }
-});
+// Vue.mixin({
+// methods: { ...modal, ...backHome }
+// });
+import { $_closeModal, $_openModal } from './modal';
+export default {
+ methods: {
+ $_openModal,
+ $_closeModal,
+ },
+}
diff --git a/src/mixins/modal.js b/src/mixins/modal.js
new file mode 100644
index 0000000..67c75ec
--- /dev/null
+++ b/src/mixins/modal.js
@@ -0,0 +1,20 @@
+function $_openModal(name, data = {}) {
+ this.$store.dispatch('modal/__openModal', { ...data, ...{ name } });
+ // this.$store.dispatch('modal/$_closeModal');
+ // const modal = {
+ // ...mapActions("modal", [
+ // "__openModal",
+ // "$_closeModal"
+ // ]),
+ // $_openModal(name, data = {}) {
+ // this.__openModal({ ...data, ...{ name } })
+ // },
+ // };
+}
+function $_closeModal() {
+ this.$store.dispatch('modal/$_closeModal');
+}
+export {
+ $_openModal,
+ $_closeModal
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index dbdb8b6..b8609d7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -64,7 +64,8 @@ function beforeLoad() {
const auth = to.meta && to.meta.auth ? to.meta.auth : false;
const roles = to.meta && to.meta.roles ? to.meta.roles : false;
- const loggedIn = !!TokenStorage.getToken();
+ const loggedIn = TokenStorage.hasToken();
+ console.log(auth, loggedIn);
if (auth && !loggedIn) {
router.push({ name: 'login', query: { redirect: to.fullPath } });
}
diff --git a/src/router/path.js b/src/router/path.js
index 3cd0803..d4f4ad3 100644
--- a/src/router/path.js
+++ b/src/router/path.js
@@ -18,7 +18,7 @@ export default [
path: '/',
view: 'Dashboard',
name: 'dashboard',
- // meta: { auth: true }
+ meta: { auth: true }
},
{
path: '/users',
diff --git a/src/store/modules/bookmarks/actions.js b/src/store/modules/bookmarks/actions.js
index 662949b..2c722d4 100644
--- a/src/store/modules/bookmarks/actions.js
+++ b/src/store/modules/bookmarks/actions.js
@@ -22,6 +22,7 @@ export default {
let repository = new BookmarkRepository();
await repository.deleteBookmark(workoutId);
commit('DELETE_BOOKMARKS_WORKOUT', workoutId);
+
},
async deleteBookmarksProgram({ commit }, courseId) {
let repository = new BookmarkRepository();
diff --git a/src/store/modules/bookmarks/mutations.js b/src/store/modules/bookmarks/mutations.js
index 1bc047e..1ffc27f 100644
--- a/src/store/modules/bookmarks/mutations.js
+++ b/src/store/modules/bookmarks/mutations.js
@@ -16,10 +16,14 @@ export default {
},
DELETE_BOOKMARKS_WORKOUT(state, payload) {
const index = state.workouts.findIndex((x) => x.id === payload);
- Vue.delete(state.workouts, index)
+ Vue.delete(state.workouts, index);
+ Vue.set(state.workoutsPagination, 'itemsLength', state.workoutsPagination.itemsLength - 1);
+ Vue.set(state.workoutsPagination, 'pageStop', state.workoutsPagination.pageStop - 1);
},
DELETE_BOOKMARKS_PROGRAM(state, payload) {
const index = state.programs.findIndex((x) => x.id === payload);
- Vue.delete(state.programs, index)
+ Vue.delete(state.programs, index);
+ Vue.set(state.programsPagination, 'itemsLength', state.programsPagination.itemsLength - 1);
+ Vue.set(state.programsPagination, 'pageStop', state.programsPagination.pageStop - 1);
},
};
\ No newline at end of file
diff --git a/src/store/modules/programs/mutations.js b/src/store/modules/programs/mutations.js
index 757f8c7..db3eedc 100644
--- a/src/store/modules/programs/mutations.js
+++ b/src/store/modules/programs/mutations.js
@@ -9,6 +9,7 @@ export default {
SET_PAGINATION(state, pagination) {
pagination = { ...state.pagination, ...pagination };
Vue.set(state, "pagination", pagination);
+ console.log('state.pagination', state.pagination);
},
SET_FILTER_PROGRAMS(state, payload) {
Vue.set(state, "filters", payload);
@@ -23,7 +24,9 @@ export default {
},
DELETE_PROGRAM(state, payload) {
const index = state.programs.findIndex((x) => x.id === payload);
- Vue.delete(state.programs, index)
+ Vue.delete(state.programs, index);
+ Vue.set(state.pagination, 'itemsLength', state.pagination.itemsLength - 1);
+ Vue.set(state.pagination, 'pageStop', state.pagination.pageStop - 1);
},
VERIFY_PROGRAM(state, payload) {
const index = state.programs.find(x => x.id === payload);
diff --git a/src/store/modules/users/mutations.js b/src/store/modules/users/mutations.js
index a4fd4ce..757e5f3 100644
--- a/src/store/modules/users/mutations.js
+++ b/src/store/modules/users/mutations.js
@@ -21,7 +21,8 @@ export default {
},
DELETE_USER(state, userId) {
const index = state.users.findIndex((x) => x.id === userId);
- // state.users.splice(index, 1);
- Vue.delete(state.users, index)
+ Vue.delete(state.users, index);
+ Vue.set(state.pagination, 'itemsLength', state.pagination.itemsLength - 1);
+ Vue.set(state.pagination, 'pageStop', state.pagination.pageStop - 1);
},
};
diff --git a/src/store/modules/workouts/mutations.js b/src/store/modules/workouts/mutations.js
index cb283b7..f0dc5c2 100644
--- a/src/store/modules/workouts/mutations.js
+++ b/src/store/modules/workouts/mutations.js
@@ -23,6 +23,8 @@ export default {
},
DELETE_WORKOUT(state, workoutId) {
const index = state.workouts.findIndex((x) => x.id === workoutId);
- Vue.delete(state.workouts, index)
+ Vue.delete(state.workouts, index);
+ Vue.set(state.pagination, 'itemsLength', state.pagination.itemsLength - 1);
+ Vue.set(state.pagination, 'pageStop', state.pagination.pageStop - 1);
},
};