@@ -1,2 +1,3 @@

 *-secrets.json

 .*.sw?

+*.fasl

new file mode 100644

@@ -0,0 +1,3 @@

+[submodule "colors"]

+	path = colors

+	url = ./colors

@@ -1,4 +1,5 @@

 ;;;; cl-oid-connect.lisp

+;;;; TODO: Need to refactor out server names!!!

 #|

 |Copyright (c) 2015 Edward Langley

 |All rights reserved.

@@ -45,6 +46,7 @@

                                 :properties '((auth-endpoint nil :accessor auth-endpoint)

                                               (token-endpoint nil :accessor token-endpoint)

                                               (userinfo-endpoint nil :accessor t)

+                                              (auth-scope "openid profile email" :accessor t)

                                               (redirect-uri nil :accessor t))))

 (sheeple:defmessage get-user-info (a b))

 (sheeple:defmessage get-access-token (a b))

@@ -67,6 +69,7 @@

           ((auth-endpoint "https://www.facebook.com/dialog/oauth")

            (token-endpoint "https://graph.facebook.com/v2.3/oauth/access_token")

            (userinfo-endpoint "https://graph.facebook.com/v2.3/me")

+           (auth-scope "email")

            (redirect-uri  "http://srv2.elangley.org:9090/oidc_callback/facebook")))

 (sheeple:defreply get-access-token ((endpoint-schema *fbook-endpoint-schema*) (code sheeple:=string=))

@@ -97,6 +100,7 @@

     (setf (auth-endpoint schema) (assoc-cdr :authorization--endpoint discovery-document))

     (setf (token-endpoint schema) (assoc-cdr :token--endpoint discovery-document))

+    (setf (userinfo-endpoint schema) (assoc-cdr :userinfo--endpoint discovery-document))

     (if gui-p (sheeple:defreply get-user-info ((a schema)) (funcall gui a)))

     (if gat-p (sheeple:defreply get-access-token ((a schema) (b sheeple:=string=))

@@ -116,7 +120,7 @@

                        :parameters `(("client_id" . ,(client-id endpoint-schema))

                                      ("app_id" . ,(client-id endpoint-schema))

                                      ("response_type" . "code")

-                                     ("scope" . "email")

+                                     ("scope" . ,(auth-scope endpoint-schema))

                                      ("redirect_uri" . ,(redirect-uri endpoint-schema))

                                      ("state" . ,state))))

@@ -163,7 +167,7 @@

     (let* ((data (yason:parse fbook-info))

            (client-id (gethash "client-id" data))

            (secret (gethash "secret" data)))

-      (setf (client-id *FBOOK-INFO*) client-id) 

+      (setf (client-id *FBOOK-INFO*) client-id)

       (setf (secret *FBOOK-INFO*) secret))))

 (defun load-google-info (loadfrom)

@@ -191,6 +195,15 @@

                       :gat #'goog-get-access-token)

   (setf (redirect-uri *goog-endpoint-schema*)   "http://srv2.elangley.org:9090/oidc_callback/google"))

+(sheeple:defreply get-user-info ((endpoint-schema *goog-endpoint-schema*) (access-token sheeple:=string=))

+  (format t "getting user data: ~a~%" "blarg")

+  (let ((endpoint (userinfo-endpoint endpoint-schema)))

+    (cl-json:decode-json-from-string

+      (drakma:http-request endpoint

+                           :parameters `(("alt" . "json")

+                                         ("access_token" . ,access-token))

+                           ))))

