diff --git a/src/routes/.users.js.swo b/src/routes/.users.js.swo new file mode 100644 index 0000000..40ebcc5 Binary files /dev/null and b/src/routes/.users.js.swo differ diff --git a/src/routes/index.js b/src/routes/index.js index 4e962d1..24824f7 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -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); diff --git a/src/routes/users.js b/src/routes/users.js index 3f454c9..23a9a04 100644 --- a/src/routes/users.js +++ b/src/routes/users.js @@ -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 @@ -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()}); diff --git a/src/views/index.ejs b/src/views/index.ejs index 048ed07..036cb3a 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -10,10 +10,9 @@
  • View available books
  • <% if (!currentUser) { %> -
  • Sign up
  • +
  • Sign up
  • Sign in
  • <% } else { %> -
  • List of Users
  • diff --git a/src/views/users/index.ejs b/src/views/users/index.ejs index 6464025..4de3e23 100644 --- a/src/views/users/index.ejs +++ b/src/views/users/index.ejs @@ -3,9 +3,11 @@ UserID: <%- users.id %> Email: <%- users.email %> Role: <%- users.role %> - Edit + Edit


    <% }) %> +

    Home

    + diff --git a/src/views/users/new.ejs b/src/views/users/new.ejs index b229506..23ac85a 100644 --- a/src/views/users/new.ejs +++ b/src/views/users/new.ejs @@ -8,7 +8,7 @@

    Sign up

    - +