From bc1ffc7f4f73f260a32e7019e46b3523b9cc6d0f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 14 Jan 2017 21:33:01 +0100 Subject: [PATCH] Move icons ns under uxbox.builtins.icons. --- .../src/uxbox/{main/ui => builtins}/icons.cljs | 11 +++++++++-- frontend/src/uxbox/main/ui.cljs | 14 +++++++------- frontend/src/uxbox/main/ui/auth/login.cljs | 2 +- frontend/src/uxbox/main/ui/auth/recovery.cljs | 6 +++--- .../uxbox/main/ui/auth/recovery_request.cljs | 2 +- frontend/src/uxbox/main/ui/auth/register.cljs | 2 +- frontend/src/uxbox/main/ui/confirm.cljs | 2 +- .../src/uxbox/main/ui/dashboard/colors.cljs | 2 +- .../src/uxbox/main/ui/dashboard/elements.cljs | 2 +- .../src/uxbox/main/ui/dashboard/header.cljs | 2 +- frontend/src/uxbox/main/ui/dashboard/icons.cljs | 2 +- .../src/uxbox/main/ui/dashboard/images.cljs | 2 +- .../src/uxbox/main/ui/dashboard/projects.cljs | 2 +- .../ui/dashboard/projects_createlightbox.cljs | 2 +- frontend/src/uxbox/main/ui/loader.cljs | 2 +- frontend/src/uxbox/main/ui/settings.cljs | 2 +- frontend/src/uxbox/main/ui/settings/header.cljs | 2 +- .../uxbox/main/ui/settings/notifications.cljs | 2 +- .../src/uxbox/main/ui/settings/password.cljs | 2 +- .../src/uxbox/main/ui/settings/profile.cljs | 2 +- frontend/src/uxbox/main/ui/users.cljs | 2 +- .../src/uxbox/main/ui/workspace/clipboard.cljs | 2 +- .../uxbox/main/ui/workspace/colorpalette.cljs | 2 +- .../uxbox/main/ui/workspace/colorpicker.cljs | 2 +- .../src/uxbox/main/ui/workspace/download.cljs | 2 +- .../src/uxbox/main/ui/workspace/header.cljs | 2 +- .../src/uxbox/main/ui/workspace/images.cljs | 2 +- .../uxbox/main/ui/workspace/recent_colors.cljs | 2 +- .../main/ui/workspace/sidebar/drawtools.cljs | 2 +- .../main/ui/workspace/sidebar/history.cljs | 2 +- .../uxbox/main/ui/workspace/sidebar/icons.cljs | 2 +- .../uxbox/main/ui/workspace/sidebar/layers.cljs | 2 +- .../main/ui/workspace/sidebar/options.cljs | 2 +- .../sidebar/options/circle_measures.cljs | 2 +- .../main/ui/workspace/sidebar/options/fill.cljs | 2 +- .../sidebar/options/icon_measures.cljs | 2 +- .../workspace/sidebar/options/interactions.cljs | 2 +- .../main/ui/workspace/sidebar/options/page.cljs | 2 +- .../sidebar/options/rect_measures.cljs | 2 +- .../ui/workspace/sidebar/options/stroke.cljs | 2 +- .../main/ui/workspace/sidebar/options/text.cljs | 2 +- .../main/ui/workspace/sidebar/sitemap.cljs | 2 +- .../ui/workspace/sidebar/sitemap_pageform.cljs | 2 +- frontend/src/uxbox/util/messages.cljs | 2 +- frontend/src/uxbox/util/router.cljs | 17 +++++++---------- frontend/src/uxbox/view/ui.cljs | 4 ++-- frontend/src/uxbox/view/ui/loader.cljs | 2 +- frontend/src/uxbox/view/ui/viewer.cljs | 2 +- frontend/src/uxbox/view/ui/viewer/canvas.cljs | 2 +- frontend/src/uxbox/view/ui/viewer/nav.cljs | 2 +- frontend/src/uxbox/view/ui/viewer/shapes.cljs | 2 +- frontend/src/uxbox/view/ui/viewer/sitemap.cljs | 2 +- 52 files changed, 75 insertions(+), 71 deletions(-) rename frontend/src/uxbox/{main/ui => builtins}/icons.cljs (99%) diff --git a/frontend/src/uxbox/main/ui/icons.cljs b/frontend/src/uxbox/builtins/icons.cljs similarity index 99% rename from frontend/src/uxbox/main/ui/icons.cljs rename to frontend/src/uxbox/builtins/icons.cljs index bf4f65976..7adf85bda 100644 --- a/frontend/src/uxbox/main/ui/icons.cljs +++ b/frontend/src/uxbox/builtins/icons.cljs @@ -1,5 +1,12 @@ -(ns uxbox.main.ui.icons - (:require [sablono.core :as html :refer-macros [html]])) +;; This Source Code Form is subject to the terms of the Mozilla Public +;; 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 +;; Copyright (c) 2015-2017 Juan de la Cruz + +(ns uxbox.builtins.icons + (:require [sablono.core :refer-macros [html]])) (def logo (html diff --git a/frontend/src/uxbox/main/ui.cljs b/frontend/src/uxbox/main/ui.cljs index d4b496d25..14d7dcad8 100644 --- a/frontend/src/uxbox/main/ui.cljs +++ b/frontend/src/uxbox/main/ui.cljs @@ -11,23 +11,23 @@ [cuerdas.core :as str] [bide.core :as bc] [potok.core :as ptk] + [uxbox.builtins.icons :as i] [uxbox.main.store :as st] [uxbox.main.data.projects :as dp] [uxbox.main.data.users :as udu] [uxbox.main.data.auth :refer [logout]] - [uxbox.util.messages :as uum] - [uxbox.main.ui.loader :refer (loader)] - [uxbox.main.ui.lightbox :refer (lightbox)] - [uxbox.main.ui.icons :as i] + [uxbox.main.ui.loader :refer [loader]] + [uxbox.main.ui.lightbox :refer [lightbox]] [uxbox.main.ui.auth :as auth] [uxbox.main.ui.dashboard :as dashboard] [uxbox.main.ui.settings :as settings] - [uxbox.main.ui.workspace :refer (workspace)] + [uxbox.main.ui.workspace :refer [workspace]] [uxbox.main.ui.shapes] + [uxbox.util.messages :as uum] [uxbox.util.router :as rt] [uxbox.util.timers :as ts] - [uxbox.util.i18n :refer (tr)] - [uxbox.util.data :refer (parse-int uuid-str?)] + [uxbox.util.i18n :refer [tr]] + [uxbox.util.data :refer [parse-int uuid-str?]] [uxbox.util.dom :as dom] [uxbox.util.mixins :as mx :include-macros true])) diff --git a/frontend/src/uxbox/main/ui/auth/login.cljs b/frontend/src/uxbox/main/ui/auth/login.cljs index 82dae2829..4e800d18c 100644 --- a/frontend/src/uxbox/main/ui/auth/login.cljs +++ b/frontend/src/uxbox/main/ui/auth/login.cljs @@ -11,7 +11,7 @@ [potok.core :as ptk] [uxbox.main.store :as st] [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.navigation :as nav] [uxbox.util.mixins :as mx :include-macros true] diff --git a/frontend/src/uxbox/main/ui/auth/recovery.cljs b/frontend/src/uxbox/main/ui/auth/recovery.cljs index e60e28f1d..085206376 100644 --- a/frontend/src/uxbox/main/ui/auth/recovery.cljs +++ b/frontend/src/uxbox/main/ui/auth/recovery.cljs @@ -2,16 +2,16 @@ ;; 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-2016 Andrey Antukh -;; Copyright (c) 2015-2016 Juan de la Cruz +;; Copyright (c) 2015-2017 Andrey Antukh +;; Copyright (c) 2015-2017 Juan de la Cruz (ns uxbox.main.ui.auth.recovery (:require [lentes.core :as l] [cuerdas.core :as str] [potok.core :as ptk] + [uxbox.builtins.icons :as i] [uxbox.main.store :as st] [uxbox.main.data.auth :as uda] - [uxbox.main.ui.icons :as i] [uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.navigation :as nav] [uxbox.util.router :as rt] diff --git a/frontend/src/uxbox/main/ui/auth/recovery_request.cljs b/frontend/src/uxbox/main/ui/auth/recovery_request.cljs index b2590d26b..a6722bd67 100644 --- a/frontend/src/uxbox/main/ui/auth/recovery_request.cljs +++ b/frontend/src/uxbox/main/ui/auth/recovery_request.cljs @@ -11,7 +11,7 @@ [potok.core :as ptk] [uxbox.main.store :as st] [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.navigation :as nav] [uxbox.util.router :as rt] diff --git a/frontend/src/uxbox/main/ui/auth/register.cljs b/frontend/src/uxbox/main/ui/auth/register.cljs index 6a3d4699f..c2ba98cc8 100644 --- a/frontend/src/uxbox/main/ui/auth/register.cljs +++ b/frontend/src/uxbox/main/ui/auth/register.cljs @@ -11,7 +11,7 @@ [potok.core :as ptk] [uxbox.main.store :as st] [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.navigation :as nav] [uxbox.util.router :as rt] diff --git a/frontend/src/uxbox/main/ui/confirm.cljs b/frontend/src/uxbox/main/ui/confirm.cljs index 20911975c..dd8323bed 100644 --- a/frontend/src/uxbox/main/ui/confirm.cljs +++ b/frontend/src/uxbox/main/ui/confirm.cljs @@ -8,7 +8,7 @@ (ns uxbox.main.ui.confirm (:require [sablono.core :as html :refer-macros [html]] [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.dom :as dom] [uxbox.main.ui.lightbox :as lbx])) diff --git a/frontend/src/uxbox/main/ui/dashboard/colors.cljs b/frontend/src/uxbox/main/ui/dashboard/colors.cljs index fa16d6a69..a798d2da1 100644 --- a/frontend/src/uxbox/main/ui/dashboard/colors.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/colors.cljs @@ -16,7 +16,7 @@ [uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.colorpicker :refer (colorpicker)] [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.lightbox :as lbx] [uxbox.util.color :refer (hex->rgb)] diff --git a/frontend/src/uxbox/main/ui/dashboard/elements.cljs b/frontend/src/uxbox/main/ui/dashboard/elements.cljs index 3eb102c80..b621a70a6 100644 --- a/frontend/src/uxbox/main/ui/dashboard/elements.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/elements.cljs @@ -11,7 +11,7 @@ [potok.core :as ptk] [uxbox.main.data.dashboard :as dd] [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.main.ui.lightbox :as lbx] [uxbox.main.ui.dashboard.header :refer (header)] diff --git a/frontend/src/uxbox/main/ui/dashboard/header.cljs b/frontend/src/uxbox/main/ui/dashboard/header.cljs index 33777db28..979b56e1f 100644 --- a/frontend/src/uxbox/main/ui/dashboard/header.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/header.cljs @@ -10,7 +10,7 @@ [uxbox.main.store :as st] [uxbox.main.data.projects :as dp] [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.util.i18n :refer (tr)] [uxbox.util.router :as r] diff --git a/frontend/src/uxbox/main/ui/dashboard/icons.cljs b/frontend/src/uxbox/main/ui/dashboard/icons.cljs index 4ac05a3c9..40237526d 100644 --- a/frontend/src/uxbox/main/ui/dashboard/icons.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/icons.cljs @@ -11,7 +11,7 @@ [uxbox.main.store :as st] [uxbox.main.data.lightbox :as udl] [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.lightbox :as lbx] [uxbox.main.ui.dashboard.header :refer (header)] diff --git a/frontend/src/uxbox/main/ui/dashboard/images.cljs b/frontend/src/uxbox/main/ui/dashboard/images.cljs index 2995cd488..bbd41c0de 100644 --- a/frontend/src/uxbox/main/ui/dashboard/images.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/images.cljs @@ -13,7 +13,7 @@ [potok.core :as ptk] [uxbox.main.data.lightbox :as udl] [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.main.ui.lightbox :as lbx] [uxbox.main.ui.keyboard :as kbd] diff --git a/frontend/src/uxbox/main/ui/dashboard/projects.cljs b/frontend/src/uxbox/main/ui/dashboard/projects.cljs index ef40d0edd..7ca9bdbd6 100644 --- a/frontend/src/uxbox/main/ui/dashboard/projects.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/projects.cljs @@ -12,7 +12,7 @@ [uxbox.main.constants :as c] [uxbox.main.data.projects :as udp] [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.projects-createlightbox] [uxbox.main.ui.lightbox :as lbx] diff --git a/frontend/src/uxbox/main/ui/dashboard/projects_createlightbox.cljs b/frontend/src/uxbox/main/ui/dashboard/projects_createlightbox.cljs index 1f9ee0e72..bf3614145 100644 --- a/frontend/src/uxbox/main/ui/dashboard/projects_createlightbox.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/projects_createlightbox.cljs @@ -14,7 +14,7 @@ [uxbox.main.exports :as exports] [uxbox.main.data.projects :as udp] [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.lightbox :as lbx] [uxbox.main.ui.keyboard :as kbd] diff --git a/frontend/src/uxbox/main/ui/loader.cljs b/frontend/src/uxbox/main/ui/loader.cljs index abd85c5b7..f393d62ea 100644 --- a/frontend/src/uxbox/main/ui/loader.cljs +++ b/frontend/src/uxbox/main/ui/loader.cljs @@ -6,7 +6,7 @@ (ns uxbox.main.ui.loader (: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])) ;; --- Component diff --git a/frontend/src/uxbox/main/ui/settings.cljs b/frontend/src/uxbox/main/ui/settings.cljs index be3524b68..a439ca0c6 100644 --- a/frontend/src/uxbox/main/ui/settings.cljs +++ b/frontend/src/uxbox/main/ui/settings.cljs @@ -11,7 +11,7 @@ [cuerdas.core :as str] [uxbox.util.router :as r] [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.dom :as dom] [uxbox.main.ui.settings.profile :as profile] diff --git a/frontend/src/uxbox/main/ui/settings/header.cljs b/frontend/src/uxbox/main/ui/settings/header.cljs index 4ae6c38d5..c5368d00c 100644 --- a/frontend/src/uxbox/main/ui/settings/header.cljs +++ b/frontend/src/uxbox/main/ui/settings/header.cljs @@ -15,7 +15,7 @@ [uxbox.main.store :as st] [uxbox.main.data.projects :as dp] [uxbox.main.ui.navigation :as nav] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.main.ui.users :refer (user)] [uxbox.util.mixins :as mx :include-macros true])) diff --git a/frontend/src/uxbox/main/ui/settings/notifications.cljs b/frontend/src/uxbox/main/ui/settings/notifications.cljs index 6b77662b4..6a740c11f 100644 --- a/frontend/src/uxbox/main/ui/settings/notifications.cljs +++ b/frontend/src/uxbox/main/ui/settings/notifications.cljs @@ -11,7 +11,7 @@ [cuerdas.core :as str] [uxbox.util.router :as r] [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.dom :as dom] [uxbox.main.ui.settings.header :refer (header)])) diff --git a/frontend/src/uxbox/main/ui/settings/password.cljs b/frontend/src/uxbox/main/ui/settings/password.cljs index da6e1a67f..11f34a464 100644 --- a/frontend/src/uxbox/main/ui/settings/password.cljs +++ b/frontend/src/uxbox/main/ui/settings/password.cljs @@ -11,7 +11,7 @@ [potok.core :as ptk] [uxbox.main.store :as st] [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.settings.header :refer [header]] [uxbox.util.forms :as forms] diff --git a/frontend/src/uxbox/main/ui/settings/profile.cljs b/frontend/src/uxbox/main/ui/settings/profile.cljs index 7da4eca0d..caffccf5b 100644 --- a/frontend/src/uxbox/main/ui/settings/profile.cljs +++ b/frontend/src/uxbox/main/ui/settings/profile.cljs @@ -10,7 +10,7 @@ [lentes.core :as l] [potok.core :as ptk] [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.messages :refer [messages-widget]] [uxbox.main.data.users :as udu] diff --git a/frontend/src/uxbox/main/ui/users.cljs b/frontend/src/uxbox/main/ui/users.cljs index 47aff87c1..1fcf3f1d9 100644 --- a/frontend/src/uxbox/main/ui/users.cljs +++ b/frontend/src/uxbox/main/ui/users.cljs @@ -11,7 +11,7 @@ [uxbox.main.store :as st] [uxbox.main.data.auth :as da] [uxbox.main.data.lightbox :as udl] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.main.ui.navigation :as nav] [uxbox.util.router :as rt] [uxbox.util.mixins :as mx :include-macros true])) diff --git a/frontend/src/uxbox/main/ui/workspace/clipboard.cljs b/frontend/src/uxbox/main/ui/workspace/clipboard.cljs index b23afdfa6..38cb31d62 100644 --- a/frontend/src/uxbox/main/ui/workspace/clipboard.cljs +++ b/frontend/src/uxbox/main/ui/workspace/clipboard.cljs @@ -10,7 +10,7 @@ [uxbox.main.store :as st] [uxbox.main.data.lightbox :as udl] [uxbox.main.data.workspace :as udw] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.main.ui.lightbox :as lbx] [potok.core :as ptk] [uxbox.util.mixins :as mx :include-macros true] diff --git a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs b/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs index 094359611..16dd6b623 100644 --- a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs +++ b/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs @@ -15,7 +15,7 @@ [uxbox.main.data.shapes :as uds] [uxbox.main.data.colors :as dc] [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.util.lens :as ul] [uxbox.util.data :refer (read-string)] diff --git a/frontend/src/uxbox/main/ui/workspace/colorpicker.cljs b/frontend/src/uxbox/main/ui/workspace/colorpicker.cljs index 1c0520ac1..7f7971a78 100644 --- a/frontend/src/uxbox/main/ui/workspace/colorpicker.cljs +++ b/frontend/src/uxbox/main/ui/workspace/colorpicker.cljs @@ -14,7 +14,7 @@ [uxbox.main.data.workspace :as udw] [uxbox.main.data.pages :as udp] [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.colorpicker :as cp] [uxbox.main.ui.workspace.recent-colors :refer [recent-colors]] diff --git a/frontend/src/uxbox/main/ui/workspace/download.cljs b/frontend/src/uxbox/main/ui/workspace/download.cljs index aca404ef9..dcceb21cd 100644 --- a/frontend/src/uxbox/main/ui/workspace/download.cljs +++ b/frontend/src/uxbox/main/ui/workspace/download.cljs @@ -14,7 +14,7 @@ [uxbox.main.refs :as refs] [uxbox.main.data.lightbox :as udl] [uxbox.main.exports :as exports] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.main.ui.lightbox :as lbx] [uxbox.util.blob :as blob] [uxbox.util.data :refer (read-string)] diff --git a/frontend/src/uxbox/main/ui/workspace/header.cljs b/frontend/src/uxbox/main/ui/workspace/header.cljs index 9616e9826..3c7e963d9 100644 --- a/frontend/src/uxbox/main/ui/workspace/header.cljs +++ b/frontend/src/uxbox/main/ui/workspace/header.cljs @@ -16,7 +16,7 @@ [uxbox.main.data.history :as udh] [uxbox.main.data.lightbox :as udl] [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.navigation :as nav] [uxbox.util.mixins :as mx :include-macros true] diff --git a/frontend/src/uxbox/main/ui/workspace/images.cljs b/frontend/src/uxbox/main/ui/workspace/images.cljs index 120e5410e..c06c88b95 100644 --- a/frontend/src/uxbox/main/ui/workspace/images.cljs +++ b/frontend/src/uxbox/main/ui/workspace/images.cljs @@ -17,7 +17,7 @@ [uxbox.main.data.images :as udi] [uxbox.main.data.workspace :as udw] [uxbox.main.data.shapes :as uds] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.main.ui.lightbox :as lbx])) diff --git a/frontend/src/uxbox/main/ui/workspace/recent_colors.cljs b/frontend/src/uxbox/main/ui/workspace/recent_colors.cljs index 1a37b8ff6..10f3e86af 100644 --- a/frontend/src/uxbox/main/ui/workspace/recent_colors.cljs +++ b/frontend/src/uxbox/main/ui/workspace/recent_colors.cljs @@ -11,7 +11,7 @@ [uxbox.main.store :as st] [uxbox.main.refs :as refs] [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.dom :as dom] [uxbox.util.i18n :refer (tr)])) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs index 48c539059..a31591a37 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs @@ -12,7 +12,7 @@ [uxbox.main.store :as st] [uxbox.main.refs :as refs] [uxbox.main.data.workspace :as dw] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.util.i18n :refer (tr)] [uxbox.util.router :as r] [uxbox.util.data :refer (read-string)] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs index a97388bad..3565d6304 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs @@ -15,7 +15,7 @@ [uxbox.main.data.workspace :as dw] [uxbox.main.data.pages :as udp] [uxbox.main.data.history :as udh] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.util.i18n :refer (tr)] [uxbox.util.router :as r] [uxbox.util.mixins :as mx :include-macros true] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs index 96a86973b..8c66a4071 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs @@ -15,7 +15,7 @@ [uxbox.main.data.icons :as udi] [uxbox.main.ui.shapes.icon :as icon] [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.dom :as dom] [uxbox.util.data :refer (read-string)])) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 08e9dd3ae..e136dbca2 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -15,7 +15,7 @@ [uxbox.main.data.workspace :as udw] [uxbox.main.data.shapes :as uds] [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.util.data :refer (read-string classnames)] [uxbox.util.router :as r] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs index efb440425..8861e6dfc 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs @@ -14,7 +14,7 @@ [uxbox.main.store :as st] [uxbox.main.data.workspace :as udw] [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.workspace.sidebar.options.icon-measures :as options-iconm] [uxbox.main.ui.workspace.sidebar.options.circle-measures :as options-circlem] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs index bcf73de60..2becac5bf 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs @@ -15,7 +15,7 @@ [uxbox.main.store :as st] [uxbox.main.data.workspace :as udw] [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.main.geom :as geom] [uxbox.util.dom :as dom] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs index 34eedaa51..3e3b512cb 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs @@ -13,7 +13,7 @@ [uxbox.main.store :as st] [uxbox.main.data.shapes :as uds] [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.dom :as dom] [uxbox.util.data :refer (parse-int parse-float read-string)] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs index fc3014dab..267265065 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs @@ -15,7 +15,7 @@ [uxbox.main.store :as st] [uxbox.main.data.workspace :as udw] [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.main.geom :as geom] [uxbox.util.dom :as dom] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs index 84100b399..59ab70495 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs @@ -17,7 +17,7 @@ [uxbox.main.data.shapes :as uds] [uxbox.main.data.lightbox :as udl] [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.colorpicker :as cp] [uxbox.util.dom :as dom] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs index 4d606dd4e..1577d19d5 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs @@ -16,7 +16,7 @@ [uxbox.main.data.pages :as udp] [uxbox.main.data.workspace :as udw] [uxbox.main.data.lightbox :as udl] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.main.ui.workspace.colorpicker] [uxbox.util.mixins :as mx :include-macros true] [uxbox.util.data :refer [parse-int]] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs index a777f21bb..9da1496a0 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs @@ -13,7 +13,7 @@ [uxbox.main.store :as st] [uxbox.main.data.workspace :as udw] [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.main.geom :as geom] [uxbox.util.dom :as dom] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs index 6bdd8b14e..73d7108e4 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs @@ -13,7 +13,7 @@ [uxbox.main.store :as st] [uxbox.main.data.shapes :as uds] [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.dom :as dom] [uxbox.util.data :refer (parse-int parse-float read-string)] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs index 962cc87df..441514390 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs @@ -12,7 +12,7 @@ [uxbox.main.geom :as geom] [uxbox.main.data.workspace :as udw] [uxbox.main.data.shapes :as uds] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.util.i18n :refer (tr)] [uxbox.util.router :as r] [uxbox.util.mixins :as mx :include-macros true] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs index 6ce09d8c6..da549a775 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs @@ -17,7 +17,7 @@ [uxbox.main.data.lightbox :as udl] [uxbox.main.ui.workspace.sidebar.sitemap-pageform] [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.i18n :refer (tr)] [uxbox.util.router :as r] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs index cb53fda86..5118f1c3b 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs @@ -14,7 +14,7 @@ [uxbox.main.data.pages :as udp] [uxbox.main.data.workspace :as dw] [uxbox.main.data.lightbox :as udl] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.main.ui.lightbox :as lbx] [uxbox.util.i18n :refer (tr)] [uxbox.util.router :as r] diff --git a/frontend/src/uxbox/util/messages.cljs b/frontend/src/uxbox/util/messages.cljs index 19f07d37e..f149c423c 100644 --- a/frontend/src/uxbox/util/messages.cljs +++ b/frontend/src/uxbox/util/messages.cljs @@ -10,7 +10,7 @@ [cuerdas.core :as str] [beicon.core :as rx] [potok.core :as ptk] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.util.timers :as ts] [uxbox.util.mixins :as mx :include-macros true] [uxbox.util.data :refer [classnames]] diff --git a/frontend/src/uxbox/util/router.cljs b/frontend/src/uxbox/util/router.cljs index f5995a33a..696b87065 100644 --- a/frontend/src/uxbox/util/router.cljs +++ b/frontend/src/uxbox/util/router.cljs @@ -7,8 +7,7 @@ (ns uxbox.util.router (:require [bide.core :as r] [beicon.core :as rx] - [potok.core :as ptk] - [uxbox.main.store :as st])) + [potok.core :as ptk])) (defonce +router+ nil) @@ -46,15 +45,13 @@ ;; --- Public Api (defn init - ([store routes] - (init store routes nil)) - ([store routes {:keys [default] :or {default :auth/login}}] - (let [opts {:on-navigate #(ptk/emit! store (update-location %1 %2)) - :default default} - router (-> (r/router routes) - (r/start! opts))] + [store routes {:keys [default] :or {default :auth/login}}] + (let [opts {:on-navigate #(ptk/emit! store (update-location %1 %2)) + :default default} + router (-> (r/router routes) + (r/start! opts))] (set! +router+ router) - router))) + router)) (defn route-for "Given a location handler and optional parameter map, return the URI diff --git a/frontend/src/uxbox/view/ui.cljs b/frontend/src/uxbox/view/ui.cljs index 49394e106..fb6d9066c 100644 --- a/frontend/src/uxbox/view/ui.cljs +++ b/frontend/src/uxbox/view/ui.cljs @@ -7,13 +7,13 @@ (ns uxbox.view.ui (:require [lentes.core :as l] [potok.core :as ptk] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.view.store :as st] [uxbox.view.ui.loader :refer [loader]] [uxbox.view.ui.notfound :refer [notfound-page]] [uxbox.view.ui.viewer :refer [viewer-page]] - [uxbox.util.i18n :refer [tr]] [uxbox.util.router :as rt] + [uxbox.util.i18n :refer [tr]] [uxbox.util.messages :as uum] [uxbox.util.mixins :as mx :include-macros true] [uxbox.util.dom :as dom])) diff --git a/frontend/src/uxbox/view/ui/loader.cljs b/frontend/src/uxbox/view/ui/loader.cljs index b29765183..75e08415e 100644 --- a/frontend/src/uxbox/view/ui/loader.cljs +++ b/frontend/src/uxbox/view/ui/loader.cljs @@ -5,7 +5,7 @@ ;; Copyright (c) 2016-2017 Andrey Antukh (ns uxbox.view.ui.loader - (:require [uxbox.main.ui.icons :as i] + (:require [uxbox.builtins.icons :as i] [uxbox.view.store :as st] [uxbox.util.mixins :as mx :include-macros true])) diff --git a/frontend/src/uxbox/view/ui/viewer.cljs b/frontend/src/uxbox/view/ui/viewer.cljs index 37daa0376..a3464a1ab 100644 --- a/frontend/src/uxbox/view/ui/viewer.cljs +++ b/frontend/src/uxbox/view/ui/viewer.cljs @@ -11,7 +11,7 @@ [potok.core :as ptk] [uxbox.util.router :as rt] [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.data.viewer :as dv] [uxbox.view.ui.viewer.nav :refer (nav)] diff --git a/frontend/src/uxbox/view/ui/viewer/canvas.cljs b/frontend/src/uxbox/view/ui/viewer/canvas.cljs index 2b891a68e..42f8ad4f7 100644 --- a/frontend/src/uxbox/view/ui/viewer/canvas.cljs +++ b/frontend/src/uxbox/view/ui/viewer/canvas.cljs @@ -13,7 +13,7 @@ [uxbox.util.data :refer (parse-int)] [uxbox.view.store :as st] [uxbox.main.ui.shapes :as uus] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.view.ui.viewer.shapes :as shapes])) ;; --- Refs diff --git a/frontend/src/uxbox/view/ui/viewer/nav.cljs b/frontend/src/uxbox/view/ui/viewer/nav.cljs index fd4ba010d..bc29f2c0b 100644 --- a/frontend/src/uxbox/view/ui/viewer/nav.cljs +++ b/frontend/src/uxbox/view/ui/viewer/nav.cljs @@ -9,7 +9,7 @@ (:require [uxbox.util.mixins :as mx :include-macros true] [potok.core :as ptk] [uxbox.view.store :as st] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.view.data.viewer :as dv])) (mx/defc nav diff --git a/frontend/src/uxbox/view/ui/viewer/shapes.cljs b/frontend/src/uxbox/view/ui/viewer/shapes.cljs index b4bca3e38..e6028bdaa 100644 --- a/frontend/src/uxbox/view/ui/viewer/shapes.cljs +++ b/frontend/src/uxbox/view/ui/viewer/shapes.cljs @@ -17,7 +17,7 @@ [uxbox.main.ui.shapes.path :refer (path-shape)] [uxbox.main.ui.shapes.circle :refer (circle-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]) (:import goog.events.EventType)) diff --git a/frontend/src/uxbox/view/ui/viewer/sitemap.cljs b/frontend/src/uxbox/view/ui/viewer/sitemap.cljs index 21eb3eb02..6f1a104d6 100644 --- a/frontend/src/uxbox/view/ui/viewer/sitemap.cljs +++ b/frontend/src/uxbox/view/ui/viewer/sitemap.cljs @@ -13,7 +13,7 @@ [uxbox.util.data :refer (parse-int)] [potok.core :as ptk] [uxbox.view.store :as st] - [uxbox.main.ui.icons :as i] + [uxbox.builtins.icons :as i] [uxbox.view.data.viewer :as dv])) ;; --- Refs