Merge pull request #2 from bamboo-firewall/quannt86/dev

Feature: Update username field in login & admin create user
bamboo-firewall · Aug 8, 2023 · 9d5000c · 9d5000c
2 parents 682d81c + bb44dd6
commit 9d5000c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/components/modal/CreateUser.tsx b/src/components/modal/CreateUser.tsx
@@ -35,6 +35,14 @@ export const CreateUser: React.FC<Props> = ({ refetchUser, onClose }) => {
         <Input />
       </Form.Item>
 
+      <Form.Item
+        label="Username"
+        name="username"
+        rules={[{ required: true, message: 'Please input your username!' }]}
+      >
+        <Input />
+      </Form.Item>
+
       <Form.Item
         label="Password"
         name="password"
@@ -47,6 +55,7 @@ export const CreateUser: React.FC<Props> = ({ refetchUser, onClose }) => {
         <Radio.Group>
           <Radio value="admin"> Admin </Radio>
           <Radio value="user"> User </Radio>
+          <Radio value="devops"> DevOps </Radio>
         </Radio.Group>
       </Form.Item>
 

diff --git a/src/pages/login.tsx b/src/pages/login.tsx
@@ -29,8 +29,8 @@ const Login = () => {
         </div>
         <div className="w-full">
           <Form initialValues={{ remember: true }} onFinish={onFinish} autoComplete="off">
-            <Form.Item name="email" rules={[{ required: true, message: 'Email is required!' }]}>
-              <Input placeholder="Email" />
+            <Form.Item name="username" rules={[{ required: true, message: 'Username is required!' }]}>
+              <Input placeholder="Username" />
             </Form.Item>
             <Form.Item name="password" rules={[{ required: true, message: 'Password is required!' }]}>
               <Input.Password placeholder="Password" />