From 7950c4268ac9325fbd23154ad897243b8a339085 Mon Sep 17 00:00:00 2001 From: Sonika Date: Tue, 19 Dec 2023 20:06:27 +0530 Subject: [PATCH] style and some logic changes --- src/App.css | 6 +- src/components/manage_users/ManageUsers.tsx | 85 ++++++++++----------- 2 files changed, 43 insertions(+), 48 deletions(-) diff --git a/src/App.css b/src/App.css index 903bd77..96ce171 100644 --- a/src/App.css +++ b/src/App.css @@ -5,7 +5,7 @@ .projectScreen-background .css-1ex1afd-MuiTableCell-root{ background-color: #171716 !important; - color:white !important; + color:white ; border-bottom: 1px solid rgb(45 51 59); } @@ -26,8 +26,4 @@ .manageusers-table-header-style .css-1ygcj2i-MuiTableCell-root{ background-color: #171716; color: white; -} - -.activeCell { - color: green !important; } \ No newline at end of file diff --git a/src/components/manage_users/ManageUsers.tsx b/src/components/manage_users/ManageUsers.tsx index 8db6bdb..00cda89 100644 --- a/src/components/manage_users/ManageUsers.tsx +++ b/src/components/manage_users/ManageUsers.tsx @@ -7,6 +7,7 @@ import { TableContainer, TableHead, TableRow, + tableRowClasses, Paper, Button, IconButton, @@ -34,75 +35,72 @@ const StyledTextField = (props:any) => ( '& .MuiOutlinedInput-root': { '& fieldset': { borderColor: 'white' }, '&:hover fieldset': { borderColor: 'white', borderWidth: 2 }, - '&.Mui-focused fieldset': { borderColor: 'white' }, + // '&.Mui-focused fieldset': { borderColor: 'white' }, }, ...props.sx, }} /> ); -interface Row { - id: number; + interface Row { name: string; - age: number; + email: string; + last_login:string; + active:boolean|string; } - const initialData: Row[] = [ - { id: 1, name: 'Row 1', age: 25 }, - { id: 2, name: 'Row 2', age: 30 }, - ]; - export default function ManageUsers(){ const [manageUsersData,setManageUsersData] = useState() const { data: manageUsersResponse, isLoading, isError } = useGetUsersData(); - const [data, setData] = useState(initialData); + const [data, setData] = useState([]); const [open, setOpen] = useState(false); const [selectedRow, setSelectedRow] = useState(); const [newRow, setNewRow] = useState(); const handleEdit = (row: Row) => { - setSelectedRow(row); + setSelectedRow({...row}); setOpen(true); }; - - const handleDelete = (id: number) => { - const updatedData = data.filter((row) => row.id !== id); - setData(updatedData); - }; - + const handleSave = () => { - if (selectedRow.id) { - const updatedData = data.map((row) => (row.id === selectedRow.id ? selectedRow : row)); - setData(updatedData); - } else { + // if (selectedRow.id) { + // const updatedData = data.map((row) => (row.id === selectedRow.id ? selectedRow : row)); + // setData(updatedData); + // } else { const id = data.length + 1; - setNewRow({ ...newRow, id }); - setData([...data, { ...newRow, id }]); - } - + setData([...data, { ...selectedRow, id }]); + // } + setOpen(false); - setSelectedRow({ id: 0, name: '', age: 0 }); - }; - - const handleOpen = () => { - setOpen(true); + setSelectedRow({name: '', email: '', last_login: '', active: '' }); + setNewRow({name: '', email: '', last_login: '', active: '' }); }; const handleClose = () => { setOpen(false); - setSelectedRow({ id: 0, name: '', age: 0 }); + setSelectedRow({name: '', email: '', last_login: '', active: '' }); + setNewRow({name: '', email: '', last_login: '', active: '' }); }; const handleChange = (e: ChangeEvent) => { const { name, value } = e.target; - setSelectedRow({ ...selectedRow, [name]: value }); - setNewRow({ ...newRow, [name]: value }); + if (selectedRow) { + // Editing existing row + setSelectedRow({ ...selectedRow, [name]: value }); + } else { + // Adding a new row + setNewRow({ ...newRow, [name]: value }); + } }; + + const handleOpen = () => { + setOpen(true); + }; + console.log(selectedRow,"sdfhhgfdg") return( - {/*
*/} @@ -120,19 +118,22 @@ export default function ManageUsers(){ {manageUsersResponse && manageUsersResponse.map((row:any) => ( - + handleEdit(row)} aria-label="edit"> - handleDelete(row.id)} aria-label="delete"> + {/* handleDelete(row.id)} aria-label="delete"> - + */} {row.username} {row.email_id} {row.last_login} - {row.active==true?'Active':'Inactive'} + {row.active? + Active + : + Inactive} ))} @@ -146,7 +147,7 @@ export default function ManageUsers(){ label="Name" type="text" name="name" - value={selectedRow && selectedRow.username} + value={selectedRow && selectedRow.name} onChange={handleChange} /> Cancel - {/* */} + - {/* */} )