@@ -2,32 +2,52 @@

   (:use :cl )

   (:export

    #:default-layout

-   #:border-color))

+   #:border-color

+   #:background-color

+   #:text-color

+   #:link-color))

 (in-package :fwoar.default-layout)

-(defclass default-layout ()

-  ((%border-color :reader border-color :initform "#eee")))

-

 (defgeneric border-color (layout)

   )

+(defgeneric text-color (layout)

+  )

+(defgeneric link-color (layout)

+  (:method (layout)

+    (text-color layout)))

+(defgeneric background-color (layout)

+  )

+

+(defclass default-layout ()

+  ((%text-color :reader text-color :initform "#eee")

+   (%border-color :reader border-color :initform "#eee")

+   (%background-color :reader background-color :initform "#eee")))

 (defmethod araneus:styles append ((layout default-layout))

   `((body

+     :background ,(background-color layout)

+     :color ,(text-color layout)

      :display flex

      :flex-direction column

      :min-height 100vh)

+    (a

+     :color ,(link-color layout))

     (h1

      :height 3em

-     :border-bottom 1px solid ,(border-color layout)

+     :border-bottom 4px double ,(border-color layout)

      :text-align center

      :line-height 3em)

     (div.main

      :display flex

      :width 100%

-     :flex-grow 1)

+     :flex-grow 1

+     :flex-shrink 1

+     )

     (nav

-     :width 10%

+     :width 20rem

      :display flex

+     :flex-grow 0

+     :flex-shrink 0

      :flex-direction column)

     ((nav a)

      :font-weight bold

@@ -35,9 +55,11 @@

      :text-align right

      :text-decoration underline)

     ((nav (:and a :hover))

-     :background "#eee")

+     :background ,(link-color layout)

+     :color ,(background-color layout))

     (main

+     :border-left 4px double ,(border-color layout)

      :flex-grow 1

+     :flex-shrink 1

      :padding 1.5rem

-     :border-left 1px solid ,(border-color layout)

-     :flex-shrink 1)))

+     :max-width 50em)))

@@ -7,15 +7,25 @@

   (:documentation "the clack handler representing the currently running application"))

 (defclass+ rss-reader ()

-  ((%app :initform (make-instance 'ningle:<app>)

+  ((%feeds :initarg :feeds :accessor feeds)

+   (%app :initform (make-instance 'ningle:<app>)

          :reader app)

    (%handler :accessor handler))

   (:documentation

    "A simple wrapper that ties a ningle app to a clack handler"))

+

 (defmethod araneus:routes progn ((app rss-reader))

   (araneus:defroutes (app app)

     (("/") (serapeum:partial 'araneus:run-route (make-instance 'homepage)))

+    (("/f/:feed") (lambda (params)

+                    (optima:match params

+                      ((optima.extra:alist (:feed . feed))

+                       (araneus:run-route (feed-page

+                                           (feeds app)

+                                           (serapeum:assocdr feed (feeds app)

+                                                             :test 'string-equal))

+                                          params)))))

     (("/other") (serapeum:partial 'araneus:run-route 'other))))

 (defun start (app)

@@ -23,5 +33,16 @@

         (clack:clackup (app app)))

   app)

+(defvar *app*)

+

+(defun unboundp (symbol)

+  (not (boundp symbol)))

+

 (defun main ()

-  (start (araneus:routes (rss-reader))))

+  (setf *app*

+        (if (not (boundp '*app*))

+            (start

+             (araneus:routes

+              (rss-reader `((:techcrunch . "https://techcrunch.com/feed/")

+                            (:just-thomism . "https://thomism.wordpress.com/feed/")))))

+            *app*)))

