From c498b03f1edb765209e1b7bdec92ff8b6413f93a Mon Sep 17 00:00:00 2001
From: saeid <saeidkhakbazan@gmail.com>
Date: Mon, 8 Jul 2019 12:55:46 +0430
Subject: [PATCH] resource

---
 public/mix-manifest.json                      |  8 ++--
 resources/js/Global/components/Tiles/Tile.vue |  2 +-
 resources/js/Home/router/index.js             | 40 ++++--------------
 resources/js/User/router/index.js             | 41 ++++---------------
 4 files changed, 22 insertions(+), 69 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 512801b..f39ab6c 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=e7004e4ba1268d86bc4e",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=c31e70c4285a4ae600da",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=3a6fd5e7f9f98ab19612",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=aaebc9ecc42c093cf60a"
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=584db8725dd8389d6625",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=2c594e6374c9a8a0ea78",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=0c0fad3f977417217589",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=d5b0a3c5d8bd997a7f4c"
 }
diff --git a/resources/js/Global/components/Tiles/Tile.vue b/resources/js/Global/components/Tiles/Tile.vue
index 57e28f3..dad199b 100644
--- a/resources/js/Global/components/Tiles/Tile.vue
+++ b/resources/js/Global/components/Tiles/Tile.vue
@@ -7,7 +7,7 @@
                         <div class="TitleFa"> {{ TitleFa }} </div>
                         <div class="TitleEn"> {{ TitleEn }} </div>
                     </div>
-                    <img class="Image" :src="getPath('images/Global/Tiles/'+ImageURL)" :height="ImageHeight"/>
+                    <img class="Image" :src="'/images/Global/Tiles/'+ImageURL" :height="ImageHeight"/>
                 </div>
                 <div v-if="Quantity != ''" class="WM-Absolute En" :class="'WM-Font-'+QuantitySize" :style="'color:'+QuantityColor" style="line-height: 90px; left:0px; bottom:-8px; opacity:0.3">
                     {{ Quantity }}
diff --git a/resources/js/Home/router/index.js b/resources/js/Home/router/index.js
index 8bfad42..fc3448d 100644
--- a/resources/js/Home/router/index.js
+++ b/resources/js/Home/router/index.js
@@ -14,45 +14,21 @@ import Meta from 'vue-meta'
 
 // Routes
 import paths from './paths'
-import commonPaths from '@Common/router'
 
-paths.map(function(path) {
-    return path['prefix'] = '@JS';
-});
-commonPaths.map(function(path) {
-    return path['prefix'] = '@Common';
-});
-
-let allPaths = paths.concat(commonPaths);
 
 function route (options) {
     let path = options.path;
     let view = options.view;
     let name = options.name;
-    let prefix = options.prefix;
     let meta = (options.meta) ? options.meta : '';
-    if (prefix == '@JS') {
-        return {
-            name: name || view,
-            path,
-            meta,
-            component: (resovle) => import(
-            `@JS/Home/views/${view}.vue`
-            ).then(resovle)
-        }
-    } else if(prefix == '@Common') {
-        console.log(prefix)
-        console.log(options)
-        return {
-            name: name || view,
-            path,
-            meta,
-            component: (resovle) => import(
-            `@Common/views/${view}.vue`
-            ).then(resovle)
-        }
+    return {
+        name: name || view,
+        path,
+        meta,
+        component: (resovle) => import(
+        `@JS/Home/views/${view}.vue`
+        ).then(resovle)
     }
-
 }
 
 Vue.use(Router)
@@ -62,7 +38,7 @@ Vue.use(Router)
 // Create a new router
 const router = new Router({
   mode: 'history',
-  routes: allPaths.map(path => route(path)).concat([
+  routes: paths.map(path => route(path)).concat([
     { path: '*', redirect: '/Home' }
   ]),
   scrollBehavior (to, from, savedPosition) {
diff --git a/resources/js/User/router/index.js b/resources/js/User/router/index.js
index ce21d1a..8bb0c18 100644
--- a/resources/js/User/router/index.js
+++ b/resources/js/User/router/index.js
@@ -14,44 +14,21 @@ import Meta from 'vue-meta'
 
 // Routes
 import paths from './paths'
-import commonPaths from '@Common/router'
-
-paths.map(function(path) {
-    return path['prefix'] = '@User';
-});
-commonPaths.map(function(path) {
-    return path['prefix'] = '@Common';
-});
-
-let allPaths = paths.concat(commonPaths);
 
 function route (options) {
     let path = options.path;
     let view = options.view;
     let name = options.name;
-    let prefix = options.prefix;
     let meta = (options.meta) ? options.meta : '';
-    if (prefix == '@User') {
-        return {
-            name: name || view,
-            path,
-            meta,
-            component: (resovle) => import(
-            `@User/views/${view}.vue`
-            ).then(resovle)
-        }
-    } else if(prefix == '@Common') {
-        console.log(prefix)
-        console.log(options)
-        return {
-            name: name || view,
-            path,
-            meta,
-            component: (resovle) => import(
-            `@Common/views/${view}.vue`
-            ).then(resovle)
-        }
+    return {
+        name: name || view,
+        path,
+        meta,
+        component: (resovle) => import(
+        `@User/views/${view}.vue`
+        ).then(resovle)
     }
+  
 
 }
 
@@ -62,7 +39,7 @@ Vue.use(Router)
 // Create a new router
 const router = new Router({
   mode: 'history',
-  routes: allPaths.map(path => route(path)).concat([
+  routes: paths.map(path => route(path)).concat([
     { path: '*', redirect: '/Home' }
   ]),
   scrollBehavior (to, from, savedPosition) {