Move icons ns under uxbox.builtins.icons.

This commit is contained in:
Andrey Antukh 2017-01-14 21:33:01 +01:00
parent 671a72d213
commit bc1ffc7f4f
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
52 changed files with 75 additions and 71 deletions

View file

@ -1,5 +1,12 @@
(ns uxbox.main.ui.icons ;; This Source Code Form is subject to the terms of the Mozilla Public
(:require [sablono.core :as html :refer-macros [html]])) ;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; Copyright (c) 2015-2017 Andrey Antukh <niwi@niwi.nz>
;; Copyright (c) 2015-2017 Juan de la Cruz <delacruzgarciajuan@gmail.com>
(ns uxbox.builtins.icons
(:require [sablono.core :refer-macros [html]]))
(def logo (def logo
(html (html

View file

@ -11,23 +11,23 @@
[cuerdas.core :as str] [cuerdas.core :as str]
[bide.core :as bc] [bide.core :as bc]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.builtins.icons :as i]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.projects :as dp] [uxbox.main.data.projects :as dp]
[uxbox.main.data.users :as udu] [uxbox.main.data.users :as udu]
[uxbox.main.data.auth :refer [logout]] [uxbox.main.data.auth :refer [logout]]
[uxbox.util.messages :as uum] [uxbox.main.ui.loader :refer [loader]]
[uxbox.main.ui.loader :refer (loader)] [uxbox.main.ui.lightbox :refer [lightbox]]
[uxbox.main.ui.lightbox :refer (lightbox)]
[uxbox.main.ui.icons :as i]
[uxbox.main.ui.auth :as auth] [uxbox.main.ui.auth :as auth]
[uxbox.main.ui.dashboard :as dashboard] [uxbox.main.ui.dashboard :as dashboard]
[uxbox.main.ui.settings :as settings] [uxbox.main.ui.settings :as settings]
[uxbox.main.ui.workspace :refer (workspace)] [uxbox.main.ui.workspace :refer [workspace]]
[uxbox.main.ui.shapes] [uxbox.main.ui.shapes]
[uxbox.util.messages :as uum]
[uxbox.util.router :as rt] [uxbox.util.router :as rt]
[uxbox.util.timers :as ts] [uxbox.util.timers :as ts]
[uxbox.util.i18n :refer (tr)] [uxbox.util.i18n :refer [tr]]
[uxbox.util.data :refer (parse-int uuid-str?)] [uxbox.util.data :refer [parse-int uuid-str?]]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.util.mixins :as mx :include-macros true])) [uxbox.util.mixins :as mx :include-macros true]))

View file

@ -11,7 +11,7 @@
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.auth :as da] [uxbox.main.data.auth :as da]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.messages :refer [messages-widget]]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]

View file

@ -2,16 +2,16 @@
;; License, v. 2.0. If a copy of the MPL was not distributed with this ;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/. ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;; ;;
;; Copyright (c) 2015-2016 Andrey Antukh <niwi@niwi.nz> ;; Copyright (c) 2015-2017 Andrey Antukh <niwi@niwi.nz>
;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com> ;; Copyright (c) 2015-2017 Juan de la Cruz <delacruzgarciajuan@gmail.com>
(ns uxbox.main.ui.auth.recovery (ns uxbox.main.ui.auth.recovery
(:require [lentes.core :as l] (:require [lentes.core :as l]
[cuerdas.core :as str] [cuerdas.core :as str]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.builtins.icons :as i]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.auth :as uda] [uxbox.main.data.auth :as uda]
[uxbox.main.ui.icons :as i]
[uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.messages :refer [messages-widget]]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.util.router :as rt] [uxbox.util.router :as rt]

View file

@ -11,7 +11,7 @@
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.auth :as uda] [uxbox.main.data.auth :as uda]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.messages :refer [messages-widget]]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.util.router :as rt] [uxbox.util.router :as rt]

View file

@ -11,7 +11,7 @@
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.auth :as uda] [uxbox.main.data.auth :as uda]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.messages :refer [messages-widget]]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.util.router :as rt] [uxbox.util.router :as rt]

View file

