Merge pull request #92 from AVC0706/AVC1

View User and mandal in Dashboard, Some changes and Next Meeting

Author: AVC0706

client/.gitignore

@@ -13,6 +13,7 @@
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local

client/src/components/dashboard/AdminTab.js

@@ -6,7 +6,7 @@ import UserContext from "../../context/user/userContext";
 
 const {TabPane} = Tabs;
 
-function AdminTab() {
+function AdminTab(props) {
     const [adminPanel, setadminPanel] = useState({
         tab: "City",
     });
@@ -117,14 +117,16 @@ function AdminTab() {
             });
     };
 
+
     return (
         <Tabs defaultActiveKey={[tab]}>
             {user.admin.toLowerCase() === "state" ? (
                 <TabPane tab="District Admins" key="District">
                     {loading ? (
                         <Spin size="large"/>
                     ) : (
-                        <DataTable users={districtAdmin} deleteUser={deleteUser} adminType={'district'}/>
+                        <DataTable users={districtAdmin} redirect={props.redirect} deleteUser={deleteUser}
+                                   adminType={'district'}/>
                     )}
                 </TabPane>
             ) : null}
@@ -135,7 +137,8 @@ function AdminTab() {
                     {loading ? (
                         <Spin size="large"/>
                     ) : (
-                        <DataTable users={cityAdmin} deleteUser={deleteUser} adminType={'city'}/>
+                        <DataTable users={cityAdmin} redirect={props.redirect} deleteUser={deleteUser}
+                                   adminType={'city'}/>
                     )}
                 </TabPane>
             ) : null}
