π A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!
Vue awesomedashboarddockerhomelabhomepagemitnodejsorganizationproductivitypwaself-hostedstartpagevue
:construction: WIP Built the form for theme color configurator
Alicia Sykes2f04a5ec6c96
diff --git a/src/assets/interface-icons/config-cancel.svg b/src/assets/interface-icons/config-cancel.svgnew file mode 100644index 00000000..93ff381c--- /dev/null+++ b/src/assets/interface-icons/config-cancel.svg@@ -0,0 +1 @@+<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="window-close" class="svg-inline--fa fa-window-close fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M464 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h416c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm0 394c0 3.3-2.7 6-6 6H54c-3.3 0-6-2.7-6-6V86c0-3.3 2.7-6 6-6h404c3.3 0 6 2.7 6 6v340zM356.5 194.6L295.1 256l61.4 61.4c4.6 4.6 4.6 12.1 0 16.8l-22.3 22.3c-4.6 4.6-12.1 4.6-16.8 0L256 295.1l-61.4 61.4c-4.6 4.6-12.1 4.6-16.8 0l-22.3-22.3c-4.6-4.6-4.6-12.1 0-16.8l61.4-61.4-61.4-61.4c-4.6-4.6-4.6-12.1 0-16.8l22.3-22.3c4.6-4.6 12.1-4.6 16.8 0l61.4 61.4 61.4-61.4c4.6-4.6 12.1-4.6 16.8 0l22.3 22.3c4.7 4.6 4.7 12.1 0 16.8z"></path></svg>\ No newline at end of filediff --git a/src/components/Settings/CustomThemeMaker.vue b/src/components/Settings/CustomThemeMaker.vueindex 4b32a9e2..fa674374 100644--- a/src/components/Settings/CustomThemeMaker.vue+++ b/src/components/Settings/CustomThemeMaker.vue@@ -1,23 +1,29 @@<template><div class="theme-configurator-wrapper"><h3 class="configurator-title">Custom Configurator</h3>- <div class="color-row">- <label for="col">Primary</label>+ <div class="color-row" v-for="colorName in Object.keys(customColors)" :key="colorName">+ <label :for="`color-input-${colorName}`" class="color-name">+ {{colorName.replace('-', ' ')}}+ </label><v-swatches- v-model="color"+ v-model="customColors[colorName]"show-fallbackfallback-input-type="color"popover-x="left"><input- id="col"+ :id="`color-input-${colorName}`"slot="trigger"- :value="color"+ :value="customColors[colorName]"class="swatch-input form__input__element"readonly- :style="`background:${color}; color: ${getForegroundColor(color)};`"+ :style="makeSwatchStyles(colorName)"/></v-swatches>+ </div> <!-- End of color list -->+ <div class="action-buttons">+ <Button><SaveIcon />Save</Button>+ <Button><CancelIcon />Cancel</Button></div></div></template>@@ -26,28 +32,40 @@import VSwatches from 'vue-swatches';import 'vue-swatches/dist/vue-swatches.css';+import Button from '@/components/FormElements/Button';+import SaveIcon from '@/assets/interface-icons/save-config.svg';+import CancelIcon from '@/assets/interface-icons/config-cancel.svg';++const mainVariables = ['primary', 'background', 'background-darker'];+export default {name: 'ThemeMaker',components: {VSwatches,+ Button,+ SaveIcon,+ CancelIcon,+ },+ data() {+ return {+ customColors: this.makeInitialData(mainVariables),+ };},- data: () => ({- color: '#A463BF',- }),methods: {- /* Returns a complmenting text color for the palete foreground */- /* White if the color is dark, otherwise black */- getForegroundColor(colorHex) {- const hexToRgb = (hex) => {- const colorParts = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);- const parse = (index) => parseInt(colorParts[index], 16);- return colorParts ? { r: parse(1), g: parse(2), b: parse(3) } : null;- };- const getLightness = (rgb) => (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;- return getLightness(hexToRgb(colorHex)) < 100 ? 'white' : 'black';+ /* Finds the current dominent value for a given CSS variable */+ getCssVariableValue(cssVar) {+ return getComputedStyle(document.documentElement).getPropertyValue(cssVar) || 'inherit';+ },+ /* Returns a JSON object, with the variable name as key, and color as value */+ makeInitialData(variableArray) {+ const data = {};+ variableArray.forEach((colorName) => {+ data[colorName] = this.getCssVariableValue(`--${colorName}`);+ });+ return data;},/* If a builtin theme is applied, grab it's colors */- getAllThemeNames() {+ findAllVariableNames() {Array.from(document.styleSheets) // Get all stylesheets, filter out irrelevant ones.filter(sheet => sheet.href === null || sheet.href.startsWith(window.location.origin)).reduce(@@ -62,6 +80,24 @@ export default {[],);},+ /* Returns a complmenting text color for the palete foreground */+ /* White if the color is dark, otherwise black */+ getForegroundColor(colorHex) {+ const hexToRgb = (hex) => {+ const colorParts = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);+ if (!colorParts || colorParts.length < 3) return 'pink';+ const parse = (index) => parseInt(colorParts[index], 16);+ return colorParts ? { r: parse(1), g: parse(2), b: parse(3) } : null;+ };+ const getLightness = (rgb) => (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;+ return getLightness(hexToRgb(colorHex.trim())) < 100 ? 'white' : 'black';+ },+ /* The contents of the style attribute, to set background and text color of swatch */+ makeSwatchStyles(colorName) {+ const contrastingColor = this.getForegroundColor(this.customColors[colorName]);+ return `background:${this.customColors[colorName]};`+ + `color:${contrastingColor}; border: 1px solid ${contrastingColor}`;+ },},};</script>@@ -70,10 +106,11 @@ export default {div.theme-configurator-wrapper {position: absolute;- right: 6rem;- top: 3rem;- width: 12rem;+ top: 4rem;+ right: 1rem;+ width: 16rem;min-height: 12rem;+ max-height: 20rem;padding: 0.5rem;z-index: 5;background: var(--config-settings-background);@@ -83,6 +120,7 @@ div.theme-configurator-wrapper {h3.configurator-title {text-align: center;+ font-weight: normal;margin: 0.4rem;}@@ -90,8 +128,11 @@ div.theme-configurator-wrapper {display: flex;align-items: center;justify-content: space-between;- padding: 0.2rem 0;+ padding: 0.25rem 0;&:not(:last-child) { border-bottom: 1px dashed var(--primary); }+ label.color-name {+ text-transform: capitalize;+ }}input.swatch-input {@@ -114,4 +155,13 @@ div.theme-configurator-wrapper {}}+div.action-buttons {+ display: flex;+ button {+ min-width: 6rem;+ padding: 0.25rem 0.5rem;+ margin: 1rem 0.5rem 0.5rem;+ }+}+</style>diff --git a/src/components/Settings/ThemeSelector.vue b/src/components/Settings/ThemeSelector.vueindex c910f965..20ed3c49 100644--- a/src/components/Settings/ThemeSelector.vue+++ b/src/components/Settings/ThemeSelector.vue@@ -1,5 +1,5 @@<template>- <div class="theme-selector-section" v-if="themes" v-click-outside="closeThemeConfigurator">+ <div class="theme-selector-section" v-click-outside="closeThemeConfigurator"><div><span class="theme-label">Theme</span><v-select@@ -11,7 +11,6 @@</div><IconPaletteclass="color-button"- v-if="selectedTheme === 'custom'"@click="openThemeConfigurator"/><CustomThemeMaker v-if="themeConfiguratorOpen" />@@ -28,7 +27,7 @@ import IconPalette from '@/assets/interface-icons/config-color-palette.svg';export default {name: 'ThemeSelector',props: {- themes: Object,+ externalThemes: Object,confTheme: String,userThemes: Array,},@@ -37,29 +36,33 @@ export default {IconPalette,},watch: {- selectedTheme(newTheme) { this.updateTheme(newTheme); },+ /* When the theme changes, then call the update method */+ selectedTheme(newTheme) {+ this.updateTheme(newTheme);+ },},data() {return {selectedTheme: this.getInitialTheme(),builtInThemes: [...Defaults.builtInThemes, ...this.userThemes],themeHelper: new LoadExternalTheme(),- // modalName: modalNames.THEME_MAKER,- themeConfiguratorOpen: false,+ themeConfiguratorOpen: false, // Control the opening of theme config popupApplyLocalTheme,ApplyCustomTheme,};},computed: {+ /* Combines all theme names (builtin and user defined) together */themeNames: function themeNames() {- const externalThemeNames = Object.keys(this.themes);+ const externalThemeNames = Object.keys(this.externalThemes);const specialThemes = ['custom'];- return [...specialThemes, ...externalThemeNames, ...this.builtInThemes];+ return [...externalThemeNames, ...this.builtInThemes, ...specialThemes];},},created() {- const added = Object.keys(this.themes).map(- name => this.themeHelper.add(name, this.themes[name]),+ // Pass all user custom stylesheets to the themehelper+ const added = Object.keys(this.externalThemes).map(+ name => this.themeHelper.add(name, this.externalThemes[name]),);// Quicker loading, if the theme is local we can apply it immidiatleyif (this.isThemeLocal(this.selectedTheme)) {@@ -76,12 +79,15 @@ export default {getInitialTheme() {return localStorage[localStorageKeys.THEME] || this.confTheme || Defaults.theme;},+ /* Determines if a given theme is local / not a custom user stylesheet */isThemeLocal(themeToCheck) {return this.builtInThemes.includes(themeToCheck);},+ /* Opens the theme color configurator popup */openThemeConfigurator() {this.themeConfiguratorOpen = true;},+ /* Closes the theme color configurator popup */closeThemeConfigurator() {this.themeConfiguratorOpen = false;},@@ -100,6 +106,7 @@ export default {}localStorage.setItem(localStorageKeys.THEME, newTheme);},+ /* Removes any applied themes */resetToDefault() {document.getElementsByTagName('html')[0].removeAttribute('data-theme');},diff --git a/src/utils/ThemeHelper.js b/src/utils/ThemeHelper.jsindex 0883f39d..adebbd3c 100644--- a/src/utils/ThemeHelper.js+++ b/src/utils/ThemeHelper.js@@ -12,7 +12,9 @@ export const ApplyLocalTheme = (newTheme) => {};/* Sets specific CSS variables, for the users custom theme */-export const ApplyCustomTheme = () => { };+export const ApplyCustomTheme = () => {+ ApplyLocalTheme('custom');+};/*** A function for pre-loading, and easy switching of external stylesheets