From b5984b43ec1047b18843c1e5a6aba677edec0554 Mon Sep 17 00:00:00 2001
From: Sam Dodrill <xena@yolo-swag.com>
Date: Thu, 8 Jan 2015 17:51:20 -0800
Subject: [PATCH] Use flashes

---
 app.moon               |  2 +-
 controllers/users.moon |  1 +
 layout/bootstrap.moon  |  5 +++++
 static/css/main.css    | 12 +++++++++++-
 views/index.moon       |  8 ++------
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app.moon b/app.moon
index 9658da1..37e1813 100644
--- a/app.moon
+++ b/app.moon
@@ -16,5 +16,5 @@ class App extends lapis.Application
       @session.flash = nil
 
   [index: "/"]: =>
-    @user = @session.user
+    @name = @session.name
     render: true
diff --git a/controllers/users.moon b/controllers/users.moon
index cd4b583..fe5021b 100644
--- a/controllers/users.moon
+++ b/controllers/users.moon
@@ -81,6 +81,7 @@ class User extends lapis.Application
           token: encoding.encode_base64 encoding.hmac_sha1(@params.email, os.time!)
         }
 
+        @session.token = encoding.encode_base64 token.token
         @title = "Login successful"
 
         return "Hi " .. user.name
diff --git a/layout/bootstrap.moon b/layout/bootstrap.moon
index 8db6df7..6c02865 100644
--- a/layout/bootstrap.moon
+++ b/layout/bootstrap.moon
@@ -69,5 +69,10 @@ class Layout extends Widget
 
       body ->
         @header!
+
+        if @flash
+          div class: "flash", ->
+            text @flash
+
         @body!
         @footer!
diff --git a/static/css/main.css b/static/css/main.css
index 3b13298..b7619eb 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -1,5 +1,5 @@
 body {
-  padding-top: 50px;
+  padding-top: 60px;
 }
 
 html {
@@ -15,3 +15,13 @@ html {
   height: 50px;
   background-color: #f5f5f5;
 }
+
+.flash {
+  background: #cee5F5;
+  padding: 0.5em;
+  border: 1px solid #aacbe2;
+}
+.error {
+  background: #f0d6d6;
+  padding: 0.5em;
+}
diff --git a/views/index.moon b/views/index.moon
index beb4e56..a04ac0e 100644
--- a/views/index.moon
+++ b/views/index.moon
@@ -6,9 +6,5 @@ class Index extends Widget
     div class: "body", ->
       text "Welcome to my site!"
 
-    if @flash
-      p class: "flash", ->
-        text @flash
-
-    if @user
-      h2 "I think you are UID #{@user}"
+    if @name
+      h2 "I think you are #{@name}"