@@ -1,3 +1,5 @@

 - Make get-dao-for leave id unbound in rss-feeds

-- Implement sorting by pub date, rather than by id --- or someting

+- Implement sorting by pub date, rather than by id --- or something

+- Switch html to spinneret

+

@@ -1 +1 @@

-Subproject commit 15a9ca8dd67e8033bd62b559ffee86606fc67e9d

+Subproject commit f693da364ea32b34bdd2a3dcce442d565ea8a1d5

@@ -1,30 +1,22 @@

 (in-package :cl-user)

 (ql:quickload :clack-middleware-postmodern)

-(ql:quickload :fwoar.lisputils)

-(ql:quickload :araneus)

-(ql:quickload :cl-markup)

-(ql:quickload :colors)

-(ql:quickload :lquery)

-(ql:quickload :plump)

-(ql:quickload :postmodern)

-(ql:quickload :sxql)

-(ql:quickload :clack-middleware-postmodern)

-(ql:quickload :dexador)

-(ql:quickload :spinneret)

-(ql:quickload :ubiquitous)

-(ql:quickload :iterate)

-(ql:quickload :jonathan)

-(ql:quickload :cl-actors)

-(ql:quickload :simple-tasks)

-(ql:quickload :cl-oid-connect)

-(ql:quickload :fwoar.lisputils)

+(ql:quickload '(:fwoar.lisputils :araneus :cl-markup :colors :lquery :plump :postmodern

+                :sxql :clack-middleware-postmodern :dexador :spinneret :ubiquitous :iterate

+                :jonathan :cl-actors :simple-tasks :cl-oid-connect :fwoar.lisputils))

 (declaim (optimize (speed 0) (safety 3) (debug 2)))

-(push (cons "application" "rdf+xml") drakma:*text-content-types*)

-(push (cons "application" "rss+xml") drakma:*text-content-types*)

-(push (cons "text" "rss+xml") drakma:*text-content-types*)

+(define-modify-macro aconsf (key value)

+                     (lambda (place k v)

+                       (acons k v place)))

+

+(aconsf drakma:*text-content-types*

+        "application" "rdf+xml")

+(aconsf drakma:*text-content-types*

+        "application" "rss+xml")

+(aconsf drakma:*text-content-types*

+        "text" "rss+xml")

 ;(load "utils.lisp")

 (load "package.lisp")

