From c00cb6ae05f548f7ae270a93ad44f57207380406 Mon Sep 17 00:00:00 2001 From: Pacien TRAN-GIRARD Date: Sun, 8 Feb 2015 20:03:02 +0100 Subject: Put views in packages --- app/controllers/Account.scala | 2 +- app/controllers/Application.scala | 6 +++--- app/controllers/Authentication.scala | 4 ++-- app/controllers/Profile.scala | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/Account.scala b/app/controllers/Account.scala index 7557ef1..625ab2d 100644 --- a/app/controllers/Account.scala +++ b/app/controllers/Account.scala @@ -26,7 +26,7 @@ object Account extends Controller { val userUuid = request.account.get.userUuid val transactions = Tables.Transactions.filter(_.userUuid === userUuid).sortBy(_.transactionDate.desc).run - Ok(views.html.pages.accountSummary(transactions)) + Ok(views.html.pages.account.accountSummary(transactions)) } } } diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index deb96d8..8f0b662 100644 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -17,15 +17,15 @@ import models._ object Application extends Controller { def index = Auth { implicit request => - Ok(views.html.pages.ebeHomepage()) + Ok(views.html.pages.static.ebeHomepage()) } def terms = Auth { implicit request => - Ok(views.html.pages.terms()) + Ok(views.html.pages.static.terms()) } def privacy = Auth { implicit request => - Ok(views.html.pages.privacy()) + Ok(views.html.pages.static.privacy()) } } diff --git a/app/controllers/Authentication.scala b/app/controllers/Authentication.scala index f9772e2..b7ee724 100644 --- a/app/controllers/Authentication.scala +++ b/app/controllers/Authentication.scala @@ -56,7 +56,7 @@ object Authentication extends Controller { def login = Auth { implicit request => if (request.account.isEmpty) { - Ok(views.html.pages.loginForm(loginForm)) + Ok(views.html.pages.auth.loginForm(loginForm)) } else { Redirect(routes.Application.index()) } @@ -66,7 +66,7 @@ object Authentication extends Controller { DB.withSession { implicit session => loginForm.bindFromRequest.fold( formWithErrors => { - BadRequest(views.html.pages.loginForm(formWithErrors)) + BadRequest(views.html.pages.auth.loginForm(formWithErrors)) }, validForm => { val userUuid: String = Tables.Users.filter(_.username === validForm.username).map(_.uuid).first.run diff --git a/app/controllers/Profile.scala b/app/controllers/Profile.scala index a41b3e9..8181106 100644 --- a/app/controllers/Profile.scala +++ b/app/controllers/Profile.scala @@ -98,7 +98,7 @@ object Profile extends Controller { if (request.account.nonEmpty) { Redirect(routes.Application.index()) } else { - Ok(views.html.pages.signupForm(signupForm)) + Ok(views.html.pages.auth.signupForm(signupForm)) } } @@ -109,7 +109,7 @@ object Profile extends Controller { DB.withSession { implicit session => signupForm.bindFromRequest.fold( formWithErrors => { - BadRequest(views.html.pages.signupForm(formWithErrors)) + BadRequest(views.html.pages.auth.signupForm(formWithErrors)) }, validForm => { -- cgit v1.2.3