From cb902da50bd75b623a47727e62c0c69913422bfd Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Sun, 8 Feb 2015 00:17:21 +0100
Subject: Authentication draft

---
 app/views/fragments/accountInfos.scala.html        | 46 +++++++++++++++-------
 app/views/fragments/branding/ebeLogo.scala.html    |  1 +
 app/views/fragments/branding/ebeSlogan.scala.html  |  1 +
 app/views/fragments/branding/pepalLogo.scala.html  |  1 +
 .../fragments/branding/pepalSlogan.scala.html      |  1 +
 app/views/fragments/ebeLogo.scala.html             |  1 -
 app/views/fragments/ebeSlogan.scala.html           |  1 -
 app/views/fragments/forms/globalErrors.scala.html  |  7 ++++
 app/views/fragments/forms/inputField.scala.html    | 10 +++++
 app/views/fragments/forms/textarea.scala.html      |  8 ++++
 app/views/fragments/pepalLogo.scala.html           |  1 -
 app/views/fragments/pepalSlogan.scala.html         |  1 -
 app/views/pages/ebeHomepage.scala.html             | 10 ++---
 app/views/pages/loginForm.scala.html               | 27 +++++++++++++
 app/views/pages/pepalHomepage.scala.html           |  8 ++--
 app/views/templates/ebe.scala.html                 |  4 +-
 app/views/templates/main.scala.html                | 20 +++++-----
 app/views/templates/pepal.scala.html               |  4 +-
 18 files changed, 112 insertions(+), 40 deletions(-)
 create mode 100644 app/views/fragments/branding/ebeLogo.scala.html
 create mode 100644 app/views/fragments/branding/ebeSlogan.scala.html
 create mode 100644 app/views/fragments/branding/pepalLogo.scala.html
 create mode 100644 app/views/fragments/branding/pepalSlogan.scala.html
 delete mode 100644 app/views/fragments/ebeLogo.scala.html
 delete mode 100644 app/views/fragments/ebeSlogan.scala.html
 create mode 100644 app/views/fragments/forms/globalErrors.scala.html
 create mode 100644 app/views/fragments/forms/inputField.scala.html
 create mode 100644 app/views/fragments/forms/textarea.scala.html
 delete mode 100644 app/views/fragments/pepalLogo.scala.html
 delete mode 100644 app/views/fragments/pepalSlogan.scala.html
 create mode 100644 app/views/pages/loginForm.scala.html

(limited to 'app/views')

