From a906c6046d46cf9dc26c8fd2ccecbeebb4002e01 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Wed, 1 Sep 2021 00:19:28 +0200 Subject: [PATCH] hm... --- zero.Web.UI/App/navigation.vue | 2 ++ zero.Web.UI/Sass/Canvas/_navigation.scss | 7 +++++++ zero.Web.UI/app/app.js | 2 +- zero.Web.UI/vite.config.js | 26 +++++++++++++++++++++++- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/zero.Web.UI/App/navigation.vue b/zero.Web.UI/App/navigation.vue index 816da03d..0f49d979 100644 --- a/zero.Web.UI/App/navigation.vue +++ b/zero.Web.UI/App/navigation.vue @@ -16,6 +16,8 @@ + + diff --git a/zero.Web.UI/Sass/Canvas/_navigation.scss b/zero.Web.UI/Sass/Canvas/_navigation.scss index fae247d3..6ba978b1 100644 --- a/zero.Web.UI/Sass/Canvas/_navigation.scss +++ b/zero.Web.UI/Sass/Canvas/_navigation.scss @@ -82,6 +82,8 @@ height: 90px; display: flex; align-items: center; + justify-content: space-between; + padding: 0 var(--padding-xs) 0 0; } .app-nav-inner @@ -108,6 +110,11 @@ } } +.app-nav-search +{ + +} + .app-nav-switch { margin-bottom: var(--padding-s); diff --git a/zero.Web.UI/app/app.js b/zero.Web.UI/app/app.js index 03663b30..c41f8b5c 100644 --- a/zero.Web.UI/app/app.js +++ b/zero.Web.UI/app/app.js @@ -11,7 +11,7 @@ import 'zero/config/axios.config.js'; Object.entries(components).forEach(cmp => { Vue.component(cmp[0], cmp[1].default || cmp[1]); -}); +}); Object.entries(directives).forEach(cmp => { diff --git a/zero.Web.UI/vite.config.js b/zero.Web.UI/vite.config.js index 16deacae..35c6eae3 100644 --- a/zero.Web.UI/vite.config.js +++ b/zero.Web.UI/vite.config.js @@ -52,6 +52,28 @@ fs.writeFile(path.resolve(__dirname, 'app/core/plugins.js'), pluginFileContent, //file written successfully }) +const myPlugin = () => ({ + name: 'configure-server', + configureServer(server) + { + var watcher = server.watcher; + watcher + .on('add', path => console.log(`watch: ${path}`)); + var files = watcher.getWatched(); + console.log('watcher:'); + console.log(files); + + // https://github.com/paulmillr/chokidar#api + + //server.middlewares.use((req, res, next) => + //{ + // console.log(req.url); + // next(); + // // custom handle request... + //}) + } +}) + /** * @type {import('vite').UserConfig} */ @@ -60,7 +82,7 @@ let config = { port: process.env.PORT, cors: true }, - plugins: [createVuePlugin(), ...zeroPlugins], + plugins: [createVuePlugin(), ...zeroPlugins, myPlugin()], alias: { '@zero': path.resolve(__dirname, 'app/'), 'zero': path.resolve(__dirname, 'app/'), @@ -87,6 +109,8 @@ let config = { } }; +console.log('root: ' + config.root); + if (process.env.NODE_ENV === 'production') { config.base = '/zero/';