From 1e033ea18a8b1a4aeee9433e5ce2c1c5228129dc Mon Sep 17 00:00:00 2001
From: sellers3 <sellers3@uni.coventry.ac.uk>
Date: Tue, 26 Nov 2019 23:20:02 +0000
Subject: [PATCH] fixed merge issues

---
 acceptance tests/admin.test.js |   2 +-
 databases/users.db-journal     | Bin 12824 -> 0 bytes
 index.js                       |   4 ++--
 routes/user.js                 |  14 +-------------
 4 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 databases/users.db-journal

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 de12fc68b8cebd85bf66df1753b3473ac600259e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12824
zcmeI&%}T>S5C`zxR4oyt-g2E|ON$o;uSQuU*v1-HFeiz1#X?(cH@ONu`VJ!aP$FLY
z7J>&Su@)`9faJfhUr8pgzs)7XzP+rz({t}t2vND8eLUv95Ds^nTv19O;B4fJ#CDfp
ztFc4~KmY;|fB*y_009U<00Iywv%q)W2YG-pe+5`O1Rwwb2tWV=5P$##AOHaflto~k
z2au;H?S5+L`gSr*QrhOD0aA)RB6g5m`FzNt<nxuq?CbuI>7PR>wst7bH8{0hQG4J9
z1p*L&00bZa0SG_<0uX=z1R(H#1iH?e*KEo-O)dw<jtBe?ePPWwGo#+}v~mzBUn|o7
zep}Jfv-MFjG%b#7WU}gco}327D>G{*wrHGR;l(9dcU`yMzoH=2>QF`0je?FJ#dM@%
j^3U{f5OPpQg}Oy~0BLp3!@I=V`7p`Sn_}4DJiyZ@iLF=7

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