From 25ad639c80e6bbfc32d36c603fba1252e5dc0620 Mon Sep 17 00:00:00 2001 From: Julien Calixte Date: Mon, 9 Aug 2021 20:13:04 +0200 Subject: [PATCH 1/2] :bug: (title) only use title notes not path --- src/hooks/useNote.hook.ts | 4 ++-- src/utils/noteTitle.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/hooks/useNote.hook.ts b/src/hooks/useNote.hook.ts index d29e3a3..e2a37fe 100644 --- a/src/hooks/useNote.hook.ts +++ b/src/hooks/useNote.hook.ts @@ -6,7 +6,7 @@ import { useOverlay } from '@/hooks/useOverlay.hook' import { useQueryStackedNotes } from '@/hooks/useQueryStackedNotes.hook' import { resolvePath } from '@/modules/repo/services/resolvePath' import { useUserRepoStore } from '@/modules/repo/store/userRepo.store' -import { pathToNoteTitle } from '@/utils/noteTitle' +import { pathToNotePathTitle } from '@/utils/noteTitle' export const useNote = (containerClass: string) => { const store = useUserRepoStore() @@ -20,7 +20,7 @@ export const useNote = (containerClass: string) => { } const filePath = store.files.find((file) => file.sha === note)?.path ?? '' - obj[note] = pathToNoteTitle(filePath) + obj[note] = pathToNotePathTitle(filePath) return obj }, {}) diff --git a/src/utils/noteTitle.ts b/src/utils/noteTitle.ts index da0bd10..503322c 100644 --- a/src/utils/noteTitle.ts +++ b/src/utils/noteTitle.ts @@ -1,7 +1,7 @@ export const filenameToNoteTitle = (title: string) => title.replaceAll('/', ' / ').replaceAll('-', ' ') -export const pathToNoteTitle = (path: string) => { +export const pathToNotePathTitle = (path: string) => { const fileNames = path.split('.') fileNames.pop() @@ -12,3 +12,7 @@ export const pathToNoteTitle = (path: string) => { .join('/') .replaceAll('-', ' ') } + +export const pathToNoteTitle = (notePathTitle: string) => { + return pathToNotePathTitle(notePathTitle).split('/').pop()?.trim() ?? '' +} From 50126da87604a294235b0baf972e3b490c191634 Mon Sep 17 00:00:00 2001 From: Julien Calixte Date: Mon, 9 Aug 2021 20:45:49 +0200 Subject: [PATCH 2/2] :lipstick: (font family) add Amiri as font family --- src/styles/app.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/app.scss b/src/styles/app.scss index caec46a..1cb0f96 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -1,5 +1,5 @@ @charset "utf-8"; -@import url('https://fonts.googleapis.com/css2?family=Courier+Prime&family=Courgette&family=IBM+Plex+Serif&family=Kiwi+Maru&family=Maven+Pro&family=Noto+Sans+KR&family=Tajawal&family=Domine&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Courier+Prime&family=Courgette&family=IBM+Plex+Serif&family=Kiwi+Maru&family=Maven+Pro&family=Noto+Sans+KR&family=Tajawal&family=Domine&family=Amiri&display=swap'); /** font-family: 'Courgette', cursive; @@ -9,6 +9,7 @@ font-family: 'Noto Sans KR', sans-serif; font-family: 'Tajawal', sans-serif; font-family: 'Domine', serif; + font-family: 'Amiri', serif; */ $primary: #2c3a47;