From 46ef63fb9f3c2688118a9d1511293128cfdfe4c9 Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Sun, 10 Jan 2021 02:04:35 +0200
Subject: feat: add dynamic settings page rendering based on the Joi object

---
 src/site/pages/dashboard/admin/settings.vue | 117 ++--------------------------
 1 file changed, 7 insertions(+), 110 deletions(-)

(limited to 'src/site/pages')

diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index 0a43dcd..bac9683 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -11,114 +11,7 @@
 					</h2>
 					<hr>
 
-					<b-field
-						label="Service name"
-						message="Please enter the name which this service is gonna be identified as"
-						horizontal>
-						<b-input
-							v-model="settings.serviceName"
-							class="chibisafe-input"
-							expanded />
-					</b-field>
-
-					<b-field
-						label="Upload folder"
-						message="Where to store the files relative to the working directory"
-						horizontal>
-						<b-input
-							v-model="settings.uploadFolder"
-							class="chibisafe-input"
-							expanded />
-					</b-field>
-
-					<b-field
-						label="Links per album"
-						message="Maximum links allowed per album"
-						horizontal>
-						<b-input
-							v-model="settings.linksPerAlbum"
-							class="chibisafe-input"
-							type="number"
-							expanded />
-					</b-field>
-
-					<b-field
-						label="Max upload size"
-						message="Maximum allowed file size in MB"
-						horizontal>
-						<b-input
-							v-model="settings.maxUploadSize"
-							class="chibisafe-input"
-							expanded />
-					</b-field>
-
-					<b-field
-						label="Filename length"
-						message="How many characters long should the generated filenames be"
-						horizontal>
-						<b-input
-							v-model="settings.filenameLength"
-							class="chibisafe-input"
-							expanded />
-					</b-field>
-
-					<b-field
-						label="Album link length"
-						message="How many characters a link for an album should have"
-						horizontal>
-						<b-input
-							v-model="settings.albumLinkLength"
-							class="chibisafe-input"
-							expanded />
-					</b-field>
-
-					<b-field
-						label="Generate thumbnails"
-						message="Generate thumbnails when uploading a file if possible"
-						horizontal>
-						<b-switch
-							v-model="settings.generateThumbnails"
-							:true-value="true"
-							:false-value="false" />
-					</b-field>
-
-					<b-field
-						label="Generate zips"
-						message="Allow generating zips to download entire albums"
-						horizontal>
-						<b-switch
-							v-model="settings.generateZips"
-							:true-value="true"
-							:false-value="false" />
-					</b-field>
-
-					<b-field
-						label="Public mode"
-						message="Enable anonymous uploades"
-						horizontal>
-						<b-switch
-							v-model="settings.publicMode"
-							:true-value="true"
-							:false-value="false" />
-					</b-field>
-
-					<b-field
-						label="Enable creating account"
-						message="Enable creating new accounts in the platform"
-						horizontal>
-						<b-switch
-							v-model="settings.enableAccounts"
-							:true-value="true"
-							:false-value="false" />
-					</b-field>
-
-					<div class="mb2 mt2 text-center">
-						<button
-							class="button is-primary"
-							@click="promptRestartService">
-							Save and restart service
-						</button>
-					</div>
+					<JoiObject :keys="settingsSchema.keys" :values="{}" />
 				</div>
 			</div>
 		</div>
@@ -128,21 +21,25 @@
 <script>
 import { mapState } from 'vuex';
 import Sidebar from '~/components/sidebar/Sidebar.vue';
