Merge pull request #15 from calcit-lang/scrolls

refine scroll areas; add link to mdbook

Author: soyaine

.github/workflows/npm-publish.yaml

@@ -0,0 +1,21 @@
+
+name: npm publish
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 16
+        registry-url: https://registry.npmjs.org/
+
+    - run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.npmignore

@@ -0,0 +1,11 @@
+
+.github/
+book/
+js-out/
+docs/
+calcit.cirru
+compact.cirru
+yarn.lock
+.*.cirru
+index.html
+main.mjs

assets/main.css

@@ -1,7 +1,7 @@
 
 @import url("./github-gist.css");
-@import url("../node_modules/github-markdown-css/github-markdown.css");
-@import url("../node_modules/cirru-color/assets/cirru.css");
+@import url("github-markdown-css/github-markdown.css");
+@import url("cirru-color/assets/cirru.css");
 
 body {
   margin: 0;
@@ -24,7 +24,8 @@ body * {
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: hsla(200,80%,76%,0.8);
+  background-color: hsla(180,60%,76%,0.8);
+  border-radius: 2px;
 }
 
 ::-webkit-scrollbar-corner {
@@ -41,6 +42,7 @@ pre {
   padding: 2px 8px;
   line-height: 1.4;
   min-width: 400px;
+  border-radius: 4px;
 }
 
 .doc-entry:hover {

calcit.cirru

@@ -2,14 +2,14 @@
 {} (:package |docs-workflow)
   :configs $ {} (:init-fn |docs-workflow.main/main!) (:reload-fn |docs-workflow.main/reload!)
     :modules $ [] |respo.calcit/ |lilac/ |memof/ |respo-ui.calcit/ |respo-markdown.calcit/ |reel.calcit/ |respo-router.calcit/ |alerts.calcit/
-    :version |0.0.4
+    :version |0.0.5
   :entries $ {}
   :files $ {}
     |docs-workflow.comp.container $ {}
       :ns $ quote
         ns docs-workflow.comp.container $ :require (respo-ui.core :as ui)
           respo-ui.core :refer $ hsl
-          respo.core :refer $ defcomp defeffect <> >> div button textarea span input list->
+          respo.core :refer $ defcomp defeffect <> >> div button textarea span input list-> a
           respo.comp.space :refer $ =<
           reel.comp.reel :refer $ comp-reel
           respo-md.comp.md :refer $ comp-md
@@ -46,7 +46,9 @@
           def style-entry $ {} (:padding "\"0 8px") (:cursor :pointer) (:transition-duration "\"200ms") (:line-height 2.4)
             :border-bottom $ str "\"1px solid " (hsl 0 0 92)
             :border-left $ str "\"0px solid " (hsl 200 90 60)
-            :background-color $ hsl 0 0 100 0.6
+        |style-title $ quote
+          def style-title $ {} (:font-family ui/font-fancy) (:font-size 18) (:font-weight 300)
+            :color $ hsl 0 0 60
         |comp-container $ quote
           defcomp comp-container (reel docs)
             let
@@ -56,6 +58,7 @@
                 state $ or (:data states)
                   {}
                     :selected $ []
+                      :key $ first docs
                     :history $ []
                 selected $ :selected state
                 history $ :history state
@@ -67,7 +70,8 @@
                     :render $ fn (on-close)
                       div
                         {} $ :style
-                          {} $ :padding "\"0 16px"
+                          merge ui/expand $ {} (:padding "\"16px 16px 120px")
+                            :border-top $ str "\"1px solid " (hsl 0 0 94)
                         comp-nav-tree docs ([])
                           fn (path d!)
                             d! cursor $ next-path state path
@@ -76,28 +80,33 @@
                   :style $ merge ui/fullscreen ui/global ui/row
                 div
                   {} $ :style
-                    {} (:padding "\"0 8px") (:width "\"20%") (:min-width 266) (:background-color :white)
+                    merge ui/column $ {} (:padding "\"0 8px") (:width "\"20%") (:min-width 266) (:background-color :white)
                       :border-right $ str "\"1px solid " (hsl 0 0 94)
                   div
                     {}
                       :style $ {} (:position :absolute) (:right 8) (:top 4)
                       :on-click $ fn (e d!) (.show quick-modal d!)
-                    <> "\"Quick Jump" $ {} (:cursor :pointer) (:font-family ui/font-fancy)
+                    <> "\"Quick Jump" $ merge
+                      {} (:cursor :pointer) (:font-family ui/font-fancy)
                   div
                     {} $ :style
-                      {} $ :margin-top 12
-                    <> "\"Pages" $ {} (:font-family ui/font-fancy)
+                      merge ui/row-parted $ {} (:margin-top 12)
+                    <> "\"Pages" style-title
+                    a $ {} (:href "\"mdbook.html") (:inner-text "\"mdbook")
+                      :style $ {} (:font-size 12) (:font-family ui/font-fancy) (:opacity 0.3)
                   comp-parent-menu selected docs $ fn (path d!)
                     d! cursor $ next-path state path
                   let
                       parent-path $ or (butlast selected) ([])
                       entries $ find-entries docs parent-path
-                    comp-page-entries (last selected) parent-path entries $ fn (xs d!)
-                      d! cursor $ next-path state xs
+                    div
+                      {} $ :style ui/expand
+                      comp-page-entries (last selected) parent-path entries $ fn (xs d!)
+                        d! cursor $ next-path state xs
                   div
                     {} $ :style
                       {} $ :margin-top 20
-                    <> "\"Histories" $ {} (:font-family ui/font-fancy)
+                    <> "\"Histories" style-title
                     comp-history-menu history docs $ fn (path d!)
                       d! cursor $ next-path state path
                 let
@@ -106,17 +115,15 @@
                     {} $ :style ui/expand
                     let
                         children $ or (:children target) ([])
-                      if (empty? children) nil $ div
-                        {} $ :style
-                          {} $ :padding "\"16px"
-                        div ({})
-                          <> "\"Children pages" $ {} (:font-family ui/font-fancy)
-                        comp-page-entries nil (:selected state) children $ fn (xs d!)
+                      if (empty? children) nil $ comp-child-entries (:selected state) children
+                        fn (xs d!)
                           d! cursor $ next-path state xs
                     comp-doc-page target
                     =< nil 120
                 .render quick-modal
                 when dev? $ comp-reel (>> states :reel) reel ({})
+        |style-child-entry $ quote
+          def style-child-entry $ {} (:padding "\"0 8px") (:cursor :pointer) (:transition-duration "\"200ms") (:line-height 2.4)
         |find-target $ quote
           defn find-target (entries path)
             if (empty? path) nil $ let
@@ -143,7 +150,8 @@
                         target $ find-target docs sub-path
                       [] idx $ div
                         {}
-                          :style $ {} (:cursor :pointer) (:font-style :italic)
+                          :style $ {} (:cursor :pointer) (:font-style :italic) (:font-family ui/font-fancy)
+                            :color $ hsl 0 0 40
                             :background-color $ hsl 180 90 94
                           :on-click $ fn (e d!) (on-select sub-path d!)
                         <> $ str "\"< "
@@ -174,9 +182,14 @@
                         div
                           {} (:class-name "\"doc-entry")
                             :style $ merge style-entry
-                              if selected? $ {} (:background-color :white)
+                              if selected? $ {}
                                 :border-left $ str "\"10px solid " (hsl 200 90 70)
                           <> $ :title entry
+                          =< 8 nil
+                          if
+                            not $ empty? (:children entry)
+                            <> "\"☰" $ {}
+                              :color $ hsl 180 80 60
         |comp-doc-page $ quote
           defcomp comp-doc-page (target)
             if (some? target)
@@ -221,6 +234,30 @@
               target $ find-target entries path
               :children target
               do (js/console.warn "\"no entries found for" entries path) ([])
+        |comp-child-entries $ quote
+          defcomp comp-child-entries (parent-path entries on-select)
+            div
+              {} $ :style
+                {} (:padding "\"8px") (:min-width 320) (:max-width 400) (:background-color :white) (:margin "\"8px 12px") (:border-radius "\"4px")
+                  :border $ str "\"1px solid " (hsl 0 0 86)
+              <> "\"Child pages" style-title
+              list-> ({})
+                -> entries $ map-indexed
+                  fn (idx entry)
+                    [] idx $ div
+                      {} $ :on-click
+                        fn (e d!)
+                          on-select
+                            conj parent-path $ :key entry
+                            , d!
+                      div
+                        {} (:class-name "\"doc-entry") (:style style-child-entry)
+                        <> $ :title entry
+                        =< 8 nil
+                        if
+                          not $ empty? (:children entry)
+                          <> "\"☰" $ {}
+                            :color $ hsl 180 80 60
     |docs-workflow.schema $ {}
       :ns $ quote (ns docs-workflow.schema)
       :defs $ {}
@@ -241,8 +278,13 @@
                   :content $ load-doc "\"design.md"
                 {} (:title "\"Overview") (:key :overview)
                   :content $ load-doc "\"overview.md"
+                  :children $ []
+                    {} (:title "\"Cirru") (:key :cirru)
+                      :content $ load-doc "\"cirru.md"
             {} (:title "\"About") (:key :about)
               :content $ load-doc "\"about.md"
+            {} (:title "\"Cirru") (:key :cirru)
+              :content $ load-doc "\"cirru.md"
         |load-doc $ quote
           defmacro load-doc (filename)
             read-file $ str "\"docs/" filename
@@ -270,10 +312,6 @@
           docs-workflow.config :as config
           "\"./calcit.build-errors" :default build-errors
           "\"bottom-tip" :default hud!
-          "\"highlight.js" :default hljs
-          "\"highlight.js/lib/languages/bash" :default bash-lang
-          "\"highlight.js/lib/languages/clojure" :default clojure-lang
-          "\"highlight.js/lib/languages/rust" :default rust-lang
       :defs $ {}
         |render-app! $ quote
           defn render-app! () $ render! mount-target (comp-container @*reel schema/docs) dispatch!
@@ -286,7 +324,7 @@
         |*reel $ quote
           defatom *reel $ -> reel-schema/reel (assoc :base schema/store) (assoc :store schema/store)
         |main! $ quote
-          defn main! () (.!registerLanguage hljs "\"clojure" clojure-lang) (.!registerLanguage hljs "\"bash" bash-lang) (.!registerLanguage hljs "\"rust" rust-lang)
+          defn main! () (config/register-languages!)
             println "\"Running mode:" $ if config/dev? "\"dev" "\"release"
             if config/dev? $ load-console-formatter!
             render-app!
@@ -313,9 +351,12 @@
               hud! "\"ok~" "\"Ok"
             hud! "\"error" build-errors
     |docs-workflow.config $ {}
-      :ns $ quote (ns docs-workflow.config)
+      :ns $ quote
+        ns docs-workflow.config $ :require ("\"highlight.js/lib/languages/rust" :default rust-lang) ("\"highlight.js/lib/languages/clojure" :default clojure-lang) ("\"highlight.js/lib/languages/bash" :default bash-lang) ("\"highlight.js" :default hljs)
       :defs $ {}
         |dev? $ quote
           def dev? $ = "\"dev" (get-env "\"mode")
         |site $ quote
           def site $ {} (:storage-key "\"workflow")
+        |register-languages! $ quote
+          defn register-languages! () (.!registerLanguage hljs "\"clojure" clojure-lang) (.!registerLanguage hljs "\"bash" bash-lang) (.!registerLanguage hljs "\"rust" rust-lang)

compact.cirru

@@ -5,4 +5,6 @@
   - [Guide](guide.md)
   - [Design](design.md)
   - [Overview](overview.md)
+    - [Cirru demo](cirru.md)
 - [About](about.md)
+- [Cirru demo](cirru.md)

docs/SUMMARY.md

@@ -0,0 +1,6 @@
+# Cirru
+
+```cirru
+defn main ()
+  println |demo
+```

docs/cirru.md

@@ -1,5 +1,6 @@
 {
-  "version": "0.0.4",
+  "version": "0.0.5",
+  "name": "@calcit/docs-workflow",
   "dependencies": {
     "@calcit/procs": "^0.5.28"
   },