@@ -145,7 +148,8 @@ function AdminTab() {
                 {loading ? (
                     <Spin size="large"/>
                 ) : (
-                    <DataTable users={normalUsers} deleteUser={deleteUser} adminType={'null'}/>
+                    <DataTable users={normalUsers} redirect={props.redirect} deleteUser={deleteUser}
+                               adminType={'null'}/>
                 )}
             </TabPane>
         </Tabs>

client/src/components/dashboard/Dashboard.js

@@ -6,7 +6,7 @@ import MandalAdminTab from "./MandalAdminTab.js";
 
 const {Sider, Content} = Layout;
 
-function Dashboard() {
+function Dashboard(props) {
     const [dashBoard, setdashBoard] = useState({
         tab: "Admins",
     });
@@ -15,6 +15,8 @@ function Dashboard() {
         setdashBoard({...dashBoard, tab: e.key});
     };
 
+
+
     return (
         <Layout style={{minHeight: "92vh"}}>
             <Layout>
@@ -27,9 +29,9 @@ function Dashboard() {
                 </Sider>
                 <Layout style={{padding: "0 24px 24px"}}>
                     <Content>
-                        {tab === "Mandals" && <MandalTab></MandalTab>}
-                        {tab === "Admins" && <AdminTab></AdminTab>}
-                        {tab === "Mandal Admins" && <MandalAdminTab></MandalAdminTab>}
+                        {tab === "Mandals" && <MandalTab redirect={props.redirectMandal}/>}
+                        {tab === "Admins" && <AdminTab redirect={props.redirectUser}/>}
+                        {tab === "Mandal Admins" && <MandalAdminTab redirect={props.redirectUser} />}
                     </Content>
                 </Layout>
             </Layout>

client/src/components/dashboard/DataTable.js

@@ -114,7 +114,7 @@ const DataTable = (props) => {
 
     const onViewButton = (e, record) => {
         e.preventDefault();
-        // props.history.push('/userProfile')
+        props.redirect(record._id)
     };
 
     const onChange = (e) => {

client/src/components/dashboard/MandalAdminTab.js

@@ -9,7 +9,7 @@ import axios from "axios";
 const {TabPane} = Tabs;
 
 
-function MandalAdminTab() {
+function MandalAdminTab(props) {
     const userContext = useContext(UserContext);
     const {user} = userContext;
     const [loading, setLoading] = useState(true);
@@ -37,12 +37,12 @@ function MandalAdminTab() {
     const [normalUsers, setNormalUsers] = useState([]);
     return (
         <Tabs defaultActiveKey={tab}>
-            <TabPane tab="Existing Admins" key="Existing"><MandalTable></MandalTable></TabPane>
+            <TabPane tab="Existing Admins" key="Existing"><MandalTable redirect={props.redirect}/></TabPane>
             <TabPane tab="Add New Mandal Admin" key="New">
                 <Row>
                     <Col/>
                     <Col>
-                        <Register></Register>
+                        <Register/>
                     </Col>
                     <Col/>
                 </Row>

client/src/components/dashboard/MandalTab.js

@@ -7,7 +7,7 @@ import UserContext from "../../context/user/userContext";
 
 const {TabPane} = Tabs;
 
-function MandalTab() {
+function MandalTab(props) {
 
     const userContext = useContext(UserContext);
     const {user} = userContext;
@@ -104,7 +104,7 @@ function MandalTab() {
                     {loading ? (
                         <Spin size="large"/>
                     ) : (
-                        <MandalApprovalTable mandals={falseMandal}></MandalApprovalTable>
+                        <MandalApprovalTable mandals={falseMandal} redirect={props.redirect}></MandalApprovalTable>
                     )}
                 </TabPane>
             ) : null}
@@ -114,7 +114,7 @@ function MandalTab() {
                 {loading ? (
                     <Spin size="large"/>
                 ) : (
-                    <MandalTable mandals={approvedMandal}></MandalTable>
+                    <MandalTable mandals={approvedMandal} redirect={props.redirect}></MandalTable>
                 )}
             </TabPane>
 

client/src/components/dashboard/MandalTable.js

@@ -43,8 +43,9 @@ const MandalTable = (props) => {
             key: "actions",
             render: (text, record) => (
                 <Space size="middle">
-                    <Button type="primary">View</Button>
-
+                    <Button type="primary" onClick={(e) => onViewButton(e, record)}>
+                        View
+                    </Button>
                     <Popconfirm
                         title="Are you sure？"
                         icon={<QuestionCircleOutlined style={{color: "red"}}/>}
@@ -87,6 +88,10 @@ const MandalTable = (props) => {
             console.log("params", pagination, filters, sorter, extra);
         }
     };
+    const onViewButton = (e, record) => {
+        e.preventDefault();
+        props.redirect(record._id)
+    };
     const onChange = (e) => {
         if (e.value === "") {
             setstate({...state, filterTable: null, baseData: props.mandals});
@@ -101,7 +106,7 @@ const MandalTable = (props) => {
                 onChange={onChange}
                 enterButton
                 onSearch={search}
-            ></Input.Search>
+            />
             <Table
                 columns={columns}
                 dataSource={filterTable == null ? baseData : filterTable}

client/src/views/Dashboard/Dashboard.js

@@ -5,11 +5,17 @@ import {Col, Row} from "antd";
 
 const Dashboard = (props) => {
     const userContext = useContext(UserContext);
+    const redirectUser = (id) => {
+        props.history.push(`/userProfile/${id}`);
+    }
+    const redirectMandal = (id) => {
+        props.history.push(`/mandalProfile/${id}`);
+    }
     return (
         <><Row>
             <Col span={2}/>
             <Col span={20}>{userContext.user && userContext.user.admin.toLowerCase() !== "null" ? (
-                <DashboardView/>
+                <DashboardView redirectUser={redirectUser} redirectMandal={redirectMandal}/>
             ) : (
                 <p>You are not a admin.</p>
             )}</Col>

client/src/views/Profiles/UserProfile.js

@@ -42,7 +42,7 @@ function UserProfile(props) {
     const getUser = () => {
         console.log(props)
         axios
-            .get(process.env.REACT_APP_SERVER_URL + `/user/profile/${props.match.params.id}`)
+            .get(`${process.env.REACT_APP_SERVER_URL}/user/profile/${props.match.params.id}`)
             .then((res) => {
                 if (res.status === 200) {
                     console.log(res.data.user)
@@ -66,7 +66,7 @@ function UserProfile(props) {
                         style={{margin: "10px"}}
                         extra=
                             {
-                                userContext.user && userContext.user.admin != "null" ? <Button
+                                userContext.user && userContext.user.admin !== "null" ? <Button
                                     style={{marginTop: "0px", float: "right"}}
                                     type="primary"
                                     onClick={showEditMember}
@@ -93,13 +93,12 @@ function UserProfile(props) {
                                     </Descriptions.Item>
                                     <Descriptions.Item label="Qualification">{qualification}</Descriptions.Item>
 
-                                    <Descriptions.Item label="Joined At">
-                                        {{
-                                            if(created_at) {
-                                                created_at.getDate();
-                                            }
-                                        }}
-                                    </Descriptions.Item>
+                                    {/*<Descriptions.Item label="Joined At">*/}
+                                    {/*    {*/}
+                                    {/*            created_at.getDate()*/}
+
+                                    {/*    }*/}
+                                    {/*</Descriptions.Item>*/}
 
                                     <Descriptions.Item label="Area of Interest"><Tag>Area of
                                         Interest</Tag></Descriptions.Item>

routes/mandal.js

@@ -26,10 +26,8 @@ router.post("/createMandal", isAdmin, async (req, res) => {
             },
         );
 
-
         await mandal.save();
 
-
         res
             .status(200)
             .json({msg: "Mandal Registration Successful  !!", mandal, user});