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 logo

Steven16dad8b00d69
diff --git a/README.md b/README.md
index 5cd1cd59d..0991c5f29 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# memos
-<img height="72px" src="https://usememos.com/logo.webp" alt="✍️ memos" align="right" />
+<img height="72px" src="https://usememos.com/logo.png" alt="✍️ memos" align="right" />
A privacy-first, lightweight note-taking service. Easily capture and share your great thoughts.
diff --git a/web/index.html b/web/index.html
index eb4c54c9a..6a5e4e565 100644
--- a/web/index.html
+++ b/web/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
- <link rel="icon" href="/logo.webp" type="image/*" />
+ <link rel="icon" href="/logo.png" type="image/*" />
<meta name="theme-color" media="(prefers-color-scheme: light)" content="#f4f4f5" />
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#27272a" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
diff --git a/web/public/logo.png b/web/public/logo.png
new file mode 100644
index 000000000..c16e71c5b
Binary files /dev/null and b/web/public/logo.png differ
diff --git a/web/public/manifest.json b/web/public/manifest.json
index 74794c0b7..5a3982ad4 100644
--- a/web/public/manifest.json
+++ b/web/public/manifest.json
@@ -4,9 +4,8 @@
"description": "usememos/memos",
"icons": [
{
- "src": "/logo.webp",
- "type": "image/webp",
- "sizes": "520x520"
+ "src": "/logo.png",
+ "type": "image/png"
}
],
"start_url": "/",
diff --git a/web/src/App.tsx b/web/src/App.tsx
index d78050076..bb6975636 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -70,7 +70,7 @@ const App = () => {
// dynamic update metadata with customized profile.
document.title = systemStatus.customizedProfile.name;
const link = document.querySelector("link[rel~='icon']") as HTMLLinkElement;
- link.href = systemStatus.customizedProfile.logoUrl || "/logo.webp";
+ link.href = systemStatus.customizedProfile.logoUrl || "/logo.png";
}, [systemStatus.customizedProfile]);
useEffect(() => {
diff --git a/web/src/components/AboutSiteDialog.tsx b/web/src/components/AboutSiteDialog.tsx
index 54f9fe244..ae6062361 100644
--- a/web/src/components/AboutSiteDialog.tsx
+++ b/web/src/components/AboutSiteDialog.tsx
@@ -33,17 +33,17 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
<div className="flex flex-row justify-start items-center mr-2">
{t("about.powered-by")}
<a href="https://usememos.com" target="_blank" className="flex flex-row justify-start items-center mx-1 hover:underline">
- <img className="w-6 h-auto rounded-full mr-1" src="/logo.webp" alt="" />
+ <img className="w-6 h-auto rounded-full mr-1" src="/logo.png" alt="" />
memos
</a>
<span>v{profile.version}</span>
</div>
<GitHubBadge />
</div>
- <div className="border-t w-full mt-3 pt-2 text-sm flex flex-row justify-start items-center space-x-4">
+ <div className="border-t w-full mt-3 pt-2 text-sm flex flex-row justify-start items-center space-x-2">
<span className="text-gray-500">{t("about.other-projects")}:</span>
<a href="https://github.com/boojack/slash" target="_blank" className="flex items-center underline text-blue-600 hover:opacity-80">
- <img className="w-4 h-auto mr-1" src="https://github.com/boojack/slash/raw/main/resources/logo.png" alt="" />
+ <img className="w-5 h-auto mr-1 rounded-full" src="https://github.com/boojack/slash/raw/main/resources/logo.png" alt="" />
<span>Slash</span>
</a>
<a
@@ -52,7 +52,7 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
className="flex items-center underline text-blue-600 hover:opacity-80"
>
<img
- className="w-4 h-auto mr-1"
+ className="w-5 h-auto mr-1"
src="https://raw.githubusercontent.com/boojack/sticky-notes/main/public/sticky-notes.ico"
alt=""
/>
diff --git a/web/src/components/UpdateCustomizedProfileDialog.tsx b/web/src/components/UpdateCustomizedProfileDialog.tsx
index 4e10fb2b2..b951224dd 100644
--- a/web/src/components/UpdateCustomizedProfileDialog.tsx
+++ b/web/src/components/UpdateCustomizedProfileDialog.tsx
@@ -63,7 +63,7 @@ const UpdateCustomizedProfileDialog: React.FC<Props> = ({ destroy }: Props) => {
const handleRestoreButtonClick = () => {
setPartialState({
name: "memos",
- logoUrl: "/logo.webp",
+ logoUrl: "/logo.png",
description: "",
locale: "en",
appearance: "system",
diff --git a/web/src/components/UserAvatar.tsx b/web/src/components/UserAvatar.tsx
index 6488fd6c8..c5353afdc 100644
--- a/web/src/components/UserAvatar.tsx
+++ b/web/src/components/UserAvatar.tsx
@@ -11,7 +11,7 @@ const UserAvatar = (props: Props) => {
<div className={classNames(`w-8 h-8 overflow-clip rounded-full`, className)}>
<img
className="w-full h-auto rounded-full shadow min-w-full min-h-full object-cover dark:opacity-80"
- src={avatarUrl || "/logo.webp"}
+ src={avatarUrl || "/logo.png"}
alt=""
/>
</div>
diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx
index 32ee194ea..e4d094cb8 100644
--- a/web/src/pages/MemoDetail.tsx
+++ b/web/src/pages/MemoDetail.tsx
@@ -14,7 +14,6 @@ import MemoResourceListView from "@/components/MemoResourceListView";
import showShareMemoDialog from "@/components/ShareMemoDialog";
import UserAvatar from "@/components/UserAvatar";
import VisibilityIcon from "@/components/VisibilityIcon";
-import { memoServiceClient } from "@/grpcweb";
import { UNKNOWN_ID, VISIBILITY_SELECTOR_ITEMS } from "@/helpers/consts";
import { getDateTimeString } from "@/helpers/datetime";
import useCurrentUser from "@/hooks/useCurrentUser";
@@ -25,15 +24,14 @@ import { User } from "@/types/proto/api/v2/user_service";
import { useTranslate } from "@/utils/i18n";
const MemoDetail = () => {
+ const t = useTranslate();
const params = useParams();
const navigateTo = useNavigateTo();
- const t = useTranslate();
const globalStore = useGlobalStore();
const memoStore = useMemoStore();
const userV1Store = useUserV1Store();
const currentUser = useCurrentUser();
- const [user, setUser] = useState<User>();
- const [comments, setComments] = useState<Memo[]>([]);
+ const [creator, setCreator] = useState<User>();
const { systemStatus } = globalStore.state;
const memoId = Number(params.memoId);
const memo = memoStore.state.memos.find((memo) => memo.id === memoId);
@@ -42,6 +40,10 @@ const MemoDetail = () => {
memo?.relationList.filter(
(relation) => relation.memoId === memo?.id && relation.relatedMemoId !== memo?.id && relation.type === "REFERENCE"
) || [];
+ const commentRelations = memo?.relationList.filter((relation) => relation.relatedMemoId === memo.id && relation.type === "COMMENT") || [];
+ const comments = commentRelations
+ .map((relation) => memoStore.state.memos.find((memo) => memo.id === relation.memoId))
+ .filter((memo) => memo) as Memo[];
// Prepare memo.
useEffect(() => {
@@ -50,7 +52,7 @@ const MemoDetail = () => {
.fetchMemoById(memoId)
.then(async (memo) => {
const user = await userV1Store.getOrFetchUserByUsername(memo.creatorUsername);
- setUser(user);
+ setCreator(user);
})
.catch((error) => {
console.error(error);
@@ -67,20 +69,19 @@ const MemoDetail = () => {
return;
}
- fetchMemoComments();
- }, [memo]);
+ (async () => {
+ await fetchMemoComments();
+ })();
+ }, [memo?.relationList]);
const fetchMemoComments = async () => {
if (!memo) {
return;
}
- const { memos } = await memoServiceClient.listMemoComments({
- id: memo.id,
- });
- const requests = memos.map((memo) => memoStore.fetchMemoById(memo.id));
- const composedMemos = await Promise.all(requests);
- setComments(composedMemos);
+ const commentRelations = memo.relationList.filter((relation) => relation.relatedMemoId === memo.id && relation.type === "COMMENT");
+ const requests = commentRelations.map((relation) => memoStore.fetchMemoById(relation.memoId));
+ await Promise.all(requests);
};
if (!memo) {
@@ -135,8 +136,8 @@ const MemoDetail = () => {
</Tooltip>
<Icon.Dot className="w-4 h-auto text-gray-400 dark:text-zinc-400" />
<Link className="flex flex-row justify-start items-center" to={`/u/${encodeURIComponent(memo.creatorUsername)}`}>
- <UserAvatar className="!w-5 !h-auto mr-1" avatarUrl={user?.avatarUrl} />
- <span className="text-sm text-gray-600 max-w-[8em] truncate dark:text-gray-400">{user?.nickname}</span>
+ <UserAvatar className="!w-5 !h-auto mr-1" avatarUrl={creator?.avatarUrl} />
+ <span className="text-sm text-gray-600 max-w-[8em] truncate dark:text-gray-400">{creator?.nickname}</span>
</Link>
{allowEdit && (
<>
diff --git a/web/src/store/module/global.ts b/web/src/store/module/global.ts
index 1469b2660..48d253479 100644
--- a/web/src/store/module/global.ts
+++ b/web/src/store/module/global.ts
@@ -21,7 +21,7 @@ export const initialGlobalState = async () => {
memoDisplayWithUpdatedTs: false,
customizedProfile: {
name: "memos",
- logoUrl: "/logo.webp",
+ logoUrl: "/logo.png",
description: "",
locale: "en",
appearance: "system",
@@ -45,7 +45,7 @@ export const initialGlobalState = async () => {
...data,
customizedProfile: {
name: customizedProfile.name || "memos",
- logoUrl: customizedProfile.logoUrl || "/logo.webp",
+ logoUrl: customizedProfile.logoUrl || "/logo.png",
description: customizedProfile.description,
locale: customizedProfile.locale || "en",
appearance: customizedProfile.appearance || "system",
diff --git a/web/src/store/reducer/global.ts b/web/src/store/reducer/global.ts
index d7fa73350..eb000771c 100644
--- a/web/src/store/reducer/global.ts
+++ b/web/src/store/reducer/global.ts
@@ -26,7 +26,7 @@ const globalSlice = createSlice({
memoDisplayWithUpdatedTs: false,
customizedProfile: {
name: "memos",
- logoUrl: "/logo.webp",
+ logoUrl: "/logo.png",
description: "",
locale: "en",
appearance: "system",
diff --git a/web/src/types/modules/resource.d.ts b/web/src/types/modules/resource.d.ts
index b37e2bec4..dc80ed847 100644
--- a/web/src/types/modules/resource.d.ts
+++ b/web/src/types/modules/resource.d.ts
@@ -5,14 +5,3 @@ interface ResourceCreate {
externalLink: string;
type: string;
}
-
-interface ResourcePatch {
- id: ResourceId;
- filename?: string;
- memoId?: number;
-}
-
-interface ResourceFind {
- offset?: number;
- limit?: number;
-}
diff --git a/web/src/types/modules/tag.d.ts b/web/src/types/modules/tag.d.ts
deleted file mode 100644
index beda8fca3..000000000
--- a/web/src/types/modules/tag.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-interface TagFind {
- creatorUsername?: string;
-}