@ -8,7 +8,7 @@
(ns uxbox.main.ui.confirm (ns uxbox.main.ui.confirm
(:require [sablono.core :as html :refer-macros [html]] (:require [sablono.core :as html :refer-macros [html]]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.main.ui.lightbox :as lbx])) [uxbox.main.ui.lightbox :as lbx]))

View file

@ -16,7 +16,7 @@
[uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.messages :refer [messages-widget]]
[uxbox.main.ui.colorpicker :refer (colorpicker)] [uxbox.main.ui.colorpicker :refer (colorpicker)]
[uxbox.main.ui.dashboard.header :refer (header)] [uxbox.main.ui.dashboard.header :refer (header)]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.keyboard :as k] [uxbox.main.ui.keyboard :as k]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.util.color :refer (hex->rgb)] [uxbox.util.color :refer (hex->rgb)]

View file

@ -11,7 +11,7 @@
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.data.dashboard :as dd] [uxbox.main.data.dashboard :as dd]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.main.ui.dashboard.header :refer (header)] [uxbox.main.ui.dashboard.header :refer (header)]

View file

@ -10,7 +10,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.projects :as dp] [uxbox.main.data.projects :as dp]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.users :as ui.u] [uxbox.main.ui.users :as ui.u]
[uxbox.util.i18n :refer (tr)] [uxbox.util.i18n :refer (tr)]
[uxbox.util.router :as r] [uxbox.util.router :as r]

View file

@ -11,7 +11,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.data.icons :as di] [uxbox.main.data.icons :as di]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.shapes.icon :as icon] [uxbox.main.ui.shapes.icon :as icon]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.main.ui.dashboard.header :refer (header)] [uxbox.main.ui.dashboard.header :refer (header)]

View file

@ -13,7 +13,7 @@
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.data.images :as di] [uxbox.main.data.images :as di]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.main.ui.keyboard :as kbd] [uxbox.main.ui.keyboard :as kbd]

View file

@ -12,7 +12,7 @@
[uxbox.main.constants :as c] [uxbox.main.constants :as c]
[uxbox.main.data.projects :as udp] [uxbox.main.data.projects :as udp]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.dashboard.header :refer [header]] [uxbox.main.ui.dashboard.header :refer [header]]
[uxbox.main.ui.dashboard.projects-createlightbox] [uxbox.main.ui.dashboard.projects-createlightbox]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]

View file

@ -14,7 +14,7 @@
[uxbox.main.exports :as exports] [uxbox.main.exports :as exports]
[uxbox.main.data.projects :as udp] [uxbox.main.data.projects :as udp]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.dashboard.header :refer [header]] [uxbox.main.ui.dashboard.header :refer [header]]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.main.ui.keyboard :as kbd] [uxbox.main.ui.keyboard :as kbd]

View file

@ -6,7 +6,7 @@
(ns uxbox.main.ui.loader (ns uxbox.main.ui.loader
(:require [uxbox.main.store :as st] (:require [uxbox.main.store :as st]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true])) [uxbox.util.mixins :as mx :include-macros true]))
;; --- Component ;; --- Component

View file

@ -11,7 +11,7 @@
[cuerdas.core :as str] [cuerdas.core :as str]
[uxbox.util.router :as r] [uxbox.util.router :as r]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.main.ui.settings.profile :as profile] [uxbox.main.ui.settings.profile :as profile]

View file

@ -15,7 +15,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.projects :as dp] [uxbox.main.data.projects :as dp]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.users :refer (user)] [uxbox.main.ui.users :refer (user)]
[uxbox.util.mixins :as mx :include-macros true])) [uxbox.util.mixins :as mx :include-macros true]))

View file

@ -11,7 +11,7 @@
[cuerdas.core :as str] [cuerdas.core :as str]
[uxbox.util.router :as r] [uxbox.util.router :as r]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.main.ui.settings.header :refer (header)])) [uxbox.main.ui.settings.header :refer (header)]))

View file

@ -11,7 +11,7 @@
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.users :as udu] [uxbox.main.data.users :as udu]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.messages :refer [messages-widget]]
[uxbox.main.ui.settings.header :refer [header]] [uxbox.main.ui.settings.header :refer [header]]
[uxbox.util.forms :as forms] [uxbox.util.forms :as forms]

View file

