1
1
mirror of https://github.com/aelve/guide.git synced 2024-11-22 03:12:58 +03:00

Merge branch 'master'

into front-ps
This commit is contained in:
Jens Krause 2017-08-13 11:28:02 +03:00
commit 60028da1ef
No known key found for this signature in database
GPG Key ID: 3B2FAFBCEFA5906D
2 changed files with 17 additions and 3 deletions

14
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,14 @@
image: registry.gitlab.frielforreal.com/friel/haskellstack:latest
cache:
untracked: true
paths:
- .stack-work
stages:
- build
build:
stage: build
script:
- stack build

View File

@ -321,9 +321,9 @@ guideApp waiMetrics = do
if isJust user
then Spock.redirect "auth/logout"
else Spock.redirect "auth/login"
Spock.getpost "login" $ authRedirect "/" loginAction
Spock.get "logout" logoutAction
Spock.getpost "register" $ authRedirect "/" signupAction
Spock.getpost (authRoute <//> "login") $ authRedirect "/" loginAction
Spock.get (authRoute <//> "logout") logoutAction
Spock.getpost (authRoute <//> "register") $ authRedirect "/" signupAction
loginAction :: GuideAction ctx ()
loginAction = do