diff options
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/Account.scala | 2 | ||||
-rw-r--r-- | app/controllers/Application.scala | 6 | ||||
-rw-r--r-- | app/controllers/Authentication.scala | 4 | ||||
-rw-r--r-- | app/controllers/Profile.scala | 4 |
4 files changed, 8 insertions, 8 deletions
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 { | |||
26 | val userUuid = request.account.get.userUuid | 26 | val userUuid = request.account.get.userUuid |
27 | val transactions = Tables.Transactions.filter(_.userUuid === userUuid).sortBy(_.transactionDate.desc).run | 27 | val transactions = Tables.Transactions.filter(_.userUuid === userUuid).sortBy(_.transactionDate.desc).run |
28 | 28 | ||
29 | Ok(views.html.pages.accountSummary(transactions)) | 29 | Ok(views.html.pages.account.accountSummary(transactions)) |
30 | } | 30 | } |
31 | } | 31 | } |
32 | } | 32 | } |
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._ | |||
17 | object Application extends Controller { | 17 | object Application extends Controller { |
18 | 18 | ||
19 | def index = Auth { implicit request => | 19 | def index = Auth { implicit request => |
20 | Ok(views.html.pages.ebeHomepage()) | 20 | Ok(views.html.pages.static.ebeHomepage()) |
21 | } | 21 | } |
22 | 22 | ||
23 | def terms = Auth { implicit request => | 23 | def terms = Auth { implicit request => |
24 | Ok(views.html.pages.terms()) | 24 | Ok(views.html.pages.static.terms()) |
25 | } | 25 | } |
26 | 26 | ||
27 | def privacy = Auth { implicit request => | 27 | def privacy = Auth { implicit request => |
28 | Ok(views.html.pages.privacy()) | 28 | Ok(views.html.pages.static.privacy()) |
29 | } | 29 | } |
30 | 30 | ||
31 | } | 31 | } |
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 { | |||
56 | 56 | ||
57 | def login = Auth { implicit request => | 57 | def login = Auth { implicit request => |
58 | if (request.account.isEmpty) { | 58 | if (request.account.isEmpty) { |
59 | Ok(views.html.pages.loginForm(loginForm)) | 59 | Ok(views.html.pages.auth.loginForm(loginForm)) |
60 | } else { | 60 | } else { |
61 | Redirect(routes.Application.index()) | 61 | Redirect(routes.Application.index()) |
62 | } | 62 | } |
@@ -66,7 +66,7 @@ object Authentication extends Controller { | |||
66 | DB.withSession { implicit session => | 66 | DB.withSession { implicit session => |
67 | loginForm.bindFromRequest.fold( | 67 | loginForm.bindFromRequest.fold( |
68 | formWithErrors => { | 68 | formWithErrors => { |
69 | BadRequest(views.html.pages.loginForm(formWithErrors)) | 69 | BadRequest(views.html.pages.auth.loginForm(formWithErrors)) |
70 | }, | 70 | }, |
71 | validForm => { | 71 | validForm => { |
72 | val userUuid: String = Tables.Users.filter(_.username === validForm.username).map(_.uuid).first.run | 72 | 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 { | |||
98 | if (request.account.nonEmpty) { | 98 | if (request.account.nonEmpty) { |
99 | Redirect(routes.Application.index()) | 99 | Redirect(routes.Application.index()) |
100 | } else { | 100 | } else { |
101 | Ok(views.html.pages.signupForm(signupForm)) | 101 | Ok(views.html.pages.auth.signupForm(signupForm)) |
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||
@@ -109,7 +109,7 @@ object Profile extends Controller { | |||
109 | DB.withSession { implicit session => | 109 | DB.withSession { implicit session => |
110 | signupForm.bindFromRequest.fold( | 110 | signupForm.bindFromRequest.fold( |
111 | formWithErrors => { | 111 | formWithErrors => { |
112 | BadRequest(views.html.pages.signupForm(formWithErrors)) | 112 | BadRequest(views.html.pages.auth.signupForm(formWithErrors)) |
113 | }, | 113 | }, |
114 | validForm => { | 114 | validForm => { |
115 | 115 | ||