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!

🎨 Consolidated settings menu, instead of 8+ different buttons

Alicia Sykes92d168e811f1
diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
index 65e3cc3d..69ba43c8 100644
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@@ -134,7 +134,9 @@
"sign-in-tooltip": "Log In",
"sign-in-welcome": "Hello {username}!",
"hide": "Hide",
- "open": "Open"
+ "open": "Open",
+ "options-title": "Options",
+ "options-tooltip": "Options"
},
"updates": {
"app-version-note": "Dashy version",
@@ -257,6 +259,7 @@
"interactive-editor": {
"menu": {
"start-editing-tooltip": "Enter the Interactive Editor",
+ "config-unavailable": "Config editor not available",
"edit-site-data-subheading": "Edit Site Data",
"edit-page-info-btn": "Edit Page Info",
"edit-page-info-tooltip": "App title, description, nav links, footer text, etc.",
diff --git a/src/components/Settings/AuthButtons.vue b/src/components/Settings/AuthButtons.vue
index 73079086..14750497 100644
--- a/src/components/Settings/AuthButtons.vue
+++ b/src/components/Settings/AuthButtons.vue
@@ -1,37 +1,16 @@
<template>
- <div>
- <!-- If auth configured, show status text -->
- <span class="user-type-note">{{ makeUserGreeting() }}</span>
- <div class="display-options">
- <!-- If user logged in, show logout button -->
- <IconLogout
- v-if="userType == userStateEnum.loggedIn"
- @click="logout()"
- v-tooltip="tooltip($t('settings.sign-out-tooltip'))"
- class="layout-icon" tabindex="-2"
- />
- <!-- If not logged in, and gues mode enabled, show login button -->
- <IconLogout
- v-if="userType == userStateEnum.guestAccess"
- @click="goToLogin()"
- v-tooltip="tooltip($t('settings.sign-in-tooltip'))"
- class="layout-icon" tabindex="-2"
- />
- <!-- If user logged in via keycloak, show keycloak logout button -->
- <IconLogout
- v-if="userType == userStateEnum.keycloakEnabled"
- @click="keycloakLogout()"
- v-tooltip="tooltip($t('settings.sign-out-tooltip'))"
- class="layout-icon" tabindex="-2"
- />
- <!-- If user logged in via oidc, show oidc logout button -->
- <IconLogout
- v-if="userType == userStateEnum.oidcEnabled"
- @click="oidcLogout()"
- v-tooltip="tooltip($t('settings.sign-out-tooltip'))"
- class="layout-icon" tabindex="-2"
- />
- </div>
+ <div class="auth-buttons" v-if="authLabel">
+ <span v-if="greeting" class="user-type-note">{{ greeting }}</span>
+ <button
+ type="button"
+ class="auth-btn"
+ @click="run"
+ v-tooltip="tooltip($t(authLabel))"
+ tabindex="-2"
+ >
+ <IconLogout />
+ <span>{{ $t(authLabel) }}</span>
+ </button>
</div>
</template>
@@ -43,82 +22,109 @@ import { getOidcAuth, isOidcEnabled } from '@/utils/auth/OidcAuth';
import { localStorageKeys, userStateEnum } from '@/utils/config/defaults';
import IconLogout from '@/assets/interface-icons/user-logout.svg';
+const SIGN_OUT_STATES = [
+ userStateEnum.loggedIn,
+ userStateEnum.keycloakEnabled,
+ userStateEnum.oidcEnabled,
+];
+
export default {
name: 'AuthButtons',
- components: {
- IconLogout,
- },
+ components: { IconLogout },
props: {
userType: Number,
},
- data() {
- return {
- userStateEnum,
- };
+ computed: {
+ authLabel() {
+ if (SIGN_OUT_STATES.includes(this.userType)) return 'settings.sign-out-tooltip';
+ if (this.userType === userStateEnum.guestAccess) return 'settings.sign-in-tooltip';
+ return null;
+ },
+ greeting() {
+ if (!SIGN_OUT_STATES.includes(this.userType)) return '';
+ const username = localStorage[localStorageKeys.USERNAME];
+ return username ? this.$t('settings.sign-in-welcome', { username }) : '';
+ },
},
methods: {
+ run() {
+ switch (this.userType) {
+ case userStateEnum.loggedIn: return this.logout();
+ case userStateEnum.keycloakEnabled: return this.keycloakLogout();
+ case userStateEnum.oidcEnabled: return this.oidcLogout();
+ case userStateEnum.guestAccess: return this.goToLogin();
+ default: return null;
+ }
+ },
logout() {
registerLogout();
this.$toast(this.$t('login.logout-message'));
- setTimeout(() => {
- router.push({ path: '/login' });
- }, 500);
- },
- oidcLogout() {
- const oidc = getOidcAuth();
- this.$toast(this.$t('login.logout-message'));
- setTimeout(() => {
- oidc.logout();
- }, 500);
+ setTimeout(() => router.push({ path: '/login' }), 500);
},
keycloakLogout() {
const keycloak = getKeycloakAuth();
this.$toast(this.$t('login.logout-message'));
- setTimeout(() => {
- keycloak.logout();
- }, 500);
+ setTimeout(() => keycloak.logout(), 500);
+ },
+ oidcLogout() {
+ const oidc = getOidcAuth();
+ this.$toast(this.$t('login.logout-message'));
+ setTimeout(() => oidc.logout(), 500);
},
goToLogin() {
if (isOidcEnabled()) {
- const oidc = getOidcAuth();
- oidc.userManager.signinRedirect();
+ getOidcAuth().userManager.signinRedirect();
} else if (isKeycloakEnabled()) {
- const keycloak = getKeycloakAuth();
- keycloak.keycloakClient.login(keycloak.loginOptions);
+ const kc = getKeycloakAuth();
+ kc.keycloakClient.login(kc.loginOptions);
} else {
router.push({ path: '/login' });
}
},
- tooltip(content) {
- return { content };
- },
- makeUserGreeting() {
- if (this.userType === userStateEnum.loggedIn
- || this.userType === userStateEnum.keycloakEnabled
- || this.userType === userStateEnum.oidcEnabled) {
- const username = localStorage[localStorageKeys.USERNAME];
- return username ? this.$t('settings.sign-in-welcome', { username }) : '';
- }
- if (this.userType === userStateEnum.guestAccess) {
- return this.$t('settings.sign-in-tooltip');
- }
- return '';
- },
+ tooltip(content) { return { content }; },
},
};
</script>
<style scoped lang="scss">
-@import '@/styles/style-helpers.scss';
+.auth-buttons {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 0.5rem;
+ width: 100%;
+}
-span.user-type-note {
+.user-type-note {
+ flex: 1;
+ min-width: 0;
+ font-size: 0.8rem;
color: var(--settings-text-color);
- margin-right: 0.5rem;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
-.display-options {
- @extend .svg-button;
+.auth-btn {
+ display: inline-flex;
+ align-items: center;
+ gap: 0.4rem;
+ height: 1.75rem;
+ padding: 0 0.5rem;
+ background: var(--background);
color: var(--settings-text-color);
-}
+ border: 1px solid currentColor;
+ border-radius: var(--curve-factor);
+ font-size: 0.8rem;
+ cursor: pointer;
+ transition: background-color 0.15s ease, color 0.15s ease;
+ svg { width: 1rem; height: 1rem; fill: currentColor; flex-shrink: 0; }
+
+ &:hover, &:focus-visible {
+ background: var(--settings-text-color);
+ color: var(--background);
+ outline: none;
+ }
+}
</style>
diff --git a/src/components/Settings/ItemSizeSelector.vue b/src/components/Settings/ItemSizeSelector.vue
index 1760ebd0..b3177cff 100644
--- a/src/components/Settings/ItemSizeSelector.vue
+++ b/src/components/Settings/ItemSizeSelector.vue
@@ -31,12 +31,7 @@ import IconMedium from '@/assets/interface-icons/icon-size-medium.svg';
import IconLarge from '@/assets/interface-icons/icon-size-large.svg';
export default {
- name: 'IconSizeSelector',
- data() {
- return {
- input: '',
- };
- },
+ name: 'ItemSizeSelector',
computed: {
iconSize() {
return this.$store.getters.iconSize;
@@ -58,29 +53,3 @@ export default {
};
</script>
-<style scoped lang="scss">
-
-span.options-label {
- color: var(--settings-text-color);
-}
-
-.display-options {
- color: var(--settings-text-color);
- svg {
- width: 1rem;
- height: 1rem;
- margin: 0.2rem;
- padding: 0.2rem;
- text-align: center;
- background: var(--background);
- border: 1px solid currentColor;
- border-radius: var(--curve-factor);
- cursor: pointer;
- &:hover, &.selected {
- background: var(--settings-text-color);
- color: var(--background);
- }
- }
-}
-
-</style>
diff --git a/src/components/Settings/LayoutSelector.vue b/src/components/Settings/LayoutSelector.vue
index 9962326c..adae7484 100644
--- a/src/components/Settings/LayoutSelector.vue
+++ b/src/components/Settings/LayoutSelector.vue
@@ -32,9 +32,6 @@ import IconVertical from '@/assets/interface-icons/layout-vertical.svg';
export default {
name: 'LayoutSelector',
- props: {
- displayLayout: String,
- },
components: {
IconDeafault,
IconHorizontal,
@@ -56,29 +53,3 @@ export default {
};
</script>
-<style scoped lang="scss">
-
-span.options-label {
- color: var(--settings-text-color);
-}
-
-.display-options {
- color: var(--settings-text-color);
- svg {
- width: 1rem;
- height: 1rem;
- margin: 0.2rem;
- padding: 0.2rem;
- text-align: center;
- background: var(--background);
- border: 1px solid currentColor;
- border-radius: var(--curve-factor);
- cursor: pointer;
- &:hover, &.selected {
- background: var(--settings-text-color);
- color: var(--background);
- }
- }
-}
-
-</style>
diff --git a/src/components/Settings/OptionsPanel.vue b/src/components/Settings/OptionsPanel.vue
new file mode 100644
index 00000000..a6c5a167
--- /dev/null
+++ b/src/components/Settings/OptionsPanel.vue
@@ -0,0 +1,293 @@
+<template>
+ <div
+ class="options-panel"
+ role="dialog"
+ aria-labelledby="options-panel-title"
+ >
+ <header class="panel-header">
+ <h3 id="options-panel-title">{{ $t('settings.options-title') }}</h3>
+ <button
+ type="button"
+ class="close-btn"
+ @click="close"
+ v-tooltip="$t('settings.hide')"
+ :aria-label="$t('settings.hide')"
+ >
+ <IconClose />
+ </button>
+ </header>
+
+ <section class="section actions-row">
+ <button
+ type="button"
+ class="action-btn"
+ :class="{ 'is-primary': !isEditMode && canEdit }"
+ @click="startEdit"
+ :disabled="!canEdit || isEditMode"
+ v-tooltip="editTooltip"
+ >
+ <IconEdit />
+ <span>{{ $t('interactive-editor.menu.edit-mode-name') }}</span>
+ </button>
+ <button
+ type="button"
+ class="action-btn"
+ @click="openConfig"
+ v-tooltip="$t('settings.config-launcher-tooltip')"
+ >
+ <IconConfig />
+ <span>{{ $t('settings.config-launcher-label') }}</span>
+ </button>
+ </section>
+
+ <section class="section theme-section">
+ <ThemeSelector />
+ </section>
+
+ <section class="section grid-2">
+ <LayoutSelector />
+ <ItemSizeSelector />
+ </section>
+
+ <section class="section view-switch-row">
+ <router-link
+ v-for="v in views"
+ :key="v.id"
+ :to="pathFor(v.id)"
+ class="view-btn"
+ :class="{ 'is-active': currentView === v.id }"
+ v-tooltip="v.label"
+ @click="close"
+ >
+ <component :is="v.icon" />
+ <span>{{ v.label }}</span>
+ </router-link>
+ </section>
+
+ <section v-if="userState !== 0" class="section auth-row">
+ <AuthButtons :userType="userState" />
+ </section>
+ </div>
+</template>
+
+<script>
+import ThemeSelector from '@/components/Settings/ThemeSelector';
+import LayoutSelector from '@/components/Settings/LayoutSelector';
+import ItemSizeSelector from '@/components/Settings/ItemSizeSelector';
+import AuthButtons from '@/components/Settings/AuthButtons';
+import Keys from '@/utils/StoreMutations';
+import { modalNames } from '@/utils/config/defaults';
+import { getUserState } from '@/utils/auth/Auth';
+import { makeRoutePath, resolveRouteIntent, viewFromPath } from '@/utils/config/ConfigHelpers';
+import IconClose from '@/assets/interface-icons/config-close.svg';
+import IconEdit from '@/assets/interface-icons/interactive-editor-edit-mode.svg';
+import IconConfig from '@/assets/interface-icons/config-editor.svg';
+import IconHome from '@/assets/interface-icons/application-home.svg';
+import IconMinimalView from '@/assets/interface-icons/application-minimal.svg';
+import IconWorkspaceView from '@/assets/interface-icons/open-workspace.svg';
+
+export default {
+ name: 'OptionsPanel',
+ components: {
+ ThemeSelector,
+ LayoutSelector,
+ ItemSizeSelector,
+ AuthButtons,
+ IconClose,
+ IconEdit,
+ IconConfig,
+ IconHome,
+ IconMinimalView,
+ IconWorkspaceView,
+ },
+ emits: ['close'],
+ computed: {
+ isEditMode() { return this.$store.state.editMode; },
+ canEdit() { return this.$store.getters.permissions.allowViewConfig; },
+ userState() { return getUserState(); },
+ editTooltip() {
+ if (!this.canEdit) return this.$t('interactive-editor.menu.config-unavailable');
+ const key = this.isEditMode ? 'edit-mode-subtitle' : 'start-editing-tooltip';
+ return this.$t(`interactive-editor.menu.${key}`);
+ },
+ currentView() { return viewFromPath(this.$route?.path); },
+ views() {
+ return [
+ { id: 'home', label: this.$t('alternate-views.default'), icon: 'IconHome' },
+ { id: 'minimal', label: this.$t('alternate-views.minimal'), icon: 'IconMinimalView' },
+ { id: 'workspace', label: this.$t('alternate-views.workspace'), icon: 'IconWorkspaceView' },
+ ];
+ },
+ },
+ mounted() {
+ document.addEventListener('keydown', this.onKey);
+ },
+ beforeUnmount() {
+ document.removeEventListener('keydown', this.onKey);
+ },
+ methods: {
+ close() { this.$emit('close'); },
+ onKey(e) { if (e.key === 'Escape') this.close(); },
+ openConfig() {
+ this.$modal.show(modalNames.CONF_EDITOR);
+ this.$store.commit(Keys.SET_MODAL_OPEN, true);
+ this.close();
+ },
+ startEdit() {
+ if (this.isEditMode || !this.canEdit) return;
+ this.$store.commit(Keys.SET_EDIT_MODE, true);
+ this.close();
+ },
+ pathFor(view) {
+ const { pageId, sectionSlug } = resolveRouteIntent(this.$route, this.$store);
+ return makeRoutePath(view, pageId, sectionSlug);
+ },
+ },
+};
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/media-queries.scss';
+
+.options-panel {
+ position: absolute;
+ top: calc(100% + 0.5rem);
+ right: 0.5rem;
+ z-index: 5;
+ width: 22rem;
+ max-width: calc(100vw - 1rem);
+ padding: 1rem;
+ background: var(--config-settings-background);
+ color: var(--config-settings-color);
+ border: 1px solid var(--primary);
+ border-radius: var(--curve-factor);
+ box-shadow: var(--settings-container-shadow);
+ display: flex;
+ flex-direction: column;
+ gap: 0.9rem;
+
+ @include phone {
+ left: 0.5rem;
+ width: auto;
+ }
+
+ button, a { transition: background-color 0.15s ease, color 0.15s ease, opacity 0.15s ease; }
+}
+
+.panel-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-bottom: 0.6rem;
+ border-bottom: 1px solid var(--primary);
+
+ h3 {
+ margin: 0;
+ font-size: 0.95rem;
+ font-weight: 600;
+ color: var(--primary);
+ }
+
+ .close-btn {
+ width: 1.6rem;
+ height: 1.6rem;
+ padding: 0.2rem;
+ background: transparent;
+ border: none;
+ border-radius: var(--curve-factor-small);
+ color: var(--primary);
+ cursor: pointer;
+ opacity: var(--dimming-factor);
+
+ svg { width: 100%; height: 100%; fill: currentColor; }
+
+ &:hover, &:focus-visible {
+ opacity: 1;
+ background: var(--primary);
+ color: var(--config-settings-background);
+ outline: none;
+ }
+ }
+}
+
+.section {
+ display: flex;
+ gap: 0.6rem;
+
+ &.grid-2 {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ gap: 0.75rem;
+ }
+}
+
+.actions-row .action-btn {
+ flex: 1;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.45rem;
+ padding: 0.55rem 0.6rem;
+ background: var(--background);
+ color: var(--primary);
+ border: 1px solid var(--primary);
+ border-radius: var(--curve-factor);
+ font-size: 0.85rem;
+ font-weight: 500;
+ cursor: pointer;
+
+ svg { width: 1rem; height: 1rem; fill: currentColor; flex-shrink: 0; }
+
+ &:hover:not(:disabled), &:focus-visible {
+ background: var(--primary);
+ color: var(--background);
+ outline: none;
+ }
+
+ &:disabled {
+ opacity: 0.45;
+ cursor: not-allowed;
+ }
+}
+
+.view-switch-row {
+ padding: 0.25rem;
+ background: var(--background);
+ border: 1px solid var(--primary);
+ border-radius: var(--curve-factor);
+ gap: 0.25rem;
+
+ .view-btn {
+ flex: 1;
+ display: inline-flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 0.2rem;
+ padding: 0.45rem 0.25rem;
+ color: var(--primary);
+ text-decoration: none;
+ border-radius: var(--curve-factor-small);
+ font-size: 0.7rem;
+ font-weight: 500;
+ text-transform: uppercase;
+ letter-spacing: 0.06em;
+
+ svg { width: 1rem; height: 1rem; fill: currentColor; }
+
+ &:hover, &:focus-visible {
+ background: color-mix(in srgb, var(--primary) 15%, transparent);
+ outline: none;
+ }
+
+ &.is-active {
+ background: var(--primary);
+ color: var(--background);
+ }
+ }
+}
+
+.auth-row {
+ padding-top: 0.75rem;
+ border-top: 1px dashed var(--primary);
+}
+</style>
diff --git a/src/components/Settings/SettingsContainer.vue b/src/components/Settings/SettingsContainer.vue
index a08ca8e4..553327b1 100644
--- a/src/components/Settings/SettingsContainer.vue
+++ b/src/components/Settings/SettingsContainer.vue
@@ -1,233 +1,161 @@
<template>
- <section v-bind:class="{ 'settings-hidden': !settingsVisible }">
- <SearchBar ref="SearchBar"
- @user-is-searchin="userIsTypingSomething"
+ <section>
+ <SearchBar
v-if="searchVisible"
+ ref="SearchBar"
+ @user-is-searchin="userIsTypingSomething"
/>
- <div class="options-outer">
- <div :class="`options-container ${!settingsVisible ? 'hide' : ''}`">
- <ThemeSelector />
- <LayoutSelector :displayLayout="$store.getters.layout" />
- <ItemSizeSelector :iconSize="iconSize" />
- <ConfigLauncher />
- <AuthButtons v-if="userState !== 0" :userType="userState" />
- </div>
- <div :class="`show-hide-container ${settingsVisible? 'hide-btn' : 'show-btn'}`">
- <button @click="toggleSettingsVisibility()"
- v-tooltip="`${settingsVisible? 'Hide' : 'Open'} Settings Menu`" tabindex="-2">
- <IconClose v-if="settingsVisible" />
- <IconOpen v-else />
- </button>
- </div>
+ <div class="options-outer" v-click-outside="closePanel">
+ <button
+ type="button"
+ class="options-trigger"
+ :class="{ open: panelOpen }"
+ @click.stop="togglePanel"
+ v-tooltip="$t('settings.options-tooltip')"
+ :aria-label="$t('settings.options-tooltip')"
+ :aria-expanded="panelOpen"
+ tabindex="-2"
+ >
+ <IconOptions />
+ </button>
+ <transition name="panel-fade">
+ <OptionsPanel v-if="panelOpen" @close="closePanel" />
+ </transition>
</div>
+
+ <modal
+ :name="modalNames.CONF_EDITOR"
+ :resizable="true"
+ width="60%"
+ height="85%"
+ classes="dashy-modal"
+ @closed="onConfigClosed"
+ >
+ <ConfigContainer :config="combinedConfig" />
+ </modal>
+ <modal
+ :name="modalNames.LANG_SWITCHER"
+ :resizable="true"
+ width="35%"
+ height="60%"
+ classes="dashy-modal"
+ >
+ <LanguageSwitcher />
+ </modal>
+
<AppInfoModal />
</section>
</template>
<script>
import SearchBar from '@/components/Settings/SearchBar';
-import ConfigLauncher from '@/components/Settings/ConfigLauncher';
-import ThemeSelector from '@/components/Settings/ThemeSelector';
-import LayoutSelector from '@/components/Settings/LayoutSelector';
-import ItemSizeSelector from '@/components/Settings/ItemSizeSelector';
-import AuthButtons from '@/components/Settings/AuthButtons';
+import OptionsPanel from '@/components/Settings/OptionsPanel';
import AppInfoModal from '@/components/Configuration/AppInfoModal';
-import IconOpen from '@/assets/interface-icons/config-open-settings.svg';
-import IconClose from '@/assets/interface-icons/config-close.svg';
-import {
- localStorageKeys,
- visibleComponents as defaultVisibleComponents,
-} from '@/utils/config/defaults';
-
-import { getUserState } from '@/utils/auth/Auth';
+import ConfigContainer from '@/components/Configuration/ConfigContainer';
+import LanguageSwitcher from '@/components/Settings/LanguageSwitcher';
+import Keys from '@/utils/StoreMutations';
+import { topLevelConfKeys, localStorageKeys, modalNames } from '@/utils/config/defaults';
+import IconOptions from '@/assets/interface-icons/config-open-settings.svg';
export default {
name: 'SettingsContainer',
- props: {
- displayLayout: String,
- iconSize: String,
- externalThemes: Object,
- },
components: {
SearchBar,
- ConfigLauncher,
- ThemeSelector,
- LayoutSelector,
- ItemSizeSelector,
- AuthButtons,
+ OptionsPanel,
AppInfoModal,
- IconOpen,
- IconClose,
- },
- data() {
- return {
- settingsVisible: true,
- };
+ ConfigContainer,
+ LanguageSwitcher,
+ IconOptions,
},
+ data: () => ({ panelOpen: false, modalNames }),
computed: {
- sections() {
- return this.$store.getters.sections;
- },
- appConfig() {
- return this.$store.getters.appConfig;
- },
- pageInfo() {
- return this.$store.getters.pageInfo;
- },
- /**
- * Determines which button should display, based on the user type
- * 0 = Auth not configured, don't show anything
- * 1 = Auth configured, and user logged in, show logout button
- * 2 = Auth configured, guest access enabled, and not logged in, show login
- * Note that if auth is enabled, but not guest access, and user not logged in,
- * then they will never be able to view the homepage, so no button needed
- */
- userState() {
- return getUserState();
- },
- /* Object indicating which components should be hidden, based on user preferences */
- visibleComponents() {
- return this.$store.getters.visibleComponents;
- },
searchVisible() {
return this.$store.getters.visibleComponents.searchBar;
},
- },
- mounted() {
- this.settingsVisible = this.getSettingsVisibility();
+ combinedConfig() {
+ const app = this.$store.getters.appConfig;
+ return {
+ [topLevelConfKeys.APP_CONFIG]: {
+ ...app,
+ theme: localStorage[localStorageKeys.THEME] || app.theme,
+ },
+ [topLevelConfKeys.PAGE_INFO]: this.$store.getters.pageInfo,
+ [topLevelConfKeys.SECTIONS]: this.$store.getters.sections,
+ };
+ },
},
methods: {
- /* Emit event to begin/ continue searching */
- userIsTypingSomething(something) {
- this.$emit('user-is-searchin', something);
- },
- /* Call function to clear search field, remove focus and reset results */
+ userIsTypingSomething(q) { this.$emit('user-is-searchin', q); },
clearFilterInput() {
if (this.$refs.SearchBar) this.$refs.SearchBar.clearFilterInput();
},
- getInitialTheme() {
- return this.appConfig.theme || '';
- },
- /* Gets user themes if available */
- getUserThemes() {
- const userThemes = this.appConfig.cssThemes || [];
- if (typeof userThemes === 'string') return [userThemes];
- return userThemes;
- },
- /* Show / hide settings */
- toggleSettingsVisibility() {
- this.settingsVisible = !this.settingsVisible;
- localStorage.setItem(localStorageKeys.HIDE_SETTINGS, this.settingsVisible);
- },
- /* Get initial settings visibility, either from appConfig, local storage or browser type */
- getSettingsVisibility() {
- const screenWidth = document.body.clientWidth;
- if (screenWidth && screenWidth < 600) return false;
- if ((this.visibleComponents || {}).settings === false) return false;
- if (localStorage[localStorageKeys.HIDE_SETTINGS] === 'false') return false;
- return defaultVisibleComponents.settings;
- },
+ togglePanel() { this.panelOpen = !this.panelOpen; },
+ closePanel() { this.panelOpen = false; },
+ onConfigClosed() { this.$store.commit(Keys.SET_MODAL_OPEN, false); },
},
};
</script>
<style scoped lang="scss">
+section {
+ position: relative;
+ display: flex;
+ align-items: stretch;
+ background: linear-gradient(0deg, var(--background) 0%, var(--background-darker) 100%);
+ box-shadow: var(--settings-container-shadow);
+}
-@import '@/styles/media-queries.scss';
+.options-outer {
+ position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ flex: 1;
+ padding: 0.25rem 0.5rem;
+ background: var(--settings-background);
+ border-radius: var(--curve-factor-navbar) 0 0;
+}
- section {
- display: flex;
- align-items: center;
- align-items: stretch;
- background: linear-gradient(0deg, var(--background) 0%, var(--background-darker) 100%);
- box-shadow: var(--settings-container-shadow);
- }
- .options-outer {
- display: flex;
- position: relative;
- flex: 1;
- background: var(--settings-background);
- border-radius: var(--curve-factor-navbar);
- }
- .options-container {
- display: flex;
- flex-direction: row;
- align-items: flex-end;
- justify-content: flex-end;
- flex: 1;
- padding: 0.5rem 1.5rem 0.5rem 1rem;
- border-radius: var(--curve-factor-navbar) 0 0;
- background: var(--settings-background);
- div {
- margin-left: 0.5rem;
- opacity: var(--dimming-factor);
- opacity: 1;
- &:hover { opacity: 1; }
- }
- &.hide {
- display: none;
- }
- @include very-tiny-phone {
- flex-direction: column;
- align-items: baseline;
- div {
- width: 100%;
- text-align: center;
- .theme-selector-section { justify-content: center; }
- }
- }
- }
+.options-trigger {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 2rem;
+ height: 2rem;
+ padding: 0.3rem;
+ background: none;
+ border: 1px solid transparent;
+ border-radius: var(--curve-factor);
+ color: var(--settings-text-color);
+ cursor: pointer;
+ opacity: var(--dimming-factor);
- .show-hide-container {
- display: flex;
- // align-items: center;
- background: var(--settings-background);
- color: var(--settings-text-color);
- width: 1.5rem;
- position: absolute;
- top: 4px;
- right: 4px;
- &.show-btn {
- width: 2rem;
- top: 0.5rem;
- right: 0.5rem;
- @include phone {
- top: -3rem !important;
- }
- }
- button {
- width: 100%;
- padding: 2px 2px 0 2px;
- margin: 2px;
- border-radius: var(--curve-factor);
- height: fit-content;
- background: none;
- border: none;
- color: var(--settings-text-color);
- cursor: pointer;
- opacity: var(--dimming-factor);
- }
- &:hover button {
- background: var(--settings-text-color);
- color: var(--settings-background);
- }
+ svg {
+ width: 100%;
+ height: 100%;
+ fill: currentColor;
}
- @include tablet {
- section {
- display: block;
- margin: 0 auto;
- background: none;
- .options-container {
- justify-content: center;
- }
- }
+ &:hover, &.open, &:focus-visible {
+ opacity: 1;
+ background: var(--primary);
+ color: var(--background);
+ outline: none;
}
+}
- @include phone {
- .options-container, .show-hide-button {
- // display: none;
- }
- }
+.panel-fade-enter-active,
+.panel-fade-leave-active {
+ transition: opacity 0.15s ease, transform 0.15s ease;
+}
+.panel-fade-enter-from,
+.panel-fade-leave-to {
+ opacity: 0;
+ transform: translateY(-0.25rem);
+}
+@media (prefers-reduced-motion: reduce) {
+ .panel-fade-enter-active,
+ .panel-fade-leave-active { transition: none; }
+}
</style>
diff --git a/src/components/Settings/ThemeSelector.vue b/src/components/Settings/ThemeSelector.vue
index 16d764a8..405ee5cf 100644
--- a/src/components/Settings/ThemeSelector.vue
+++ b/src/components/Settings/ThemeSelector.vue
@@ -74,10 +74,9 @@ export default {
.theme-dropdown {
div.vs__dropdown-toggle {
+ width: 100%;
border-color: var(--settings-text-color);
border-radius: var(--curve-factor);
- min-width: 8rem;
- max-width: 16rem;
height: 1.8rem;
font-size: 0.85rem;
cursor: pointer;
@@ -110,31 +109,26 @@ export default {
.theme-selector-section {
display: flex;
- flex-direction: row;
- align-items: flex-start;
- justify-content: center;
- height: 100%;
- span.theme-label {
- font-size: 1rem;
- color: var(--settings-text-color);
- margin: 1px 0 2px 0;
+ align-items: flex-end;
+ gap: 0.5rem;
+ width: 100%;
+ > div {
+ flex: 1;
+ min-width: 0;
}
}
svg.color-button {
- path {
- fill: var(--settings-text-color);
- }
- width: 1rem;
- height: 1rem;
- padding: 0.2rem;
- margin: 0.5rem;
- align-self: flex-end;
- text-align: center;
+ width: 1.8rem;
+ height: 1.8rem;
+ padding: 0.4rem;
+ box-sizing: border-box;
+ flex-shrink: 0;
background: var(--background);
- border: 1px solid var(--settings-text-color);;
+ border: 1px solid var(--settings-text-color);
border-radius: var(--curve-factor);
cursor: pointer;
+ path { fill: var(--settings-text-color); }
&:hover, &.selected {
background: var(--settings-text-color);
path { fill: var(--background); }
diff --git a/src/styles/global-styles.scss b/src/styles/global-styles.scss
index 2887bf8a..64911ac3 100644
--- a/src/styles/global-styles.scss
+++ b/src/styles/global-styles.scss
@@ -55,6 +55,40 @@ button svg, a svg {
background: #00000080;
}
+/* Small uppercase label above a form control */
+.options-label,
+.theme-label {
+ display: block;
+ margin-bottom: 0.3rem;
+ font-size: 0.7rem;
+ font-weight: 600;
+ text-transform: uppercase;
+ letter-spacing: 0.06em;
+ color: var(--primary);
+ opacity: 0.75;
+}
+
+/* Row of icon buttons used as a multi-option toggle */
+.display-options {
+ display: flex;
+ gap: 0.35rem;
+ color: var(--settings-text-color);
+ svg {
+ flex: 1;
+ height: 1.75rem;
+ padding: 0.3rem;
+ box-sizing: border-box;
+ background: var(--background);
+ border: 1px solid currentColor;
+ border-radius: var(--curve-factor);
+ cursor: pointer;
+ &:hover, &.selected {
+ background: var(--settings-text-color);
+ color: var(--background);
+ }
+ }
+}
+
/* v-select, dropdown styles */
.v-select {
.vs__dropdown-toggle {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 5c440adb..62567664 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -4,11 +4,6 @@
<!-- Search bar, layout options and settings -->
<SettingsContainer ref="filterComp"
@user-is-searchin="searching"
- @change-modal-visibility="updateModalVisibility"
- :displayLayout="layout"
- :iconSize="itemSizeBound"
- :externalThemes="getExternalCSSLinks()"
- :modalOpen="modalOpen"
class="settings-outer"
/>
<!-- Show back button, when on single-section view -->
@@ -162,24 +157,6 @@ export default {
if (!match) ErrorHandler(`No section named '${sectionTitle}' was found`);
return match ? [match] : undefined;
},
- /* Returns an array of links to external CSS from the Config */
- getExternalCSSLinks() {
- const availibleThemes = {};
- if (this.appConfig) {
- if (this.appConfig.externalStyleSheet) {
- const externals = this.appConfig.externalStyleSheet;
- if (Array.isArray(externals)) {
- externals.forEach((ext, i) => {
- availibleThemes[`External Stylesheet ${i + 1}`] = ext;
- });
- } else {
- availibleThemes['External Stylesheet'] = this.appConfig.externalStyleSheet;
- }
- }
- }
- availibleThemes.Default = '#';
- return availibleThemes;
- },
readActiveColCount() {
const { sectionsContainer } = this.$refs;
if (!sectionsContainer) return;