Journal continued

.projectile

@@ -0,0 +1,9 @@
+-/.git
+-/api/.cpcache
+-/api/.shadow-cljs/
+-/api/node_modules/
+-/web/.cpcache
+-/web/.shadow-cljs/
+-/web/node_modules/
+-/web/public/static/js/cljs-runtime/
+-/web/public/static/js/main.js

web/public/static/css/style.css

@@ -249,11 +249,11 @@ textarea {
     outline: none;
 }
 
-#content ol, #content ui {
+.content ol, .content ui {
     list-style: disc;
     margin-left: 1em;
 }
 
-#content p, #content div {
+.content p, .content div {
     word-break: break-word;
 }

web/src/frontend/components/file.cljs

@@ -28,7 +28,7 @@
         suffix (last (string/split path #"\."))]
     (sidebar/sidebar
      (if (and suffix (contains? #{"md" "markdown" "org"} suffix))
-       [:div#content
+       [:div.content
         [:a {:href (str "/file/" encoded-path "/edit")}
          "edit"]
         (cond
@@ -60,7 +60,7 @@
         [_encoded-path path] (get-path state)]
     (prn {:rows rows})
     (sidebar/sidebar
-     [:div#content
+     [:div.content
       [:h3.mb-2 (str "Update " path)]
       [:textarea
        {:rows rows

web/src/frontend/components/journal.cljs

@@ -6,58 +6,50 @@
             [frontend.ui :as ui]
             [frontend.format :as format]
             [frontend.mixins :as mixins]
-            [frontend.db :as db]))
-
-(defonce content-atom (atom ""))
-(defonce edit?-atom (atom false))
-
-(defn today
-  []
-  (.toLocaleDateString (js/Date.) "default"
-                       (clj->js {:month "long"
-                                 :year "numeric"
-                                 :day "numeric"
-                                 :weekday "long"})))
-
+            [frontend.db :as db]
+            [frontend.state :as state]))
 
+(def edit-content (atom ""))
 (rum/defc editor-box <
   (mixins/event-mixin
    (fn [state]
-     (mixins/close-when-esc-or-outside
+     (mixins/hide-when-esc-or-outside
       state
-      edit?-atom
-      :on-close (fn []
-                  (reset! edit?-atom false)
-                  (handler/alter-file (util/current-journal-path) "Auto save" @content-atom false)))))
-  [content-atom]
-  (ui/textarea-autosize
-   {:on-change (fn [e]
-                 (reset! content-atom (util/evalue e)))
-    :default-value @content-atom
-    :auto-focus true
-    :style {:border "none"
-            :border-radius 0
-            :background "transparent"
-            :margin-top 12.5}}))
+      nil
+      :show-fn (fn []
+                 (:edit? @state/state))
+      :on-hide (fn []
+                 (handler/save-current-edit-journal! @edit-content)))))
+  [content]
+  [:div.flex-1
+   (ui/textarea-autosize
+    {:on-change (fn [e]
+                  (reset! edit-content (util/evalue e)))
+     :default-value content
+     :auto-focus true
+     :style {:border "none"
+             :border-radius 0
+             :background "transparent"
+             :margin-top 12.5}})])
+
+(rum/defc journal-cp < rum/reactive
+  [{:keys [uuid _title content] :as journal}]
+  (let [{:keys [edit? edit-journal]} (rum/react state/state)]
+    (if (and edit? (= uuid (:uuid edit-journal)))
+      (editor-box content)
+      [:div.flex-1 {:on-click (fn []
+                                (handler/edit-journal! content journal))
+                    :style {:padding 8
+                            :min-height 200}}
+       (util/raw-html (format/to-html content "org"))])))
 
-(rum/defcs journal < rum/reactive
+(rum/defcs journals < rum/reactive
   {:will-mount (fn [state]
-                 (reset! content-atom (db/get-current-journal))
+                 (handler/set-latest-journals!)
                  state)}
   [state]
-  (let [content (rum/react content-atom)
-        edit? (rum/react edit?-atom)
-        show-textarea? (or edit? (string/blank? content))]
-    (when (and show-textarea? (not edit?))
-      (reset! edit?-atom true))
-    [:div#content
-     [:h1 {:style {:color "#202b33"
-                   :font-weight 450}}
-      (today)]
-     (if show-textarea?
-       (editor-box content-atom)
-       [:div.flex-1 {:on-click (fn []
-                                 (reset! edit?-atom true))
-                     :style {:padding 8
-                             :min-height 200}}
-        (util/raw-html (format/to-html content "org"))])]))
+  (let [{:keys [latest-journals]} (rum/react state/state)]
+    [:div#journals.content
+     (for [journal latest-journals]
+       [:div.journal {:key (cljs.core/random-uuid)}
+        (journal-cp journal)])]))

web/src/frontend/components/sidebar.cljs

@@ -60,7 +60,7 @@
   (let [repos (db/get-repos)]
     [:div.max-w-7xl.mx-auto.px-4.sm:px-6.md:px-8
     (if (seq repos)
-      (journal/journal)
+      (journal/journals)
       (repo/add-repo))]))
 
 (rum/defcs sidebar < (mixins/modal)

web/src/frontend/db.cljs

@@ -5,7 +5,8 @@
             [datascript.transit :as dt]
             [frontend.format.org-mode :as org]
             [frontend.format.org.block :as block]
-            [clojure.string :as string]))
+            [clojure.string :as string]
+            [frontend.utf8 :as utf8]))
 
 ;; TODO: don't persistent :github/token
 
@@ -305,9 +306,7 @@
   [repo-url file content]
   (if (string/blank? content)
     []
-    (let [headings (-> content
-                       (org/parse-json)
-                       (util/json->clj))
+    (let [headings (org/->clj content)
           headings (block/extract-headings headings)]
       (map (fn [heading]
              (assoc heading
@@ -400,6 +399,36 @@
   []
   (get-file (util/current-journal-path)))
 
+(defn get-latest-journals
+  ([]
+   (get-latest-journals {}))
+  ([{:keys [days content]
+     :or {days 7}}]
+   (when-let [content (or content (get-current-journal))]
+    (let [journal-path (util/current-journal-path)
+          content-arr (utf8/encode content)
+          end-pos (utf8/length content-arr)
+          blocks (take days (reverse (org/->clj content)))
+          headings (some->>
+                    blocks
+                    (filter (fn [block]
+                              (and (block/heading-block? block)
+                                   (= 1 (:level (second block))))))
+                    (map (fn [[_ {:keys [title meta]}]]
+                           {:title (last (first title))
+                            :file-path journal-path
+                            :start-pos (:pos meta)})))
+          [_ journals] (reduce (fn [[last-end-pos acc] heading]
+                                 (let [end-pos last-end-pos
+                                       acc (conj acc (assoc heading
+                                                            :uuid (cljs.core/random-uuid)
+                                                            :end-pos end-pos
+                                                            :content (utf8/substring content-arr
+                                                                                     (:start-pos heading)
+                                                                                     end-pos)))]
+                                   [(:start-pos heading) acc])) [end-pos []] headings)]
+      journals))))
+
 (comment
   (d/transact! conn [{:db/id -1
                       :repo/url "https://github.com/tiensonqin/notes"

web/src/frontend/format/org/block.cljs

@@ -1,13 +1,13 @@
 (ns frontend.format.org.block
   (:require [frontend.util :as util]))
 
-(defn- heading-block?
+(defn heading-block?
   [block]
   (and
    (vector? block)
    (= "Heading" (first block))))
 
-(defn- task-block?
+(defn task-block?
   [block]
   (and
    (heading-block? block)

web/src/frontend/format/org_mode.cljs

@@ -1,6 +1,8 @@
 (ns frontend.format.org-mode
   (:require ["mldoc_org" :as org]
-            [frontend.format.protocol :as protocol]))
+            [frontend.format.protocol :as protocol]
+            [frontend.util :as util]
+            [clojure.string :as string]))
 
 (def config
   (js/JSON.stringify
@@ -18,6 +20,14 @@
   [content]
   (.parseJson Org content))
 
+(defn ->clj
+  [content]
+  (if (string/blank? content)
+    {}
+    (-> content
+       (parse-json)
+       (util/json->clj))))
+
 (defn inline-list->html
   [json]
   (.inlineListToHtmlStr Org json))

web/src/frontend/fs.cljs

@@ -30,5 +30,6 @@
    (util/p-handle
     (stat dir path)
     (fn [_stat] true)
-    (fn [_error]
-      (write-file dir path initial-content)))))
+    (fn [error]
+      (write-file dir path initial-content)
+      false))))

web/src/frontend/handler.cljs

@@ -326,18 +326,23 @@
         {:keys [year month day weekday]} (util/get-date)
         file-path (str "/" path)
         ;; org-journal format, something like `* Tuesday, 06/04/13`
-        default-content (util/format "* %s, %d/%d/%d\n" weekday month day year)]
+        month (if (< month 10) (str "0" month) month)
+        day (if (< day 10) (str "0" day) day)
+        default-content (util/format "* %s, %s/%s/%d\n" weekday month day year)]
     (->
      (util/p-handle
       (fs/mkdir (str repo-dir "/journals"))
       (fn [result]
         (fs/create-if-not-exists repo-dir file-path default-content))
       (fn [error]
-        ;; exists
         (fs/create-if-not-exists repo-dir file-path default-content)))
      (util/p-handle
-      (fn [result]
-        (git-add-commit repo-url path "create a month journal" default-content))
+      (fn [file-exists?]
+        (if file-exists?
+          (prn "Month journal already exists!")
+          (do
+            (prn "create a month journal")
+            (git-add-commit repo-url path "create a month journal" default-content))))
       (fn [error]
         (prn error))))))
 
@@ -363,7 +368,8 @@
 (defn re-render!
   []
   (when-let [comp (get @state/state :root-component)]
-    (rum/request-render comp)))
+    (when-not (:edit? @state/state)
+      (rum/request-render comp))))
 
 (defn db-listen-to-tx!
   []
@@ -389,6 +395,46 @@
   (periodically-pull repo-url)
   (periodically-push-tasks repo-url))
 
+(defn set-state-kv!
+  [key value]
+  (swap! state/state assoc key value))
+
+(defn edit-journal!
+  [content journal]
+  (swap! state/state assoc
+         :edit? true
+         :edit-journal journal))
+
+(defn set-latest-journals!
+  []
+  (set-state-kv! :latest-journals (db/get-latest-journals {})))
+
+(defn set-journal-content!
+  [uuid content]
+  (swap! state/state update :latest-journals
+         (fn [journals]
+           (mapv
+            (fn [journal]
+              (if (= (:uuid journal) uuid)
+                (assoc journal :content content)
+                journal))
+            journals))))
+
+(defn save-current-edit-journal!
+  [edit-content]
+  (let [{:keys [edit-journal]} @state/state
+        {:keys [start-pos end-pos]} edit-journal]
+    (swap! state/state assoc
+           :edit? false
+           :edit-journal nil)
+    (when-not (= edit-content (:content edit-journal)) ; if new changes
+      (let [path (:file-path edit-journal)
+            current-journals (db/get-file path)
+            new-content (utf8/insert! current-journals start-pos end-pos edit-content)]
+        (prn {:new-content new-content})
+        (set-state-kv! :latest-journals (db/get-latest-journals {:content new-content}))
+        (alter-file path "Auto save" new-content false)))))
+
 (defn start!
   []
   (db/restore!)
@@ -398,4 +444,5 @@
   (let [repos (db/get-repos)]
     (doseq [repo repos]
       (create-month-journal-if-not-exists repo)
-      (periodically-pull-and-push repo))))
+      ;; (periodically-pull-and-push repo)
+      )))

web/src/frontend/mixins.cljs

@@ -48,25 +48,24 @@
 ;;        (util/clear-interval interval))
 ;;      (dissoc state name))})
 