+

 (defun oauth2-login-middleware (&key google-info facebook-info)

   (let ((clack-env nil))

@@ -200,16 +213,16 @@

       (load-goog-endpoint-schema)

       (load-google-info google-info)

-    (def-route ("/login/google" (params) :app app)

-      (with-context-variables (session)

-        (let ((state (gen-state 36)))

-          (setf (gethash :state session) state)

-          (with-endpoints *goog-endpoint-schema*

-            (setf (gethash :endpoint-schema session) *goog-endpoint-schema*)

-            (multiple-value-bind (content rcode headers) (do-auth-request *goog-endpoint-schema* state)

-              (if (< rcode 400)

-                `(302 (:location ,(cdr (assoc :location headers))))

-                content))))))

+      (def-route ("/login/google" (params) :app app)

+        (with-context-variables (session)

+          (let ((state (gen-state 36)))

+            (setf (gethash :state session) state)

+            (with-endpoints *goog-endpoint-schema*

+              (setf (gethash :endpoint-schema session) *goog-endpoint-schema*)

+              (multiple-value-bind (content rcode headers) (do-auth-request *goog-endpoint-schema* state)

+                (if (< rcode 400)

+                  `(302 (:location ,(cdr (assoc :location headers))))

+                  content))))))

     (def-route ("/login/facebook" (params) :app app)

@@ -231,10 +244,14 @@

                      (with-context-variables (session)

                        (with-endpoints *goog-endpoint-schema*

                          (let* ((a-t (get-access-token *goog-endpoint-schema* code))

+                                (access-token (assoc-cdr :access--token a-t)) ;; Argh

                                 (id-token (assoc-cdr :id--token a-t))

                                 (decoded (cljwt:decode id-token :fail-if-unsupported nil)))

-                           (setf (gethash :userinfo session) decoded)

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

+                           (setf (gethash :idtoken session) (get-user-info *goog-endpoint-schema* id-token))

+                           (setf (gethash :accesstoken session) (get-user-info *goog-endpoint-schema* access-token))

+                           (setf (gethash :userinfo session) (get-user-info *goog-endpoint-schema* access-token))

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

+                           )))

                      '(403 '() "Out, vile imposter!"))))

