diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/application.conf | 4 | ||||
-rw-r--r-- | conf/routes | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/conf/application.conf b/conf/application.conf index 72c25b7..17a1896 100644 --- a/conf/application.conf +++ b/conf/application.conf | |||
@@ -45,8 +45,8 @@ db.default.url=${?DATABASE_URL} | |||
45 | # db.default.password="" | 45 | # db.default.password="" |
46 | 46 | ||
47 | slick.default="models.*" | 47 | slick.default="models.*" |
48 | slick.profile="scala.slick.driver.PostgresDriver" | 48 | #slick.profile="scala.slick.driver.PostgresDriver" |
49 | slick.profile=${?SLICK_PROFILE} | 49 | #slick.profile=${?SLICK_PROFILE} |
50 | 50 | ||
51 | # Evolutions | 51 | # Evolutions |
52 | # ~~~~~ | 52 | # ~~~~~ |
diff --git a/conf/routes b/conf/routes index cf3f5ae..095c886 100644 --- a/conf/routes +++ b/conf/routes | |||
@@ -3,17 +3,19 @@ | |||
3 | # ~~~~ | 3 | # ~~~~ |
4 | 4 | ||
5 | # Dev | 5 | # Dev |
6 | GET /ebe controllers.Application.ebe | 6 | GET /ebe controllers.Application.ebe |
7 | GET /pepal controllers.Application.pepal | 7 | GET /pepal controllers.Application.pepal |
8 | 8 | ||
9 | # Home page | 9 | # Home page |
10 | GET / controllers.Application.index | 10 | GET / controllers.Application.index |
11 | GET /terms controllers.Application.index | 11 | GET /terms controllers.Application.index |
12 | GET /privacy controllers.Application.index | 12 | GET /privacy controllers.Application.index |
13 | 13 | ||
14 | ## User account | 14 | # User account |
15 | #GET /login controllers.Application.index | 15 | GET /login controllers.Auth.login |
16 | #POST /login controllers.Application.index | 16 | POST /login controllers.Auth.loginSubmit |
17 | |||
18 | GET /logout controllers.Auth.logout | ||
17 | # | 19 | # |
18 | #GET /signup controllers.Application.index | 20 | #GET /signup controllers.Application.index |
19 | #POST /signup controllers.Application.index | 21 | #POST /signup controllers.Application.index |
@@ -45,7 +47,7 @@ GET /privacy controllers.Application.index | |||
45 | #POST /sell controllers.Application.index | 47 | #POST /sell controllers.Application.index |
46 | 48 | ||
47 | # Cheat console | 49 | # Cheat console |
48 | POST /console controllers.Console.console | 50 | POST /console controllers.Console.console |
49 | 51 | ||
50 | # Map static resources from the /public folder to the /assets URL path | 52 | # Map static resources from the /public folder to the /assets URL path |
51 | GET /assets/*file controllers.Assets.at(path="/public", file) | 53 | GET /assets/*file controllers.Assets.at(path="/public", file) |