generated from Seekra/repository-template
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
17072dbc5a
|
|||
|
1d90612bbd
|
|||
|
f322f19f9e
|
|||
|
d0dc66940a
|
|||
|
8ff26f4bb8
|
|||
|
12f67f17ed
|
|||
|
8850732ec6
|
|||
|
940eb84202
|
|||
|
c2a9d80cf5
|
|||
|
8fc2b14ef1
|
|||
|
6731b1981b
|
|||
|
4584fd92d1
|
|||
|
42bd37e9e4
|
|||
|
d9906c782f
|
|||
|
c1ce580ed7
|
|||
|
e0419d57cc
|
|||
|
751b2663b3
|
|||
|
c53d98a95c
|
|||
|
4d612f2c19
|
|||
|
4d8521c130
|
+1
-2
@@ -17,11 +17,10 @@
|
||||
"vue-router": "^5.0.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/test-utils": "^2.4.6",
|
||||
"@vitejs/plugin-vue": "^6.0.6",
|
||||
"jsdom": "^29.1.1",
|
||||
"vite": "^8.0.10",
|
||||
"vite-plugin-html": "^3.2.2",
|
||||
"vitest": "^4.1.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-5
@@ -42,18 +42,15 @@ watch(colorScheme, val => updateColorScheme(val))
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
#app-wrapper {
|
||||
.main-content {
|
||||
--main-content-padding-x: 30px;
|
||||
--main-content-padding-y: 40px;
|
||||
--main-content-padding: var(--main-content-padding-y) var(--main-content-padding-x);
|
||||
}
|
||||
|
||||
.main-content {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
@media (max-width: 48rem) {
|
||||
#app-wrapper {
|
||||
.main-content {
|
||||
--main-content-padding-x: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ const copyrightPeriod =
|
||||
<template>
|
||||
<footer class="global-footer">
|
||||
<div class="footer-segment">
|
||||
<RouterLink to="/settings" class="link">
|
||||
<RouterLink to="settings" class="link">
|
||||
{{ t('preferences.settings') }}
|
||||
</RouterLink>
|
||||
<LanguageSwitchButton />
|
||||
|
||||
@@ -1,114 +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 { expect, test, describe, vi, beforeEach } from 'vitest';
|
||||
import { mount } from '@vue/test-utils';
|
||||
import LanguageSwitchButton from '../LanguageSwitchButton.vue';
|
||||
import { loadLanguage } from '@/i18n';
|
||||
|
||||
vi.mock('@/i18n', () => ({
|
||||
loadLanguage: vi.fn(() => Promise.resolve()),
|
||||
LANGUAGES_RTL: ['ar', 'he'],
|
||||
SUPPORTED_LANGUAGES: ['en', 'de', 'ar']
|
||||
}));
|
||||
|
||||
vi.mock('vue-i18n', () => ({
|
||||
useI18n: () => ({
|
||||
t: (key) => key,
|
||||
locale: { value: 'de' }
|
||||
})
|
||||
}));
|
||||
|
||||
vi.mock('@/features/icons/components/Icon.vue', () => ({
|
||||
default: {
|
||||
name: 'Icon',
|
||||
template: '<span>Icon</span>'
|
||||
}
|
||||
}));
|
||||
|
||||
describe('LanguageSwitchButton.vue', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
localStorage.clear();
|
||||
document.documentElement.lang = '';
|
||||
document.documentElement.dir = '';
|
||||
});
|
||||
|
||||
test('renders correctly with initial state closed', () => {
|
||||
const wrapper = mount(LanguageSwitchButton);
|
||||
|
||||
expect(wrapper.find('.language-button').exists()).toBe(true);
|
||||
expect(wrapper.find('.language-dropdown').exists()).toBe(false);
|
||||
expect(wrapper.find('.language-button').attributes('aria-expanded')).toBe('false');
|
||||
});
|
||||
|
||||
test('opens the dropdown when language button is clicked', async () => {
|
||||
const wrapper = mount(LanguageSwitchButton);
|
||||
const button = wrapper.find('.language-button');
|
||||
|
||||
await button.trigger('click');
|
||||
|
||||
expect(wrapper.find('.language-dropdown').exists()).toBe(true);
|
||||
expect(button.attributes('aria-expanded')).toBe('true');
|
||||
});
|
||||
|
||||
const languageTestCases = [
|
||||
{ code: 'en', expectedDir: 'ltr' },
|
||||
{ code: 'de', expectedDir: 'ltr' },
|
||||
{ code: 'ar', expectedDir: 'rtl' }
|
||||
];
|
||||
|
||||
test.for(languageTestCases)('selectLanguage($code) sets localStorage, html attributes and changes layout direction to $expectedDir', async ({ code, expectedDir }) => {
|
||||
const wrapper = mount(LanguageSwitchButton);
|
||||
|
||||
await wrapper.find('.language-button').trigger('click');
|
||||
|
||||
const options = wrapper.findAll('.language-dropdown li');
|
||||
const optionToClick = options.find(opt => opt.text().includes(code));
|
||||
|
||||
await optionToClick.trigger('click');
|
||||
|
||||
expect(loadLanguage).toHaveBeenCalledWith(code);
|
||||
expect(localStorage.getItem('locale')).toBe(code);
|
||||
expect(document.documentElement.lang).toBe(code);
|
||||
expect(document.documentElement.dir).toBe(expectedDir);
|
||||
expect(wrapper.find('.language-dropdown').exists()).toBe(false);
|
||||
});
|
||||
|
||||
test('closes the dropdown when clicking outside the component', async () => {
|
||||
const wrapper = mount(LanguageSwitchButton, {
|
||||
attachTo: document.body
|
||||
});
|
||||
|
||||
await wrapper.find('.language-button').trigger('click');
|
||||
expect(wrapper.find('.language-dropdown').exists()).toBe(true);
|
||||
|
||||
await new Promise(resolve => setTimeout(resolve, 0));
|
||||
|
||||
const externalDiv = document.createElement('div');
|
||||
document.body.appendChild(externalDiv);
|
||||
|
||||
const clickEvent = new MouseEvent('click', { bubbles: true });
|
||||
externalDiv.dispatchEvent(clickEvent);
|
||||
|
||||
await wrapper.vm.$nextTick();
|
||||
|
||||
expect(wrapper.find('.language-dropdown').exists()).toBe(false);
|
||||
|
||||
wrapper.unmount();
|
||||
externalDiv.remove();
|
||||
});
|
||||
});
|
||||
@@ -42,7 +42,7 @@ import NavbarSearchBarWrapper from './NavbarSearchBarWrapper.vue';
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 18px var(--main-content-padding-x);
|
||||
padding: 18px 40px;
|
||||
height: 42px;
|
||||
}
|
||||
|
||||
|
||||
@@ -73,8 +73,7 @@ const submitSearch = function () {
|
||||
border-radius: calc(var(--content-height) * 0.5 + var(--submit-button-padding-y) + var(--padding));
|
||||
padding: var(--padding);
|
||||
padding-left: var(--padding-left);
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
width: calc(100% - var(--padding-left));
|
||||
}
|
||||
|
||||
.search-wrapper input {
|
||||
@@ -84,7 +83,6 @@ const submitSearch = function () {
|
||||
font-size: 1rem;
|
||||
background: transparent;
|
||||
height: calc(var(--content-height) + 2 * var(--submit-button-padding-y));
|
||||
padding-left: 12px;
|
||||
}
|
||||
|
||||
.search-button {
|
||||
|
||||
@@ -53,6 +53,10 @@ limitations under the License.
|
||||
* @typedef {BoolSettingConfig | NumberSettingConfig | StringSettingConfig | SelectionSettingConfig | SectionSettingConfig} SettingConfigEntry
|
||||
*/
|
||||
|
||||
/**
|
||||
* @typedef {Object} SettingsConfig
|
||||
* @property {SettingConfigEntry[]} contents
|
||||
*/
|
||||
/**
|
||||
* @typedef {{ type: 'bool', name: string, i18n: string, description?: string, default: boolean }} BoolSettingConfig
|
||||
* @typedef {{ type: 'number', name: string, i18n: string, description?: string, default: number }} NumberSettingConfig
|
||||
@@ -60,6 +64,5 @@ limitations under the License.
|
||||
* @typedef {{ type: 'selection', name: string, i18n: string, description?: string, default: string | string[], allowMultiple?: boolean, options: SelectionOption[] }} SelectionSettingConfig
|
||||
* @typedef {{ type: 'section', name: string, i18n?: string, description?: string, content: SettingConfigEntry[] }} SectionSettingConfig
|
||||
* @typedef {BoolSettingConfig | NumberSettingConfig | StringSettingConfig | SelectionSettingConfig | SectionSettingConfig} SettingConfigEntry
|
||||
* @typedef {{ contents: SettingConfigEntry[] }} FirstLevelSettingConfigEntry
|
||||
* @typedef {{ contents: FirstLevelSettingConfigEntry[] }} SettingsConfig
|
||||
* @typedef {{ contents: SettingConfigEntry[] }} SettingsConfig
|
||||
*/
|
||||
@@ -33,6 +33,7 @@ describe('validateSettingsConfig', () => {
|
||||
{ raw: {
|
||||
contents: [
|
||||
{
|
||||
type: 'section',
|
||||
name: 'general',
|
||||
i18n: 'settings.settings.general',
|
||||
content: [
|
||||
@@ -48,6 +49,7 @@ describe('validateSettingsConfig', () => {
|
||||
{ raw: {
|
||||
contents: [
|
||||
{
|
||||
type: 'section',
|
||||
name: 'general',
|
||||
i18n: 'settings.settings.general',
|
||||
content: [
|
||||
@@ -59,6 +61,7 @@ describe('validateSettingsConfig', () => {
|
||||
]
|
||||
},
|
||||
{
|
||||
type: 'section',
|
||||
name: 'copyOfGeneral',
|
||||
i18n: 'settings.settings.copyOfGeneral',
|
||||
content: [
|
||||
@@ -74,6 +77,7 @@ describe('validateSettingsConfig', () => {
|
||||
{ raw: {
|
||||
contents: [
|
||||
{
|
||||
type: 'section',
|
||||
name: 'general',
|
||||
i18n: 'settings.settings.general',
|
||||
content: [
|
||||
@@ -85,6 +89,7 @@ describe('validateSettingsConfig', () => {
|
||||
]
|
||||
},
|
||||
{
|
||||
type: 'section',
|
||||
name: 'copyOfGeneral',
|
||||
i18n: 'settings.settings.copyOfGeneral',
|
||||
content: [
|
||||
@@ -97,6 +102,7 @@ describe('validateSettingsConfig', () => {
|
||||
]
|
||||
},
|
||||
{
|
||||
type: 'section',
|
||||
name: 'aSection',
|
||||
i18n: 'settings.settings.aSection',
|
||||
content: [
|
||||
@@ -135,6 +141,7 @@ describe('validateSettingsConfig', () => {
|
||||
{ raw: {
|
||||
contents: [
|
||||
{
|
||||
type: 'section',
|
||||
name: 'general',
|
||||
i18n: 'settings.settings.general',
|
||||
content: [
|
||||
@@ -146,6 +153,7 @@ describe('validateSettingsConfig', () => {
|
||||
]
|
||||
},
|
||||
{
|
||||
type: 'section',
|
||||
name: 'copyOfGeneral',
|
||||
i18n: 'settings.settings.copyOfGeneral',
|
||||
content: [
|
||||
@@ -158,6 +166,7 @@ describe('validateSettingsConfig', () => {
|
||||
]
|
||||
},
|
||||
{
|
||||
type: 'section',
|
||||
name: 'aSection',
|
||||
i18n: 'settings.settings.aSection',
|
||||
content: [
|
||||
@@ -194,74 +203,6 @@ describe('validateSettingsConfig', () => {
|
||||
},
|
||||
]
|
||||
}, expected: true },
|
||||
{ raw: {
|
||||
contents: [
|
||||
{
|
||||
type: 'bool',
|
||||
name: 'aStandaloneBooleanSetting',
|
||||
i18n: 'settings.settings.aStandaloneBooleanSetting',
|
||||
default: true
|
||||
},
|
||||
{
|
||||
name: 'general',
|
||||
i18n: 'settings.settings.general',
|
||||
content: [
|
||||
{
|
||||
type: 'bool',
|
||||
name: 'Enable feature 42',
|
||||
i18n: 'settings.settings.general.enableFeature42'
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
name: 'copyOfGeneral',
|
||||
i18n: 'settings.settings.copyOfGeneral',
|
||||
content: [
|
||||
{
|
||||
type: 'bool',
|
||||
name: 'Enable feature 42',
|
||||
default: false,
|
||||
i18n: 'settings.settings.general.enableFeature42'
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
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 },
|
||||
{ raw: {
|
||||
contents: [
|
||||
{
|
||||
|
||||
@@ -83,19 +83,6 @@ export const validateEntry = function validateEntry (entry, path) {
|
||||
}
|
||||
}
|
||||
|
||||
export const validateFirstLevelSection = function validateFirstLevelSection (section, path) {
|
||||
assertString(section.name);
|
||||
assertString(section.i18n);
|
||||
|
||||
if (!Array.isArray(section.content)) {
|
||||
throw new Error(`[settings] "${path}.content" must be an array`);
|
||||
};
|
||||
|
||||
section.content.forEach((entry, i) =>
|
||||
validateEntry(entry, `${path}.content[${i}]`)
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Validates a raw settings config object.
|
||||
* @param {unknown} raw
|
||||
@@ -110,7 +97,7 @@ export function validateSettingsConfig(raw) {
|
||||
throw new Error('[settings] "contents" must be an array');
|
||||
}
|
||||
raw.contents.forEach((entry, i) =>
|
||||
validateFirstLevelSection(entry, `contents[${i}]`)
|
||||
validateEntry(entry, `contents[${i}]`)
|
||||
);
|
||||
return { valid: true, config: raw };
|
||||
} catch (e) {
|
||||
|
||||
@@ -17,33 +17,9 @@ limitations under the License.
|
||||
<script setup>
|
||||
import LeftSidebarLayout from '@/layouts/LeftSidebarLayout.vue';
|
||||
|
||||
import { loadSettingsConfig } from '../utils/settingsParser';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
|
||||
const settingsLoaded = ref(false)
|
||||
const settings = ref([]);
|
||||
|
||||
onMounted(async () => {
|
||||
settings.value = (await loadSettingsConfig()).contents;
|
||||
if (!settings.value.map((section) => section.name).includes(getActiveSection())) {
|
||||
router.push('/settings');
|
||||
};
|
||||
settingsLoaded.value = true;
|
||||
});
|
||||
|
||||
const getActiveSection = function getActiveSection () {
|
||||
const segments = route.path
|
||||
.split('/')
|
||||
.filter(Boolean);
|
||||
|
||||
return segments[1];
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -55,23 +31,7 @@ const getActiveSection = function getActiveSection () {
|
||||
</header>
|
||||
<LeftSidebarLayout class="layout">
|
||||
<template #sidebar>
|
||||
<ul class="sidebar-sections-list">
|
||||
<li v-for="section in settings">
|
||||
<RouterLink
|
||||
:to="`/settings/${section.name}`"
|
||||
class="button button-link link sidebar-section"
|
||||
:class="{ active: getActiveSection() === section.name }"
|
||||
>
|
||||
{{ t(section.i18n) }}
|
||||
</RouterLink>
|
||||
</li>
|
||||
</ul>
|
||||
</template>
|
||||
<div>
|
||||
<div v-if="!settingsLoaded">
|
||||
{{ t('loading') }}
|
||||
</div>
|
||||
</div>
|
||||
</LeftSidebarLayout>
|
||||
</div>
|
||||
</template>
|
||||
@@ -86,10 +46,6 @@ const getActiveSection = function getActiveSection () {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.active {
|
||||
background-color: var(--light-hover);
|
||||
}
|
||||
|
||||
.header {
|
||||
padding: var(--main-content-padding-y) var(--main-content-padding-x);
|
||||
}
|
||||
@@ -97,21 +53,4 @@ const getActiveSection = function getActiveSection () {
|
||||
.header h1 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.sidebar-sections-list {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.sidebar-section {
|
||||
--padding: 0.8em;
|
||||
border-radius: var(--padding);
|
||||
padding: var(--padding);
|
||||
margin-bottom: 4px;
|
||||
width: calc(100% - 2 * var(--padding));
|
||||
text-align: start;
|
||||
font-size: 1rem;
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"loading": "Laden ...",
|
||||
"search": {
|
||||
"searchBar": {
|
||||
"submit": "Suchen",
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"loading": "Loading ...",
|
||||
"search": {
|
||||
"searchBar": {
|
||||
"submit": "Search",
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"loading": "Cargando ...",
|
||||
"search": {
|
||||
"searchBar": {
|
||||
"submit": "Buscar",
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"loading": "Chargement ...",
|
||||
"search": {
|
||||
"searchBar": {
|
||||
"submit": "Rechercher",
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"loading": "Caricamento ...",
|
||||
"search": {
|
||||
"searchBar": {
|
||||
"submit": "Cerca",
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"loading": "A carregar ...",
|
||||
"search": {
|
||||
"searchBar": {
|
||||
"submit": "Pesquisar",
|
||||
|
||||
@@ -43,12 +43,6 @@ const routes = [
|
||||
path: '/settings',
|
||||
name: 'settings',
|
||||
component: SettingsView,
|
||||
children: [
|
||||
{
|
||||
path: ':rest(.*)',
|
||||
component: SettingsView
|
||||
}
|
||||
],
|
||||
meta: {
|
||||
title: () => i18n.global.t('preferences.settings')
|
||||
}
|
||||
@@ -65,18 +59,6 @@ const router = createRouter({
|
||||
routes
|
||||
});
|
||||
|
||||
// remove trailing slash(es)
|
||||
router.beforeEach((route) => {
|
||||
if (route.path !== '/' && route.path.endsWith('/')) {
|
||||
return {
|
||||
path: route.path.replace(/\/+$/, ''),
|
||||
query: route.query,
|
||||
hash: route.hash,
|
||||
replace: true
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
// set page title
|
||||
router.afterEach(to => {
|
||||
const title =
|
||||
|
||||
+1
-28
@@ -23,23 +23,10 @@ body {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.link:hover:not(.button-link), .link:focus:not(.button-link) {
|
||||
outline: none;
|
||||
.link:hover:not(.button-link) {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.button-link {
|
||||
color: var(--dark);
|
||||
}
|
||||
|
||||
.button-link:hover {
|
||||
color: var(--dark);
|
||||
}
|
||||
|
||||
.button-link:visited {
|
||||
color: var(--dark);
|
||||
}
|
||||
|
||||
input {
|
||||
color: var(--dark);
|
||||
}
|
||||
@@ -47,18 +34,4 @@ input {
|
||||
.main-content-padding {
|
||||
padding: var(--main-content-padding);
|
||||
width: calc(100% - var(--main-content-padding-x) * 2);
|
||||
}
|
||||
|
||||
.button {
|
||||
background-color: var(--light-bg);
|
||||
border: none;
|
||||
}
|
||||
|
||||
.button:focus {
|
||||
background-color: var(--light-hover);
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.button:hover {
|
||||
background-color: var(--light-hover);
|
||||
}
|
||||
@@ -43,7 +43,7 @@ const { t } = useI18n();
|
||||
.error-message{
|
||||
margin: 0;
|
||||
font-weight: 600;
|
||||
font-size: 1.75rem;
|
||||
font-size: 2vw;
|
||||
}
|
||||
#link {
|
||||
align-items: center;
|
||||
|
||||
@@ -67,10 +67,9 @@ const submitSearch = function () {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.slogan {
|
||||
margin-top: 1rem;
|
||||
.slogan{
|
||||
margin: 0;
|
||||
font-size: small;
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
.search-container {
|
||||
|
||||
Reference in New Issue
Block a user