Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: update daily dialog style

boojackbabeb468c183
diff --git a/web/src/helpers/api.ts b/web/src/helpers/api.ts
index bd86daefc..c5a9c5631 100644
--- a/web/src/helpers/api.ts
+++ b/web/src/helpers/api.ts
@@ -48,11 +48,11 @@ export function patchUser(userPatch: UserPatch) {
return axios.patch<ResponseObject<User>>("/api/user/me", userPatch);
}
-export function getMyMemos() {
+export function getMemoList() {
return axios.get<ResponseObject<Memo[]>>("/api/memo");
}
-export function getMyArchivedMemos() {
+export function getArchivedMemoList() {
return axios.get<ResponseObject<Memo[]>>("/api/memo?rowStatus=ARCHIVED");
}
@@ -80,7 +80,7 @@ export function deleteMemo(memoId: MemoId) {
return axios.delete(`/api/memo/${memoId}`);
}
-export function getMyShortcuts() {
+export function getShortcutList() {
return axios.get<ResponseObject<Shortcut[]>>("/api/shortcut");
}
@@ -99,3 +99,7 @@ export function deleteShortcutById(shortcutId: ShortcutId) {
export function uploadFile(formData: FormData) {
return axios.post<ResponseObject<Resource>>("/api/resource", formData);
}
+
+export function getTagList() {
+ return axios.get<ResponseObject<string[]>>("/api/tag");
+}
diff --git a/web/src/less/daily-memo-diary-dialog.less b/web/src/less/daily-memo-diary-dialog.less
index d3b0c1bb5..e190b6f21 100644
--- a/web/src/less/daily-memo-diary-dialog.less
+++ b/web/src/less/daily-memo-diary-dialog.less
@@ -4,7 +4,7 @@
@apply p-0 sm:py-16;
> .dialog-container {
- @apply w-112 max-w-full p-0 rounded-none sm:rounded-lg;
+ @apply w-112 max-w-full grow sm:grow-0 bg-white p-0 rounded-none sm:rounded-lg;
> .dialog-header-container {
@apply flex flex-row justify-between items-center w-full p-6 pb-0 mb-0;
@@ -70,7 +70,7 @@
}
> .tip-container {
- @apply m-auto py-4 px-0;
+ @apply m-auto py-6 pb-12 px-0;
> .tip-text {
font-style: italic;
diff --git a/web/src/services/memoService.ts b/web/src/services/memoService.ts
index 55ab99dbb..c268a05ec 100644
--- a/web/src/services/memoService.ts
+++ b/web/src/services/memoService.ts
@@ -1,5 +1,4 @@
import * as api from "../helpers/api";
-import { TAG_REG } from "../helpers/consts";
import { createMemo, patchMemo, setMemos, setTags } from "../store/modules/memo";
import store from "../store";
@@ -17,7 +16,7 @@ const memoService = {
},
fetchAllMemos: async () => {
- const { data } = (await api.getMyMemos()).data;
+ const { data } = (await api.getMemoList()).data;
const memos = data.filter((m) => m.rowStatus !== "ARCHIVED").map((m) => convertResponseModelMemo(m));
store.dispatch(setMemos(memos));
@@ -25,7 +24,7 @@ const memoService = {
},
fetchDeletedMemos: async () => {
- const { data } = (await api.getMyArchivedMemos()).data;
+ const { data } = (await api.getArchivedMemoList()).data;
const deletedMemos = data.map((m) => {
return convertResponseModelMemo(m);
});
@@ -42,16 +41,9 @@ const memoService = {
return null;
},
- updateTagsState: () => {
- const { memos } = memoService.getState();
- const tagsSet = new Set<string>();
- for (const m of memos) {
- for (const t of Array.from(m.content.match(TAG_REG) ?? [])) {
- tagsSet.add(t.replace(TAG_REG, "$1").trim());
- }
- }
-
- store.dispatch(setTags(Array.from(tagsSet).filter((t) => Boolean(t))));
+ updateTagsState: async () => {
+ const { data } = (await api.getTagList()).data;
+ store.dispatch(setTags(data));
},
getLinkedMemos: async (memoId: MemoId): Promise<Memo[]> => {
diff --git a/web/src/services/shortcutService.ts b/web/src/services/shortcutService.ts
index 3d4f51e70..4126dc2f0 100644
--- a/web/src/services/shortcutService.ts
+++ b/web/src/services/shortcutService.ts
@@ -16,7 +16,7 @@ const shortcutService = {
},
getMyAllShortcuts: async () => {
- const { data } = (await api.getMyShortcuts()).data;
+ const { data } = (await api.getShortcutList()).data;
const shortcuts = data.map((s) => convertResponseModelShortcut(s));
store.dispatch(setShortcuts(shortcuts));
},