diff --git a/app/views/fragments/accountInfos.scala.html b/app/views/fragments/accountInfos.scala.html
index 711fb40..8fb0aab 100644
--- a/app/views/fragments/accountInfos.scala.html
+++ b/app/views/fragments/accountInfos.scala.html
@@ -1,14 +1,32 @@
-<a class="pure-button" href="#">
-	<i class="fa fa-sign-out fa-lg"></i>
-	Logout
-</a>
-
-<a class="pure-button" href="#">
-	<i class="fa fa-money fa-lg"></i>
-	-400 000 €
-</a>
-
-<a class="pure-button" href="#">
-	<i class="fa fa-user fa-lg"></i>
-	Mr. Kornada
-</a>
+@(accountData: Option[models.Views.Account] = None)
+
+@accountData match {
+	case Some(account) => {
+		<a class="pure-button" href="@routes.Auth.logout()">
+			<i class="fa fa-sign-out fa-lg"></i>
+			Logout
+		</a>
+
+		<a class="pure-button" href="#">
+			<i class="fa fa-money fa-lg"></i>
+			@account.equity €
+		</a>
+
+		<a class="pure-button" href="#">
+			<i class="fa fa-user fa-lg"></i>
+			@account.username
+		</a>
+	}
+
+	case None => {
+		<a class="pure-button" href="@routes.Auth.logout()">
+			<i class="fa fa-pencil-square-o fa-lg"></i>
+			Sign up
+		</a>
+
+		<a class="pure-button" href="@routes.Auth.login()">
+			<i class="fa fa-sign-in fa-lg"></i>
+			Log in
+		</a>
+	}
+}
diff --git a/app/views/fragments/branding/ebeLogo.scala.html b/app/views/fragments/branding/ebeLogo.scala.html
new file mode 100644
index 0000000..f2b552a
--- /dev/null
+++ b/app/views/fragments/branding/ebeLogo.scala.html
@@ -0,0 +1 @@
+<span class="ebe-logo"><span class="red">e</span><span class="blue">b</span><span class="yellow">é</span></span>
\ No newline at end of file
diff --git a/app/views/fragments/branding/ebeSlogan.scala.html b/app/views/fragments/branding/ebeSlogan.scala.html
new file mode 100644
index 0000000..c0b5332
--- /dev/null
+++ b/app/views/fragments/branding/ebeSlogan.scala.html
@@ -0,0 +1 @@
+Le marketplace
\ No newline at end of file
diff --git a/app/views/fragments/branding/pepalLogo.scala.html b/app/views/fragments/branding/pepalLogo.scala.html
new file mode 100644
index 0000000..a4b75ae
--- /dev/null
+++ b/app/views/fragments/branding/pepalLogo.scala.html
@@ -0,0 +1 @@
+<span class="pepal-logo"><span class="dark-blue">Pé</span><span class="light-blue">Pal</span></span>
\ No newline at end of file
diff --git a/app/views/fragments/branding/pepalSlogan.scala.html b/app/views/fragments/branding/pepalSlogan.scala.html
new file mode 100644
index 0000000..a6d6e69
--- /dev/null
+++ b/app/views/fragments/branding/pepalSlogan.scala.html
@@ -0,0 +1 @@
+Le money
\ No newline at end of file
diff --git a/app/views/fragments/ebeLogo.scala.html b/app/views/fragments/ebeLogo.scala.html
deleted file mode 100644
index f2b552a..0000000
--- a/app/views/fragments/ebeLogo.scala.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="ebe-logo"><span class="red">e</span><span class="blue">b</span><span class="yellow">é</span></span>
\ No newline at end of file
diff --git a/app/views/fragments/ebeSlogan.scala.html b/app/views/fragments/ebeSlogan.scala.html
deleted file mode 100644
index c0b5332..0000000
--- a/app/views/fragments/ebeSlogan.scala.html
+++ /dev/null
@@ -1 +0,0 @@
-Le marketplace
\ No newline at end of file
diff --git a/app/views/fragments/forms/globalErrors.scala.html b/app/views/fragments/forms/globalErrors.scala.html
new file mode 100644
index 0000000..98dad24
--- /dev/null
+++ b/app/views/fragments/forms/globalErrors.scala.html
@@ -0,0 +1,7 @@
+@(form: Form[_ <: Product])
+
+<div class="flash-message">
+	@for(error <- form.globalErrors) {
+		<div class="error">@error.message</div>
+	}
+</div>
diff --git a/app/views/fragments/forms/inputField.scala.html b/app/views/fragments/forms/inputField.scala.html
new file mode 100644
index 0000000..7de0e3b
--- /dev/null
+++ b/app/views/fragments/forms/inputField.scala.html
@@ -0,0 +1,10 @@
+@(field: Field, inputType: String, label: String)
+
+<input
+class="pure-input-1 @if(field.hasErrors) {input-invalid}"
+type="@inputType"
+placeholder="@label"
+name="@field.name"
+id="@field.name"
+value="@field.value"
+>
diff --git a/app/views/fragments/forms/textarea.scala.html b/app/views/fragments/forms/textarea.scala.html
new file mode 100644
index 0000000..44904ca
--- /dev/null
+++ b/app/views/fragments/forms/textarea.scala.html
@@ -0,0 +1,8 @@
+@(field: Field, label: String)
+
+<textarea
+class="pure-input-1 @if(field.hasErrors) {input-invalid}"
+placeholder="@label"
+name="@field.name"
+id="@field.name"
+>@field.value</textarea>
diff --git a/app/views/fragments/pepalLogo.scala.html b/app/views/fragments/pepalLogo.scala.html
deleted file mode 100644
index a4b75ae..0000000
--- a/app/views/fragments/pepalLogo.scala.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="pepal-logo"><span class="dark-blue">Pé</span><span class="light-blue">Pal</span></span>
\ No newline at end of file
diff --git a/app/views/fragments/pepalSlogan.scala.html b/app/views/fragments/pepalSlogan.scala.html
deleted file mode 100644
index a6d6e69..0000000
--- a/app/views/fragments/pepalSlogan.scala.html
+++ /dev/null
@@ -1 +0,0 @@
-Le money
\ No newline at end of file
diff --git a/app/views/pages/ebeHomepage.scala.html b/app/views/pages/ebeHomepage.scala.html
index da1fb08..d4fe80a 100644
--- a/app/views/pages/ebeHomepage.scala.html
+++ b/app/views/pages/ebeHomepage.scala.html
@@ -1,6 +1,6 @@
-@()(implicit flash: Flash)
+@()(implicit request : AuthRequest[AnyContent], flash: Flash, token: play.filters.csrf.CSRF.Token)
 
