Skip to content

Commit 0d6281e

Browse files
boojackboojack
authored
chore: update signin page (usememos#410)
* chore: update signin page * chore: update version `v0.7.1`
1 parent 8e2844e commit 0d6281e

File tree

9 files changed

+22
-21
lines changed

9 files changed

+22
-21
lines changed

‎server/version/version.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77

88
// Version is the service current released version.
99
// Semantic versioning: https://semver.org/
10-
var Version = "0.7.0"
10+
var Version = "0.7.1"
1111

1212
// DevVersion is the service current development version.
13-
var DevVersion = "0.7.0"
13+
var DevVersion = "0.7.1"
1414

1515
func GetCurrentVersion(mode string) string {
1616
if mode == "dev" {

‎web/src/components/SettingDialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const SettingDialog: React.FC<Props> = (props: Props) => {
6666
onClick={() => handleSectionSelectorItemClick("system")}
6767
className={`section-item ${state.selectedSection === "system" ? "selected" : ""}`}
6868
>
69-
<span className="icon-text">🧑‍🔧</span> System Setting
69+
<span className="icon-text">🧑‍🔧</span> System
7070
</span>
7171
</div>
7272
</>

‎web/src/less/auth.less‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@
7070
&.requesting {
7171
@apply cursor-wait opacity-80;
7272
}
73-
74-
> .img-icon {
75-
@apply w-4 h-auto mr-1 animate-spin;
76-
}
7773
}
7874
}
7975

‎web/src/less/memo-editor.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@
8585
}
8686

8787
> .tag-list {
88-
@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;
88+
@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;
8989

9090
> .item-container {
91-
@apply w-full text-white cursor-pointer rounded text-sm leading-6 px-2 hover:bg-gray-700;
91+
@apply w-full text-white cursor-pointer rounded text-sm leading-6 px-2 truncate hover:bg-gray-700;
9292
}
9393

9494
> .tip-text {

‎web/src/locales/en.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"fold": "Fold",
4444
"expand": "Expand"
4545
},
46-
"slogan": "An open source, self-hosted knowledge base that works with a SQLite db file.",
46+
"slogan": "An open-source, self-hosted memo hub for knowledge management and collaboration.",
4747
"auth": {
4848
"signup-as-host": "Sign up as Host",
4949
"host-tip": "You are registering as the Site Host.",
@@ -175,4 +175,4 @@
175175
"resource-filename-updated": "Resource filename changed.",
176176
"invalid-resource-filename": "Invalid filename."
177177
}
178-
}
178+
}

‎web/src/locales/vi.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"fold": "Fold",
4444
"expand": "Expand"
4545
},
46-
"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.",
46+
"slogan": "An open-source, self-hosted memo hub for knowledge management and collaboration.",
4747
"auth": {
4848
"signup-as-host": "Đăng ký như chủ nhân",
4949
"host-tip": "Bạn đang đăng ký với tư cách chủ nhân của trang web này.",

‎web/src/locales/zh.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"fold": "折叠",
4444
"expand": "展开"
4545
},
46-
"slogan": "一个开源的、支持私有化部署的碎片化知识卡片管理工具。",
46+
"slogan": "An open-source, self-hosted memo hub for knowledge management and collaboration.",
4747
"auth": {
4848
"signup-as-host": "注册为 Host",
4949
"host-tip": "你正在注册为 Host 用户账号。",
@@ -175,4 +175,4 @@
175175
"resource-filename-updated": "资源文件名更改成功。",
176176
"invalid-resource-filename": "无效的资源文件名"
177177
}
178-
}
178+
}

‎web/src/pages/Auth.tsx‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as api from "../helpers/api";
55
import { validate, ValidatorConfig } from "../helpers/validator";
66
import useLoading from "../hooks/useLoading";
77
import { globalService, userService } from "../services";
8+
import Icon from "../components/Icon";
89
import toastHelper from "../components/Toast";
910
import "../less/auth.less";
1011

@@ -141,13 +142,17 @@ const Auth = () => {
141142
<>
142143
{systemStatus?.host ? (
143144
<>
145+
{actionBtnLoadingState.isLoading && <Icon.Loader className="w-4 h-auto animate-spin" />}
144146
{systemStatus?.allowSignUp && (
145-
<button
146-
className={`btn signup-btn ${actionBtnLoadingState.isLoading ? "requesting" : ""}`}
147-
onClick={() => handleSignUpBtnsClick("USER")}
148-
>
149-
{t("common.sign-up")}
150-
</button>
147+
<>
148+
<button
149+
className={`btn signup-btn ${actionBtnLoadingState.isLoading ? "requesting" : ""}`}
150+
onClick={() => handleSignUpBtnsClick("USER")}
151+
>
152+
{t("common.sign-up")}
153+
</button>
154+
<span className="mr-2 font-mono text-gray-200">/</span>
155+
</>
151156
)}
152157
<button
153158
className={`btn signin-btn ${actionBtnLoadingState.isLoading ? "requesting" : ""}`}

‎web/src/services/memoService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { createMemo, deleteMemo, patchMemo, setIsFetching, setMemos, setTags } f
44
import store from "../store";
55
import userService from "./userService";
66

7-
export const DEFAULT_MEMO_LIMIT = 20;
7+
export const DEFAULT_MEMO_LIMIT = 30;
88

99
const convertResponseModelMemo = (memo: Memo): Memo => {
1010
return {

0 commit comments

Comments
 (0)