Skip to content

Commit

Permalink
chore: update signin page (#410)
Browse files Browse the repository at this point in the history
* chore: update signin page

* chore: update version `v0.7.1`
  • Loading branch information
boojack authored Nov 4, 2022
1 parent 8e2844e commit 0d6281e
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 21 deletions.
4 changes: 2 additions & 2 deletions server/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/SettingDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</>
Expand Down
4 changes: 0 additions & 4 deletions web/src/less/auth.less
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
&.requesting {
@apply cursor-wait opacity-80;
}

> .img-icon {
@apply w-4 h-auto mr-1 animate-spin;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions web/src/less/memo-editor.less
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions web/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -175,4 +175,4 @@
"resource-filename-updated": "Resource filename changed.",
"invalid-resource-filename": "Invalid filename."
}
}
}
2 changes: 1 addition & 1 deletion web/src/locales/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
4 changes: 2 additions & 2 deletions web/src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 用户账号。",
Expand Down Expand Up @@ -175,4 +175,4 @@
"resource-filename-updated": "资源文件名更改成功。",
"invalid-resource-filename": "无效的资源文件名"
}
}
}
17 changes: 11 additions & 6 deletions web/src/pages/Auth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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" : ""}`}
Expand Down
2 changes: 1 addition & 1 deletion web/src/services/memoService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 0d6281e

Please sign in to comment.