Skip to content

Commit 9868d24

Browse files
committed
feat: jump to login page in invite view
useful to switch to guest login way
1 parent bad6aa0 commit 9868d24

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

client/shared/i18n/langs/en-US/translation.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"k1a377364": "Message List Virtualization",
2323
"k1a78e6f0": "Expiration",
2424
"k1ac0bd00": "30 days",
25-
"k1b38bb5c": "Register Now",
2625
"k1b3d8c72": "Group Not Found",
2726
"k1bc58056": "Private Message Service",
2827
"k1bd56481": "Close independent window",
@@ -57,6 +56,7 @@
5756
"k323b5cc7": "Recall",
5857
"k3279c602": "Add now",
5958
"k32905632": "Unlimited invitation link",
59+
"k32ccc323": "Invitation code has expired",
6060
"k335c71bf": "OTP code cannot be empty",
6161
"k34b5e3ab": "Send Message",
6262
"k34e357ee": "Group Summary",
@@ -198,6 +198,7 @@
198198
"k9b0bdb34": "Allow members to view group details",
199199
"k9b91079c": "All readed",
200200
"k9bb01902": "Show Detail",
201+
"k9d343e46": "Haven't logged in yet, login now",
201202
"k9d5a843a": "Mail Service",
202203
"k9d80acdf": "Verify email",
203204
"k9d901c20": "Meeting room",

client/shared/i18n/langs/zh-CN/translation.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"k1a377364": "聊天列表虚拟化",
2323
"k1a78e6f0": "过期时间",
2424
"k1ac0bd00": "30天",
25-
"k1b38bb5c": "立即注册",
2625
"k1b3d8c72": "群组未找到",
2726
"k1bc58056": "私信服务",
2827
"k1bd56481": "关闭独立窗口",
@@ -57,6 +56,7 @@
5756
"k323b5cc7": "撤回",
5857
"k3279c602": "立即添加",
5958
"k32905632": "不限时邀请链接",
59+
"k32ccc323": "邀请码已过期",
6060
"k335c71bf": "校验码不能为空",
6161
"k34b5e3ab": "发送消息",
6262
"k34e357ee": "群组概述",
@@ -198,6 +198,7 @@
198198
"k9b0bdb34": "允许成员查看群组详情",
199199
"k9b91079c": "所有已读",
200200
"k9bb01902": "显示详情",
201+
"k9d343e46": "尚未登录, 立即登录",
201202
"k9d5a843a": "邮件服务",
202203
"k9d80acdf": "认证邮箱",
203204
"k9d901c20": "会议室",

client/web/src/routes/Invite/JoinBtn.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ export const JoinBtn: React.FC<Props> = React.memo((props) => {
3232
});
3333
const [isJoined, setIsJoined] = useState(false);
3434

35-
const handleRegister = useCallback(() => {
36-
navigate(
37-
`/entry/register?redirect=${encodeURIComponent(location.pathname)}`
38-
);
35+
const handleLogin = useCallback(() => {
36+
navigate(`/entry/login?redirect=${encodeURIComponent(location.pathname)}`);
3937
}, []);
4038

4139
const { value: invite } = useAsync(() => {
@@ -103,7 +101,7 @@ export const JoinBtn: React.FC<Props> = React.memo((props) => {
103101
if (props.expired && new Date(props.expired).valueOf() < Date.now()) {
104102
return (
105103
<Button block={true} type="primary" size="large" disabled={true}>
106-
{t('已过期')}
104+
{t('邀请码已过期')}
107105
</Button>
108106
);
109107
}
@@ -119,8 +117,8 @@ export const JoinBtn: React.FC<Props> = React.memo((props) => {
119117
{t('加入群组')}
120118
</Button>
121119
) : (
122-
<Button block={true} type="primary" size="large" onClick={handleRegister}>
123-
{t('立即注册')}
120+
<Button block={true} type="primary" size="large" onClick={handleLogin}>
121+
{t('尚未登录, 立即登录')}
124122
</Button>
125123
);
126124
});

0 commit comments

Comments
 (0)