From 2e75dfeb73f1ed16f2e2a5b88c02955166c5f749 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Wed, 9 Oct 2019 02:06:20 +0330 Subject: [PATCH] work in home --- public/mix-manifest.json | 8 ++++---- resources/js/Global/utils/common/ProcessTreeArray.js | 8 ++++---- resources/js/Global/utils/common/routes.js | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 4fa70e4..c7810fe 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=b01dcfa845b84da87394", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=3d59743a5c1071a14b23", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=51954041d9e7136bbadc", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=52b907dbc08d5b945ed6" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=4c5fa0bdb556f1157fbf", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=b418ebd88575764c1eef", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=8eb2a7992f1192c1c852", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=641003427457b9ee06d1" } diff --git a/resources/js/Global/utils/common/ProcessTreeArray.js b/resources/js/Global/utils/common/ProcessTreeArray.js index e62cd64..10007fb 100644 --- a/resources/js/Global/utils/common/ProcessTreeArray.js +++ b/resources/js/Global/utils/common/ProcessTreeArray.js @@ -178,19 +178,19 @@ const updateTreeArray = (treeArray, update, id, listArray = null) => { let array = treeArray; for (const key in hierarchy) { if (hierarchy.hasOwnProperty(key)) { - if (key == 0) { + if (key == 0) { if (hierarchy.length - 1 == key) { update["children"] = array[hierarchy[key]]["children"]; array[hierarchy[key]] = update; } else { - array = array[hierarchy[key]]; + array = array[hierarchy[key]]['children']; } } else { if (hierarchy.length - 1 == key) { update["children"] = array[hierarchy[key]]["children"]; - array["children"][hierarchy[key]] = update; + array[hierarchy[key]] = update; } else { - array = array["children"][hierarchy[key]]; + array = array[hierarchy[key]]['children']; } } } diff --git a/resources/js/Global/utils/common/routes.js b/resources/js/Global/utils/common/routes.js index 78b87f6..d57aa81 100644 --- a/resources/js/Global/utils/common/routes.js +++ b/resources/js/Global/utils/common/routes.js @@ -8,4 +8,7 @@ export default { user() { return "/User/List"; }, + originHostName() { + return process.env.MIX_PUSHER_APP_ORIGIN_HOST_NAME || 'www.willaengine.ir'; + }, }