@@ -46,7 +46,7 @@

 (defun make-submission (headline url &key (approved ""))

   (make-instance 'submission :headline headline :url url :approved approved

-                 :date ))

+                 :date (current-date-string)))

 (defun submission-alist (submission)

   `(("headline". ,(s-headline submission))

@@ -89,18 +89,18 @@

 (setf (ningle:route *app* "/")

       (i-lambda (params)

         (ningle.context:with-context-variables (session)

-           (handler-case

-             (cl-oid-connect.utils:ensure-logged-in

-               (cl-oid-connect.utils:redirect-if-necessary session

-                 (render-mustache #p"static/index.mustache.html"

-                                  `((:links . ,(mapcar #'submission-alist *submissions*))

-                                    (:user . ,(user-alist (gethash :app-user session)))))))

-             (cl-oid-connect.utils:user-not-logged-in (c) (render-mustache #p"static/index.mustache.html"

-                                                                           nil))))))

+          (handler-case

+            (cl-oid-connect.utils:ensure-logged-in

+              (cl-oid-connect.utils:redirect-if-necessary session

+                (render-mustache #p"static/index.mustache.html"

+                                 `((:links . ,(mapcar #'submission-alist *submissions*))

+                                   (:user . ,(user-alist (gethash :app-user session)))))))

+            (cl-oid-connect.utils:user-not-logged-in (c) (render-mustache #p"static/index.mustache.html"

+                                                                          nil))))))

 (defun submit (params)

   (awhen (alist-submission params :nil-if-exists t)

-    (format t "~s <<<" it)

+    ;(format t "~s <<<" it)

     (push it *submissions*)))

 (defun get-by-key (headline url)

@@ -126,14 +126,14 @@

       (i-lambda (params)

         `(200 ()

           (,(cl-who:with-html-output-to-string (s)

-             (:html

-               (:head

-                 (:title "Login")

-                 (:link :rel "stylesheet" :href "/static/css/login.css"))

-              (:body

-                (:h1 "In Angulis")

-                (:div :class "login-buttons"

-                 (:a :class "facebook" :href "/login/facebook" "Login With Facebook")))))))))

+              (:html

+                (:head

+                  (:title "Login")

+                  (:link :rel "stylesheet" :href "/static/css/login.css"))

+                (:body

+                  (:h1 "In Angulis")

+                  (:div :class "login-buttons"

+                   (:a :class "facebook" :href "/login/facebook" "Login With Facebook")))))))))

 (cl-oid-connect:def-route ("/logout" (params) :app *app*)

   (declare (ignore params))

@@ -18,6 +18,7 @@ body {

   font-size: 14px;

   font-family: 'Alegreya Sans', sans-serif;

   padding-bottom: 6em;

+  margin-top: -1.5em;

 }

 h1 {

@@ -167,9 +168,11 @@ ul#submissions li {

 ul#submissions li.in-progress {

   position: relative;

   margin-top: 1.5em;

-  font-size: 0.9em;

+  font-size: 1.1em;

   background: #eee;

   padding: 1em;

+  text-shadow: 0em 0em 0.2em white;

+  letter-spacing: 1px;

 }

 ul#submissions li.submission:first-child {

@@ -218,17 +221,18 @@ a:active, a:hover { text-decoration: underline; }

   border-radius: 0.2em;

   border: 3px double #888;

   position: absolute;

-  font-size: 0.9em;

-  right: 1em;

-  top: 1em;

+  right: 0em;

+  top: 0em;

   text-align: center;

+  text-shadow: 0em 0em 0.2em white;

+  border-bottom-left-radius: 3.5em;

 }

 .userinfo .user {

   font-size: 1.5em;

 }

 .userinfo .email {

-  color: #888;

+  color: #666;

 }

 body > div.userinfo > a#logout {

   width: 100%;

@@ -17,15 +17,24 @@

     </div>

     {{/user}}

     <main id="app">

-    <form action="/murmuro" id="submission" name="submission" method="POST"  v-on:submit="submit">

+    <form action="/murmuro" id="submission" name="submission" method="POST">

       <input type="text" name="headline" placeholder="Headline" v-model="newLink.headline">

       <input type="text" name="url" placeholder="URL" v-model="newLink.url">

       <input type="submit" value="Go" title='Murmuro'>

     </form>

     <ul id="submissions">

+      <li class="in-progress hidden" v-if="newLink.headline !== undefined || newLink.url !== undefined">

+        <a href="#">

+          {{=<% %>=}}

+          <h2>{{ newLink.headline }}</h2>

+          <p>{{ newLink.url }}</p>

+          <%={{ }}=%>

+        </a>

+      </li>

+

       {{#links}}

-      <li class="submission" v-for="link in links">

+      <li class="submission">

         {{#user}}

         {{#moderator}}

         <div class="moderation">

@@ -49,29 +58,27 @@

     <script src="/static/js/jquery.js"></script>

     <script src="/static/js/jquery.formalize.js"></script>

-<!--

-   -    <script src="/static/js/vue.js"></script>

-   -    <script type="text/javascript">

-   -new Vue({

-   -  el: '#app',

-   -

-   -  methods: {

-   -    submit: function(e) {

-   -      e.preventDefault();

-   -      this.links.unshift(0,Object.create(this.newLink));

-   -      this.newLink = {};

-   -      return false;

-   -    }

-   -  },

-   -

-   -  data: {

-   -    newLink: {

-   -    },

-   -    links: [ {{ jsondata }} ]

-   -  }

-   -});

-   -    </script>

-   -->

+    <script src="/static/js/vue.js"></script>

+    <script type="text/javascript">

+      new Vue({

+        el: '#app',

+

+         methods: {

+             submit: function(e) {

+                 e.preventDefault();

+                 this.links.unshift(0,Object.create(this.newLink));

+                 this.newLink = {};

+                 return false;

+               }

+           },

+

+         data: {

+             newLink: {

+               },

+           }

+      });

+      jQuery('.hidden.in-progress').removeClass('hidden');

+    </script>

   </body>

 </html>