noo

routes/users.js

@@ -73,8 +73,6 @@ router.post('/login', function(req,res){
 });
 
 
-
-
 ////////////////////////REGISTER////////////////////////
 //The findOrCreate method will check if certain table elements
 //already exist. If they do it will not create a new user. Else

views/register.pug

@@ -11,42 +11,10 @@ section.event-single
 	.container
 		.event-intro
 			img.img-responsive.event-image.scroll-reveal(src='/assets/images/registration.jpg')
-<<<<<<< HEAD
-			h1.scroll-reveal Individual Registration 
-=======
 			h1.scroll-reveal Individual Registration
 			form(action='/register' method ='post')
 				.col-sm-6 
 					h2 Details
-					input.reg-input.scroll-reveal(type='text' placeholder='Name')
-					input.reg-input.scroll-reveal(type='text' placeholder='Location')
-					input.reg-input.scroll-reveal(type='text' placeholder='Course Enrolled in')
-					input.reg-input.scroll-reveal(type='text' placeholder='Email' name='email')
-					input.reg-input.scroll-reveal(type='text' placeholder='username' name='username')
-					input.reg-input.scroll-reveal(type='text' placeholder='password' name = 'password')
-					label.chk-label.scroll-reveal
-						input(type='checkbox' name='accomodation' fee='700' class='event-chk' value= 'Accomodation')
-						span Accomodation (If required) -- €700
-				.col-sm-6
-					.col-sm-12
-						h2 Events
-					.events-chklist
-						p Select all the events you want to participate for, from the list below. Registration fees will be calculated below.
-						label.chk-label.scroll-reveal
-							input.event-chk(type='checkbox' name='vehicle1' fee='100')
-							span creative writing - €100
-						br
-						label.chk-label.scroll-reveal
-							input.event-chk(type='checkbox' name='vehicle2' fee='50')
-							span Extempore Speech - €50
-				.col-sm-8.scroll-revealamount Total amount to be paid: &nbsp;&nbsp;&nbsp;
-					span#register-amt € 0
-				.col-sm-4.scroll-revealA
-					a.btn.btn-home.scroll-reveal.btn-reg(href='') Next
-					br
-					p#reg Registration for school - € 100 to be paid on registration
->>>>>>> 974f74f39bbffe0303b3eabbadefdebe9668116b
-				h2 Details
 				form(action="/register" method="post")
 					input.reg-input.scroll-reveal(type='text' placeholder='Name' name="username")
 					input.reg-input.scroll-reveal(type='text' placeholder='Location')