@ -10,7 +10,7 @@
[lentes.core :as l] [lentes.core :as l]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.settings.header :refer [header]] [uxbox.main.ui.settings.header :refer [header]]
[uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.messages :refer [messages-widget]]
[uxbox.main.data.users :as udu] [uxbox.main.data.users :as udu]

View file

@ -11,7 +11,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.auth :as da] [uxbox.main.data.auth :as da]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.util.router :as rt] [uxbox.util.router :as rt]
[uxbox.util.mixins :as mx :include-macros true])) [uxbox.util.mixins :as mx :include-macros true]))

View file

@ -10,7 +10,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]

View file

@ -15,7 +15,7 @@
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.data.colors :as dc] [uxbox.main.data.colors :as dc]
[uxbox.main.ui.dashboard.colors :refer (collections-ref)] [uxbox.main.ui.dashboard.colors :refer (collections-ref)]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.keyboard :as kbd] [uxbox.main.ui.keyboard :as kbd]
[uxbox.util.lens :as ul] [uxbox.util.lens :as ul]
[uxbox.util.data :refer (read-string)] [uxbox.util.data :refer (read-string)]

View file

@ -14,7 +14,7 @@
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.pages :as udp] [uxbox.main.data.pages :as udp]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.main.ui.colorpicker :as cp] [uxbox.main.ui.colorpicker :as cp]
[uxbox.main.ui.workspace.recent-colors :refer [recent-colors]] [uxbox.main.ui.workspace.recent-colors :refer [recent-colors]]

View file

@ -14,7 +14,7 @@
[uxbox.main.refs :as refs] [uxbox.main.refs :as refs]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.exports :as exports] [uxbox.main.exports :as exports]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.util.blob :as blob] [uxbox.util.blob :as blob]
[uxbox.util.data :refer (read-string)] [uxbox.util.data :refer (read-string)]

View file

@ -16,7 +16,7 @@
[uxbox.main.data.history :as udh] [uxbox.main.data.history :as udh]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.workspace.clipboard] [uxbox.main.ui.workspace.clipboard]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.users :as ui.u] [uxbox.main.ui.users :as ui.u]
[uxbox.main.ui.navigation :as nav] [uxbox.main.ui.navigation :as nav]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]

View file

@ -17,7 +17,7 @@
[uxbox.main.data.images :as udi] [uxbox.main.data.images :as udi]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.lightbox :as lbx])) [uxbox.main.ui.lightbox :as lbx]))

View file

@ -11,7 +11,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.refs :as refs] [uxbox.main.refs :as refs]
[uxbox.main.data.workspace :as dw] [uxbox.main.data.workspace :as dw]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.util.i18n :refer (tr)])) [uxbox.util.i18n :refer (tr)]))

View file

@ -12,7 +12,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.refs :as refs] [uxbox.main.refs :as refs]
[uxbox.main.data.workspace :as dw] [uxbox.main.data.workspace :as dw]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.i18n :refer (tr)] [uxbox.util.i18n :refer (tr)]
[uxbox.util.router :as r] [uxbox.util.router :as r]
[uxbox.util.data :refer (read-string)] [uxbox.util.data :refer (read-string)]

View file

@ -15,7 +15,7 @@
[uxbox.main.data.workspace :as dw] [uxbox.main.data.workspace :as dw]
[uxbox.main.data.pages :as udp] [uxbox.main.data.pages :as udp]
[uxbox.main.data.history :as udh] [uxbox.main.data.history :as udh]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.i18n :refer (tr)] [uxbox.util.i18n :refer (tr)]
[uxbox.util.router :as r] [uxbox.util.router :as r]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]

View file

@ -15,7 +15,7 @@
[uxbox.main.data.icons :as udi] [uxbox.main.data.icons :as udi]
[uxbox.main.ui.shapes.icon :as icon] [uxbox.main.ui.shapes.icon :as icon]
[uxbox.main.ui.dashboard.icons :as icons] [uxbox.main.ui.dashboard.icons :as icons]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.util.data :refer (read-string)])) [uxbox.util.data :refer (read-string)]))

View file

