From 4839a3b94c5b60c8b1c565930fd692d7351c3c99 Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Mon, 19 Jun 2023 04:06:52 +0200 Subject: [PATCH] Allowing HTML in disclaimer. --- assets/components/container/container.vue | 54 +++++++++++++++++------ 1 file changed, 40 insertions(+), 14 deletions(-) mode change 100644 => 100755 assets/components/container/container.vue diff --git a/assets/components/container/container.vue b/assets/components/container/container.vue old mode 100644 new mode 100755 index d770bbc5e..2b4030b1e --- a/assets/components/container/container.vue +++ b/assets/components/container/container.vue @@ -8,35 +8,40 @@ /> - + -
+

{{ config.disclaimer }}

+ v-html="config.disclaimer" + /> + +

- +
+ + @@ -45,6 +50,7 @@ import Warning from './warning.vue'; import Header from '../header/header.vue'; import Sidebar from '../sidebar/sidebar.vue'; import Filters from '../filters/filters.vue'; +import Settings from '../settings/settings.vue'; function toggleSidebar(state) { this.showSidebar = typeof state === 'boolean' ? state : !this.showSidebar; @@ -55,6 +61,11 @@ function toggleFilters(state) { this.showSidebar = false; } +function toggleSettings(state) { + this.showSettings = state; + this.showSidebar = false; +} + async function setConsent(consent, includeQueer) { if (consent) { this.showWarning = false; @@ -62,7 +73,7 @@ async function setConsent(consent, includeQueer) { } if (includeQueer) { - this.$store.dispatch('setTagFilter', this.$store.state.ui.tagFilter.filter(tag => !['gay', 'bisexual', 'transsexual'].includes(tag))); + this.$store.dispatch('setTagFilter', this.$store.state.ui.tagFilter.filter((tag) => !['gay', 'bisexual', 'transsexual'].includes(tag))); return; } @@ -88,6 +99,9 @@ function scrollToTop() { function mounted() { document.addEventListener('click', this.blur); window.addEventListener('resize', this.resize); + + this.events.on('toggleSettings', this.toggleSettings); + this.events.on('toggleSidebar', this.toggleSidebar); } function beforeUnmount() { @@ -101,12 +115,15 @@ export default { Sidebar, Warning, Filters, + Settings, }, data() { return { showSidebar: false, showWarning: localStorage.getItem('consent') !== window.env.sessionId, showFilters: false, + showSettings: false, + selected: null, }; }, mounted, @@ -114,6 +131,7 @@ export default { methods: { toggleSidebar, toggleFilters, + toggleSettings, setConsent, blur, resize, @@ -183,13 +201,21 @@ export default {