@@ -252,7 +269,7 @@

     (def-route ("/userinfo.json" (params) :app app)

       (with-context-variables (session)

-        (require-login 

+        (require-login

           (with-endpoints  (gethash :endpoint-schema session)

             (cl-json:encode-json-to-string (gethash :userinfo session))))))

new file mode 160000

@@ -0,0 +1 @@

+Subproject commit b203d4f1b4abdc5c72582d6e6465e7eebe5fec0e

deleted file mode 100644

@@ -1 +0,0 @@

-This is the stub README.txt for the "colors" project.

deleted file mode 100644

@@ -1,9 +0,0 @@

-;;;; colors.asd

-

-(asdf:defsystem #:colors

-  :description "Describe colors here"

-  :author "Your Name <your.name@example.com>"

-  :license "Specify license here"

-  :serial t

-  :components ((:file "colors")))

-

deleted file mode 100644

@@ -1,111 +0,0 @@

-;;;; colors.lisp

-(defpackage #:colors

-  (:use #:cl)

-  (:export #:colorscheme #:palette *palette*

-           #:invert-palette

-           #:let-palette #:with-palette

-           #:accentize

-           #:colorscheme-bg #:colorscheme-bg-highlight 

-           #:colorscheme-fg-deemph #:colorscheme-fg #:colorscheme-fg-highlight 

-           #:colorscheme-accent 

-           #:colorscheme-hover-highlight))

-

-(in-package #:colors)

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

-

-;;; Generic utility macro TODO: separate these out!!!

-(defmacro initialize-to (obj1-v obj2-v &body slot-swaps)

-  (alexandria:with-gensyms (obj1 obj2)

-    `(let* ((,obj1 ,obj1-v)

-            (,obj2 ,obj2-v))

-       ,@(loop for (to from) in slot-swaps

-               collect `(setf (,to ,obj1) (,from ,obj2))))))

-

-;;; This macro connects the "-" prefixed slots in the colorscheme class

-;;; To the appropriate palette

-(defmacro def-palette-accessor (scheme-slot scheme palette )

-  `(progn

-     (defgeneric ,scheme-slot (,scheme))

-     (defmethod ,scheme-slot ((,scheme colorscheme))

-       (slot-value ,palette (,(intern (concatenate 'string "-" (symbol-name scheme-slot))) ,scheme)))))

-

-

-;; &group interfaces

-;;; Palette class and methods &group

-

-(defclass palette () ; solarized http://ethanschoonover.com/solarized

-  ((base03     :accessor palette-base03      :initform "#002b36")

-   (base02     :accessor palette-base02      :initform "#073642")

-   (base01     :accessor palette-base01      :initform "#586e75")

-   (base00     :accessor palette-base00      :initform "#657b83")

-   (base0      :accessor palette-base0       :initform "#839496")

-   (base1      :accessor palette-base1       :initform "#93a1a1")

-   (base2      :accessor palette-base2       :initform "#eee8d5")

-   (base3      :accessor palette-base3       :initform "#fdf6e3")

-   (yellow     :accessor palette-yellow      :initform "#b58900")

-   (orange     :accessor palette-orange      :initform "#cb4b16")

-   (red        :accessor palette-red         :initform "#dc322f")

-   (magenta    :accessor palette-magenta     :initform "#d33682")

-   (violet     :accessor palette-violet      :initform "#6c71c4")

-   (blue       :accessor palette-blue        :initform "#268bd2")

-   (cyan       :accessor palette-cyan        :initform "#2aa198")

-   (green      :accessor palette-green       :initform "#859900")))

-

-(defgeneric invert-palette (palette))

-

-;;; The palette var: this defaults to the solarized palette defined

-;;; above, but can (and should) be temporarily rebound via the 

-;;; with-palette macro below.

-(defparameter *palette* (make-instance 'palette))

-

-(defmacro let-palette (palette &body body)

-  "Set custom palette in end-user code"

-  `(let ((*palette* ,palette))

-     ,@body))

-

-(defmacro with-palette ((place) &body body)

-  "Access the current palette"

-  `(let ((,place *palette*))

-     ,@body))

-

-;;; &endgroup

-;;; &group Color scheme

-(defclass colorscheme ()

-  ((bg           :accessor -colorscheme-bg           :initform 'base03)

-   (bg-highlight :accessor -colorscheme-bg-highlight :initform 'base02)

-   (fg-deemph    :accessor -colorscheme-fg-deemph    :initform 'base01)

-   (fg           :accessor -colorscheme-fg           :initform 'base0 )

-   (fg-highlight :accessor -colorscheme-fg-highlight :initform 'base1 )

-   (hover-highlight :accessor -colorscheme-hover-highlight :initform 'base3 )

-   (accent       :accessor -colorscheme-accent       :initform 'violet)))

-

-(defgeneric accentize (colorscheme accent))

-

-(def-palette-accessor colorscheme-bg               scheme *palette*)

-(def-palette-accessor colorscheme-bg-highlight     scheme *palette*)

-(def-palette-accessor colorscheme-fg-deemph        scheme *palette*)

-(def-palette-accessor colorscheme-fg               scheme *palette*)

-(def-palette-accessor colorscheme-fg-highlight     scheme *palette*)

-(def-palette-accessor colorscheme-accent           scheme *palette*)

-(def-palette-accessor colorscheme-hover-highlight  scheme *palette*)

-

-;;; &endgroup

-;; &endgroup

-

-(defmethod invert-palette ((palette palette))

-  (let ((result (make-instance 'palette)))

-    (initialize-to result palette

-      (palette-base03 palette-base3)

-      (palette-base02 palette-base2)

-      (palette-base01 palette-base1)

-      (palette-base00 palette-base0)

-      (palette-base0  palette-base00)

-      (palette-base1  palette-base01)

-      (palette-base2  palette-base02)

-      (palette-base3  palette-base03))

-    result))

-

-(defmethod accentize ((colorscheme colorscheme) accent)

-  (setf (colorscheme-accent colorscheme) (funcall accent colorscheme)))

-

-; vim: foldmethod=marker foldmarker=&group,&endgroup foldlevel=0 :

deleted file mode 100644

@@ -1,2 +0,0 @@

-;;;; package.lisp

-

@@ -1,25 +1,39 @@

 (in-package :cl-user)

-(ql:quickload :plump)

-(ql:quickload :lquery)

 (ql:quickload :cl-markup)

 (ql:quickload :cl-oid-connect)

 (ql:quickload :colors)

+(ql:quickload :lquery)

+(ql:quickload :plump)

+(ql:quickload :postmodern)

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

+(lquery:define-lquery-list-function tag-name (nodes &rest tags)

+  "Manipulate elements on the basis of there tag-name.

+   With no arguments, return their names else return

+   the corresponding tags."

+  (if (null tags)

+    (map 'vector #'plump:tag-name nodes)

+    (apply #'vector

+           (loop for node across nodes

+                 if (find (plump:tag-name node) tags :test #'string=)

+                 collect node))))

+

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

 (defclass rss-feed ()

-  ((feed :accessor rss-feed-feed

-         :initarg :feed)

+  ((feed :accessor rss-feed-feed :initarg :feed)

    (channel :accessor rss-feed-channel)

    (title :accessor rss-feed-title)

    (link :accessor rss-feed-link)

    (description :accessor rss-feed-description)

    (items :accessor rss-feed-items)))

+(defgeneric serialize (cls))

+

+

 (defclass rss-item ()

   ((item :accessor rss-item-item  :initarg :item)

    (title :accessor rss-item-title)

@@ -33,6 +47,10 @@

    (pub-date :accessor rss-item-pub-date)

    (source :accessor rss-item-source)))

+(defmethod serialize ((obj rss-feed))

+  (postmodern:make-dao 'rss)

+  )

+

 (defmacro get-elements (feed &optional (filter nil))

   (let ((feed-sym (gensym))

         (filter-lis `(lambda (x) (and (plump-dom:element-p x) ,@(loop for x in filter

@@ -44,11 +62,7 @@

   `(get-elements ,feed ((lambda (x) (string= ,tagname (plump:tag-name x))))))

 (defmacro extract-text (selector &optional (default ""))

-  (alexandria:with-gensyms (selector-s)

-    `(let ((,selector-s ,selector))

-       (if (not (equalp #() (lquery:$ ,selector-s)))

-         (lquery:$ ,selector-s (text) (node))

-         ,default))))

+  `(or (lquery:$ ,selector (text) (node)) ,default))

 (defun make-rss-item (item)

   (lquery:initialize item)

@@ -98,7 +112,7 @@

 (defun make-rss-feed (feed)

   (lquery:initialize feed)

   (let* ((result (make-instance 'rss-feed :feed feed))

-         (channel (lquery:$ "channel" (text) (node)))

+         (channel (lquery:$ "channel" (node)))

          (title (lquery:$  "title" (text) (node)))

          (link (lquery:$ "link" (text) (node)))

          (description (lquery:$ "description" (text) (node)))

@@ -125,17 +139,6 @@

           :class "login-button google"

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

-(lquery:define-lquery-list-function tag-name (nodes &rest tags)

-  "Manipulate elements on the basis of there tag-name.

-   With no arguments, return their names else return

-   the corresponding tags."

-  (if (null tags)

-    (map 'vector #'plump:tag-name nodes)

-    (apply #'vector

-           (loop for node across nodes

-                 if (find (plump:tag-name node) tags :test #'string=) 

-                 collect node))))

-

 (defparameter *feed-urls*

   #(

     "http://www.reddit.com/r/lisp.rss"

@@ -157,109 +160,6 @@

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

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

-;;; probably should be refactored out

-(defparameter *palette* nil)

-

-(defparameter *colorscheme* (make-instance 'colors:colorscheme))

-

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

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

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

-

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

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

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

-

-(defun get-theme-css ()

-  (colors:with-palette (*palette*)

-    (flet ((combine-unit-q (quant unit) (format nil "~d~a" quant unit)))

-      (let* ((header-height 9)

-             (height-units "vh")

-             (ss (lass:compile-and-write

-                   `(* :color ,(colors:colorscheme-fg *colorscheme*))

-

-                 `(body :background-color ,(colors:colorscheme-bg *colorscheme*))

-

-                 `((:or h1 h2 h3)

-                   :color ,(colors:colorscheme-fg-highlight *colorscheme*))

-                 `(.feed-header

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

-

-                 `((:or h4 h5 h6) :color ,(colors:colorscheme-fg-highlight *colorscheme*))

-

-                 `(header

-                    :border-bottom "thin" "solid" ,(colors:colorscheme-accent *colorscheme*)

-                    :height ,(combine-unit-q header-height height-units)

-                    :font-size ,(combine-unit-q (* 0.75 header-height) height-units)

-                    :line-height ,(combine-unit-q header-height height-units)

-                    (.flip-button

-                      :float right

-                      :width "3em"

-                      :height "3em"

-                      :padding-left "1em"

-                      :padding-bottom "1em"

-                      :border-bottom-left-radius "100%"

-                      :border none

-                      :transition "all 0.5s ease"

-                      :background-color ,(colors:colorscheme-fg *colorscheme*)

-                      :color ,(colors:colorscheme-bg *colorscheme*))

-                    ((:and .flip-button :focus)

-                     :outline none)

-                    ((:and .flip-button :hover)

-                     :width "4em"

-                     :height "4em"

-                     :padding-left "2em"

-                     :padding-bottom "2em")

-                    )

-

-                 `(main

-                    :border-left thin solid ,(colors:colorscheme-accent *colorscheme*)

-                    :height ,(combine-unit-q (- 100 header-height) height-units))

-

-                 `((:or a (:and a :visited) (:and a :active) code.url)

-                   :color ,(colors:colorscheme-fg-highlight *colorscheme*))

-

-                 `(section#sidebar

-                    (ul.menu

-                      ((li + li)

-                       :border-top "thin" "solid" ,(colors:colorscheme-fg-highlight *colorscheme*))

-                      ((:and li :hover)

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

-                       :color ,(colors:colorscheme-fg-highlight *colorscheme*))))

-

-                 `(.feed

-                    :border-bottom thin solid ,(colors:colorscheme-fg *colorscheme*)

-                    :border-left none)

-

-                 `(.link-header :background-color ,(colors:colorscheme-bg-highlight *colorscheme*))

-                 `(.link

-                    :border-top thin solid ,(colors:colorscheme-fg *colorscheme*)

-                    :border-bottom none

-

-

-                    (.link-info

-                      :color ,(colors:colorscheme-fg-deemph *colorscheme*)

-                      :border-bottom "thin" "solid" ,(colors:colorscheme-fg *colorscheme*)

-                      ((:or a span)

-                       :color inherit)

-                      ((:and a :hover)

-                       :color ,(colors:colorscheme-fg *colorscheme*))

-                      ))

-                 `((:and .feed-header :hover)

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

-                 `((.link.closed .link-header)

-                   :background-color ,(colors:colorscheme-bg *colorscheme*))

-

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

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

-                 `(blah

-                    :a ,(colors:colorscheme-fg-highlight *colorscheme*)

-                    :a ,(colors:colorscheme-hover-highlight *colorscheme*)

-                    :a ,(colors:colorscheme-bg-highlight *colorscheme*)

-                    )

-                 )))

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

 (defmacro item-markup (item)

   (alexandria:with-gensyms (item-s)

@@ -313,7 +213,7 @@

        (:link :rel "stylesheet" :href "/theme/light.css"))

      (:body

        (:header

-         (:button :class "flip-button" ">") 

+         (:button :class "flip-button" ">")

          (:h1 "What?")

          )

        (:section :id "content"

@@ -354,10 +254,113 @@

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

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

       ;(cl-oid-connect:require-login

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

-          (base-template-f));)

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

+          (let ((*feeds* (gethash :feeds session *feeds*)))

+          (base-template-f)));)

   ))

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

+;;; probably should be refactored out

+(defparameter *palette* nil)

+

+(defparameter *colorscheme* (make-instance 'colors:colorscheme))

+

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

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

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

+

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

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

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

+

+

+

+(defun get-theme-css ()

+  (colors:with-palette (*palette*)

+    (flet ((combine-unit-q (quant unit) (format nil "~d~a" quant unit)))

+      (let* ((header-height 9)

+             (height-units "vh")

+             (ss (lass:compile-and-write

+                   `(* :color ,(colors:colorscheme-fg *colorscheme*))

+

+                   `(body :background-color ,(colors:colorscheme-bg *colorscheme*))

+

+                   `((:or h1 h2 h3)

+                     :color ,(colors:colorscheme-fg-highlight *colorscheme*))

+                   `(.feed-header

+                      :background-color ,(colors:colorscheme-bg-highlight *colorscheme*))

+

+                   `((:or h4 h5 h6) :color ,(colors:colorscheme-fg-highlight *colorscheme*))

+

+                   `(header

+                      :border-bottom "thin" "solid" ,(colors:colorscheme-accent *colorscheme*)

+                      :height ,(combine-unit-q header-height height-units)

+                      :font-size ,(combine-unit-q (* 0.75 header-height) height-units)

+                      :line-height ,(combine-unit-q header-height height-units)

+                      (.flip-button

+                        :float right

+                        :width "3em"

+                        :height "3em"

+                        :padding-left "1em"

+                        :padding-bottom "1em"

+                        :border-bottom-left-radius "100%"

+                        :border none

+                        :transition "all 2s cubic-bezier(0.175, 0.885, 0.32, 1.275)"

+                        :background-color ,(colors:colorscheme-fg *colorscheme*)

+                        :color ,(colors:colorscheme-bg *colorscheme*))

+                      ((:and .flip-button :focus)

+                       :outline none)

+                      ((:and .flip-button :hover)

+                       :width "6em"

+                       :height "6em"

+                       :padding-left "4em"

+                       :padding-bottom "3em")

+                      )

+

+                   `(main

+                      :border-left thin solid ,(colors:colorscheme-accent *colorscheme*)

+                      :height ,(combine-unit-q (- 100 header-height) height-units))

+

+                   `((:or a (:and a :visited) (:and a :active) code.url)

+                     :color ,(colors:colorscheme-fg-highlight *colorscheme*))

+

+                   `(section#sidebar

+                      (ul.menu

+                        ((li + li)

+                         :border-top "thin" "solid" ,(colors:colorscheme-fg-highlight *colorscheme*))

+                        ((:and li :hover)

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

+                         :color ,(colors:colorscheme-fg-highlight *colorscheme*))))

+

+                   `(.feed

+                      :border-bottom thick solid ,(colors:colorscheme-accent *colorscheme*)

+                      :border-left none)

+

+                   `(.link-header :background-color ,(colors:colorscheme-bg-highlight *colorscheme*))

+                   `(.link

+                      :border-top thin solid ,(colors:colorscheme-fg *colorscheme*)

+                      :border-bottom none

+

+

+                      (.link-info

+                        :color ,(colors:colorscheme-fg-deemph *colorscheme*)

+                        :border-bottom "thin" "solid" ,(colors:colorscheme-fg *colorscheme*)

+                        ((:or a span)

+                         :color inherit)

+                        ((:and a :hover)

+                         :color ,(colors:colorscheme-fg *colorscheme*))

+                        ))

+                   

+                   `((:and .feed-header :hover)

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

+

+                   `((.link.closed .link-header)

+                     :background-color ,(colors:colorscheme-bg *colorscheme*))

+

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

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

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

+

 (defvar *handler* nil)

 (defun stop ()

@@ -11,6 +11,7 @@

   :padding "0px")

 (body

+  :transition "background-color 0.25s ease"

   :font-family "Lato")

 (((:or main "#sidebar" .feed) > (:or ul ol))

@@ -53,13 +54,14 @@

     :font-variant small-caps

     (li

       (a

-        :width "100%"

+        :color inherit

         :display block

+        :font-size "125%"

+        :font-weight 700

         :padding "0.5em"

-        :color inherit

         :text-decoration none

-        :font-weight 700

-        :font-size "125%"

+        :transition "background-color 0.25s ease"

+        :width "100%"

         ))))

 (main

@@ -73,6 +75,7 @@

   ((:or h2 h3) :padding "0.62em")

   (h2 :padding-bottom "0.38em")

   (h3 :padding-top "0.38em")

+  :transition "background-color 0.25s ease"

   :padding-bottom "0em")

 ((.link.closed .link-content) 

@@ -91,6 +94,7 @@

     :padding "1em"

     :padding-bottom "0em"

     :cursor pointer

+    :transition "background-color 0.25s ease"

     (h4

       :margin-bottom "0.5em"

       :display "inline-block")) 

@@ -1 +1 @@

-@import url(https://fonts.googleapis.com/css?family=Lato:400,100,300,400italic,300italic,700,700italic,900&subset=latin,latin-ext);@import url(https://fonts.googleapis.com/css?family=Caudex);.feed,main{-webkit-backface-visibility:hidden;-webkit-transform:translateZ(0);}*{box-sizing:border-box;margin:0px;padding:0px;}body{font-family:Lato;}main > ul,main > ol,#sidebar > ul,#sidebar > ol,.feed > ul,.feed > ol{list-style:none;margin:0px;}ul{margin:1em;}h1,h2{font-size:153.9%;}:h3{font-size:146.5%;}h4,h5,h6{font-size:138.5%;}ul + h1,ul + h2,ul + h3,ul + h4,ul + h5,ul + h6{width:initial;}header{color:white;}header h1{font-family:Caudex;font-size:inherit;margin-top:0em;padding-left:10vw;font-weight:200;}#sidebar,main{border-top:none;}section#sidebar{width:38vw;height:90vh;position:fixed;overflow:auto;}section#sidebar ul.menu{text-align:right;font-variant:small-caps;}section#sidebar ul.menu li a{width:100%;display:block;padding:0.5em;color:inherit;text-decoration:none;font-weight:700;font-size:125%;}main{width:62vw;float:right;clear:right;overflow-x:hidden;overflow-y:scroll;}.feed-header{padding-bottom:0em;}.feed-header h2,.feed-header h3{padding:0.62em;}.feed-header h2{padding-bottom:0.38em;}.feed-header h3{padding-top:0.38em;}.link.closed .link-content{max-height:0px;padding:0em;}.link.closed{padding-bottom:0em;}.link{text-decoration:none;display:block;overflow:hidden;font-size:0.8em;}.link .link-header{padding:1em;padding-bottom:0em;cursor:pointer;}.link .link-header h4{margin-bottom:0.5em;display:inline-block;}.link .link-info{margin-left:-1em;margin-right:-1em;padding-left:1em;padding-right:1em;padding-bottom:0.32em;}.link .link-info .link-url{float:left;}.link .link-info .link-date{float:right;display:block;}.link .link-info:after{content:" ";display:block;clear:both;}.link .link-content{-moz-transition:max-height 0.5s ease;-o-transition:max-height 0.5s ease;-webkit-transition:max-height 0.5s ease;-ms-transition:max-height 0.5s ease;transition:max-height 0.5s ease;}.link .link-content > div{padding:1em;}.feed.closed .post-list{max-height:0px;padding:0em;}.feed:first-child{border-top:none;}.feed{overflow:hidden;}.feed .post-list{-moz-transition:max-height 0.5s ease;-o-transition:max-height 0.5s ease;-webkit-transition:max-height 0.5s ease;-ms-transition:max-height 0.5s ease;transition:max-height 0.5s ease;}

\ No newline at end of file

+@import url(https://fonts.googleapis.com/css?family=Lato:400,100,300,400italic,300italic,700,700italic,900&subset=latin,latin-ext);@import url(https://fonts.googleapis.com/css?family=Caudex);.feed,main{-webkit-backface-visibility:hidden;-webkit-transform:translateZ(0);}*{box-sizing:border-box;margin:0px;padding:0px;}body{-moz-transition:background-color 0.25s ease;-o-transition:background-color 0.25s ease;-webkit-transition:background-color 0.25s ease;-ms-transition:background-color 0.25s ease;transition:background-color 0.25s ease;font-family:Lato;}main > ul,main > ol,#sidebar > ul,#sidebar > ol,.feed > ul,.feed > ol{list-style:none;margin:0px;}ul{margin:1em;}h1,h2{font-size:153.9%;}:h3{font-size:146.5%;}h4,h5,h6{font-size:138.5%;}ul + h1,ul + h2,ul + h3,ul + h4,ul + h5,ul + h6{width:initial;}header{color:white;}header h1{font-family:Caudex;font-size:inherit;margin-top:0em;padding-left:10vw;font-weight:200;}#sidebar,main{border-top:none;}section#sidebar{width:38vw;height:90vh;position:fixed;overflow:auto;}section#sidebar ul.menu{text-align:right;font-variant:small-caps;}section#sidebar ul.menu li a{color:inherit;display:block;font-size:125%;font-weight:700;padding:0.5em;text-decoration:none;-moz-transition:background-color 0.25s ease;-o-transition:background-color 0.25s ease;-webkit-transition:background-color 0.25s ease;-ms-transition:background-color 0.25s ease;transition:background-color 0.25s ease;width:100%;}main{width:62vw;float:right;clear:right;overflow-x:hidden;overflow-y:scroll;}.feed-header{-moz-transition:background-color 0.25s ease;-o-transition:background-color 0.25s ease;-webkit-transition:background-color 0.25s ease;-ms-transition:background-color 0.25s ease;transition:background-color 0.25s ease;padding-bottom:0em;}.feed-header h2,.feed-header h3{padding:0.62em;}.feed-header h2{padding-bottom:0.38em;}.feed-header h3{padding-top:0.38em;}.link.closed .link-content{max-height:0px;padding:0em;}.link.closed{padding-bottom:0em;}.link{text-decoration:none;display:block;overflow:hidden;font-size:0.8em;}.link .link-header{padding:1em;padding-bottom:0em;cursor:pointer;-moz-transition:background-color 0.25s ease;-o-transition:background-color 0.25s ease;-webkit-transition:background-color 0.25s ease;-ms-transition:background-color 0.25s ease;transition:background-color 0.25s ease;}.link .link-header h4{margin-bottom:0.5em;display:inline-block;}.link .link-info{margin-left:-1em;margin-right:-1em;padding-left:1em;padding-right:1em;padding-bottom:0.32em;}.link .link-info .link-url{float:left;}.link .link-info .link-date{float:right;display:block;}.link .link-info:after{content:" ";display:block;clear:both;}.link .link-content{-moz-transition:max-height 0.5s ease;-o-transition:max-height 0.5s ease;-webkit-transition:max-height 0.5s ease;-ms-transition:max-height 0.5s ease;transition:max-height 0.5s ease;}.link .link-content > div{padding:1em;}.feed.closed .post-list{max-height:0px;padding:0em;}.feed:first-child{border-top:none;}.feed{overflow:hidden;}.feed .post-list{-moz-transition:max-height 0.5s ease;-o-transition:max-height 0.5s ease;-webkit-transition:max-height 0.5s ease;-ms-transition:max-height 0.5s ease;transition:max-height 0.5s ease;}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,50 @@

+(ql:quickload :postmodern)

+

+(defclass rss-feed-store ()

+  ((id          :col-type serial :initarg :id          :accessor rfs-id)

+   (title       :col-type text   :initarg :title       :accessor rss-feed-title       :col-default "")

+   (link        :col-type text   :initarg :link        :accessor rss-feed-line        :col-default "")

+   (description :col-type text   :initarg :description :accessor rss-feed-description :col-default ""))

+  (:metaclass postmodern:dao-class)

+  (:table-name "rssFeed")

+  (:unique link)

+  (:keys id))

+

+(postmodern:deftable rss-feed-store

+  (postmodern:!dao-def))

+

+; (postmodern:create-table 'rss-feed-store)

+

+(defclass rss-item-store ()

+  ((id          :col-type serial  :initarg :id          :accessor ris-id)

+   (title       :col-type text    :initarg :title       :accessor ris-title       :col-default "")

+   (link        :col-type text    :initarg :link        :accessor ris-link        :col-default "")

+   (description :col-type text    :initarg :description :accessor ris-description :col-default "")

+   (comments    :col-type text    :initarg :comments    :accessor ris-comments    :col-default "")

+   (enclosure   :col-type text    :initarg :enclosure   :accessor ris-enclosure   :col-default "")

+   (guid        :col-type text    :initarg :guid        :accessor ris-guid        :col-default "")

+   (pub-date    :col-type text    :initarg :pub-date    :accessor ris-pub-date    :col-default "")

+   (source      :col-type text    :initarg :source      :accessor ris-source      :col-default "")

+   (feed        :col-type integer :initarg :feed        :accessor ris-feed))

+  (:metaclass postmodern:dao-class)

+  (:keys id))

+

+(postmodern:deftable rss-item-store

+  (postmodern:!dao-def)

+  (postmodern:!foreign "rssfeed" "feed" "id" :on-delete :cascade :on-update :cascade))

+

+

+; (postmodern:create-table 'rss-item-store)

+

+(defclass user ()

+  ((id)

+   (foreign-id)

+   (email)

+   (first-name)

+   (gender)

+   (last-name)

+   (link)

+   (locale)

+   

+   )

+  )