From 25edb1386a2c91c954691dc659fc3e1faa8e972c Mon Sep 17 00:00:00 2001 From: farid saravi Date: Sun, 18 Oct 2020 20:00:18 +0330 Subject: [PATCH 01/17] feat: add find language --- app/Http/Kernel.php | 1 + app/Http/Middleware/FindLanguage.php | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 app/Http/Middleware/FindLanguage.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index a3d8c48..7ace88e 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -19,6 +19,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, \App\Http\Middleware\TrustProxies::class, + \App\Http\Middleware\FindLanguage::class, ]; /** diff --git a/app/Http/Middleware/FindLanguage.php b/app/Http/Middleware/FindLanguage.php new file mode 100644 index 0000000..ffba8bd --- /dev/null +++ b/app/Http/Middleware/FindLanguage.php @@ -0,0 +1,24 @@ +header('accept-language')) { + app()->setLocale($language); + } + return $next($request); + } +} From 4021f51f2acb8e81bbfdf37dfce5b4fc1a00cae7 Mon Sep 17 00:00:00 2001 From: Saeid Date: Sun, 18 Oct 2020 20:23:05 +0330 Subject: [PATCH 02/17] feat: feat cost-daily in chart --- resources/js/Global/plugins/chart/apexhart/type/bar.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/js/Global/plugins/chart/apexhart/type/bar.js b/resources/js/Global/plugins/chart/apexhart/type/bar.js index 1e8be62..97d66b8 100644 --- a/resources/js/Global/plugins/chart/apexhart/type/bar.js +++ b/resources/js/Global/plugins/chart/apexhart/type/bar.js @@ -41,10 +41,13 @@ export default class extends chart { setOptions() { switch (this.type) { case 'weekly': + case 'cost-weekly': return this.setWeekly(); case 'monthly': + case 'cost-monthly': return this.setMonthly(); case 'daily': + case 'cost-daily': return this.setDaily(); } } From 4e32ee2b8d31969b6bbba8d2fd2732f6e02a8ab4 Mon Sep 17 00:00:00 2001 From: Saeid Date: Sun, 18 Oct 2020 21:36:52 +0330 Subject: [PATCH 03/17] fix: fix date --- resources/js/Global/plugins/chart/apexhart/type/bar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/Global/plugins/chart/apexhart/type/bar.js b/resources/js/Global/plugins/chart/apexhart/type/bar.js index 97d66b8..aba6749 100644 --- a/resources/js/Global/plugins/chart/apexhart/type/bar.js +++ b/resources/js/Global/plugins/chart/apexhart/type/bar.js @@ -64,7 +64,7 @@ export default class extends chart { setDaily() { this.options.series[0].data = this.responseChart.map(x => x.count); - this.options.xaxis.categories = this.responseChart.map(x => x.date); + this.options.xaxis.categories = this.responseChart.map(x => x.persian_date); } From a9d687360aeace9d2fb75e29953f638692f2eef7 Mon Sep 17 00:00:00 2001 From: Saeid Date: Mon, 19 Oct 2020 17:57:06 +0330 Subject: [PATCH 04/17] feat: add accept-language in headers axios --- resources/js/Global/services/api.services.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/js/Global/services/api.services.js b/resources/js/Global/services/api.services.js index 2375528..b328303 100644 --- a/resources/js/Global/services/api.services.js +++ b/resources/js/Global/services/api.services.js @@ -9,7 +9,7 @@ const ApiService = { } else if (process.env.MIX_PUSHER_APP_API) { axios.defaults.baseURL = process.env.MIX_PUSHER_APP_API; } - + this.setHeader(); axios.interceptors.request.use((config) => { config.headers = this.setModuleHeader(config.headers); return config; @@ -17,10 +17,9 @@ const ApiService = { }, setHeader() { - axios.defaults.headers.common["Accept"] = `application/json`; - axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; + axios.defaults.headers.common["Accept-Language"] = `fa`; }, - + setModuleHeader(headers = axios.defaults.headers.common) { headers['Module'] = commonState.current_module; return headers; From 5ad2e18b481f707d379e4e91108e0d780e024e83 Mon Sep 17 00:00:00 2001 From: Saeid Date: Mon, 19 Oct 2020 21:00:14 +0330 Subject: [PATCH 05/17] feat: add color to chart --- .../Global/plugins/chart/apexhart/type/pie.js | 12 ++++---- resources/js/Global/utils/colors/index.js | 30 +++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/resources/js/Global/plugins/chart/apexhart/type/pie.js b/resources/js/Global/plugins/chart/apexhart/type/pie.js index 5987ea1..e796e7b 100644 --- a/resources/js/Global/plugins/chart/apexhart/type/pie.js +++ b/resources/js/Global/plugins/chart/apexhart/type/pie.js @@ -1,5 +1,5 @@ import chart from "../chart"; - +import color from "@Global/utils/colors/index" export default class extends chart { constructor(options) { @@ -37,9 +37,11 @@ export default class extends chart { setOptions() { this.options.series = this.responseChart.map(x => x.count); this.options.labels = this.responseChart.map(x => x.category); - this.options.fill.labels = this.responseChart.map(x => x.category); - // this.options.labels = this.responseChart.map(x => x.category.name); - // this.options.fill.label = this.responseChart.map(x => x.category.name); - // this.options['colors'] = this.responseChart.map( x => x.category.color ? x.category.color : "#fff"); + this.options.labels = this.responseChart.map(x => x.category.name); + this.options.fill.label = this.responseChart.map(x => x.category.name); + this.options['colors'] = this.responseChart.map( x =>{ + let colorText = x.category.color ? x.category.color : color[parseInt((Math.random() * 100) % 14)].color; + return color.find(x => x.color == colorText).hex; + } ); } } diff --git a/resources/js/Global/utils/colors/index.js b/resources/js/Global/utils/colors/index.js index 46b3087..5bb8f81 100644 --- a/resources/js/Global/utils/colors/index.js +++ b/resources/js/Global/utils/colors/index.js @@ -1,17 +1,17 @@ export default [ - { name: 'قرمز', color:'red'}, - { name: 'نارنجی', color:'orange'}, - { name: 'زرد', color:'yellow'}, - { name: 'صورتی', color:'pink'}, - { name: 'طلایی', color:'gold'}, - { name: 'بنفش', color:'purple'}, - { name: 'آبی', color:'blue'}, - { name: 'آبی تیره', color:'dark-blue'}, - { name: 'سبز', color:'green'}, - { name: 'سبز پاستیلی', color:'teal'}, - { name: 'فیروزه ای', color:'cyan'}, - { name: 'قهوه ای', color:'brown'}, - { name: 'خاکستری', color:'gray'}, - { name: 'مشکی', color:'black'}, - { name: 'سفید', color:'white'}, + { name: 'قرمز', color:'red', hex: '#ee3552'}, + { name: 'نارنجی', color:'orange', hex: '#ff6b57'}, + { name: 'زرد', color:'yellow', hex: '#ffc107'}, + { name: 'صورتی', color:'pink', hex: '#e94c8f'}, + { name: 'طلایی', color:'gold', hex: '#ddcfbb'}, + { name: 'بنفش', color:'purple', hex: '#ac3773'}, + { name: 'آبی', color:'blue', hex: '#1875BB'}, + { name: 'آبی تیره', color:'dark-blue', hex: '#04314B'}, + { name: 'سبز', color:'green', hex: '#0d7e00'}, + { name: 'سبز پاستیلی', color:'teal', hex: '#00897b'}, + { name: 'فیروزه ای', color:'cyan', hex: '#32c5d2'}, + { name: 'قهوه ای', color:'brown', hex: '#915117'}, + { name: 'خاکستری', color:'gray', hex: '#828282'}, + { name: 'مشکی', color:'black', hex: '#000'}, + { name: 'سفید', color:'white', hex: '#fff'}, ]; From dd8ee0d6d5c8e13915e39f3908f63d20d0d11b2a Mon Sep 17 00:00:00 2001 From: Saeid Date: Wed, 11 Nov 2020 14:05:11 +0330 Subject: [PATCH 06/17] 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 07/17] 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 80a6be4d47f2c2c0decf5028c46910296810a395 Mon Sep 17 00:00:00 2001 From: aliqasemi Date: Tue, 17 Nov 2020 20:02:44 +0330 Subject: [PATCH 08/17] a --- tests/Unit/ArticleTest.php | 42 ++++++++++++++++++++++++++++++++++++++ tests/Unit/ExampleTest.php | 19 ----------------- 2 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 tests/Unit/ArticleTest.php delete mode 100644 tests/Unit/ExampleTest.php diff --git a/tests/Unit/ArticleTest.php b/tests/Unit/ArticleTest.php new file mode 100644 index 0000000..bd418a5 --- /dev/null +++ b/tests/Unit/ArticleTest.php @@ -0,0 +1,42 @@ + "dfjfjdfmnjdf" , + 'abstract' => "jhljl" , + 'content' => "jhlgjleswgqaeaeaedhnjredhnjreswhnjreswnjrfnjresfnjres" , + 'verified' => false , + 'user_id' => 1 , + 'business_id' => 521 , + 'scheme' => "article" , + 'article_categories' => [] , + ] ; + + $this->get('http://meshkee.local:8000/api/v1/articles' , + ['Authorization' => 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6ImZiMDkwMzk1ODhjMzI0MzNkM2UzMmE3MTc4MzQwMmExNjZmNDI4YzcxZDQ0OTc3ZDc5OWI4YTU0MDJhMzY4MTBlNzdmZTJjMDYxOTYzYjRjIn0.eyJhdWQiOiIxIiwianRpIjoiZmIwOTAzOTU4OGMzMjQzM2QzZTMyYTcxNzgzNDAyYTE2NmY0MjhjNzFkNDQ5NzdkNzk5YjhhNTQwMmEzNjgxMGU3N2ZlMmMwNjE5NjNiNGMiLCJpYXQiOjE2MDI1OTgzNjMsIm5iZiI6MTYwMjU5ODM2MywiZXhwIjoxNjM0MTM0MzYzLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.J7u1RigLGddGLS2-0-WUx6Qfee4qm8gzu5U30CJ5kBJPzFKzCw9uht5OZAvg3I2OCM0b2pFo53cSCVybTA3NMwK_hnMunqo9CMBZB_P-GP3mwb_GZKpS7Urw-hXv8DOcT_JVAYps71MMGYJFv_LtSgUV25hPZrTCu28o09O2ydHZStKWTc4sysgzsBcLIi0B3DWgAdaeV7sen7oOeH39dnS-o1IrdaixfuJ3XpmYeBTqlKIv32uDf2RRvpPIbBn0Zha2T7EpVzLN8xq17dBEhjA25JWt6ssG4F8ZSzTBHe3MNBUU_H5n8fckOJfNCV4BVTuERTUdaz7eQIzsUUpbdff5ShV2Twx_lQcI0kufKYCX9_oO_Q24DxKJ4SPub3hil9onFh1zBOQHCe4kfkN6g_Rxh7CsDd7iTNuwgnFRBjziR3sX4YPD90zH6CXuZI2wy-dxg-VaKR-3AbPIVqKb-TCQQ4d6m26u_UK894R3NmkwQwPymG9WAc-0QaUUjzizgqEs-qW3u_k3gUFfNgGsbouBEaXCh1Qvf_myVixmwuVQOF6s8Czb8VxYkf51sANaIDTqmElH7cUrH5XIqtUH1TG3RRyHB_VwhwME08BozEMcSmXAP9W6FDx7TX3KAS75OEk-mJaIXgfags309CC9Dq11hXX2uBHX5SCCVrfq82U', + 'module' => 'blog' , + 'Accept' => 'application/json' , + ] + )->assertStatus(200); + + + + + + } +} diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php deleted file mode 100644 index e9fe19c..0000000 --- a/tests/Unit/ExampleTest.php +++ /dev/null @@ -1,19 +0,0 @@ -assertTrue(true); - } -} From 5702e83b2fd2f6c63a0f2cf2b3faf88661f5570e Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 19 Nov 2020 16:03:22 +0330 Subject: [PATCH 09/17] 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 10/17] 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 d90e60887474cf9a448e28d0bd9543e8fbf451cf Mon Sep 17 00:00:00 2001 From: aliqasemi Date: Sat, 21 Nov 2020 20:35:00 +0330 Subject: [PATCH 11/17] updte categories to nested set --- .../2020_11_10_113020_create_cache_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2020_11_10_113020_create_cache_table.php diff --git a/database/migrations/2020_11_10_113020_create_cache_table.php b/database/migrations/2020_11_10_113020_create_cache_table.php new file mode 100644 index 0000000..7b73e5f --- /dev/null +++ b/database/migrations/2020_11_10_113020_create_cache_table.php @@ -0,0 +1,32 @@ +string('key')->unique(); + $table->mediumText('value'); + $table->integer('expiration'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cache'); + } +} From cfb12f914ae4acd67baa07392809c2cb5e75cc7b Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 26 Nov 2020 16:44:05 +0330 Subject: [PATCH 12/17] 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 @@