diff --git a/acceptance tests/admin.test.js b/acceptance tests/admin.test.js index fac3198..8640bc2 100644 --- a/acceptance tests/admin.test.js +++ b/acceptance tests/admin.test.js @@ -181,7 +181,7 @@ describe('menu', () => { await page.goto('http://localhost:8080/order/1', { timeout: 30000, waitUntil: 'load' }) await page.goto('http://localhost:8080/order/1', { timeout: 30000, waitUntil: 'load' }) - await page.click('input[id=add]') + await page.click('button[name=add]') await page.waitFor(2000) diff --git a/databases/users.db-journal b/databases/users.db-journal deleted file mode 100644 index de12fc6..0000000 Binary files a/databases/users.db-journal and /dev/null differ diff --git a/index.js b/index.js index b233a28..2a082fc 100644 --- a/index.js +++ b/index.js @@ -12,7 +12,7 @@ const session = require('koa-session') /* IMPORT CUSTOM MODULES */ const User = require('./routes/user') const Menu = require('./routes/menu') -const Order = require('./routers/order') +const Order = require('./routes/order') const app = new Koa() const router = new Router() @@ -29,7 +29,7 @@ const port = process.env.PORT || defaultPort app.use(User.routes()) app.use(Menu.routes()) -app.use(Order.routers()) +app.use(Order.routes()) app.use(router.routes()) diff --git a/routes/user.js b/routes/user.js index e59c8e6..ae2a871 100644 --- a/routes/user.js +++ b/routes/user.js @@ -18,7 +18,7 @@ router.get('/', async ctx => { const auth = ctx.session.authorised const user = await new User(dbUsers) const authenticated = user.checkAuth(auth) - if(authenticated === true) { + if(authenticated !== true) { return ctx.redirect('/login?msg=you need to log in') } const data = {} @@ -29,20 +29,8 @@ router.get('/', async ctx => { } }) -/** - * The user registration page. - * - * @name Register Page - * @route {GET} /register - */ router.get('/register', async ctx => await ctx.render('register')) -/** - * The script to process new user registrations. - * - * @name Register Script - * @route {POST} /register - */ router.post('/register', koaBody, async ctx => { try { // extract the data from the request