aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/controllers/Account.scala6
-rw-r--r--app/controllers/Profile.scala4
-rw-r--r--app/views/fragments/accountInfos.scala.html2
-rw-r--r--app/views/fragments/ebeMainActions.scala.html2
-rw-r--r--app/views/fragments/pepalMainActions.scala.html4
-rw-r--r--app/views/pages/account/accountSummary.scala.html4
-rw-r--r--conf/routes19
7 files changed, 28 insertions, 13 deletions
diff --git a/app/controllers/Account.scala b/app/controllers/Account.scala
index 625ab2d..b705653 100644
--- a/app/controllers/Account.scala
+++ b/app/controllers/Account.scala
@@ -31,4 +31,10 @@ object Account extends Controller {
31 } 31 }
32 } 32 }
33 33
34 def deposit = TODO
35
36 def withdraw = TODO
37
38 def transfer = TODO
39
34} 40}
diff --git a/app/controllers/Profile.scala b/app/controllers/Profile.scala
index 8181106..0009628 100644
--- a/app/controllers/Profile.scala
+++ b/app/controllers/Profile.scala
@@ -138,4 +138,8 @@ object Profile extends Controller {
138 } 138 }
139 } 139 }
140 140
141 def viewProfile(userUuid: String) = TODO
142
143 def editProfile = TODO
144
141} 145}
diff --git a/app/views/fragments/accountInfos.scala.html b/app/views/fragments/accountInfos.scala.html
index 60c3583..105fc5a 100644
--- a/app/views/fragments/accountInfos.scala.html
+++ b/app/views/fragments/accountInfos.scala.html
@@ -12,7 +12,7 @@
12 @account.equity € 12 @account.equity €
13 </a> 13 </a>
14 14
15 <a class="pure-button" href="#"> 15 <a class="pure-button" href="@routes.Profile.editProfile()">
16 <i class="fa fa-user fa-lg"></i> 16 <i class="fa fa-user fa-lg"></i>
17 @account.username 17 @account.username
18 </a> 18 </a>
diff --git a/app/views/fragments/ebeMainActions.scala.html b/app/views/fragments/ebeMainActions.scala.html
index 0043321..9976d17 100644
--- a/app/views/fragments/ebeMainActions.scala.html
+++ b/app/views/fragments/ebeMainActions.scala.html
@@ -1,5 +1,5 @@
1<div class="pure-u-1 pure-u-lg-1-2"> 1<div class="pure-u-1 pure-u-lg-1-2">
2 <a class="pure-button blue-bg" href="#"> 2 <a class="pure-button blue-bg" href="@routes.Sale.sell(null)">
3 <i class="fa fa-gavel fa-5x"></i> 3 <i class="fa fa-gavel fa-5x"></i>
4 <span>Sell</span> 4 <span>Sell</span>
5 </a> 5 </a>
diff --git a/app/views/fragments/pepalMainActions.scala.html b/app/views/fragments/pepalMainActions.scala.html
index 0e614a6..9c874ba 100644
--- a/app/views/fragments/pepalMainActions.scala.html
+++ b/app/views/fragments/pepalMainActions.scala.html
@@ -1,12 +1,12 @@
1<div class="pure-u-1 pure-u-lg-1-2"> 1<div class="pure-u-1 pure-u-lg-1-2">
2 <a class="pure-button dark-blue-bg" href="#"> 2 <a class="pure-button dark-blue-bg" href="@routes.Account.deposit()">
3 <i class="fa fa-download fa-5x"></i> 3 <i class="fa fa-download fa-5x"></i>
4 <span>Deposit</span> 4 <span>Deposit</span>
5 </a> 5 </a>
6</div> 6</div>
7 7
8<div class="pure-u-1 pure-u-lg-1-2"> 8<div class="pure-u-1 pure-u-lg-1-2">
9 <a class="pure-button light-blue-bg" href="#"> 9 <a class="pure-button light-blue-bg" href="@routes.Account.transfer()">
10 <i class="fa fa-share fa-5x"></i> 10 <i class="fa fa-share fa-5x"></i>
11 <span>Send money</span> 11 <span>Send money</span>
12 </a> 12 </a>
diff --git a/app/views/pages/account/accountSummary.scala.html b/app/views/pages/account/accountSummary.scala.html
index 3a10d3d..4b3a263 100644
--- a/app/views/pages/account/accountSummary.scala.html
+++ b/app/views/pages/account/accountSummary.scala.html
@@ -37,7 +37,7 @@
37 37
38 <div class="pure-g wallet-actions"> 38 <div class="pure-g wallet-actions">
39 <div class="pure-u-1 pure-u-lg-1-1"> 39 <div class="pure-u-1 pure-u-lg-1-1">
40 <a class="pure-button" href="#"> 40 <a class="pure-button" href="@routes.Account.deposit()">
41 <i class="fa fa-download"></i> 41 <i class="fa fa-download"></i>
42 Deposit 42 Deposit
43 </a> 43 </a>
@@ -46,7 +46,7 @@
46 <br><br> 46 <br><br>
47 47
48 <div class="pure-u-1 pure-u-lg-1-1"> 48 <div class="pure-u-1 pure-u-lg-1-1">
49 <a class="pure-button" href="#HAHAHAHA"> 49 <a class="pure-button" href="@routes.Account.withdraw()">
50 <i class="fa fa-upload"></i> 50 <i class="fa fa-upload"></i>
51 Withdraw 51 Withdraw
52 </a> 52 </a>
diff --git a/conf/routes b/conf/routes
index 06081d1..c245163 100644
--- a/conf/routes
+++ b/conf/routes
@@ -17,17 +17,22 @@ GET /logout controllers.Authentication.logout
17GET /signup controllers.Profile.signup 17GET /signup controllers.Profile.signup
18POST /signup controllers.Profile.signupSubmit 18POST /signup controllers.Profile.signupSubmit
19 19
20#GET /profile controllers.Application.index 20GET /account controllers.Profile.editProfile
21#POST /profile controllers.Application.index 21POST /account controllers.Profile.editProfile
22
23GET /profile/:uuid controllers.Profile.viewProfile(uuid)
22 24
23# Internal wallet and transactions (Pépal) 25# Internal wallet and transactions (Pépal)
24GET /account controllers.Account.summary 26GET /summary controllers.Account.summary
27
28GET /deposit controllers.Account.deposit
29POST /deposit controllers.Account.deposit
25 30
26#GET /deposit controllers.Application.index 31GET /withdraw controllers.Account.withdraw
27#POST /deposit controllers.Application.index 32POST /withdraw controllers.Account.withdraw
28 33
29#GET /withdraw controllers.Application.index 34GET /transfer controllers.Account.transfer
30#POST /withdraw controllers.Application.index 35POST /transfer controllers.Account.transfer
31 36
32# Items and sales (eBé) 37# Items and sales (eBé)
33GET /sales controllers.Sale.sales 38GET /sales controllers.Sale.sales