From a03b9f327bfe7df63e1eeabf83f443e2b437cf46 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Thu, 29 Oct 2020 11:10:58 +0100
Subject: [PATCH] make HMR work again + favicon + get route meta from parent if
 child has none

---
 zero.Core/Api/ApplicationContext.cs      |   2 +-
 zero.Debug/wwwroot/Assets/zero-icon.png  | Bin 0 -> 3935 bytes
 zero.Web.UI/App/config/router.config.js  |  40 ++++++++++++++++-------
 zero.Web.UI/App/core/zero.js             |   4 +--
 zero.Web.UI/App/pages/settings/routes.js |  10 +++---
 zero.Web.UI/vue.config.js                |   5 +++
 zero.Web/Views/Zero/Index.cshtml         |   3 ++
 7 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 zero.Debug/wwwroot/Assets/zero-icon.png

diff --git a/zero.Core/Api/ApplicationContext.cs b/zero.Core/Api/ApplicationContext.cs
index e8ccb2e6..967f4f8b 100644
--- a/zero.Core/Api/ApplicationContext.cs
+++ b/zero.Core/Api/ApplicationContext.cs
@@ -66,7 +66,7 @@ namespace zero.Core.Api
 
       if (app == null)
       {
-        Logger.LogWarning($"Could not resolve application for host $host", context.Request.Host);
+        Logger.LogWarning("Could not resolve application for host {host}", context.Request.Host);
         IList<IApplication> apps = await GetApplications();
         app = apps.FirstOrDefault();
       }
diff --git a/zero.Debug/wwwroot/Assets/zero-icon.png b/zero.Debug/wwwroot/Assets/zero-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..683dc9369769c023acf753169022e9c5ea6fb8b8
GIT binary patch
literal 3935
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

literal 0
HcmV?d00001

diff --git a/zero.Web.UI/App/config/router.config.js b/zero.Web.UI/App/config/router.config.js
index 260a099a..e6c330b3 100644
--- a/zero.Web.UI/App/config/router.config.js
+++ b/zero.Web.UI/App/config/router.config.js
@@ -1,8 +1,9 @@
 import Localization from 'zero/services/localization';
+import { isArray as _isArray } from 'underscore';
 
 
 // set meta title before routing
-const beforeEach = () => (to, from, next) =>
+const beforeEach = (to, from, next) =>
 {
   let isGuarded = false;
 
@@ -10,24 +11,39 @@ const beforeEach = () => (to, from, next) =>
   let callback = () =>
   {
     let title = Localization.localize('@zero.name');
+    let name = to.meta.name;
 
-    if (to.meta.name && to.meta.alias !== __zero.alias.sections.dashboard)
+    if (!name && to.matched.length > 1)
     {
-      let name = to.meta.name;
-      let nameParts = _isArray(name) ? name : [name];
-      let translations = [];
-
-      nameParts.forEach(part =>
+      to.matched.forEach(route =>
       {
-        if (part)
+        if (!name && route.meta.name)
         {
-          translations.push(Localization.localize(part));
+          name = route.meta.name;
         }
       });
-
-      title += ': ' + translations.join(' - ');
     }
 
+    if (!name || to.meta.alias === __zero.alias.sections.dashboard)
+    {
+      document.title = title;
+      next();
+      return;
+    }
+
+    let nameParts = _isArray(name) ? name : [name];
+    let translations = [];
+
+    nameParts.forEach(part =>
+    {
+      if (part)
+      {
+        translations.push(Localization.localize(part));
+      }
+    });
+
+    title += ': ' + translations.join(' - ');
+
     document.title = title;
 
     next();
@@ -67,7 +83,7 @@ export default {
   base: __zero.path,
   linkActiveClass: 'is-active',
   linkExactActiveClass: 'is-active-exact',
-  //beforeEach: beforeEach,
+  beforeEach: beforeEach,
   scrollBehavior(to, from, savedPosition)
   {
     return savedPosition ? savedPosition : { x: 0, y: 0 };
diff --git a/zero.Web.UI/App/core/zero.js b/zero.Web.UI/App/core/zero.js
index 8ae0ee62..e53f59df 100644
--- a/zero.Web.UI/App/core/zero.js
+++ b/zero.Web.UI/App/core/zero.js
@@ -75,11 +75,11 @@ class Zero
       routes: this.#routes
     });
 
+    this.#router.beforeEach(routerConfig.beforeEach);
+
     //const result = await Axios.get('zerovue/config');
     //this.config = { ...this.config, ...result.data };
 
-    //console.info(this.#vue.router);
-
     this.#setupDone = true;
     //EventHub.$emit('zero.setup');
   }
diff --git a/zero.Web.UI/App/pages/settings/routes.js b/zero.Web.UI/App/pages/settings/routes.js
index b1a231e1..5425b851 100644
--- a/zero.Web.UI/App/pages/settings/routes.js
+++ b/zero.Web.UI/App/pages/settings/routes.js
@@ -33,7 +33,7 @@ const addArea = (areaAlias, component, detailComponent, hasCreate, postCreate) =
     path: area.url,
     component: component,
     meta: {
-      name: [area.name, section.name]
+      name: area.name
     }
   });
 
@@ -46,7 +46,7 @@ const addArea = (areaAlias, component, detailComponent, hasCreate, postCreate) =
       component: detailComponent,
       meta: {
         create: true,
-        name: [area.name, section.name]
+        name: area.name
       }
     });
   }
@@ -59,7 +59,7 @@ const addArea = (areaAlias, component, detailComponent, hasCreate, postCreate) =
       props: true,
       component: detailComponent,
       meta: {
-        name: [area.name, section.name]
+        name: area.name
       }
     });
   }
@@ -105,7 +105,7 @@ if (section)
       component: UserRole,
       meta: {
         create: true,
-        name: [area.name, section.name]
+        name: area.name
       }
     });
 
@@ -115,7 +115,7 @@ if (section)
       props: true,
       component: UserRole,
       meta: {
-        name: [area.name, section.name]
+        name: area.name
       }
     });
   });
diff --git a/zero.Web.UI/vue.config.js b/zero.Web.UI/vue.config.js
index 87edba85..41b54601 100644
--- a/zero.Web.UI/vue.config.js
+++ b/zero.Web.UI/vue.config.js
@@ -27,6 +27,11 @@ module.exports = {
     app: "app.js"
   },
 
+  devServer: {
+    sockPath: '/zero/vue-cli/sockjs-node',
+    public: 'http://localhost:2310/zero/vue-cli'
+  },
+
   // webpack configuration
   chainWebpack: config =>
   {
diff --git a/zero.Web/Views/Zero/Index.cshtml b/zero.Web/Views/Zero/Index.cshtml
index 3b79cdd0..addcf09b 100644
--- a/zero.Web/Views/Zero/Index.cshtml
+++ b/zero.Web/Views/Zero/Index.cshtml
@@ -10,6 +10,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <meta http-equiv="expires" content="0">
+  <link rel="icon" type="image/png" href="/assets/zero-icon.png" sizes="32x32">
+  <link rel="image_src" type="image/png" href="/assets/zero-icon.png" sizes="192x192" />
+  <link rel="shortcut icon" type="image/png" href="/assets/zero-icon.png" sizes="196x196">
   <base href="~/">
   <environment exclude="Development">
     <link href="~/zero/Assets/app.css" rel="stylesheet" asp-append-version="true" />