greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UI improvement

pull/645/head
Tienson Qin 2020-04-02 15:25:38 +08:00
parent 61829ecd88
commit 51e6017cc2
5 changed files with 69 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/public/static/js/manifest.edn
View File

File diff suppressed because one or more lines are too long

79
web/src/frontend/components/agenda.cljs
View File

@ -1,46 +1,49 @@
(ns frontend.components.agenda
;; (:require [rum.core :as rum]
;; [frontend.mui :as mui]
;; [frontend.util :as util]
;; [frontend.handler :as handler]
;; [frontend.format.org.block :as block]
;; [frontend.state :as state]
;; [clojure.string :as string]
;; [frontend.format.org-mode :as org])
)
(:require [rum.core :as rum]
[frontend.util :as util]
[frontend.handler :as handler]
[frontend.format.org.block :as block]
[frontend.state :as state]
[clojure.string :as string]
[frontend.format.org-mode :as org]
[frontend.components.sidebar :as sidebar]))
;; (rum/defc timestamps-cp
;; [timestamps]
;; [:ul
;; (for [[type {:keys [date time]}] timestamps]
;; (let [{:keys [year month day]} date
;; {:keys [hour min]} time]
;; [:li {:key type}
;; [:span {:style {:margin-right 6}} type]
;; [:span (if time
;; (str year "-" month "-" day " " hour ":" min)
;; (str year "-" month "-" day))]]))])
(rum/defc agenda
[]
(sidebar/sidebar [:div "Agenda"]))
;; (rum/defc title-cp
;; [title]
;; (let [title-json (js/JSON.stringify (clj->js title))
;; html (org/inline-list->html title-json)]
;; (util/raw-html html)))
(rum/defc timestamps-cp
[timestamps]
[:ul
(for [[type {:keys [date time]}] timestamps]
(let [{:keys [year month day]} date
{:keys [hour min]} time]
[:li {:key type}
[:span {:style {:margin-right 6}} type]
[:span (if time
(str year "-" month "-" day " " hour ":" min)
(str year "-" month "-" day))]]))])
;; (rum/defc marker-cp
;; [marker]
;; [:span {:class (str "marker-" (string/lower-case marker))
;; :style {:margin-left 8}}
;; (if (contains? #{"DOING" "IN-PROGRESS"} marker)
;; (str " (" marker ")"))])
(rum/defc title-cp
[title]
(let [title-json (js/JSON.stringify (clj->js title))
html (org/inline-list->html title-json)]
(util/raw-html html)))
;; (rum/defc tags-cp
;; [tags]
;; [:span
;; (for [tag tags]
;; [:span.tag {:key tag}
;; [:span
;; tag]])])
(rum/defc marker-cp
[marker]
[:span {:class (str "marker-" (string/lower-case marker))
:style {:margin-left 8}}
(if (contains? #{"DOING" "IN-PROGRESS"} marker)
(str " (" marker ")"))])
(rum/defc tags-cp
[tags]
[:span
(for [tag tags]
[:span.tag {:key tag}
[:span
tag]])])
;; (rum/defc agenda
;; [tasks]

2
web/src/frontend/components/file.cljs
View File

@ -55,7 +55,7 @@
[_encoded-path path] (get-path state)]
(sidebar/sidebar
[:div#content.flex.justify-center
[:div.m-6.flex-1 {:style {:max-width 900}}
[:div.m-6.flex-1 {:style {:max-width 800}}
[:h3.mb-2 (str "Update " path)]
[:textarea
{:rows (+ 3 (count-newlines @content))

35
web/src/frontend/components/sidebar.cljs
View File

@ -6,7 +6,7 @@
[frontend.components.repo :as repo]
[goog.crypt.base64 :as b64]
[frontend.util :as util]
))
[frontend.state :as state]))
(defonce active-button :a.group.flex.items-center.px-2.py-2.text-base.leading-6.font-medium.rounded-md.text-white.bg-gray-900.focus:outline-none.focus:bg-gray-700.transition.ease-in-out.duration-150)
(defonce inactive-button :a.mt-1.group.flex.items-center.px-2.py-2.text-base.leading-6.font-medium.rounded-md.text-gray-300.hover:text-white.hover:bg-gray-700.focus:outline-none.focus:text-white.focus:bg-gray-700.transition.ease-in-out.duration-150)
@ -28,25 +28,32 @@
(rum/defq files-list <
{:q (fn [] (db/sub-files))}
[state files]
[state files file-active?]
[:div.cursor-pointer.my-1.flex.flex-col.ml-2
(if (seq files)
(let [files (->> files (map first))]
(for [file files]
[:a {:key file
:class (util/hiccup->class "mt-1.group.flex.items-center.px-2.py-1.text-base.leading-6.font-medium.rounded-md.text-gray-500.hover:text-white.hover:bg-gray-700.focus:outline-none.focus:text-white.focus:bg-gray-700.transition.ease-in-out.duration-150")
:href (str "/file/" (b64/encodeString file))}
file])))])
(let [encoded-path (b64/encodeString file)]
[:a {:key file
:class (util/hiccup->class "mt-1.group.flex.items-center.px-2.py-1.text-base.leading-6.font-medium.rounded-md.text-gray-500.hover:text-white.hover:bg-gray-700.focus:outline-none.focus:text-white.focus:bg-gray-700.transition.ease-in-out.duration-150")
:style {:color (if (file-active? encoded-path) "#FFF")}
:href (str "/file/" encoded-path)}
file]))))])
(rum/defc sidebar-nav
(rum/defc sidebar-nav < rum/reactive
[]
[:nav.flex-1.px-2.py-4.bg-gray-800
(nav-item "Daily notes" "#"
"M3 12l9-9 9 9M5 10v10a1 1 0 001 1h3a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1h3a1 1 0 001-1V10M9 21h6"
true)
(nav-item "Agenda" "#"
"M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z")
(files-list)])
(let [{:keys [:route-match]} (rum/react state/state)
active? (fn [route] (= route (get-in route-match [:data :name])))
file-active? (fn [path]
(= path (get-in route-match [:parameters :path :path])))]
[:nav.flex-1.px-2.py-4.bg-gray-800
(nav-item "Daily notes" "/"
"M3 12l9-9 9 9M5 10v10a1 1 0 001 1h3a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1h3a1 1 0 001-1V10M9 21h6"
(active? :home))
(nav-item "Agenda" "/agenda"
"M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
(active? :agenda))
(files-list file-active?)]))
(rum/defq main-content <
{:q (fn [_state] (db/sub-repos))}

5
web/src/frontend/routes.cljs
View File

@ -4,6 +4,7 @@
[frontend.components.auth :as auth]
[frontend.components.repo :as repo]
[frontend.components.file :as file]
[frontend.components.agenda :as agenda]
))
(def routes
@ -26,6 +27,10 @@
{:name :file-edit
:view file/edit}]
["/agenda"
{:name :agenda
:view agenda/agenda}]
;; TODO: edit file
;; Settings
;; ["/item/:id"