Use new components macros for sidebar ns.

This commit is contained in:
Andrey Antukh 2016-08-31 17:23:43 +03:00
parent c293427752
commit 3ab79eb247
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95

View file

@ -6,9 +6,7 @@
;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com> ;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com>
(ns uxbox.main.ui.workspace.sidebar (ns uxbox.main.ui.workspace.sidebar
(:require [sablono.core :as html :refer-macros [html]] (:require [lentes.core :as l]
[rum.core :as rum]
[lentes.core :as l]
[uxbox.main.state :as st] [uxbox.main.state :as st]
[uxbox.util.router :as r] [uxbox.util.router :as r]
[uxbox.util.rstore :as rs] [uxbox.util.rstore :as rs]
@ -21,14 +19,12 @@
[uxbox.main.ui.workspace.sidebar.icons :refer (icons-toolbox)] [uxbox.main.ui.workspace.sidebar.icons :refer (icons-toolbox)]
[uxbox.main.ui.workspace.sidebar.drawtools :refer (draw-toolbox)])) [uxbox.main.ui.workspace.sidebar.drawtools :refer (draw-toolbox)]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; --- Left Sidebar (Component)
;; Left Sidebar
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defn left-sidebar-render (mx/defc left-sidebar
[own] {:mixins [mx/reactive mx/static]}
[]
(let [flags (mx/react wb/flags-ref)] (let [flags (mx/react wb/flags-ref)]
(html
[:aside#settings-bar.settings-bar.settings-bar-left [:aside#settings-bar.settings-bar.settings-bar-left
[:div.settings-bar-inside [:div.settings-bar-inside
(when (contains? flags :sitemap) (when (contains? flags :sitemap)
@ -36,22 +32,14 @@
(when (contains? flags :document-history) (when (contains? flags :document-history)
(history-toolbox)) (history-toolbox))
(when (contains? flags :layers) (when (contains? flags :layers)
(layers-toolbox))]]))) (layers-toolbox))]]))
(def left-sidebar ;; --- Right Sidebar (Component)
(mx/component
{:render left-sidebar-render
:name "left-sidebar"
:mixins [mx/reactive mx/static]}))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (mx/defc right-sidebar
;; Right Sidebar {:mixins [mx/reactive mx/static]}
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; []
(defn right-sidebar-render
[own]
(let [flags (mx/react wb/flags-ref)] (let [flags (mx/react wb/flags-ref)]
(html
[:aside#settings-bar.settings-bar [:aside#settings-bar.settings-bar
[:div.settings-bar-inside [:div.settings-bar-inside
(when (contains? flags :drawtools) (when (contains? flags :drawtools)
@ -59,10 +47,5 @@
(when (contains? flags :element-options) (when (contains? flags :element-options)
(options-toolbox)) (options-toolbox))
(when (contains? flags :icons) (when (contains? flags :icons)
(icons-toolbox))]]))) (icons-toolbox))]]))
(def right-sidebar
(mx/component
{:render right-sidebar-render
:name "right-sidebar"
:mixins [mx/reactive mx/static]}))