diff --git a/src/components/TopBar/Settings.vue b/src/components/TopBar/Settings.vue index 80ca3d6..ec471b2 100644 --- a/src/components/TopBar/Settings.vue +++ b/src/components/TopBar/Settings.vue @@ -1,5 +1,5 @@ - + @@ -42,13 +34,15 @@ const handleClick = (fn: (...args: any[]) => any) => { > (preferredNotesSource = source))" > - {{ label }} + {{ sourceLabels[source] }} diff --git a/src/composables/useNotes.ts b/src/composables/useNotes.ts index 18b242e..f6de2e7 100644 --- a/src/composables/useNotes.ts +++ b/src/composables/useNotes.ts @@ -14,18 +14,18 @@ export const notesSources = computed(() => ({ firebase: initialized.value && user.value })) -export const availableNotesSources = computed(() => +export const availableNotesSources = computed(() => Object.entries(notesSources.value) .filter(([, enabled]) => enabled) - .map(([source]) => source) + .map(([source]) => source as notesSourceValues) ) -export type notesSourceValues = keyof typeof notesSources.value | null +export type notesSourceValues = keyof typeof notesSources.value -export const activeNotesSource = ref(null) +export const activeNotesSource = ref(null) watchEffect(() => { - const getSource = (): notesSourceValues => { + const getSource = (): notesSourceValues | null => { if (!initialized.value) return null if ( preferredNotesSource.value && diff --git a/src/composables/useSettings.ts b/src/composables/useSettings.ts index 3a6f42b..ce0793c 100644 --- a/src/composables/useSettings.ts +++ b/src/composables/useSettings.ts @@ -1,10 +1,10 @@ import type { notesSourceValues } from '@/composables/useNotes' interface Settings { - preferredNotesSource: notesSourceValues + preferredNotesSource: notesSourceValues | null } -export const preferredNotesSource = ref(null) +export const preferredNotesSource = ref(null) const updateSettings = () => { const settings: Settings = {