@@ -49,14 +49,19 @@

      :flex-grow 0

      :flex-shrink 0

      :flex-direction column)

-    ((nav a)

+    ((:or (nav a) (:and a "[data-ic-get-from]"))

+     :cursor pointer

      :font-weight bold

-     :padding 1.5rem

      :text-align right

      :text-decoration underline)

+    ((nav a)

+     :padding 1.5rem)

     ((nav (:and a :hover))

      :background ,(link-color layout)

      :color ,(background-color layout))

+    (("#content" img)

+     :max-width "70%"

+     :margin 1em)

     (main

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

      :flex-grow 1

@@ -40,7 +40,16 @@

                                                      (find feed (feeds app)

                                                            :key 'feed-key

                                                            :test 'string-equal))

-                                          params)))))))

+                                          params)))))

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

+                          (optima:match params

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

+                             (araneus:run-route (feed-item-page (feeds app)

+                                                                (find feed (feeds app)

+                                                                      :key 'feed-key

+                                                                      :test 'string-equal)

+                                                                item)

+                                                params)))))))

 (defun start (app)

   (prog1 app

@@ -35,3 +35,7 @@

          (plump:parse

           description))))))

+(defun id->slug (it)

+  (ironclad:byte-array-to-hex-string

+   (ironclad:digest-sequence :sha256

+                             (babel:string-to-octets it))))

@@ -36,15 +36,17 @@

   (plump:first-element

    (plump:parse

     (spinneret:with-html-string

-      (:li

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

-           (plump:decode-entities

-            (alimenta:title item)))

-       (:p.description

-        (let ((description (fwoar.rss-reader:prepare-feed-item-description renderer item)))

-          (when description

-            (plump:decode-entities

-             description)))))))))

+      (:li (:a :data-ic-push-url "true"

+               :data-ic-get-from (format nil "/f/~a/~a"

+                                         (fwoar.rss-reader::feed-key renderer)

+                                         (fwoar.rss-reader::id->slug (alimenta:id item)))

+               (plump:decode-entities

+                (alimenta:title item)))

+           (:p.description

+            (let ((description (fwoar.rss-reader:prepare-feed-item-description renderer item)))

+              (when description

+                (plump:decode-entities

+                 description)))))))))

 (defmethod alimenta.render:add-rendered-item (feed-r item-r (renderer fwoar.rss-reader:feed-reference))

   (lquery:$

@@ -6,6 +6,16 @@

 (defclass rss-reader-route ()

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

+(defun nav (route)

+  (spinneret:with-html

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

+          for idx from 0

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

+                      :class (if (string= (feed-key feed)

+                                          (feed-key (feed route)))

+                                 "active" "")

+                      (feed-key feed)))))

+

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

@@ -18,7 +28,7 @@ the hook that pulls in CSS"

         (:head

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

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

                   :defer "defer")

          (:script :defer "defer"

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

@@ -48,7 +58,9 @@ the hook that pulls in CSS"

     ((:or h1 h2 h3 h4 h5 h6)

      :font-size 1.6rem)

     ((:or ul ol)

-     :padding-left 2rem)))

+     :padding-left 2rem)

+    (.active

+     :background "#888")))

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

   `(let ((content (lambda ()

@@ -71,7 +83,7 @@ the hook that pulls in CSS"

 (defmethod araneus:view ((route feed-page) (model fwoar.intercooler:intercooler-request))

   (spinneret:with-html

-    (:main#content

+    (spinneret:html

      (alimenta:render (fwoar.intercooler:request model)

                       (feed route)))))

@@ -81,15 +93,46 @@ the hook that pulls in CSS"

     (:div.main

      (:nav

       :data-ic-push-url "true"

-      :data-ic-target "main"

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

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

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

-                        (feed-key feed))))

+      :data-ic-target "#content"

+      :data-ic-switch-class "active"

+      (nav route))

      (:main#content

+      :data-ic-target "#content"

       (alimenta:render (fwoar.intercooler:request model)

                        (feed route))))))

+(defclass+ feed-item-page ((rss-reader-route (feed-list))

+                           fwoar.intercooler:intercooler-route

+                           fwoar.default-layout:default-layout)

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

+   (%item :initarg :item :reader item)))

+

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

+  (find (item route)

+        (resolve-feed-reference (feed route))

+        :key (alexandria:compose 'id->slug 'alimenta:id)

+        :test 'string-equal))

+

+(defmethod araneus:view ((route feed-item-page) (model fwoar.intercooler:intercooler-request))

+  (spinneret:with-html

+    (:raw

+     (alimenta:content (fwoar.intercooler:request model)))))

+

+(defmethod araneus:view ((route feed-item-page) (model fwoar.intercooler:full-request))

+  (spinneret:with-html

+    (:h1 "Hello, World!")

+    (:div.main

+     (:nav

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

+      :data-ic-target "#content"

+      #+(or)(:data-ic-replace-target "true")

+      :data-ic-switch-class "active"

+      (nav route))

+     (:main#content

+      :data-ic-target "#content"

+      (:raw

+       (alimenta:content (fwoar.intercooler:request model)))))))

+

 (defmethod fwoar.default-layout:border-color ((layout rss-reader-route))

   "#BDE0F3")

 (defmethod fwoar.default-layout:background-color ((layout rss-reader-route))