From 537dfa241d4c113c1b8d1d53fd69bb14f616de34 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 12 Jan 2016 16:41:49 +0200 Subject: [PATCH] Update naming of lenses around all the project. --- frontend/uxbox/ui/dashboard/header.cljs | 4 ++-- frontend/uxbox/ui/dashboard/icons.cljs | 10 +++++----- frontend/uxbox/ui/dashboard/projects.cljs | 8 ++++---- frontend/uxbox/ui/users.cljs | 4 ++-- frontend/uxbox/ui/workspace.cljs | 2 +- frontend/uxbox/ui/workspace/base.cljs | 14 +++++++------- frontend/uxbox/ui/workspace/canvas.cljs | 2 +- frontend/uxbox/ui/workspace/colorpalette.cljs | 2 +- frontend/uxbox/ui/workspace/grid.cljs | 4 ++-- frontend/uxbox/ui/workspace/header.cljs | 4 ++-- frontend/uxbox/ui/workspace/lateralmenu.cljs | 2 +- frontend/uxbox/ui/workspace/pagesmngr.cljs | 12 ++++++------ frontend/uxbox/ui/workspace/sidebar.cljs | 2 +- frontend/uxbox/ui/workspace/toolboxes.cljs | 6 +++--- frontend/uxbox/ui/workspace/workarea.cljs | 4 ++-- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/frontend/uxbox/ui/dashboard/header.cljs b/frontend/uxbox/ui/dashboard/header.cljs index 297463961..36a07f279 100644 --- a/frontend/uxbox/ui/dashboard/header.cljs +++ b/frontend/uxbox/ui/dashboard/header.cljs @@ -12,7 +12,7 @@ [uxbox.ui.users :as ui.u] [uxbox.ui.util :as util])) -(def ^:static header-state +(def ^:static header-l (as-> (l/in [:dashboard]) $ (l/focus-atom $ s/state))) @@ -24,7 +24,7 @@ (defn header-render [own] - (let [local (rum/react header-state) + (let [local (rum/react header-l) projects? (= (:section local) :dashboard/projects) elements? (= (:section local) :dashboard/elements) icons? (= (:section local) :dashboard/icons) diff --git a/frontend/uxbox/ui/dashboard/icons.cljs b/frontend/uxbox/ui/dashboard/icons.cljs index 6d46daf25..55f6fca8f 100644 --- a/frontend/uxbox/ui/dashboard/icons.cljs +++ b/frontend/uxbox/ui/dashboard/icons.cljs @@ -21,7 +21,7 @@ ;; Lenses ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def ^:static dashboard-state +(def ^:static dashboard-l (as-> (l/in [:dashboard]) $ (l/focus-atom $ st/state))) @@ -31,7 +31,7 @@ (defn page-title-render [own coll] - (let [dashboard (rum/react dashboard-state) + (let [dashboard (rum/react dashboard-l) own? (:builtin coll false)] (html [:div.dashboard-title {} @@ -57,7 +57,7 @@ (defn nav-render [own] - (let [dashboard (rum/react dashboard-state) + (let [dashboard (rum/react dashboard-l) collid (:collection-id dashboard) own? (= (:collection-type dashboard) :own) builtin? (= (:collection-type dashboard) :builtin) @@ -100,14 +100,14 @@ (defn grid-render [own] - (let [dashboard (rum/react dashboard-state) + (let [dashboard (rum/react dashboard-l) coll-type (:collection-type dashboard) coll-id (:collection-id dashboard) own? (= coll-type :own) coll (get library/+icon-collections-by-id+ coll-id)] ;; coll (case coll-type ;; :builtin (get library/+color-collections-by-id+ coll-id) - ;; :own (rum/react collection-state))] + ;; :own (rum/react collection-l))] ;; edit-cb #(lightbox/open! :icon-form {:coll coll :icon %}) ;; remove-cb #(rs/emit! (dd/remove-icon {:id (:id coll) :icon %}))] ;; (println "KAKAKKA" coll-type coll-id coll) diff --git a/frontend/uxbox/ui/dashboard/projects.cljs b/frontend/uxbox/ui/dashboard/projects.cljs index 3b22baca9..091e39a1c 100644 --- a/frontend/uxbox/ui/dashboard/projects.cljs +++ b/frontend/uxbox/ui/dashboard/projects.cljs @@ -149,7 +149,7 @@ ;; Menu ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; (def ^:static menu-state +;; (def ^:static menu-l ;; (as-> (l/select-keys [:projects]) $ ;; (l/focus-atom $ s/state))) @@ -166,7 +166,7 @@ (defn menu-render [] - (let [state {:projects []} #_(rum/react menu-state) + (let [state {:projects []} #_(rum/react menu-l) pcount (count (:projects state))] (html [:section#dashboard-bar.dashboard-bar @@ -226,7 +226,7 @@ ;; Grid ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def ^:static grid-state +(def ^:static grid-l (as-> (l/select-keys [:projects-by-id]) $ (l/focus-atom $ s/state))) @@ -235,7 +235,7 @@ (letfn [(on-click [e] (dom/prevent-default e) (lightbox/open! :new-project))] - (let [state (rum/react grid-state)] + (let [state (rum/react grid-l)] (html [:section.dashboard-grid [:h2 "Your projects"] diff --git a/frontend/uxbox/ui/users.cljs b/frontend/uxbox/ui/users.cljs index 374da882b..41ab195cf 100644 --- a/frontend/uxbox/ui/users.cljs +++ b/frontend/uxbox/ui/users.cljs @@ -48,13 +48,13 @@ :user/avatar "http://lorempixel.com/50/50/"})) (def menu-open? (atom false)) -(def ^:static user-state +(def ^:static user-l (as-> (l/in [:user]) $ (l/focus-atom $ s/state))) (defn user-render [own] - (let [user (rum/react user-state) + (let [user (rum/react user-l) local (:rum/local own)] (html [:div.user-zone {:on-mouse-enter #(swap! local assoc :open true) diff --git a/frontend/uxbox/ui/workspace.cljs b/frontend/uxbox/ui/workspace.cljs index 21185f2b3..221dac220 100644 --- a/frontend/uxbox/ui/workspace.cljs +++ b/frontend/uxbox/ui/workspace.cljs @@ -53,7 +53,7 @@ (defn- workspace-render [own projectid] - (let [workspace (rum/react wb/workspace-state) + (let [workspace (rum/react wb/workspace-l) no-toolbars? (empty? (:toolboxes workspace))] (html [:div diff --git a/frontend/uxbox/ui/workspace/base.cljs b/frontend/uxbox/ui/workspace/base.cljs index 9766a377f..f8a73d572 100644 --- a/frontend/uxbox/ui/workspace/base.cljs +++ b/frontend/uxbox/ui/workspace/base.cljs @@ -15,28 +15,28 @@ ;; Lenses ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def ^:static project-state +(def ^:static project-l (as-> (ul/dep-in [:projects-by-id] [:workspace :project]) $ (l/focus-atom $ st/state))) -(def ^:static page-state +(def ^:static page-l (as-> (ul/dep-in [:pages-by-id] [:workspace :page]) $ (l/focus-atom $ st/state))) -(def ^:static pages-state +(def ^:static pages-l (as-> (ul/getter #(let [pid (get-in % [:workspace :project])] (dp/project-pages % pid))) $ (l/focus-atom $ st/state))) -(def ^:static workspace-state +(def ^:static workspace-l (as-> (l/in [:workspace]) $ (l/focus-atom $ st/state))) -(def ^:static active-toolboxes-state +(def ^:static toolboxes-l (as-> (l/in [:workspace :toolboxes]) $ (l/focus-atom $ st/state))) -(def ^:static flags-state +(def ^:static flags-l (as-> (l/in [:workspace :flags]) $ (l/focus-atom $ st/state))) @@ -75,7 +75,7 @@ (defonce mouse-b (rx/bus)) (defonce mouse-s (->> mouse-b - (rx/filter #(= (:id %) (:id @page-state))) + (rx/filter #(= (:id %) (:id @page-l))) (rx/map :coords))) ;; Deltas diff --git a/frontend/uxbox/ui/workspace/canvas.cljs b/frontend/uxbox/ui/workspace/canvas.cljs index ca107a79e..99cd9b073 100644 --- a/frontend/uxbox/ui/workspace/canvas.cljs +++ b/frontend/uxbox/ui/workspace/canvas.cljs @@ -211,7 +211,7 @@ (defn- canvas-render [own {:keys [width height id] :as page}] - (let [workspace (rum/react wb/workspace-state) + (let [workspace (rum/react wb/workspace-l) shapes-by-id (rum/react shapes-by-id) workspace-selected (:selected workspace) shapes (map #(get shapes-by-id %) (:shapes page)) diff --git a/frontend/uxbox/ui/workspace/colorpalette.cljs b/frontend/uxbox/ui/workspace/colorpalette.cljs index 0874f4063..9919afe61 100644 --- a/frontend/uxbox/ui/workspace/colorpalette.cljs +++ b/frontend/uxbox/ui/workspace/colorpalette.cljs @@ -42,7 +42,7 @@ (defn- colorpalette-render [own] (let [local (:rum/local own) - flags (rum/react wb/flags-state) + flags (rum/react wb/flags-l) collections-by-id (rum/react collections-by-id-l) collections (vals collections-by-id) collection (if-let [collid (:selected @local)] diff --git a/frontend/uxbox/ui/workspace/grid.cljs b/frontend/uxbox/ui/workspace/grid.cljs index ac4e7ae31..1382fca3e 100644 --- a/frontend/uxbox/ui/workspace/grid.cljs +++ b/frontend/uxbox/ui/workspace/grid.cljs @@ -56,8 +56,8 @@ (let [padding (* 0 zoom) ticks-mod (/ 100 zoom) step-size (/ 10 zoom) - flags (rum/react wb/flags-state) - page (rum/react wb/page-state) + flags (rum/react wb/flags-l) + page (rum/react wb/page-l) enabled? (contains? flags :workspace/grid) vertical-ticks (range (- 0 wb/document-start-y) (- (:width page) wb/document-start-y) diff --git a/frontend/uxbox/ui/workspace/header.cljs b/frontend/uxbox/ui/workspace/header.cljs index 2f204a676..42fbd3a2e 100644 --- a/frontend/uxbox/ui/workspace/header.cljs +++ b/frontend/uxbox/ui/workspace/header.cljs @@ -23,8 +23,8 @@ (defn header-render [own] - (let [page (rum/react wb/page-state) - flags (rum/react wb/flags-state) + (let [page (rum/react wb/page-l) + flags (rum/react wb/flags-l) toggle #(rs/emit! (dw/toggle-tool %))] (html [:header#workspace-bar.workspace-bar diff --git a/frontend/uxbox/ui/workspace/lateralmenu.cljs b/frontend/uxbox/ui/workspace/lateralmenu.cljs index f81e2262d..8bdeaa2f1 100644 --- a/frontend/uxbox/ui/workspace/lateralmenu.cljs +++ b/frontend/uxbox/ui/workspace/lateralmenu.cljs @@ -19,7 +19,7 @@ (defn lateralmenu-render [own] - (let [toolboxes (rum/react wb/active-toolboxes-state) + (let [toolboxes (rum/react wb/toolboxes-l) toggle #(rs/emit! (dw/toggle-toolbox %))] (html [:div#tool-bar.tool-bar diff --git a/frontend/uxbox/ui/workspace/pagesmngr.cljs b/frontend/uxbox/ui/workspace/pagesmngr.cljs index ff8cd46db..936ca7fc4 100644 --- a/frontend/uxbox/ui/workspace/pagesmngr.cljs +++ b/frontend/uxbox/ui/workspace/pagesmngr.cljs @@ -18,7 +18,7 @@ (let [data {:edit true :form page}] (reset! parent data)))] - (let [curpage (rum/react wb/page-state) + (let [curpage (rum/react wb/page-l) active? (= (:id curpage) (:id page)) deletable? (> numpages 1) navigate #(rs/emit! (dp/go-to (:project page) (:id page))) @@ -44,8 +44,8 @@ (defn- page-list-render [own parent] - (let [project (rum/react wb/project-state) - pages (rum/react wb/pages-state) + (let [project (rum/react wb/project-l) + pages (rum/react wb/pages-l) name (:name project)] (html [:div.project-bar-inside @@ -67,7 +67,7 @@ (defn- page-form-render [own parent] (let [form (:form @parent) - project @wb/project-state] + project @wb/project-l] (letfn [(on-change [e] (let [value (dom/event->value e)] (swap! parent assoc-in [:form :name] value))) @@ -116,8 +116,8 @@ (defn pagesmngr-render [own] (let [local (:rum/local own) - flags (rum/react wb/flags-state) - project (rum/react wb/project-state)] + flags (rum/react wb/flags-l) + project (rum/react wb/project-l)] (html [:div#project-bar.project-bar (when-not (contains? flags :workspace/pagesmngr) diff --git a/frontend/uxbox/ui/workspace/sidebar.cljs b/frontend/uxbox/ui/workspace/sidebar.cljs index 51759d66c..dc4da6004 100644 --- a/frontend/uxbox/ui/workspace/sidebar.cljs +++ b/frontend/uxbox/ui/workspace/sidebar.cljs @@ -17,7 +17,7 @@ (defn aside-render [own] (println "aside-render") - (let [toolboxes (rum/react wb/active-toolboxes-state)] + (let [toolboxes (rum/react wb/toolboxes-l)] (html [:aside#settings-bar.settings-bar [:div.settings-bar-inside diff --git a/frontend/uxbox/ui/workspace/toolboxes.cljs b/frontend/uxbox/ui/workspace/toolboxes.cljs index 13e23c9cf..7d885d932 100644 --- a/frontend/uxbox/ui/workspace/toolboxes.cljs +++ b/frontend/uxbox/ui/workspace/toolboxes.cljs @@ -60,7 +60,7 @@ (defn draw-tools-render [open-toolboxes] - (let [workspace (rum/react wb/workspace-state) + (let [workspace (rum/react wb/workspace-l) close #(rs/emit! (dw/toggle-toolbox :draw)) tools (->> (into [] +draw-tools+) (sort-by (comp :priority second)))] @@ -109,7 +109,7 @@ (defn layers-render [own] - (let [workspace (rum/react wb/workspace-state) + (let [workspace (rum/react wb/workspace-l) selected (:selected workspace) shapes-by-id (rum/react shapes-by-id) page (rum/react (focus-page (:page workspace))) @@ -182,7 +182,7 @@ (defn- select-icon [icon] - (if (= (:drawing @wb/workspace-state) icon) + (if (= (:drawing @wb/workspace-l) icon) (rs/emit! (dw/select-for-drawing nil)) (rs/emit! (dw/select-for-drawing icon)))) diff --git a/frontend/uxbox/ui/workspace/workarea.cljs b/frontend/uxbox/ui/workspace/workarea.cljs index 37de33129..07effc5a0 100644 --- a/frontend/uxbox/ui/workspace/workarea.cljs +++ b/frontend/uxbox/ui/workspace/workarea.cljs @@ -31,8 +31,8 @@ (defn viewport-render [own] - (let [workspace (rum/react wb/workspace-state) - page (rum/react wb/page-state) + (let [workspace (rum/react wb/workspace-l) + page (rum/react wb/page-l) drawing? (:drawing workspace) zoom 1] (html