From 6f1a1957c248377582897eb3f53020f7d38b5d29 Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Sat, 30 Nov 2019 18:59:38 +0330
Subject: [PATCH] merge - product

---
 public/mix-manifest.json                          | 14 ++++++++------
 resources/js/Global/components/Drawer/SideBar.vue |  4 ++--
 resources/js/Global/utils/common/routes.js        |  6 +++---
 routes/web.php                                    |  4 ++--
 webpack.mix.js                                    |  1 -
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 4e56a49..18a9db9 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,7 +1,9 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=f42769f802937bf95150",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=20cbc303a38d3ff32b72",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=e9a742ddfd5ff64b9511",
-    "/js/vue/Modules/Store/app.js": "/js/vue/Modules/Store/app.js?id=0076ff8cc3ac14215ddb",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=177d52042c2071ccddeb"
-}
\ No newline at end of file
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=704f9944e6888047986d",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=7d6c4f1f24a6d559a576",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=4024f09cac7702728462",
+    "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=e50506192ad708debe22",
+    "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=3dfdad00a15564daf88e",
+    "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=23d8714760af2482908b",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=848c3771c97bd147e175"
+}
diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue
index 2349863..9210926 100644
--- a/resources/js/Global/components/Drawer/SideBar.vue
+++ b/resources/js/Global/components/Drawer/SideBar.vue
@@ -67,7 +67,7 @@ export default {
 			hints: true,
 			drawer: false,
 			Items: [
-				{ titleEn: 'My Profile', titleFa: ' حساب کاربری من ', icon: 'dashboard', permission: "", href: '/User/Profile' },
+				{ titleEn: 'My Profile', titleFa: ' حساب کاربری من ', icon: 'dashboard', permission: "", href: '/user/profile' },
 				// { titleEn: ' My Messages ', titleFa: ' پیام های من ', icon: 'question_answer', permission: "", href: '/User/List' },
 				{
 					titleEn: " My Users ",
@@ -82,7 +82,7 @@ export default {
 					titleFa: " مدیریت پیام های کوتاه ",
 					icon: "question_answer",
 					permission: "",
-					href: '/User/SMS',
+					href: '/sms/manage',
 				}
 
 			],
diff --git a/resources/js/Global/utils/common/routes.js b/resources/js/Global/utils/common/routes.js
index 729aed3..5d0a46c 100644
--- a/resources/js/Global/utils/common/routes.js
+++ b/resources/js/Global/utils/common/routes.js
@@ -1,12 +1,12 @@
 export default {
     login() {
-        return process.env.MIX_PUSHER_APP_ROUTE_LOGIN || "/WE-Login";
+        return process.env.MIX_PUSHER_APP_ROUTE_LOGIN || "/ms-login";
     },
     main() {
-        return process.env.MIX_PUSHER_APP_ROUTE_MAIN || "/Main/Home";
+        return process.env.MIX_PUSHER_APP_ROUTE_MAIN || "/main/home";
     },
     user() {
-        return "/User/List";
+        return "/user/list";
     },
     originHostName() {
         return process.env.MIX_PUSHER_APP_ORIGIN_HOST_NAME || 'www.willaengine.ir';
diff --git a/routes/web.php b/routes/web.php
index 64fc8ee..ab42d46 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,7 +14,7 @@
 // Route::get('/{any?}', function () {
 //     return view('Home');
 // });
-Route::get('/Main/{any?}', function () {
+Route::get('/main/{any?}', function () {
     return view( 'Home');
 });
 
@@ -24,5 +24,5 @@ Route::get('/WebsiteManagement/{any?}', function () {
 
 
 Route::get('/{any?}', function () {
-    return redirect('/Main/Home');
+    return redirect('/main/home');
 });
diff --git a/webpack.mix.js b/webpack.mix.js
index c20dd48..de2b2a2 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -30,7 +30,6 @@ mix.js('resources/js/Home/app.js', 'public/js/vue/Home');
 require('./modules/wm-core/webpack.mix');
 require('./modules/wm-common/webpack.mix');
 require('./modules/wm-crm/webpack.mix');
-require('./modules/wm-store/webpack.mix');
 
 // require('./modules/wm-reservation/webpack.mix');