From c43eea5428e8abb0ae4b49e59b5c78d5cd85885d Mon Sep 17 00:00:00 2001 From: KarnamShyam1947 <karnamshyamgithub@gmail.com> Date: Thu, 30 May 2024 17:47:35 +0530 Subject: [PATCH 1/2] setup done --- Makefile | 2 +- web/frontend/rollup.config.mjs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 497acb2..15594cb 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ $(TARGET): $(VAR) $(CFG) $(SVELTE_TARGETS) frontend: $(info ===> BUILD frontend) - cd web/frontend && pnpm install && pnpm run build + cd web/frontend && npm install && npm run build clean: $(info ===> CLEAN) diff --git a/web/frontend/rollup.config.mjs b/web/frontend/rollup.config.mjs index 4778e7a..5cbb388 100644 --- a/web/frontend/rollup.config.mjs +++ b/web/frontend/rollup.config.mjs @@ -6,8 +6,8 @@ import terser from '@rollup/plugin-terser'; import css from 'rollup-plugin-css-only'; import livereload from 'rollup-plugin-livereload'; -// const production = !process.env.ROLLUP_WATCH; -const production = false +const production = !process.env.ROLLUP_WATCH; +// const production = false const plugins = [ svelte({ @@ -52,7 +52,7 @@ const entrypoint = (name, path) => ({ // we'll extract any component CSS out into // a separate file - better for performance css({ output: `${name}.css` }), - livereload('public') + // livereload('public') ], watch: { clearScreen: false From 3d9667a930107094e26fafdc488d23540d24d9aa Mon Sep 17 00:00:00 2001 From: KarnamShyam1947 <karnamshyamgithub@gmail.com> Date: Fri, 31 May 2024 11:30:42 +0530 Subject: [PATCH 2/2] changed header component --- web/frontend/rollup.config.mjs | 2 +- web/frontend/src/Header.svelte | 112 ++++++++++++++++----------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/web/frontend/rollup.config.mjs b/web/frontend/rollup.config.mjs index 5cbb388..0ca5740 100644 --- a/web/frontend/rollup.config.mjs +++ b/web/frontend/rollup.config.mjs @@ -52,7 +52,7 @@ const entrypoint = (name, path) => ({ // we'll extract any component CSS out into // a separate file - better for performance css({ output: `${name}.css` }), - // livereload('public') + livereload('public') ], watch: { clearScreen: false diff --git a/web/frontend/src/Header.svelte b/web/frontend/src/Header.svelte index 5b05bb8..7ed0105 100644 --- a/web/frontend/src/Header.svelte +++ b/web/frontend/src/Header.svelte @@ -32,62 +32,62 @@ usersTitle.set(5, "Users"); const views = [ - { - title: "My Jobs", - requiredRole: roles.user, - href: `/monitoring/user/${username}`, - icon: "bar-chart-line-fill", - perCluster: false, - menu: "none", - }, - { - title: jobsTitle.get(authlevel), - requiredRole: roles.user, - href: `/monitoring/jobs/`, - icon: "card-list", - perCluster: false, - menu: "none", - }, - { - title: usersTitle.get(authlevel), - requiredRole: roles.manager, - href: "/monitoring/users/", - icon: "people-fill", - perCluster: false, - menu: "Groups", - }, - { - title: "Projects", - requiredRole: roles.support, - href: "/monitoring/projects/", - icon: "folder", - perCluster: false, - menu: "Groups", - }, - { - title: "Tags", - requiredRole: roles.user, - href: "/monitoring/tags/", - icon: "tags", - perCluster: false, - menu: "Groups", - }, - { - title: "Analysis", - requiredRole: roles.support, - href: "/monitoring/analysis/", - icon: "graph-up", - perCluster: true, - menu: "Stats", - }, - { - title: "Nodes", - requiredRole: roles.admin, - href: "/monitoring/systems/", - icon: "cpu", - perCluster: true, - menu: "Groups", - }, + // { + // title: "My Jobs changed", + // requiredRole: roles.user, + // href: `/monitoring/user/${username}`, + // icon: "bar-chart-line-fill", + // perCluster: false, + // menu: "none", + // }, + // { + // title: jobsTitle.get(authlevel), + // requiredRole: roles.user, + // href: `/monitoring/jobs/`, + // icon: "card-list", + // perCluster: false, + // menu: "none", + // }, + // { + // title: usersTitle.get(authlevel), + // requiredRole: roles.manager, + // href: "/monitoring/users/", + // icon: "people-fill", + // perCluster: false, + // menu: "Groups", + // }, + // { + // title: "Projects changed", + // requiredRole: roles.support, + // href: "/monitoring/projects/", + // icon: "folder", + // perCluster: false, + // menu: "Groups", + // }, + // { + // title: "Tags", + // requiredRole: roles.user, + // href: "/monitoring/tags/", + // icon: "tags", + // perCluster: false, + // menu: "Groups", + // }, + // { + // title: "Analysis", + // requiredRole: roles.support, + // href: "/monitoring/analysis/", + // icon: "graph-up", + // perCluster: true, + // menu: "Stats", + // }, + // { + // title: "Nodes", + // requiredRole: roles.admin, + // href: "/monitoring/systems/", + // icon: "cpu", + // perCluster: true, + // menu: "Groups", + // }, { title: "Control", requiredRole: roles.admin,