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!

You can now edit sections and items from the UI πŸ€“

Alicia Sykes25dc8cc4ea06
diff --git a/src/components/Configuration/ConfigContainer.vue b/src/components/Configuration/ConfigContainer.vue
index 129cd29e..fae477ea 100644
--- a/src/components/Configuration/ConfigContainer.vue
+++ b/src/components/Configuration/ConfigContainer.vue
@@ -1,12 +1,9 @@
<template>
<Tabs>
- <TabItem name="Edit">
- <div class="first-tab">Todo</div>
+ <TabItem name="Config Editor">
+ <JsonEditor :sections="sections" />
</TabItem>
- <TabItem name="Raw Editor">
- <RawEditor :sections="sections" />
- </TabItem>
- <TabItem name="Download">
+ <TabItem name="View/ Save YAML">
<pre>{{this.jsonParser(this.sections)}}</pre>
</TabItem>
<TabItem name="Add Item">
@@ -19,7 +16,7 @@
import JsonToYaml from '@/utils/JsonToYaml';
import AddItem from '@/components/Configuration/AddItem';
-import RawEditor from '@/components/Configuration/RawEditor';
+import JsonEditor from '@/components/Configuration/JsonEditor';
export default {
name: 'ConfigContainer',
@@ -33,7 +30,7 @@ export default {
},
components: {
AddItem,
- RawEditor,
+ JsonEditor,
},
};
</script>
diff --git a/src/components/Configuration/JsonEditor.vue b/src/components/Configuration/JsonEditor.vue
new file mode 100644
index 00000000..ba2c85ab
--- /dev/null
+++ b/src/components/Configuration/JsonEditor.vue
@@ -0,0 +1,77 @@
+<template>
+ <div class="json-editor-outer">
+ <v-jsoneditor
+ v-model="jsonData"
+ :options="options"
+ height="650px"
+ />
+ <button class="save-button" @click="save()">Save Changes</button>
+
+ </div>
+</template>
+
+<script>
+
+import VJsoneditor from 'v-jsoneditor';
+import { localStorageKeys } from '@/utils/defaults';
+
+export default {
+ name: 'JsonEditor',
+ props: {
+ sections: Array,
+ },
+ components: {
+ VJsoneditor,
+ },
+ data() {
+ return {
+ jsonData: this.sections,
+ options: {
+ mode: 'tree',
+ modes: ['tree', 'code', 'preview'],
+ name: 'sections',
+ },
+ };
+ },
+ methods: {
+ save() {
+ localStorage.setItem(localStorageKeys.CONF_SECTIONS, JSON.stringify(this.jsonData));
+ },
+ },
+};
+</script>
+
+<style lang="scss">
+
+.json-editor-outer {
+ text-align: center;
+}
+
+button.save-button {
+ padding: 0.5rem 1rem;
+ margin: 0.25rem auto;
+ font-size: 1.2rem;
+ background: var(--config-settings-background);
+ color: var(--config-settings-color);
+ border: 1px solid var(--config-settings-color);
+ border-radius: var(--curve-factor);
+ cursor: pointer;
+ &:hover {
+ background: var(--config-settings-color);
+ color: var(--config-settings-background);
+ }
+}
+
+.jsoneditor-menu {
+ background: var(--config-settings-background);
+ color: var(--config-settings-color);
+}
+
+.jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected,
+.jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected:focus,
+.jsoneditor-contextmenu .jsoneditor-menu li button.jsoneditor-selected:hover {
+ background: var(--config-settings-background);
+ color: var(--config-settings-color);
+}
+
+</style>
diff --git a/src/components/Configuration/RawEditor.vue b/src/components/Configuration/RawEditor.vue
deleted file mode 100644
index 7a1fcdb9..00000000
--- a/src/components/Configuration/RawEditor.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
- <div>
- <v-jsoneditor
- v-model="json"
- :options="options"
- :plus="false"
- height="650px"
- @error="onError"
- />
- </div>
-</template>
-
-<script>
-
-import VJsoneditor from 'v-jsoneditor';
-
-export default {
- name: 'RawEditor',
- props: {
- sections: Array,
- },
- components: {
- VJsoneditor,
- },
- data() {
- return {
- json: this.sections,
- };
- },
- methods: {
- onError() {
- console.log('error');
- },
- },
-};
-</script>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/src/styles/color-palette.scss b/src/styles/color-palette.scss
index d340cc63..8d122999 100644
--- a/src/styles/color-palette.scss
+++ b/src/styles/color-palette.scss
@@ -31,7 +31,9 @@
--item-group-shadow: var(--item-shadow);
--settings-container-shadow: none;
- /* Specific components, using variables allows them to be overridden individually */
+ /* Color variables for specific components
+ * all variables are optional, since they inherit initial values from above*
+ * Using specific variables makes overriding for custom themes really easy */
--heading-text-color: var(--primary);
--nav-link-text-color: var(--primary);
--nav-link-background-color: #607d8b33;
@@ -53,4 +55,6 @@
--welcome-popup-text-color: var(--primary);
--config-code-background: #fff;
--config-code-color: var(--background);
+ --config-settings-color: var(--background);
+ --config-settings-background: var(--primary);
}
diff --git a/src/styles/global-styles.scss b/src/styles/global-styles.scss
index 6259a9f2..ded74986 100644
--- a/src/styles/global-styles.scss
+++ b/src/styles/global-styles.scss
@@ -11,7 +11,7 @@ html {
}
/* Default app font face */
-body, div, p, a, span, label, input {
+body, div, p, a, span, label, input, button {
font-family: 'Inconsolata', sans-serif;
}
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 7add7de0..f425233d 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -84,7 +84,10 @@ export default {
getSections(sections) {
// If the user has stored sections in local storage, return those
const localSections = localStorage[localStorageKeys.CONF_SECTIONS];
- if (localSections && localSections.length >= 1) return localSections;
+ if (localSections) {
+ const json = JSON.parse(localSections);
+ if (json.length >= 1) return json;
+ }
// Otherwise, return the usuall data from conf.yml
return sections;
},