Skip to content

Refactor + issue #48 #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BadBrahmin wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Refactor + issue #48 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8503470
add Verification action
Jan 27, 2020
dbb2647
refactor App.jsx
Jan 27, 2020
15fd27b
add protected and non protected routes components
Jan 28, 2020
8bee725
fix: wrong redirect on add content
BadBrahmin Jan 29, 2020
6c5183e
add: AdminWrapper component
BadBrahmin Jan 29, 2020
aa04ba3
update: AdminFeed, PendingApprovals with wrapper
BadBrahmin Jan 29, 2020
bc8cb23
update: StudentList with wrapper
BadBrahmin Jan 29, 2020
2bf1b48
update: moved under admin
BadBrahmin Jan 29, 2020
1a59de6
update: ContentList with wrapper
BadBrahmin Jan 29, 2020
4ca079f
fix: redirects
BadBrahmin Jan 29, 2020
67e808f
cleanup
BadBrahmin Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 20 additions & 187 deletions client/components/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,72 +8,30 @@ import {
BrowserRouter as Router,
} from 'react-router-dom';
import { connect } from 'react-redux';
import Home from './home/Home';
import RegisterUser from './auth/RegisterUser';
import LoginUser from './auth/LoginUser';
import AdminLogin from './auth/AdminLogin';
import Page404 from './Page404';
import ContentList from './content/ContentList';
import PendingApprovals from './adminDashboard/PendingApprovals';
import ContentSubmission from './content/ContentSubmission';
import Onboarding from './auth/Onboarding';
import StudentDashboard from './students/studentDashboard/StudentDashboard';
import UpdateContentModal from './content/UpdateContentModal';
import AdminFeed from './adminDashboard/AdminFeed';
import StudentList from './students/StudentList';
import RegisterVerification from './registerVerfication/RegisterVerification';

import AdminProtectedRoutes from './auth/AdminProtectedRoutes';
import StudentProtectedRoutes from './auth/StudentProtectedRoutes';
import NonProtectedRoutes from './auth/NonProtectedRoutes';

import { verifyUser } from '../redux/actions/verificationAction';
import { studentLogin, studentLogout } from '../redux/actions/studentAction';
import { adminLogout } from '../redux/actions/adminAction';
import StudentProfile from './students/StudentProfile';

class App extends Component {
constructor(props) {
super(props);

this.state = {
user: null,
};
// this.state = {
// user: null,
// };
}

componentDidMount() {
if (localStorage.token) {
this.loginUser();
this.props.verifyUser();
}
}

loginUser = () => {
//TODO Store user/admin in reducer
fetch('http://localhost:3000/api/v1/admin/me', {
method: 'GET',
headers: {
authorization: localStorage.token,
'content-Type': 'application/json',
},
})
.then(res => res.json())
.then(admin => {
if (admin) {
this.setState({
user: admin,
});
} else {
fetch('http://localhost:3000/api/v1/students/me', {
method: 'GET',
headers: {
authorization: localStorage.token,
'content-Type': 'application/json',
},
})
.then(res => res.json())
.then(student => {
this.setState({
user: student,
});
});
}
});
};

cb = () => {
this.setState({ user: null }, () => {
this.props.history.push('/');
Expand All @@ -87,151 +45,26 @@ class App extends Component {
this.props.adminLogout(this.cb);
};

protectedAdminRoutes = () => {
return (
<>
<Switch>
<Route
exact
path='/admin/feed'
render={() => (
<AdminFeed
state={this.state}
handleLogout={this.handleLogout}
isAuthed={true}
/>
)}
/>
<Route exact path='/admin/contents' component={ContentList} />
<Route
exact
path='/admin/students'
render={() => (
<StudentList
state={this.state}
handleLogout={this.handleLogout}
isAuthed={true}
/>
)}
/>
<Route path='/admin/update-content' component={UpdateContentModal} />
<Route
exact
path='/admin/pending-approvals'
render={() => (
<PendingApprovals
state={this.state}
handleLogout={this.handleLogout}
isAuthed={true}
/>
)}
/>
<Route
render={() => (
<AdminFeed
state={this.state}
handleLogout={this.handleLogout}
isAuthed={true}
/>
)}
/>
</Switch>
</>
);
};

protectedStudentRoutes = () => {
return (
<>
<Switch>
<Route
exact
path='/submission/:deliveryid'
render={() => (
<ContentSubmission state={this.state} isAuthed={true} />
)}
/>
<Route
exact
path='/await-approval'
component={RegisterVerification}
/>
<Route
exact
path='/feed'
render={() => (
<StudentDashboard
state={this.state}
handleLogout={this.handleLogout}
isAuthed={true}
/>
)}
/>
<Route
exact
path='/profile'
render={() => (
<StudentProfile
state={this.state}
handleLogout={this.handleLogout}
isAuthed={true}
/>
)}
/>
<Route
render={() => (
<StudentDashboard
state={this.state}
handleLogout={this.handleLogout}
isAuthed={true}
/>
)}
/>
{/* <Route component={Page404} /> */}
</Switch>
</>
);
};

nonProtectedRoutes = () => {
return (
<>
<Switch>
<Route exact path='/' component={Home} />
<Route exact path='/register' component={RegisterUser} />
<Route exact path='/login' component={LoginUser} />
<Route exact path='/admin/login' component={AdminLogin} />
<Route exact path='/register/onboarding' component={Onboarding} />
<Route
exact
path='/await-approval'
component={RegisterVerification}
/>

<Route component={Page404} />
</Switch>
</>
);
};

render() {
if (!this.state.user && localStorage.token) this.loginUser();
// console.log('app render...', this.state.user);
// if ((!this.props.adminReducer.isAdminLoggedIn || !this.props.isStudentLoggedIn ) && localStorage.token) this.props.verifyUser();
// console.log('app render...', this.props);
return (
<>
{!this.state.user
? this.nonProtectedRoutes()
: this.state.user.isAdmin
? this.protectedAdminRoutes()
: this.protectedStudentRoutes()}
{/* <StudentDashboard /> */}
{this.props.adminReducer.isAdminLoggedIn ? (
<AdminProtectedRoutes />
) : this.props.studentReducer.isStudentLoggedIn ? (
<StudentProtectedRoutes />
) : (
<NonProtectedRoutes />
)}
</>
);
}
}
const mapStateToProps = store => store;

export default connect(mapStateToProps, {
verifyUser,
studentLogin,
studentLogout,
adminLogout,
Expand Down
Loading