@@ -1,6 +1,8 @@

 (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)

@@ -37,23 +39,13 @@

 (in-package :whitespace)

+(use-package :fwoar.lisputils)

+(use-package :araneus)

 (ubiquitous:restore :whitespace)

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

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

-  (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"))))))

-

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

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

@@ -61,11 +53,14 @@

          (docs (map 'vector (lambda (x) (plump:parse (drakma:http-request x))) feed-urls)))

     (defparameter *feeds* (map 'vector (lambda (x) (make-rss-feed x)) docs))))

-(defparameter *db-connection-info* (ubiquitous:value 'db 'connection 'info))

+(defparameter *db-connection-info* (ubiquitous:value 'db))

+

 (defmacro with-whitespace-db (&body body)

   `(postmodern:with-connection *db-connection-info*

      ,@body))

+

 (defmacro wc (&body body)

+  "Utility function for the REPL"

   `(with-whitespace-db ,@body))

 (defmacro with-xml-tags (&body body)

@@ -136,10 +131,6 @@

                     (list :|success| success

                           :|result| result)))

-(defmacro neither (&rest forms) `(not (or ,@forms)))

-(defmacro neither-null (&rest forms)

-  `(neither ,@(loop for form in forms collecting `(null ,form))))

-

 ; ; ;  Ultimately, this will only serialize the feed if the client

 (cl-oid-connect:def-route ("/feeds/add" (params) :method :post :app *app*)

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

@@ -161,7 +152,7 @@

               ()

               (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

@@ -173,7 +164,7 @@

            (*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*)))))

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

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

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

@@ -194,14 +185,6 @@

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

     ))|#

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

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

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

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

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

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

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

-

 ;;; this will be bound by calls to with-palette

 ;;; probably should be refactored out

 (defparameter *palette* nil)

@@ -291,28 +274,80 @@

                    `((:or (:and .link-header :hover) (.link.closed (:and .link-header :hover)))

                      :background-color ,(colors:colorscheme-hover-highlight *colorscheme*)))))

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

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

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

-(cl-oid-connect:def-route ("/theme/dark.css" (params) :app *app*)

+(define-view dark-css (params)

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

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

-(cl-oid-connect:def-route ("/theme/light.css" (params) :app *app*)

+(define-view light-css (params)

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

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

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

+(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)))))))

+        `(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"))))))

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

+(define-controller logout (params)

   (declare (ignore params))

   (ningle:with-context-variables (session)

     (setf (gethash :userinfo session) nil)

-    '(302 (:location "/"))))

+    "/"))

+

+(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")))

+

+(defroutes *app*

+  (("/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)) 

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

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

   (aif (cl-oid-connect:assoc-cdr alt1 alist test)

@@ -322,7 +357,7 @@

 (cl-oid-connect::setup-oid-connect *app* (userinfo &rest args)

   (declare (ignore args) (optimize (speed 0) (safety 3) (debug 3)))

   (flet ((get-received-id (userinfo) (assoc-cdr-alternatives userinfo :id :sub))

-         (get-db-user (received-id) (car (postmodern:select-dao 'reader_user (:= :foreign-id received-id)))) 

+         (get-db-user (received-id) (car (postmodern:select-dao 'reader_user (:= :foreign-id received-id))))

          (get-first-name (userinfo) (assoc-cdr-alternatives userinfo :first--name :given--name))

          (get-last-name (userinfo) (assoc-cdr-alternatives userinfo :last--name :family--name))

          (get-link (userinfo) (assoc-cdr-alternatives userinfo :link :profile)))