Headers

client/components/App.jsx

@@ -20,6 +20,11 @@ import EditContent from './content/EditContent';
 import AdminFeed from './adminDashboard/AdminFeed';
 import StudentList from "./students/StudentList"
 
+
+// componentDidMount = () => {
+
+// }
+
 function App() {
   return (
     <>

client/components/actions/adminAction.js

@@ -1,6 +1,7 @@
-export const adminloggedIn = adminCredentials => {
+export const adminloggedIn = (adminCredentials) => {
+  console.log("in admin login action")
   return dispatch => {
-    fetch('http://localhost:3000/api/v1/admin/login', {
+    fetch('/api/v1/admin/login', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -9,17 +10,28 @@ export const adminloggedIn = adminCredentials => {
     })
       .then(res => res.json())
       .then(admin => {
+        console.log(admin)
         localStorage.setItem('token', admin.Token);
-        dispatch({ type: 'ADMIN_LOGIN_SUCCESSFUL', payload: admin });
+        dispatch({ type: 'ADMIN_LOGIN_SUCCESSFULL', payload: admin });
       });
   };
 };
 
+export const pendingApprovals = (dispatch) => {
+  return dispatch => {
+    fetch("http://localhost:3000/api/v1/admin/pending-approvals", {
+      method: "GET"
+    })
+      .then(res => res.json())
+      .then(pendingApprovals => {
+        dispatch({ type: "PENDING_APPROVALS", payload: pendingApprovals })
+      })
+  }
+}
 
-
-export const adminLogout = () => {
-  console.log("logged out")
+export const adminLogout = (dispatch) => {
+  console.log("inside adminLogout action")
   return dispatch => {
-    dispatch({type: "ADMIN_LOGOUT"}) 
+    dispatch({ type: "ADMIN_LOGOUT" })
   }
 }

client/components/actions/contentAction.js

@@ -23,6 +23,7 @@ export const getContent = () => {
     })
     .then(res => res.json())
     .then(content => {
+      console.log(content, "in content")
       dispatch({type: 'GET_CONTENT', payload: content})
     })
   }

client/components/actions/userAction.js

@@ -1,46 +1,47 @@
-const userLoggedIn = userCredentials => {
+const userLoggedIn = (dispatch, userCredentials) => {
+  console.log("in login action")
   return dispatch => {
-    fetch('/api/v1/users/login', {
-      method: 'POST',
+    fetch("/api/v1/users/login", {
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json"
       },
-      body: JSON.stringify(userCredentials),
+      body: JSON.stringify(userCredentials)
     })
       .then(res => res.json())
       .then(user => {
-        console.log(user, 'in user action');
-        dispatch({ type: 'USER_LOGIN_SUCCESSFULL', payload: user });
+        dispatch({ type: "USER_LOGIN_SUCCESSFULL", payload: user });
         // localStorage.setItem("userToken", user.Token)
         // this.setState({email : user.user.email , username : user.user.username , isLoggedin: true })
       });
   };
 };
 
-
 const userRegister = userCredentials => {
   return dispatch => {
-    fetch('/api/v1/users/register', {
-      method: 'POST',
+    fetch("/api/v1/users/register", {
+      method: "POST",
       body: JSON.stringify(userCredentials),
       headers: {
-        'Content-Type': 'application/json',
-      },
+        "Content-Type": "application/json"
+      }
     })
       .then(res => res.json())
       .then(user => {
-        dispatch({ type: 'USER_REGISTER_SUCCESSFULL', payload: user });
+        dispatch({ type: "USER_REGISTER_SUCCESSFULL", payload: user });
       });
   };
 };
 
-const userLogout = userCredentials => {
+
+const userLogout = (dispatch,userCredentials) => {
+  console.log("in user logout in actions")
   return dispatch => {
     dispatch({
-      type : 'USER_LOGOUT',
-      payload : null
-    })
-  }
-}
+      type: "USER_LOGOUT",
+      payload: null
+    });
+  };
+};
 
-module.exports= {userLoggedIn , userLogout ,userRegister};
+module.exports = { userLoggedIn, userLogout, userRegister };

client/components/adminDashboard/AdminFeed.jsx

@@ -1,11 +1,13 @@
 import React from "react";
 import StudentSubmissionCard from "../students/studentDashboard/StudentSubmissionCard";
 import AdminSidebar from "./AdminSidebar";
+import Header from "../header/Header"
 
 
 function AdminFeed(){
   return (
     <>
+    <Header />
       <div className="wrapper grid-dashboard">
         <div>
           <AdminSidebar />

client/components/adminDashboard/PendingApprovals.js

@@ -1,34 +1,27 @@
 import React, { Component } from 'react';
 import AdminSidebar from './AdminSidebar';
 import PendingCard from './PendingCard';
+import { connect } from "react-redux"
+import { pendingApprovals } from '../actions/adminAction'
+import Header from "../header/Header"
+
 
 class PendingApprovals extends Component {
-  constructor() {
-    super();
-    this.state = {
-      pendingStudentList: null,
-    };
+  constructor(props) {
+    super(props);
+
   }
 
   componentDidMount() {
-    fetch('/api/v1/admin/pending-approvals', {
-      method: 'GET',
-      headers: {
-        // "Authorization": `Token ${localStorage.getItem('Admintoken')}`,
-        'Content-Type': 'application/json',
-      },
-    })
-      .then(res => res.json())
-      .then(data => this.setState({ pendingStudentList: data }));
+    this.props.pendingApprovals()
   }
 
-  render() {
-    const pendingStudentList =
-      this.state.pendingStudentList && this.state.pendingStudentList.users;
-    console.log(pendingStudentList);
 
+  render() {
+    const pendingStudentList = this.props.adminReducer.pendingApprovals.users
     return (
       <>
+        <Header />
         <div className="wrapper grid-dashboard">
           <div>
             <AdminSidebar />
@@ -38,10 +31,16 @@ class PendingApprovals extends Component {
               Pending Approvals
             </h3>
             <div className="grid-col-3">
-              {pendingStudentList &&
+              {/* {pendingStudentList &&
                 pendingStudentList.map(pendingStudent => (
                   <PendingCard pendingStudentData={pendingStudent} />
-                ))}
+                ))} */}
+              {
+                pendingStudentList && pendingStudentList.map(pendingStudent => {
+                  return <PendingCard pendingStudent={pendingStudent} />
+                })
+              }
+              {/* <PendingCard /> */}
             </div>
           </div>
         </div>
@@ -50,4 +49,11 @@ class PendingApprovals extends Component {
   }
 }
 
-export default PendingApprovals;
+const mapStateToProps = (state) => {
+  return state
+}
+
+export default connect(mapStateToProps, { pendingApprovals })(PendingApprovals)
+
+
+// export default PendingApprovals

client/components/adminDashboard/PendingCard.js

@@ -5,12 +5,23 @@ class Pending extends Component {
     super(props);
   }
 
-  render() {
-    // console.log(this.props.pendingStudentData)
-    const {
-      username, email, isActive, isInCampus, isAdmin, createdAt,
-    } = this.props.pendingStudentData;
+  // handleApproveStudent = () => {
+  //   console.log("inside handleApproveStudent")
+  //   fetch(`api/v1/admin/approved/${this.props.pendingStudent._id}`)
+  //     .then(res => res.json())
+  //     .then(approvedStudent => console.log(approvedstudent))
+  // }
+
+  // handleRejectStudent = () => {
+  //   console.log("inside handleRejectStudent")
+  //   fetch(`api/v1/admin/approved/${this.props.pendingStudent._id}`)
+  //   .then(res => res.json())
+  //   .then(rejectedStudent => console.log(rejectedstudent))
+  // }
 
+  render() {
+    const { username, email, createdAt } = this.props.pendingStudent
+    // console.log(this.props)
     return (
 
       <div className="student-card">
@@ -20,16 +31,14 @@ class Pending extends Component {
             <div className="student-pfp" />
           </div>
           <div>
-Details:
+            Details:
             {email}
-            {isInCampus}
-            {/* {createdAt} */}
+            {createdAt}
           </div>
-
         </div>
         <div className="pending-footer">
-          <button className="reject">X</button>
-          <button className="approve">✔</button>
+          <button onClick={this.handleRejectStudent} className="reject">X</button>
+          <button onClick={this.handleApproveStudent} className="approve">✔</button>
         </div>
       </div>
     );

client/components/auth/AdminLogin.js

@@ -1,44 +1,49 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import store from '../store/store';
-import { adminloggedIn, adminLogout } from '../actions/adminAction';
+import React, { Component } from "react";
+import { connect } from "react-redux";
+import store from "../store/store";
+import { adminloggedIn, adminLogout } from "../actions/adminAction";
 class AdminLogin extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      email: '',
-      password: '',
-      admin: '',
+      email: "",
+      password: "",
+      admin: ""
     };
   }
 
   handleChange = e => {
     this.setState({
-      [e.target.name]: e.target.value,
+      [e.target.name]: e.target.value
     });
   };
 
   handleAdminLogin = e => {
+    // console.log("inside handleAdminLogin")
     e.preventDefault();
     const adminCredentials = {
       email: this.state.email,
-      password: this.state.password,
+      password: this.state.password
     };
-    this.props.adminloggedIn(adminCredentials);
-    store.subscribe(() => {
-      console.log(store.getState(), "in admin component");
-      store.getState().adminReducer.adminData.Token
-        ? this.props.history.push('/admin/feed')
-        : this.setState({
-          ...this.state,
-          admin: "Please Check Admin Credentials!"
-
-        });
-    });
+    if (!adminCredentials.email || !adminCredentials.password) {
+      return alert("PLEASE CHECK INPUT FIELDS!");
+    } else {
+      this.props.adminloggedIn(adminCredentials);
+      store.subscribe(() => {
+        store.getState().adminReducer.adminData.Token
+          ? this.props.history.push("/admin/feed")
+          : this.setState({
+              ...this.state,
+              admin: store.getState().adminReducer.adminData.admin
+            });
+      });
+    }
   };
   render() {
     // console.log(this.props)
     return (
+      <>
+      {/* <Header /> */}
       <div className="wrapper text-center">
         <p>{this.state.admin}</p>
         <h1 className="heading">Admin-Login</h1>
@@ -63,15 +68,22 @@ class AdminLogin extends Component {
           />
           <br />
 
-          <button className="button" type="submit" onClick={this.handleAdminLogin}>
+          <button
+            className="button"
+            type="submit"
+            onClick={this.handleAdminLogin}
+          >
             Submit
           </button>
         </div>
       </div>
+      </>
     );
   }
 }
 const mapStateToProps = state => {
   return state;
 };
-export default connect(mapStateToProps, { adminloggedIn, adminLogout })(AdminLogin);
+export default connect(mapStateToProps, { adminloggedIn, adminLogout })(
+  AdminLogin
+);