@@ -46,7 +38,6 @@

 (defparameter *app* (make-instance 'ningle:<app>))

-

 (handler-bind ((warning #'sb-ext::muffle-warning))

   (let* ((feed-urls (ubiquitous:value 'feed 'urls))

          (plump-parser:*tag-dispatchers* plump:*xml-tags*)

@@ -67,60 +58,6 @@

   `(let ((plump:*tag-dispatchers* plump:*xml-tags*))

      ,@body))

-(defmacro def-markup (name (&rest args) &body body)

-  `(defmacro ,name ,args

-     (alexandria:once-only ,args

-      `(cl-markup:markup

-         ,,@body))))

-

-(defmacro item-markup (item)

-  (alexandria:once-only (item)

-    `(let ((,item ,item))

-       (cl-markup:markup

-         (:li :class "link closed"

-          (:section :class "link-header"

-           (:h4 (rss-item-title ,item))

-           (:p :class "link-info"

-            (:a :target "_blank" :href (rss-item-link ,item)

-             (:span :class "link-url" (rss-item-link ,item)))

-            (:span :class "link-date") (rss-item-pub-date ,item)))

-          (:section :class "link-content"

-           (:div

-             (cl-markup:raw (rss-item-description-raw ,item)))))))))

-

-(defmacro feed-markup (feed-v fc-v)

-  (alexandria:with-gensyms (feed fc)

-    `(let ((,feed ,feed-v)

-           (,fc ,fc-v))

-       (cl-markup:markup

-         (:section :class "feed closed" :id (format nil "feed-~a" ,fc)

-          (:section :class "feed-header"

-           (:h2 (rss-feed-title ,feed))

-           (:h3 (rss-feed-description ,feed)))

-          (:ul :class "post-list"

-           (:li :class "link closed" :ng-repeat (format nil "item in feeds.result[~d].items" (- ,fc 1))

-            (:section :class "link-header"

-             (:h4 "{{item.title}}")

-             (:p :class "link-info"

-              (:a :target "_blank" :ng-href "{{item.link}}" :class "link-url" "{{item.link}}")

-              (:span :class "link-date" "{{item.date}}")))

-            (:section :class "link-content"

-             (:div

-               "{{item.description}}")))

-           ))))))

-

-(defmacro feedlist-markup (feedlist)

-  (alexandria:once-only (feedlist)

-    `(cl-markup:markup*

-       `(:ul :class "menu"

-         ,@(loop for feed across ,feedlist

-                 count feed into feed-count

-                 collect

-                 (list :li

-                       (list :a

-                             :href (format nil "#feed-~a" feed-count)

-                             (rss-feed-title feed))))))))

-

 (load "base-template.lisp")

 (defmacro defun-from-value (name value)

@@ -147,41 +84,18 @@

               (multiple-value-bind (added-feed dao-feed) (store-feed doc)

                 (subscribe-to-feed uid (slot-value dao-feed 'id))

                 (when api

-                  (setf result `(200 (:Content-Type "application/json") ,(jsonapi-encoder t added-feed))))))

+                  (setf result `(200 (:Content-Type "application/json")

+                                 (,(jsonapi-encoder t added-feed)))))))

             (cl-postgres-error:unique-violation

               ()

               (when api

                 (setf result

-                      `(400 () ',(jsonapi-encoder nil "Feed already saved"))))))))

+                      `(400 () (,(jsonapi-encoder nil "Feed already saved")))))))))

       result)))

 ;;; TODO: add needs to return the new content, so that angular can append it

 (defparameter *userasdfs* nil)

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

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

-    (let* ((user-info (gethash :app-user session))

-           (*feeds* (if user-info (deserialize user-info) *feeds*)))

-      (setf *userasdfs* user-info)

-      `(200 (:content-type "application/json" :cache-control "private, max-age=300")

-        (,(jsonapi-encoder t *feeds*))))))

-

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

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

-    (cl-oid-connect:require-login

-      (let* ((feedlist-s (cdr (assoc :feeds params)))

-             (feedlist (mapcar #'parse-integer (split-sequence:split-sequence #\SPACE feedlist-s)))

-             (*feeds* (gethash :feeds session *feeds*))

-             (*feeds* (make-array (list (length feedlist))

-                                  :initial-contents (loop for x in feedlist

-                                                          collect (elt *feeds* x)))))

-        (base-template-f)))))

-

-

-

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

-  (base-template-f t))

-

 #|(cl-oid-connect:require-login

     ))|#

@@ -276,77 +190,28 @@

         (declare (ignorable main-right-margin)) ; TODO: use this!!!

         `(200 (:content-type "text/css") (,ss))))))

-(define-view dark-css (params)

-  (colors:let-palette (make-instance 'colors:palette)

-    (eval '(get-theme-css))))

-

-(define-view light-css (params)

-  (colors:let-palette (colors:invert-palette (make-instance 'colors:palette))

-    (eval '(get-theme-css))))

-

-(define-view css (colorscheme)

-  (string-case:string-case (colorscheme :default "")

-    ("light" (view 'light-css colorscheme))

-    ("dark" (view 'dark-css colorscheme))))

-

-(define-view userinfo (params)

-  (declare (ignore params))

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

-    (cl-oid-connect:require-login

-      (cl-oid-connect::with-endpoints (gethash :endpoint-schema session)

-        `(200

-          (:content-type "application/json")

-          (,(cl-json:encode-json-to-string

-             (gethash :userinfo session))))))))

-

-(define-controller css (params)

-  (cl-oid-connect.utils:assoc-cdr :scheme params))

-

-(define-controller id (params)

-  params)

-

-(define-view redirect (destination)

-  `(302 (:location ,destination)))

-

-(define-view login (params)

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

-    (:html

-      (:head (:title "Login"))

-      (:body

-        (:div

-          :class "login-button facebook"

-          (:a :href "/login/facebook" "Facebook"))

-        (:div

-          :class "login-button google"

-          (:a :href "/login/google" "Google"))))))

-

-(define-controller logout (params)

-  (declare (ignore params))

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

-    (setf (gethash :userinfo session) nil)

-    "/"))

-

-(define-view root (feeds)

-  (let ((*feeds* feeds))

-    (base-template-f)))

-

-(define-controller root (params)

-  (cl-oid-connect.utils::with-login

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

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

-        (let* ((user-info (gethash :app-user session)))

-          (deserialize user-info))))

-    (:unauthorized (c)

-     (declare (ignore c))

-     (format t "hmm...")

-     (araneus::switch-view 'redirect)

-     "/login")))

+(load "route-atoms.lisp")

+

+(define-view json-feed (the-feeds)

+  `(200 (:content-type "application/json" :cache-control "private, max-age=300")

+    (,(jsonapi-encoder t the-feeds))))