@@ -5,7 +5,8 @@

 (defpackage :fwoar.rss-reader.ui

   (:use :cl :parenscript)

   (:export ui

-           #:homepage))

+           #:homepage

+           #:intercooler-debugger))

 (defpackage :fwoar.rss-reader

   (:use :cl )

@@ -22,6 +22,7 @@

   :components ((:file "package")

                (:file "utils" :depends-on ("package"))

                (:file "default-layout")

+               (:file "rss-render")

                (:file "ui" :depends-on ("package"))

-               (:file "view" :depends-on ("package" "ui" "default-layout"))

+               (:file "view" :depends-on ("package" "ui" "default-layout" "rss-render"))

                (:file "main" :depends-on ("package" "utils" "view"))))

new file mode 100644

@@ -0,0 +1,35 @@

+(defpackage :fwoar.rss-render

+  (:use :cl )

+  (:export

+   #:summary))

+(in-package :fwoar.rss-render)

+

+(defmethod alimenta.render:render-feed (feed (renderer (eql 'summary)))

+  (plump:parse

+   (spinneret:with-html-string

+     (:div.feed

+      (:section

+       (:h2.title (plump:decode-entities

+                   (alimenta:title feed)))

+       (:p.description (plump:decode-entities

+                        (alimenta:description feed))))

+      (:ul.items)))))

+

+(defmethod alimenta.render:render-item (item feed (renderer (eql 'summary)))

+  (plump:first-element

+   (plump:parse

+    (spinneret:with-html-string

+      (:li

+       (:a :href (alimenta:link item)

+           (plump:decode-entities

+            (alimenta:title item)))

+       (:p.description

+        (plump:decode-entities

+         (alimenta:description item))))))))

+

+(defmethod alimenta.render:add-rendered-item (feed-r item-r (renderer (eql 'summary)))

+  (lquery:$

+    (inline feed-r)

+    ".items"

+    (append item-r))

+  feed-r)

@@ -5,16 +5,24 @@

     (:h1 "Hello, World!")

     (:div.main

      (:nav

+      :data-ic-target "main"

+      :data-ic-replace-target "true"

       (:a :data-ic-get-from "/"

-          :data-ic-target "#content"

           "home")

       (:a :data-ic-get-from "/other"

-          :data-ic-target "#content"

           "other")

       (:a :data-ic-get-from "/third"

-          :data-ic-target "#content"

           "third")

       (:a :data-ic-get-from "/fourth"

-          :data-ic-target "#content"

           "fourth"))

-     (:main#content content))))

+     (funcall content))))

+

+

+(defun intercooler-debugger ()

+  (ps

+    (defun cdnjs-library (name version &key (file name))

+      (chain

+       $ (get-script

+          "https://cdnjs.cloudflare.com/ajax/libs/intercooler-js/1.2.2/intercooler-debugger.js")))

+    (cdnjs-library

+     "intercooler-js" "1.2.2" #+(or)"intercooler-debugger.js")))

@@ -12,7 +12,12 @@

                                                                           :initarg)))

                                        (make-symbol (symbol-name initarg)))))

                                   direct-slots))))

-    `(progn (defclass ,name ,super

+    `(progn (defclass ,name

+                ,(mapcar (lambda (it)

+                           (typecase it

+                             (cons (car it))

+                             (t it)))

+                  super)

               ,direct-slots

               ,@options)

             (defun ,name (,@initargs)

@@ -1,23 +1,31 @@

 (in-package :fwoar.rss-reader)

 (defclass rss-reader-route ()

+  ((%feed-list :initarg :feed-list :reader feed-list)))

+

+(defclass+ intercooler-request ()

+  ((%request :initarg :request :reader request)))

+(defclass+ partial-request ((intercooler-request (request)))

+  ())

+(defclass+ full-request ((intercooler-request (request)))

   ())

 (defmethod araneus:view :around ((route rss-reader-route) model)

   "basic html and javascript for our app, as well as an invocation of

 the hook that pulls in CSS"

-  (ecase model

-    (:full

+  (etypecase model

+    (full-request

      (spinneret:with-html-string

        (:doctype)

        (:html

         (:head

-         (:script :src "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"

-                  :defer "defer")

+         (:script :src "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")

          (:script :src

                   "https://cdnjs.cloudflare.com/ajax/libs/intercooler-js/1.2.2/intercooler.min.js"

                   :defer "defer")

+         (:script :defer "defer"

+                  (:raw (fwoar.rss-reader.ui:intercooler-debugger)))

          (:meta :name "intercoolerjs:use-data-prefix"

                 :content "true"/)

          (:style

@@ -25,7 +33,7 @@ the hook that pulls in CSS"

                  (araneus:styles route))))

         (:body

          (call-next-method)))))

-    (:partial

+    (partial-request

      (spinneret:with-html-string

        (call-next-method)))))

@@ -46,6 +54,47 @@ the hook that pulls in CSS"

     ((:or ul ol)

      :padding-left 2rem)))

+(defclass+ feed-page ((rss-reader-route (feed-list)) fwoar.default-layout:default-layout)

+  ((%feed :initarg :feed :reader feed)))

+

+(defmethod araneus:controller ((route feed-page) params &key)

+  (funcall (if (equal (serapeum:assocdr "ic-request" params

+                                        :test 'equal)

+                      "true")

+               'partial-request

+               'full-request)

+           (alimenta.pull-feed:pull-feed (feed route))))

+

+(defmacro with-layout ((render-type layout) &body content)

+  `(let ((content (lambda ()

+                    (spinneret:with-html

+                      (:main

+                       ,@content)))))

+     (ecase ,render-type

+       (:full (spinneret:with-html

+                (,layout content)))

+       (:partial (funcall content)))))

+

+(defmethod araneus:view ((_ feed-page) (model intercooler-request))

+  (spinneret:with-html

+    (:main#content

+     (alimenta:render (request model)

+                      'fwoar.rss-render:summary))))

+(defmethod araneus:view ((route feed-page) (model full-request))

+  (spinneret:with-html

+    (:h1 "Hello, World!")

+    (:div.main

+     (:nav

+      :data-ic-push-url "true"

+      :data-ic-target "main"

+      :data-ic-replace-target "true"

+      (loop for (feed-id) in (feed-list route)

+            collect (:a :data-ic-get-from (format nil "/f/~a" (string-downcase feed-id))

+                        feed-id)))

+     (:main#content

+      (alimenta:render (request model)

+                       'fwoar.rss-render:summary)))))

+

 (defclass homepage (rss-reader-route fwoar.default-layout:default-layout)

   ())

@@ -61,15 +110,14 @@ the hook that pulls in CSS"

       :full))

 (defmethod araneus:view ((route homepage) model)

-  (let ((content "home content"))

-    (ecase model

-      (:full (fwoar.rss-reader.ui:homepage content))

-      (:partial (spinneret:with-html

-                  (:raw (with-output-to-string (s)

-                          (cl-markdown:markdown content

-                                                :stream s))))))))

+  (with-layout (model fwoar.rss-reader.ui:homepage)

+    (:raw

+     (plump:serialize (alimenta:render (alimenta.pull-feed:pull-feed

+                                        "https://thomism.wordpress.com/feed/")

+                                       'fwoar.rss-render:summary)

+                      nil))))

 (araneus:define-controller other (_)

   (values))

 (araneus:define-view other (_)

-  "<h2>???</h2>")

+  "<main><h2>???</h2></main>")