0
0
Fork 0

Merge branch 'dev' into 5986-redisgnDescriptors

This commit is contained in:
Jorge Penadés 2023-08-09 12:57:26 +00:00
commit dd9b58a0ab
4 changed files with 5 additions and 6 deletions

View File

@ -107,10 +107,7 @@ async function togglePinned(item, event) {
message: t('globals.dataSaved'), message: t('globals.dataSaved'),
type: 'positive', type: 'positive',
}); });
}; }
function firstLower(str) {
return str[0].toLowerCase() + str.slice(1);
};
</script> </script>
<template> <template>

View File

@ -14,7 +14,7 @@ const props = defineProps({
const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
</script> </script>
<template> <template>
<QItem active-class="text-primary" :to="{ name: item.name }" clickable class="q-ml-md" v-ripple> <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
<QItemSection avatar v-if="item.icon"> <QItemSection avatar v-if="item.icon">
<QIcon :name="item.icon" /> <QIcon :name="item.icon" />
</QItemSection> </QItemSection>

View File

@ -15,6 +15,8 @@ const quasar = useQuasar();
const state = useState(); const state = useState();
const user = state.getUser(); const user = state.getUser();
const token = session.getToken(); const token = session.getToken();
const appName = 'Lilium';
onMounted(() => stateStore.setMounted()); onMounted(() => stateStore.setMounted());
const pinnedModulesRef = ref(); const pinnedModulesRef = ref();

View File

@ -45,7 +45,7 @@ vi.mock('src/router/modules', () => ({
], ],
})); }));
describe('Leftmenu', () => { describe.skip('Leftmenu', () => {
let vm; let vm;
let navigation; let navigation;
beforeAll(() => { beforeAll(() => {