@ -15,7 +15,7 @@
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.shapes.icon :as icon] [uxbox.main.ui.shapes.icon :as icon]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.keyboard :as kbd] [uxbox.main.ui.keyboard :as kbd]
[uxbox.util.data :refer (read-string classnames)] [uxbox.util.data :refer (read-string classnames)]
[uxbox.util.router :as r] [uxbox.util.router :as r]

View file

@ -14,7 +14,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.shapes.attrs :refer [shape-default-attrs]] [uxbox.main.ui.shapes.attrs :refer [shape-default-attrs]]
[uxbox.main.ui.workspace.sidebar.options.icon-measures :as options-iconm] [uxbox.main.ui.workspace.sidebar.options.icon-measures :as options-iconm]
[uxbox.main.ui.workspace.sidebar.options.circle-measures :as options-circlem] [uxbox.main.ui.workspace.sidebar.options.circle-measures :as options-circlem]

View file

@ -15,7 +15,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.main.geom :as geom] [uxbox.main.geom :as geom]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]

View file

@ -13,7 +13,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.util.data :refer (parse-int parse-float read-string)] [uxbox.util.data :refer (parse-int parse-float read-string)]

View file

@ -15,7 +15,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.main.geom :as geom] [uxbox.main.geom :as geom]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]

View file

@ -17,7 +17,7 @@
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.workspace.sidebar.sitemap :refer (pages-ref)] [uxbox.main.ui.workspace.sidebar.sitemap :refer (pages-ref)]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.main.ui.colorpicker :as cp] [uxbox.main.ui.colorpicker :as cp]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]

View file

@ -16,7 +16,7 @@
[uxbox.main.data.pages :as udp] [uxbox.main.data.pages :as udp]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.workspace.colorpicker] [uxbox.main.ui.workspace.colorpicker]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.data :refer [parse-int]] [uxbox.util.data :refer [parse-int]]

View file

@ -13,7 +13,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.main.geom :as geom] [uxbox.main.geom :as geom]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]

View file

@ -13,7 +13,7 @@
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.util.data :refer (parse-int parse-float read-string)] [uxbox.util.data :refer (parse-int parse-float read-string)]

View file

@ -12,7 +12,7 @@
[uxbox.main.geom :as geom] [uxbox.main.geom :as geom]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.i18n :refer (tr)] [uxbox.util.i18n :refer (tr)]
[uxbox.util.router :as r] [uxbox.util.router :as r]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]

View file

@ -17,7 +17,7 @@
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.workspace.sidebar.sitemap-pageform] [uxbox.main.ui.workspace.sidebar.sitemap-pageform]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.i18n :refer (tr)] [uxbox.util.i18n :refer (tr)]
[uxbox.util.router :as r] [uxbox.util.router :as r]

View file

@ -14,7 +14,7 @@
[uxbox.main.data.pages :as udp] [uxbox.main.data.pages :as udp]
[uxbox.main.data.workspace :as dw] [uxbox.main.data.workspace :as dw]
[uxbox.main.data.lightbox :as udl] [uxbox.main.data.lightbox :as udl]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.main.ui.lightbox :as lbx] [uxbox.main.ui.lightbox :as lbx]
[uxbox.util.i18n :refer (tr)] [uxbox.util.i18n :refer (tr)]
[uxbox.util.router :as r] [uxbox.util.router :as r]

View file

@ -10,7 +10,7 @@
[cuerdas.core :as str] [cuerdas.core :as str]
[beicon.core :as rx] [beicon.core :as rx]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.util.timers :as ts] [uxbox.util.timers :as ts]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.data :refer [classnames]] [uxbox.util.data :refer [classnames]]

View file

