diff --git a/out/main/index.js b/out/main/index.js index b323e20..dfb83e1 100644 --- a/out/main/index.js +++ b/out/main/index.js @@ -79,7 +79,9 @@ const ajv = new Ajv({ allErrors: true, strict: false }); const getDefaultConfig = () => { return { activeAdapter: "browser", - theme: "dark" + theme: "dark", + enableBlackletter: "true", + openNotesInNewWindow: "true" }; }; const CONFIG_SCHEMA = { @@ -313,6 +315,7 @@ class NotesAPI { } getNote(id) { const note = this.notesCache.get(id); + console.log(this.notesCache, id); return note ? { ...note } : null; } async createNote(metadata = {}, content = "", plainText = "") { diff --git a/src/core/NotesAPI.js b/src/core/NotesAPI.js index 947018d..2df68b1 100644 --- a/src/core/NotesAPI.js +++ b/src/core/NotesAPI.js @@ -188,6 +188,7 @@ export default class NotesAPI { getNote(id) { const note = this.notesCache.get(id) + console.log(this.notesCache, id) return note ? { ...note } : null } diff --git a/src/core/PluginManager.js b/src/core/PluginManager.js index 168e9b1..5d60909 100644 --- a/src/core/PluginManager.js +++ b/src/core/PluginManager.js @@ -77,7 +77,6 @@ export const createPluginManagerClient = () => { id, config, ) - console.log(test) return test }, } diff --git a/src/main/index.js b/src/main/index.js index 5a88471..f54c356 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -90,8 +90,6 @@ app.whenReady().then(async () => { ) ipcMain.handle('pluginManager:call', async (_, method, ...args) => { - console.log(method, ...args) - const methodCall = await pluginManager[method](...args) if (method === 'setActivePlugin') { diff --git a/src/renderer/src/components/Btn.vue b/src/renderer/src/components/Btn.vue new file mode 100644 index 0000000..b978912 --- /dev/null +++ b/src/renderer/src/components/Btn.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/renderer/src/components/DeleteMenu.vue b/src/renderer/src/components/DeleteMenu.vue new file mode 100644 index 0000000..b44d2f5 --- /dev/null +++ b/src/renderer/src/components/DeleteMenu.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/renderer/src/components/Modal.vue b/src/renderer/src/components/Modal.vue new file mode 100644 index 0000000..4dd808a --- /dev/null +++ b/src/renderer/src/components/Modal.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/renderer/src/components/MoveMenu.vue b/src/renderer/src/components/MoveMenu.vue index 1850f05..df5ea62 100644 --- a/src/renderer/src/components/MoveMenu.vue +++ b/src/renderer/src/components/MoveMenu.vue @@ -56,7 +56,11 @@ watch(open, async () => { diff --git a/src/renderer/src/components/preferences/Storage.vue b/src/renderer/src/components/preferences/Storage.vue index f38334b..4e457a8 100644 --- a/src/renderer/src/components/preferences/Storage.vue +++ b/src/renderer/src/components/preferences/Storage.vue @@ -109,7 +109,6 @@ const validate = async () => { // Test connection const testResult = await testPlugin(plugin.id, adapterConfig) - console.log(testResult) if (!testResult) { throw new Error(`Failed to connect to ${plugin.name}`) } diff --git a/src/renderer/src/components/svg/BtnOutline.vue b/src/renderer/src/components/svg/BtnOutline.vue new file mode 100644 index 0000000..7fcfa3a --- /dev/null +++ b/src/renderer/src/components/svg/BtnOutline.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/renderer/src/composables/useNotes.js b/src/renderer/src/composables/useNotes.js index f8b2c70..3b2d86e 100644 --- a/src/renderer/src/composables/useNotes.js +++ b/src/renderer/src/composables/useNotes.js @@ -12,6 +12,7 @@ export default () => { // Change listeners for electron const { setupListeners, broadcastChange, changeCount } = useNoteListeners() setupListeners() + getNotesAPI() const getDecryptionFailures = async () => { const api = await getNotesAPI() @@ -30,7 +31,7 @@ export default () => { } const loadNote = async (id) => { const api = await getNotesAPI() - return api.getNote(id) + return await api.getNote(id) } // Create diff --git a/src/renderer/src/composables/useOpenNote.js b/src/renderer/src/composables/useOpenNote.js index fdf90fd..b04dee7 100644 --- a/src/renderer/src/composables/useOpenNote.js +++ b/src/renderer/src/composables/useOpenNote.js @@ -1,11 +1,15 @@ import { useRouter } from 'vue-router' import { useEnvironment, ENVIRONMENTS } from './useEnvironment' +import useConfig from '@/composables/useConfig' export default () => { const router = useRouter() + const { config, ensureConfig } = useConfig() - function openNote(noteId, options = {}) { - const { newWindow = true } = options + const openNote = async (noteId) => { + await ensureConfig() + const newWindow = + config.value.openNotesInNewWindow === 'true' ? true : false const environment = useEnvironment() diff --git a/src/renderer/src/libs/theme.js b/src/renderer/src/libs/theme.js index 8ad0e12..aa616f6 100644 --- a/src/renderer/src/libs/theme.js +++ b/src/renderer/src/libs/theme.js @@ -5,6 +5,7 @@ const colors = { green: '#87FF5B', blue: '#5B92FF', purple: '#94079E', + red: '#D40202', } const themes = { diff --git a/src/renderer/src/views/Category.vue b/src/renderer/src/views/Category.vue index 99f4d8f..790d975 100644 --- a/src/renderer/src/views/Category.vue +++ b/src/renderer/src/views/Category.vue @@ -7,8 +7,15 @@ @edited="onCategoryEdited" /> + +
- +
@@ -22,12 +29,14 @@ import useNotes from '@/composables/useNotes' import NoteRow from '@/components/NoteRow.vue' import CategoryRow from '@/components/CategoryRow.vue' import NewNote from '@/components/NewNote.vue' +import DeleteMenu from '@/components/DeleteMenu.vue' const route = useRoute() const id = route.params?.id const router = useRouter() const notes = ref() +const deleteActive = ref(false) const refreshNotes = async () => { if (id) { @@ -48,7 +57,6 @@ onMounted(async () => { if (!categories.value?.length) { await loadCategories() - console.log(categories.value) } }) @@ -75,6 +83,9 @@ main.category { .category-row { margin-top: 4px; } + .delete-menu { + margin: 10px 0 12px; + } .notes { display: flex; flex-direction: column; diff --git a/src/renderer/src/views/Directory.vue b/src/renderer/src/views/Directory.vue index e510a59..7a29827 100644 --- a/src/renderer/src/views/Directory.vue +++ b/src/renderer/src/views/Directory.vue @@ -10,10 +10,19 @@ :key="category" /> -

Summarium

+
+

Summarium

+ + +
- +
@@ -33,6 +42,7 @@ import DecryptionWarning from '@/components/DecryptionWarning.vue' import { onMounted, ref, watchEffect, watch } from 'vue' import CategoryRow from '@/components/CategoryRow.vue' import PageLoading from '@/components/PageLoading.vue' +import DeleteMenu from '@/components/DeleteMenu.vue' import NoteRow from '@/components/NoteRow.vue' import useNotes from '@/composables/useNotes' import NewNote from '@/components/NewNote.vue' @@ -51,6 +61,7 @@ const { const notes = ref() const loaded = ref(false) +const deleteActive = ref(false) const refreshNotes = async () => { loaded.value = false @@ -81,10 +92,16 @@ main.directory { padding-top: var(--nav-height); padding-bottom: 60px; - .label { - text-transform: uppercase; + .bar { + display: flex; + align-items: center; + gap: 27px; margin: 17px 0 24px; - @include p; + + .label { + text-transform: uppercase; + @include p; + } } .notes { display: flex; diff --git a/src/renderer/src/views/Instructions.vue b/src/renderer/src/views/Instructions.vue index c9d1566..78b1de6 100644 --- a/src/renderer/src/views/Instructions.vue +++ b/src/renderer/src/views/Instructions.vue @@ -15,6 +15,7 @@ const renderedContent = md.render(content)