From dd8ee0d6d5c8e13915e39f3908f63d20d0d11b2a Mon Sep 17 00:00:00 2001 From: Saeid Date: Wed, 11 Nov 2020 14:05:11 +0330 Subject: [PATCH 1/8] remove .idea --- .idea/.gitignore | 2 - .idea/composerJson.xml | 10 --- .idea/deployment.xml | 14 ---- .idea/misc.xml | 6 -- .idea/modules.xml | 8 -- .idea/php.xml | 153 -------------------------------------- .idea/symfony2.xml | 8 -- .idea/vcs.xml | 6 -- .idea/webServers.xml | 15 ---- .idea/willamall-admin.iml | 146 ------------------------------------ 10 files changed, 368 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/composerJson.xml delete mode 100644 .idea/deployment.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/symfony2.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/webServers.xml delete mode 100644 .idea/willamall-admin.iml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index e7e9d11..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml diff --git a/.idea/composerJson.xml b/.idea/composerJson.xml deleted file mode 100644 index 1b07430..0000000 --- a/.idea/composerJson.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml deleted file mode 100644 index e69e45a..0000000 --- a/.idea/deployment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 28a804d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 503f6ce..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index e3a3a7f..0000000 --- a/.idea/php.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/symfony2.xml b/.idea/symfony2.xml deleted file mode 100644 index e3f946c..0000000 --- a/.idea/symfony2.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/webServers.xml b/.idea/webServers.xml deleted file mode 100644 index 3ceff87..0000000 --- a/.idea/webServers.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/willamall-admin.iml b/.idea/willamall-admin.iml deleted file mode 100644 index fb21e09..0000000 --- a/.idea/willamall-admin.iml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 8fb4bb86d220a5c6e56f3b8447222dea2819f067 Mon Sep 17 00:00:00 2001 From: Saeid Date: Mon, 16 Nov 2020 18:46:29 +0330 Subject: [PATCH 2/8] feat: next line in block info --- .gitignore | 2 +- package-lock.json | 6 +++--- package.json | 2 +- resources/js/Global/components/Blocks/Info.vue | 4 ++-- .../data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 | 1 - .../data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c | 1 - webpack.mix.js | 1 + 7 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 delete mode 100644 storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c diff --git a/.gitignore b/.gitignore index 34cb938..aae9e1d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ app/storage/ storage/ - +storage/framework # Laravel 5 & Lumen specific public/storage public/hot diff --git a/package-lock.json b/package-lock.json index bcba7c6..4faa46b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12248,9 +12248,9 @@ } }, "vuetify": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.1.15.tgz", - "integrity": "sha512-M35NJvlzkbCpFfsK08xraNvCpiNCIbYUXI/hkzjWHQV1MFIZnjrDTVtYoiudCyJ52zlrhWezAr4pzFOCLAr6RA==" + "version": "2.3.17", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.17.tgz", + "integrity": "sha512-XqVDsCKHcWmJDJaSXEYg8Qt1jFdAhgm/L5ppAo19ATyld181lu0BC3V3vjakpU2uScHVwjxZw8Gre0lz+2cGvA==" }, "vuex": { "version": "3.1.2", diff --git a/package.json b/package.json index 22f363a..ec6efe7 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "vue-the-mask": "^0.11.1", "vue-tinymce-editor": "^1.6.2", "vue2-dropzone": "^3.6.0", - "vuetify": "^2.0.19" + "vuetify": "^2.3.17" }, "devDependencies": { "@babel/plugin-syntax-dynamic-import": "^7.2.0", diff --git a/resources/js/Global/components/Blocks/Info.vue b/resources/js/Global/components/Blocks/Info.vue index a0ff776..189a02e 100644 --- a/resources/js/Global/components/Blocks/Info.vue +++ b/resources/js/Global/components/Blocks/Info.vue @@ -1,8 +1,8 @@ diff --git a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 b/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 deleted file mode 100644 index 616580a..0000000 --- a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 +++ /dev/null @@ -1 +0,0 @@ -1601220079i:1601220079; \ No newline at end of file diff --git a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c b/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c deleted file mode 100644 index ee38aea..0000000 --- a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c +++ /dev/null @@ -1 +0,0 @@ -1601220079i:4; \ No newline at end of file diff --git a/webpack.mix.js b/webpack.mix.js index 38aa6e7..b8f66e7 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -37,6 +37,7 @@ require('./modules/wm-product/webpack.mix'); require('./modules/wm-service/webpack.mix'); require('./modules/wm-store/webpack.mix'); require('./modules/wm-warehouse/webpack.mix'); +// require('./modules/wm-web-builder/webpack.mix'); // require('./modules/wm-reservation/webpack.mix'); mix.version(); From 5702e83b2fd2f6c63a0f2cf2b3faf88661f5570e Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 19 Nov 2020 16:03:22 +0330 Subject: [PATCH 3/8] fix: fix Product --- resources/js/Global/components/Drawer/SideBar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue index 6c5c24f..1daede8 100644 --- a/resources/js/Global/components/Drawer/SideBar.vue +++ b/resources/js/Global/components/Drawer/SideBar.vue @@ -81,6 +81,7 @@ export default { titleFa: " مدیریت محصولات ", icon: "dropbox", permissionClass: "Product::index", + module: "core", href: '/product/home', tileClass: 'cyan-theme', }, From 692d6f1c5f1951b010f13ec0dcd93e1f53f4a407 Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 19 Nov 2020 16:19:07 +0330 Subject: [PATCH 4/8] fix: font family in sidebar --- resources/js/Global/components/Drawer/SideBar.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue index 1daede8..76e4b4c 100644 --- a/resources/js/Global/components/Drawer/SideBar.vue +++ b/resources/js/Global/components/Drawer/SideBar.vue @@ -217,4 +217,7 @@ export default { .drawer.open { left: 0px; } +.v-application .caption { + font-family: iranyekan-regular!important; +} From cfb12f914ae4acd67baa07392809c2cb5e75cc7b Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 26 Nov 2020 16:44:05 +0330 Subject: [PATCH 5/8] refactor: refactor modal structure --- .../Global/components/Modals/BasicModal.vue | 26 ++++++++--------- .../js/Global/components/Modals/Dialog.vue | 18 +++--------- .../js/Global/components/Modals/Helper.vue | 29 +++++-------------- .../js/Global/plugins/globalComponent.js | 3 ++ resources/js/Home/App.vue | 4 +-- .../Modules/PaymentConfirmation.vue | 13 +-------- .../components/Modules/TrialConfirmation.vue | 16 ++-------- 7 files changed, 34 insertions(+), 75 deletions(-) diff --git a/resources/js/Global/components/Modals/BasicModal.vue b/resources/js/Global/components/Modals/BasicModal.vue index 8066561..b4f41c6 100644 --- a/resources/js/Global/components/Modals/BasicModal.vue +++ b/resources/js/Global/components/Modals/BasicModal.vue @@ -1,30 +1,24 @@