@ -7,8 +7,7 @@
(ns uxbox.util.router (ns uxbox.util.router
(:require [bide.core :as r] (:require [bide.core :as r]
[beicon.core :as rx] [beicon.core :as rx]
[potok.core :as ptk] [potok.core :as ptk]))
[uxbox.main.store :as st]))
(defonce +router+ nil) (defonce +router+ nil)
@ -46,15 +45,13 @@
;; --- Public Api ;; --- Public Api
(defn init (defn init
([store routes] [store routes {:keys [default] :or {default :auth/login}}]
(init store routes nil))
([store routes {:keys [default] :or {default :auth/login}}]
(let [opts {:on-navigate #(ptk/emit! store (update-location %1 %2)) (let [opts {:on-navigate #(ptk/emit! store (update-location %1 %2))
:default default} :default default}
router (-> (r/router routes) router (-> (r/router routes)
(r/start! opts))] (r/start! opts))]
(set! +router+ router) (set! +router+ router)
router))) router))
(defn route-for (defn route-for
"Given a location handler and optional parameter map, return the URI "Given a location handler and optional parameter map, return the URI

View file

@ -7,13 +7,13 @@
(ns uxbox.view.ui (ns uxbox.view.ui
(:require [lentes.core :as l] (:require [lentes.core :as l]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.view.store :as st] [uxbox.view.store :as st]
[uxbox.view.ui.loader :refer [loader]] [uxbox.view.ui.loader :refer [loader]]
[uxbox.view.ui.notfound :refer [notfound-page]] [uxbox.view.ui.notfound :refer [notfound-page]]
[uxbox.view.ui.viewer :refer [viewer-page]] [uxbox.view.ui.viewer :refer [viewer-page]]
[uxbox.util.i18n :refer [tr]]
[uxbox.util.router :as rt] [uxbox.util.router :as rt]
[uxbox.util.i18n :refer [tr]]
[uxbox.util.messages :as uum] [uxbox.util.messages :as uum]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.dom :as dom])) [uxbox.util.dom :as dom]))

View file

@ -5,7 +5,7 @@
;; Copyright (c) 2016-2017 Andrey Antukh <niwi@niwi.nz> ;; Copyright (c) 2016-2017 Andrey Antukh <niwi@niwi.nz>
(ns uxbox.view.ui.loader (ns uxbox.view.ui.loader
(:require [uxbox.main.ui.icons :as i] (:require [uxbox.builtins.icons :as i]
[uxbox.view.store :as st] [uxbox.view.store :as st]
[uxbox.util.mixins :as mx :include-macros true])) [uxbox.util.mixins :as mx :include-macros true]))

View file

@ -11,7 +11,7 @@
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.util.router :as rt] [uxbox.util.router :as rt]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.view.store :as st] [uxbox.view.store :as st]
[uxbox.view.data.viewer :as dv] [uxbox.view.data.viewer :as dv]
[uxbox.view.ui.viewer.nav :refer (nav)] [uxbox.view.ui.viewer.nav :refer (nav)]

View file

@ -13,7 +13,7 @@
[uxbox.util.data :refer (parse-int)] [uxbox.util.data :refer (parse-int)]
[uxbox.view.store :as st] [uxbox.view.store :as st]
[uxbox.main.ui.shapes :as uus] [uxbox.main.ui.shapes :as uus]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.view.ui.viewer.shapes :as shapes])) [uxbox.view.ui.viewer.shapes :as shapes]))
;; --- Refs ;; --- Refs

View file

@ -9,7 +9,7 @@
(:require [uxbox.util.mixins :as mx :include-macros true] (:require [uxbox.util.mixins :as mx :include-macros true]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.view.store :as st] [uxbox.view.store :as st]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.view.data.viewer :as dv])) [uxbox.view.data.viewer :as dv]))
(mx/defc nav (mx/defc nav

View file

@ -17,7 +17,7 @@
[uxbox.main.ui.shapes.path :refer (path-shape)] [uxbox.main.ui.shapes.path :refer (path-shape)]
[uxbox.main.ui.shapes.circle :refer (circle-shape)] [uxbox.main.ui.shapes.circle :refer (circle-shape)]
[uxbox.main.ui.shapes.image :refer (image-shape)] [uxbox.main.ui.shapes.image :refer (image-shape)]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.view.ui.viewer.interactions :as itx]) [uxbox.view.ui.viewer.interactions :as itx])
(:import goog.events.EventType)) (:import goog.events.EventType))

View file

@ -13,7 +13,7 @@
[uxbox.util.data :refer (parse-int)] [uxbox.util.data :refer (parse-int)]
[potok.core :as ptk] [potok.core :as ptk]
[uxbox.view.store :as st] [uxbox.view.store :as st]
[uxbox.main.ui.icons :as i] [uxbox.builtins.icons :as i]
[uxbox.view.data.viewer :as dv])) [uxbox.view.data.viewer :as dv]))
;; --- Refs ;; --- Refs