From 1b01c9dbf6344d5e7ff95be75d47152a9027638b Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 19 Sep 2019 20:32:55 +0430 Subject: [PATCH 1/7] debug --- public/mix-manifest.json | 10 +++++----- .../js/Global/components/Drawer/SideBar.vue | 5 +++-- resources/js/Global/mixins/commingSoon.js | 3 --- .../js/Global/services/storage.services.js | 20 ++++++++++++++++++- resources/js/Global/utils/common/routes.js | 5 ++++- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 344eca2..20fb7bc 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=68a619e5234e5c93b9e4", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=6b604267e1685646785e", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=d3b08bf505e8aa0af5dc", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=39ff97f18a2b3789e948", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=b07d43f829d994cb6f43" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=4aee497136db9b69fbc1", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=45a3347170c011b90211", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=19e864d8bee4648e7ab2", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=4685b4df85eeaaaa46fc", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=88a391bc3d9bd72cd1b2" } diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue index d301d68..0492289 100644 --- a/resources/js/Global/components/Drawer/SideBar.vue +++ b/resources/js/Global/components/Drawer/SideBar.vue @@ -2,7 +2,7 @@ fas fa-bars - + fas fa-home
@@ -51,6 +51,7 @@ \ No newline at end of file From 4fee70e0f890b1b3720aac8dd529baa723dec571 Mon Sep 17 00:00:00 2001 From: Saeid Date: Sat, 21 Sep 2019 20:55:55 +0430 Subject: [PATCH 3/7] office --- public/mix-manifest.json | 10 +++++----- resources/js/Global/components/Drawer/SideBar.vue | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 20fb7bc..a788539 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=4aee497136db9b69fbc1", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=45a3347170c011b90211", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=19e864d8bee4648e7ab2", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=4685b4df85eeaaaa46fc", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=88a391bc3d9bd72cd1b2" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=332517bc015408503b69", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=8ec37859c1ba595d0aae", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=6558558fe022ff1d5c88", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=c29d16abdef963c3a3a3", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=f6ab2099c3dbf024d0bf" } diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue index 0492289..c87ed3b 100644 --- a/resources/js/Global/components/Drawer/SideBar.vue +++ b/resources/js/Global/components/Drawer/SideBar.vue @@ -2,7 +2,7 @@ fas fa-bars - + fas fa-home
@@ -69,11 +69,13 @@ export default { titleFa: " کاربران مجموعه ی من ", icon: "question_answer", permission: "", - href: Routes.user() + href: Routes.user(), + } ], user: { name: "" }, timeNow: "", + mainHref: Routes.main(), }; }, mounted(){ From 891bc10aeb31c97290ac3ca24a38bf20fe0efce7 Mon Sep 17 00:00:00 2001 From: Farid Saravi Date: Mon, 23 Sep 2019 18:38:07 +0330 Subject: [PATCH 4/7] remove deprecated facade --- config/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/app.php b/config/app.php index 4b6def4..37abb4f 100644 --- a/config/app.php +++ b/config/app.php @@ -224,7 +224,6 @@ return [ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, - 'AuthFinder' => App\CorePackages\Authenticate\AuthFinderFacade::class, ], From f76b0d0e8f734a4466a3c96d44d9becf51a409a4 Mon Sep 17 00:00:00 2001 From: Saeid Date: Tue, 24 Sep 2019 18:11:52 +0330 Subject: [PATCH 5/7] add Modules --- public/mix-manifest.json | 10 +- resources/js/Home/store/getters.js | 2 - resources/js/Home/store/state.js | 2 - resources/js/Home/views/AddModule.vue | 426 ++++++++++++++------------ resources/js/Home/views/Home.vue | 4 +- webpack.mix.js | 1 + 6 files changed, 243 insertions(+), 202 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index a788539..c72b5d4 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=332517bc015408503b69", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=8ec37859c1ba595d0aae", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=6558558fe022ff1d5c88", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=c29d16abdef963c3a3a3", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=f6ab2099c3dbf024d0bf" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=701c2edb7565e75246bc", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=696f8230515488f2770f", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=df3222da19579f98c4af", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=704caf2cf99d4b813820", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=d016a4dfdc71a81ff1f1" } diff --git a/resources/js/Home/store/getters.js b/resources/js/Home/store/getters.js index fab8971..02a61be 100644 --- a/resources/js/Home/store/getters.js +++ b/resources/js/Home/store/getters.js @@ -1,4 +1,2 @@ export default { - getClientTypes: state => state.clientTypes, - getPhoneTypes: state => state.phoneTypes }; diff --git a/resources/js/Home/store/state.js b/resources/js/Home/store/state.js index fd1f162..ce7bc92 100644 --- a/resources/js/Home/store/state.js +++ b/resources/js/Home/store/state.js @@ -1,4 +1,2 @@ export default { - PaymentConfirmation: false, - TrialConfirmation: false, }; \ No newline at end of file diff --git a/resources/js/Home/views/AddModule.vue b/resources/js/Home/views/AddModule.vue index 14e62f9..4fb149d 100644 --- a/resources/js/Home/views/AddModule.vue +++ b/resources/js/Home/views/AddModule.vue @@ -1,215 +1,259 @@ diff --git a/resources/js/Home/views/Home.vue b/resources/js/Home/views/Home.vue index db0604d..63349c2 100644 --- a/resources/js/Home/views/Home.vue +++ b/resources/js/Home/views/Home.vue @@ -18,11 +18,11 @@ > - + diff --git a/webpack.mix.js b/webpack.mix.js index 157f640..b276fd4 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -16,6 +16,7 @@ mix.webpackConfig({ alias: { '@JS': path.resolve(__dirname, 'resources/js'), '@Global': path.resolve(__dirname, 'resources/js/Global'), + '@Home': path.resolve(__dirname, 'resources/js/Home'), }, }, output: { From 4dcf116f6402a3fd1345348abfc4822b844b8dcb Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Wed, 25 Sep 2019 01:12:05 +0330 Subject: [PATCH 6/7] add modules Finish --- public/mix-manifest.json | 10 +++++----- resources/js/Home/views/AddModule.vue | 16 ++++++++-------- webpack.mix.js | 1 - 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index c72b5d4..2e30511 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=701c2edb7565e75246bc", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=696f8230515488f2770f", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=df3222da19579f98c4af", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=704caf2cf99d4b813820", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=d016a4dfdc71a81ff1f1" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=7fcd283086b499f2c4eb", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=4271ddf84160f6db9559", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=42a67229cb063f0afead", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=31627036c5ddd8a0c6ba", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=140e6ef646d3001986ba" } diff --git a/resources/js/Home/views/AddModule.vue b/resources/js/Home/views/AddModule.vue index 4fb149d..9967bbf 100644 --- a/resources/js/Home/views/AddModule.vue +++ b/resources/js/Home/views/AddModule.vue @@ -10,7 +10,7 @@ titleFa=" افزودن بخش جدید " titleEn=" Add a New Section " > -
+
{{index+1}}
@@ -19,9 +19,9 @@
{{ module.title_en }}
-
{{ module.old_Price }}
+
{{ Intl.NumberFormat().format(module.old_price) }}
- {{ module.price }} + {{ Intl.NumberFormat().format(module.price) }} IRT
@@ -41,7 +41,7 @@