merge - product

pull/1/head
Saeid 5 years ago
parent 0913aada3b
commit 6f1a1957c2

@ -1,7 +1,9 @@
{ {
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=f42769f802937bf95150", "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=704f9944e6888047986d",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=20cbc303a38d3ff32b72", "/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=e9a742ddfd5ff64b9511", "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=4024f09cac7702728462",
"/js/vue/Modules/Store/app.js": "/js/vue/Modules/Store/app.js?id=0076ff8cc3ac14215ddb", "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=e50506192ad708debe22",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=177d52042c2071ccddeb" "/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"
} }

@ -67,7 +67,7 @@ export default {
hints: true, hints: true,
drawer: false, drawer: false,
Items: [ 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 Messages ', titleFa: ' پیام های من ', icon: 'question_answer', permission: "", href: '/User/List' },
{ {
titleEn: " My Users ", titleEn: " My Users ",
@ -82,7 +82,7 @@ export default {
titleFa: " مدیریت پیام های کوتاه ", titleFa: " مدیریت پیام های کوتاه ",
icon: "question_answer", icon: "question_answer",
permission: "", permission: "",
href: '/User/SMS', href: '/sms/manage',
} }
], ],

@ -1,12 +1,12 @@
export default { export default {
login() { login() {
return process.env.MIX_PUSHER_APP_ROUTE_LOGIN || "/WE-Login"; return process.env.MIX_PUSHER_APP_ROUTE_LOGIN || "/ms-login";
}, },
main() { main() {
return process.env.MIX_PUSHER_APP_ROUTE_MAIN || "/Main/Home"; return process.env.MIX_PUSHER_APP_ROUTE_MAIN || "/main/home";
}, },
user() { user() {
return "/User/List"; return "/user/list";
}, },
originHostName() { originHostName() {
return process.env.MIX_PUSHER_APP_ORIGIN_HOST_NAME || 'www.willaengine.ir'; return process.env.MIX_PUSHER_APP_ORIGIN_HOST_NAME || 'www.willaengine.ir';

@ -14,7 +14,7 @@
// Route::get('/{any?}', function () { // Route::get('/{any?}', function () {
// return view('Home'); // return view('Home');
// }); // });
Route::get('/Main/{any?}', function () { Route::get('/main/{any?}', function () {
return view( 'Home'); return view( 'Home');
}); });
@ -24,5 +24,5 @@ Route::get('/WebsiteManagement/{any?}', function () {
Route::get('/{any?}', function () { Route::get('/{any?}', function () {
return redirect('/Main/Home'); return redirect('/main/home');
}); });

1
webpack.mix.js vendored

@ -30,7 +30,6 @@ mix.js('resources/js/Home/app.js', 'public/js/vue/Home');
require('./modules/wm-core/webpack.mix'); require('./modules/wm-core/webpack.mix');
require('./modules/wm-common/webpack.mix'); require('./modules/wm-common/webpack.mix');
require('./modules/wm-crm/webpack.mix'); require('./modules/wm-crm/webpack.mix');
require('./modules/wm-store/webpack.mix');
// require('./modules/wm-reservation/webpack.mix'); // require('./modules/wm-reservation/webpack.mix');

Loading…
Cancel
Save