From e199c68d683a7ad693eda7bf63a420fc779b21f6 Mon Sep 17 00:00:00 2001 From: Julien Calixte Date: Wed, 24 Mar 2021 21:23:23 +0100 Subject: [PATCH] :recycle: (store) use a store to store readme and files --- package.json | 1 + src/components/FluxNote.vue | 26 +++--- src/components/StackedNote.vue | 9 +- src/hooks/useFile.hook.ts | 19 ++-- src/hooks/useImages.hook.ts | 23 ++--- src/hooks/useNote.hook.ts | 43 +++------ src/hooks/useRepo.hook.ts | 104 ---------------------- src/main.ts | 2 + src/modules/note/hooks/useFolderNotes.ts | 16 ++-- src/modules/repo/interfaces/RepoFile.ts | 8 ++ src/modules/repo/services/repo.ts | 77 ++++++++++++++++ src/modules/repo/store/userRepo.store.ts | 39 ++++++++ src/modules/user/hooks/useUserSettings.ts | 1 + src/styles/app.scss | 11 ++- src/views/DraftNotes.vue | 17 +--- src/views/FleetingNotes.vue | 17 +--- src/views/Home.vue | 13 +-- yarn.lock | 5 ++ 18 files changed, 202 insertions(+), 229 deletions(-) delete mode 100644 src/hooks/useRepo.hook.ts create mode 100644 src/modules/repo/interfaces/RepoFile.ts create mode 100644 src/modules/repo/services/repo.ts create mode 100644 src/modules/repo/store/userRepo.store.ts create mode 100644 src/modules/user/hooks/useUserSettings.ts diff --git a/package.json b/package.json index 9fe66c5..7151c33 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "core-js": "^3.9.0", "markdown-it": "^12.0.4", "nanoid": "^3.1.22", + "pinia": "^2.0.0-alpha.7", "pouchdb-adapter-indexeddb": "^7.2.2", "pouchdb-browser": "^7.2.2", "register-service-worker": "^1.7.2", diff --git a/src/components/FluxNote.vue b/src/components/FluxNote.vue index c611255..4bc5410 100644 --- a/src/components/FluxNote.vue +++ b/src/components/FluxNote.vue @@ -25,8 +25,6 @@ v-for="(stackedNote, index) in stackedNotes" :key="stackedNote" :index="index" - :user="user" - :repo="repo" :sha="stackedNote" :title="titles[stackedNote ?? '']" /> @@ -38,7 +36,6 @@ import { useQueryStackedNotes } from '@/hooks/useQueryStackedNotes.hook' import { defineComponent, defineAsyncComponent, - toRefs, computed, watch, nextTick, @@ -48,6 +45,7 @@ import HeaderNote from '@/components/HeaderNote.vue' import { useNote } from '@/hooks/useNote.hook' import { useMarkdown } from '@/hooks/useMarkdown.hook' import { useLinks } from '@/hooks/useLinks.hook' +import { useUserRepoStore } from '@/modules/repo/store/userRepo.store' const StackedNote = defineAsyncComponent(() => import('@/components/StackedNote.vue') @@ -65,27 +63,31 @@ export default defineComponent({ content: { type: String, required: false, default: null } }, setup(props) { + const store = useUserRepoStore() const { renderString } = useMarkdown() - const refProps = toRefs(props) const { listenToClick } = useLinks('note-display') const { stackedNotes, resetStackedNotes } = useQueryStackedNotes() - const { readme, ...noteProps } = useNote( - 'note-container', - refProps.user, - refProps.repo - ) + const { ...noteProps } = useNote('note-container') const renderedContent = computed(() => - props.content !== null ? renderString(props.content) : readme.value + props.content !== null ? renderString(props.content) : store.readme ) const hasContent = computed(() => !!renderedContent.value) - watch(renderedContent, () => nextTick(() => listenToClick())) + watch(renderedContent, () => + nextTick(() => { + console.log(renderedContent) + + listenToClick() + }) + ) + + store.setUserRepo(props.user, props.repo) onUnmounted(() => { - readme.value = '' + store.resetUserRepo() }) return { diff --git a/src/components/StackedNote.vue b/src/components/StackedNote.vue index 07da535..ebdc33c 100644 --- a/src/components/StackedNote.vue +++ b/src/components/StackedNote.vue @@ -17,7 +17,7 @@