Put views in packages

14 files changed, 50 insertions, 9 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 {
         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 => {
 
diff --git a/app/views/fragments/ebeMainActions.scala.html b/app/views/fragments/ebeMainActions.scala.html
index 46faeb6..0043321 100644
--- a/app/views/fragments/ebeMainActions.scala.html
+++ b/app/views/fragments/ebeMainActions.scala.html
@@ -6,7 +6,7 @@
 </div>
 
 <div class="pure-u-1 pure-u-lg-1-2">
-        <a class="pure-button green-bg" href="#">
+        <a class="pure-button green-bg" href="@routes.Sale.sales()">
                 <i class="fa fa-dropbox fa-5x"></i>
                 <span>Buy</span>
         </a>
diff --git a/app/views/pages/accountSummary.scala.html b/app/views/pages/account/accountSummary.scala.html
index 3a10d3d..3a10d3d 100644
--- a/app/views/pages/accountSummary.scala.html
+++ b/app/views/pages/account/accountSummary.scala.html
diff --git a/app/views/pages/loginForm.scala.html b/app/views/pages/auth/loginForm.scala.html
index f359082..f359082 100644
--- a/app/views/pages/loginForm.scala.html
+++ b/app/views/pages/auth/loginForm.scala.html
diff --git a/app/views/pages/signupForm.scala.html b/app/views/pages/auth/signupForm.scala.html
index b026167..b026167 100644
--- a/app/views/pages/signupForm.scala.html
+++ b/app/views/pages/auth/signupForm.scala.html
diff --git a/app/views/pages/sales/currentSales.scala.html b/app/views/pages/sales/currentSales.scala.html
new file mode 100644
index 0000000..30cea78
--- /dev/null
+++ b/app/views/pages/sales/currentSales.scala.html
@@ -0,0 +1,41 @@
+@(sales: Seq[Views.Sale])(implicit request: AuthRequest[AnyContent], flash: Flash, token: play.filters.csrf.CSRF.Token)
+
+@templates.ebe("Sales")(request.account) {
+
+        <div class="action-buttons pure-g">
+        @fragments.ebeMainActions()
+        </div>
+
+        <br>
+
+        <div class="pure-g">
+                <div class="pure-u-1 pure-u-lg-1-1">
+                        <div class="l-box">
+                                <h2>Current sales</h2>
+
+                                <table class="pure-table pure-table-horizontal">
+
+                                        <thead>
+                                                <tr>
+                                                        <td>End date</td>
+                                                        <td>Item</td>
+                                                        <td>Current price</td>
+                                                </tr>
+                                        </thead>
+
+                                        <tbody>
+                                        @for(sale <- sales) {
+                                                <tr>
+                                                        <td>@sale.endDate</td>
+                                                        <td><a href="@routes.Sale.item(sale.itemUuid.get)">@sale.itemName</a></td>
+                                                        <td>@if(sale.bestOffer.isDefined) {@sale.bestOffer} else {sale.initialPrice} €</td>
+                                                </tr>
+                                        }
+                                        </tbody>
+
+                                </table>
+                        </div>
+                </div>
+        </div>
+
+}
diff --git a/app/views/pages/ebeHomepage.scala.html b/app/views/pages/static/ebeHomepage.scala.html
index d4fe80a..d4fe80a 100644
--- a/app/views/pages/ebeHomepage.scala.html
+++ b/app/views/pages/static/ebeHomepage.scala.html
diff --git a/app/views/pages/index.scala.html b/app/views/pages/static/index.scala.html
index b6e0029..b6e0029 100644
--- a/app/views/pages/index.scala.html
+++ b/app/views/pages/static/index.scala.html
diff --git a/app/views/pages/pepalHomepage.scala.html b/app/views/pages/static/pepalHomepage.scala.html
index 9f4b227..9f4b227 100644
--- a/app/views/pages/pepalHomepage.scala.html
+++ b/app/views/pages/static/pepalHomepage.scala.html
diff --git a/app/views/pages/privacy.scala.html b/app/views/pages/static/privacy.scala.html
index dd6898a..dd6898a 100644
--- a/app/views/pages/privacy.scala.html
+++ b/app/views/pages/static/privacy.scala.html
diff --git a/app/views/pages/terms.scala.html b/app/views/pages/static/terms.scala.html
index 3ccadc7..3ccadc7 100644
--- a/app/views/pages/terms.scala.html
+++ b/app/views/pages/static/terms.scala.html