+import JoiObject from '~/components/settings/JoiObject.vue';
 
 export default {
 	components: {
-		Sidebar
+		Sidebar,
+		JoiObject
 	},
 	middleware: ['auth', 'admin', ({ store }) => {
 		try {
 			store.dispatch('admin/fetchSettings');
+			store.dispatch('admin/getSettingsSchema');
 		} catch (e) {
 			// eslint-disable-next-line no-console
 			console.error(e);
 		}
 	}],
 	computed: mapState({
-		settings: state => state.admin.settings
+		settings: state => state.admin.settings,
+		settingsSchema: state => state.admin.settingsSchema
 	}),
 	methods: {
 		promptRestartService() {
-- 
cgit v1.2.3


From d69fcd856a47b04f964c658edfa2bed3e6f0abc1 Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Mon, 11 Jan 2021 12:51:45 +0200
Subject: feat: add sections to settings object meta

---
 src/site/pages/dashboard/admin/settings.vue | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'src/site/pages')

diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index bac9683..5a28dda 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -11,7 +11,8 @@
 					</h2>
 					<hr>
 
-					<JoiObject :keys="settingsSchema.keys" :values="{}" />
+					<!-- TODO: IMPLEMENT SECTIONS (v-for JoiObject for each section maybe?) -->
+					<JoiObject :keys="sectionedSettings" :values="{}" />
 				</div>
 			</div>
 		</div>
@@ -31,16 +32,33 @@ export default {
 	middleware: ['auth', 'admin', ({ store }) => {
 		try {
 			store.dispatch('admin/fetchSettings');
+			// TODO: Implement merging fields with values from the db (no endpoint to fetch settings yet)
 			store.dispatch('admin/getSettingsSchema');
 		} catch (e) {
 			// eslint-disable-next-line no-console
 			console.error(e);
 		}
 	}],
-	computed: mapState({
-		settings: state => state.admin.settings,
-		settingsSchema: state => state.admin.settingsSchema
-	}),
+	computed: {
+		...mapState({
+			settings: state => state.admin.settings,
+			settingsSchema: state => state.admin.settingsSchema
+		}),
+		sectionedSettings() {
+			return Object.entries(this.settings).reduce((acc, { key, field }) => {
+				if (!field.meta) acc['Other'] = { ...acc['Other'], [key]: field };
+
+				const { sectionName } = field.metas.find(e => e.sectionName);
+				if (sectionName) {
+					acc[sectionName] = { ...acc[sectionName], [key]: field };
+				} else {
+					acc['Other'] = { ...acc['Other'], [key]: field };
+				}
+
+				return acc;
+			}, {});
+		}
+	},
 	methods: {
 		promptRestartService() {
 			this.$buefy.dialog.confirm({
-- 
cgit v1.2.3


From dc4f3a6557cc5f4ddf3d9a9bc8fad4f3bdc40c72 Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Mon, 11 Jan 2021 18:57:19 +0200
Subject: fix: sections not rendering

---
 src/site/pages/dashboard/admin/settings.vue | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'src/site/pages')

diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index 5a28dda..bd23b1c 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -11,8 +11,20 @@
 					</h2>
 					<hr>
 
-					<!-- TODO: IMPLEMENT SECTIONS (v-for JoiObject for each section maybe?) -->
-					<JoiObject :keys="sectionedSettings" :values="{}" />
+					<div v-for="[sectionName, fields] in Object.entries(sectionedSettings)" :key="sectionName" class="block">
+						<h5 class="title is-5 has-text-grey-lighter">
+							{{ sectionName }}
+						</h5>
+						<JoiObject :keys="fields" :values="{}" />
+					</div>
+
+					<div class="mb2 mt2 text-center">
+						<button
+							class="button is-primary"
+							@click="promptRestartService">
+							Save settings
+						</button>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -45,12 +57,12 @@ export default {
 			settingsSchema: state => state.admin.settingsSchema
 		}),
 		sectionedSettings() {
-			return Object.entries(this.settings).reduce((acc, { key, field }) => {
-				if (!field.meta) acc['Other'] = { ...acc['Other'], [key]: field };
+			return Object.entries(this.settingsSchema.keys).reduce((acc, [key, field]) => {
+				if (!field.metas) acc['Other'] = { ...acc['Other'], [key]: field };
 
-				const { sectionName } = field.metas.find(e => e.sectionName);
-				if (sectionName) {
-					acc[sectionName] = { ...acc[sectionName], [key]: field };
+				const sectionMeta = field.metas.find(e => e.section);
+				if (sectionMeta) {
+					acc[sectionMeta.section] = { ...acc[sectionMeta.section], [key]: field };
 				} else {
 					acc['Other'] = { ...acc['Other'], [key]: field };
 				}
-- 
cgit v1.2.3


From 6fe5055e9d62a6ae06128bf61a55960537e02091 Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Thu, 17 Jun 2021 01:13:15 +0300
Subject: feat: show setting values on the settings page and implement sending
 to backend (no saving yet)

---
 src/site/pages/dashboard/admin/settings.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'src/site/pages')

diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index 3b2e99b..7346729 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -15,7 +15,7 @@
 						<h5 class="title is-5 has-text-grey-lighter">
 							{{ sectionName }}
 						</h5>
-						<JoiObject :keys="fields" :values="{}" />
+						<JoiObject ref="jois" :settings="fields" />
 					</div>
 
 					<div class="mb2 mt2 text-center">
@@ -49,13 +49,13 @@ export default {
 		}),
 		sectionedSettings() {
 			return Object.entries(this.settingsSchema.keys).reduce((acc, [key, field]) => {
-				if (!field.metas) acc['Other'] = { ...acc['Other'], [key]: field };
+				if (!field.metas) acc.Other = { ...acc.Other, [key]: field };
 
 				const sectionMeta = field.metas.find(e => e.section);
 				if (sectionMeta) {
 					acc[sectionMeta.section] = { ...acc[sectionMeta.section], [key]: field };
 				} else {
-					acc['Other'] = { ...acc['Other'], [key]: field };
+					acc.Other = { ...acc.Other, [key]: field };
 				}
 
 				return acc;
@@ -64,18 +64,26 @@ export default {
 	},
 	async asyncData({ app }) {
 		await app.store.dispatch('admin/fetchSettings');
-		// TODO: Implement merging fields with values from the db (no endpoint to fetch settings yet)
 		await app.store.dispatch('admin/getSettingsSchema');
+		await app.store.commit('admin/populateSchemaWithValues');
 	},
 	methods: {
 		promptRestartService() {
 			this.$buefy.dialog.confirm({
 				message: 'Keep in mind that restarting only works if you have PM2 or something similar set up. Continue?',
-				onConfirm: () => this.restartService()
+				onConfirm: () => this.saveSettings()
 			});
 		},
-		restartService() {
-			this.$handler.executeAction('admin/restartService');
+		saveSettings() {
+			// handle refs
+			let settings = {};
+			for (const joiComponent of this.$refs.jois) {
+				settings = { ...settings, ...joiComponent.getValues() };
+			}
+
+			this.$handler.executeAction('admin/saveSettings', settings);
+			// restart service
+			// this.$handler.executeAction('admin/restartService');
 		}
 	},
 	head() {
-- 
cgit v1.2.3


From 0cae7e9eda3b62c17cfa7ec620913f4a504bc5ee Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Thu, 17 Jun 2021 16:06:53 +0300
Subject: feat: show validation errors from joi on the frontend

---
 src/site/pages/dashboard/admin/settings.vue | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'src/site/pages')

diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index 7346729..51e5ea8 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -15,7 +15,7 @@
 						<h5 class="title is-5 has-text-grey-lighter">
 							{{ sectionName }}
 						</h5>
-						<JoiObject ref="jois" :settings="fields" />
+						<JoiObject ref="jois" :settings="fields" :errors="validationErrors" />
 					</div>
 
 					<div class="mb2 mt2 text-center">
@@ -42,6 +42,11 @@ export default {
 		JoiObject
 	},
 	middleware: ['auth', 'admin'],
+	data() {
+		return {
+			validationErrors: {}
+		};
+	},
 	computed: {
 		...mapState({
 			settings: state => state.admin.settings,
@@ -74,16 +79,24 @@ export default {
 				onConfirm: () => this.saveSettings()
 			});
 		},
-		saveSettings() {
+		async saveSettings() {
 			// handle refs
 			let settings = {};
 			for (const joiComponent of this.$refs.jois) {
 				settings = { ...settings, ...joiComponent.getValues() };
 			}
 
-			this.$handler.executeAction('admin/saveSettings', settings);
-			// restart service
-			// this.$handler.executeAction('admin/restartService');
+			try {
+				await this.$store.dispatch('admin/saveSettings', settings);
+				this.$set(this, 'validationErrors', {});
+
+				await this.$store.dispatch('config/fetchSettings');
+				this.$handler.executeAction('admin/restartService');
+			} catch (e) {
+				if (e.response?.data?.errors) {
+					this.$set(this, 'validationErrors', e.response.data.errors);
+				}
+			}
 		}
 	},
 	head() {
-- 
cgit v1.2.3


From ce893ebc15fda1e77cc39996c26b0ffaef2e51e4 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Thu, 17 Jun 2021 23:31:38 +0900
Subject: chore: prevent restarting for the time being

---
 src/site/pages/dashboard/admin/settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/site/pages')

diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index 51e5ea8..d2448a0 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -91,7 +91,7 @@ export default {
 				this.$set(this, 'validationErrors', {});
 
 				await this.$store.dispatch('config/fetchSettings');
-				this.$handler.executeAction('admin/restartService');
+				// this.$handler.executeAction('admin/restartService');
 			} catch (e) {
 				if (e.response?.data?.errors) {
 					this.$set(this, 'validationErrors', e.response.data.errors);
-- 
cgit v1.2.3


From d4390cce40eef4010e031d25f060de2131fc2635 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Thu, 17 Jun 2021 23:35:44 +0900
Subject: chore: change save msg

---
 src/site/pages/dashboard/admin/settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/site/pages')

diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index d2448a0..3fce282 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -75,7 +75,7 @@ export default {
 	methods: {
 		promptRestartService() {
 			this.$buefy.dialog.confirm({
-				message: 'Keep in mind that restarting only works if you have PM2 or something similar set up. Continue?',
+				message: 'Certain changes need for you to manually restart your chibisafe instance, please do so from the terminal. Continue?',
 				onConfirm: () => this.saveSettings()
 			});
 		},
-- 
cgit v1.2.3