-(defn close-when-esc-or-outside
-  [state open? & {:keys [on-close node]}]
-  (let [node (or node (rum/dom-node state))]
-    (when @open?
+(defn hide-when-esc-or-outside
+  [state show? & {:keys [on-hide node show-fn]}]
+  (let [node (or node (rum/dom-node state))
+        show? (if (and show-fn (fn? show-fn))
+                (show-fn)
+                @show?)]
+    (when show?
       (listen state js/window "click"
               (fn [e]
                 ;; If the click target is outside of current node
                 (when-not (dom/contains node (.. e -target))
-                  (prn "hide b")
-                  (on-close e))))
+                  (on-hide e))))
 
       (listen state js/window "keydown"
               (fn [e]
-                (prn "key code: " (.-keyCode e))
                 (case (.-keyCode e)
                   ;; Esc
-                  27 (do
-                       (prn "hide a")
-                       (on-close e))
+                  27 (on-hide e)
                   nil))))))
 
 (defn event-mixin
@@ -92,9 +91,9 @@
     (event-mixin
      (fn [state]
        (let [open? (get state k)]
-         (close-when-esc-or-outside state
+         (hide-when-esc-or-outside state
                                     open?
-                                    :on-close (fn []
+                                    :on-hide (fn []
                                                 (reset! open? false)))))
      (fn [state]
        (let [open? (atom false)

web/src/frontend/state.cljs

@@ -7,4 +7,6 @@
              :notification/text nil
              :root-component nil
              :git-status nil
-             :git-error nil}))
+             :git-error nil
+             :edit? false
+             :latest-journals []}))

web/src/frontend/utf8.cljs

@@ -1,4 +1,6 @@
-(ns frontend.utf8)
+(ns frontend.utf8
+  (:require [goog.object :as gobj]))
+
 (defonce encoder
   (js/TextEncoder. "utf-8"))
 
@@ -16,3 +18,14 @@
   ([arr start end]
    (->> (.subarray arr start end)
         (.decode decoder))))
+
+(defn length
+  [arr]
+  (gobj/get arr "length"))
+
+(defn insert!
+  [s start-pos end-pos content]
+  (let [arr (encode s)]
+    (str (substring arr 0 start-pos)
+         content
+         (substring arr end-pos))))

web/src/frontend/util.cljs

@@ -123,5 +123,14 @@
 
 (defn current-journal-path
   []
-  (let [{:keys [year month]} (get-date)]
+  (let [{:keys [year month]} (get-date)
+        month (if (< month 10) (str "0" month) month)]
     (str "journals/" year "_" month ".org")))
+
+(defn today
+  []
+  (.toLocaleDateString (js/Date.) "default"
+                       (clj->js {:month "long"
+                                 :year "numeric"
+                                 :day "numeric"
+                                 :weekday "long"})))