Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

✨ Adds nav links, and editor to minimal view

Alicia Sykes7983bc2d58e8
diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
index 0b074ad4..30312982 100644
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@@ -131,6 +131,7 @@
"language-label": "Language",
"config-launcher-label": "Config",
"config-launcher-tooltip": "Update Configuration",
+ "nav-links-tooltip": "Navigation and Configs",
"sign-out-tooltip": "Sign Out",
"sign-in-tooltip": "Log In",
"sign-in-welcome": "Hello {username}!",
diff --git a/src/components/LinkItems/ItemIcon.vue b/src/components/LinkItems/ItemIcon.vue
index 41ac5c2b..cf0eb3c4 100644
--- a/src/components/LinkItems/ItemIcon.vue
+++ b/src/components/LinkItems/ItemIcon.vue
@@ -306,11 +306,13 @@ export default {
fill: currentColor;
}
}
- /* Simple Icons */
+ /* Simple Icons. Height is set explicitly so the global `a svg { height: 1rem }`
+ * default in global-styles.scss doesn't squash them. */
.item-icon .simple-icons {
width: 2rem;
- &.small { width: 1.5rem; }
- &.large { width: 2.5rem; }
+ height: 2rem;
+ &.small { width: 1.5rem; height: 1.5rem; }
+ &.large { width: 2.5rem; height: 2.5rem; }
}
.item-icon .simple-icons path {
diff --git a/src/components/PageStrcture/Nav.vue b/src/components/PageStrcture/Nav.vue
index 818f793c..e433c628 100644
--- a/src/components/PageStrcture/Nav.vue
+++ b/src/components/PageStrcture/Nav.vue
@@ -7,7 +7,7 @@
<nav id="nav" v-if="navVisible">
<!-- Render either router-link or anchor, depending if internal / external link -->
<template v-for="(link, index) in allLinks" :key="index">
- <router-link v-if="!isUrl(link.path)"
+ <router-link v-if="!isHttpUrl(link.path)"
:to="link.path"
:title="link.title"
class="nav-item"
@@ -15,7 +15,7 @@
</router-link>
<a v-else
:href="link.path"
- :target="determineTarget(link)"
+ :target="resolveLinkTarget(link)"
:title="link.title"
class="nav-item"
rel="noopener noreferrer"
@@ -28,8 +28,7 @@
<script>
import IconBurger from '@/assets/interface-icons/burger-menu.svg';
-import { makePageSlug, viewFromPath } from '@/utils/config/ConfigHelpers';
-import { checkPageVisibility } from '@/utils/CheckPageVisibility';
+import { buildAllLinks, isHttpUrl, resolveLinkTarget } from '@/utils/NavLinks';
export default {
name: 'Nav',
@@ -44,18 +43,9 @@ export default {
isMobile: false,
}),
computed: {
- /* Get links to sub-pages, and combine with nav-links. Sub-page links honor the
- * current view (home/minimal/workspace) so users stay in the view they chose. */
allLinks() {
void this.$store.state.authRevision; // Re-filter pages when auth state changes
- const view = viewFromPath(this.$route.path);
- const subPages = this.$store.getters.pages.filter((page) => checkPageVisibility(page))
- .map((subPage) => ({
- path: makePageSlug(subPage.name, view),
- title: subPage.name,
- }));
- const navLinks = this.links || [];
- return [...navLinks, ...subPages];
+ return buildAllLinks(this.$store, this.$route, this.links);
},
},
created() {
@@ -67,18 +57,8 @@ export default {
const screenWidth = document.body.clientWidth;
return screenWidth && screenWidth < 600;
},
- isUrl: (str) => new RegExp(/(http|https):\/\/(\S+)(:[0-9]+)?/).test(str),
- determineTarget(link) {
- if (!link.target) return '_blank';
- switch (link.target) {
- case 'sametab': return '_self';
- case 'newtab': return '_blank';
- case 'newwindow': return '_blank';
- case 'parent': return '_parent';
- case 'top': return '_top';
- default: return '_blank';
- }
- },
+ isHttpUrl,
+ resolveLinkTarget,
},
};
</script>
diff --git a/src/components/Settings/ConfigLauncher.vue b/src/components/Settings/ConfigLauncher.vue
index e7e8e663..d681dd2f 100644
--- a/src/components/Settings/ConfigLauncher.vue
+++ b/src/components/Settings/ConfigLauncher.vue
@@ -1,5 +1,5 @@
<template>
- <div class="config-options" v-click-outside="closeViewSwitcher">
+ <div class="config-options" v-click-outside="closeMenus">
<!-- Button and label -->
<span class="config-label">{{ $t('settings.config-launcher-label') }}</span>
<div class="config-buttons">
@@ -8,6 +8,9 @@
<IconInteractiveEditor @click="startInteractiveEditor()" tabindex="-2"
v-tooltip="tooltip(enterEditModeTooltip)"
:class="(isEditMode || !isEditAllowed) ? 'disabled' : ''" />
+ <IconNavLinks v-if="hasNavLinks" @click="openNavLinksMenu()" tabindex="-2"
+ v-tooltip="tooltip($t('settings.nav-links-tooltip'))"
+ :aria-expanded="navLinksOpen" aria-haspopup="menu" />
<IconViewMode @click="openChangeViewMenu()" tabindex="-2"
v-tooltip="tooltip($t('alternate-views.alternate-view-heading'))" />
<AuthButtons :userType="userState" iconOnly />
@@ -27,6 +30,9 @@
<!-- Menu for switching view -->
<ViewSwitcher v-if="viewSwitcherOpen" />
+
+ <!-- Menu listing user nav links and other configs -->
+ <NavLinksSwitcher v-if="navLinksOpen" @close="closeMenus" />
</div>
</template>
@@ -38,10 +44,13 @@ import AuthButtons from '@/components/Settings/AuthButtons';
import Keys from '@/utils/StoreMutations';
import { topLevelConfKeys, localStorageKeys, modalNames } from '@/utils/config/defaults';
import ViewSwitcher from '@/components/Settings/ViewSwitcher';
+import NavLinksSwitcher from '@/components/Settings/NavLinksSwitcher.vue';
+import { buildAllLinks } from '@/utils/NavLinks';
// Import icons for config launcher buttons
import IconSpanner from '@/assets/interface-icons/config-editor.svg';
import IconInteractiveEditor from '@/assets/interface-icons/interactive-editor-edit-mode.svg';
import IconViewMode from '@/assets/interface-icons/application-change-view.svg';
+import IconNavLinks from '@/assets/interface-icons/config-pages.svg';
export default {
name: 'ConfigLauncher',
@@ -49,6 +58,7 @@ export default {
return {
modalNames,
viewSwitcherOpen: false,
+ navLinksOpen: false,
};
},
components: {
@@ -56,9 +66,11 @@ export default {
LanguageSwitcher,
AuthButtons,
ViewSwitcher,
+ NavLinksSwitcher,
IconSpanner,
IconInteractiveEditor,
IconViewMode,
+ IconNavLinks,
},
computed: {
sections() {
@@ -87,6 +99,12 @@ export default {
? 'edit-mode-subtitle' : 'start-editing-tooltip'}`,
);
},
+ /* True when there's at least one nav link or visible sub-page to show */
+ hasNavLinks() {
+ void this.$store.state.authRevision;
+ const nav = (this.pageInfo && this.pageInfo.navLinks) || [];
+ return buildAllLinks(this.$store, this.$route, nav).length > 0;
+ },
},
methods: {
showEditor: function show() {
@@ -110,9 +128,15 @@ export default {
},
openChangeViewMenu() {
this.viewSwitcherOpen = !this.viewSwitcherOpen;
+ this.navLinksOpen = false;
+ },
+ openNavLinksMenu() {
+ this.navLinksOpen = !this.navLinksOpen;
+ this.viewSwitcherOpen = false;
},
- closeViewSwitcher() {
+ closeMenus() {
this.viewSwitcherOpen = false;
+ this.navLinksOpen = false;
},
startInteractiveEditor() {
if (!this.isEditMode && this.isEditAllowed) {
diff --git a/src/components/Settings/NavLinksSwitcher.vue b/src/components/Settings/NavLinksSwitcher.vue
new file mode 100644
index 00000000..d91e411b
--- /dev/null
+++ b/src/components/Settings/NavLinksSwitcher.vue
@@ -0,0 +1,66 @@
+<template>
+ <div v-if="allLinks.length" class="nav-links-switcher" role="menu">
+ <template v-for="(link, index) in allLinks" :key="index">
+ <router-link v-if="!isHttpUrl(link.path)"
+ :to="link.path" class="nav-link" role="menuitem"
+ @click="$emit('close')">
+ {{ link.title }}
+ </router-link>
+ <a v-else
+ :href="link.path" :target="resolveLinkTarget(link)"
+ class="nav-link" role="menuitem"
+ rel="noopener noreferrer"
+ @click="$emit('close')">
+ {{ link.title }}
+ </a>
+ </template>
+ </div>
+</template>
+
+<script>
+import { buildAllLinks, isHttpUrl, resolveLinkTarget } from '@/utils/NavLinks';
+
+export default {
+ name: 'NavLinksSwitcher',
+ emits: ['close'],
+ computed: {
+ allLinks() {
+ void this.$store.state.authRevision;
+ const nav = (this.$store.getters.pageInfo && this.$store.getters.pageInfo.navLinks) || [];
+ return buildAllLinks(this.$store, this.$route, nav);
+ },
+ },
+ methods: { isHttpUrl, resolveLinkTarget },
+};
+</script>
+
+<style scoped lang="scss">
+.nav-links-switcher {
+ position: absolute;
+ right: 1rem;
+ margin-top: 3rem;
+ z-index: 5;
+ display: flex;
+ flex-direction: column;
+ min-width: 12rem;
+ max-height: 70vh;
+ overflow-y: auto;
+ background: var(--background);
+ border: 1px solid var(--settings-text-color);
+ border-radius: var(--curve-factor);
+ box-shadow: var(--settings-container-shadow);
+ .nav-link {
+ padding: 0.4rem 0.75rem;
+ color: var(--settings-text-color);
+ text-decoration: none;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ &:hover, &:focus-visible, &.router-link-active {
+ outline: none;
+ background: var(--settings-text-color);
+ color: var(--background);
+ }
+ }
+}
+</style>
diff --git a/src/utils/NavLinks.js b/src/utils/NavLinks.js
new file mode 100644
index 00000000..0591fb43
--- /dev/null
+++ b/src/utils/NavLinks.js
@@ -0,0 +1,23 @@
+import { makePageSlug, viewFromPath } from '@/utils/config/ConfigHelpers';
+import { checkPageVisibility } from '@/utils/CheckPageVisibility';
+
+/* True when the string looks like an absolute http(s) URL */
+export const isHttpUrl = (str) => /^(http|https):\/\/\S+/.test(str);
+
+/* Map a link's `target` config value to a valid HTML anchor target */
+export const resolveLinkTarget = (link) => {
+ const t = link && link.target;
+ if (t === 'sametab') return '_self';
+ if (t === 'parent') return '_parent';
+ if (t === 'top') return '_top';
+ return '_blank';
+};
+
+/* Combined list of user-defined nav links + visible sub-pages for the current
+ * view. Each entry: { path, title, target? }. Empty list means nothing to show. */
+export const buildAllLinks = (store, route, extraLinks = []) => {
+ const view = viewFromPath(route.path);
+ const subPages = (store.getters.pages || []).filter(checkPageVisibility)
+ .map((page) => ({ path: makePageSlug(page.name, view), title: page.name }));
+ return [...(extraLinks || []), ...subPages];
+};
diff --git a/src/views/Minimal.vue b/src/views/Minimal.vue
index d62c72ac..5763ae50 100644
--- a/src/views/Minimal.vue
+++ b/src/views/Minimal.vue
@@ -58,6 +58,8 @@
</div>
<div v-else class="no-data"> {{ $t('home.no-data') }} </div>
</div>
+ <!-- Interactive editor save options bottom banner -->
+ <EditModeSaveMenu v-if="isEditMode" />
</template>
<script>
@@ -66,6 +68,7 @@ import MinimalSection from '@/components/MinimalView/MinimalSection.vue';
import MinimalHeading from '@/components/MinimalView/MinimalHeading.vue';
import MinimalSearch from '@/components/MinimalView/MinimalSearch.vue';
import ConfigLauncher from '@/components/Settings/ConfigLauncher';
+import EditModeSaveMenu from '@/components/InteractiveEditor/EditModeSaveMenu.vue';
import { makePageName, resolveRouteIntent } from '@/utils/config/ConfigHelpers';
import ErrorHandler from '@/utils/logging/ErrorHandler';
@@ -77,6 +80,7 @@ export default {
MinimalHeading,
MinimalSearch,
ConfigLauncher,
+ EditModeSaveMenu,
},
data: () => ({
layout: '',