Integrate welcome page

* route handler for /welcome
* update + run build-landing-page.sh
This commit is contained in:
Teemu Patja 2017-11-01 17:54:02 +02:00
parent a76b5464d4
commit cf797c71b8
No known key found for this signature in database
GPG Key ID: F5B7035E6580FD4C
3 changed files with 7 additions and 6 deletions

View File

@ -4,8 +4,6 @@
echo "Copying index.html, dest, and assets to resources/{templates,public}." echo "Copying index.html, dest, and assets to resources/{templates,public}."
cp static_langing_page/index.html resources/templates/index.html cp static_langing_page/index.html resources/templates/index.html
cp static_langing_page/welcome-dev.html resources/templates/welcome-dev.html
cp -r static_langing_page/dest/ resources/public/dest/ cp -r static_langing_page/dest/ resources/public/dest/
cp -r static_langing_page/assets/ resources/public/assets/ cp -r static_langing_page/assets/ resources/public/assets/

View File

@ -224,14 +224,12 @@ a {
border-radius: 10px; border-radius: 10px;
z-index: 900; z-index: 900;
max-width: 1200px; } max-width: 1200px; }
.header-welcome { .header-welcome {
margin: 0; margin: 0;
border-radius: 0; border-radius: 0;
box-shadow: 0; box-shadow: 0;
max-width: inherit; max-width: inherit;
padding-bottom: 0; } padding-bottom: 0; } }
}
.header__inner { .header__inner {
display: -ms-flexbox; display: -ms-flexbox;

View File

@ -25,9 +25,14 @@
(defn landing-page [] (defn landing-page []
(layout/render "index.html" {:authorize-url (github/signup-authorize-url)})) (layout/render "index.html" {:authorize-url (github/signup-authorize-url)}))
(defn welcome-page []
(layout/render "welcome-dev.html"))
(defroutes home-routes (defroutes home-routes
(GET "/app" {{user :identity} :session} (GET "/app" {{user :identity} :session}
(home-page user)) (home-page user))
(GET "/welcome" {session :session}
(welcome-page))
(GET "/" {session :session} (GET "/" {session :session}
(landing-page)) (landing-page))
(GET "/logout" {session :session} (GET "/logout" {session :session}