From abf00ac401cb7492427949868a8861b312455f84 Mon Sep 17 00:00:00 2001 From: Nikola Petrov Date: Fri, 11 Sep 2026 16:06:49 +0200 Subject: [PATCH] Working on UI --- typed-router.d.ts | 63 ++++++++++++++++++++++++++++++++++ vite.config.js | 1 + vue/app.vue | 16 ++++----- vue/components/Sidebar.vue | 53 ++++++++++++++++++++++++++++ vue/css/all.css | 10 +++++- vue/locales/en.json | 11 +++++- vue/locales/sl.json | 7 +++- vue/routes/index.vue | 16 ++------- vue/routes/settings.vue | 26 ++++++++++++++ vue/routes/settings/groups.vue | 8 +++++ vue/routes/settings/users.vue | 16 +++++++++ vue/routes/user_settings.vue | 16 +++++++++ 12 files changed, 218 insertions(+), 25 deletions(-) create mode 100644 vue/components/Sidebar.vue create mode 100644 vue/routes/settings.vue create mode 100644 vue/routes/settings/groups.vue create mode 100644 vue/routes/settings/users.vue create mode 100644 vue/routes/user_settings.vue diff --git a/typed-router.d.ts b/typed-router.d.ts index 2dfad76..24ee6cb 100644 --- a/typed-router.d.ts +++ b/typed-router.d.ts @@ -38,6 +38,35 @@ declare module 'vue-router/auto-routes' { Record, | never >, + '/settings': RouteRecordInfo< + '/settings', + '/settings', + Record, + Record, + | '/settings/groups' + | '/settings/users' + >, + '/settings/groups': RouteRecordInfo< + '/settings/groups', + '/settings/groups', + Record, + Record, + | never + >, + '/settings/users': RouteRecordInfo< + '/settings/users', + '/settings/users', + Record, + Record, + | never + >, + '/user_settings': RouteRecordInfo< + '/user_settings', + '/user_settings', + Record, + Record, + | never + >, } /** @@ -59,6 +88,40 @@ declare module 'vue-router/auto-routes' { pathParamNames: | never } + 'vue/routes/settings.vue': { + routes: + | '/settings' + | '/settings/groups' + | '/settings/users' + views: + | 'default' + pathParamNames: + | never + } + 'vue/routes/settings/groups.vue': { + routes: + | '/settings/groups' + views: + | never + pathParamNames: + | never + } + 'vue/routes/settings/users.vue': { + routes: + | '/settings/users' + views: + | never + pathParamNames: + | never + } + 'vue/routes/user_settings.vue': { + routes: + | '/user_settings' + views: + | never + pathParamNames: + | never + } } /** diff --git a/vite.config.js b/vite.config.js index 01c003e..26c6789 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,6 +12,7 @@ export default defineConfig(() => ({ VueRouter({ routesFolder: 'vue/routes', importMode: 'sync', + exclude: ['vue/routes/**/comp/**'], }), vue(), ], diff --git a/vue/app.vue b/vue/app.vue index 0ccdd8c..8017af0 100644 --- a/vue/app.vue +++ b/vue/app.vue @@ -1,18 +1,18 @@ \ No newline at end of file + diff --git a/vue/components/Sidebar.vue b/vue/components/Sidebar.vue new file mode 100644 index 0000000..e38094c --- /dev/null +++ b/vue/components/Sidebar.vue @@ -0,0 +1,53 @@ + + + diff --git a/vue/css/all.css b/vue/css/all.css index ff35a98..6d17e38 100644 --- a/vue/css/all.css +++ b/vue/css/all.css @@ -1,9 +1,12 @@ - @import 'vue-multiselect/dist/vue-multiselect.css'; @import '@fortawesome/fontawesome-free/css/all.min.css'; @import 'bulma/css/bulma.min.css'; +html { + background-color: var(--bulma-scheme-main-ter); +} + .dropdown { --bulma-dropdown-menu-min-width: 4rem; } @@ -12,3 +15,8 @@ a.dropdown-item, button.dropdown-item { padding-inline-end: 1rem; } + +[data-theme=dark], +.theme-dark { + --bulma-scheme-main-ter-l: 20%; +} \ No newline at end of file diff --git a/vue/locales/en.json b/vue/locales/en.json index 14e6390..3a98bc6 100644 --- a/vue/locales/en.json +++ b/vue/locales/en.json @@ -1,4 +1,13 @@ { + "menu": { + "settings": "Settings", + "userSettings": "User settings", + "dashboard": "Dashboard" + }, + "settings":{ + "users":"Users", + "groups":"Groups" + }, "common": { "save": "Save", "cancel": "Cancel", @@ -13,4 +22,4 @@ "hello": "HELLO", "world": "WORLD" } -} +} \ No newline at end of file diff --git a/vue/locales/sl.json b/vue/locales/sl.json index f802ae1..d8ba81d 100644 --- a/vue/locales/sl.json +++ b/vue/locales/sl.json @@ -1,4 +1,9 @@ { + "menu": { + "settings": "Nastavitve", + "userSettings": "Uporabniške nastavitve", + "dashboard": "Nadzorna plošča" + }, "common": { "save": "Shrani", "cancel": "Prekliči", @@ -13,4 +18,4 @@ "hello": "ZDRAVO", "world": "SVET" } -} +} \ No newline at end of file diff --git a/vue/routes/index.vue b/vue/routes/index.vue index a87dca3..50adade 100644 --- a/vue/routes/index.vue +++ b/vue/routes/index.vue @@ -1,22 +1,10 @@ \ No newline at end of file diff --git a/vue/routes/settings.vue b/vue/routes/settings.vue new file mode 100644 index 0000000..cded0b1 --- /dev/null +++ b/vue/routes/settings.vue @@ -0,0 +1,26 @@ + + \ No newline at end of file diff --git a/vue/routes/settings/groups.vue b/vue/routes/settings/groups.vue new file mode 100644 index 0000000..709e344 --- /dev/null +++ b/vue/routes/settings/groups.vue @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/vue/routes/settings/users.vue b/vue/routes/settings/users.vue new file mode 100644 index 0000000..dcee0d3 --- /dev/null +++ b/vue/routes/settings/users.vue @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/vue/routes/user_settings.vue b/vue/routes/user_settings.vue new file mode 100644 index 0000000..aeecd9a --- /dev/null +++ b/vue/routes/user_settings.vue @@ -0,0 +1,16 @@ + + +