🔀 sync: sync upstream

web/src/layout/MainLayout/Header/ProfileSection/index.js

@@ -157,7 +157,7 @@ const ProfileSection = () => {
                       <ListItemIcon>
                         <IconLogout stroke={1.5} size="1.3rem" />
                       </ListItemIcon>
-                      <ListItemText primary={<Typography variant="body2">Logout</Typography>} />
+                      <ListItemText primary={<Typography variant="body2">注销</Typography>} />
                     </ListItemButton>
                   </List>
                 </MainCard>

web/src/layout/MainLayout/Sidebar/MenuCard/index.js

@@ -121,7 +121,6 @@ const MenuCard = () => {
             />
           </ListItem>
         </List>
-        {/* <LinearProgressWithLabel value={80} /> */}
       </CardContent>
     </CardStyle>
   );

web/src/layout/MainLayout/Sidebar/index.js

@@ -38,9 +38,6 @@ const Sidebar = ({ drawerOpen, drawerToggle, window }) => {
         >
           <MenuList />
           <MenuCard />
-          <Stack direction="row" justifyContent="center" sx={{ mb: 2 }}>
-            <Chip label={process.env.REACT_APP_VERSION} disabled chipcolor="secondary" size="small" sx={{ cursor: 'pointer' }} />
-          </Stack>
         </PerfectScrollbar>
       </BrowserView>
       <MobileView>

web/src/layout/MinimalLayout/Header/index.js

@@ -44,7 +44,7 @@ const Header = () => {
           </Button>
         ) : (
           <Button component={Link} variant="contained" to="/login" color="primary">
-            登入
+            登录
           </Button>
         )}
       </Stack>

web/src/menu-items/panel.js

@@ -22,7 +22,7 @@ const panel = {
   children: [
     {
       id: 'dashboard',
-      title: 'Dashboard',
+      title: '仪表盘',
       type: 'item',
       url: '/panel/dashboard',
       icon: icons.IconDashboard,
@@ -40,7 +40,7 @@ const panel = {
     },
     {
       id: 'token',
-      title: 'Token',
+      title: '令牌',
       type: 'item',
       url: '/panel/token',
       icon: icons.IconKey,

web/src/views/Authentication/AuthForms/AuthLogin.js

@@ -180,7 +180,7 @@ const LoginForm = ({ ...others }) => {
         {({ errors, handleBlur, handleChange, handleSubmit, isSubmitting, touched, values }) => (
           <form noValidate onSubmit={handleSubmit} {...others}>
             <FormControl fullWidth error={Boolean(touched.username && errors.username)} sx={{ ...theme.typography.customInput }}>
-              <InputLabel htmlFor="outlined-adornment-username-login">用户名</InputLabel>
+              <InputLabel htmlFor="outlined-adornment-username-login">用户名/邮箱</InputLabel>
               <OutlinedInput
                 id="outlined-adornment-username-login"
                 type="text"
@@ -188,7 +188,7 @@ const LoginForm = ({ ...others }) => {
                 name="username"
                 onBlur={handleBlur}
                 onChange={handleChange}
-                label="用户名"
+                label="用户名/邮箱"
                 inputProps={{ autoComplete: 'username' }}
               />
               {touched.username && errors.username && (

web/src/views/Token/component/EditModal.js

@@ -103,7 +103,7 @@ const EditModal = ({ open, tokenId, onCancel, onOk }) => {
   return (
     <Dialog open={open} onClose={onCancel} fullWidth maxWidth={'md'}>
       <DialogTitle sx={{ margin: '0px', fontWeight: 700, lineHeight: '1.55556', padding: '24px', fontSize: '1.125rem' }}>
-        {tokenId ? '编辑Token' : '新建Token'}
+        {tokenId ? '编辑令牌' : '新建令牌'}
       </DialogTitle>
       <Divider />
       <DialogContent>

web/src/views/Token/index.js

@@ -158,7 +158,7 @@ export default function Token() {
   return (
     <>
       <Stack direction="row" alignItems="center" justifyContent="space-between" mb={5}>
-        <Typography variant="h4">Token</Typography>
+        <Typography variant="h4">令牌</Typography>
 
         <Button
           variant="contained"
@@ -168,7 +168,7 @@ export default function Token() {
           }}
           startIcon={<IconPlus />}
         >
-          新建Token
+          新建令牌
         </Button>
       </Stack>
       <Stack mb={5}>