From 56bdddc8657b1ace15c8a4d4e64f8307f2b72241 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 24 Oct 2016 23:44:10 +0200 Subject: [PATCH] Comment some code related to elements. --- src/uxbox/main/ui.cljs | 3 +- src/uxbox/main/ui/dashboard.cljs | 4 +- src/uxbox/main/ui/dashboard/elements.cljs | 341 +++++++++++----------- 3 files changed, 173 insertions(+), 175 deletions(-) diff --git a/src/uxbox/main/ui.cljs b/src/uxbox/main/ui.cljs index 240a7f13d6..d11aebc6ed 100644 --- a/src/uxbox/main/ui.cljs +++ b/src/uxbox/main/ui.cljs @@ -97,8 +97,7 @@ :auth/recovery-request (auth/recovery-request-page) :auth/recovery (auth/recovery-page (:token params)) :dashboard/projects (dashboard/projects-page) - :dashboard/elements (dashboard/elements-page) - + ;; :dashboard/elements (dashboard/elements-page) :dashboard/icons (let [{:keys [id type]} params type (when (str/alpha? type) (keyword type)) id (cond diff --git a/src/uxbox/main/ui/dashboard.cljs b/src/uxbox/main/ui/dashboard.cljs index 0e14e5b257..baec9e71c0 100644 --- a/src/uxbox/main/ui/dashboard.cljs +++ b/src/uxbox/main/ui/dashboard.cljs @@ -1,12 +1,12 @@ (ns uxbox.main.ui.dashboard (:require [uxbox.main.ui.dashboard.projects :as projects] - [uxbox.main.ui.dashboard.elements :as elements] + ;; [uxbox.main.ui.dashboard.elements :as elements] [uxbox.main.ui.dashboard.icons :as icons] [uxbox.main.ui.dashboard.images :as images] [uxbox.main.ui.dashboard.colors :as colors])) (def projects-page projects/projects-page) -(def elements-page elements/elements-page) +;; (def elements-page elements/elements-page) (def icons-page icons/icons-page) (def images-page images/images-page) (def colors-page colors/colors-page) diff --git a/src/uxbox/main/ui/dashboard/elements.cljs b/src/uxbox/main/ui/dashboard/elements.cljs index 140bae3070..f1e0df4473 100644 --- a/src/uxbox/main/ui/dashboard/elements.cljs +++ b/src/uxbox/main/ui/dashboard/elements.cljs @@ -14,199 +14,198 @@ [uxbox.main.ui.icons :as i] [uxbox.util.mixins :as mx :include-macros true] [uxbox.main.ui.lightbox :as lbx] - [uxbox.main.ui.library-bar :as ui.library-bar] [uxbox.main.ui.dashboard.header :refer (header)] [uxbox.util.dom :as dom])) ;; --- Page Title -(defn page-title-render - [] - (html - [:div.dashboard-title - [:h2 "Element library name"] - [:div.edition - [:span i/pencil] - [:span i/trash]]])) +;; (defn page-title-render +;; [] +;; (html +;; [:div.dashboard-title +;; [:h2 "Element library name"] +;; [:div.edition +;; [:span i/pencil] +;; [:span i/trash]]])) -(def ^:private page-title - (mx/component - {:render page-title-render - :name "page-title" - :mixins [mx/static]})) +;; (def ^:private page-title +;; (mx/component +;; {:render page-title-render +;; :name "page-title" +;; :mixins [mx/static]})) -;; --- Grid +;; ;; --- Grid -(defn grid-render - [own] - (html - [:div.dashboard-grid-content - [:div.dashboard-grid-row - [:div.grid-item.add-project - {on-click #(udl/open! :new-element)} - [:span "+ New element"]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]] - [:div.grid-item.project-th - [:span.grid-item-image i/image] - [:h3 "Custom element"] - [:div.project-th-actions - [:div.project-th-icon.edit i/pencil] - [:div.project-th-icon.delete i/trash]]]]])) +;; (defn grid-render +;; [own] +;; (html +;; [:div.dashboard-grid-content +;; [:div.dashboard-grid-row +;; [:div.grid-item.add-project +;; {on-click #(udl/open! :new-element)} +;; [:span "+ New element"]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]] +;; [:div.grid-item.project-th +;; [:span.grid-item-image i/image] +;; [:h3 "Custom element"] +;; [:div.project-th-actions +;; [:div.project-th-icon.edit i/pencil] +;; [:div.project-th-icon.delete i/trash]]]]])) -(def ^:private grid - (mx/component - {:render grid-render - :name "grid" - :mixins [mx/static]})) +;; (def ^:private grid +;; (mx/component +;; {:render grid-render +;; :name "grid" +;; :mixins [mx/static]})) ;; --- Elements Page -(defn elements-page-render - [own] - (html - [:main.dashboard-main - (header) - [:section.dashboard-content - (ui.library-bar/library-bar) - [:section.dashboard-grid.library - (page-title) - (grid)]]])) +;; (defn elements-page-render +;; [own] +;; (html +;; [:main.dashboard-main +;; (header) +;; [:section.dashboard-content +;; (ui.library-bar/library-bar) +;; [:section.dashboard-grid.library +;; (page-title) +;; (grid)]]])) -(defn elements-page-will-mount - [own] - (rs/emit! (dd/initialize :dashboard/elements)) - own) +;; (defn elements-page-will-mount +;; [own] +;; (rs/emit! (dd/initialize :dashboard/elements)) +;; own) -(defn elements-page-did-remount - [old-state state] - (rs/emit! (dd/initialize :dashboard/elements)) - state) +;; (defn elements-page-did-remount +;; [old-state state] +;; (rs/emit! (dd/initialize :dashboard/elements)) +;; state) -(def elements-page - (mx/component - {:render elements-page-render - :will-mount elements-page-will-mount - :did-remount elements-page-did-remount - :name "elements-page" - :mixins [mx/static]})) +;; (def elements-page +;; (mx/component +;; {:render elements-page-render +;; :will-mount elements-page-will-mount +;; :did-remount elements-page-did-remount +;; :name "elements-page" +;; :mixins [mx/static]})) ;; --- New Element Lightbox (TODO) -(defn- new-element-lightbox-render - [own] - #_(html - ;;------Element lightbox +;; (defn- new-element-lightbox-render +;; [own] +;; (html +;; ;;------Element lightbox - ;;[:div.lightbox-body - ;;[:h3 "New element"] - ;;[:div.row-flex - ;;[:div.lightbox-big-btn - ;;[:span.big-svg i/shapes] - ;;[:span.text "Go to workspace"]] - ;;[:div.lightbox-big-btn - ;;[:span.big-svg.upload i/exit] - ;;[:span.text "Upload file"]]] - ;;[:a.close {:href "#" - ;;:on-click #(do (dom/prevent-default %) - ;;(udl/close!))} - ;;i/close]] +;; ;;[:div.lightbox-body +;; ;;[:h3 "New element"] +;; ;;[:div.row-flex +;; ;;[:div.lightbox-big-btn +;; ;;[:span.big-svg i/shapes] +;; ;;[:span.text "Go to workspace"]] +;; ;;[:div.lightbox-big-btn +;; ;;[:span.big-svg.upload i/exit] +;; ;;[:span.text "Upload file"]]] +;; ;;[:a.close {:href "#" +;; ;;:on-click #(do (dom/prevent-default %) +;; ;;(udl/close!))} +;; ;;i/close]] - ;;------Upload image lightbox +;; ;;------Upload image lightbox - ;;[:div.lightbox-body - ;;[:h3 "Import image"] - ;;[:div.row-flex - ;;[:div.lightbox-big-btn - ;;[:span.big-svg i/image] - ;;[:span.text "Select from library"]] - ;;[:div.lightbox-big-btn - ;;[:span.big-svg.upload i/exit] - ;;[:span.text "Upload file"]]] - ;;[:a.close {:href "#" - ;;:on-click #(do (dom/prevent-default %) - ;;(udl/close!))} - ;;i/close]] +;; ;;[:div.lightbox-body +;; ;;[:h3 "Import image"] +;; ;;[:div.row-flex +;; ;;[:div.lightbox-big-btn +;; ;;[:span.big-svg i/image] +;; ;;[:span.text "Select from library"]] +;; ;;[:div.lightbox-big-btn +;; ;;[:span.big-svg.upload i/exit] +;; ;;[:span.text "Upload file"]]] +;; ;;[:a.close {:href "#" +;; ;;:on-click #(do (dom/prevent-default %) +;; ;;(udl/close!))} +;; ;;i/close]] - ;;------Upload image library lightbox +;; ;;------Upload image library lightbox - )) +;; )) -(def ^:private new-element-lightbox - (mx/component - {:render new-element-lightbox-render - :name "new-element-lightbox"})) +;; (def ^:private new-element-lightbox +;; (mx/component +;; {:render new-element-lightbox-render +;; :name "new-element-lightbox"})) -(defmethod lbx/render-lightbox :new-element - [_] - (new-element-lightbox)) +;; (defmethod lbx/render-lightbox :new-element +;; [_] +;; (new-element-lightbox))