generated from Seekra/repository-template
Compare commits
1
Commits
main
..
f5572de605
| Author | SHA1 | Date | |
|---|---|---|---|
 jakob.scheid
|
f5572de605
|
-34
@@ -21,42 +21,8 @@ limitations under the License.
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<meta name="theme-color" content="#0158D2" />
|
<meta name="theme-color" content="#0158D2" />
|
||||||
<title>Seekra</title>
|
<title>Seekra</title>
|
||||||
<noscript>
|
|
||||||
<style>
|
|
||||||
body {
|
|
||||||
font-family: 'Inter', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: #000;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</noscript>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<noscript>
|
|
||||||
<h1>
|
|
||||||
Seekra
|
|
||||||
</h1>
|
|
||||||
<p>
|
|
||||||
You need to enable JavaScript to use Seekra.
|
|
||||||
</p>
|
|
||||||
<section>
|
|
||||||
<h2>Legal Content</h2>
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
<a href="https://assets.seekra.jcloud-services.ddns.net/2026-08-04-76a067e/legal/legal_notice.html">
|
|
||||||
Legal Notice
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</section>
|
|
||||||
</noscript>
|
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
<script type="module" src="/src/main.js"></script>
|
<script type="module" src="/src/main.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
+10
-12
@@ -19,36 +19,34 @@ import Navbar from './features/nav/components/Navbar.vue';
|
|||||||
import Footer from './features/footer/components/Footer.vue';
|
import Footer from './features/footer/components/Footer.vue';
|
||||||
|
|
||||||
import { updatePageTitle } from './router';
|
import { updatePageTitle } from './router';
|
||||||
import { useSettings } from './features/settings/composables/useSettings.js';
|
import { useColorScheme } from './features/colorScheme/composables/useColorScheme';
|
||||||
import { computed, watch, watchEffect } from 'vue';
|
import { ref, provide, watch, watchEffect } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
||||||
const { getSetting } = useSettings();
|
const { getColorScheme, updateColorScheme } = useColorScheme();
|
||||||
const colorScheme = computed(() => getSetting(['appearance', 'colorScheme']));
|
const colorScheme = ref('auto');
|
||||||
|
provide('colorScheme', colorScheme);
|
||||||
const updateColorScheme = function updateColorScheme (newColorScheme) {
|
watch(colorScheme, (newValue) => {
|
||||||
|
updateColorScheme(newValue);
|
||||||
document.body.style.setProperty(colorScheme, {
|
document.body.style.setProperty(colorScheme, {
|
||||||
auto: 'normal',
|
auto: 'normal',
|
||||||
dark: 'dark',
|
dark: 'dark',
|
||||||
light: 'light'
|
light: 'light'
|
||||||
});
|
});
|
||||||
if (newColorScheme === 'dark') {
|
if (newValue === 'dark') {
|
||||||
document.body.classList.add('dark');
|
document.body.classList.add('dark');
|
||||||
} else {
|
} else {
|
||||||
document.body.classList.remove('dark');
|
document.body.classList.remove('dark');
|
||||||
}
|
}
|
||||||
if (newColorScheme === 'auto') {
|
if (newValue === 'auto') {
|
||||||
document.body.classList.add('color-scheme-auto');
|
document.body.classList.add('color-scheme-auto');
|
||||||
} else {
|
} else {
|
||||||
document.body.classList.remove('color-scheme-auto');
|
document.body.classList.remove('color-scheme-auto');
|
||||||
}
|
}
|
||||||
}
|
|
||||||
watch(colorScheme, (newColorScheme) => {
|
|
||||||
updateColorScheme(newColorScheme);
|
|
||||||
});
|
});
|
||||||
updateColorScheme(colorScheme.value);
|
colorScheme.value = getColorScheme();
|
||||||
|
|
||||||
watchEffect(() => updatePageTitle(route));
|
watchEffect(() => updatePageTitle(route));
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -17,14 +17,12 @@ limitations under the License.
|
|||||||
<script setup>
|
<script setup>
|
||||||
import Icon from '@/features/icons/components/Icon.vue';
|
import Icon from '@/features/icons/components/Icon.vue';
|
||||||
|
|
||||||
import { useSettings } from '@/features/settings/composables/useSettings';
|
import { inject } from 'vue';
|
||||||
import { computed } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { getSetting, setSetting } = useSettings();
|
|
||||||
|
|
||||||
const colorScheme = computed(() => getSetting(['appearance', 'colorScheme']));
|
const colorScheme = inject('colorScheme');
|
||||||
|
|
||||||
const colorSchemeNextMapper = {
|
const colorSchemeNextMapper = {
|
||||||
'light': 'dark',
|
'light': 'dark',
|
||||||
@@ -41,15 +39,11 @@ const colorSchemeIconMapper = {
|
|||||||
const getTooltipTranslation = function (colorScheme) {
|
const getTooltipTranslation = function (colorScheme) {
|
||||||
return t(`preferences.colorScheme.switch.${colorSchemeNextMapper[colorScheme]}`);
|
return t(`preferences.colorScheme.switch.${colorSchemeNextMapper[colorScheme]}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
const setColorScheme = function setColorScheme (newColorScheme) {
|
|
||||||
setSetting(['appearance', 'colorScheme'], newColorScheme);
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<button class="color-scheme-button"
|
<button class="color-scheme-button"
|
||||||
@click="setColorScheme(colorSchemeNextMapper[colorScheme])"
|
@click="colorScheme = colorSchemeNextMapper[colorScheme]"
|
||||||
:aria-label="getTooltipTranslation(colorScheme)"
|
:aria-label="getTooltipTranslation(colorScheme)"
|
||||||
:title="getTooltipTranslation(colorScheme)"
|
:title="getTooltipTranslation(colorScheme)"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import ColorSchemeButton from '../ColorSchemeButton.vue';
|
|
||||||
import { useSettings } from '@/features/settings/composables/useSettings.js';
|
|
||||||
import { mountComponent } from '@/test-utils/mountComponent';
|
|
||||||
import { describe, expect, test } from 'vitest';
|
|
||||||
|
|
||||||
const { getSetting } = useSettings();
|
|
||||||
|
|
||||||
const colorSchemeSettingPath = ['appearance', 'colorScheme']
|
|
||||||
|
|
||||||
const getWrapper = function getWrapper () {
|
|
||||||
return mountComponent(ColorSchemeButton);
|
|
||||||
};
|
|
||||||
|
|
||||||
describe('ColorSchemeButton', () => {
|
|
||||||
test('sets color scheme setting', async () => {
|
|
||||||
const wrapper = getWrapper();
|
|
||||||
|
|
||||||
expect(getSetting(colorSchemeSettingPath)).toBe('auto');
|
|
||||||
|
|
||||||
const colorSchemeButton = wrapper.find('button');
|
|
||||||
|
|
||||||
await colorSchemeButton.trigger('click');
|
|
||||||
expect(getSetting(colorSchemeSettingPath)).toBe('light');
|
|
||||||
|
|
||||||
await colorSchemeButton.trigger('click');
|
|
||||||
expect(getSetting(colorSchemeSettingPath)).toBe('dark');
|
|
||||||
|
|
||||||
await colorSchemeButton.trigger('click');
|
|
||||||
expect(getSetting(colorSchemeSettingPath)).toBe('auto');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2026 Seekra
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const useColorScheme = function () {
|
||||||
|
const getColorScheme = function () {
|
||||||
|
let colorScheme = localStorage.getItem('colorScheme') || 'auto';
|
||||||
|
if (!(colorScheme === 'dark' || colorScheme === 'light' || colorScheme === 'auto')) {
|
||||||
|
colorScheme = 'auto';
|
||||||
|
};
|
||||||
|
return colorScheme;
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateColorScheme = function (newScheme) {
|
||||||
|
let actualNewScheme = newScheme;
|
||||||
|
if (!(actualNewScheme === 'dark' || actualNewScheme === 'light' || actualNewScheme === 'auto')) {
|
||||||
|
actualNewScheme = 'auto';
|
||||||
|
};
|
||||||
|
|
||||||
|
localStorage.setItem('colorScheme', actualNewScheme);
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
getColorScheme,
|
||||||
|
updateColorScheme
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -40,20 +40,8 @@ const copyrightPeriod =
|
|||||||
</RouterLink>
|
</RouterLink>
|
||||||
<LanguageSwitchButton />
|
<LanguageSwitchButton />
|
||||||
</div>
|
</div>
|
||||||
<div class="footer-segment legal-segment">
|
<div class="footer-segment">
|
||||||
<div></div>
|
© {{ copyrightPeriod }} Seekra
|
||||||
<div class="copyright-notice">
|
|
||||||
© {{ copyrightPeriod }} Seekra
|
|
||||||
</div>
|
|
||||||
<div class="legal-links">
|
|
||||||
<RouterLink
|
|
||||||
:to="{ name: 'legalNotice' }"
|
|
||||||
class="link"
|
|
||||||
:title="t('legal.notice.title')"
|
|
||||||
>
|
|
||||||
{{ t('legal.notice.title') }}
|
|
||||||
</RouterLink>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</template>
|
</template>
|
||||||
@@ -66,7 +54,6 @@ const copyrightPeriod =
|
|||||||
.footer-segment {
|
.footer-segment {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
|
||||||
gap: 32px;
|
gap: 32px;
|
||||||
padding: var(--padding-y);
|
padding: var(--padding-y);
|
||||||
background-color: var(--light-bg);
|
background-color: var(--light-bg);
|
||||||
@@ -76,31 +63,4 @@ const copyrightPeriod =
|
|||||||
.global-footer a {
|
.global-footer a {
|
||||||
color: var(--dark);
|
color: var(--dark);
|
||||||
}
|
}
|
||||||
|
|
||||||
.legal-segment {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr auto 1fr;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.copyright-notice {
|
|
||||||
justify-self: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.legal-links {
|
|
||||||
justify-self: end;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 48rem) {
|
|
||||||
.legal-segment {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.legal-links {
|
|
||||||
margin-top: 0.8em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
export class FetchError extends Error {
|
|
||||||
constructor (message) {
|
|
||||||
super(message);
|
|
||||||
this.name = 'FetchError';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@@ -1,110 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { FetchError } from '../../errors';
|
|
||||||
import { getLegalNotice } from '../fetchLegalContent';
|
|
||||||
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
|
|
||||||
|
|
||||||
let fetchSpy;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fetchSpy = vi.spyOn(globalThis, 'fetch');
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
fetchSpy.mockRestore();
|
|
||||||
});
|
|
||||||
|
|
||||||
const exampleHtml = `<h1>Heading</h1>
|
|
||||||
<p>
|
|
||||||
<a>...</a>
|
|
||||||
</p>`;
|
|
||||||
|
|
||||||
const exampleHtmlWithLinkClass = `<h1>Heading</h1>
|
|
||||||
<p>
|
|
||||||
<a class="link">...</a>
|
|
||||||
</p>`;
|
|
||||||
const exampleHtmlDocument = `<html>
|
|
||||||
<head>
|
|
||||||
<title>Legal Notice</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
${exampleHtml}
|
|
||||||
</body>
|
|
||||||
</html>`;
|
|
||||||
const exampleHtmlDocumentWithMain = `<html>
|
|
||||||
<head>
|
|
||||||
<title>Legal Notice</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<main>
|
|
||||||
${exampleHtml}
|
|
||||||
</main>
|
|
||||||
</body>
|
|
||||||
</html>`;
|
|
||||||
|
|
||||||
describe('fetchLegalContent', () => {
|
|
||||||
describe('getLegalNotice', () => {
|
|
||||||
describe('success', () => {
|
|
||||||
test('returns HTML body', async () => {
|
|
||||||
fetchSpy.mockResolvedValue(
|
|
||||||
new Response(exampleHtmlDocument)
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(
|
|
||||||
(await getLegalNotice()).trim()
|
|
||||||
).toBe(exampleHtmlWithLinkClass);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('returns HTML <main>', async () => {
|
|
||||||
fetchSpy.mockResolvedValue(
|
|
||||||
new Response(exampleHtmlDocumentWithMain)
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(
|
|
||||||
(await getLegalNotice()).trim()
|
|
||||||
).toBe(exampleHtmlWithLinkClass);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('does not fail on success status code', async () => {
|
|
||||||
fetchSpy.mockResolvedValue(
|
|
||||||
new Response(null, { status: 206 })
|
|
||||||
);
|
|
||||||
|
|
||||||
await getLegalNotice();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('error', () => {
|
|
||||||
test('throws FetchError when fetch fails', async () => {
|
|
||||||
fetchSpy.mockRejectedValue(new TypeError());
|
|
||||||
await expect(getLegalNotice()).rejects.toThrow(FetchError);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('throws FetchError on HTTP error', async () => {
|
|
||||||
fetchSpy.mockResolvedValue(
|
|
||||||
new Response(null, { status: 404 })
|
|
||||||
)
|
|
||||||
await expect(getLegalNotice()).rejects.toThrow(FetchError);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('does not throw FetchError when fetch throws another error than TypeError', async () => {
|
|
||||||
fetchSpy.mockRejectedValue(new Error());
|
|
||||||
await expect(getLegalNotice()).rejects.toThrow(Error);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { FetchError } from '../errors';
|
|
||||||
import { getAssetsUrl } from '@/config/env';
|
|
||||||
|
|
||||||
const fetchHtml = async function fetchHtml (url, options) {
|
|
||||||
let response;
|
|
||||||
try {
|
|
||||||
response = await fetch(url, options);
|
|
||||||
} catch (err) {
|
|
||||||
if (err instanceof TypeError) throw new FetchError(err);
|
|
||||||
else throw err;
|
|
||||||
}
|
|
||||||
if (response.ok) return await response.text();
|
|
||||||
else throw new FetchError();
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getLegalNotice = async function getLegalNotice () {
|
|
||||||
const legalNoticeUrl = new URL('legal/legal_notice.html', getAssetsUrl()).href;
|
|
||||||
const html = await fetchHtml(legalNoticeUrl);
|
|
||||||
|
|
||||||
const parser = new DOMParser();
|
|
||||||
const doc = parser.parseFromString(html, 'text/html');
|
|
||||||
|
|
||||||
const legalNoticeContainer = doc.querySelector('main') ?? doc.body;
|
|
||||||
legalNoticeContainer.querySelectorAll('a').forEach(
|
|
||||||
(link) => link.classList.add('link')
|
|
||||||
);
|
|
||||||
return legalNoticeContainer.innerHTML;
|
|
||||||
};
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
<!--
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<script setup>
|
|
||||||
import { getLegalNotice } from '../services/fetchLegalContent';
|
|
||||||
import { onMounted, ref } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
|
|
||||||
const { t } = useI18n();
|
|
||||||
|
|
||||||
const loading = ref(true);
|
|
||||||
const legalNoticeError = ref(null);
|
|
||||||
const legalNoticeHtml = ref(null);
|
|
||||||
onMounted(async () => {
|
|
||||||
try {
|
|
||||||
legalNoticeHtml.value = await getLegalNotice();
|
|
||||||
} catch {
|
|
||||||
legalNoticeError.value = 'legal.notice.loadError';
|
|
||||||
} finally {
|
|
||||||
loading.value = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="main-content-padding legal-notice-container">
|
|
||||||
<header class="header">
|
|
||||||
<h1>
|
|
||||||
{{ t('legal.notice.title') }}
|
|
||||||
</h1>
|
|
||||||
</header>
|
|
||||||
<main>
|
|
||||||
<div class="legal-notice-loading" v-if="loading">
|
|
||||||
{{ t('loading') }}
|
|
||||||
</div>
|
|
||||||
<div class="error" v-else-if="legalNoticeError">
|
|
||||||
{{ t(legalNoticeError) }}
|
|
||||||
</div>
|
|
||||||
<div class="legal-notice" v-html="legalNoticeHtml" v-else></div>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.header h1 {
|
|
||||||
margin-top: 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { FetchError } from '../../errors.js';
|
|
||||||
import LegalNoticeView from '../LegalNoticeView.vue';
|
|
||||||
import { mountComponent } from '@/test-utils/mountComponent';
|
|
||||||
import { flushPromises } from '@vue/test-utils';
|
|
||||||
import { afterEach, describe, expect, test, vi } from 'vitest';
|
|
||||||
|
|
||||||
const getLegalNotice = vi.hoisted(() => vi.fn().mockResolvedValue('legal notice'));
|
|
||||||
vi.mock('../../services/fetchLegalContent', async (importOriginal) => {
|
|
||||||
const actual = await importOriginal();
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
getLegalNotice
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => getLegalNotice.mockRestore());
|
|
||||||
|
|
||||||
describe('LegalNoticeView', () => {
|
|
||||||
test('shows loading indicator', () => {
|
|
||||||
const wrapper = mountComponent(LegalNoticeView);
|
|
||||||
|
|
||||||
const legalNoticeLoading = wrapper.find('.legal-notice-loading');
|
|
||||||
const legalNoticeError = wrapper.find('.error');
|
|
||||||
const legalNotice = wrapper.find('.legal-notice');
|
|
||||||
|
|
||||||
expect(legalNoticeLoading.exists()).toBe(true);
|
|
||||||
expect(legalNoticeError.exists()).toBe(false);
|
|
||||||
expect(legalNotice.exists()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('shows error', async () => {
|
|
||||||
getLegalNotice.mockRejectedValue(new FetchError());
|
|
||||||
|
|
||||||
const wrapper = mountComponent(LegalNoticeView);
|
|
||||||
|
|
||||||
await flushPromises();
|
|
||||||
await wrapper.vm.$nextTick();
|
|
||||||
|
|
||||||
const legalNoticeLoading = wrapper.find('.legal-notice-loading');
|
|
||||||
const legalNoticeError = wrapper.find('.error');
|
|
||||||
const legalNotice = wrapper.find('.legal-notice');
|
|
||||||
|
|
||||||
expect(legalNoticeLoading.exists()).toBe(false);
|
|
||||||
expect(legalNoticeError.exists()).toBe(true);
|
|
||||||
expect(legalNotice.exists()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('shows legal notice', async () => {
|
|
||||||
const wrapper = mountComponent(LegalNoticeView);
|
|
||||||
|
|
||||||
await flushPromises();
|
|
||||||
await wrapper.vm.$nextTick();
|
|
||||||
|
|
||||||
const legalNoticeLoading = wrapper.find('.legal-notice-loading');
|
|
||||||
const legalNoticeError = wrapper.find('.error');
|
|
||||||
const legalNotice = wrapper.find('.legal-notice');
|
|
||||||
|
|
||||||
expect(legalNoticeLoading.exists()).toBe(false);
|
|
||||||
expect(legalNoticeError.exists()).toBe(false);
|
|
||||||
expect(legalNotice.exists()).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -54,9 +54,10 @@ const props = defineProps({
|
|||||||
const store = useSettingsStore();
|
const store = useSettingsStore();
|
||||||
|
|
||||||
const optionType = computed(() => props.setting.allowMultiple ? 'checkbox' : 'radio');
|
const optionType = computed(() => props.setting.allowMultiple ? 'checkbox' : 'radio');
|
||||||
const selected = computed({
|
const selected = ref(normalizeSelectedValue(store.get(props.path) ?? props.setting.default));
|
||||||
get: () => normalizeSelectedValue(store.get(props.path) ?? props.setting.default),
|
|
||||||
set: (value) => store.set(props.path, value)
|
watch(selected, (newValue) => {
|
||||||
|
store.set(props.path, newValue);
|
||||||
});
|
});
|
||||||
|
|
||||||
const labelId = useId();
|
const labelId = useId();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { useSettingsStore } from '../stores/settingsStore';
|
import { useSettingsStore } from '../stores/settingsStore';
|
||||||
import { ref, useId, watch } from 'vue';
|
import { useId } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
@@ -35,16 +35,8 @@ const switchId = useId();
|
|||||||
|
|
||||||
const store = useSettingsStore();
|
const store = useSettingsStore();
|
||||||
|
|
||||||
const enabled = ref(null);
|
|
||||||
watch(store, (newStore) => {
|
|
||||||
enabled.value = newStore.get(props.path);
|
|
||||||
});
|
|
||||||
// set value after registering watcher to avoid immediate value change
|
|
||||||
enabled.value = store.get(props.path) ?? props.setting.default;
|
|
||||||
|
|
||||||
const toggle = function toggle () {
|
const toggle = function toggle () {
|
||||||
enabled.value = !enabled.value;
|
store.set(props.path, !store.get(props.path));
|
||||||
store.set(props.path, enabled.value);
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -55,7 +47,7 @@ const toggle = function toggle () {
|
|||||||
</label>
|
</label>
|
||||||
<div
|
<div
|
||||||
class="switch-wrapper"
|
class="switch-wrapper"
|
||||||
:class="{ enabled }"
|
:class="{ enabled: store.get(props.path) }"
|
||||||
:title="t('settings.switch.title')"
|
:title="t('settings.switch.title')"
|
||||||
:aria-label="t('settings.switch.ariaLabel')"
|
:aria-label="t('settings.switch.ariaLabel')"
|
||||||
:aria-labelledby="labelId"
|
:aria-labelledby="labelId"
|
||||||
|
|||||||
@@ -90,32 +90,6 @@ describe('Selection', () => {
|
|||||||
expect(inputsChecked).toStrictEqual([false, true, false]);
|
expect(inputsChecked).toStrictEqual([false, true, false]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('reacts on store change', async () => {
|
|
||||||
const wrapper = getWrapper({
|
|
||||||
options: exampleOptions,
|
|
||||||
piniaOptions: {
|
|
||||||
setupStores: () => {
|
|
||||||
const store = useSettingsStore();
|
|
||||||
store.set('selection', 'o1');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
const settings = useSettingsStore();
|
|
||||||
|
|
||||||
{
|
|
||||||
const inputs = wrapper.findAll('input');
|
|
||||||
const inputsChecked = getChecked(inputs);
|
|
||||||
expect(inputsChecked).toStrictEqual([false, true, false]);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
settings.set('selection', 'o2');
|
|
||||||
await nextTick();
|
|
||||||
const inputs = wrapper.findAll('input');
|
|
||||||
const inputsChecked = getChecked(inputs);
|
|
||||||
expect(inputsChecked).toStrictEqual([false, false, true]);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
test('shows multiple values from store', () => {
|
test('shows multiple values from store', () => {
|
||||||
const wrapper = getWrapper({
|
const wrapper = getWrapper({
|
||||||
options: exampleOptions,
|
options: exampleOptions,
|
||||||
|
|||||||
@@ -20,23 +20,17 @@ import { useSettingsStore } from '../../stores/settingsStore.js';
|
|||||||
import { expect, describe, test } from 'vitest';
|
import { expect, describe, test } from 'vitest';
|
||||||
import { nextTick } from 'vue';
|
import { nextTick } from 'vue';
|
||||||
|
|
||||||
const getWrapper = function getWrapper ({
|
const getWrapper = function getWrapper ({ i18n = 'switch1', translations = {} } = {}) {
|
||||||
i18n = 'switch1',
|
|
||||||
defaultValue = undefined,
|
|
||||||
translations = {},
|
|
||||||
piniaOptions = {}
|
|
||||||
} = {}) {
|
|
||||||
return mountComponent(Switch, {
|
return mountComponent(Switch, {
|
||||||
attrs: {
|
attrs: {
|
||||||
setting: {
|
setting: {
|
||||||
type: 'bool',
|
type: 'bool',
|
||||||
name: 'switch',
|
name: 'switch',
|
||||||
i18n,
|
i18n
|
||||||
default: defaultValue
|
|
||||||
},
|
},
|
||||||
path: 'switch'
|
path: 'switch'
|
||||||
}
|
}
|
||||||
}, translations, [], piniaOptions);
|
}, translations);
|
||||||
};
|
};
|
||||||
|
|
||||||
describe('Switch', () => {
|
describe('Switch', () => {
|
||||||
@@ -59,42 +53,6 @@ describe('Switch', () => {
|
|||||||
expect(switchElementClasses2).not.toContain('enabled');
|
expect(switchElementClasses2).not.toContain('enabled');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('shows default value', () => {
|
|
||||||
const wrapper = getWrapper({
|
|
||||||
defaultValue: true
|
|
||||||
});
|
|
||||||
|
|
||||||
const switchElement = wrapper.find('.switch-wrapper');
|
|
||||||
expect(switchElement.classes('enabled')).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('shows stored value instead of default value', () => {
|
|
||||||
const wrapper = getWrapper({
|
|
||||||
defaultValue: true,
|
|
||||||
piniaOptions: {
|
|
||||||
setupStores: () => {
|
|
||||||
const store = useSettingsStore();
|
|
||||||
store.set('switch', false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const switchElement = wrapper.find('.switch-wrapper');
|
|
||||||
expect(switchElement.classes('enabled')).toBeFalsy();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('reacts on store change', async () => {
|
|
||||||
const wrapper = getWrapper();
|
|
||||||
const store = useSettingsStore();
|
|
||||||
|
|
||||||
const switchElement = wrapper.find('.switch-wrapper');
|
|
||||||
expect(switchElement.classes('enabled')).toBeFalsy();
|
|
||||||
|
|
||||||
store.set('switch', true);
|
|
||||||
await nextTick();
|
|
||||||
expect(switchElement.classes('enabled')).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('toggles value in store', async () => {
|
test('toggles value in store', async () => {
|
||||||
const wrapper = getWrapper();
|
const wrapper = getWrapper();
|
||||||
|
|
||||||
|
|||||||
@@ -1,91 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { useSettings } from '../useSettings';
|
|
||||||
import { createTestingPinia } from '@pinia/testing';
|
|
||||||
import { setActivePinia } from 'pinia';
|
|
||||||
import { beforeEach, describe, expect, test, vi } from 'vitest';
|
|
||||||
|
|
||||||
const settingDefaultValue = vi.hoisted(() => 42);
|
|
||||||
const settingPath = ['test', 'number'];
|
|
||||||
|
|
||||||
vi.mock('../../settings.json', () => ({
|
|
||||||
default: {
|
|
||||||
contents: [
|
|
||||||
{
|
|
||||||
name: 'test',
|
|
||||||
i18n: '',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'number',
|
|
||||||
i18n: '',
|
|
||||||
name: 'number',
|
|
||||||
default: settingDefaultValue
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
i18n: '',
|
|
||||||
name: 'bool'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
describe('useSettings', () => {
|
|
||||||
describe('getSetting', () => {
|
|
||||||
test('returns stored value', () => {
|
|
||||||
const { getSetting, setSetting } = useSettings();
|
|
||||||
|
|
||||||
const key = ['setting'];
|
|
||||||
const value = 42;
|
|
||||||
|
|
||||||
setSetting(key, value);
|
|
||||||
expect(getSetting(key)).toBe(value);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('returns default value', () => {
|
|
||||||
const { getSetting, setSetting } = useSettings();
|
|
||||||
expect(getSetting(settingPath)).toBe(settingDefaultValue);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('returns stored value instead of default value', () => {
|
|
||||||
const { getSetting, setSetting } = useSettings();
|
|
||||||
|
|
||||||
const value = 43;
|
|
||||||
|
|
||||||
expect(getSetting(settingPath)).toBe(settingDefaultValue);
|
|
||||||
|
|
||||||
setSetting(settingPath, value);
|
|
||||||
expect(getSetting(settingPath)).toBe(value);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('returns undefined if there is no value', () => {
|
|
||||||
const { getSetting } = useSettings();
|
|
||||||
expect(getSetting(['test', 'bool'])).toBeUndefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
setActivePinia(
|
|
||||||
createTestingPinia({
|
|
||||||
createSpy: vi.fn,
|
|
||||||
stubActions: false
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2026 Seekra
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import settings from '../settings.json';
|
|
||||||
import { useSettingsStore } from '../stores/settingsStore';
|
|
||||||
import { getSettingRecursively } from '../utils/getSetting';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides access to the stored settings.
|
|
||||||
*/
|
|
||||||
export const useSettings = function useSettings () {
|
|
||||||
/**
|
|
||||||
* Returns the value of a specific setting.
|
|
||||||
* @param {string[]} key - The settings key.
|
|
||||||
* @return The value of the setting.
|
|
||||||
*/
|
|
||||||
const getSetting = function getSetting (key) {
|
|
||||||
const settingsStore = useSettingsStore();
|
|
||||||
|
|
||||||
return (
|
|
||||||
settingsStore.get(key.join('.')) ??
|
|
||||||
getSettingRecursively(
|
|
||||||
key, settings.contents ?? []
|
|
||||||
)?.default
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the value of a specific setting.
|
|
||||||
* @param {string[]} key - The setting key.
|
|
||||||
* @param value - The new value for the setting.
|
|
||||||
*/
|
|
||||||
const setSetting = function setSetting (key, value) {
|
|
||||||
const settingsStore = useSettingsStore();
|
|
||||||
settingsStore.set(key.join('.'), value);
|
|
||||||
};
|
|
||||||
|
|
||||||
return { getSetting, setSetting };
|
|
||||||
};
|
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2026 Seekra
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { ref, readonly } from 'vue';
|
||||||
|
import { loadSettingsConfig } from '../utils/settingsParser.js';
|
||||||
|
|
||||||
|
const config = ref(null);
|
||||||
|
const error = ref(null);
|
||||||
|
const loading = ref(false);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides reactive access to the parsed settings configuration.
|
||||||
|
* The config is loaded once and shared across all consumers.
|
||||||
|
*/
|
||||||
|
export function useSettingsConfig() {
|
||||||
|
async function load() {
|
||||||
|
loading.value = true;
|
||||||
|
error.value = null;
|
||||||
|
try {
|
||||||
|
config.value = await loadSettingsConfig();
|
||||||
|
} catch (e) {
|
||||||
|
error.value = e.message;
|
||||||
|
config.value = null;
|
||||||
|
} finally {
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
config: readonly(config),
|
||||||
|
error: readonly(error),
|
||||||
|
loading: readonly(loading),
|
||||||
|
load,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,30 +1,3 @@
|
|||||||
{
|
{
|
||||||
"contents": [
|
"contents": []
|
||||||
{
|
}
|
||||||
"name": "appearance",
|
|
||||||
"i18n": "settings.settings.appearance.title",
|
|
||||||
"content": [
|
|
||||||
{
|
|
||||||
"name": "colorScheme",
|
|
||||||
"type": "selection",
|
|
||||||
"i18n": "settings.settings.appearance.contents.colorScheme.title",
|
|
||||||
"default": "auto",
|
|
||||||
"options": [
|
|
||||||
{
|
|
||||||
"name": "auto",
|
|
||||||
"i18n": "settings.settings.appearance.contents.colorScheme.options.auto"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "light",
|
|
||||||
"i18n": "settings.settings.appearance.contents.colorScheme.options.light"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "dark",
|
|
||||||
"i18n": "settings.settings.appearance.contents.colorScheme.options.dark"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -20,10 +20,18 @@ import { validateSettingsConfig, validateEntry, validateSelectionOptions, assert
|
|||||||
describe('settingsValidator', () => {
|
describe('settingsValidator', () => {
|
||||||
describe('validateSettingsConfig', () => {
|
describe('validateSettingsConfig', () => {
|
||||||
test.for([
|
test.for([
|
||||||
{ settings: {
|
{ raw: false, expected: false },
|
||||||
|
{ raw: true, expected: false },
|
||||||
|
{ raw: 0, expected: false },
|
||||||
|
{ raw: 42, expected: false },
|
||||||
|
{ raw: '', expected: false },
|
||||||
|
{ raw: ' ', expected: false },
|
||||||
|
{ raw: 'a', expected: false },
|
||||||
|
{ raw: {}, expected: false },
|
||||||
|
{ raw: {
|
||||||
contents: []
|
contents: []
|
||||||
} },
|
}, expected: true },
|
||||||
{ settings: {
|
{ raw: {
|
||||||
contents: [
|
contents: [
|
||||||
{
|
{
|
||||||
name: 'general',
|
name: 'general',
|
||||||
@@ -37,8 +45,8 @@ describe('settingsValidator', () => {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
} },
|
}, expected: true },
|
||||||
{ settings: {
|
{ raw: {
|
||||||
contents: [
|
contents: [
|
||||||
{
|
{
|
||||||
name: 'general',
|
name: 'general',
|
||||||
@@ -63,8 +71,8 @@ describe('settingsValidator', () => {
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
} },
|
}, expected: true },
|
||||||
{ settings: {
|
{ raw: {
|
||||||
contents: [
|
contents: [
|
||||||
{
|
{
|
||||||
name: 'general',
|
name: 'general',
|
||||||
@@ -120,12 +128,12 @@ describe('settingsValidator', () => {
|
|||||||
default: 'str'
|
default: 'str'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
]
|
]
|
||||||
} },
|
}, expected: true },
|
||||||
{ settings: {
|
{ raw: {
|
||||||
contents: [
|
contents: [
|
||||||
{
|
{
|
||||||
name: 'general',
|
name: 'general',
|
||||||
@@ -182,283 +190,12 @@ describe('settingsValidator', () => {
|
|||||||
default: 'str'
|
default: 'str'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
]
|
]
|
||||||
} }
|
}, expected: true },
|
||||||
])('does not throw an error and returns input', ({ settings }) => {
|
{ raw: {
|
||||||
validateSettingsConfig(settings);
|
|
||||||
});
|
|
||||||
|
|
||||||
test.for([
|
|
||||||
{ settings: false },
|
|
||||||
{ settings: true },
|
|
||||||
{ settings: 0 },
|
|
||||||
{ settings: 42 },
|
|
||||||
{ settings: '' },
|
|
||||||
{ settings: ' ' },
|
|
||||||
{ settings: 'a' },
|
|
||||||
{ settings: {} },
|
|
||||||
{ settings: {
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'sectio',
|
|
||||||
name: 'general',
|
|
||||||
i18n: 'settings.settings.general',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'copyOfGeneral',
|
|
||||||
i18n: 'settings.settings.copyOfGeneral',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
default: false,
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'aSection',
|
|
||||||
i18n: 'settings.settings.aSection',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 43',
|
|
||||||
i18n: 'settings.settings.aSection.enableFeature43'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'selection',
|
|
||||||
name: 'language',
|
|
||||||
i18n: 'settings.settings.aSection.language.label',
|
|
||||||
default: 'en',
|
|
||||||
allowMultiple: 'false',
|
|
||||||
options: [
|
|
||||||
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
|
||||||
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'section2',
|
|
||||||
i18n: 'settings.settings.aSection.section2.label',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'string',
|
|
||||||
name: 'string',
|
|
||||||
i18n: 'settings.settings.aSection.sections.string',
|
|
||||||
default: 'str'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
} },
|
|
||||||
{ settings: {
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'sectio',
|
|
||||||
name: 'general',
|
|
||||||
i18n: 'settings.settings.general',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'copyOfGeneral',
|
|
||||||
i18n: 'settings.settings.copyOfGeneral',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
default: false,
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'aSection',
|
|
||||||
i18n: 'settings.settings.aSection',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 43',
|
|
||||||
i18n: 'settings.settings.aSection.enableFeature43'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'selection',
|
|
||||||
name: 'language',
|
|
||||||
i18n: 'settings.settings.aSection.language.label',
|
|
||||||
default: 'en',
|
|
||||||
options: [
|
|
||||||
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
|
||||||
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'section2',
|
|
||||||
i18n: 'settings.settings.aSection.section2.label',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'string',
|
|
||||||
name: 'string',
|
|
||||||
i18n: 'settings.settings.aSection.sections.string',
|
|
||||||
default: 'str'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
} },
|
|
||||||
{ settings: {
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'general',
|
|
||||||
i18n: 'settings.settings.general',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'copyOfGeneral',
|
|
||||||
i18n: 'settings.settings.copyOfGeneral',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
default: false,
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'aSection',
|
|
||||||
i18n: 'settings.settings.aSection',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 43',
|
|
||||||
i18n: 'settings.settings.aSection.enableFeature43'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'selection',
|
|
||||||
name: 'language',
|
|
||||||
i18n: 'settings.settings.aSection.language.label',
|
|
||||||
default: 'en',
|
|
||||||
options: [
|
|
||||||
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
|
||||||
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'section2',
|
|
||||||
i18n: 'settings.settings.aSection.section2.label',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'string',
|
|
||||||
name: 'string',
|
|
||||||
i18n: 'settings.settings.aSection.sections.string',
|
|
||||||
default: 'str'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
} },
|
|
||||||
{ settings: {
|
|
||||||
contents: [
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'general',
|
|
||||||
i18n: 'settings.settings.general',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'copyOfGeneral',
|
|
||||||
i18n: 'settings.settings.copyOfGeneral',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 42',
|
|
||||||
default: false,
|
|
||||||
i18n: 'settings.settings.general.enableFeature42'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'aSection',
|
|
||||||
i18n: 'settings.settings.aSection',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'bool',
|
|
||||||
name: 'Enable feature 43',
|
|
||||||
i18n: 'settings.settings.aSection.enableFeature43',
|
|
||||||
default: 'true'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'selection',
|
|
||||||
name: 'language',
|
|
||||||
i18n: 'settings.settings.aSection.language.label',
|
|
||||||
default: 'en',
|
|
||||||
options: [
|
|
||||||
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
|
||||||
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'section',
|
|
||||||
name: 'section2',
|
|
||||||
i18n: 'settings.settings.aSection.section2.label',
|
|
||||||
content: [
|
|
||||||
{
|
|
||||||
type: 'string',
|
|
||||||
name: 'string',
|
|
||||||
i18n: 'settings.settings.aSection.sections.string',
|
|
||||||
default: 42
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
} },
|
|
||||||
{ settings: {
|
|
||||||
contents: [
|
contents: [
|
||||||
{
|
{
|
||||||
type: 'bool',
|
type: 'bool',
|
||||||
@@ -521,14 +258,276 @@ describe('settingsValidator', () => {
|
|||||||
default: 'str'
|
default: 'str'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}, expected: false },
|
||||||
|
{ raw: {
|
||||||
|
contents: [
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'general',
|
||||||
|
i18n: 'settings.settings.general',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'copyOfGeneral',
|
||||||
|
i18n: 'settings.settings.copyOfGeneral',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
default: false,
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'aSection',
|
||||||
|
i18n: 'settings.settings.aSection',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 43',
|
||||||
|
i18n: 'settings.settings.aSection.enableFeature43',
|
||||||
|
default: 'true'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'selection',
|
||||||
|
name: 'language',
|
||||||
|
i18n: 'settings.settings.aSection.language.label',
|
||||||
|
default: 'en',
|
||||||
|
options: [
|
||||||
|
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
||||||
|
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'section2',
|
||||||
|
i18n: 'settings.settings.aSection.section2.label',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'string',
|
||||||
|
name: 'string',
|
||||||
|
i18n: 'settings.settings.aSection.sections.string',
|
||||||
|
default: 42
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
},
|
||||||
]
|
]
|
||||||
} }
|
}, expected: false },
|
||||||
])('throws error', ({ settings }) => {
|
{ raw: {
|
||||||
expect(() => validateSettingsConfig(settings)).toThrow(Error)
|
content: [
|
||||||
})
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'general',
|
||||||
|
i18n: 'settings.settings.general',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'copyOfGeneral',
|
||||||
|
i18n: 'settings.settings.copyOfGeneral',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
default: false,
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'aSection',
|
||||||
|
i18n: 'settings.settings.aSection',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 43',
|
||||||
|
i18n: 'settings.settings.aSection.enableFeature43'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'selection',
|
||||||
|
name: 'language',
|
||||||
|
i18n: 'settings.settings.aSection.language.label',
|
||||||
|
default: 'en',
|
||||||
|
options: [
|
||||||
|
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
||||||
|
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'section2',
|
||||||
|
i18n: 'settings.settings.aSection.section2.label',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'string',
|
||||||
|
name: 'string',
|
||||||
|
i18n: 'settings.settings.aSection.sections.string',
|
||||||
|
default: 'str'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}, expected: false },
|
||||||
|
{ raw: {
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'sectio',
|
||||||
|
name: 'general',
|
||||||
|
i18n: 'settings.settings.general',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'copyOfGeneral',
|
||||||
|
i18n: 'settings.settings.copyOfGeneral',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
default: false,
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'aSection',
|
||||||
|
i18n: 'settings.settings.aSection',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 43',
|
||||||
|
i18n: 'settings.settings.aSection.enableFeature43'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'selection',
|
||||||
|
name: 'language',
|
||||||
|
i18n: 'settings.settings.aSection.language.label',
|
||||||
|
default: 'en',
|
||||||
|
options: [
|
||||||
|
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
||||||
|
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'section2',
|
||||||
|
i18n: 'settings.settings.aSection.section2.label',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'string',
|
||||||
|
name: 'string',
|
||||||
|
i18n: 'settings.settings.aSection.sections.string',
|
||||||
|
default: 'str'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}, expected: false },
|
||||||
|
{ raw: {
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'sectio',
|
||||||
|
name: 'general',
|
||||||
|
i18n: 'settings.settings.general',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'copyOfGeneral',
|
||||||
|
i18n: 'settings.settings.copyOfGeneral',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 42',
|
||||||
|
default: false,
|
||||||
|
i18n: 'settings.settings.general.enableFeature42'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'aSection',
|
||||||
|
i18n: 'settings.settings.aSection',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: 'Enable feature 43',
|
||||||
|
i18n: 'settings.settings.aSection.enableFeature43'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'selection',
|
||||||
|
name: 'language',
|
||||||
|
i18n: 'settings.settings.aSection.language.label',
|
||||||
|
default: 'en',
|
||||||
|
allowMultiple: 'false',
|
||||||
|
options: [
|
||||||
|
{ name: 'en', i18n: 'settings.settings.aSection.language.options.en' },
|
||||||
|
{ name: 'de', i18n: 'settings.settings.aSection.language.options.de' },
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'section',
|
||||||
|
name: 'section2',
|
||||||
|
i18n: 'settings.settings.aSection.section2.label',
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: 'string',
|
||||||
|
name: 'string',
|
||||||
|
i18n: 'settings.settings.aSection.sections.string',
|
||||||
|
default: 'str'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}, expected: false }
|
||||||
|
])('returns valid: $expected', ({ raw, expected }) => {
|
||||||
|
const result = validateSettingsConfig(raw);
|
||||||
|
if (!result.valid) {
|
||||||
|
console.error('Error message:', result.error);
|
||||||
|
};
|
||||||
|
expect(result.valid).toBe(expected);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('validateEntry', () => {
|
describe('validateEntry', () => {
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2026 Seekra
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { validateSettingsConfig } from './settingsValidator.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads and parses the settings configuration via dynamic import.
|
||||||
|
* @returns {Promise<import('../types/settingsConfig').SettingsConfig>}
|
||||||
|
*/
|
||||||
|
export async function loadSettingsConfig() {
|
||||||
|
let raw;
|
||||||
|
|
||||||
|
try {
|
||||||
|
raw = (await import('../settings.json')).default;
|
||||||
|
} catch (e) {
|
||||||
|
throw new Error(`[settings] Failed to load settings.json: ${e.message}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = validateSettingsConfig(raw);
|
||||||
|
if (!result.valid) {
|
||||||
|
throw new Error(result.error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.config;
|
||||||
|
}
|
||||||
@@ -117,13 +117,18 @@ export const validateFirstLevelSection = function validateFirstLevelSection (sec
|
|||||||
* @returns {{ valid: true, config: import('../types/settingsConfig').SettingsConfig } | { valid: false, error: string }}
|
* @returns {{ valid: true, config: import('../types/settingsConfig').SettingsConfig } | { valid: false, error: string }}
|
||||||
*/
|
*/
|
||||||
export function validateSettingsConfig(raw) {
|
export function validateSettingsConfig(raw) {
|
||||||
if (!raw || typeof raw !== 'object') {
|
try {
|
||||||
throw new Error('[settings] Config must be an object');
|
if (!raw || typeof raw !== 'object') {
|
||||||
|
throw new Error('[settings] Config must be an object');
|
||||||
|
}
|
||||||
|
if (!Array.isArray(raw.contents)) {
|
||||||
|
throw new Error('[settings] "contents" must be an array');
|
||||||
|
}
|
||||||
|
raw.contents.forEach((entry, i) =>
|
||||||
|
validateFirstLevelSection(entry, `contents[${i}]`)
|
||||||
|
);
|
||||||
|
return { valid: true, config: raw };
|
||||||
|
} catch (e) {
|
||||||
|
return { valid: false, error: e.message };
|
||||||
}
|
}
|
||||||
if (!Array.isArray(raw.contents)) {
|
|
||||||
throw new Error('[settings] "contents" must be an array');
|
|
||||||
}
|
|
||||||
raw.contents.forEach((entry, i) =>
|
|
||||||
validateFirstLevelSection(entry, `contents[${i}]`)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
@@ -18,9 +18,9 @@ limitations under the License.
|
|||||||
import LeftSidebarLayout from '@/layouts/LeftSidebarLayout.vue';
|
import LeftSidebarLayout from '@/layouts/LeftSidebarLayout.vue';
|
||||||
import SettingsPage from '../components/SettingsPage.vue';
|
import SettingsPage from '../components/SettingsPage.vue';
|
||||||
|
|
||||||
import settingsConfiguration from '../settings.json';
|
|
||||||
import { getSettingRecursively } from '../utils/getSetting.js';
|
import { getSettingRecursively } from '../utils/getSetting.js';
|
||||||
import { computed, onMounted, ref, watch } from 'vue';
|
import { loadSettingsConfig } from '../utils/settingsParser';
|
||||||
|
import { onMounted, ref, watchEffect } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
|
|
||||||
@@ -28,27 +28,39 @@ const { t } = useI18n();
|
|||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
const settings = settingsConfiguration.contents;
|
const settingsLoaded = ref(false)
|
||||||
|
const settings = ref([]);
|
||||||
|
const activeSectionContent = ref({});
|
||||||
|
const activeSection = ref(null);
|
||||||
|
|
||||||
const activePath = computed(() => {
|
watchEffect(() => {
|
||||||
const segments = route.path
|
const segments = route.path
|
||||||
.split('/')
|
.split('/')
|
||||||
.filter(Boolean);
|
.filter(Boolean);
|
||||||
|
|
||||||
return segments.slice(1, segments.length);
|
activeSection.value = segments.slice(1, segments.length).join('.');
|
||||||
});
|
});
|
||||||
|
|
||||||
const activeSection = ref(null);
|
const updateSettings = function updateSettings () {
|
||||||
const updateSettings = async function updateSettings () {
|
if (activeSection.value) {
|
||||||
const setting = getSettingRecursively(activePath.value, settings);
|
const setting = getSettingRecursively(activeSection.value.split('.'), settings.value);
|
||||||
if (setting) {
|
if (!setting) {
|
||||||
activeSection.value = setting;
|
router.push('/settings');
|
||||||
|
} else {
|
||||||
|
activeSectionContent.value = setting;
|
||||||
|
};
|
||||||
} else {
|
} else {
|
||||||
await router.push('/settings');
|
activeSectionContent.value = { content: [] };
|
||||||
}
|
};
|
||||||
};
|
};
|
||||||
watch(route, (newRoute) => updateSettings(newRoute));
|
|
||||||
onMounted(updateSettings);
|
onMounted(async () => {
|
||||||
|
settings.value = (await loadSettingsConfig()).contents;
|
||||||
|
watchEffect(() => {
|
||||||
|
updateSettings();
|
||||||
|
});
|
||||||
|
settingsLoaded.value = true;
|
||||||
|
});
|
||||||
|
|
||||||
const toggleSidebarIfSmallScreen = function toggleSidebarIfSmallScreen (toggleSidebarFunction) {
|
const toggleSidebarIfSmallScreen = function toggleSidebarIfSmallScreen (toggleSidebarFunction) {
|
||||||
if (matchMedia('(max-width: 48rem)').matches) toggleSidebarFunction();
|
if (matchMedia('(max-width: 48rem)').matches) toggleSidebarFunction();
|
||||||
@@ -69,7 +81,7 @@ const toggleSidebarIfSmallScreen = function toggleSidebarIfSmallScreen (toggleSi
|
|||||||
<RouterLink
|
<RouterLink
|
||||||
:to="`/settings/${section.name}`"
|
:to="`/settings/${section.name}`"
|
||||||
class="button button-link link sidebar-section"
|
class="button button-link link sidebar-section"
|
||||||
:class="{ active: activeSection && activeSection.name === section.name }"
|
:class="{ active: activeSection === section.name }"
|
||||||
@click="toggleSidebarIfSmallScreen(toggleSidebar)"
|
@click="toggleSidebarIfSmallScreen(toggleSidebar)"
|
||||||
>
|
>
|
||||||
{{ t(section.i18n) }}
|
{{ t(section.i18n) }}
|
||||||
@@ -77,9 +89,12 @@ const toggleSidebarIfSmallScreen = function toggleSidebarIfSmallScreen (toggleSi
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
<div v-if="activeSection">
|
<div v-if="!settingsLoaded" class="main-content--loading">
|
||||||
|
{{ t('loading') }}
|
||||||
|
</div>
|
||||||
|
<div v-else-if="activeSection" class="main-content--loaded">
|
||||||
<div class="settings-main-content">
|
<div class="settings-main-content">
|
||||||
<SettingsPage :setting="activeSection" :path="activePath" />
|
<SettingsPage :setting="activeSectionContent" :path="activeSection" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="main-content--no-section">
|
<div v-else class="main-content--no-section">
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ limitations under the License.
|
|||||||
|
|
||||||
import SettingsView from '../SettingsView.vue';
|
import SettingsView from '../SettingsView.vue';
|
||||||
import { mountComponent } from '@/test-utils/mountComponent.js';
|
import { mountComponent } from '@/test-utils/mountComponent.js';
|
||||||
|
import { flushPromises } from '@vue/test-utils';
|
||||||
import { beforeEach, describe, expect, test, vi } from 'vitest';
|
import { beforeEach, describe, expect, test, vi } from 'vitest';
|
||||||
import { nextTick } from 'vue';
|
|
||||||
|
|
||||||
const settingsHoisted = vi.hoisted(() => [
|
const settingsHoisted = vi.hoisted(() => [
|
||||||
{
|
{
|
||||||
@@ -197,8 +197,10 @@ const settings = settingsHoisted.values();
|
|||||||
const originalCurrentSection = 's0';
|
const originalCurrentSection = 's0';
|
||||||
let currentSection = originalCurrentSection;
|
let currentSection = originalCurrentSection;
|
||||||
|
|
||||||
vi.mock('../../settings.json', () => ({
|
vi.mock('../../utils/settingsParser', () => ({
|
||||||
default: { contents: settingsHoisted }
|
loadSettingsConfig: vi.fn().mockResolvedValue({
|
||||||
|
contents: settingsHoisted
|
||||||
|
})
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock('vue-router', async (importOriginal) => {
|
vi.mock('vue-router', async (importOriginal) => {
|
||||||
@@ -233,7 +235,9 @@ describe('SettingsView', () => {
|
|||||||
describe('sidebar', () => {
|
describe('sidebar', () => {
|
||||||
test('shows all top-level sections', async () => {
|
test('shows all top-level sections', async () => {
|
||||||
const wrapper = getWrapper();
|
const wrapper = getWrapper();
|
||||||
await nextTick();
|
|
||||||
|
await flushPromises();
|
||||||
|
await wrapper.vm.$nextTick();
|
||||||
|
|
||||||
const sidebarItems = wrapper.findAll('.sidebar-sections-list > li');
|
const sidebarItems = wrapper.findAll('.sidebar-sections-list > li');
|
||||||
settings.forEach((setting, index) => {
|
settings.forEach((setting, index) => {
|
||||||
@@ -250,27 +254,47 @@ describe('SettingsView', () => {
|
|||||||
|
|
||||||
describe('main', () => {
|
describe('main', () => {
|
||||||
describe('correct element', () => {
|
describe('correct element', () => {
|
||||||
|
test('shows that it is loading', () => {
|
||||||
|
const wrapper = getWrapper();
|
||||||
|
|
||||||
|
const mainContentLoading = wrapper.find('.main-content--loading');
|
||||||
|
const mainContentLoaded = wrapper.find('.main-content--loaded');
|
||||||
|
const mainContentNoSection = wrapper.find('.main-content--no-section');
|
||||||
|
|
||||||
|
expect(mainContentLoading.exists()).toBe(true);
|
||||||
|
expect(mainContentLoaded.exists()).toBe(false);
|
||||||
|
expect(mainContentNoSection.exists()).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
test('shows that no section is selected', async () => {
|
test('shows that no section is selected', async () => {
|
||||||
currentSection = '';
|
currentSection = '';
|
||||||
|
|
||||||
const wrapper = getWrapper();
|
const wrapper = getWrapper();
|
||||||
await nextTick();
|
|
||||||
|
|
||||||
const mainContent = wrapper.find('.settings-main-content');
|
await flushPromises();
|
||||||
|
await wrapper.vm.$nextTick();
|
||||||
|
|
||||||
|
const mainContentLoading = wrapper.find('.main-content--loading');
|
||||||
|
const mainContentLoaded = wrapper.find('.main-content--loaded');
|
||||||
const mainContentNoSection = wrapper.find('.main-content--no-section');
|
const mainContentNoSection = wrapper.find('.main-content--no-section');
|
||||||
|
|
||||||
expect(mainContent.exists()).toBe(false);
|
expect(mainContentLoading.exists()).toBe(false);
|
||||||
|
expect(mainContentLoaded.exists()).toBe(false);
|
||||||
expect(mainContentNoSection.exists()).toBe(true);
|
expect(mainContentNoSection.exists()).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('shows main content', async () => {
|
test('shows main content', async () => {
|
||||||
const wrapper = getWrapper();
|
const wrapper = getWrapper();
|
||||||
await nextTick();
|
|
||||||
|
|
||||||
const mainContent = wrapper.find('.settings-main-content');
|
await flushPromises();
|
||||||
|
await wrapper.vm.$nextTick();
|
||||||
|
|
||||||
|
const mainContentLoading = wrapper.find('.main-content--loading');
|
||||||
|
const mainContentLoaded = wrapper.find('.main-content--loaded');
|
||||||
const mainContentNoSection = wrapper.find('.main-content--no-section');
|
const mainContentNoSection = wrapper.find('.main-content--no-section');
|
||||||
|
|
||||||
expect(mainContent.exists()).toBe(true);
|
expect(mainContentLoading.exists()).toBe(false);
|
||||||
|
expect(mainContentLoaded.exists()).toBe(true);
|
||||||
expect(mainContentNoSection.exists()).toBe(false);
|
expect(mainContentNoSection.exists()).toBe(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ const toggleSidebar = function toggleSidebar () {
|
|||||||
<div class="sidebar-controls">
|
<div class="sidebar-controls">
|
||||||
<SidebarExpandButton @click="toggleSidebar" class="sidebar-expand-button" />
|
<SidebarExpandButton @click="toggleSidebar" class="sidebar-expand-button" />
|
||||||
</div>
|
</div>
|
||||||
<div class="sidebar-content" v-show="props.expanded">
|
<div class="sidebar-content" v-if="props.expanded">
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
@@ -61,10 +61,6 @@ const toggleSidebar = function toggleSidebar () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 48rem) {
|
@media (max-width: 48rem) {
|
||||||
.sidebar {
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar:not(.expanded) .sidebar-expand-button {
|
.sidebar:not(.expanded) .sidebar-expand-button {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,27 +60,6 @@
|
|||||||
"option": {
|
"option": {
|
||||||
"ariaLabel": "Wählt die Option {option} aus"
|
"ariaLabel": "Wählt die Option {option} aus"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"settings": {
|
|
||||||
"appearance": {
|
|
||||||
"title": "Erscheinungsbild",
|
|
||||||
"contents": {
|
|
||||||
"colorScheme": {
|
|
||||||
"title": "Farbschema",
|
|
||||||
"options": {
|
|
||||||
"auto": "An Systemfarbschema anpassen",
|
|
||||||
"light": "Hell",
|
|
||||||
"dark": "Dunkel"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"legal": {
|
|
||||||
"notice": {
|
|
||||||
"title": "Impressum",
|
|
||||||
"loadError": "Das Impressum konnte nicht geladen werden."
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -60,27 +60,6 @@
|
|||||||
"option": {
|
"option": {
|
||||||
"ariaLabel": "Selects option {option}"
|
"ariaLabel": "Selects option {option}"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"settings": {
|
|
||||||
"appearance": {
|
|
||||||
"title": "Appearance",
|
|
||||||
"contents": {
|
|
||||||
"colorScheme": {
|
|
||||||
"title": "Color Scheme",
|
|
||||||
"options": {
|
|
||||||
"auto": "Adapt to system color scheme",
|
|
||||||
"light": "Light",
|
|
||||||
"dark": "Dark"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"legal": {
|
|
||||||
"notice": {
|
|
||||||
"title": "Legal Notice",
|
|
||||||
"loadError": "The legal notice could not be loaded."
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -30,9 +30,6 @@ import rawFonts from './styles/fonts.json';
|
|||||||
import './styles/common.css';
|
import './styles/common.css';
|
||||||
import './styles/variables/colors.css';
|
import './styles/variables/colors.css';
|
||||||
|
|
||||||
import settings from './features/settings/settings.json';
|
|
||||||
import { validateSettingsConfig } from './features/settings/utils/settingsValidator';
|
|
||||||
|
|
||||||
(async () => {
|
(async () => {
|
||||||
const fonts = rawFonts.map((font) => new FontFace(
|
const fonts = rawFonts.map((font) => new FontFace(
|
||||||
font.family ?? '',
|
font.family ?? '',
|
||||||
@@ -57,8 +54,6 @@ import { validateSettingsConfig } from './features/settings/utils/settingsValida
|
|||||||
|
|
||||||
const pinia = createPinia();
|
const pinia = createPinia();
|
||||||
pinia.use(piniaPluginPersistedstate);
|
pinia.use(piniaPluginPersistedstate);
|
||||||
|
|
||||||
validateSettingsConfig(settings);
|
|
||||||
|
|
||||||
createApp(App)
|
createApp(App)
|
||||||
.use(router)
|
.use(router)
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ import { createRouter, createWebHistory } from 'vue-router';
|
|||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
|
|
||||||
import SearchView from '../views/SearchView.vue';
|
import SearchView from '../views/SearchView.vue';
|
||||||
import LegalNoticeView from '@/features/legal/views/LegalNoticeView.vue';
|
|
||||||
import SearchResultsView from '@/features/search/views/SearchResultsView.vue';
|
import SearchResultsView from '@/features/search/views/SearchResultsView.vue';
|
||||||
import SettingsView from '@/features/settings/views/SettingsView.vue';
|
import SettingsView from '@/features/settings/views/SettingsView.vue';
|
||||||
import NotFound from '../views/NotFound.vue';
|
import NotFound from '../views/NotFound.vue';
|
||||||
@@ -40,14 +39,6 @@ const routes = [
|
|||||||
title: (route) => route.query.q
|
title: (route) => route.query.q
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: '/legal/notice',
|
|
||||||
name: 'legalNotice',
|
|
||||||
component: LegalNoticeView,
|
|
||||||
meta: {
|
|
||||||
title: () => i18n.global.t('legal.notice.title')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: '/settings/:rest(.*)*',
|
path: '/settings/:rest(.*)*',
|
||||||
name: 'settings',
|
name: 'settings',
|
||||||
|
|||||||
+1
-10
@@ -24,7 +24,6 @@ body {
|
|||||||
|
|
||||||
.link {
|
.link {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: var(--dark);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.link:hover:not(.button-link), .link:focus-visible:not(.button-link) {
|
.link:hover:not(.button-link), .link:focus-visible:not(.button-link) {
|
||||||
@@ -92,12 +91,4 @@ input {
|
|||||||
/* Temporary until a custom tap highlight is implemented. */
|
/* Temporary until a custom tap highlight is implemented. */
|
||||||
* {
|
* {
|
||||||
-webkit-tap-highlight-color: transparent;
|
-webkit-tap-highlight-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
.error {
|
|
||||||
background-color: var(--color-negative-bg);
|
|
||||||
border: 1px solid var(--color-negative-border);
|
|
||||||
padding: 1em 2em;
|
|
||||||
border-radius: 1.2em;
|
|
||||||
color: var(--white);
|
|
||||||
}
|
|
||||||
@@ -84,9 +84,6 @@ body {
|
|||||||
--light-hover: var(--light-d-2);
|
--light-hover: var(--light-d-2);
|
||||||
|
|
||||||
--invert: invert(0);
|
--invert: invert(0);
|
||||||
|
|
||||||
--color-negative-bg: oklch(59% 0.22706 29.244);
|
|
||||||
--color-negative-border: oklch(51% 0.22706 29.244);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
@media (prefers-color-scheme: dark) {
|
||||||
|
|||||||
Reference in New Issue
Block a user