From faf6545f7ecfaf77907adedc7ef6456a3ab0a863 Mon Sep 17 00:00:00 2001 From: shuai Date: Thu, 17 Aug 2023 10:49:31 +0800 Subject: [PATCH 1/3] feat: ui algolia plugin add link --- i18n/en_US.yaml | 2 +- ui/src/plugins/builtin/Algolia/index.tsx | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml index 8efaa25b6..39c8632c6 100644 --- a/i18n/en_US.yaml +++ b/i18n/en_US.yaml @@ -1430,7 +1430,7 @@ ui: fields: users: label: Bulk add user - placeholder: "John Smith, john@example.com, BUSYopr2 \nAlice, alice@example.com, fpDntV8q" + placeholder: "John Smith, john@example.com, BUSYopr2\nAlice, alice@example.com, fpDntV8q" text: Separate “name, email, password” with commas. One user per line. msg: "Please enter the user's email, one per line." display_name: diff --git a/ui/src/plugins/builtin/Algolia/index.tsx b/ui/src/plugins/builtin/Algolia/index.tsx index 416baedec..83cea6bd8 100644 --- a/ui/src/plugins/builtin/Algolia/index.tsx +++ b/ui/src/plugins/builtin/Algolia/index.tsx @@ -22,10 +22,14 @@ const Index: FC = () => { if (!data?.icon) return null; return ( -
+ {t('search_by')} -
+ ); }; From 0c4e5338f31a0e24ac35036f0cf43bde69310575 Mon Sep 17 00:00:00 2001 From: shuai Date: Thu, 17 Aug 2023 11:13:39 +0800 Subject: [PATCH 2/3] feat: install add private switch --- i18n/en_US.yaml | 3 +++ .../Install/components/FourthStep/index.tsx | 20 +++++++++++++++++++ ui/src/pages/Install/index.tsx | 8 +++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml index 39c8632c6..c28b0352d 100644 --- a/i18n/en_US.yaml +++ b/i18n/en_US.yaml @@ -1259,6 +1259,9 @@ ui: msg: empty: Contact Email cannot be empty. incorrect: Contact Email incorrect format. + login_required: + label: Private + switch: Login required admin_name: label: Name msg: Name cannot be empty. diff --git a/ui/src/pages/Install/components/FourthStep/index.tsx b/ui/src/pages/Install/components/FourthStep/index.tsx index 441a9984f..8e6e2b0e5 100644 --- a/ui/src/pages/Install/components/FourthStep/index.tsx +++ b/ui/src/pages/Install/components/FourthStep/index.tsx @@ -192,6 +192,26 @@ const Index: FC = ({ visible, data, changeCallback, nextCallback }) => { + + {t('login_required.label')} + { + console.log(e.target.checked); + changeCallback({ + login_required: { + value: e.target.checked, + isInvalid: false, + errorMsg: '', + }, + }); + }} + /> + +
{t('admin_account')}
{t('admin_name.label')} diff --git a/ui/src/pages/Install/index.tsx b/ui/src/pages/Install/index.tsx index f3a9f85c4..0f78e23c6 100644 --- a/ui/src/pages/Install/index.tsx +++ b/ui/src/pages/Install/index.tsx @@ -23,7 +23,7 @@ import { const Index: FC = () => { const { t } = useTranslation('translation', { keyPrefix: 'install' }); - const [step, setStep] = useState(1); + const [step, setStep] = useState(4); const [loading, setLoading] = useState(true); const [errorData, setErrorData] = useState<{ [propName: string]: any }>({ msg: '', @@ -84,6 +84,11 @@ const Index: FC = () => { isInvalid: false, errorMsg: '', }, + login_required: { + value: false, + isInvalid: false, + errorMsg: '', + }, name: { value: '', isInvalid: false, @@ -164,6 +169,7 @@ const Index: FC = () => { site_name: formData.site_name.value, site_url: formData.site_url.value, contact_email: formData.contact_email.value, + login_required: formData.login_required.value, name: formData.name.value, password: formData.password.value, email: formData.email.value, From 0eb097c590a364fc326fc3cc1d09601afb67acc3 Mon Sep 17 00:00:00 2001 From: shuai Date: Thu, 17 Aug 2023 11:15:07 +0800 Subject: [PATCH 3/3] fix: install init --- ui/src/pages/Install/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/pages/Install/index.tsx b/ui/src/pages/Install/index.tsx index 0f78e23c6..4262e1351 100644 --- a/ui/src/pages/Install/index.tsx +++ b/ui/src/pages/Install/index.tsx @@ -23,7 +23,7 @@ import { const Index: FC = () => { const { t } = useTranslation('translation', { keyPrefix: 'install' }); - const [step, setStep] = useState(4); + const [step, setStep] = useState(1); const [loading, setLoading] = useState(true); const [errorData, setErrorData] = useState<{ [propName: string]: any }>({ msg: '',