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 format to png (#830)

boojack9f25badde3cb
diff --git a/api/system_setting.go b/api/system_setting.go
index ff67d11cb..645f29897 100644
--- a/api/system_setting.go
+++ b/api/system_setting.go
@@ -24,8 +24,8 @@ const (
type CustomizedProfile struct {
// Name is the server name, default is `memos`
Name string `json:"name"`
- // IconURL is the url of icon image.
- IconURL string `json:"iconUrl"`
+ // LogoURL is the url of logo image.
+ LogoURL string `json:"logoUrl"`
// Description is the server description.
Description string `json:"description"`
// Locale is the server default locale.
@@ -100,7 +100,7 @@ func (upsert SystemSettingUpsert) Validate() error {
} else if upsert.Name == SystemSettingCustomizedProfileName {
customizedProfile := CustomizedProfile{
Name: "memos",
- IconURL: "",
+ LogoURL: "",
Description: "",
Locale: "en",
Appearance: "system",
diff --git a/server/system.go b/server/system.go
index e3a281168..e4e510d52 100644
--- a/server/system.go
+++ b/server/system.go
@@ -48,7 +48,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
AdditionalScript: "",
CustomizedProfile: api.CustomizedProfile{
Name: "memos",
- IconURL: "",
+ LogoURL: "",
Description: "",
Locale: "en",
Appearance: "system",
@@ -77,7 +77,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
valueMap := value.(map[string]interface{})
systemStatus.CustomizedProfile = api.CustomizedProfile{
Name: valueMap["name"].(string),
- IconURL: valueMap["iconUrl"].(string),
+ LogoURL: valueMap["logoUrl"].(string),
Description: valueMap["description"].(string),
Locale: valueMap["locale"].(string),
Appearance: valueMap["appearance"].(string),
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-full.webp b/web/public/logo-full.webp
deleted file mode 100644
index 36ea2eeee..000000000
Binary files a/web/public/logo-full.webp and /dev/null differ
diff --git a/web/public/logo.png b/web/public/logo.png
new file mode 100644
index 000000000..3c22d5f81
Binary files /dev/null and b/web/public/logo.png differ
diff --git a/web/public/logo.webp b/web/public/logo.webp
deleted file mode 100644
index ecf7c4412..000000000
Binary files a/web/public/logo.webp and /dev/null differ
diff --git a/web/public/manifest.json b/web/public/manifest.json
index 74794c0b7..aff5fe880 100644
--- a/web/public/manifest.json
+++ b/web/public/manifest.json
@@ -4,8 +4,8 @@
"description": "usememos/memos",
"icons": [
{
- "src": "/logo.webp",
- "type": "image/webp",
+ "src": "/logo.png",
+ "type": "image/png",
"sizes": "520x520"
}
],
diff --git a/web/src/App.tsx b/web/src/App.tsx
index e00b47ab0..62748f59c 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -59,7 +59,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.iconUrl || "/logo.webp";
+ link.href = systemStatus.customizedProfile.logoUrl || "/logo.png";
}, [systemStatus]);
useEffect(() => {
diff --git a/web/src/components/AboutSiteDialog.tsx b/web/src/components/AboutSiteDialog.tsx
index 047598905..1636351f2 100644
--- a/web/src/components/AboutSiteDialog.tsx
+++ b/web/src/components/AboutSiteDialog.tsx
@@ -20,7 +20,7 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {
<>
<div className="dialog-header-container">
<p className="title-text flex items-center">
- <img className="w-7 h-auto mr-1" src="/logo.webp" alt="" />
+ <img className="w-7 h-auto mr-1" src="/logo.png" alt="" />
{t("common.about")} memos
</p>
<button className="btn close-btn" onClick={handleCloseBtnClick}>
diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx
index a505d95d2..dd6df1db2 100644
--- a/web/src/components/MemoEditor.tsx
+++ b/web/src/components/MemoEditor.tsx
@@ -551,7 +551,7 @@ const MemoEditor = () => {
</button>
<button className="action-btn confirm-btn" disabled={!allowSave || state.isUploadingResource} onClick={handleSaveBtnClick}>
{t("editor.save")}
- <img className="icon-img w-4 h-auto" src="/logo.webp" />
+ <img className="icon-img w-4 h-auto" src="/logo.png" />
</button>
</div>
</div>
diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsx
index bbb8e4c4a..c0985ee36 100644
--- a/web/src/components/ShareMemoDialog.tsx
+++ b/web/src/components/ShareMemoDialog.tsx
@@ -147,7 +147,7 @@ const ShareMemoDialog: React.FC<Props> = (props: Props) => {
{state.memoAmount} MEMOS / {createdDays} DAYS
</span>
</div>
- <img className="logo-img" src="/logo.webp" alt="" />
+ <img className="logo-img" src="/logo.png" alt="" />
</div>
</div>
<div className="px-4 py-3 w-full flex flex-row justify-between items-center">
diff --git a/web/src/components/UpdateCustomizedProfileDialog.tsx b/web/src/components/UpdateCustomizedProfileDialog.tsx
index 8b30bf3b3..836af271b 100644
--- a/web/src/components/UpdateCustomizedProfileDialog.tsx
+++ b/web/src/components/UpdateCustomizedProfileDialog.tsx
@@ -32,11 +32,11 @@ const UpdateCustomizedProfileDialog: React.FC<Props> = ({ destroy }: Props) => {
});
};
- const handleIconUrlChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
+ const handleLogoUrlChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
setState((state) => {
return {
...state,
- iconUrl: e.target.value as string,
+ logoUrl: e.target.value as string,
};
});
};
@@ -69,7 +69,7 @@ const UpdateCustomizedProfileDialog: React.FC<Props> = ({ destroy }: Props) => {
};
const handleSaveBtnClick = async () => {
- if (state.name === "" || state.iconUrl === "") {
+ if (state.name === "" || state.logoUrl === "") {
toastHelper.error(t("message.fill-all"));
return;
}
@@ -103,7 +103,7 @@ const UpdateCustomizedProfileDialog: React.FC<Props> = ({ destroy }: Props) => {
</p>
<input type="text" className="input-text" value={state.name} onChange={handleNameChanged} />
<p className="text-sm mb-1 mt-2">{t("setting.system-section.customize-server.icon-url")}</p>
- <input type="text" className="input-text" value={state.iconUrl} onChange={handleIconUrlChanged} />
+ <input type="text" className="input-text" value={state.logoUrl} onChange={handleLogoUrlChanged} />
<p className="text-sm mb-1 mt-2">Description</p>
<input type="text" className="input-text" value={state.description} onChange={handleDescriptionChanged} />
<p className="text-sm mb-1 mt-2">Server locale</p>
diff --git a/web/src/pages/Auth.tsx b/web/src/pages/Auth.tsx
index 10842f11a..100d326e2 100644
--- a/web/src/pages/Auth.tsx
+++ b/web/src/pages/Auth.tsx
@@ -123,7 +123,7 @@ const Auth = () => {
<div className="auth-form-wrapper">
<div className="page-header-container">
<div className="title-container">
- <img className="logo-img" src={systemStatus.customizedProfile.iconUrl} alt="" />
+ <img className="logo-img" src={systemStatus.customizedProfile.logoUrl} alt="" />
<p className="logo-text">{systemStatus.customizedProfile.name}</p>
</div>
<p className="slogan-text">{systemStatus.customizedProfile.description || t("slogan")}</p>
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index f3261289d..167949d99 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -63,7 +63,7 @@ const Explore = () => {
<div className="page-container">
<div className="page-header">
<div className="title-container">
- <img className="logo-img" src={customizedProfile.iconUrl} alt="" />
+ <img className="logo-img" src={customizedProfile.logoUrl} alt="" />
<span className="title-text">{customizedProfile.name}</span>
</div>
<div className="action-button-container">
diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx
index d7b691169..5c02fe64a 100644
--- a/web/src/pages/MemoDetail.tsx
+++ b/web/src/pages/MemoDetail.tsx
@@ -54,7 +54,7 @@ const MemoDetail = () => {
<div className="page-container">
<div className="page-header">
<div className="title-container">
- <img className="logo-img" src={customizedProfile.iconUrl} alt="" />
+ <img className="logo-img" src={customizedProfile.logoUrl} alt="" />
<p className="logo-text">{customizedProfile.name}</p>
</div>
<div className="action-button-container">
diff --git a/web/src/store/module/global.ts b/web/src/store/module/global.ts
index 687cc9e68..decbf3c8e 100644
--- a/web/src/store/module/global.ts
+++ b/web/src/store/module/global.ts
@@ -13,7 +13,7 @@ export const initialGlobalState = async () => {
additionalScript: "",
customizedProfile: {
name: "memos",
- iconUrl: "https://usememos.com/logo.webp",
+ logoUrl: "/logo.png",
description: "",
locale: "en",
appearance: "system",
diff --git a/web/src/store/reducer/global.ts b/web/src/store/reducer/global.ts
index 089dca265..6965e1305 100644
--- a/web/src/store/reducer/global.ts
+++ b/web/src/store/reducer/global.ts
@@ -23,7 +23,7 @@ const globalSlice = createSlice({
additionalScript: "",
customizedProfile: {
name: "memos",
- iconUrl: "https://usememos.com/logo.webp",
+ logoUrl: "/logo.png",
description: "",
locale: "en",
appearance: "system",
diff --git a/web/src/types/modules/system.d.ts b/web/src/types/modules/system.d.ts
index aad5bb789..55c1d3431 100644
--- a/web/src/types/modules/system.d.ts
+++ b/web/src/types/modules/system.d.ts
@@ -5,7 +5,7 @@ interface Profile {
interface CustomizedProfile {
name: string;
- iconUrl: string;
+ logoUrl: string;
description: string;
locale: Locale;
appearance: Appearance;