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 signin page (#410)

boojack0d6281ef6b01
diff --git a/server/version/version.go b/server/version/version.go
index a4f17607e..d138f401c 100644
--- a/server/version/version.go
+++ b/server/version/version.go
@@ -7,10 +7,10 @@ import (
// Version is the service current released version.
// Semantic versioning: https://semver.org/
-var Version = "0.7.0"
+var Version = "0.7.1"
// DevVersion is the service current development version.
-var DevVersion = "0.7.0"
+var DevVersion = "0.7.1"
func GetCurrentVersion(mode string) string {
if mode == "dev" {
diff --git a/web/src/components/SettingDialog.tsx b/web/src/components/SettingDialog.tsx
index d295bee18..393515c11 100644
--- a/web/src/components/SettingDialog.tsx
+++ b/web/src/components/SettingDialog.tsx
@@ -66,7 +66,7 @@ const SettingDialog: React.FC<Props> = (props: Props) => {
onClick={() => handleSectionSelectorItemClick("system")}
className={`section-item ${state.selectedSection === "system" ? "selected" : ""}`}
>
- <span className="icon-text">🧑‍🔧</span> System Setting
+ <span className="icon-text">🧑‍🔧</span> System
</span>
</div>
</>
diff --git a/web/src/less/auth.less b/web/src/less/auth.less
index 8ada60a5b..266ffd225 100644
--- a/web/src/less/auth.less
+++ b/web/src/less/auth.less
@@ -70,10 +70,6 @@
&.requesting {
@apply cursor-wait opacity-80;
}
-
- > .img-icon {
- @apply w-4 h-auto mr-1 animate-spin;
- }
}
}
diff --git a/web/src/less/memo-editor.less b/web/src/less/memo-editor.less
index 06280cb8d..191fab940 100644
--- a/web/src/less/memo-editor.less
+++ b/web/src/less/memo-editor.less
@@ -85,10 +85,10 @@
}
> .tag-list {
- @apply hidden flex-col justify-start items-start absolute top-6 left-0 mt-1 p-1 z-1 rounded w-32 max-h-52 overflow-auto font-mono bg-black;
+ @apply hidden flex-col justify-start items-start absolute top-6 left-0 mt-1 p-1 z-1 rounded w-36 max-h-52 overflow-auto font-mono bg-black;
> .item-container {
- @apply w-full text-white cursor-pointer rounded text-sm leading-6 px-2 hover:bg-gray-700;
+ @apply w-full text-white cursor-pointer rounded text-sm leading-6 px-2 truncate hover:bg-gray-700;
}
> .tip-text {
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 4924394ff..9982eba32 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -43,7 +43,7 @@
"fold": "Fold",
"expand": "Expand"
},
- "slogan": "An open source, self-hosted knowledge base that works with a SQLite db file.",
+ "slogan": "An open-source, self-hosted memo hub for knowledge management and collaboration.",
"auth": {
"signup-as-host": "Sign up as Host",
"host-tip": "You are registering as the Site Host.",
@@ -175,4 +175,4 @@
"resource-filename-updated": "Resource filename changed.",
"invalid-resource-filename": "Invalid filename."
}
-}
\ No newline at end of file
+}
diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json
index 2e916a591..c1ab08e2b 100644
--- a/web/src/locales/vi.json
+++ b/web/src/locales/vi.json
@@ -43,7 +43,7 @@
"fold": "Fold",
"expand": "Expand"
},
- "slogan": "Một mã nguồn mở, tự bạn lưu lại mọi thứ bạn biết dựa trên SQLite db.",
+ "slogan": "An open-source, self-hosted memo hub for knowledge management and collaboration.",
"auth": {
"signup-as-host": "Đăng ký như chủ nhân",
"host-tip": "Bạn đang đăng ký với tư cách chủ nhân của trang web này.",
diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json
index 7e9cb8e7e..70bf74a2a 100644
--- a/web/src/locales/zh.json
+++ b/web/src/locales/zh.json
@@ -43,7 +43,7 @@
"fold": "折叠",
"expand": "展开"
},
- "slogan": "一个开源的、支持私有化部署的碎片化知识卡片管理工具。",
+ "slogan": "An open-source, self-hosted memo hub for knowledge management and collaboration.",
"auth": {
"signup-as-host": "注册为 Host",
"host-tip": "你正在注册为 Host 用户账号。",
@@ -175,4 +175,4 @@
"resource-filename-updated": "资源文件名更改成功。",
"invalid-resource-filename": "无效的资源文件名"
}
-}
\ No newline at end of file
+}
diff --git a/web/src/pages/Auth.tsx b/web/src/pages/Auth.tsx
index 648538532..227361a46 100644
--- a/web/src/pages/Auth.tsx
+++ b/web/src/pages/Auth.tsx
@@ -5,6 +5,7 @@ import * as api from "../helpers/api";
import { validate, ValidatorConfig } from "../helpers/validator";
import useLoading from "../hooks/useLoading";
import { globalService, userService } from "../services";
+import Icon from "../components/Icon";
import toastHelper from "../components/Toast";
import "../less/auth.less";
@@ -141,13 +142,17 @@ const Auth = () => {
<>
{systemStatus?.host ? (
<>
+ {actionBtnLoadingState.isLoading && <Icon.Loader className="w-4 h-auto animate-spin" />}
{systemStatus?.allowSignUp && (
- <button
- className={`btn signup-btn ${actionBtnLoadingState.isLoading ? "requesting" : ""}`}
- onClick={() => handleSignUpBtnsClick("USER")}
- >
- {t("common.sign-up")}
- </button>
+ <>
+ <button
+ className={`btn signup-btn ${actionBtnLoadingState.isLoading ? "requesting" : ""}`}
+ onClick={() => handleSignUpBtnsClick("USER")}
+ >
+ {t("common.sign-up")}
+ </button>
+ <span className="mr-2 font-mono text-gray-200">/</span>
+ </>
)}
<button
className={`btn signin-btn ${actionBtnLoadingState.isLoading ? "requesting" : ""}`}
diff --git a/web/src/services/memoService.ts b/web/src/services/memoService.ts
index a00511e2e..ba8059213 100644
--- a/web/src/services/memoService.ts
+++ b/web/src/services/memoService.ts
@@ -4,7 +4,7 @@ import { createMemo, deleteMemo, patchMemo, setIsFetching, setMemos, setTags } f
import store from "../store";
import userService from "./userService";
-export const DEFAULT_MEMO_LIMIT = 20;
+export const DEFAULT_MEMO_LIMIT = 30;
const convertResponseModelMemo = (memo: Memo): Memo => {
return {