+

+(define-controller json-feed (params)

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

+    (let* ((user-info (gethash :app-user session))

+           (*feeds* (if user-info (deserialize user-info) *feeds*)))

+      (setf *userasdfs* user-info)

+      *feeds*)) )

+

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

+  (base-template-f t))

 (defroutes *app*

+  (("/feeds/json") (araneus:as-route 'json-feed))

   (("/theme/:scheme.css") (araneus::compose-route (css) css))

   (("/userinfo.json") (araneus::compose-route (id) userinfo))

   (("/login") (araneus::compose-route (id) login))

-  (("/logout") (araneus::compose-route (logout) redirect)) 

+  (("/logout") (araneus::compose-route (logout) redirect))

   (("/") (araneus:as-route 'root)))

 (defun assoc-cdr-alternatives (alist alt1 alt2 &optional (test #'eql))

new file mode 100644

@@ -0,0 +1,68 @@

+(in-package :whitespace)

+

+(define-view dark-css (params)

+  (colors:let-palette (make-instance 'colors:palette)

+    (eval '(get-theme-css))))

+

+(define-view light-css (params)

+  (colors:let-palette (colors:invert-palette (make-instance 'colors:palette))

+    (eval '(get-theme-css))))

+

+(define-view css (colorscheme)

+  (string-case:string-case (colorscheme :default "")

+    ("light" (view 'light-css colorscheme))

+    ("dark" (view 'dark-css colorscheme))))

+

+(define-view userinfo (params)

+  (declare (ignore params))

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

+    (cl-oid-connect:require-login

+      (cl-oid-connect::with-endpoints (gethash :endpoint-schema session)

+        `(200

+          (:content-type "application/json")

+          (,(cl-json:encode-json-to-string

+             (gethash :userinfo session))))))))

+

+(define-controller css (params)

+  (cl-oid-connect.utils:assoc-cdr :scheme params))

+

+(define-controller id (params)

+  params)

+

+(define-view redirect (destination)

+  `(302 (:location ,destination)))

+

+(define-view login (params)

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

+    (:html

+      (:head (:title "Login"))

+      (:body

+        (:div

+          :class "login-button facebook"

+          (:a :href "/login/facebook" "Facebook"))

+        (:div

+          :class "login-button google"

+          (:a :href "/login/google" "Google"))))))

+

+(define-controller logout (params)

+  (declare (ignore params))

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

+    (setf (gethash :userinfo session) nil)

+    "/"))

+

+(define-view root (feeds)

+  (let ((*feeds* feeds))

+    (base-template-f)))

+

+(define-controller root (params)

+  (cl-oid-connect.utils::with-login

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

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

+        (let* ((user-info (gethash :app-user session)))

+          (deserialize user-info))))

+    (:unauthorized (c)

+     (declare (ignore c))

+     (format t "hmm...")

+     (araneus::switch-view 'redirect)

+     "/login")))

+

@@ -5,6 +5,11 @@ Creative Commons Attribution-Share Alike 3.0 License

 version 0.5.2

 */

+li.link > section.link-content {

+  margin-left: 4em;

+  margin-right: 6em;

+}

+

 li.link > section.link-content > div {

   /******************** Base ********************/

@@ -4,6 +4,10 @@ Copyright (C) 2009 Stephane Curzi, ProjetUrbain.com

 Creative Commons Attribution-Share Alike 3.0 License

 version 0.5.2

 */

+li.link > section.link-content {

+  margin-left: 4em;

+  margin-right: 6em; }

+

 li.link > section.link-content > div {

   /******************** Base ********************/

   /* html 5 */

Binary files a/static/images/Whitespace_favicon.png and b/static/images/Whitespace_favicon.png differ

new file mode 100644

Binary files /dev/null and b/static/images/Whitespace_favicon.xcf differ