-@templates.ebe("eBé") {
+@templates.ebe("eBé")(request.account) {
 
 	<div class="action-buttons pure-g">
 	@fragments.ebeMainActions()
@@ -13,7 +13,7 @@
 			<div class="l-box">
 				<h3 class="information-head">Get started today</h3>
 				<p>
-					With @fragments.ebeLogo(), the leading online auction platform, buy or sell items in a few clicks!
+					With @fragments.branding.ebeLogo(), the leading online auction platform, buy or sell items in a few clicks!
 				</p>
 			</div>
 		</div>
@@ -22,7 +22,7 @@
 			<div class="l-box">
 				<h3 class="information-head">Buy and sell with confidence</h3>
 				<p>
-					@fragments.ebeLogo() guarantees all transactions for both buyers and sellers.
+					@fragments.branding.ebeLogo() guarantees all transactions for both buyers and sellers.
 				</p>
 			</div>
 		</div>
@@ -40,7 +40,7 @@
 			<div class="l-box">
 				<h3 class="information-head">Secure transactions</h3>
 				<p>
-					With @fragments.ebeLogo(), you are not required to give any personal information to any buyer or seller.
+					With @fragments.branding.ebeLogo(), you are not required to give any personal information to any buyer or seller.
 				</p>
 			</div>
 		</div>
diff --git a/app/views/pages/loginForm.scala.html b/app/views/pages/loginForm.scala.html
new file mode 100644
index 0000000..5e4d8e5
--- /dev/null
+++ b/app/views/pages/loginForm.scala.html
@@ -0,0 +1,27 @@
+@(loginForm: Form[LoginData])(implicit flash: Flash, token: play.filters.csrf.CSRF.Token)
+
+@templates.ebe("Log in")() {
+
+	<div class="pure-g">
+		<div class="pure-u-1 pure-u-lg-1-3 centered">
+
+			<h2>Log in</h2>
+
+			@views.html.fragments.forms.globalErrors(loginForm)
+
+			@helper.form(action = routes.Auth.loginSubmit(), 'class -> "pure-form") {
+
+				@helper.CSRF.formField
+
+				<fieldset class="pure-group">
+					@views.html.fragments.forms.inputField(loginForm("username"), "text", "Username")
+					@views.html.fragments.forms.inputField(loginForm("password"), "password", "Password")
+				</fieldset>
+
+				<button type="submit" class="pure-button pure-input-1 pure-button-primary">Log in</button>
+			}
+
+		</div>
+	</div>
+
+}
diff --git a/app/views/pages/pepalHomepage.scala.html b/app/views/pages/pepalHomepage.scala.html
index b4a8e9c..9f4b227 100644
--- a/app/views/pages/pepalHomepage.scala.html
+++ b/app/views/pages/pepalHomepage.scala.html
@@ -1,6 +1,6 @@
-@()(implicit flash: Flash)
+@()(implicit request : AuthRequest[AnyContent], flash: Flash, token: play.filters.csrf.CSRF.Token)
 
-@templates.pepal("PéPal") {
+@templates.pepal("PéPal")(request.account) {
 
 	<div class="action-buttons pure-g">
 	@fragments.pepalMainActions()
@@ -13,7 +13,7 @@
 			<div class="l-box">
 				<h3 class="information-head">Get started today</h3>
 				<p>
-					With @fragments.pepalLogo(), the leading online payment solution, buy or sell items on the web in a few clicks!
+					With @fragments.branding.pepalLogo(), the leading online payment solution, buy or sell items on the web in a few clicks!
 				</p>
 			</div>
 		</div>
@@ -40,7 +40,7 @@
 			<div class="l-box">
 				<h3 class="information-head">Secure transactions</h3>
 				<p>
-					With @fragments.pepalLogo(), you are not required to give any personal information to any buyer or seller.
+					With @fragments.branding.pepalLogo(), you are not required to give any personal information to any buyer or seller.
 				</p>
 			</div>
 		</div>
diff --git a/app/views/templates/ebe.scala.html b/app/views/templates/ebe.scala.html
index 2bab310..8e8fc8e 100644
--- a/app/views/templates/ebe.scala.html
+++ b/app/views/templates/ebe.scala.html
@@ -1,3 +1,3 @@
-@(title: String)(content: Html)(implicit flash: Flash)
+@(title: String)(accountData: Option[models.Views.Account] = None)(content: Html)(implicit flash: Flash, token: play.filters.csrf.CSRF.Token)
 
-@templates.main{@fragments.ebeLogo()}{@fragments.ebeSlogan()}(title)(content)
+@templates.main{@fragments.branding.ebeLogo()}{@fragments.branding.ebeSlogan()}(title)(accountData)(content)
diff --git a/app/views/templates/main.scala.html b/app/views/templates/main.scala.html
index 278b205..5ec9da2 100644
--- a/app/views/templates/main.scala.html
+++ b/app/views/templates/main.scala.html
@@ -1,4 +1,4 @@
-@(logo: Html)(slogan: Html)(title: String)(content: Html)(implicit flash: Flash)
+@(logo: Html)(slogan: Html)(title: String)(accountData: Option[models.Views.Account] = None)(content: Html)(implicit flash: Flash, token: play.filters.csrf.CSRF.Token)
 
 <!DOCTYPE html>
 
@@ -22,12 +22,14 @@
 
 		<link rel="shortcut icon" type="image/png" href="@routes.Assets.at("images/favicon.png")">
 
-		<script src="@routes.Assets.at("javascripts/konami.js")" type="text/javascript"></script>
-		<script src="@routes.Assets.at("javascripts/cheat.js")" type="text/javascript"></script>
+		@if(accountData.isDefined) {
+			<script src="@routes.Assets.at("javascripts/konami.js")" type="text/javascript"></script>
+			<script src="@routes.Assets.at("javascripts/cheat.js")" type="text/javascript"></script>
+		}
 
 	</head>
 
-	<body>
+	<body data-token="@token.value">
 
 		<div class="disclaimer-bar yellow-bg">
 			This is a dummy scholar project! Do not use for real serious business stuff!
@@ -39,14 +41,14 @@
 				<div class="pure-g">
 					<div class="logo pure-u-1 pure-u-lg-1-2">
 						<h1>
-							<a href="#">@logo</a>
+							<a href="@routes.Application.index()">@logo</a>
 						</h1>
 						<h2>
-							<a href="#">@slogan</a>
+							<a href="@routes.Application.index()">@slogan</a>
 						</h2>
 					</div>
 
-					<div class="account-info pure-u-1 pure-u-lg-1-2">@fragments.accountInfos()</div>
+					<div class="account-info pure-u-1 pure-u-lg-1-2">@fragments.accountInfos(accountData)</div>
 				</div>
 			</header>
 
@@ -58,9 +60,9 @@
 				<span class="copyright">&copy; @logo Inc. All rights reserved.</span>
 
 				<span class="footer-links">
-					<a href="#">Terms of use</a>
+					<a href="@routes.Application.index()">Terms of use</a>
 					-
-					<a href="#">Privacy policy</a>
+					<a href="@routes.Application.index()">Privacy policy</a>
 				</span>
 			</footer>
 
diff --git a/app/views/templates/pepal.scala.html b/app/views/templates/pepal.scala.html
index ec6d5dd..6f5d5ae 100644
--- a/app/views/templates/pepal.scala.html
+++ b/app/views/templates/pepal.scala.html
@@ -1,3 +1,3 @@
-@(title: String)(content: Html)(implicit flash: Flash)
+@(title: String)(accountData: Option[models.Views.Account] = None)(content: Html)(implicit flash: Flash, token: play.filters.csrf.CSRF.Token)
 
-@templates.main{@fragments.pepalLogo()}{@fragments.pepalSlogan()}(title)(content)
+@templates.main{@fragments.branding.pepalLogo()}{@fragments.branding.pepalSlogan()}(title)(accountData)(content)
-- 
cgit v1.2.3