From 0d6281ef6b01fabb61d8756cf054891e6a5b064b Mon Sep 17 00:00:00 2001 From: boojack Date: Fri, 4 Nov 2022 20:28:16 +0800 Subject: [PATCH] chore: update signin page (#410) * chore: update signin page * chore: update version `v0.7.1` --- server/version/version.go | 4 ++-- web/src/components/SettingDialog.tsx | 2 +- web/src/less/auth.less | 4 ---- web/src/less/memo-editor.less | 4 ++-- web/src/locales/en.json | 4 ++-- web/src/locales/vi.json | 2 +- web/src/locales/zh.json | 4 ++-- web/src/pages/Auth.tsx | 17 +++++++++++------ web/src/services/memoService.ts | 2 +- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/server/version/version.go b/server/version/version.go index a4f17607..d138f401 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 d295bee1..393515c1 100644 --- a/web/src/components/SettingDialog.tsx +++ b/web/src/components/SettingDialog.tsx @@ -66,7 +66,7 @@ const SettingDialog: React.FC = (props: Props) => { onClick={() => handleSectionSelectorItemClick("system")} className={`section-item ${state.selectedSection === "system" ? "selected" : ""}`} > - 🧑‍🔧 System Setting + 🧑‍🔧 System diff --git a/web/src/less/auth.less b/web/src/less/auth.less index 8ada60a5..266ffd22 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 06280cb8..191fab94 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 4924394f..9982eba3 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 2e916a59..c1ab08e2 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 7e9cb8e7..70bf74a2 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 64853853..227361a4 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 && } {systemStatus?.allowSignUp && ( - + <> + + / + )}