Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added src/routes/.users.js.swo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import catchAsync from '../lib/catchAsync';
const router = Router();

router.use('/books', books);
router.use('/users', users);
router.use('/admin/users', users);
router.use('/sessions', sessions);
router.use('/loans', loans);

Expand Down
9 changes: 6 additions & 3 deletions src/routes/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ router.get('/:id', ensureLoggedIn(), catchAsync(async (req, res) => {
// View all users
router.get('/', ensureLoggedIn(), catchAsync(async (req, res) => {
const users = await User.findAll({});

res.render('users/index', {users});
if(req.user.role == 'Borrower') {
res.redirect('/');
} else {
res.render('users/index', {users});
}
}));

// Update a user
Expand All @@ -41,7 +44,7 @@ router.post('/:id', ensureLoggedIn(), catchAsync(async (req, res) => {
try {
await user.save();
req.flash('info', 'User updated successfully');
res.redirect('/users');
res.redirect('/admin/users');
} catch(e) {
console.warn(e);
res.render('users/edit', {user, error: e.toString()});
Expand Down
3 changes: 1 addition & 2 deletions src/views/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
<li><a href='/books'>View available books</a></li>

<% if (!currentUser) { %>
<li><a href='/users/new'>Sign up</a></li>
<li><a href='/admin/users/new'>Sign up</a></li>
<li><a href='/sessions/new'>Sign in</a></li>
<% } else { %>
<li><a href='/users'>List of Users</a></li>
<li>
<form action='/sessions/destroy' method='post'>
<button type='submit'>Logout</button>
Expand Down
4 changes: 3 additions & 1 deletion src/views/users/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
UserID: <%- users.id %>
Email: <%- users.email %>
Role: <%- users.role %>
<a href="/users/<%- users.id %>">Edit</a>
<a href="/admin/users/<%- users.id %>">Edit</a>
</p>
<hr>
<% }) %>


<p><a href='/'>Home</a></p>

2 changes: 1 addition & 1 deletion src/views/users/new.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<p>Sign up</p>

<form action='/users' method='post'>
<form action='/admin/users' method='post'>

<p>
<label>
Expand Down