From f92632112a5fe37cdadc0952bc997c278f8083ef Mon Sep 17 00:00:00 2001 From: behmaram Date: Sat, 6 Feb 2021 12:07:59 +0330 Subject: [PATCH 1/9] fix: vuex --- resources/js/Default/abstraction/repositories/repository.text | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/Default/abstraction/repositories/repository.text b/resources/js/Default/abstraction/repositories/repository.text index 8b7407c..a60460a 100644 --- a/resources/js/Default/abstraction/repositories/repository.text +++ b/resources/js/Default/abstraction/repositories/repository.text @@ -1,4 +1,4 @@ -import {setQuery, setData, getJson, getArray} from "@|-BaseModule-|/abstraction/repositories/|-module-|Recource"; +import {setQuery, setData, getJson, getArray} from "@|-BaseModule-|/abstraction/resources/|-module-|/|-module-|Resource"; import axios from "axios"; import url from "@|-BaseModule-|/router/urls"; From f930e4514f9ee802fca741fee09306fe5c1d2d39 Mon Sep 17 00:00:00 2001 From: behmaram Date: Sat, 6 Feb 2021 16:41:23 +0330 Subject: [PATCH 2/9] fix: state --- resources/js/Default/store/store/state.text | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/Default/store/store/state.text b/resources/js/Default/store/store/state.text index 9b4b885..c92e5d7 100644 --- a/resources/js/Default/store/store/state.text +++ b/resources/js/Default/store/store/state.text @@ -1,4 +1,4 @@ -//import { |-module-|Paginate } from "@|-BaseModule-|/services/localStorage/|-module-|.storage"; +//import { |-Module-|Paginate } from "@|-BaseModule-|/services/localStorage/|-module-|.storage"; export default { module_info:{ @@ -7,7 +7,7 @@ export default { }, |-module-|: [], |-module-|_selected: [], - //pagination: newsPaginate.getWithDefault(), + //pagination: |-Module-|Paginate.getWithDefault(), loading: false, filters:{}, }; From 237fa80efa6bd96d7e4640f209ac963f7af37e58 Mon Sep 17 00:00:00 2001 From: behmaram Date: Sat, 6 Feb 2021 16:55:19 +0330 Subject: [PATCH 3/9] fix: state --- resources/js/Default/store/store/state.text | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/js/Default/store/store/state.text b/resources/js/Default/store/store/state.text index c92e5d7..d7fcf32 100644 --- a/resources/js/Default/store/store/state.text +++ b/resources/js/Default/store/store/state.text @@ -5,10 +5,12 @@ export default { name: '|-module-|', module: '|-baseModule-|', }, - |-module-|: [], + |-module-|_list: [], |-module-|_selected: [], + filtered_|-module-|: [], //pagination: |-Module-|Paginate.getWithDefault(), loading: false, filters:{}, + is_filtered: false, }; From fd781f49d04d901eeab245f6a61db35739fcc232 Mon Sep 17 00:00:00 2001 From: behmaram Date: Sat, 6 Feb 2021 16:55:55 +0330 Subject: [PATCH 4/9] feat: getter --- resources/js/Default/store/store/getters.text | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/js/Default/store/store/getters.text b/resources/js/Default/store/store/getters.text index cb2c597..59eafa6 100644 --- a/resources/js/Default/store/store/getters.text +++ b/resources/js/Default/store/store/getters.text @@ -1,7 +1,10 @@ export default { - get|-Module-|: state => state.|-module-|, + get|-Module-|s: state => state.|-module-|, + get|-Module-|: state => product => state.product_list.find(item => item.id == |-module-|), get|-Module-|Loading: state => state.loading, get|-Module-|Pagination: state => state.pagination, + getRowsPerPageItems: state => state.rowsPerPageItems, get|-Module-|Selected: state => state.selected, + isFiltered|-Module-|: state => state.is_filtered, }; From 2f7f18c43a3347b3ce55bdf02fd312e06f7a927c Mon Sep 17 00:00:00 2001 From: behmaram Date: Sat, 6 Feb 2021 19:26:10 +0330 Subject: [PATCH 5/9] fix: vuex --- resources/js/Default/store/store/getters.text | 2 +- resources/js/Default/store/store/mutations.text | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/Default/store/store/getters.text b/resources/js/Default/store/store/getters.text index 59eafa6..3c1f432 100644 --- a/resources/js/Default/store/store/getters.text +++ b/resources/js/Default/store/store/getters.text @@ -1,5 +1,5 @@ export default { - get|-Module-|s: state => state.|-module-|, + get|-Module-|s: state => state.|-module-|_list, get|-Module-|: state => product => state.product_list.find(item => item.id == |-module-|), get|-Module-|Loading: state => state.loading, get|-Module-|Pagination: state => state.pagination, diff --git a/resources/js/Default/store/store/mutations.text b/resources/js/Default/store/store/mutations.text index 9bdb8c0..5f286c6 100644 --- a/resources/js/Default/store/store/mutations.text +++ b/resources/js/Default/store/store/mutations.text @@ -43,6 +43,6 @@ export default { }, SET_LOADING(state, value) { - state.loading = value; + Vue.set(state, 'loading', value); } }; From c7aad8eff9be34a9420973abac4829ad96f71a33 Mon Sep 17 00:00:00 2001 From: behmaram Date: Sat, 6 Feb 2021 19:28:11 +0330 Subject: [PATCH 6/9] remove storage from mutation --- resources/js/Default/store/store/mutations.text | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/js/Default/store/store/mutations.text b/resources/js/Default/store/store/mutations.text index 5f286c6..2857d3b 100644 --- a/resources/js/Default/store/store/mutations.text +++ b/resources/js/Default/store/store/mutations.text @@ -1,5 +1,4 @@ import Vue from 'vue'; -//import { |-module-|Paginate } from "@|-BaseModule-|/services/localStorage/|-module-|.storage" export default { SET_|-MODULE-|(state, |-module-|) { @@ -14,7 +13,6 @@ export default { SET_|-MODULE-|_PAGINATION(state, pagination) { Vue.set(state, "pagination", pagination); - //|-module-|Paginate.save(pagination); }, REMOVE_|-MODULE-|(state, id) { From ebf215e9658f2df6978d7cf5dade013b17514f64 Mon Sep 17 00:00:00 2001 From: behmaram Date: Mon, 8 Feb 2021 13:44:06 +0330 Subject: [PATCH 7/9] fix:Category store --- .../repositories/categoryRepository.text | 10 ++++----- .../js/Default/store/category/actions.text | 2 +- .../js/Default/store/category/getters.text | 6 ++--- .../js/Default/store/category/mutations.text | 22 +++++++++---------- .../js/Default/store/category/state.text | 6 ++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/resources/js/Default/abstraction/repositories/categoryRepository.text b/resources/js/Default/abstraction/repositories/categoryRepository.text index ebdee75..d4621f3 100644 --- a/resources/js/Default/abstraction/repositories/categoryRepository.text +++ b/resources/js/Default/abstraction/repositories/categoryRepository.text @@ -1,8 +1,8 @@ -import {setData, getJson, getArray} from '@|-BaseModule-|/abstraction/resources/productCategory/|-module-|CategoryResource' +import {setData, getJson, getArray} from '@|-BaseModule-|/abstraction/resources/|-module-|/|-module-|Resource' import axios from "axios"; -import url from "@|-Module-|/router/urls"; +import url from "@|-BaseModule-|/router/urls"; -export default class |-module-|CategoryRepository { +export default class |-module-|Repository { async index() { @@ -32,7 +32,7 @@ export default class |-module-|CategoryRepository { const params = setData(data, true); - let response = await axios.post(url('url', {|-module-|Category: data.id}), params); + let response = await axios.post(url('url', {|-module-|: data.id}), params); if (response && response.status === 200) { @@ -42,7 +42,7 @@ export default class |-module-|CategoryRepository { } async destroy(dataId) { - let response = await axios.delete(url('url', {|-module-|Category: dataId})); + let response = await axios.delete(url('url', {|-module-|: dataId})); if (response && response.status === 200) { diff --git a/resources/js/Default/store/category/actions.text b/resources/js/Default/store/category/actions.text index 61e7e96..9aec9ce 100644 --- a/resources/js/Default/store/category/actions.text +++ b/resources/js/Default/store/category/actions.text @@ -1,4 +1,4 @@ -import |-Module-|Repository from "@|-BaseModule-|/abstraction/repositories/|-module-|Repository"; +import |-Module-|Repository from "@|-BaseModule-|/abstraction/repositories/|-module-|/|-module-|Repository"; let repository = new |-Module-|Repository(); diff --git a/resources/js/Default/store/category/getters.text b/resources/js/Default/store/category/getters.text index d3d2339..606e5e5 100644 --- a/resources/js/Default/store/category/getters.text +++ b/resources/js/Default/store/category/getters.text @@ -1,11 +1,11 @@ export default { getList|-Module-|: state => { if (state.has_filter) { - return state.filtered_|-module-|; + return state.filtered_|-snake_module-|; } - return state.|-module-|; + return state.|-snake_module-|; }, - get|-Module-|: state => state.|-module-|, + get|-Module-|: state => state.|-snake_module-|, isFiltered|-Module-|: state =>state.is_filtered, getFilter|-Module-|: state =>state.filter, get|-Module-|Loading: state => state.loading, diff --git a/resources/js/Default/store/category/mutations.text b/resources/js/Default/store/category/mutations.text index 4ebe587..5e8f6ba 100644 --- a/resources/js/Default/store/category/mutations.text +++ b/resources/js/Default/store/category/mutations.text @@ -3,21 +3,21 @@ import {addIndexTreeToList} from '@Global/utils/common/ProcessTreeArray'; export default { SET_|-MODULE-|(state, |-module-|) { - Vue.set(state, '|-module-|', addIndexTreeToList(|-module-|)); + Vue.set(state, '|-snake_module-|', addIndexTreeToList(|-module-|)); }, UPDATE_|-MODULE-|(state, |-module-|) { - const index = state.|-module-|.findIndex(x => x.id === |-module-|.id); - Vue.set(state.|-module-|, index, |-module-|); - Vue.set(state, '|-module-|', addIndexTreeToList(state.|-module-|)); + const index = state.|-snake_module-|.findIndex(x => x.id === |-module-|.id); + Vue.set(state.|-snake_module-|, index, |-module-|); + Vue.set(state, '|-snake_module-|', addIndexTreeToList(state.|-snake_module-|)); }, REMOVE_|-MODULE-|(state, id) { - const Index = state.|-module-|.findIndex(x => x.id === id); - const selectedIndex = state.|-module-|_selected.findIndex(x => x.id === id); - Vue.delete(state.|-module-|, Index); - Vue.delete(state.|-module-|_selected, selectedIndex); - Vue.set(state, '|-module-|', addIndexTreeToList(state.|-module-|)); + const Index = state.|-snake_module-|.findIndex(x => x.id === id); + const selectedIndex = state.|-snake_module-|_selected.findIndex(x => x.id === id); + Vue.delete(state.|-snake_module-|, Index); + Vue.delete(state.|-snake_module-|_selected, selectedIndex); + Vue.set(state, '|-snake_module-|', addIndexTreeToList(state.|-snake_module-|)); }, ADD_|-MODULE-|(state, |-module-|) { @@ -31,12 +31,12 @@ export default { }, SET_FILTER_|-MODULE-|(state, value) { - Vue.set(state, 'filtered_|-module-|', value); + Vue.set(state, 'filtered_|-snake_module-|', value); Vue.set(state, 'has_filter', true); }, RESET_FILTERED_|-MODULE-|(state, value) { - Vue.set(state, 'filtered_|-module-|', [value]); + Vue.set(state, 'filtered_|-snake_module-|', [value]); Vue.set(state, 'is_filter', false); }, SET_LOADING(state, value) { diff --git a/resources/js/Default/store/category/state.text b/resources/js/Default/store/category/state.text index 90c9f79..3e4f08a 100644 --- a/resources/js/Default/store/category/state.text +++ b/resources/js/Default/store/category/state.text @@ -5,9 +5,9 @@ export default { }, filter: [], is_filtered: false, - |-module-|: [], - filtered_|-module-|: [], - |-module-|_selected: [], + |-snake_module-|: [], + filtered_|-snake_module-|: [], + |-snake_module-|_selected: [], loading: false, default_category: { id: null, From 7ddcfa369ddac0aab78a94d031deabe8c5870a93 Mon Sep 17 00:00:00 2001 From: behmaram Date: Mon, 8 Feb 2021 14:06:48 +0330 Subject: [PATCH 8/9] fix: snake name --- app/Console/Commands/Vuex.php | 5 +++-- resources/js/Default/store/category/mutations.text | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/Vuex.php b/app/Console/Commands/Vuex.php index 62b03ad..4b90bb3 100644 --- a/app/Console/Commands/Vuex.php +++ b/app/Console/Commands/Vuex.php @@ -102,9 +102,10 @@ class Vuex } private static function replacer($data) { - $data = str_replace('|-module-|', Str::snake(static::$storeModule), $data); + $data = str_replace('|-module-|', Str::camel(static::$storeModule), $data); + $data = str_replace('|-snake_module-|', Str::snake(static::$storeModule), $data); $data = str_replace('|-Module-|', Str::title(static::$storeModule), $data); - $data = str_replace('|-MODULE-|', Str::upper(static::$storeModule), $data); + $data = str_replace('|-MODULE-|', Str::upper(Str::snake(static::$storeModule)), $data); $data = str_replace('|-BaseModule-|', Str::title(static::$module), $data); return str_replace('|-baseModule-|', Str::camel(static::$module), $data); } diff --git a/resources/js/Default/store/category/mutations.text b/resources/js/Default/store/category/mutations.text index 5e8f6ba..2490363 100644 --- a/resources/js/Default/store/category/mutations.text +++ b/resources/js/Default/store/category/mutations.text @@ -21,8 +21,8 @@ export default { }, ADD_|-MODULE-|(state, |-module-|) { - Vue.set(state.|-module-|, state.|-module-|.length, |-module-|); - Vue.set(state, '|-module-|', addIndexTreeToList(state.|-module-|)) + Vue.set(state.|-snake_module-|, state.|-snake_module-|.length, |-module-|); + Vue.set(state, '|-snake_module-|', addIndexTreeToList(state.|-snake_module-|)) }, ADD_|-MODULE-|_SELECTED(state, |-module-|Id) { From 6270ed6a8ea93872722b6a4c2b8982ccf31e190d Mon Sep 17 00:00:00 2001 From: behmaram Date: Mon, 8 Feb 2021 14:15:20 +0330 Subject: [PATCH 9/9] remove selected category item --- resources/js/Default/store/category/mutations.text | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/js/Default/store/category/mutations.text b/resources/js/Default/store/category/mutations.text index 2490363..c0aa86d 100644 --- a/resources/js/Default/store/category/mutations.text +++ b/resources/js/Default/store/category/mutations.text @@ -14,9 +14,7 @@ export default { REMOVE_|-MODULE-|(state, id) { const Index = state.|-snake_module-|.findIndex(x => x.id === id); - const selectedIndex = state.|-snake_module-|_selected.findIndex(x => x.id === id); Vue.delete(state.|-snake_module-|, Index); - Vue.delete(state.|-snake_module-|_selected, selectedIndex); Vue.set(state, '|-snake_module-|', addIndexTreeToList(state.|-snake_module-|)); },