diff --git a/backend/deps.edn b/backend/deps.edn index edb88c09b..fffaacf9f 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -80,11 +80,11 @@ :args {}} :fn-media-loader - {:fn uxbox.cli.media-loader/run + {:fn app.cli.media-loader/run :args {}} :fn-fixtures - {:fn uxbox.cli.fixtures/run + {:fn app.cli.fixtures/run :args {}} :lint diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index 2bcacbd93..ffda464ec 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -30,11 +30,11 @@ - + - + diff --git a/backend/scripts/import-generic-collections.sh b/backend/scripts/import-generic-collections.sh index ff12ddaf0..b28c41296 100755 --- a/backend/scripts/import-generic-collections.sh +++ b/backend/scripts/import-generic-collections.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -clojure -Adev -m uxbox.cli.collimp $@ +clojure -Adev -m app.cli.collimp $@ diff --git a/backend/scripts/psql.sh b/backend/scripts/psql.sh index 5edf959d8..02d9cfebc 100755 --- a/backend/scripts/psql.sh +++ b/backend/scripts/psql.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -PGPASSWORD=$UXBOX_DATABASE_PASSWORD psql $UXBOX_DATABASE_URI -U $UXBOX_DATABASE_USERNAME +PGPASSWORD=$app_DATABASE_PASSWORD psql $app_DATABASE_URI -U $app_DATABASE_USERNAME diff --git a/backend/scripts/run-tests-in-docker.sh b/backend/scripts/run-tests-in-docker.sh index 3f5d1b381..bcb8e50ec 100755 --- a/backend/scripts/run-tests-in-docker.sh +++ b/backend/scripts/run-tests-in-docker.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -xe -clojure -Adev -m uxbox.tests.main; +clojure -Adev -m app.tests.main; diff --git a/backend/scripts/start-dev b/backend/scripts/start-dev index dea5773d8..1a9acac3b 100755 --- a/backend/scripts/start-dev +++ b/backend/scripts/start-dev @@ -4,10 +4,10 @@ set -e if [ ! -e ~/local/.fixtures-loaded ]; then echo "Loading fixtures..." - clojure -Adev -m uxbox.fixtures + clojure -Adev -m app.fixtures touch ~/local/.fixtures-loaded fi -clojure -m uxbox.main +clojure -m app.main diff --git a/backend/scripts/start-prod b/backend/scripts/start-prod index 28613e273..d9778c034 100755 --- a/backend/scripts/start-prod +++ b/backend/scripts/start-prod @@ -2,4 +2,4 @@ set -e -clojure -O:jmx-remote -A:dev -J-Xms100m -J-Xmx100m -J-XX:+AlwaysPreTouch -J-XX:+UseBiasedLocking -J-Duxbox.enable-asserts=false -J-Dclojure.compiler.direct-linking=true -J-Dclojure.server.repl='{:port 5555 :accept clojure.core.server/repl}' -m uxbox.main +clojure -O:jmx-remote -A:dev -J-Xms100m -J-Xmx100m -J-XX:+AlwaysPreTouch -J-XX:+UseBiasedLocking -J-Dapp.enable-asserts=false -J-Dclojure.compiler.direct-linking=true -J-Dclojure.server.repl='{:port 5555 :accept clojure.core.server/repl}' -m app.main diff --git a/backend/src/uxbox/cli/fixtures.clj b/backend/src/app/cli/fixtures.clj similarity index 95% rename from backend/src/uxbox/cli/fixtures.clj rename to backend/src/app/cli/fixtures.clj index a44cf2b35..bc3b21f69 100644 --- a/backend/src/uxbox/cli/fixtures.clj +++ b/backend/src/app/cli/fixtures.clj @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.cli.fixtures +(ns app.cli.fixtures "A initial fixtures." (:require [clojure.tools.logging :as log] [mount.core :as mount] [sodi.pwhash :as pwhash] - [uxbox.common.data :as d] - [uxbox.common.pages :as cp] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.migrations] - [uxbox.services.mutations.profile :as profile] - [uxbox.util.blob :as blob])) + [app.common.data :as d] + [app.common.pages :as cp] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.migrations] + [app.services.mutations.profile :as profile] + [app.util.blob :as blob])) (defn- mk-uuid [prefix & args] @@ -86,7 +86,7 @@ :fullname (str "Profile " index) :password "123123" :demo? true - :email (str "profile" index ".test@uxbox.io")}))) + :email (str "profile" index ".test@app.io")}))) create-profiles (fn [conn] @@ -264,9 +264,9 @@ [{:keys [preset] :or {preset :small}}] (try - (-> (mount/only #{#'uxbox.config/config - #'uxbox.db/pool - #'uxbox.migrations/migrations}) + (-> (mount/only #{#'app.config/config + #'app.db/pool + #'app.migrations/migrations}) (mount/start)) (run* preset) (catch Exception e diff --git a/backend/src/uxbox/cli/media_loader.clj b/backend/src/app/cli/media_loader.clj similarity index 91% rename from backend/src/uxbox/cli/media_loader.clj rename to backend/src/app/cli/media_loader.clj index 57159147c..28b8e335e 100644 --- a/backend/src/uxbox/cli/media_loader.clj +++ b/backend/src/app/cli/media_loader.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2016-2020 Andrey Antukh -(ns uxbox.cli.media-loader +(ns app.cli.media-loader "Media libraries importer (command line helper)." (:require [clojure.tools.logging :as log] @@ -15,17 +15,17 @@ [clojure.java.io :as io] [mount.core :as mount] [datoteka.core :as fs] - [uxbox.config] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.media] - [uxbox.media-storage] - [uxbox.migrations] - [uxbox.common.uuid :as uuid] - [uxbox.services.mutations.projects :as projects] - [uxbox.services.mutations.files :as files] - [uxbox.services.mutations.colors :as colors] - [uxbox.services.mutations.media :as media]) + [app.config] + [app.common.spec :as us] + [app.db :as db] + [app.media] + [app.media-storage] + [app.migrations] + [app.common.uuid :as uuid] + [app.services.mutations.projects :as projects] + [app.services.mutations.files :as files] + [app.services.mutations.colors :as colors] + [app.services.mutations.media :as media]) (:import java.io.PushbackReader)) @@ -219,11 +219,11 @@ (let [path (validate-path path)] (try - (-> (mount/only #{#'uxbox.config/config - #'uxbox.db/pool - #'uxbox.migrations/migrations - #'uxbox.media/semaphore - #'uxbox.media-storage/media-storage}) + (-> (mount/only #{#'app.config/config + #'app.db/pool + #'app.migrations/migrations + #'app.media/semaphore + #'app.media-storage/media-storage}) (mount/start)) (run* path) (catch Exception e diff --git a/backend/src/uxbox/config.clj b/backend/src/app/config.clj similarity index 92% rename from backend/src/uxbox/config.clj rename to backend/src/app/config.clj index c581e9358..f5ac01929 100644 --- a/backend/src/uxbox/config.clj +++ b/backend/src/app/config.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.config +(ns app.config "A configuration management." (:require [clojure.spec.alpha :as s] @@ -15,16 +15,16 @@ [cuerdas.core :as str] [environ.core :refer [env]] [mount.core :refer [defstate]] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.util.time :as dt])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.util.time :as dt])) (def defaults {:http-server-port 6060 :http-server-cors "http://localhost:3449" - :database-uri "postgresql://127.0.0.1/uxbox" - :database-username "uxbox" - :database-password "uxbox" + :database-uri "postgresql://127.0.0.1/app" + :database-username "app" + :database-password "app" :media-directory "resources/public/media" :assets-directory "resources/public/static" @@ -161,7 +161,10 @@ (fn [acc k v] (cond-> acc (str/starts-with? (name k) "uxbox-") - (assoc (keyword (subs (name k) 6)) v))) + (assoc (keyword (subs (name k) 6)) v) + + (str/starts-with? (name k) "app-") + (assoc (keyword (subs (name k) 4)) v))) {} env)) @@ -175,9 +178,9 @@ [env] (assoc (read-config env) :redis-uri "redis://redis/1" - :database-uri "postgresql://postgres/uxbox_test" - :media-directory "/tmp/uxbox/media" - :assets-directory "/tmp/uxbox/static" + :database-uri "postgresql://postgres/app_test" + :media-directory "/tmp/app/media" + :assets-directory "/tmp/app/static" :migrations-verbose false)) (defstate config diff --git a/backend/src/uxbox/db.clj b/backend/src/app/db.clj similarity index 96% rename from backend/src/uxbox/db.clj rename to backend/src/app/db.clj index f28a7c66b..7a8f7cbb5 100644 --- a/backend/src/uxbox/db.clj +++ b/backend/src/app/db.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.db +(ns app.db (:require [clojure.spec.alpha :as s] [clojure.data.json :as json] @@ -18,12 +18,12 @@ [next.jdbc.result-set :as jdbc-rs] [next.jdbc.sql :as jdbc-sql] [next.jdbc.sql.builder :as jdbc-bld] - [uxbox.common.exceptions :as ex] - [uxbox.config :as cfg] - [uxbox.metrics :as mtx] - [uxbox.util.time :as dt] - [uxbox.util.transit :as t] - [uxbox.util.data :as data]) + [app.common.exceptions :as ex] + [app.config :as cfg] + [app.metrics :as mtx] + [app.util.time :as dt] + [app.util.transit :as t] + [app.util.data :as data]) (:import org.postgresql.util.PGobject org.postgresql.util.PGInterval diff --git a/backend/src/uxbox/emails.clj b/backend/src/app/emails.clj similarity index 91% rename from backend/src/uxbox/emails.clj rename to backend/src/app/emails.clj index 14efd7a5e..95a96d13b 100644 --- a/backend/src/uxbox/emails.clj +++ b/backend/src/app/emails.clj @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.emails +(ns app.emails "Main api for send emails." (:require [clojure.spec.alpha :as s] [promesa.core :as p] - [uxbox.config :as cfg] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.tasks :as tasks] - [uxbox.util.emails :as emails])) + [app.config :as cfg] + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.db :as db] + [app.tasks :as tasks] + [app.util.emails :as emails])) ;; --- Defaults diff --git a/backend/src/uxbox/http.clj b/backend/src/app/http.clj similarity index 84% rename from backend/src/uxbox/http.clj rename to backend/src/app/http.clj index 716047d44..e5afdd856 100644 --- a/backend/src/uxbox/http.clj +++ b/backend/src/app/http.clj @@ -7,24 +7,24 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.http +(ns app.http (:require [clojure.tools.logging :as log] [mount.core :as mount :refer [defstate]] [reitit.ring :as rring] [ring.adapter.jetty9 :as jetty] - [uxbox.config :as cfg] - [uxbox.http.auth :as auth] - [uxbox.http.auth.google :as google] - [uxbox.http.auth.ldap :as ldap] - [uxbox.http.debug :as debug] - [uxbox.http.errors :as errors] - [uxbox.http.handlers :as handlers] - [uxbox.http.middleware :as middleware] - [uxbox.http.session :as session] - [uxbox.http.ws :as ws] - [uxbox.metrics :as mtx] - [uxbox.services.notifications :as usn])) + [app.config :as cfg] + [app.http.auth :as auth] + [app.http.auth.google :as google] + [app.http.auth.ldap :as ldap] + [app.http.debug :as debug] + [app.http.errors :as errors] + [app.http.handlers :as handlers] + [app.http.middleware :as middleware] + [app.http.session :as session] + [app.http.ws :as ws] + [app.metrics :as mtx] + [app.services.notifications :as usn])) (defn- create-router [] diff --git a/backend/src/uxbox/http/auth.clj b/backend/src/app/http/auth.clj similarity index 84% rename from backend/src/uxbox/http/auth.clj rename to backend/src/app/http/auth.clj index baf1b5d37..a4113ef84 100644 --- a/backend/src/uxbox/http/auth.clj +++ b/backend/src/app/http/auth.clj @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.http.auth +(ns app.http.auth (:require - [uxbox.common.exceptions :as ex] - [uxbox.common.uuid :as uuid] - [uxbox.http.session :as session] - [uxbox.services.mutations :as sm])) + [app.common.exceptions :as ex] + [app.common.uuid :as uuid] + [app.http.session :as session] + [app.services.mutations :as sm])) (defn login-handler [req] diff --git a/backend/src/uxbox/http/auth/google.clj b/backend/src/app/http/auth/google.clj similarity index 94% rename from backend/src/uxbox/http/auth/google.clj rename to backend/src/app/http/auth/google.clj index 25c7b9107..ff0c7494b 100644 --- a/backend/src/uxbox/http/auth/google.clj +++ b/backend/src/app/http/auth/google.clj @@ -7,18 +7,18 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.http.auth.google +(ns app.http.auth.google (:require [clojure.data.json :as json] [clojure.tools.logging :as log] [lambdaisland.uri :as uri] - [uxbox.common.exceptions :as ex] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.services.tokens :as tokens] - [uxbox.services.mutations :as sm] - [uxbox.http.session :as session] - [uxbox.util.http :as http])) + [app.common.exceptions :as ex] + [app.config :as cfg] + [app.db :as db] + [app.services.tokens :as tokens] + [app.services.mutations :as sm] + [app.http.session :as session] + [app.util.http :as http])) (def base-goauth-uri "https://accounts.google.com/o/oauth2/v2/auth") diff --git a/backend/src/uxbox/http/auth/ldap.clj b/backend/src/app/http/auth/ldap.clj similarity index 95% rename from backend/src/uxbox/http/auth/ldap.clj rename to backend/src/app/http/auth/ldap.clj index d869cb3f3..af74843fb 100644 --- a/backend/src/uxbox/http/auth/ldap.clj +++ b/backend/src/app/http/auth/ldap.clj @@ -1,12 +1,12 @@ -(ns uxbox.http.auth.ldap +(ns app.http.auth.ldap (:require [clj-ldap.client :as client] [clojure.set :as set] [mount.core :refer [defstate]] - [uxbox.common.exceptions :as ex] - [uxbox.config :as cfg] - [uxbox.services.mutations :as sm] - [uxbox.http.session :as session] + [app.common.exceptions :as ex] + [app.config :as cfg] + [app.services.mutations :as sm] + [app.http.session :as session] [clojure.tools.logging :as log])) diff --git a/backend/src/uxbox/http/debug.clj b/backend/src/app/http/debug.clj similarity index 79% rename from backend/src/uxbox/http/debug.clj rename to backend/src/app/http/debug.clj index c02eb676e..e0df75670 100644 --- a/backend/src/uxbox/http/debug.clj +++ b/backend/src/app/http/debug.clj @@ -4,14 +4,14 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.http.debug +(ns app.http.debug "Debug related handlers." (:require [clojure.tools.logging :as log] [promesa.core :as p] - [uxbox.http.errors :as errors] - [uxbox.http.session :as session] - [uxbox.common.uuid :as uuid])) + [app.http.errors :as errors] + [app.http.session :as session] + [app.common.uuid :as uuid])) (defn emails-list [req] diff --git a/backend/src/uxbox/http/errors.clj b/backend/src/app/http/errors.clj similarity index 97% rename from backend/src/uxbox/http/errors.clj rename to backend/src/app/http/errors.clj index 0ec60f4df..8a5e5ed98 100644 --- a/backend/src/uxbox/http/errors.clj +++ b/backend/src/app/http/errors.clj @@ -4,12 +4,12 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.http.errors +(ns app.http.errors "A errors handling for the http server." (:require [clojure.tools.logging :as log] [cuerdas.core :as str] - [uxbox.metrics :as mtx] + [app.metrics :as mtx] [io.aviso.exception :as e])) (defmulti handle-exception diff --git a/backend/src/uxbox/http/handlers.clj b/backend/src/app/http/handlers.clj similarity index 90% rename from backend/src/uxbox/http/handlers.clj rename to backend/src/app/http/handlers.clj index 1eb16f272..f49e6da45 100644 --- a/backend/src/uxbox/http/handlers.clj +++ b/backend/src/app/http/handlers.clj @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.http.handlers +(ns app.http.handlers (:require - [uxbox.common.exceptions :as ex] - [uxbox.emails :as emails] - [uxbox.http.session :as session] - [uxbox.services.init] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq])) + [app.common.exceptions :as ex] + [app.emails :as emails] + [app.http.session :as session] + [app.services.init] + [app.services.mutations :as sm] + [app.services.queries :as sq])) (def unauthorized-services #{:create-demo-profile diff --git a/backend/src/uxbox/http/middleware.clj b/backend/src/app/http/middleware.clj similarity index 96% rename from backend/src/uxbox/http/middleware.clj rename to backend/src/app/http/middleware.clj index 4955cfa68..ab02d9675 100644 --- a/backend/src/uxbox/http/middleware.clj +++ b/backend/src/app/http/middleware.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.http.middleware +(ns app.http.middleware (:require [clojure.tools.logging :as log] [ring.middleware.cookies :refer [wrap-cookies]] @@ -15,10 +15,10 @@ [ring.middleware.multipart-params :refer [wrap-multipart-params]] [ring.middleware.params :refer [wrap-params]] [ring.middleware.resource :refer [wrap-resource]] - [uxbox.metrics :as mtx] - [uxbox.common.exceptions :as ex] - [uxbox.config :as cfg] - [uxbox.util.transit :as t])) + [app.metrics :as mtx] + [app.common.exceptions :as ex] + [app.config :as cfg] + [app.util.transit :as t])) (defn- wrap-parse-request-body [handler] diff --git a/backend/src/uxbox/http/session.clj b/backend/src/app/http/session.clj similarity index 94% rename from backend/src/uxbox/http/session.clj rename to backend/src/app/http/session.clj index c2157b756..de926da51 100644 --- a/backend/src/uxbox/http/session.clj +++ b/backend/src/app/http/session.clj @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.http.session +(ns app.http.session (:require - [uxbox.db :as db] - [uxbox.services.tokens :as tokens])) + [app.db :as db] + [app.services.tokens :as tokens])) (defn extract-auth-token [request] diff --git a/backend/src/uxbox/http/ws.clj b/backend/src/app/http/ws.clj similarity index 89% rename from backend/src/uxbox/http/ws.clj rename to backend/src/app/http/ws.clj index 9d611115d..259782a85 100644 --- a/backend/src/uxbox/http/ws.clj +++ b/backend/src/app/http/ws.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.http.ws +(ns app.http.ws "Web Socket handlers" (:require [clojure.spec.alpha :as s] @@ -16,10 +16,10 @@ [ring.middleware.cookies :refer [wrap-cookies]] [ring.middleware.keyword-params :refer [wrap-keyword-params]] [ring.middleware.params :refer [wrap-params]] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.http.session :refer [wrap-session]] - [uxbox.services.notifications :as nf])) + [app.common.spec :as us] + [app.db :as db] + [app.http.session :refer [wrap-session]] + [app.services.notifications :as nf])) (s/def ::file-id ::us/uuid) (s/def ::session-id ::us/uuid) diff --git a/backend/src/uxbox/main.clj b/backend/src/app/main.clj similarity index 78% rename from backend/src/uxbox/main.clj rename to backend/src/app/main.clj index 063686417..f116ace24 100644 --- a/backend/src/uxbox/main.clj +++ b/backend/src/app/main.clj @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main +(ns app.main (:require [mount.core :as mount])) (defn- enable-asserts [_] - (let [m (System/getProperty "uxbox.enable-asserts")] + (let [m (System/getProperty "app.enable-asserts")] (or (nil? m) (= "true" m)))) ;; Set value for all new threads bindings. @@ -26,11 +26,11 @@ (defn run [params] - (require 'uxbox.config - 'uxbox.migrations - 'uxbox.worker - 'uxbox.media - 'uxbox.http) + (require 'app.config + 'app.migrations + 'app.worker + 'app.media + 'app.http) (mount/start)) diff --git a/backend/src/uxbox/media.clj b/backend/src/app/media.clj similarity index 95% rename from backend/src/uxbox/media.clj rename to backend/src/app/media.clj index 272bffcd7..6e0a77c36 100644 --- a/backend/src/uxbox/media.clj +++ b/backend/src/app/media.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.media +(ns app.media "Media postprocessing." (:require [clojure.core.async :as a] @@ -15,14 +15,14 @@ [clojure.spec.alpha :as s] [datoteka.core :as fs] [mount.core :refer [defstate]] - [uxbox.config :as cfg] - [uxbox.common.data :as d] - [uxbox.common.media :as cm] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.media-storage :as mst] - [uxbox.util.storage :as ust] - [uxbox.util.http :as http]) + [app.config :as cfg] + [app.common.data :as d] + [app.common.media :as cm] + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.media-storage :as mst] + [app.util.storage :as ust] + [app.util.http :as http]) (:import java.io.ByteArrayInputStream java.io.InputStream diff --git a/backend/src/uxbox/media_storage.clj b/backend/src/app/media_storage.clj similarity index 88% rename from backend/src/uxbox/media_storage.clj rename to backend/src/app/media_storage.clj index e260e98ff..3accc3026 100644 --- a/backend/src/uxbox/media_storage.clj +++ b/backend/src/app/media_storage.clj @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2017-2020 Andrey Antukh -(ns uxbox.media-storage - "A media storage impl for uxbox." +(ns app.media-storage + "A media storage impl for app." (:require [mount.core :refer [defstate]] [clojure.java.io :as io] [cuerdas.core :as str] [datoteka.core :as fs] - [uxbox.util.storage :as ust] - [uxbox.config :refer [config]])) + [app.util.storage :as ust] + [app.config :refer [config]])) ;; --- State diff --git a/backend/src/uxbox/metrics.clj b/backend/src/app/metrics.clj similarity index 99% rename from backend/src/uxbox/metrics.clj rename to backend/src/app/metrics.clj index 01b2f7386..39d08970c 100644 --- a/backend/src/uxbox/metrics.clj +++ b/backend/src/app/metrics.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.metrics +(ns app.metrics (:require [clojure.tools.logging :as log] [cuerdas.core :as str]) diff --git a/backend/src/uxbox/migrations.clj b/backend/src/app/migrations.clj similarity index 97% rename from backend/src/uxbox/migrations.clj rename to backend/src/app/migrations.clj index 0fd740d6f..8b2440ebe 100644 --- a/backend/src/uxbox/migrations.clj +++ b/backend/src/app/migrations.clj @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.migrations +(ns app.migrations (:require [mount.core :as mount :refer [defstate]] - [uxbox.db :as db] - [uxbox.config :as cfg] - [uxbox.util.migrations :as mg])) + [app.db :as db] + [app.config :as cfg] + [app.util.migrations :as mg])) (def +migrations+ {:name "uxbox-main" diff --git a/backend/src/uxbox/redis.clj b/backend/src/app/redis.clj similarity index 88% rename from backend/src/uxbox/redis.clj rename to backend/src/app/redis.clj index f1052d36a..1c0eec8e6 100644 --- a/backend/src/uxbox/redis.clj +++ b/backend/src/app/redis.clj @@ -4,16 +4,16 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.redis +(ns app.redis (:refer-clojure :exclude [run!]) (:require [clojure.tools.logging :as log] [lambdaisland.uri :refer [uri]] [mount.core :as mount :refer [defstate]] - [uxbox.common.exceptions :as ex] - [uxbox.config :as cfg] - [uxbox.util.data :as data] - [uxbox.util.redis :as redis]) + [app.common.exceptions :as ex] + [app.config :as cfg] + [app.util.data :as data] + [app.util.redis :as redis]) (:import java.lang.AutoCloseable)) diff --git a/backend/src/app/services/init.clj b/backend/src/app/services/init.clj new file mode 100644 index 000000000..fd99bb8f2 --- /dev/null +++ b/backend/src/app/services/init.clj @@ -0,0 +1,40 @@ +;; 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/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2019-2020 Andrey Antukh + +(ns app.services.init + "A initialization of services." + (:require + [mount.core :as mount :refer [defstate]])) + +(defn- load-query-services + [] + (require 'app.services.queries.media) + (require 'app.services.queries.colors) + (require 'app.services.queries.projects) + (require 'app.services.queries.files) + (require 'app.services.queries.pages) + (require 'app.services.queries.profile) + (require 'app.services.queries.recent-files) + (require 'app.services.queries.viewer)) + +(defn- load-mutation-services + [] + (require 'app.services.mutations.demo) + (require 'app.services.mutations.media) + (require 'app.services.mutations.colors) + (require 'app.services.mutations.projects) + (require 'app.services.mutations.files) + (require 'app.services.mutations.pages) + (require 'app.services.mutations.profile)) + +(defstate query-services + :start (load-query-services)) + +(defstate mutation-services + :start (load-mutation-services)) diff --git a/backend/src/uxbox/services/middleware.clj b/backend/src/app/services/middleware.clj similarity index 93% rename from backend/src/uxbox/services/middleware.clj rename to backend/src/app/services/middleware.clj index 24c129b34..098020b75 100644 --- a/backend/src/uxbox/services/middleware.clj +++ b/backend/src/app/services/middleware.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.services.middleware +(ns app.services.middleware "Common middleware for services." (:require [clojure.tools.logging :as log] [clojure.spec.alpha :as s] [cuerdas.core :as str] [expound.alpha :as expound] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.metrics :as mtx])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.metrics :as mtx])) (defn wrap-spec [handler] diff --git a/backend/src/uxbox/services/mutations.clj b/backend/src/app/services/mutations.clj similarity index 82% rename from backend/src/uxbox/services/mutations.clj rename to backend/src/app/services/mutations.clj index 8f12adb08..c15bbbbb2 100644 --- a/backend/src/uxbox/services/mutations.clj +++ b/backend/src/app/services/mutations.clj @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.services.mutations +(ns app.services.mutations (:require - [uxbox.services.middleware :as middleware] - [uxbox.util.dispatcher :as uds])) + [app.services.middleware :as middleware] + [app.util.dispatcher :as uds])) (uds/defservice handle :dispatch-by ::type diff --git a/backend/src/uxbox/services/mutations/colors.clj b/backend/src/app/services/mutations/colors.clj similarity index 92% rename from backend/src/uxbox/services/mutations/colors.clj rename to backend/src/app/services/mutations/colors.clj index 88f7bc198..9e5c545ed 100644 --- a/backend/src/uxbox/services/mutations/colors.clj +++ b/backend/src/app/services/mutations/colors.clj @@ -7,18 +7,18 @@ ;; ;; Copyright (c) 2020 Andrey Antukh -(ns uxbox.services.mutations.colors +(ns app.services.mutations.colors (:require [clojure.spec.alpha :as s] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.services.queries.teams :as teams] - [uxbox.tasks :as tasks] - [uxbox.util.time :as dt])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.services.mutations :as sm] + [app.services.queries.teams :as teams] + [app.tasks :as tasks] + [app.util.time :as dt])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/mutations/demo.clj b/backend/src/app/services/mutations/demo.clj similarity index 82% rename from backend/src/uxbox/services/mutations/demo.clj rename to backend/src/app/services/mutations/demo.clj index 337b73cfc..e603c3936 100644 --- a/backend/src/uxbox/services/mutations/demo.clj +++ b/backend/src/app/services/mutations/demo.clj @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2016-2020 Andrey Antukh -(ns uxbox.services.mutations.demo +(ns app.services.mutations.demo "A demo specific mutations." (:require [clojure.spec.alpha :as s] [sodi.prng] [sodi.util] - [uxbox.common.exceptions :as ex] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.services.mutations.profile :as profile] - [uxbox.tasks :as tasks] - [uxbox.common.uuid :as uuid] - [uxbox.util.time :as tm])) + [app.common.exceptions :as ex] + [app.config :as cfg] + [app.db :as db] + [app.services.mutations :as sm] + [app.services.mutations.profile :as profile] + [app.tasks :as tasks] + [app.common.uuid :as uuid] + [app.util.time :as tm])) (sm/defmutation ::create-demo-profile [_] diff --git a/backend/src/uxbox/services/mutations/files.clj b/backend/src/app/services/mutations/files.clj similarity index 91% rename from backend/src/uxbox/services/mutations/files.clj rename to backend/src/app/services/mutations/files.clj index 99435223e..a7370f849 100644 --- a/backend/src/uxbox/services/mutations/files.clj +++ b/backend/src/app/services/mutations/files.clj @@ -7,24 +7,24 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.services.mutations.files +(ns app.services.mutations.files (:require [clojure.spec.alpha :as s] [datoteka.core :as fs] [promesa.core :as p] - [uxbox.common.exceptions :as ex] - [uxbox.common.pages :as cp] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.services.mutations.projects :as proj] - [uxbox.services.queries.files :as files] - [uxbox.tasks :as tasks] - [uxbox.util.blob :as blob] - [uxbox.util.storage :as ust] - [uxbox.util.time :as dt])) + [app.common.exceptions :as ex] + [app.common.pages :as cp] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.services.mutations :as sm] + [app.services.mutations.projects :as proj] + [app.services.queries.files :as files] + [app.tasks :as tasks] + [app.util.blob :as blob] + [app.util.storage :as ust] + [app.util.time :as dt])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/mutations/media.clj b/backend/src/app/services/mutations/media.clj similarity index 89% rename from backend/src/uxbox/services/mutations/media.clj rename to backend/src/app/services/mutations/media.clj index 10818fc94..f26bc7ede 100644 --- a/backend/src/uxbox/services/mutations/media.clj +++ b/backend/src/app/services/mutations/media.clj @@ -7,23 +7,23 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.services.mutations.media +(ns app.services.mutations.media (:require [clojure.spec.alpha :as s] [datoteka.core :as fs] - [uxbox.common.media :as cm] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.media :as media] - [uxbox.services.mutations :as sm] - [uxbox.services.queries.teams :as teams] - [uxbox.tasks :as tasks] - [uxbox.media-storage :as mst] - [uxbox.util.storage :as ust] - [uxbox.util.time :as dt])) + [app.common.media :as cm] + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.media :as media] + [app.services.mutations :as sm] + [app.services.queries.teams :as teams] + [app.tasks :as tasks] + [app.media-storage :as mst] + [app.util.storage :as ust] + [app.util.time :as dt])) (def thumbnail-options {:width 100 @@ -46,16 +46,16 @@ (declare persist-media-object-on-fs) (declare persist-media-thumbnail-on-fs) -(s/def :uxbox$upload/filename ::us/string) -(s/def :uxbox$upload/size ::us/integer) -(s/def :uxbox$upload/content-type cm/valid-media-types) -(s/def :uxbox$upload/tempfile any?) +(s/def :app$upload/filename ::us/string) +(s/def :app$upload/size ::us/integer) +(s/def :app$upload/content-type cm/valid-media-types) +(s/def :app$upload/tempfile any?) (s/def ::upload - (s/keys :req-un [:uxbox$upload/filename - :uxbox$upload/size - :uxbox$upload/tempfile - :uxbox$upload/content-type])) + (s/keys :req-un [:app$upload/filename + :app$upload/size + :app$upload/tempfile + :app$upload/content-type])) (s/def ::content ::upload) diff --git a/backend/src/uxbox/services/mutations/pages.clj b/backend/src/app/services/mutations/pages.clj similarity index 92% rename from backend/src/uxbox/services/mutations/pages.clj rename to backend/src/app/services/mutations/pages.clj index 4b46e9aa5..d67a8f707 100644 --- a/backend/src/uxbox/services/mutations/pages.clj +++ b/backend/src/app/services/mutations/pages.clj @@ -7,25 +7,25 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.services.mutations.pages +(ns app.services.mutations.pages (:require [clojure.spec.alpha :as s] - [uxbox.common.data :as d] - [uxbox.common.exceptions :as ex] - [uxbox.common.pages :as cp] - [uxbox.common.pages-migrations :as pmg] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.services.queries.files :as files] - [uxbox.services.queries.pages :refer [decode-row]] - [uxbox.tasks :as tasks] - [uxbox.redis :as redis] - [uxbox.util.blob :as blob] - [uxbox.util.time :as dt] - [uxbox.util.transit :as t])) + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.common.pages :as cp] + [app.common.pages-migrations :as pmg] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.services.mutations :as sm] + [app.services.queries.files :as files] + [app.services.queries.pages :refer [decode-row]] + [app.tasks :as tasks] + [app.redis :as redis] + [app.util.blob :as blob] + [app.util.time :as dt] + [app.util.transit :as t])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/mutations/profile.clj b/backend/src/app/services/mutations/profile.clj similarity index 95% rename from backend/src/uxbox/services/mutations/profile.clj rename to backend/src/app/services/mutations/profile.clj index aec25ab8e..7ce748dd2 100644 --- a/backend/src/uxbox/services/mutations/profile.clj +++ b/backend/src/app/services/mutations/profile.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2016-2020 Andrey Antukh -(ns uxbox.services.mutations.profile +(ns app.services.mutations.profile (:require [clojure.spec.alpha :as s] [cuerdas.core :as str] @@ -17,25 +17,25 @@ [sodi.prng] [sodi.pwhash] [sodi.util] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.common.media :as cm] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.emails :as emails] - [uxbox.media :as media] - [uxbox.media-storage :as mst] - [uxbox.services.tokens :as tokens] - [uxbox.services.mutations :as sm] - [uxbox.services.mutations.media :as media-mutations] - [uxbox.services.mutations.projects :as projects] - [uxbox.services.mutations.teams :as teams] - [uxbox.services.queries.profile :as profile] - [uxbox.tasks :as tasks] - [uxbox.util.blob :as blob] - [uxbox.util.storage :as ust] - [uxbox.util.time :as dt])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.common.media :as cm] + [app.config :as cfg] + [app.db :as db] + [app.emails :as emails] + [app.media :as media] + [app.media-storage :as mst] + [app.services.tokens :as tokens] + [app.services.mutations :as sm] + [app.services.mutations.media :as media-mutations] + [app.services.mutations.projects :as projects] + [app.services.mutations.teams :as teams] + [app.services.queries.profile :as profile] + [app.tasks :as tasks] + [app.util.blob :as blob] + [app.util.storage :as ust] + [app.util.time :as dt])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/mutations/projects.clj b/backend/src/app/services/mutations/projects.clj similarity index 93% rename from backend/src/uxbox/services/mutations/projects.clj rename to backend/src/app/services/mutations/projects.clj index 382acefb1..1b7d42b38 100644 --- a/backend/src/uxbox/services/mutations/projects.clj +++ b/backend/src/app/services/mutations/projects.clj @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.services.mutations.projects +(ns app.services.mutations.projects (:require [clojure.spec.alpha :as s] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.tasks :as tasks] - [uxbox.util.blob :as blob])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.services.mutations :as sm] + [app.tasks :as tasks] + [app.util.blob :as blob])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/mutations/teams.clj b/backend/src/app/services/mutations/teams.clj similarity index 90% rename from backend/src/uxbox/services/mutations/teams.clj rename to backend/src/app/services/mutations/teams.clj index 5867f90ee..891120ea4 100644 --- a/backend/src/uxbox/services/mutations/teams.clj +++ b/backend/src/app/services/mutations/teams.clj @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 Andrey Antukh -(ns uxbox.services.mutations.teams +(ns app.services.mutations.teams (:require [clojure.spec.alpha :as s] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.util.blob :as blob])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.db :as db] + [app.services.mutations :as sm] + [app.util.blob :as blob])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/notifications.clj b/backend/src/app/services/notifications.clj similarity index 96% rename from backend/src/uxbox/services/notifications.clj rename to backend/src/app/services/notifications.clj index 3dee2b8cd..5b6dd9b24 100644 --- a/backend/src/uxbox/services/notifications.clj +++ b/backend/src/app/services/notifications.clj @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.services.notifications +(ns app.services.notifications "A websocket based notifications mechanism." (:require [clojure.core.async :as a :refer [>! -(ns uxbox.services.queries.colors +(ns app.services.queries.colors (:require [clojure.spec.alpha :as s] [promesa.core :as p] [promesa.exec :as px] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.services.queries :as sq] - [uxbox.services.queries.teams :as teams] - [uxbox.util.blob :as blob] - [uxbox.util.data :as data])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.db :as db] + [app.services.queries :as sq] + [app.services.queries.teams :as teams] + [app.util.blob :as blob] + [app.util.data :as data])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/queries/files.clj b/backend/src/app/services/queries/files.clj similarity index 98% rename from backend/src/uxbox/services/queries/files.clj rename to backend/src/app/services/queries/files.clj index 3434b4294..2144a8192 100644 --- a/backend/src/uxbox/services/queries/files.clj +++ b/backend/src/app/services/queries/files.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.services.queries.files +(ns app.services.queries.files (:require [clojure.spec.alpha :as s] [promesa.core :as p] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.media :as media] - [uxbox.services.queries :as sq] - [uxbox.util.blob :as blob])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.db :as db] + [app.media :as media] + [app.services.queries :as sq] + [app.util.blob :as blob])) (declare decode-row) diff --git a/backend/src/uxbox/services/queries/media.clj b/backend/src/app/services/queries/media.clj similarity index 92% rename from backend/src/uxbox/services/queries/media.clj rename to backend/src/app/services/queries/media.clj index 71e1afb6d..94ff99dcb 100644 --- a/backend/src/uxbox/services/queries/media.clj +++ b/backend/src/app/services/queries/media.clj @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.services.queries.media +(ns app.services.queries.media (:require [clojure.spec.alpha :as s] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.media :as media] - [uxbox.services.queries :as sq] - [uxbox.services.queries.teams :as teams])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.db :as db] + [app.media :as media] + [app.services.queries :as sq] + [app.services.queries.teams :as teams])) (s/def ::id ::us/uuid) (s/def ::name ::us/string) diff --git a/backend/src/uxbox/services/queries/pages.clj b/backend/src/app/services/queries/pages.clj similarity index 91% rename from backend/src/uxbox/services/queries/pages.clj rename to backend/src/app/services/queries/pages.clj index fc85b2161..910036695 100644 --- a/backend/src/uxbox/services/queries/pages.clj +++ b/backend/src/app/services/queries/pages.clj @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.services.queries.pages +(ns app.services.queries.pages (:require [clojure.spec.alpha :as s] [promesa.core :as p] - [uxbox.common.spec :as us] - [uxbox.common.exceptions :as ex] - [uxbox.common.pages-migrations :as pmg] - [uxbox.db :as db] - [uxbox.services.queries :as sq] - [uxbox.services.queries.files :as files] - [uxbox.util.blob :as blob])) + [app.common.spec :as us] + [app.common.exceptions :as ex] + [app.common.pages-migrations :as pmg] + [app.db :as db] + [app.services.queries :as sq] + [app.services.queries.files :as files] + [app.util.blob :as blob])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/queries/profile.clj b/backend/src/app/services/queries/profile.clj similarity index 90% rename from backend/src/uxbox/services/queries/profile.clj rename to backend/src/app/services/queries/profile.clj index e6e951bd3..5ffd10cef 100644 --- a/backend/src/uxbox/services/queries/profile.clj +++ b/backend/src/app/services/queries/profile.clj @@ -4,16 +4,16 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.services.queries.profile +(ns app.services.queries.profile (:require [clojure.spec.alpha :as s] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.media :as media] - [uxbox.services.queries :as sq] - [uxbox.common.uuid :as uuid] - [uxbox.util.blob :as blob])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.db :as db] + [app.media :as media] + [app.services.queries :as sq] + [app.common.uuid :as uuid] + [app.util.blob :as blob])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/queries/projects.clj b/backend/src/app/services/queries/projects.clj similarity index 94% rename from backend/src/uxbox/services/queries/projects.clj rename to backend/src/app/services/queries/projects.clj index 6636c4b92..68443b777 100644 --- a/backend/src/uxbox/services/queries/projects.clj +++ b/backend/src/app/services/queries/projects.clj @@ -4,14 +4,14 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.services.queries.projects +(ns app.services.queries.projects (:require [clojure.spec.alpha :as s] [promesa.core :as p] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.services.queries :as sq] - [uxbox.util.blob :as blob])) + [app.common.spec :as us] + [app.db :as db] + [app.services.queries :as sq] + [app.util.blob :as blob])) (declare decode-row) diff --git a/backend/src/uxbox/services/queries/recent_files.clj b/backend/src/app/services/queries/recent_files.clj similarity index 88% rename from backend/src/uxbox/services/queries/recent_files.clj rename to backend/src/app/services/queries/recent_files.clj index 3f660a373..aec3a67c2 100644 --- a/backend/src/uxbox/services/queries/recent_files.clj +++ b/backend/src/app/services/queries/recent_files.clj @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.services.queries.recent-files +(ns app.services.queries.recent-files (:require [clojure.spec.alpha :as s] [promesa.core :as p] - [uxbox.db :as db] - [uxbox.common.spec :as us] - [uxbox.services.queries :as sq] - [uxbox.services.queries.projects :refer [retrieve-projects]] - [uxbox.services.queries.files :refer [decode-row]])) + [app.db :as db] + [app.common.spec :as us] + [app.services.queries :as sq] + [app.services.queries.projects :refer [retrieve-projects]] + [app.services.queries.files :refer [decode-row]])) (def ^:private sql:project-files-recent "select distinct diff --git a/backend/src/uxbox/services/queries/teams.clj b/backend/src/app/services/queries/teams.clj similarity index 86% rename from backend/src/uxbox/services/queries/teams.clj rename to backend/src/app/services/queries/teams.clj index 031b12e0f..3c5dad0da 100644 --- a/backend/src/uxbox/services/queries/teams.clj +++ b/backend/src/app/services/queries/teams.clj @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 Andrey Antukh -(ns uxbox.services.queries.teams +(ns app.services.queries.teams (:require [clojure.spec.alpha :as s] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.services.queries :as sq] - [uxbox.util.blob :as blob])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.db :as db] + [app.services.queries :as sq] + [app.util.blob :as blob])) ;; --- Team Edition Permissions diff --git a/backend/src/uxbox/services/queries/viewer.clj b/backend/src/app/services/queries/viewer.clj similarity index 80% rename from backend/src/uxbox/services/queries/viewer.clj rename to backend/src/app/services/queries/viewer.clj index a2835a448..d1a1d0adf 100644 --- a/backend/src/uxbox/services/queries/viewer.clj +++ b/backend/src/app/services/queries/viewer.clj @@ -7,21 +7,21 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.services.queries.viewer +(ns app.services.queries.viewer (:require [clojure.spec.alpha :as s] [promesa.core :as p] [promesa.exec :as px] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.services.queries :as sq] - [uxbox.services.queries.files :as files] - [uxbox.services.queries.media :as media-queries] - [uxbox.services.queries.pages :as pages] - [uxbox.util.blob :as blob] - [uxbox.util.data :as data])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.db :as db] + [app.services.queries :as sq] + [app.services.queries.files :as files] + [app.services.queries.media :as media-queries] + [app.services.queries.pages :as pages] + [app.util.blob :as blob] + [app.util.data :as data])) ;; --- Helpers & Specs diff --git a/backend/src/uxbox/services/tokens.clj b/backend/src/app/services/tokens.clj similarity index 93% rename from backend/src/uxbox/services/tokens.clj rename to backend/src/app/services/tokens.clj index c51493863..e9c8da048 100644 --- a/backend/src/uxbox/services/tokens.clj +++ b/backend/src/app/services/tokens.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.services.tokens +(ns app.services.tokens (:require [clojure.spec.alpha :as s] [cuerdas.core :as str] [sodi.prng] [sodi.util] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.util.time :as dt] - [uxbox.db :as db])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.util.time :as dt] + [app.db :as db])) (defn next-token ([] (next-token 96)) diff --git a/backend/src/uxbox/tasks.clj b/backend/src/app/tasks.clj similarity index 91% rename from backend/src/uxbox/tasks.clj rename to backend/src/app/tasks.clj index 188b3c62a..6a4fe8ef7 100644 --- a/backend/src/uxbox/tasks.clj +++ b/backend/src/app/tasks.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.tasks +(ns app.tasks (:require [cuerdas.core :as str] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.util.time :as dt] - [uxbox.metrics :as mtx])) + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.db :as db] + [app.util.time :as dt] + [app.metrics :as mtx])) (s/def ::name ::us/string) (s/def ::delay diff --git a/backend/src/uxbox/tasks/delete_object.clj b/backend/src/app/tasks/delete_object.clj similarity index 91% rename from backend/src/uxbox/tasks/delete_object.clj rename to backend/src/app/tasks/delete_object.clj index cc88ab4a8..e09776557 100644 --- a/backend/src/uxbox/tasks/delete_object.clj +++ b/backend/src/app/tasks/delete_object.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.tasks.delete-object +(ns app.tasks.delete-object "Generic task for permanent deletion of objects." (:require [clojure.spec.alpha :as s] [clojure.tools.logging :as log] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.metrics :as mtx] - [uxbox.util.storage :as ust])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.db :as db] + [app.metrics :as mtx] + [app.util.storage :as ust])) (s/def ::type keyword?) (s/def ::id ::us/uuid) diff --git a/backend/src/uxbox/tasks/delete_profile.clj b/backend/src/app/tasks/delete_profile.clj similarity index 93% rename from backend/src/uxbox/tasks/delete_profile.clj rename to backend/src/app/tasks/delete_profile.clj index 2874d7e55..a9304fb50 100644 --- a/backend/src/uxbox/tasks/delete_profile.clj +++ b/backend/src/app/tasks/delete_profile.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.tasks.delete-profile +(ns app.tasks.delete-profile "Task for permanent deletion of profiles." (:require [clojure.spec.alpha :as s] [clojure.tools.logging :as log] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.db :as db] - [uxbox.metrics :as mtx] - [uxbox.util.storage :as ust])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.db :as db] + [app.metrics :as mtx] + [app.util.storage :as ust])) (declare delete-profile-data) (declare delete-teams) diff --git a/backend/src/uxbox/tasks/gc.clj b/backend/src/app/tasks/gc.clj similarity index 90% rename from backend/src/uxbox/tasks/gc.clj rename to backend/src/app/tasks/gc.clj index ad9987452..e342f662a 100644 --- a/backend/src/uxbox/tasks/gc.clj +++ b/backend/src/app/tasks/gc.clj @@ -7,21 +7,21 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.tasks.gc +(ns app.tasks.gc (:require [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [cuerdas.core :as str] [postal.core :as postal] [promesa.core :as p] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.tasks :as tasks] - [uxbox.media-storage :as mst] - [uxbox.util.blob :as blob] - [uxbox.util.storage :as ust])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.config :as cfg] + [app.db :as db] + [app.tasks :as tasks] + [app.media-storage :as mst] + [app.util.blob :as blob] + [app.util.storage :as ust])) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Task: Remove deleted media diff --git a/backend/src/uxbox/tasks/impl.clj b/backend/src/app/tasks/impl.clj similarity index 97% rename from backend/src/uxbox/tasks/impl.clj rename to backend/src/app/tasks/impl.clj index 1dc6d39c8..c0c8c4e09 100644 --- a/backend/src/uxbox/tasks/impl.clj +++ b/backend/src/app/tasks/impl.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 Andrey Antukh -(ns uxbox.tasks.impl +(ns app.tasks.impl "Async tasks implementation." (:require [cuerdas.core :as str] @@ -15,13 +15,13 @@ [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [promesa.exec :as px] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.util.async :as aa] - [uxbox.util.blob :as blob] - [uxbox.util.time :as dt]) + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.util.async :as aa] + [app.util.blob :as blob] + [app.util.time :as dt]) (:import java.util.concurrent.ScheduledExecutorService java.util.concurrent.Executors diff --git a/backend/src/uxbox/tasks/remove_media.clj b/backend/src/app/tasks/remove_media.clj similarity index 82% rename from backend/src/uxbox/tasks/remove_media.clj rename to backend/src/app/tasks/remove_media.clj index 7872fb4f0..ca31e2aca 100644 --- a/backend/src/uxbox/tasks/remove_media.clj +++ b/backend/src/app/tasks/remove_media.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.tasks.remove-media +(ns app.tasks.remove-media "Demo accounts garbage collector." (:require [clojure.spec.alpha :as s] [clojure.tools.logging :as log] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.media-storage :as mst] - [uxbox.metrics :as mtx] - [uxbox.util.storage :as ust])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.media-storage :as mst] + [app.metrics :as mtx] + [app.util.storage :as ust])) (s/def ::path ::us/not-empty-string) (s/def ::props diff --git a/backend/src/uxbox/tasks/sendmail.clj b/backend/src/app/tasks/sendmail.clj similarity index 94% rename from backend/src/uxbox/tasks/sendmail.clj rename to backend/src/app/tasks/sendmail.clj index 63fcdf94b..ea16ed33b 100644 --- a/backend/src/uxbox/tasks/sendmail.clj +++ b/backend/src/app/tasks/sendmail.clj @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.tasks.sendmail +(ns app.tasks.sendmail (:require [clojure.data.json :as json] [clojure.tools.logging :as log] [postal.core :as postal] - [uxbox.common.data :as d] - [uxbox.common.exceptions :as ex] - [uxbox.config :as cfg] - [uxbox.metrics :as mtx] - [uxbox.util.http :as http])) + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.config :as cfg] + [app.metrics :as mtx] + [app.util.http :as http])) (defmulti sendmail (fn [config email] (:sendmail-backend config))) @@ -91,7 +91,7 @@ :context result)))) (defn handler - {:uxbox.tasks/name "sendmail"} + {:app.tasks/name "sendmail"} [{:keys [props] :as task}] (sendmail cfg/config props)) diff --git a/backend/src/uxbox/tasks/trim_file.clj b/backend/src/app/tasks/trim_file.clj similarity index 92% rename from backend/src/uxbox/tasks/trim_file.clj rename to backend/src/app/tasks/trim_file.clj index b537c7243..b95888440 100644 --- a/backend/src/uxbox/tasks/trim_file.clj +++ b/backend/src/app/tasks/trim_file.clj @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.tasks.trim-file +(ns app.tasks.trim-file (:require [clojure.spec.alpha :as s] [clojure.tools.logging :as log] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.tasks :as tasks] - [uxbox.util.blob :as blob] - [uxbox.util.time :as dt])) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.config :as cfg] + [app.db :as db] + [app.tasks :as tasks] + [app.util.blob :as blob] + [app.util.time :as dt])) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Task: Trim File diff --git a/backend/src/uxbox/util/async.clj b/backend/src/app/util/async.clj similarity index 98% rename from backend/src/uxbox/util/async.clj rename to backend/src/app/util/async.clj index 94672729e..f455f03ca 100644 --- a/backend/src/uxbox/util/async.clj +++ b/backend/src/app/util/async.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2020 Andrey Antukh -(ns uxbox.util.async +(ns app.util.async (:require [clojure.spec.alpha :as s] [clojure.tools.logging :as log] diff --git a/backend/src/uxbox/util/blob.clj b/backend/src/app/util/blob.clj similarity index 97% rename from backend/src/uxbox/util/blob.clj rename to backend/src/app/util/blob.clj index 509075c94..7761ff7e5 100644 --- a/backend/src/uxbox/util/blob.clj +++ b/backend/src/app/util/blob.clj @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2016-2020 Andrey Antukh -(ns uxbox.util.blob +(ns app.util.blob "A generic blob storage encoding. Mainly used for page data, page options and txlog payload storage." - (:require [uxbox.util.transit :as t]) + (:require [app.util.transit :as t]) (:import java.io.ByteArrayInputStream java.io.ByteArrayOutputStream diff --git a/backend/src/uxbox/util/cli.clj b/backend/src/app/util/cli.clj similarity index 90% rename from backend/src/uxbox/util/cli.clj rename to backend/src/app/util/cli.clj index 43289e51f..e49f83421 100644 --- a/backend/src/uxbox/util/cli.clj +++ b/backend/src/app/util/cli.clj @@ -1,4 +1,4 @@ -(ns uxbox.util.cli +(ns app.util.cli "Command line interface helpers.") (defn exit! diff --git a/backend/src/uxbox/util/closeable.clj b/backend/src/app/util/closeable.clj similarity index 97% rename from backend/src/uxbox/util/closeable.clj rename to backend/src/app/util/closeable.clj index 58d52a3c5..78da0565f 100644 --- a/backend/src/uxbox/util/closeable.clj +++ b/backend/src/app/util/closeable.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.closeable +(ns app.util.closeable "A closeable abstraction. A drop in replacement for clojure builtin `with-open` syntax abstraction." (:refer-clojure :exclude [with-open])) diff --git a/backend/src/uxbox/util/data.clj b/backend/src/app/util/data.clj similarity index 96% rename from backend/src/uxbox/util/data.clj rename to backend/src/app/util/data.clj index f4e6c1743..d5e12cd8b 100644 --- a/backend/src/uxbox/util/data.clj +++ b/backend/src/app/util/data.clj @@ -4,12 +4,12 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.data +(ns app.util.data "Data transformations utils." (:require [clojure.walk :as walk] [cuerdas.core :as str])) -;; TODO: move to uxbox.common.helpers +;; TODO: move to app.common.helpers (defn dissoc-in [m [k & ks :as keys]] diff --git a/backend/src/uxbox/util/dispatcher.clj b/backend/src/app/util/dispatcher.clj similarity index 97% rename from backend/src/uxbox/util/dispatcher.clj rename to backend/src/app/util/dispatcher.clj index b41c1df7b..8aad12455 100644 --- a/backend/src/uxbox/util/dispatcher.clj +++ b/backend/src/app/util/dispatcher.clj @@ -4,13 +4,13 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.util.dispatcher +(ns app.util.dispatcher "A generic service dispatcher implementation." (:refer-clojure :exclude [defmethod]) (:require [clojure.spec.alpha :as s] [expound.alpha :as expound] - [uxbox.common.exceptions :as ex]) + [app.common.exceptions :as ex]) (:import clojure.lang.IDeref clojure.lang.MapEntry diff --git a/backend/src/uxbox/util/emails.clj b/backend/src/app/util/emails.clj similarity index 95% rename from backend/src/uxbox/util/emails.clj rename to backend/src/app/util/emails.clj index 382d48df8..d962b4be4 100644 --- a/backend/src/uxbox/util/emails.clj +++ b/backend/src/app/util/emails.clj @@ -4,14 +4,14 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.util.emails +(ns app.util.emails (:require [clojure.java.io :as io] [clojure.spec.alpha :as s] [cuerdas.core :as str] - [uxbox.common.spec :as us] - [uxbox.common.exceptions :as ex] - [uxbox.util.template :as tmpl])) + [app.common.spec :as us] + [app.common.exceptions :as ex] + [app.util.template :as tmpl])) ;; --- Impl. diff --git a/backend/src/uxbox/util/http.clj b/backend/src/app/util/http.clj similarity index 97% rename from backend/src/uxbox/util/http.clj rename to backend/src/app/util/http.clj index 735055354..e2f46493b 100644 --- a/backend/src/uxbox/util/http.clj +++ b/backend/src/app/util/http.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.util.http +(ns app.util.http "Http client abstraction layer." (:require [promesa.core :as p] diff --git a/backend/src/uxbox/util/migrations.clj b/backend/src/app/util/migrations.clj similarity index 99% rename from backend/src/uxbox/util/migrations.clj rename to backend/src/app/util/migrations.clj index 965360159..ec7f10838 100644 --- a/backend/src/uxbox/util/migrations.clj +++ b/backend/src/app/util/migrations.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.util.migrations +(ns app.util.migrations (:require [clojure.tools.logging :as log] [clojure.java.io :as io] diff --git a/backend/src/uxbox/util/redis.clj b/backend/src/app/util/redis.clj similarity index 99% rename from backend/src/uxbox/util/redis.clj rename to backend/src/app/util/redis.clj index dfc3e98a1..672b66b17 100644 --- a/backend/src/uxbox/util/redis.clj +++ b/backend/src/app/util/redis.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.util.redis +(ns app.util.redis "Asynchronous posgresql client." (:refer-clojure :exclude [run!]) (:require diff --git a/backend/src/uxbox/util/sql.clj b/backend/src/app/util/sql.clj similarity index 99% rename from backend/src/uxbox/util/sql.clj rename to backend/src/app/util/sql.clj index 48b4cab58..f61e2963d 100644 --- a/backend/src/uxbox/util/sql.clj +++ b/backend/src/app/util/sql.clj @@ -22,7 +22,7 @@ ;; OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -(ns uxbox.util.sql +(ns app.util.sql "A composable sql helpers." (:refer-clojure :exclude [test update set format]) (:require [clojure.core :as c] diff --git a/backend/src/uxbox/util/storage.clj b/backend/src/app/util/storage.clj similarity index 99% rename from backend/src/uxbox/util/storage.clj rename to backend/src/app/util/storage.clj index 58808ff36..74f19b206 100644 --- a/backend/src/uxbox/util/storage.clj +++ b/backend/src/app/util/storage.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 Andrey Antukh -(ns uxbox.util.storage +(ns app.util.storage "A local filesystem storage implementation." (:require [clojure.java.io :as io] @@ -17,7 +17,7 @@ [datoteka.proto :as fp] [sodi.prng :as sodi.prng] [sodi.util :as sodi.util] - [uxbox.common.exceptions :as ex]) + [app.common.exceptions :as ex]) (:import java.io.ByteArrayInputStream java.io.InputStream diff --git a/backend/src/uxbox/util/svg.clj b/backend/src/app/util/svg.clj similarity index 97% rename from backend/src/uxbox/util/svg.clj rename to backend/src/app/util/svg.clj index 7c8147d50..bb37d83b8 100644 --- a/backend/src/uxbox/util/svg.clj +++ b/backend/src/app/util/svg.clj @@ -4,13 +4,13 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.util.svg +(ns app.util.svg "Icons SVG parsing helpers." (:require [clojure.spec.alpha :as s] [cuerdas.core :as str] - [uxbox.common.spec :as us] - [uxbox.common.exceptions :as ex]) + [app.common.spec :as us] + [app.common.exceptions :as ex]) (:import org.jsoup.Jsoup org.jsoup.nodes.Attribute diff --git a/backend/src/uxbox/util/template.clj b/backend/src/app/util/template.clj similarity index 94% rename from backend/src/uxbox/util/template.clj rename to backend/src/app/util/template.clj index becb12911..0148c9894 100644 --- a/backend/src/uxbox/util/template.clj +++ b/backend/src/app/util/template.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.util.template +(ns app.util.template "A lightweight abstraction over mustache.java template engine. The documentation can be found: http://mustache.github.io/mustache.5.html" (:require @@ -13,7 +13,7 @@ [clojure.java.io :as io] [cuerdas.core :as str] [selmer.parser :as sp] - [uxbox.common.exceptions :as ex])) + [app.common.exceptions :as ex])) ;; (sp/cache-off!) diff --git a/backend/src/uxbox/util/time.clj b/backend/src/app/util/time.clj similarity index 97% rename from backend/src/uxbox/util/time.clj rename to backend/src/app/util/time.clj index e613f8eb4..bdf3d0c11 100644 --- a/backend/src/uxbox/util/time.clj +++ b/backend/src/app/util/time.clj @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2016-2020 Andrey Antukh -(ns uxbox.util.time +(ns app.util.time (:require [clojure.spec.alpha :as s] - [uxbox.common.exceptions :as ex] + [app.common.exceptions :as ex] [cognitect.transit :as t]) (:import java.time.Instant @@ -79,7 +79,7 @@ (defmethod print-method Duration [mv ^java.io.Writer writer] - (.write writer (str "#uxbox/duration \"" (.toString ^Duration mv) "\""))) + (.write writer (str "#app/duration \"" (.toString ^Duration mv) "\""))) (defmethod print-dup Duration [o w] (print-method o w)) @@ -212,7 +212,7 @@ (defmethod print-method CronExpression [mv ^java.io.Writer writer] - (.write writer (str "#uxbox/cron \"" (.toString ^CronExpression mv) "\""))) + (.write writer (str "#app/cron \"" (.toString ^CronExpression mv) "\""))) (defmethod print-dup CronExpression [o w] @@ -248,7 +248,7 @@ (defmethod print-method Instant [mv ^java.io.Writer writer] - (.write writer (str "#uxbox/instant \"" (.toString ^Instant mv) "\""))) + (.write writer (str "#app/instant \"" (.toString ^Instant mv) "\""))) (defmethod print-dup Instant [o w] (print-method o w)) diff --git a/backend/src/uxbox/util/transit.clj b/backend/src/app/util/transit.clj similarity index 93% rename from backend/src/uxbox/util/transit.clj rename to backend/src/app/util/transit.clj index a13dc99de..e188e9b04 100644 --- a/backend/src/uxbox/util/transit.clj +++ b/backend/src/app/util/transit.clj @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.transit +(ns app.util.transit (:require [cognitect.transit :as t] [clojure.java.io :as io] [linked.core :as lk] - [uxbox.util.time :as dt] - [uxbox.util.data :as data] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.matrix :as gmt]) + [app.util.time :as dt] + [app.util.data :as data] + [app.common.geom.point :as gpt] + [app.common.geom.matrix :as gmt]) (:import linked.set.LinkedSet java.io.ByteArrayInputStream java.io.ByteArrayOutputStream java.io.File - uxbox.common.geom.point.Point - uxbox.common.geom.matrix.Matrix)) + app.common.geom.point.Point + app.common.geom.matrix.Matrix)) ;; --- Handlers diff --git a/backend/src/uxbox/util/workers.clj b/backend/src/app/util/workers.clj similarity index 97% rename from backend/src/uxbox/util/workers.clj rename to backend/src/app/util/workers.clj index 03e4572f3..1f271366f 100644 --- a/backend/src/uxbox/util/workers.clj +++ b/backend/src/app/util/workers.clj @@ -4,12 +4,12 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.workers +(ns app.util.workers "A distributed asynchronous tasks queue implementation on top of PostgreSQL reliable advirsory locking mechanism." #_(:require [suricatta.core :as sc] - [uxbox.db :as db])) + [app.db :as db])) ;; (defn- poll-for-task ;; [conn queue] diff --git a/backend/src/uxbox/worker.clj b/backend/src/app/worker.clj similarity index 66% rename from backend/src/uxbox/worker.clj rename to backend/src/app/worker.clj index 6f70e964c..42a732b5b 100644 --- a/backend/src/uxbox/worker.clj +++ b/backend/src/app/worker.clj @@ -7,39 +7,39 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.worker +(ns app.worker (:require [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [mount.core :as mount :refer [defstate]] - [uxbox.common.spec :as us] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.metrics :as mtx] - [uxbox.tasks.delete-object] - [uxbox.tasks.delete-profile] - [uxbox.tasks.gc] - [uxbox.tasks.remove-media] - [uxbox.tasks.sendmail] - [uxbox.tasks.trim-file] - [uxbox.util.time :as dt] - [uxbox.worker-impl :as impl])) + [app.common.spec :as us] + [app.config :as cfg] + [app.db :as db] + [app.metrics :as mtx] + [app.tasks.delete-object] + [app.tasks.delete-profile] + [app.tasks.gc] + [app.tasks.remove-media] + [app.tasks.sendmail] + [app.tasks.trim-file] + [app.util.time :as dt] + [app.worker-impl :as impl])) ;; --- State initialization (def ^:private tasks - {"delete-profile" #'uxbox.tasks.delete-profile/handler - "delete-object" #'uxbox.tasks.delete-object/handler - "remove-media" #'uxbox.tasks.remove-media/handler - "sendmail" #'uxbox.tasks.sendmail/handler}) + {"delete-profile" #'app.tasks.delete-profile/handler + "delete-object" #'app.tasks.delete-object/handler + "remove-media" #'app.tasks.remove-media/handler + "sendmail" #'app.tasks.sendmail/handler}) (def ^:private schedule [{:id "remove-deleted-media" :cron (dt/cron "0 0 0 */1 * ? *") ;; daily - :fn #'uxbox.tasks.gc/remove-deleted-media} + :fn #'app.tasks.gc/remove-deleted-media} {:id "trim-file" :cron (dt/cron "0 0 0 */1 * ? *") ;; daily - :fn #'uxbox.tasks.trim-file/handler} + :fn #'app.tasks.trim-file/handler} ]) diff --git a/backend/src/uxbox/worker_impl.clj b/backend/src/app/worker_impl.clj similarity index 97% rename from backend/src/uxbox/worker_impl.clj rename to backend/src/app/worker_impl.clj index cd369aab2..86c20de2e 100644 --- a/backend/src/uxbox/worker_impl.clj +++ b/backend/src/app/worker_impl.clj @@ -7,21 +7,21 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.worker-impl +(ns app.worker-impl (:require [cuerdas.core :as str] [clojure.core.async :as a] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [promesa.exec :as px] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.db :as db] - [uxbox.util.async :as aa] - [uxbox.util.blob :as blob] - [uxbox.util.time :as dt]) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.util.async :as aa] + [app.util.blob :as blob] + [app.util.time :as dt]) (:import org.eclipse.jetty.util.thread.QueuedThreadPool java.util.concurrent.ExecutorService diff --git a/backend/src/data_readers.clj b/backend/src/data_readers.clj index c894d4124..ffde08914 100644 --- a/backend/src/data_readers.clj +++ b/backend/src/data_readers.clj @@ -1,3 +1,3 @@ -{uxbox/instant uxbox.util.time/from-string - uxbox/cron uxbox.util.time/cron - uxbox/duration uxbox.util.time/duration} +{app/instant app.util.time/from-string + app/cron app.util.time/cron + app/duration app.util.time/duration} diff --git a/backend/src/uxbox/services/init.clj b/backend/src/uxbox/services/init.clj deleted file mode 100644 index e8365a3c0..000000000 --- a/backend/src/uxbox/services/init.clj +++ /dev/null @@ -1,40 +0,0 @@ -;; 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/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2019-2020 Andrey Antukh - -(ns uxbox.services.init - "A initialization of services." - (:require - [mount.core :as mount :refer [defstate]])) - -(defn- load-query-services - [] - (require 'uxbox.services.queries.media) - (require 'uxbox.services.queries.colors) - (require 'uxbox.services.queries.projects) - (require 'uxbox.services.queries.files) - (require 'uxbox.services.queries.pages) - (require 'uxbox.services.queries.profile) - (require 'uxbox.services.queries.recent-files) - (require 'uxbox.services.queries.viewer)) - -(defn- load-mutation-services - [] - (require 'uxbox.services.mutations.demo) - (require 'uxbox.services.mutations.media) - (require 'uxbox.services.mutations.colors) - (require 'uxbox.services.mutations.projects) - (require 'uxbox.services.mutations.files) - (require 'uxbox.services.mutations.pages) - (require 'uxbox.services.mutations.profile)) - -(defstate query-services - :start (load-query-services)) - -(defstate mutation-services - :start (load-mutation-services)) diff --git a/backend/tests/uxbox/tests/_files/sample.jpg b/backend/tests/app/tests/_files/sample.jpg similarity index 100% rename from backend/tests/uxbox/tests/_files/sample.jpg rename to backend/tests/app/tests/_files/sample.jpg diff --git a/backend/tests/uxbox/tests/_files/sample1.svg b/backend/tests/app/tests/_files/sample1.svg similarity index 100% rename from backend/tests/uxbox/tests/_files/sample1.svg rename to backend/tests/app/tests/_files/sample1.svg diff --git a/backend/tests/uxbox/tests/_files/sample2.svg b/backend/tests/app/tests/_files/sample2.svg similarity index 100% rename from backend/tests/uxbox/tests/_files/sample2.svg rename to backend/tests/app/tests/_files/sample2.svg diff --git a/backend/tests/uxbox/tests/helpers.clj b/backend/tests/app/tests/helpers.clj similarity index 75% rename from backend/tests/uxbox/tests/helpers.clj rename to backend/tests/app/tests/helpers.clj index 375bafbe4..a19a4da6a 100644 --- a/backend/tests/uxbox/tests/helpers.clj +++ b/backend/tests/app/tests/helpers.clj @@ -1,4 +1,4 @@ -(ns uxbox.tests.helpers +(ns app.tests.helpers (:require [clojure.java.io :as io] [clojure.spec.alpha :as s] @@ -7,49 +7,49 @@ [cuerdas.core :as str] [mount.core :as mount] [environ.core :refer [env]] - [uxbox.common.pages :as cp] - [uxbox.services.init] - [uxbox.services.mutations.profile :as profile] - [uxbox.services.mutations.projects :as projects] - [uxbox.services.mutations.teams :as teams] - [uxbox.services.mutations.files :as files] - [uxbox.services.mutations.pages :as pages] - [uxbox.services.mutations.colors :as colors] - [uxbox.migrations] - [uxbox.media] - [uxbox.media-storage] - [uxbox.db :as db] - [uxbox.util.blob :as blob] - [uxbox.common.uuid :as uuid] - [uxbox.util.storage :as ust] - [uxbox.config :as cfg]) + [app.common.pages :as cp] + [app.services.init] + [app.services.mutations.profile :as profile] + [app.services.mutations.projects :as projects] + [app.services.mutations.teams :as teams] + [app.services.mutations.files :as files] + [app.services.mutations.pages :as pages] + [app.services.mutations.colors :as colors] + [app.migrations] + [app.media] + [app.media-storage] + [app.db :as db] + [app.util.blob :as blob] + [app.common.uuid :as uuid] + [app.util.storage :as ust] + [app.config :as cfg]) (:import org.postgresql.ds.PGSimpleDataSource)) (defn testing-datasource [] (doto (PGSimpleDataSource.) (.setServerName "postgres") - (.setDatabaseName "uxbox_test") - (.setUser "uxbox") - (.setPassword "uxbox"))) + (.setDatabaseName "app_test") + (.setUser "app") + (.setPassword "app"))) (defn state-init [next] (let [config (cfg/read-test-config env)] (try (let [pool (testing-datasource)] - (-> (mount/only #{#'uxbox.config/config - #'uxbox.db/pool - #'uxbox.redis/client - #'uxbox.redis/conn - #'uxbox.media/semaphore - #'uxbox.services.init/query-services - #'uxbox.services.init/mutation-services - #'uxbox.migrations/migrations - #'uxbox.media-storage/assets-storage - #'uxbox.media-storage/media-storage}) - (mount/swap {#'uxbox.config/config config - #'uxbox.db/pool pool}) + (-> (mount/only #{#'app.config/config + #'app.db/pool + #'app.redis/client + #'app.redis/conn + #'app.media/semaphore + #'app.services.init/query-services + #'app.services.init/mutation-services + #'app.migrations/migrations + #'app.media-storage/assets-storage + #'app.media-storage/media-storage}) + (mount/swap {#'app.config/config config + #'app.db/pool pool}) (mount/start))) (next) (finally @@ -70,8 +70,8 @@ (try (next) (finally - (ust/clear! uxbox.media-storage/media-storage) - (ust/clear! uxbox.media-storage/assets-storage)))) + (ust/clear! app.media-storage/media-storage) + (ust/clear! app.media-storage/assets-storage)))) (defn mk-uuid [prefix & args] diff --git a/backend/tests/uxbox/tests/test_common_pages.clj b/backend/tests/app/tests/test_common_pages.clj similarity index 99% rename from backend/tests/uxbox/tests/test_common_pages.clj rename to backend/tests/app/tests/test_common_pages.clj index 78d994dbf..4c603de97 100644 --- a/backend/tests/uxbox/tests/test_common_pages.clj +++ b/backend/tests/app/tests/test_common_pages.clj @@ -5,17 +5,17 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020 app Labs SL -(ns uxbox.tests.test-common-pages +(ns app.tests.test-common-pages (:require [clojure.test :as t] [clojure.pprint :refer [pprint]] [promesa.core :as p] [mockery.core :refer [with-mock]] - [uxbox.common.pages :as cp] - [uxbox.common.uuid :as uuid] - [uxbox.tests.helpers :as th])) + [app.common.pages :as cp] + [app.common.uuid :as uuid] + [app.tests.helpers :as th])) (t/deftest process-change-set-option (let [data cp/default-page-data] diff --git a/backend/tests/uxbox/tests/test_emails.clj b/backend/tests/app/tests/test_emails.clj similarity index 69% rename from backend/tests/uxbox/tests/test_emails.clj rename to backend/tests/app/tests/test_emails.clj index 790f1b275..461f06eb9 100644 --- a/backend/tests/uxbox/tests/test_emails.clj +++ b/backend/tests/app/tests/test_emails.clj @@ -4,20 +4,20 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.tests.test-emails +(ns app.tests.test-emails (:require [clojure.test :as t] [promesa.core :as p] [mockery.core :refer [with-mock]] - [uxbox.db :as db] - [uxbox.emails :as emails] - [uxbox.tests.helpers :as th])) + [app.db :as db] + [app.emails :as emails] + [app.tests.helpers :as th])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) (t/deftest register-email-rendering - (let [result (emails/render emails/register {:to "example@uxbox.io" :name "foo"})] + (let [result (emails/render emails/register {:to "example@app.io" :name "foo"})] (t/is (map? result)) (t/is (contains? result :subject)) (t/is (contains? result :content)) @@ -26,18 +26,18 @@ (t/is (vector? (:content result))))) ;; (t/deftest email-sending-and-sendmail-job -;; (let [res @(emails/send! emails/register {:to "example@uxbox.io" :name "foo"})] +;; (let [res @(emails/send! emails/register {:to "example@app.io" :name "foo"})] ;; (t/is (nil? res))) ;; (with-mock mock -;; {:target 'uxbox.jobs.sendmail/impl-sendmail +;; {:target 'app.jobs.sendmail/impl-sendmail ;; :return (p/resolved nil)} -;; (let [res @(uxbox.jobs.sendmail/send-emails {})] +;; (let [res @(app.jobs.sendmail/send-emails {})] ;; (t/is (= 1 res)) ;; (t/is (:called? @mock)) ;; (t/is (= 1 (:call-count @mock)))) -;; (let [res @(uxbox.jobs.sendmail/send-emails {})] +;; (let [res @(app.jobs.sendmail/send-emails {})] ;; (t/is (= 0 res)) ;; (t/is (:called? @mock)) ;; (t/is (= 1 (:call-count @mock)))))) diff --git a/backend/tests/uxbox/tests/test_services_colors.clj b/backend/tests/app/tests/test_services_colors.clj similarity index 92% rename from backend/tests/uxbox/tests/test_services_colors.clj rename to backend/tests/app/tests/test_services_colors.clj index dbbb0bea1..59fadf469 100644 --- a/backend/tests/uxbox/tests/test_services_colors.clj +++ b/backend/tests/app/tests/test_services_colors.clj @@ -5,19 +5,19 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020 app Labs SL -(ns uxbox.tests.test-services-colors +(ns app.tests.test-services-colors (:require [clojure.test :as t] [datoteka.core :as fs] [clojure.java.io :as io] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.util.storage :as ust] - [uxbox.common.uuid :as uuid] - [uxbox.tests.helpers :as th])) + [app.db :as db] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.util.storage :as ust] + [app.common.uuid :as uuid] + [app.tests.helpers :as th])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) diff --git a/backend/tests/uxbox/tests/test_services_files.clj b/backend/tests/app/tests/test_services_files.clj similarity index 91% rename from backend/tests/uxbox/tests/test_services_files.clj rename to backend/tests/app/tests/test_services_files.clj index 35f50c9fd..91ad239a1 100644 --- a/backend/tests/uxbox/tests/test_services_files.clj +++ b/backend/tests/app/tests/test_services_files.clj @@ -5,19 +5,19 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020 app Labs SL -(ns uxbox.tests.test-services-files +(ns app.tests.test-services-files (:require [clojure.test :as t] [datoteka.core :as fs] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.http :as http] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.tests.helpers :as th] - [uxbox.util.storage :as ust])) + [app.common.uuid :as uuid] + [app.db :as db] + [app.http :as http] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.tests.helpers :as th] + [app.util.storage :as ust])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) @@ -109,7 +109,7 @@ error-data (ex-data error)] (t/is (th/ex-info? error)) (t/is (= (:type error-data) :service-error)) - (t/is (= (:name error-data) :uxbox.services.queries.files/file))) + (t/is (= (:name error-data) :app.services.queries.files/file))) (let [error (ex-cause (:error out)) error-data (ex-data error)] diff --git a/backend/tests/uxbox/tests/test_services_media.clj b/backend/tests/app/tests/test_services_media.clj similarity index 92% rename from backend/tests/uxbox/tests/test_services_media.clj rename to backend/tests/app/tests/test_services_media.clj index d09ba3084..7c37ce186 100644 --- a/backend/tests/uxbox/tests/test_services_media.clj +++ b/backend/tests/app/tests/test_services_media.clj @@ -5,18 +5,18 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020 app Labs SL -(ns uxbox.tests.test-services-media +(ns app.tests.test-services-media (:require [clojure.test :as t] [datoteka.core :as fs] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.tests.helpers :as th] - [uxbox.util.storage :as ust])) + [app.common.uuid :as uuid] + [app.db :as db] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.tests.helpers :as th] + [app.util.storage :as ust])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) @@ -30,7 +30,7 @@ object-id-2 (uuid/next)] (t/testing "create media object from url to file" - (let [url "https://raw.githubusercontent.com/uxbox/uxbox/develop/frontend/resources/images/penpot-login.jpg" + (let [url "https://raw.githubusercontent.com/app/app/develop/frontend/resources/images/penpot-login.jpg" data {::sm/type :add-media-object-from-url :id object-id-1 :profile-id (:id prof) @@ -54,7 +54,7 @@ (t/testing "upload media object to file" (let [content {:filename "sample.jpg" - :tempfile (th/tempfile "uxbox/tests/_files/sample.jpg") + :tempfile (th/tempfile "app/tests/_files/sample.jpg") :content-type "image/jpeg" :size 312043} data {::sm/type :upload-media-object diff --git a/backend/tests/uxbox/tests/test_services_pages.clj b/backend/tests/app/tests/test_services_pages.clj similarity index 95% rename from backend/tests/uxbox/tests/test_services_pages.clj rename to backend/tests/app/tests/test_services_pages.clj index f463194f5..64a0a00f7 100644 --- a/backend/tests/uxbox/tests/test_services_pages.clj +++ b/backend/tests/app/tests/test_services_pages.clj @@ -5,20 +5,20 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020 app Labs SL -(ns uxbox.tests.test-services-pages +(ns app.tests.test-services-pages (:require [clojure.spec.alpha :as s] [clojure.test :as t] [promesa.core :as p] - [uxbox.common.pages :as cp] - [uxbox.db :as db] - [uxbox.http :as http] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.common.uuid :as uuid] - [uxbox.tests.helpers :as th])) + [app.common.pages :as cp] + [app.db :as db] + [app.http :as http] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.common.uuid :as uuid] + [app.tests.helpers :as th])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) @@ -168,7 +168,7 @@ error-data (ex-data error)] (t/is (th/ex-info? error)) (t/is (= (:type error-data) :service-error)) - (t/is (= (:name error-data) :uxbox.services.mutations.pages/update-page))) + (t/is (= (:name error-data) :app.services.mutations.pages/update-page))) (let [error (ex-cause (:error out)) error-data (ex-data error)] diff --git a/backend/tests/uxbox/tests/test_services_profile.clj b/backend/tests/app/tests/test_services_profile.clj similarity index 91% rename from backend/tests/uxbox/tests/test_services_profile.clj rename to backend/tests/app/tests/test_services_profile.clj index 23b9d0a22..13bba72ec 100644 --- a/backend/tests/uxbox/tests/test_services_profile.clj +++ b/backend/tests/app/tests/test_services_profile.clj @@ -7,18 +7,18 @@ ;; ;; Copyright (c) 2019-2020 Andrey Antukh -(ns uxbox.tests.test-services-profile +(ns app.tests.test-services-profile (:require [clojure.test :as t] [clojure.java.io :as io] [mockery.core :refer [with-mocks]] [cuerdas.core :as str] [datoteka.core :as fs] - [uxbox.db :as db] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.services.mutations.profile :as profile] - [uxbox.tests.helpers :as th])) + [app.db :as db] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.services.mutations.profile :as profile] + [app.tests.helpers :as th])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) @@ -40,7 +40,7 @@ (let [error (ex-cause (:error out))] (t/is (th/ex-info? error)) (t/is (th/ex-of-type? error :validation)) - (t/is (th/ex-of-code? error :uxbox.services.mutations.profile/wrong-credentials))))) + (t/is (th/ex-of-code? error :app.services.mutations.profile/wrong-credentials))))) (t/testing "success" (let [event {::sm/type :login @@ -98,7 +98,7 @@ :profile-id (:id profile) :file {:filename "sample.jpg" :size 123123 - :tempfile "tests/uxbox/tests/_files/sample.jpg" + :tempfile "tests/app/tests/_files/sample.jpg" :content-type "image/jpeg"}} out (th/try-on! (sm/handle data))] @@ -116,7 +116,7 @@ ;; (t/testing "try to delete profile not marked for deletion" ;; (let [params {:props {:profile-id (:id prof)}} - ;; out (th/try-on! (uxbox.tasks.delete-profile/handler params))] + ;; out (th/try-on! (app.tasks.delete-profile/handler params))] ;; ;; (th/print-result! out) ;; (t/is (nil? (:error out))) @@ -135,7 +135,7 @@ ;; (t/testing "mark profile for deletion" ;; (with-mocks - ;; [mock {:target 'uxbox.tasks/schedule! :return nil}] + ;; [mock {:target 'app.tasks/schedule! :return nil}] ;; (let [data {::sm/type :delete-profile ;; :profile-id (:id prof)} @@ -163,7 +163,7 @@ ;; (t/testing "try to delete profile marked for deletion" ;; (let [params {:props {:profile-id (:id prof)}} - ;; out (th/try-on! (uxbox.tasks.delete-profile/handler params))] + ;; out (th/try-on! (app.tasks.delete-profile/handler params))] ;; ;; (th/print-result! out) ;; (t/is (nil? (:error out))) @@ -180,7 +180,7 @@ ;; error-data (ex-data error)] ;; (t/is (th/ex-info? error)) ;; (t/is (= (:type error-data) :service-error)) - ;; (t/is (= (:name error-data) :uxbox.services.queries.profile/profile))) + ;; (t/is (= (:name error-data) :app.services.queries.profile/profile))) ;; (let [error (ex-cause (:error out)) ;; error-data (ex-data error)] diff --git a/backend/tests/uxbox/tests/test_services_projects.clj b/backend/tests/app/tests/test_services_projects.clj similarity index 91% rename from backend/tests/uxbox/tests/test_services_projects.clj rename to backend/tests/app/tests/test_services_projects.clj index c0cd886ba..986f8ed85 100644 --- a/backend/tests/uxbox/tests/test_services_projects.clj +++ b/backend/tests/app/tests/test_services_projects.clj @@ -1,13 +1,13 @@ -(ns uxbox.tests.test-services-projects +(ns app.tests.test-services-projects (:require [clojure.test :as t] [promesa.core :as p] - [uxbox.db :as db] - [uxbox.http :as http] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.tests.helpers :as th] - [uxbox.common.uuid :as uuid])) + [app.db :as db] + [app.http :as http] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.tests.helpers :as th] + [app.common.uuid :as uuid])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) diff --git a/backend/tests/uxbox/tests/test_services_user_attrs.clj b/backend/tests/app/tests/test_services_user_attrs.clj similarity index 92% rename from backend/tests/uxbox/tests/test_services_user_attrs.clj rename to backend/tests/app/tests/test_services_user_attrs.clj index 6b4e4611a..1133a27be 100644 --- a/backend/tests/uxbox/tests/test_services_user_attrs.clj +++ b/backend/tests/app/tests/test_services_user_attrs.clj @@ -1,13 +1,13 @@ -(ns uxbox.tests.test-services-user-attrs +(ns app.tests.test-services-user-attrs (:require [clojure.spec.alpha :as s] [clojure.test :as t] [promesa.core :as p] - [uxbox.db :as db] - [uxbox.http :as http] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.tests.helpers :as th])) + [app.db :as db] + [app.http :as http] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.tests.helpers :as th])) ;; (t/use-fixtures :once th/state-init) ;; (t/use-fixtures :each th/database-reset) diff --git a/backend/tests/uxbox/tests/test_services_viewer.clj b/backend/tests/app/tests/test_services_viewer.clj similarity index 89% rename from backend/tests/uxbox/tests/test_services_viewer.clj rename to backend/tests/app/tests/test_services_viewer.clj index 287da13df..abd45e12f 100644 --- a/backend/tests/uxbox/tests/test_services_viewer.clj +++ b/backend/tests/app/tests/test_services_viewer.clj @@ -5,19 +5,19 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020 app Labs SL -(ns uxbox.tests.test-services-viewer +(ns app.tests.test-services-viewer (:require [clojure.test :as t] [datoteka.core :as fs] - [uxbox.common.uuid :as uuid] - [uxbox.db :as db] - [uxbox.http :as http] - [uxbox.services.mutations :as sm] - [uxbox.services.queries :as sq] - [uxbox.tests.helpers :as th] - [uxbox.util.storage :as ust])) + [app.common.uuid :as uuid] + [app.db :as db] + [app.http :as http] + [app.services.mutations :as sm] + [app.services.queries :as sq] + [app.tests.helpers :as th] + [app.util.storage :as ust])) (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) @@ -71,7 +71,7 @@ error-data (ex-data error)] (t/is (th/ex-info? error)) (t/is (= (:type error-data) :service-error)) - (t/is (= (:name error-data) :uxbox.services.queries.viewer/viewer-bundle))) + (t/is (= (:name error-data) :app.services.queries.viewer/viewer-bundle))) (let [error (ex-cause (:error out)) error-data (ex-data error)] diff --git a/backend/tests/uxbox/tests/test_util_svg.clj b/backend/tests/app/tests/test_util_svg.clj similarity index 83% rename from backend/tests/uxbox/tests/test_util_svg.clj rename to backend/tests/app/tests/test_util_svg.clj index 75270bb6b..823c175a5 100644 --- a/backend/tests/uxbox/tests/test_util_svg.clj +++ b/backend/tests/app/tests/test_util_svg.clj @@ -1,13 +1,13 @@ -(ns uxbox.tests.test-util-svg +(ns app.tests.test-util-svg (:require [clojure.test :as t] [clojure.java.io :as io] - [uxbox.http :as http] - [uxbox.util.svg :as svg] - [uxbox.tests.helpers :as th])) + [app.http :as http] + [app.util.svg :as svg] + [app.tests.helpers :as th])) (t/deftest parse-svg-1 - (let [result (-> (io/resource "uxbox/tests/_files/sample1.svg") + (let [result (-> (io/resource "app/tests/_files/sample1.svg") (svg/parse))] (t/is (contains? result :width)) (t/is (contains? result :height)) @@ -20,7 +20,7 @@ (t/is (= "lock.svg" (:name result))))) (t/deftest parse-svg-2 - (let [result (-> (io/resource "uxbox/tests/_files/sample2.svg") + (let [result (-> (io/resource "app/tests/_files/sample2.svg") (svg/parse))] (t/is (contains? result :width)) (t/is (contains? result :height)) @@ -33,7 +33,7 @@ (t/is (= "play.svg" (:name result))))) (t/deftest parse-invalid-svg-1 - (let [image (io/resource "uxbox/tests/_files/sample.jpg") + (let [image (io/resource "app/tests/_files/sample.jpg") out (th/try! (svg/parse image))] (let [error (:error out)] diff --git a/backend/tests/user.clj b/backend/tests/user.clj index 62515d6f4..52e12e56b 100644 --- a/backend/tests/user.clj +++ b/backend/tests/user.clj @@ -15,16 +15,16 @@ [clojure.pprint :refer [pprint]] [clojure.test :as test] [clojure.java.io :as io] - [uxbox.common.pages :as cp] + [app.common.pages :as cp] [clojure.repl :refer :all] [criterium.core :refer [quick-bench bench with-progress-reporting]] [clj-kondo.core :as kondo] - [uxbox.migrations] - [uxbox.db :as db] - [uxbox.metrics :as mtx] - [uxbox.util.storage :as st] - [uxbox.util.time :as tm] - [uxbox.util.blob :as blob] + [app.migrations] + [app.db :as db] + [app.metrics :as mtx] + [app.util.storage :as st] + [app.util.time :as tm] + [app.util.blob :as blob] [mount.core :as mount])) ;; --- Benchmarking Tools @@ -49,7 +49,7 @@ (defn- start [] - (-> #_(mount/except #{#'uxbox.scheduled-jobs/scheduler}) + (-> #_(mount/except #{#'app.scheduled-jobs/scheduler}) (mount/start))) (defn- stop @@ -62,7 +62,7 @@ (repl/refresh :after 'user/start)) (defn- run-tests - ([] (run-tests #"^uxbox.tests.*")) + ([] (run-tests #"^app.tests.*")) ([o] (repl/refresh) (cond @@ -83,8 +83,8 @@ :cache false :config {:linters {:unresolved-symbol - {:exclude ['(uxbox.services.mutations/defmutation) - '(uxbox.services.queries/defquery) - '(uxbox.db/with-atomic) + {:exclude ['(app.services.mutations/defmutation) + '(app.services.queries/defquery) + '(app.db/with-atomic) '(promesa.core/let)]}}}}) (kondo/print!)))) diff --git a/common/uxbox/common/data.cljc b/common/app/common/data.cljc similarity index 99% rename from common/uxbox/common/data.cljc rename to common/app/common/data.cljc index 18c374dbd..6b1d78d65 100644 --- a/common/uxbox/common/data.cljc +++ b/common/app/common/data.cljc @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.common.data +(ns app.common.data "Data manipulation and query helper functions." (:refer-clojure :exclude [concat read-string]) (:require [clojure.set :as set] diff --git a/common/uxbox/common/exceptions.cljc b/common/app/common/exceptions.cljc similarity index 97% rename from common/uxbox/common/exceptions.cljc rename to common/app/common/exceptions.cljc index 1b271c36e..ee1370279 100644 --- a/common/uxbox/common/exceptions.cljc +++ b/common/app/common/exceptions.cljc @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.common.exceptions +(ns app.common.exceptions "A helpers for work with exceptions." (:require [clojure.spec.alpha :as s])) diff --git a/common/uxbox/common/geom/matrix.cljc b/common/app/common/geom/matrix.cljc similarity index 96% rename from common/uxbox/common/geom/matrix.cljc rename to common/app/common/geom/matrix.cljc index db5b65db1..f3b9a0007 100644 --- a/common/uxbox/common/geom/matrix.cljc +++ b/common/app/common/geom/matrix.cljc @@ -7,11 +7,11 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.geom.matrix +(ns app.common.geom.matrix (:require [cuerdas.core :as str] - [uxbox.common.math :as mth] - [uxbox.common.geom.point :as gpt])) + [app.common.math :as mth] + [app.common.geom.point :as gpt])) ;; --- Matrix Impl diff --git a/common/uxbox/common/geom/point.cljc b/common/app/common/geom/point.cljc similarity index 98% rename from common/uxbox/common/geom/point.cljc rename to common/app/common/geom/point.cljc index 95277b9a8..48a6241aa 100644 --- a/common/uxbox/common/geom/point.cljc +++ b/common/app/common/geom/point.cljc @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.geom.point +(ns app.common.geom.point (:refer-clojure :exclude [divide min max]) (:require #?(:cljs [cljs.core :as c] :clj [clojure.core :as c]) [cuerdas.core :as str] - [uxbox.common.math :as mth])) + [app.common.math :as mth])) ;; --- Point Impl diff --git a/common/uxbox/common/geom/shapes.cljc b/common/app/common/geom/shapes.cljc similarity index 99% rename from common/uxbox/common/geom/shapes.cljc rename to common/app/common/geom/shapes.cljc index cb1c8ce19..d543db4b0 100644 --- a/common/uxbox/common/geom/shapes.cljc +++ b/common/app/common/geom/shapes.cljc @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.geom.shapes +(ns app.common.geom.shapes (:require [clojure.spec.alpha :as s] - [uxbox.common.spec :as us] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.common.math :as mth] - [uxbox.common.data :as d])) + [app.common.spec :as us] + [app.common.pages-helpers :as cph] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.math :as mth] + [app.common.data :as d])) (defn- nilf "Returns a new function that if you pass nil as any argument will diff --git a/common/uxbox/common/math.cljc b/common/app/common/math.cljc similarity index 99% rename from common/uxbox/common/math.cljc rename to common/app/common/math.cljc index d102a845d..4e3cb9eb5 100644 --- a/common/uxbox/common/math.cljc +++ b/common/app/common/math.cljc @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.math +(ns app.common.math "A collection of math utils." #?(:cljs (:require [goog.math :as math]))) diff --git a/common/uxbox/common/media.cljc b/common/app/common/media.cljc similarity index 98% rename from common/uxbox/common/media.cljc rename to common/app/common/media.cljc index 16ad98f86..cfdb0aee6 100644 --- a/common/uxbox/common/media.cljc +++ b/common/app/common/media.cljc @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.media +(ns app.common.media (:require [clojure.spec.alpha :as s] [cuerdas.core :as str])) diff --git a/common/uxbox/common/pages.cljc b/common/app/common/pages.cljc similarity index 98% rename from common/uxbox/common/pages.cljc rename to common/app/common/pages.cljc index 47e10b735..8596ad38f 100644 --- a/common/uxbox/common/pages.cljc +++ b/common/app/common/pages.cljc @@ -7,18 +7,18 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.pages +(ns app.common.pages "A common (clj/cljs) functions and specs for pages." (:require [clojure.spec.alpha :as s] - [uxbox.common.data :as d] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.exceptions :as ex] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid])) + [app.common.data :as d] + [app.common.pages-helpers :as cph] + [app.common.exceptions :as ex] + [app.common.geom.shapes :as geom] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.spec :as us] + [app.common.uuid :as uuid])) (def page-version 5) diff --git a/common/uxbox/common/pages_helpers.cljc b/common/app/common/pages_helpers.cljc similarity index 97% rename from common/uxbox/common/pages_helpers.cljc rename to common/app/common/pages_helpers.cljc index 81e21cfd2..c7d6ac1a3 100644 --- a/common/uxbox/common/pages_helpers.cljc +++ b/common/app/common/pages_helpers.cljc @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.pages-helpers +(ns app.common.pages-helpers (:require - [uxbox.common.data :as d] - [uxbox.common.uuid :as uuid])) + [app.common.data :as d] + [app.common.uuid :as uuid])) (defn get-children "Retrieve all children ids recursively for a given object" diff --git a/common/uxbox/common/pages_migrations.cljc b/common/app/common/pages_migrations.cljc similarity index 88% rename from common/uxbox/common/pages_migrations.cljc rename to common/app/common/pages_migrations.cljc index 02b8ac133..7eeeb8295 100644 --- a/common/uxbox/common/pages_migrations.cljc +++ b/common/app/common/pages_migrations.cljc @@ -1,12 +1,12 @@ -(ns uxbox.common.pages-migrations +(ns app.common.pages-migrations (:require - [uxbox.common.pages :as cp] - [uxbox.common.geom.shapes :as gsh] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.common.data :as d])) + [app.common.pages :as cp] + [app.common.geom.shapes :as gsh] + [app.common.geom.point :as gpt] + [app.common.geom.matrix :as gmt] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.common.data :as d])) ;; TODO: revisit this diff --git a/common/uxbox/common/spec.cljc b/common/app/common/spec.cljc similarity index 95% rename from common/uxbox/common/spec.cljc rename to common/app/common/spec.cljc index d959fbbbd..79293eba1 100644 --- a/common/uxbox/common/spec.cljc +++ b/common/app/common/spec.cljc @@ -4,16 +4,16 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.common.spec +(ns app.common.spec "Data manipulation and query helper functions." (:refer-clojure :exclude [assert]) - #?(:cljs (:require-macros [uxbox.common.spec :refer [assert]])) + #?(:cljs (:require-macros [app.common.spec :refer [assert]])) (:require #?(:clj [clojure.spec.alpha :as s] :cljs [cljs.spec.alpha :as s]) [expound.alpha :as expound] - [uxbox.common.uuid :as uuid] - [uxbox.common.exceptions :as ex] + [app.common.uuid :as uuid] + [app.common.exceptions :as ex] [cuerdas.core :as str])) (s/check-asserts true) diff --git a/common/uxbox/common/uuid.cljc b/common/app/common/uuid.cljc similarity index 93% rename from common/uxbox/common/uuid.cljc rename to common/app/common/uuid.cljc index c6b5903e8..3dad2eb0e 100644 --- a/common/uxbox/common/uuid.cljc +++ b/common/app/common/uuid.cljc @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.common.uuid +(ns app.common.uuid (:refer-clojure :exclude [next uuid zero?]) #?(:clj (:import java.util.UUID)) #?(:clj (:require [clj-uuid :as impl] [clojure.core :as c]) :cljs - (:require [uxbox.common.uuid-impl :as impl] + (:require [app.common.uuid-impl :as impl] [cljs.core :as c]))) (def zero #uuid "00000000-0000-0000-0000-000000000000") diff --git a/common/uxbox/common/uuid_impl.js b/common/app/common/uuid_impl.js similarity index 98% rename from common/uxbox/common/uuid_impl.js rename to common/app/common/uuid_impl.js index 4d86331a7..8a26fb5a9 100644 --- a/common/uxbox/common/uuid_impl.js +++ b/common/app/common/uuid_impl.js @@ -11,11 +11,11 @@ "use strict"; goog.require("cljs.core"); -goog.provide("uxbox.common.uuid_impl"); +goog.provide("app.common.uuid_impl"); goog.scope(function() { const core = cljs.core; - const self = uxbox.common.uuid_impl; + const self = app.common.uuid_impl; const fill = (() => { if (typeof window === "object") { diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml index 3747ab6d8..faac35645 100644 --- a/docker/devenv/docker-compose.yaml +++ b/docker/devenv/docker-compose.yaml @@ -40,12 +40,12 @@ services: - 9090:9090 environment: - - UXBOX_DATABASE_URI=postgresql://postgres/uxbox - - UXBOX_DATABASE_USERNAME=uxbox - - UXBOX_DATABASE_PASSWORD=uxbox - - UXBOX_SENDMAIL_BACKEND=smtp - - UXBOX_SMTP_HOST=smtp - - UXBOX_SMTP_PORT=25 + - APP_DATABASE_URI=postgresql://postgres/uxbox + - APP_DATABASE_USERNAME=uxbox + - APP_DATABASE_PASSWORD=uxbox + - APP_SENDMAIL_BACKEND=smtp + - APP_SMTP_HOST=smtp + - APP_SMTP_PORT=25 smtp: container_name: "uxbox-devenv-smtp" @@ -75,7 +75,7 @@ services: - postgres_data:/var/lib/postgresql/data redis: - image: redis:6.0-rc3 + image: redis:6.0.6 hostname: "uxbox-devenv-redis" container_name: "uxbox-devenv-redis" restart: always diff --git a/exporter/src/app/http/export.cljs b/exporter/src/app/http/export.cljs index 6e1f89430..3ade4b035 100644 --- a/exporter/src/app/http/export.cljs +++ b/exporter/src/app/http/export.cljs @@ -7,8 +7,8 @@ [cuerdas.core :as str] [lambdaisland.glogi :as log] [promesa.core :as p] - [uxbox.common.exceptions :as exc :include-macros true] - [uxbox.common.spec :as us])) + [app.common.exceptions :as exc :include-macros true] + [app.common.spec :as us])) (s/def ::name ::us/string) (s/def ::page-id ::us/uuid) diff --git a/exporter/src/app/http/export_bitmap.cljs b/exporter/src/app/http/export_bitmap.cljs index 87c4e5500..be11da5f1 100644 --- a/exporter/src/app/http/export_bitmap.cljs +++ b/exporter/src/app/http/export_bitmap.cljs @@ -6,10 +6,10 @@ [lambdaisland.glogi :as log] [cljs.spec.alpha :as s] [promesa.core :as p] - [uxbox.common.exceptions :as exc :include-macros true] - [uxbox.common.data :as d] - [uxbox.common.pages :as cp] - [uxbox.common.spec :as us]) + [app.common.exceptions :as exc :include-macros true] + [app.common.data :as d] + [app.common.pages :as cp] + [app.common.spec :as us]) (:import goog.Uri)) diff --git a/exporter/src/app/http/export_svg.cljs b/exporter/src/app/http/export_svg.cljs index c9ba05873..878118dc4 100644 --- a/exporter/src/app/http/export_svg.cljs +++ b/exporter/src/app/http/export_svg.cljs @@ -7,10 +7,10 @@ [lambdaisland.glogi :as log] [cljs.spec.alpha :as s] [promesa.core :as p] - [uxbox.common.exceptions :as exc :include-macros true] - [uxbox.common.data :as d] - [uxbox.common.pages :as cp] - [uxbox.common.spec :as us] + [app.common.exceptions :as exc :include-macros true] + [app.common.data :as d] + [app.common.pages :as cp] + [app.common.spec :as us] ["xml-js" :as xml] ["child_process" :as chp] ["os" :as os] diff --git a/exporter/src/app/util/transit.cljs b/exporter/src/app/util/transit.cljs index 1f3bfd9b8..e4d487ffd 100644 --- a/exporter/src/app/util/transit.cljs +++ b/exporter/src/app/util/transit.cljs @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020 app Labs SL (ns app.util.transit (:require diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index baf508914..fa32fc84e 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -152,7 +152,7 @@ function templatePipeline(options) { const output = options.output; const ts = Math.floor(new Date()); - const th = process.env.UXBOX_THEME || "default"; + const th = process.env.APP_THEME || "default"; const themes = ["default"]; const locales = readLocales(); diff --git a/frontend/package.json b/frontend/package.json index de255d854..095511f84 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,12 +1,12 @@ { - "name": "uxbox", + "name": "app", "version": "0.1.0", "description": "The Open-Source prototyping tool", "author": "UXBOX LABS SL", "license": "SEE LICENSE IN ", "repository": { "type": "git", - "url": "https://github.com/uxbox/uxbox" + "url": "https://github.com/app/app" }, "browserslist": [ "defaults" diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 04cfddd0c..2058b652f 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -1,6 +1,6 @@ { "auth.already-have-account" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:107" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:107" ], "translations" : { "en" : "Already have an account?", "fr" : "Vous avez déjà un compte?", @@ -9,7 +9,7 @@ } }, "auth.confirm-password-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery.cljs:77" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs:77" ], "translations" : { "en" : "Confirm password", "fr" : "Confirmez mot de passe", @@ -18,7 +18,7 @@ } }, "auth.create-demo-profile" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:116", "src/uxbox/main/ui/auth/login.cljs:121" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:116", "src/app/main/ui/auth/login.cljs:121" ], "translations" : { "en" : "Create demo account", "fr" : "Créer un compte de démonstration", @@ -27,7 +27,7 @@ } }, "auth.create-demo-profile-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:113", "src/uxbox/main/ui/auth/login.cljs:118" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:113", "src/app/main/ui/auth/login.cljs:118" ], "translations" : { "en" : "Just wanna try it?", "fr" : "Vous voulez juste essayer?", @@ -36,7 +36,7 @@ } }, "auth.demo-warning" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:33" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:33" ], "translations" : { "en" : "This is a DEMO service, DO NOT USE for real work, the projects will be periodicaly wiped.", "fr" : "Il s'agit d'un service DEMO, NE PAS UTILISER pour un travail réel, les projets seront périodiquement supprimés.", @@ -45,7 +45,7 @@ } }, "auth.email-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:82", "src/uxbox/main/ui/auth/recovery_request.cljs:46", "src/uxbox/main/ui/auth/login.cljs:74" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:82", "src/app/main/ui/auth/recovery_request.cljs:46", "src/app/main/ui/auth/login.cljs:74" ], "translations" : { "en" : "Email", "fr" : "Adresse email", @@ -54,7 +54,7 @@ } }, "auth.forgot-password" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:103" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:103" ], "translations" : { "en" : "Forgot your password?", "fr" : "Mot de passe oublié?", @@ -63,7 +63,7 @@ } }, "auth.fullname-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:76" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:76" ], "translations" : { "en" : "Full Name", "fr" : "Nom complet", @@ -72,7 +72,7 @@ } }, "auth.go-back-to-login" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery_request.cljs:67" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:67" ], "translations" : { "en" : "Go back!", "fr" : "Retour!", @@ -81,7 +81,7 @@ } }, "auth.goodbye-title" : { - "used-in" : [ "src/uxbox/main/ui/auth.cljs:33" ], + "used-in" : [ "src/app/main/ui/auth.cljs:33" ], "translations" : { "en" : "Goodbye!", "fr" : "Au revoir!", @@ -90,7 +90,7 @@ } }, "auth.login-here" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:110" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:110" ], "translations" : { "en" : "Login here", "fr" : "Se connecter ici", @@ -99,7 +99,7 @@ } }, "auth.login-submit-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:82" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:82" ], "translations" : { "en" : "Sign in", "fr" : "Se connecter", @@ -108,7 +108,7 @@ } }, "auth.login-subtitle" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:95" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:95" ], "translations" : { "en" : "Enter your details below", "fr" : "Entrez vos informations ci-dessous", @@ -117,7 +117,7 @@ } }, "auth.login-title" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:94" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:94" ], "translations" : { "en" : "Great to see you again!", "fr" : "Ravi de vous revoir!", @@ -126,7 +126,7 @@ } }, "auth.login-with-ldap-submit-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:86" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:86" ], "translations" : { "en" : "Sign in with LDAP", "fr" : "Se connecter via LDAP", @@ -135,7 +135,7 @@ } }, "auth.new-password-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery.cljs:73" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs:73" ], "translations" : { "en" : "Type a new password", "fr" : "Saisissez un nouveau mot de passe", @@ -144,7 +144,7 @@ } }, "auth.notifications.invalid-token-error" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery.cljs:49" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs:49" ], "translations" : { "en" : "The recovery token is invalid.", "fr" : "Le code de récupération n'est pas valide.", @@ -153,7 +153,7 @@ } }, "auth.notifications.password-changed-succesfully" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery.cljs:53" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs:53" ], "translations" : { "en" : "Password successfully changed", "fr" : "Mot de passe changé avec succès", @@ -162,7 +162,7 @@ } }, "auth.notifications.recovery-token-sent" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery_request.cljs:33" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:33" ], "translations" : { "en" : "Password recovery link sent to your inbox.", "fr" : "Lien de récupération de mot de passe envoyé.", @@ -171,7 +171,7 @@ } }, "auth.password-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:86", "src/uxbox/main/ui/auth/login.cljs:80" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:86", "src/app/main/ui/auth/login.cljs:80" ], "translations" : { "en" : "Password", "fr" : "Mot de passe", @@ -180,7 +180,7 @@ } }, "auth.password-length-hint" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:85" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:85" ], "translations" : { "en" : "At least 8 characters", "fr" : "Au moins 8 caractères", @@ -189,7 +189,7 @@ } }, "auth.recovery-request-submit-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery_request.cljs:51" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:51" ], "translations" : { "en" : "Recover Password", "fr" : "Récupérer le mot de passe", @@ -198,7 +198,7 @@ } }, "auth.recovery-request-subtitle" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery_request.cljs:60" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:60" ], "translations" : { "en" : "We'll send you an email with instructions", "fr" : "Nous vous enverrons un e-mail avec des instructions", @@ -207,7 +207,7 @@ } }, "auth.recovery-request-title" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery_request.cljs:59" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:59" ], "translations" : { "en" : "Forgot your password?", "fr" : "Vous avez oublié votre mot de passe?", @@ -216,7 +216,7 @@ } }, "auth.recovery-submit-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery.cljs:80" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs:80" ], "translations" : { "en" : "Change your password", "fr" : "Changez votre mot de passe", @@ -225,7 +225,7 @@ } }, "auth.register" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:109" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:109" ], "translations" : { "en" : "Sign up here", "fr" : "Inscrivez-vous ici", @@ -234,7 +234,7 @@ } }, "auth.register-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:106" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:106" ], "translations" : { "en" : "No account yet?", "fr" : "Pas encore de compte?", @@ -243,7 +243,7 @@ } }, "auth.register-submit-label" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:90" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:90" ], "translations" : { "en" : "Create an account", "fr" : "Créer un compte", @@ -252,7 +252,7 @@ } }, "auth.register-subtitle" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:99" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:99" ], "translations" : { "en" : "It's free, it's Open Source", "fr" : "C'est gratuit, c'est Open Source", @@ -261,7 +261,7 @@ } }, "auth.register-title" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:98" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:98" ], "translations" : { "en" : "Create an account", "fr" : "Créer un compte", @@ -270,7 +270,7 @@ } }, "auth.sidebar-tagline" : { - "used-in" : [ "src/uxbox/main/ui/auth.cljs:42" ], + "used-in" : [ "src/app/main/ui/auth.cljs:42" ], "translations" : { "en" : "The open-source solution for design and prototyping.", "fr" : "La solution Open Source pour la conception et le prototypage.", @@ -279,7 +279,7 @@ } }, "dashboard.grid.add-shared" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:131", "src/uxbox/main/ui/workspace/header.cljs:147" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:131", "src/app/main/ui/workspace/header.cljs:147" ], "translations" : { "en" : "Add as Shared Library", "fr" : "", @@ -288,7 +288,7 @@ } }, "dashboard.grid.add-shared-accept" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:70", "src/uxbox/main/ui/workspace/header.cljs:70" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:70", "src/app/main/ui/workspace/header.cljs:70" ], "translations" : { "en" : "Add as Shared Library", "fr" : "", @@ -297,7 +297,7 @@ } }, "dashboard.grid.add-shared-hint" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:69", "src/uxbox/main/ui/workspace/header.cljs:69" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:69", "src/app/main/ui/workspace/header.cljs:69" ], "translations" : { "en" : "Once added as Shared Library, the assets of this file library will be available to be used among the rest of your files.", "fr" : "", @@ -306,7 +306,7 @@ } }, "dashboard.grid.add-shared-message" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:68", "src/uxbox/main/ui/workspace/header.cljs:68" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:68", "src/app/main/ui/workspace/header.cljs:68" ], "translations" : { "en" : "Add “%s” as Shared Library", "fr" : "", @@ -315,7 +315,7 @@ } }, "dashboard.grid.delete" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/project.cljs:62", "src/uxbox/main/ui/dashboard/grid.cljs:128" ], + "used-in" : [ "src/app/main/ui/dashboard/project.cljs:62", "src/app/main/ui/dashboard/grid.cljs:128" ], "translations" : { "en" : "Delete", "fr" : "Supprimer", @@ -324,7 +324,7 @@ } }, "dashboard.grid.empty-files" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:153" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:153" ], "translations" : { "en" : "You still have no files here", "fr" : "Vous n'avez encore aucun fichier ici", @@ -333,7 +333,7 @@ } }, "dashboard.grid.remove-shared" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:130", "src/uxbox/main/ui/workspace/header.cljs:145" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:130", "src/app/main/ui/workspace/header.cljs:145" ], "translations" : { "en" : "Remove as Shared Library", "fr" : "", @@ -342,7 +342,7 @@ } }, "dashboard.grid.remove-shared-accept" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:81", "src/uxbox/main/ui/workspace/header.cljs:79" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:81", "src/app/main/ui/workspace/header.cljs:79" ], "translations" : { "en" : "Remove as Shared Library", "fr" : "", @@ -351,7 +351,7 @@ } }, "dashboard.grid.remove-shared-hint" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:80", "src/uxbox/main/ui/workspace/header.cljs:78" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:80", "src/app/main/ui/workspace/header.cljs:78" ], "translations" : { "en" : "Once removed as Shared Library, the File Library of this file will stop being available to be used among the rest of your files.", "fr" : "", @@ -360,7 +360,7 @@ } }, "dashboard.grid.remove-shared-message" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:79", "src/uxbox/main/ui/workspace/header.cljs:77" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:79", "src/app/main/ui/workspace/header.cljs:77" ], "translations" : { "en" : "Remove “%s” as Shared Library", "fr" : "", @@ -369,7 +369,7 @@ } }, "dashboard.grid.rename" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/project.cljs:61", "src/uxbox/main/ui/dashboard/grid.cljs:127" ], + "used-in" : [ "src/app/main/ui/dashboard/project.cljs:61", "src/app/main/ui/dashboard/grid.cljs:127" ], "translations" : { "en" : "Rename", "fr" : "Renommer", @@ -378,7 +378,7 @@ } }, "dashboard.header.draft" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/project.cljs:55" ], + "used-in" : [ "src/app/main/ui/dashboard/project.cljs:55" ], "translations" : { "en" : "Draft", "fr" : "Brouillon", @@ -387,7 +387,7 @@ } }, "dashboard.header.libraries" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/libraries.cljs:41" ], + "used-in" : [ "src/app/main/ui/dashboard/libraries.cljs:41" ], "translations" : { "en" : "Shared Libraries", "fr" : "", @@ -396,7 +396,7 @@ } }, "dashboard.header.new-file" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/project.cljs:72" ], + "used-in" : [ "src/app/main/ui/dashboard/project.cljs:72" ], "translations" : { "en" : "+ New file", "fr" : "+ Nouveau fichier", @@ -405,7 +405,7 @@ } }, "dashboard.header.new-project" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/recent_files.cljs:48" ], + "used-in" : [ "src/app/main/ui/dashboard/recent_files.cljs:48" ], "translations" : { "en" : "+ New project", "fr" : "+ Nouveau projet", @@ -414,7 +414,7 @@ } }, "dashboard.header.profile-menu.logout" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/profile.cljs:58" ], + "used-in" : [ "src/app/main/ui/dashboard/profile.cljs:58" ], "translations" : { "en" : "Exit", "fr" : "Quitter", @@ -423,7 +423,7 @@ } }, "dashboard.header.profile-menu.password" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/profile.cljs:55" ], + "used-in" : [ "src/app/main/ui/dashboard/profile.cljs:55" ], "translations" : { "en" : "Password", "fr" : "Mot de passe", @@ -432,7 +432,7 @@ } }, "dashboard.header.profile-menu.profile" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/profile.cljs:52" ], + "used-in" : [ "src/app/main/ui/dashboard/profile.cljs:52" ], "translations" : { "en" : "Profile", "fr" : "Profil", @@ -441,7 +441,7 @@ } }, "dashboard.header.project" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/project.cljs:57" ], + "used-in" : [ "src/app/main/ui/dashboard/project.cljs:57" ], "translations" : { "en" : "Project %s", "fr" : "Projet %s", @@ -531,7 +531,7 @@ "unused" : true }, "dashboard.search.no-matches-for" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/search.cljs:48" ], + "used-in" : [ "src/app/main/ui/dashboard/search.cljs:48" ], "translations" : { "en" : "No matches found for “%s“", "fr" : "Aucune correspondance pour “%s“", @@ -540,7 +540,7 @@ } }, "dashboard.search.searching-for" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/search.cljs:44" ], + "used-in" : [ "src/app/main/ui/dashboard/search.cljs:44" ], "translations" : { "en" : "Searching for “%s“...", "fr" : "Recherche de “%s“...", @@ -549,7 +549,7 @@ } }, "dashboard.search.type-something" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/search.cljs:40" ], + "used-in" : [ "src/app/main/ui/dashboard/search.cljs:40" ], "translations" : { "en" : "Type to search results", "fr" : "Écrivez pour rechercher", @@ -558,7 +558,7 @@ } }, "dashboard.sidebar.drafts" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/sidebar.cljs:129" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:129" ], "translations" : { "en" : "Drafts", "fr" : "Brouillons", @@ -567,7 +567,7 @@ } }, "dashboard.sidebar.libraries" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/sidebar.cljs:135" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:135" ], "translations" : { "en" : "Shared Libraries", "fr" : "", @@ -576,7 +576,7 @@ } }, "dashboard.sidebar.recent" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/sidebar.cljs:122" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:122" ], "translations" : { "en" : "Recent", "fr" : "Récent", @@ -585,7 +585,7 @@ } }, "ds.accept" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/history.cljs:114" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:114" ], "translations" : { "en" : "Accept", "fr" : "Accepter", @@ -612,7 +612,7 @@ "unused" : true }, "ds.button.save" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:62" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:62" ], "translations" : { "en" : "Save", "fr" : "Sauvegarder", @@ -621,7 +621,7 @@ } }, "ds.cancel" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/history.cljs:115" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:115" ], "translations" : { "en" : "Cancel", "fr" : "Annuler", @@ -630,7 +630,7 @@ } }, "ds.confirm-cancel" : { - "used-in" : [ "src/uxbox/main/ui/confirm.cljs:20" ], + "used-in" : [ "src/app/main/ui/confirm.cljs:20" ], "translations" : { "en" : "Cancel", "fr" : "Annuler", @@ -639,7 +639,7 @@ } }, "ds.confirm-ok" : { - "used-in" : [ "src/uxbox/main/ui/confirm.cljs:21" ], + "used-in" : [ "src/app/main/ui/confirm.cljs:21" ], "translations" : { "en" : "Ok", "fr" : "Ok", @@ -648,7 +648,7 @@ } }, "ds.confirm-title" : { - "used-in" : [ "src/uxbox/main/ui/confirm.cljs:19" ], + "used-in" : [ "src/app/main/ui/confirm.cljs:19" ], "translations" : { "en" : "Are you sure?", "fr" : "Êtes-vous sûr?", @@ -657,7 +657,7 @@ } }, "ds.history.pinned" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/history.cljs:96" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:96" ], "translations" : { "en" : null, "fr" : null, @@ -666,7 +666,7 @@ } }, "ds.history.versions" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/history.cljs:93" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:93" ], "translations" : { "en" : null, "fr" : null, @@ -675,7 +675,7 @@ } }, "ds.new-file" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:149", "src/uxbox/main/ui/dashboard/grid.cljs:155" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:149", "src/app/main/ui/dashboard/grid.cljs:155" ], "translations" : { "en" : "+ New File", "fr" : "+ Nouveau fichier", @@ -684,7 +684,7 @@ } }, "ds.search.placeholder" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/sidebar.cljs:188" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:188" ], "translations" : { "en" : "Search...", "fr" : "Rechercher...", @@ -693,7 +693,7 @@ } }, "ds.settings.document-history" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/history.cljs:87" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:87" ], "translations" : { "en" : null, "fr" : null, @@ -702,7 +702,7 @@ } }, "ds.updated-at" : { - "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:46" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:46" ], "translations" : { "en" : "Updated: %s", "fr" : "Mis à jour: %s", @@ -711,7 +711,7 @@ } }, "errors.auth.unauthorized" : { - "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:63" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs:63" ], "translations" : { "en" : "Username or password seems to be wrong.", "fr" : "Le nom d'utilisateur ou le mot de passe semble être faux.", @@ -720,7 +720,7 @@ } }, "errors.email-already-exists" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:47", "src/uxbox/main/ui/auth.cljs:87" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:47", "src/app/main/ui/auth.cljs:87" ], "translations" : { "en" : "Email already used", "fr" : "Adresse e-mail déjà utilisée", @@ -729,7 +729,7 @@ } }, "errors.email-invalid-confirmation" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:37" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:37" ], "translations" : { "en" : "Confirmation email must match", "fr" : "L'adresse e-mail de confirmation doit correspondre", @@ -738,7 +738,7 @@ } }, "errors.generic" : { - "used-in" : [ "src/uxbox/main/ui.cljs:183", "src/uxbox/main/ui/settings/profile.cljs:38", "src/uxbox/main/ui/auth.cljs:91" ], + "used-in" : [ "src/app/main/ui.cljs:183", "src/app/main/ui/settings/profile.cljs:38", "src/app/main/ui/auth.cljs:91" ], "translations" : { "en" : "Something wrong has happened.", "fr" : "Quelque chose c'est mal passé.", @@ -747,7 +747,7 @@ } }, "errors.media-format-unsupported" : { - "used-in" : [ "src/uxbox/main/data/media.cljs:39" ], + "used-in" : [ "src/app/main/data/media.cljs:39" ], "translations" : { "en" : "The image format is not supported (must be svg, jpg or png).", "fr" : "Le format d'image n'est pas supporté (doit être svg, jpg ou png).", @@ -756,7 +756,7 @@ } }, "errors.media-too-large" : { - "used-in" : [ "src/uxbox/main/data/media.cljs:37" ], + "used-in" : [ "src/app/main/data/media.cljs:37" ], "translations" : { "en" : "The image is too large to be inserted (must be under 5mb).", "fr" : "L'image est trop grande (doit être inférieure à 5 Mo).", @@ -765,7 +765,7 @@ } }, "errors.media-type-mismatch" : { - "used-in" : [ "src/uxbox/main/data/media.cljs:62" ], + "used-in" : [ "src/app/main/data/media.cljs:62" ], "translations" : { "en" : "Seems that the contents of the image does not match the file extension.", "fr" : "", @@ -774,7 +774,7 @@ } }, "errors.media-type-not-allowed" : { - "used-in" : [ "src/uxbox/main/data/media.cljs:59" ], + "used-in" : [ "src/app/main/data/media.cljs:59" ], "translations" : { "en" : "Seems that this is not a valid image.", "fr" : "", @@ -783,7 +783,7 @@ } }, "errors.network" : { - "used-in" : [ "src/uxbox/main/ui.cljs:177" ], + "used-in" : [ "src/app/main/ui.cljs:177" ], "translations" : { "en" : "Unable to connect to backend server.", "fr" : "Impossible de se connecter au serveur principal.", @@ -792,7 +792,7 @@ } }, "errors.password-invalid-confirmation" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:58" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:58" ], "translations" : { "en" : "Confirmation password must match", "fr" : "Le mot de passe de confirmation doit correspondre", @@ -801,7 +801,7 @@ } }, "errors.password-too-short" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:61" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:61" ], "translations" : { "en" : "Password should at least be 8 characters", "fr" : "Le mot de passe doit contenir au moins 8 caractères", @@ -810,7 +810,7 @@ } }, "errors.registration-disabled" : { - "used-in" : [ "src/uxbox/main/ui/auth/register.cljs:48" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs:48" ], "translations" : { "en" : "The registration is currently disabled.", "fr" : "L'enregistrement est actuellement désactivé.", @@ -819,7 +819,7 @@ } }, "errors.unexpected-error" : { - "used-in" : [ "src/uxbox/main/data/media.cljs:65", "src/uxbox/main/ui/settings/change_email.cljs:51", "src/uxbox/main/ui/workspace/sidebar/options/exports.cljs:65", "src/uxbox/main/ui/auth/register.cljs:54" ], + "used-in" : [ "src/app/main/data/media.cljs:65", "src/app/main/ui/settings/change_email.cljs:51", "src/app/main/ui/workspace/sidebar/options/exports.cljs:65", "src/app/main/ui/auth/register.cljs:54" ], "translations" : { "en" : "An unexpected error occurred.", "fr" : "Une erreur inattendue c'est produite", @@ -828,7 +828,7 @@ } }, "errors.wrong-old-password" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:28" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:28" ], "translations" : { "en" : "Old password is incorrect", "fr" : "l'ancien mot de passe est incorrect", @@ -837,7 +837,7 @@ } }, "generic.error" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:31" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:31" ], "translations" : { "en" : "An error has occurred", "fr" : null, @@ -846,7 +846,7 @@ } }, "header.sitemap" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:85" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:85" ], "translations" : { "en" : "Sitemap", "fr" : null, @@ -855,7 +855,7 @@ } }, "history.alert-message" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/history.cljs:112" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:112" ], "translations" : { "en" : "You are seeing version %s", "fr" : "Vous voyez la version %s", @@ -864,7 +864,7 @@ } }, "media.loading" : { - "used-in" : [ "src/uxbox/main/data/media.cljs:44" ], + "used-in" : [ "src/app/main/data/media.cljs:44" ], "translations" : { "en" : "Loading image...", "fr" : "Chargement de l'image...", @@ -873,7 +873,7 @@ } }, "modal.create-color.new-color" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:55" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:55" ], "translations" : { "en" : "New Color", "fr" : "Nouvelle couleur", @@ -882,7 +882,7 @@ } }, "profile.recovery.go-to-login" : { - "used-in" : [ "src/uxbox/main/ui/auth/recovery.cljs:96" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs:96" ], "translations" : { "en" : null, "fr" : null, @@ -891,7 +891,7 @@ } }, "settings.cancel-and-keep-my-account" : { - "used-in" : [ "src/uxbox/main/ui/settings/delete_account.cljs:43" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:43" ], "translations" : { "en" : "Cancel and keep my account", "fr" : "Annuler et conserver mon compte", @@ -900,7 +900,7 @@ } }, "settings.cancel-email-change" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:83" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:83" ], "translations" : { "en" : "Cancel", "fr" : "Annuler", @@ -909,7 +909,7 @@ } }, "settings.change-email-info" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:67" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:67" ], "translations" : { "en" : "We'll send you an email to your current email “%s” to verify your identity.", "fr" : "Nous vous enverrons un e-mail à votre adresse actuelle “%s” pour vérifier votre identité.", @@ -918,7 +918,7 @@ } }, "settings.change-email-info2" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:94" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:94" ], "translations" : { "en" : "We have sent you an email to “%s”. Please follow the instructions to verify the email.", "fr" : "Nous vous avons envoyé un e-mail à “%s”. Veuillez suivre les instructions pour vérifier l'e-mail.", @@ -927,7 +927,7 @@ } }, "settings.change-email-info3" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:80" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:80" ], "translations" : { "en" : "There is a pending change of your email to “%s”.", "fr" : "Il y a un changement en attente de votre adresse e-mail “%s”.", @@ -936,7 +936,7 @@ } }, "settings.change-email-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:75" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:75" ], "translations" : { "en" : "Change email", "fr" : "Changer adresse e-mail", @@ -945,7 +945,7 @@ } }, "settings.change-email-submit-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:84" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:84" ], "translations" : { "en" : "Change email", "fr" : "Changer adresse e-mail", @@ -954,7 +954,7 @@ } }, "settings.change-email-title" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:63" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:63" ], "translations" : { "en" : "Change your email", "fr" : "Changer adresse e-mail", @@ -963,7 +963,7 @@ } }, "settings.close-modal-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:98" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:98" ], "translations" : { "en" : "Close", "fr" : "Fermer", @@ -972,7 +972,7 @@ } }, "settings.confirm-email-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:80" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:80" ], "translations" : { "en" : "Verify new email", "fr" : "Vérifier la nouvelle adresse e-mail", @@ -981,7 +981,7 @@ } }, "settings.confirm-password-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:90" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:90" ], "translations" : { "en" : "Confirm password", "fr" : "Confirmez mot de passe", @@ -990,7 +990,7 @@ } }, "settings.delete-account-info" : { - "used-in" : [ "src/uxbox/main/ui/settings/delete_account.cljs:33" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:33" ], "translations" : { "en" : "By removing your account you’ll lose all your current projects and archives.", "fr" : "En supprimant votre compte, vous perdrez tous vos projets et archives actuels.", @@ -999,7 +999,7 @@ } }, "settings.delete-account-title" : { - "used-in" : [ "src/uxbox/main/ui/settings/delete_account.cljs:29" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:29" ], "translations" : { "en" : "Are you sure you want to delete your account?", "fr" : "Voulez-vous vraiment supprimer votre compte?", @@ -1008,7 +1008,7 @@ } }, "settings.email-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:69" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:69" ], "translations" : { "en" : "Email", "fr" : "E-mail", @@ -1017,7 +1017,7 @@ } }, "settings.email-verification-pending" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:88" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:88" ], "translations" : { "en" : "There is a pending email validation.", "fr" : "Une validation par e-mail est en attente.", @@ -1026,7 +1026,7 @@ } }, "settings.fullname-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:61" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:61" ], "translations" : { "en" : "Your name", "fr" : "Votre nom complet", @@ -1035,7 +1035,7 @@ } }, "settings.language-change-title" : { - "used-in" : [ "src/uxbox/main/ui/settings/options.cljs:50" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs:50" ], "translations" : { "en" : "Language", "fr" : "Langue", @@ -1044,7 +1044,7 @@ } }, "settings.language-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/options.cljs:56" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs:56" ], "translations" : { "en" : "Select UI language", "fr" : "Sélectionner la langue de l'interface", @@ -1053,7 +1053,7 @@ } }, "settings.multiple" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:137", "src/uxbox/main/ui/workspace/sidebar/options/rows/color_row.cljs:117", "src/uxbox/main/ui/workspace/sidebar/options/rows/color_row.cljs:126", "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:124", "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:227", "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:240" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:137", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:117", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:126", "src/app/main/ui/workspace/sidebar/options/text.cljs:124", "src/app/main/ui/workspace/sidebar/options/text.cljs:227", "src/app/main/ui/workspace/sidebar/options/text.cljs:240" ], "translations" : { "en" : "Mixed", "fr" : null, @@ -1062,7 +1062,7 @@ } }, "settings.new-email-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:75" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:75" ], "translations" : { "en" : "New email", "fr" : "Nouvel e-mail", @@ -1071,7 +1071,7 @@ } }, "settings.new-password-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:85" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:85" ], "translations" : { "en" : "New password", "fr" : "Nouveau mot de passe", @@ -1080,7 +1080,7 @@ } }, "settings.notifications.email-changed-successfully" : { - "used-in" : [ "src/uxbox/main/ui/auth.cljs:62" ], + "used-in" : [ "src/app/main/ui/auth.cljs:62" ], "translations" : { "en" : "Your email address has been updated successfully", "fr" : "Votre adresse e-mail a été mise à jour avec succès", @@ -1089,7 +1089,7 @@ } }, "settings.notifications.email-not-verified" : { - "used-in" : [ "src/uxbox/main/ui/dashboard.cljs:98" ], + "used-in" : [ "src/app/main/ui/dashboard.cljs:98" ], "translations" : { "en" : "Your email address has not been verified yet. Please check your inbox at “%s” for a confirmation email.", "fr" : "Votre adresse e-mail n'a pas encore été vérifiée. Veuillez vérifier votre boîte de réception à “%s” pour un e-mail de confirmation.", @@ -1098,7 +1098,7 @@ } }, "settings.notifications.email-verified-successfully" : { - "used-in" : [ "src/uxbox/main/ui/auth.cljs:55" ], + "used-in" : [ "src/app/main/ui/auth.cljs:55" ], "translations" : { "en" : "Your email address has been verified successfully", "fr" : "Votre adresse e-mail a été vérifiée avec succès", @@ -1107,7 +1107,7 @@ } }, "settings.notifications.password-saved" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:36" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:36" ], "translations" : { "en" : "Password saved successfully!", "fr" : "Mot de passe enregistré avec succès!", @@ -1116,7 +1116,7 @@ } }, "settings.notifications.profile-deletion-not-allowed" : { - "used-in" : [ "src/uxbox/main/data/auth.cljs:160" ], + "used-in" : [ "src/app/main/data/auth.cljs:160" ], "translations" : { "en" : "You can't delete you profile. Reasign your teams before proceed.", "fr" : "Vous ne pouvez pas supprimer votre profil. Réassignez vos équipes avant de continuer.", @@ -1125,7 +1125,7 @@ } }, "settings.notifications.profile-saved" : { - "used-in" : [ "src/uxbox/main/ui/settings/options.cljs:37", "src/uxbox/main/ui/settings/profile.cljs:43" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs:37", "src/app/main/ui/settings/profile.cljs:43" ], "translations" : { "en" : "Profile saved successfully!", "fr" : "Profil enregistré avec succès!", @@ -1134,7 +1134,7 @@ } }, "settings.old-password-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:80" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:80" ], "translations" : { "en" : "Old password", "fr" : "Ancien mot de passe", @@ -1143,7 +1143,7 @@ } }, "settings.options" : { - "used-in" : [ "src/uxbox/main/ui/settings/header.cljs:54" ], + "used-in" : [ "src/app/main/ui/settings/header.cljs:54" ], "translations" : { "en" : "OPTIONS", "fr" : "OPTIONS", @@ -1152,7 +1152,7 @@ } }, "settings.password" : { - "used-in" : [ "src/uxbox/main/ui/settings/header.cljs:49" ], + "used-in" : [ "src/app/main/ui/settings/header.cljs:49" ], "translations" : { "en" : "PASSWORD", "fr" : "MOT DE PASSE", @@ -1161,7 +1161,7 @@ } }, "settings.password-change-title" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:75" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:75" ], "translations" : { "en" : "Change password", "fr" : "Changement de mot de passe", @@ -1170,7 +1170,7 @@ } }, "settings.profile" : { - "used-in" : [ "src/uxbox/main/ui/settings/header.cljs:44" ], + "used-in" : [ "src/app/main/ui/settings/header.cljs:44" ], "translations" : { "en" : "PROFILE", "fr" : "PROFIL", @@ -1179,7 +1179,7 @@ } }, "settings.profile-submit-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/password.cljs:93", "src/uxbox/main/ui/settings/options.cljs:67", "src/uxbox/main/ui/settings/profile.cljs:91" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs:93", "src/app/main/ui/settings/options.cljs:67", "src/app/main/ui/settings/profile.cljs:91" ], "translations" : { "en" : "Update settings", "fr" : "Mettre à jour les paramètres", @@ -1188,7 +1188,7 @@ } }, "settings.remove-account-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:96" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:96" ], "translations" : { "en" : "Want to remove your account?", "fr" : "Vous souhaitez supprimer votre compte?", @@ -1206,7 +1206,7 @@ "unused" : true }, "settings.theme-change-title" : { - "used-in" : [ "src/uxbox/main/ui/settings/options.cljs:60" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs:60" ], "translations" : { "en" : "UI theme", "fr" : "Thème de l'interface", @@ -1215,7 +1215,7 @@ } }, "settings.theme-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/options.cljs:61" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs:61" ], "translations" : { "en" : "Select theme", "fr" : "Sélectionnez un thème", @@ -1224,7 +1224,7 @@ } }, "settings.update-photo-label" : { - "used-in" : [ "src/uxbox/main/ui/settings/profile.cljs:117" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs:117" ], "translations" : { "en" : "UPDATE", "fr" : "METTRE A JOUR", @@ -1233,7 +1233,7 @@ } }, "settings.verification-sent-title" : { - "used-in" : [ "src/uxbox/main/ui/settings/change_email.cljs:89" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs:89" ], "translations" : { "en" : "Verification email sent", "fr" : "L'e-mail de vérification a été envoyé", @@ -1242,7 +1242,7 @@ } }, "settings.yes-delete-my-account" : { - "used-in" : [ "src/uxbox/main/ui/settings/delete_account.cljs:40" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:40" ], "translations" : { "en" : "Yes, delete my account", "fr" : "Oui, supprimez mon compte", @@ -1251,7 +1251,7 @@ } }, "viewer.empty-state" : { - "used-in" : [ "src/uxbox/main/ui/viewer.cljs:43" ], + "used-in" : [ "src/app/main/ui/viewer.cljs:43" ], "translations" : { "en" : "No frames found on the page.", "fr" : "Aucun cadre trouvé sur la page.", @@ -1260,7 +1260,7 @@ } }, "viewer.frame-not-found" : { - "used-in" : [ "src/uxbox/main/ui/viewer.cljs:47" ], + "used-in" : [ "src/app/main/ui/viewer.cljs:47" ], "translations" : { "en" : "Frame not found.", "fr" : "Cadre introuvable.", @@ -1269,7 +1269,7 @@ } }, "viewer.header.dont-show-interactions" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:67" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:67" ], "translations" : { "en" : "Don't show interactions", "fr" : "Ne pas afficher les interactions", @@ -1278,7 +1278,7 @@ } }, "viewer.header.edit-page" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:165" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:165" ], "translations" : { "en" : "Edit page", "fr" : "Editer la page", @@ -1287,7 +1287,7 @@ } }, "viewer.header.fullscreen" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:176" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:176" ], "translations" : { "en" : "Full Screen", "fr" : "Plein écran", @@ -1296,7 +1296,7 @@ } }, "viewer.header.share.copy-link" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:113" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:113" ], "translations" : { "en" : "Copy link", "fr" : "Copier lien", @@ -1305,7 +1305,7 @@ } }, "viewer.header.share.create-link" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:122" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:122" ], "translations" : { "en" : "Create link", "fr" : "Créer lien", @@ -1314,7 +1314,7 @@ } }, "viewer.header.share.placeholder" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:114" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:114" ], "translations" : { "en" : "Share link will appear here", "fr" : "Le lien de partage apparaîtra ici", @@ -1323,7 +1323,7 @@ } }, "viewer.header.share.remove-link" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:120" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:120" ], "translations" : { "en" : "Remove link", "fr" : "Supprimer le lien", @@ -1332,7 +1332,7 @@ } }, "viewer.header.share.subtitle" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:116" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:116" ], "translations" : { "en" : "Anyone with the link will have access", "fr" : "Toute personne disposant du lien aura accès", @@ -1341,7 +1341,7 @@ } }, "viewer.header.share.title" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:99", "src/uxbox/main/ui/viewer/header.cljs:101", "src/uxbox/main/ui/viewer/header.cljs:107" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:99", "src/app/main/ui/viewer/header.cljs:101", "src/app/main/ui/viewer/header.cljs:107" ], "translations" : { "en" : "Share link", "fr" : "Lien de partage", @@ -1350,7 +1350,7 @@ } }, "viewer.header.show-interactions" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:71" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:71" ], "translations" : { "en" : "Show interactions", "fr" : "Afficher les interactions", @@ -1359,7 +1359,7 @@ } }, "viewer.header.show-interactions-on-click" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:75" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:75" ], "translations" : { "en" : "Show interactions on click", "fr" : "Afficher les interactions au clic", @@ -1368,7 +1368,7 @@ } }, "viewer.header.sitemap" : { - "used-in" : [ "src/uxbox/main/ui/viewer/header.cljs:149" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs:149" ], "translations" : { "en" : "Sitemap", "fr" : "Plan du site", @@ -1377,7 +1377,7 @@ } }, "workspace.align.hcenter" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:53" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:53" ], "translations" : { "en" : "Align horizontal center", "fr" : "Aligner au centre", @@ -1386,7 +1386,7 @@ } }, "workspace.align.hdistribute" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:65" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:65" ], "translations" : { "en" : "Distribute horizontal spacing", "fr" : "Répartir l'espacement horizontal", @@ -1395,7 +1395,7 @@ } }, "workspace.align.hleft" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:47" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:47" ], "translations" : { "en" : "Align left", "fr" : "Aligner à gauche", @@ -1404,7 +1404,7 @@ } }, "workspace.align.hright" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:59" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:59" ], "translations" : { "en" : "Align right", "fr" : "Aligner à droite", @@ -1413,7 +1413,7 @@ } }, "workspace.align.vbottom" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:84" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:84" ], "translations" : { "en" : "Align bottom", "fr" : "Aligner en bas", @@ -1422,7 +1422,7 @@ } }, "workspace.align.vcenter" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:78" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:78" ], "translations" : { "en" : "Align vertical center", "fr" : "Aligner au centre", @@ -1431,7 +1431,7 @@ } }, "workspace.align.vdistribute" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:90" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:90" ], "translations" : { "en" : "Distribute vertical spacing", "fr" : "Répartir l'espacement vertical", @@ -1440,7 +1440,7 @@ } }, "workspace.align.vtop" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/align.cljs:72" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:72" ], "translations" : { "en" : "Align top", "fr" : "Aligner en haut", @@ -1449,7 +1449,7 @@ } }, "workspace.assets.assets" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:328" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:328" ], "translations" : { "en" : "Assets", "fr" : "", @@ -1458,7 +1458,7 @@ } }, "workspace.assets.box-filter-all" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:348" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:348" ], "translations" : { "en" : "All assets", "fr" : "", @@ -1467,7 +1467,7 @@ } }, "workspace.assets.box-filter-colors" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:350" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:350" ], "translations" : { "en" : "Colors", "fr" : "", @@ -1476,7 +1476,7 @@ } }, "workspace.assets.box-filter-graphics" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:349" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:349" ], "translations" : { "en" : "Graphics", "fr" : "", @@ -1485,7 +1485,7 @@ } }, "workspace.assets.colors" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:240" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:240" ], "translations" : { "en" : "Colors", "fr" : "", @@ -1494,7 +1494,7 @@ } }, "workspace.assets.delete" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:129", "src/uxbox/main/ui/workspace/sidebar/assets.cljs:224" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:129", "src/app/main/ui/workspace/sidebar/assets.cljs:224" ], "translations" : { "en" : "Delete", "fr" : "", @@ -1503,7 +1503,7 @@ } }, "workspace.assets.edit" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:223" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:223" ], "translations" : { "en" : "Edit", "fr" : "", @@ -1512,7 +1512,7 @@ } }, "workspace.assets.file-library" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:354" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:354" ], "translations" : { "en" : "File library", "fr" : "", @@ -1521,7 +1521,7 @@ } }, "workspace.assets.graphics" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:106" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:106" ], "translations" : { "en" : "Graphics", "fr" : "", @@ -1530,7 +1530,7 @@ } }, "workspace.assets.libraries" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:331" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:331" ], "translations" : { "en" : "Libraries", "fr" : "", @@ -1539,7 +1539,7 @@ } }, "workspace.assets.not-found" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:281" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:281" ], "translations" : { "en" : "No assets found", "fr" : "", @@ -1548,7 +1548,7 @@ } }, "workspace.assets.rename" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:222" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:222" ], "translations" : { "en" : "Rename", "fr" : "", @@ -1557,7 +1557,7 @@ } }, "workspace.assets.search" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:335" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:335" ], "translations" : { "en" : "Search assets", "fr" : "", @@ -1566,7 +1566,7 @@ } }, "workspace.assets.shared" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/assets.cljs:268" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:268" ], "translations" : { "en" : "SHARED", "fr" : "", @@ -1575,7 +1575,7 @@ } }, "workspace.header.menu.disable-dynamic-alignment" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:139" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:139" ], "translations" : { "en" : "Disable dynamic alignment", "fr" : "Désactiver l'alignement dynamique", @@ -1584,7 +1584,7 @@ } }, "workspace.header.menu.disable-snap-grid" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:111" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:111" ], "translations" : { "en" : "Disable snap to grid", "fr" : "Désactiver l'alignement sur la grille", @@ -1593,7 +1593,7 @@ } }, "workspace.header.menu.enable-dynamic-alignment" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:140" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:140" ], "translations" : { "en" : "Enable dynamic aligment", "fr" : "Activer l'alignement dynamique", @@ -1602,7 +1602,7 @@ } }, "workspace.header.menu.enable-snap-grid" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:112" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:112" ], "translations" : { "en" : "Snap to grid", "fr" : "Aligner sur la grille", @@ -1611,7 +1611,7 @@ } }, "workspace.header.menu.hide-assets" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:132" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:132" ], "translations" : { "en" : "Hide assets", "fr" : "", @@ -1620,7 +1620,7 @@ } }, "workspace.header.menu.hide-grid" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:104" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:104" ], "translations" : { "en" : "Hide grid", "fr" : "Masquer la grille", @@ -1629,7 +1629,7 @@ } }, "workspace.header.menu.hide-layers" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:118" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:118" ], "translations" : { "en" : "Hide layers", "fr" : "Masquer les couches", @@ -1638,7 +1638,7 @@ } }, "workspace.header.menu.hide-palette" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:125" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:125" ], "translations" : { "en" : "Hide color palette", "fr" : "Masquer la palette de couleurs", @@ -1647,7 +1647,7 @@ } }, "workspace.header.menu.hide-rules" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:97" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:97" ], "translations" : { "en" : "Hide rules", "fr" : "Masquer les règles", @@ -1656,7 +1656,7 @@ } }, "workspace.header.menu.show-assets" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:133" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:133" ], "translations" : { "en" : "Show assets", "fr" : "", @@ -1665,7 +1665,7 @@ } }, "workspace.header.menu.show-grid" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:105" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:105" ], "translations" : { "en" : "Show grid", "fr" : "Montrer la grille", @@ -1674,7 +1674,7 @@ } }, "workspace.header.menu.show-layers" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:119" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:119" ], "translations" : { "en" : "Show layers", "fr" : "Montrer les couches", @@ -1683,7 +1683,7 @@ } }, "workspace.header.menu.show-palette" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:126" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:126" ], "translations" : { "en" : "Show color palette", "fr" : "Montrer la palette de couleurs", @@ -1692,7 +1692,7 @@ } }, "workspace.header.menu.show-rules" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:98" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:98" ], "translations" : { "en" : "Show rules", "fr" : "Montrer les règles", @@ -1701,7 +1701,7 @@ } }, "workspace.header.viewer" : { - "used-in" : [ "src/uxbox/main/ui/workspace/header.cljs:184" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs:184" ], "translations" : { "en" : "View mode (Ctrl + P)", "fr" : "Mode visualisation (Ctrl + P)", @@ -1710,7 +1710,7 @@ } }, "workspace.libraries.add" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:98" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:98" ], "translations" : { "en" : "Add", "fr" : "", @@ -1719,7 +1719,7 @@ } }, "workspace.libraries.colors" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:55" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:55" ], "translations" : { "en" : "%s colors", "fr" : "", @@ -1728,7 +1728,7 @@ } }, "workspace.libraries.file-library" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:61" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:61" ], "translations" : { "en" : "File library", "fr" : "", @@ -1737,7 +1737,7 @@ } }, "workspace.libraries.graphics" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:52" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:52" ], "translations" : { "en" : "%s graphics", "fr" : "", @@ -1746,7 +1746,7 @@ } }, "workspace.libraries.in-this-file" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:58" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:58" ], "translations" : { "en" : "LIBRARIES IN THIS FILE", "fr" : "", @@ -1755,7 +1755,7 @@ } }, "workspace.libraries.libraries" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:140" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:140" ], "translations" : { "en" : "LIBRARIES", "fr" : "", @@ -1764,7 +1764,7 @@ } }, "workspace.libraries.no-matches-for" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:104" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:104" ], "translations" : { "en" : "No matches found for “%s“", "fr" : "Aucune correspondance pour “%s“", @@ -1773,7 +1773,7 @@ } }, "workspace.libraries.no-shared-libraries-available" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:103" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:103" ], "translations" : { "en" : "There are no Shared Libraries available", "fr" : "", @@ -1782,7 +1782,7 @@ } }, "workspace.libraries.remove" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:72" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:72" ], "translations" : { "en" : "Remove", "fr" : "", @@ -1791,7 +1791,7 @@ } }, "workspace.libraries.search-shared-libraries" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:79" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:79" ], "translations" : { "en" : "Search shared libraries", "fr" : "", @@ -1800,7 +1800,7 @@ } }, "workspace.libraries.shared-libraries" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:76" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:76" ], "translations" : { "en" : "SHARED LIBRARIES", "fr" : "", @@ -1809,7 +1809,7 @@ } }, "workspace.libraries.updates" : { - "used-in" : [ "src/uxbox/main/ui/workspace/libraries.cljs:144" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:144" ], "translations" : { "en" : "UPDATES", "fr" : "", @@ -1872,7 +1872,7 @@ "unused" : true }, "workspace.options.canvas-background" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/page.cljs:37" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/page.cljs:37" ], "translations" : { "en" : "Canvas background", "fr" : "Couleur de fond", @@ -1881,7 +1881,7 @@ } }, "workspace.options.design" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options.cljs:65" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs:65" ], "translations" : { "en" : "Design", "fr" : "Conception", @@ -1890,28 +1890,28 @@ } }, "workspace.options.export" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/exports.cljs:122" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:122" ], "translations" : { "en" : "Export", "ru" : "Экспорт" } }, "workspace.options.export-object" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/exports.cljs:155" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:155" ], "translations" : { "en" : "Export shape", "ru" : "Экспорт фигуры" } }, "workspace.options.exporting-object" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/exports.cljs:154" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:154" ], "translations" : { "en" : "Exporting...", "ru" : "Экспортирую ..." } }, "workspace.options.fill" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/fill.cljs:52" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs:52" ], "translations" : { "en" : "Fill", "fr" : "Remplissage", @@ -1920,7 +1920,7 @@ } }, "workspace.options.grid.auto" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:40" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:40" ], "translations" : { "en" : "Auto", "fr" : "Automatique", @@ -1929,7 +1929,7 @@ } }, "workspace.options.grid.column" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:134" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:134" ], "translations" : { "en" : "Columns", "fr" : "Colonnes", @@ -1938,7 +1938,7 @@ } }, "workspace.options.grid.params.columns" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:175" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:175" ], "translations" : { "en" : "Columns", "fr" : "Colonnes", @@ -1947,7 +1947,7 @@ } }, "workspace.options.grid.params.gutter" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:208" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:208" ], "translations" : { "en" : "Gutter", "fr" : "Gouttière", @@ -1956,7 +1956,7 @@ } }, "workspace.options.grid.params.height" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:199" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:199" ], "translations" : { "en" : "Height", "fr" : "Hauteur", @@ -1965,7 +1965,7 @@ } }, "workspace.options.grid.params.margin" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:214" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:214" ], "translations" : { "en" : "Margin", "fr" : "Marge", @@ -1974,7 +1974,7 @@ } }, "workspace.options.grid.params.rows" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:166" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:166" ], "translations" : { "en" : "Rows", "fr" : "Lignes", @@ -1983,7 +1983,7 @@ } }, "workspace.options.grid.params.set-default" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:227" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:227" ], "translations" : { "en" : "Set as default", "fr" : "Définir par défaut", @@ -1992,7 +1992,7 @@ } }, "workspace.options.grid.params.size" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:159" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:159" ], "translations" : { "en" : "Size", "fr" : "Taille", @@ -2001,7 +2001,7 @@ } }, "workspace.options.grid.params.type" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:184" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:184" ], "translations" : { "en" : "Type", "fr" : "Type", @@ -2010,7 +2010,7 @@ } }, "workspace.options.grid.params.type.bottom" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:192" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:192" ], "translations" : { "en" : "Bottom", "fr" : "Bas", @@ -2019,7 +2019,7 @@ } }, "workspace.options.grid.params.type.center" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:190" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:190" ], "translations" : { "en" : "Center", "fr" : "Centre", @@ -2028,7 +2028,7 @@ } }, "workspace.options.grid.params.type.left" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:189" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:189" ], "translations" : { "en" : "Left", "fr" : "Gauche", @@ -2037,7 +2037,7 @@ } }, "workspace.options.grid.params.type.right" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:193" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:193" ], "translations" : { "en" : "Right", "fr" : "Droite", @@ -2046,7 +2046,7 @@ } }, "workspace.options.grid.params.type.stretch" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:186" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:186" ], "translations" : { "en" : "Stretch", "fr" : "Étirer", @@ -2055,7 +2055,7 @@ } }, "workspace.options.grid.params.type.top" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:188" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:188" ], "translations" : { "en" : "Top", "fr" : "Haut", @@ -2064,7 +2064,7 @@ } }, "workspace.options.grid.params.use-default" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:225" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:225" ], "translations" : { "en" : "Use default", "fr" : "Utiliser la valeur par défaut", @@ -2073,7 +2073,7 @@ } }, "workspace.options.grid.params.width" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:200" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:200" ], "translations" : { "en" : "Width", "fr" : "Largeur", @@ -2082,7 +2082,7 @@ } }, "workspace.options.grid.row" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:135" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:135" ], "translations" : { "en" : "Rows", "fr" : "Lignes", @@ -2091,7 +2091,7 @@ } }, "workspace.options.grid.square" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:133" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:133" ], "translations" : { "en" : "Square", "fr" : "Carré", @@ -2100,7 +2100,7 @@ } }, "workspace.options.grid.title" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs:239" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:239" ], "translations" : { "en" : "Grid & Layouts", "fr" : "Grille & couches", @@ -2109,7 +2109,7 @@ } }, "workspace.options.group-fill" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/fill.cljs:51" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs:51" ], "translations" : { "en" : "Group fill", "fr" : null, @@ -2118,7 +2118,7 @@ } }, "workspace.options.group-stroke" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:70" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:70" ], "translations" : { "en" : "Group stroke", "fr" : null, @@ -2127,7 +2127,7 @@ } }, "workspace.options.navigate-to" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs:59" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:59" ], "translations" : { "en" : "Navigate to", "fr" : "Naviguer vers", @@ -2136,7 +2136,7 @@ } }, "workspace.options.none" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs:72" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:72" ], "translations" : { "en" : "None", "fr" : "Aucun", @@ -2145,7 +2145,7 @@ } }, "workspace.options.position" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/measures.cljs:146", "src/uxbox/main/ui/workspace/sidebar/options/frame.cljs:125" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs:146", "src/app/main/ui/workspace/sidebar/options/frame.cljs:125" ], "translations" : { "en" : "Position", "fr" : "Position", @@ -2154,7 +2154,7 @@ } }, "workspace.options.prototype" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options.cljs:76" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs:76" ], "translations" : { "en" : "Prototype", "fr" : "Prototype", @@ -2163,7 +2163,7 @@ } }, "workspace.options.radius" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/measures.cljs:188" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs:188" ], "translations" : { "en" : "Radius", "fr" : "Rayon", @@ -2172,7 +2172,7 @@ } }, "workspace.options.rotation" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/measures.cljs:165" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs:165" ], "translations" : { "en" : "Rotation", "fr" : "Rotation", @@ -2181,7 +2181,7 @@ } }, "workspace.options.select-a-shape" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs:53" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:53" ], "translations" : { "en" : "Select a shape, artboard or group to drag a connection to other artboard.", "fr" : "Sélectionnez une forme, un plan de travail ou un groupe pour faire glisser une connexion vers un autre plan de travail.", @@ -2190,7 +2190,7 @@ } }, "workspace.options.select-artboard" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs:65" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:65" ], "translations" : { "en" : "Select artboard", "fr" : "Sélectionner un plan de travail", @@ -2199,7 +2199,7 @@ } }, "workspace.options.selection-fill" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/fill.cljs:50" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs:50" ], "translations" : { "en" : "Selection fill", "fr" : null, @@ -2208,7 +2208,7 @@ } }, "workspace.options.selection-stroke" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:69" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:69" ], "translations" : { "en" : "Selection stroke", "fr" : null, @@ -2217,7 +2217,7 @@ } }, "workspace.options.size" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/measures.cljs:116", "src/uxbox/main/ui/workspace/sidebar/options/frame.cljs:98" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs:116", "src/app/main/ui/workspace/sidebar/options/frame.cljs:98" ], "translations" : { "en" : "Size", "fr" : "Taille", @@ -2226,7 +2226,7 @@ } }, "workspace.options.size-presets" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/frame.cljs:80" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame.cljs:80" ], "translations" : { "en" : "Size presets", "fr" : "Tailles prédéfinies", @@ -2235,7 +2235,7 @@ } }, "workspace.options.stroke" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:71" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:71" ], "translations" : { "en" : "Stroke", "fr" : "Bordure", @@ -2244,7 +2244,7 @@ } }, "workspace.options.stroke.center" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:144" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:144" ], "translations" : { "en" : "Center", "fr" : "Centre", @@ -2253,7 +2253,7 @@ } }, "workspace.options.stroke.dashed" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:154" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:154" ], "translations" : { "en" : "Dashed", "fr" : "Tiré", @@ -2262,7 +2262,7 @@ } }, "workspace.options.stroke.dotted" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:153" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:153" ], "translations" : { "en" : "Dotted", "fr" : "Pointillé", @@ -2271,7 +2271,7 @@ } }, "workspace.options.stroke.inner" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:145" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:145" ], "translations" : { "en" : "Inside", "fr" : "Intérieur", @@ -2280,7 +2280,7 @@ } }, "workspace.options.stroke.mixed" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:155" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:155" ], "translations" : { "en" : "Mixed", "fr" : "Mixte", @@ -2289,7 +2289,7 @@ } }, "workspace.options.stroke.outer" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:146" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:146" ], "translations" : { "en" : "Outside", "fr" : "Extérieur", @@ -2298,7 +2298,7 @@ } }, "workspace.options.stroke.solid" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs:152" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:152" ], "translations" : { "en" : "Solid", "fr" : "Solide", @@ -2307,7 +2307,7 @@ } }, "workspace.options.text-options.align-bottom" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:284" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:284" ], "translations" : { "en" : "Align bottom", "fr" : "Aligner en bas", @@ -2316,7 +2316,7 @@ } }, "workspace.options.text-options.align-center" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:183" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:183" ], "translations" : { "en" : "Align center", "fr" : "Aligner au centre", @@ -2325,7 +2325,7 @@ } }, "workspace.options.text-options.align-justify" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:193" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:193" ], "translations" : { "en" : "Justify", "fr" : "Justifier", @@ -2334,7 +2334,7 @@ } }, "workspace.options.text-options.align-left" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:178" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:178" ], "translations" : { "en" : "Align left", "fr" : "Aligner à gauche", @@ -2343,7 +2343,7 @@ } }, "workspace.options.text-options.align-middle" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:279" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:279" ], "translations" : { "en" : "Align middle", "fr" : "Aligner au milieu", @@ -2352,7 +2352,7 @@ } }, "workspace.options.text-options.align-right" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:188" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:188" ], "translations" : { "en" : "Align right", "fr" : "Aligner à droite", @@ -2361,7 +2361,7 @@ } }, "workspace.options.text-options.align-top" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:274" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:274" ], "translations" : { "en" : "Align top", "fr" : "Aligner en haut", @@ -2370,7 +2370,7 @@ } }, "workspace.options.text-options.decoration" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:303" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:303" ], "translations" : { "en" : "Decoration", "fr" : "Décoration", @@ -2379,7 +2379,7 @@ } }, "workspace.options.text-options.letter-spacing" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:232" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:232" ], "translations" : { "en" : "Letter Spacing", "fr" : "Espacement de caractères", @@ -2388,7 +2388,7 @@ } }, "workspace.options.text-options.line-height" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:219" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:219" ], "translations" : { "en" : "Line height", "fr" : "Hauteur de ligne", @@ -2397,7 +2397,7 @@ } }, "workspace.options.text-options.lowercase" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:350" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:350" ], "translations" : { "en" : "Lowercase", "fr" : "Minuscule", @@ -2406,7 +2406,7 @@ } }, "workspace.options.text-options.none" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:306", "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:340" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:306", "src/app/main/ui/workspace/sidebar/options/text.cljs:340" ], "translations" : { "en" : "None", "fr" : "Aucune", @@ -2415,7 +2415,7 @@ } }, "workspace.options.text-options.strikethrough" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:318" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:318" ], "translations" : { "en" : "Strikethrough", "fr" : "Barré", @@ -2424,7 +2424,7 @@ } }, "workspace.options.text-options.text-case" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:337" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:337" ], "translations" : { "en" : "Case", "fr" : "Casse", @@ -2433,7 +2433,7 @@ } }, "workspace.options.text-options.title" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:375" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:375" ], "translations" : { "en" : "Text", "fr" : "Texte", @@ -2442,7 +2442,7 @@ } }, "workspace.options.text-options.title-group" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:374" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:374" ], "translations" : { "en" : "Group text", "ru" : "Текст группы", @@ -2450,7 +2450,7 @@ } }, "workspace.options.text-options.title-selection" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:373" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:373" ], "translations" : { "en" : "Selection text", "ru" : "Выбранный текст", @@ -2458,7 +2458,7 @@ } }, "workspace.options.text-options.titlecase" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:355" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:355" ], "translations" : { "en" : "Titlecase", "fr" : "Titre", @@ -2467,7 +2467,7 @@ } }, "workspace.options.text-options.underline" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:312" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:312" ], "translations" : { "en" : "Underline", "fr" : "Souligner", @@ -2476,7 +2476,7 @@ } }, "workspace.options.text-options.uppercase" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:345" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:345" ], "translations" : { "en" : "Uppercase", "fr" : "Majuscule", @@ -2485,7 +2485,7 @@ } }, "workspace.options.text-options.vertical-align" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/text.cljs:271" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:271" ], "translations" : { "en" : "Vertical align", "fr" : "Alignement vertical", @@ -2494,7 +2494,7 @@ } }, "workspace.options.use-play-button" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs:55" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:55" ], "translations" : { "en" : "Use the play button at the header to run the prototype view.", "fr" : "Utilisez le bouton de lecture dans l'en-tête pour exécuter la vue du prototype.", @@ -2512,7 +2512,7 @@ "unused" : true }, "workspace.sidebar.sitemap" : { - "used-in" : [ "src/uxbox/main/ui/workspace/sidebar/sitemap.cljs:150" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:150" ], "translations" : { "en" : "Pages", "fr" : "Pages", @@ -2521,7 +2521,7 @@ } }, "workspace.toolbar.assets" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:99" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:99" ], "translations" : { "en" : "Assets (Ctrl + I)", "fr" : "", @@ -2530,7 +2530,7 @@ } }, "workspace.toolbar.circle" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:63" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:63" ], "translations" : { "en" : "Circle (E)", "fr" : "Cercle (E)", @@ -2539,7 +2539,7 @@ } }, "workspace.toolbar.color-palette" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:107" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:107" ], "translations" : { "en" : "Color Palette (---)", "fr" : "Palette de couleurs (---)", @@ -2548,7 +2548,7 @@ } }, "workspace.toolbar.curve" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:82" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:82" ], "translations" : { "en" : "Curve", "fr" : "Courbe", @@ -2557,7 +2557,7 @@ } }, "workspace.toolbar.frame" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:53" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:53" ], "translations" : { "en" : "Artboard (A)", "fr" : "Plan de travail (A)", @@ -2566,7 +2566,7 @@ } }, "workspace.toolbar.image" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:73" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:73" ], "translations" : { "en" : "Image (I)", "fr" : "Image (I)", @@ -2584,7 +2584,7 @@ "unused" : true }, "workspace.toolbar.path" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:87" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:87" ], "translations" : { "en" : "Path", "fr" : "Chemin", @@ -2593,7 +2593,7 @@ } }, "workspace.toolbar.rect" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:58" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:58" ], "translations" : { "en" : "Box (B)", "fr" : "Boîte (B)", @@ -2602,7 +2602,7 @@ } }, "workspace.toolbar.text" : { - "used-in" : [ "src/uxbox/main/ui/workspace/left_toolbar.cljs:68" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:68" ], "translations" : { "en" : "Text (T)", "fr" : "Texte (T)", @@ -2611,7 +2611,7 @@ } }, "workspace.viewport.click-to-close-path" : { - "used-in" : [ "src/uxbox/main/ui/workspace/drawarea.cljs:59" ], + "used-in" : [ "src/app/main/ui/workspace/drawarea.cljs:59" ], "translations" : { "en" : "Click to close the path", "fr" : "Cliquez pour fermer le chemin", diff --git a/frontend/resources/styles/main-default.scss b/frontend/resources/styles/main-default.scss index 627e2165d..10410d673 100644 --- a/frontend/resources/styles/main-default.scss +++ b/frontend/resources/styles/main-default.scss @@ -5,7 +5,7 @@ // Copyright (c) 2016 Andrey Antukh // Copyright (c) 2016 Juan de la Cruz -// UXBOX MAIN STYLES +// app MAIN STYLES //################################################# // //################################################# diff --git a/frontend/resources/styles/main/partials/sidebar.scss b/frontend/resources/styles/main/partials/sidebar.scss index 41f26a4c6..9946d7f1a 100644 --- a/frontend/resources/styles/main/partials/sidebar.scss +++ b/frontend/resources/styles/main/partials/sidebar.scss @@ -6,7 +6,7 @@ // Copyright (c) 2015-2020 Juan de la Cruz $width-settings-bar: 15rem; - // This width is also used in update-viewport-size at frontend/src/uxbox/main/data/workspace.cljs + // This width is also used in update-viewport-size at frontend/src/app/main/data/workspace.cljs .settings-bar { background-color: $color-gray-50; diff --git a/frontend/resources/templates/index.mustache b/frontend/resources/templates/index.mustache index ec4ef388f..4eb36d586 100644 --- a/frontend/resources/templates/index.mustache +++ b/frontend/resources/templates/index.mustache @@ -3,7 +3,7 @@ - UXBOX - The Open-Source prototyping tool + app - The Open-Source prototyping tool diff --git a/frontend/shadow-cljs.edn b/frontend/shadow-cljs.edn index 6da3a14bf..29be0b91c 100644 --- a/frontend/shadow-cljs.edn +++ b/frontend/shadow-cljs.edn @@ -13,10 +13,10 @@ :modules {:shared {:entries []} - :main {:entries [uxbox.main] + :main {:entries [app.main] :depends-on #{:shared} - :init-fn uxbox.main/init} - :worker {:entries [uxbox.worker] + :init-fn app.main/init} + :worker {:entries [app.worker] :web-worker true :depends-on #{:shared}}} :compiler-options @@ -35,7 +35,7 @@ :tests {:target :node-test :output-to "target/tests.js" - :ns-regexp "^uxbox.test-" + :ns-regexp "^app.test-" :autorun true}}} diff --git a/frontend/src/uxbox/config.cljs b/frontend/src/app/config.cljs similarity index 94% rename from frontend/src/uxbox/config.cljs rename to frontend/src/app/config.cljs index dc1803b1c..b593919a6 100644 --- a/frontend/src/uxbox/config.cljs +++ b/frontend/src/app/config.cljs @@ -7,8 +7,8 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.config - (:require [uxbox.util.object :as obj])) +(ns app.config + (:require [app.util.object :as obj])) (this-as global (def default-language "en") diff --git a/frontend/src/uxbox/main.cljs b/frontend/src/app/main.cljs similarity index 78% rename from frontend/src/uxbox/main.cljs rename to frontend/src/app/main.cljs index aaf64adb8..6759e6510 100644 --- a/frontend/src/uxbox/main.cljs +++ b/frontend/src/app/main.cljs @@ -7,26 +7,26 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main +(ns app.main (:require [hashp.core :include-macros true] [cljs.spec.alpha :as s] [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.common.uuid :as uuid] - [uxbox.main.data.auth :refer [logout]] - [uxbox.main.data.users :as udu] - [uxbox.main.store :as st] - [uxbox.main.ui :as ui] - [uxbox.main.ui.modal :refer [modal]] - [uxbox.main.worker] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n] - [uxbox.util.theme :as theme] - [uxbox.util.router :as rt] - [uxbox.util.object :as obj] - [uxbox.util.storage :refer [storage]] - [uxbox.util.timers :as ts])) + [app.common.uuid :as uuid] + [app.main.data.auth :refer [logout]] + [app.main.data.users :as udu] + [app.main.store :as st] + [app.main.ui :as ui] + [app.main.ui.modal :refer [modal]] + [app.main.worker] + [app.util.dom :as dom] + [app.util.i18n :as i18n] + [app.util.theme :as theme] + [app.util.router :as rt] + [app.util.object :as obj] + [app.util.storage :refer [storage]] + [app.util.timers :as ts])) (declare reinit) diff --git a/frontend/src/uxbox/main/constants.cljs b/frontend/src/app/main/constants.cljs similarity index 97% rename from frontend/src/uxbox/main/constants.cljs rename to frontend/src/app/main/constants.cljs index 0895a18cc..ba2b7b531 100644 --- a/frontend/src/uxbox/main/constants.cljs +++ b/frontend/src/app/main/constants.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2015-2016 Andrey Antukh -(ns uxbox.main.constants) +(ns app.main.constants) (def viewport-width 4000) (def viewport-height 4000) diff --git a/frontend/src/uxbox/main/data/auth.cljs b/frontend/src/app/main/data/auth.cljs similarity index 93% rename from frontend/src/uxbox/main/data/auth.cljs rename to frontend/src/app/main/data/auth.cljs index 186c130e7..2a235b79f 100644 --- a/frontend/src/uxbox/main/data/auth.cljs +++ b/frontend/src/app/main/data/auth.cljs @@ -7,19 +7,19 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.auth +(ns app.main.data.auth (:require [cljs.spec.alpha :as s] [beicon.core :as rx] [potok.core :as ptk] - [uxbox.common.spec :as us] - [uxbox.main.repo :as rp] - [uxbox.main.store :refer [initial-state]] - [uxbox.main.data.users :as du] - [uxbox.main.data.messages :as dm] - [uxbox.util.router :as rt] - [uxbox.util.i18n :as i18n :refer [tr]] - [uxbox.util.storage :refer [storage]])) + [app.common.spec :as us] + [app.main.repo :as rp] + [app.main.store :refer [initial-state]] + [app.main.data.users :as du] + [app.main.data.messages :as dm] + [app.util.router :as rt] + [app.util.i18n :as i18n :refer [tr]] + [app.util.storage :refer [storage]])) (s/def ::email ::us/email) (s/def ::password string?) @@ -156,7 +156,7 @@ (def request-account-deletion (letfn [(on-error [{:keys [code] :as error}] - (if (= :uxbox.services.mutations.profile/owner-teams-with-people code) + (if (= :app.services.mutations.profile/owner-teams-with-people code) (let [msg (tr "settings.notifications.profile-deletion-not-allowed")] (rx/of (dm/error msg))) (rx/empty)))] diff --git a/frontend/src/uxbox/main/data/colors.cljs b/frontend/src/app/main/data/colors.cljs similarity index 90% rename from frontend/src/uxbox/main/data/colors.cljs rename to frontend/src/app/main/data/colors.cljs index a4df5b8b7..81949921d 100644 --- a/frontend/src/uxbox/main/data/colors.cljs +++ b/frontend/src/app/main/data/colors.cljs @@ -4,21 +4,21 @@ ;; ;; Copyright (c) 2015-2019 Andrey Antukh -(ns uxbox.main.data.colors +(ns app.main.data.colors (:require [cljs.spec.alpha :as s] [beicon.core :as rx] [clojure.set :as set] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.spec :as us] - [uxbox.main.repo :as rp] - [uxbox.main.store :as st] - [uxbox.util.color :as color] - [uxbox.util.i18n :refer [tr]] - [uxbox.util.router :as rt] - [uxbox.util.time :as dt] - [uxbox.common.uuid :as uuid])) + [app.common.data :as d] + [app.common.spec :as us] + [app.main.repo :as rp] + [app.main.store :as st] + [app.util.color :as color] + [app.util.i18n :refer [tr]] + [app.util.router :as rt] + [app.util.time :as dt] + [app.common.uuid :as uuid])) (declare create-color-result) diff --git a/frontend/src/uxbox/main/data/dashboard.cljs b/frontend/src/app/main/data/dashboard.cljs similarity index 97% rename from frontend/src/uxbox/main/data/dashboard.cljs rename to frontend/src/app/main/data/dashboard.cljs index 183bc5aba..3246c29d9 100644 --- a/frontend/src/uxbox/main/data/dashboard.cljs +++ b/frontend/src/app/main/data/dashboard.cljs @@ -4,20 +4,20 @@ ;; ;; Copyright (c) 2015-2016 Andrey Antukh -(ns uxbox.main.data.dashboard +(ns app.main.data.dashboard (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [cuerdas.core :as str] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.pages :as cp] - [uxbox.common.spec :as us] - [uxbox.main.repo :as rp] - [uxbox.util.router :as rt] - [uxbox.util.time :as dt] - [uxbox.util.timers :as ts] - [uxbox.common.uuid :as uuid])) + [app.common.data :as d] + [app.common.pages :as cp] + [app.common.spec :as us] + [app.main.repo :as rp] + [app.util.router :as rt] + [app.util.time :as dt] + [app.util.timers :as ts] + [app.common.uuid :as uuid])) ;; --- Specs diff --git a/frontend/src/uxbox/main/data/history.cljs b/frontend/src/app/main/data/history.cljs similarity index 97% rename from frontend/src/uxbox/main/data/history.cljs rename to frontend/src/app/main/data/history.cljs index 6112736fd..6cce00edb 100644 --- a/frontend/src/uxbox/main/data/history.cljs +++ b/frontend/src/app/main/data/history.cljs @@ -4,15 +4,15 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.main.data.history +(ns app.main.data.history (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [potok.core :as ptk] - [uxbox.common.spec :as us] - [uxbox.common.pages :as cp] - [uxbox.main.repo :as rp] - [uxbox.util.data :refer [replace-by-id index-by]])) + [app.common.spec :as us] + [app.common.pages :as cp] + [app.main.repo :as rp] + [app.util.data :refer [replace-by-id index-by]])) ;; --- Schema diff --git a/frontend/src/uxbox/main/data/media.cljs b/frontend/src/app/main/data/media.cljs similarity index 78% rename from frontend/src/uxbox/main/data/media.cljs rename to frontend/src/app/main/data/media.cljs index 9b01ef506..dd31763ec 100644 --- a/frontend/src/uxbox/main/data/media.cljs +++ b/frontend/src/app/main/data/media.cljs @@ -4,24 +4,24 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.main.data.media +(ns app.main.data.media (:require [cljs.spec.alpha :as s] [cuerdas.core :as str] [beicon.core :as rx] [potok.core :as ptk] - [uxbox.common.spec :as us] - [uxbox.common.data :as d] - [uxbox.common.media :as cm] - [uxbox.main.data.messages :as dm] - [uxbox.main.store :as st] - [uxbox.main.repo :as rp] - [uxbox.util.i18n :refer [tr]] - [uxbox.util.router :as rt] - [uxbox.common.uuid :as uuid] - [uxbox.util.time :as ts] - [uxbox.util.router :as r] - [uxbox.util.files :as files])) + [app.common.spec :as us] + [app.common.data :as d] + [app.common.media :as cm] + [app.main.data.messages :as dm] + [app.main.store :as st] + [app.main.repo :as rp] + [app.util.i18n :refer [tr]] + [app.util.router :as rt] + [app.common.uuid :as uuid] + [app.util.time :as ts] + [app.util.router :as r] + [app.util.files :as files])) ;; --- Specs diff --git a/frontend/src/uxbox/main/data/messages.cljs b/frontend/src/app/main/data/messages.cljs similarity index 91% rename from frontend/src/uxbox/main/data/messages.cljs rename to frontend/src/app/main/data/messages.cljs index 5e6fbbf3b..aaeb60464 100644 --- a/frontend/src/uxbox/main/data/messages.cljs +++ b/frontend/src/app/main/data/messages.cljs @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.messages +(ns app.main.data.messages (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.exceptions :as ex] - [uxbox.common.pages :as cp] - [uxbox.common.spec :as us] - [uxbox.config :as cfg])) + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.common.pages :as cp] + [app.common.spec :as us] + [app.config :as cfg])) (declare hide) (declare show) diff --git a/frontend/src/uxbox/main/data/users.cljs b/frontend/src/app/main/data/users.cljs similarity index 92% rename from frontend/src/uxbox/main/data/users.cljs rename to frontend/src/app/main/data/users.cljs index 732a42988..1ade0ca6c 100644 --- a/frontend/src/uxbox/main/data/users.cljs +++ b/frontend/src/app/main/data/users.cljs @@ -4,23 +4,23 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.main.data.users +(ns app.main.data.users (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [cuerdas.core :as str] [potok.core :as ptk] - [uxbox.common.spec :as us] - [uxbox.config :as cfg] - [uxbox.main.store :as st] - [uxbox.main.repo :as rp] - [uxbox.main.data.messages :as dm] - [uxbox.main.data.media :as di] - [uxbox.util.router :as rt] - [uxbox.util.i18n :as i18n :refer [tr]] - [uxbox.util.storage :refer [storage]] - [uxbox.util.avatars :as avatars] - [uxbox.util.theme :as theme])) + [app.common.spec :as us] + [app.config :as cfg] + [app.main.store :as st] + [app.main.repo :as rp] + [app.main.data.messages :as dm] + [app.main.data.media :as di] + [app.util.router :as rt] + [app.util.i18n :as i18n :refer [tr]] + [app.util.storage :refer [storage]] + [app.util.avatars :as avatars] + [app.util.theme :as theme])) ;; --- Common Specs diff --git a/frontend/src/uxbox/main/data/viewer.cljs b/frontend/src/app/main/data/viewer.cljs similarity index 95% rename from frontend/src/uxbox/main/data/viewer.cljs rename to frontend/src/app/main/data/viewer.cljs index d49947e8c..efb7810b0 100644 --- a/frontend/src/uxbox/main/data/viewer.cljs +++ b/frontend/src/app/main/data/viewer.cljs @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.viewer +(ns app.main.data.viewer (:require [cljs.spec.alpha :as s] [beicon.core :as rx] [potok.core :as ptk] - [uxbox.main.constants :as c] - [uxbox.main.repo :as rp] - [uxbox.main.store :as st] - [uxbox.common.spec :as us] - [uxbox.common.pages :as cp] - [uxbox.common.data :as d] - [uxbox.common.exceptions :as ex] - [uxbox.util.router :as rt] - [uxbox.common.uuid :as uuid])) + [app.main.constants :as c] + [app.main.repo :as rp] + [app.main.store :as st] + [app.common.spec :as us] + [app.common.pages :as cp] + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.util.router :as rt] + [app.common.uuid :as uuid])) ;; --- Specs diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs similarity index 98% rename from frontend/src/uxbox/main/data/workspace.cljs rename to frontend/src/app/main/data/workspace.cljs index d20f3f226..f586c0a93 100644 --- a/frontend/src/uxbox/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -7,38 +7,38 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace +(ns app.main.data.workspace (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [clojure.set :as set] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.exceptions :as ex] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.config :as cfg] - [uxbox.main.constants :as c] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.data.workspace.notifications :as dwn] - [uxbox.main.data.workspace.persistence :as dwp] - [uxbox.main.data.workspace.texts :as dwtxt] - [uxbox.main.data.workspace.transforms :as dwt] - [uxbox.main.data.workspace.selection :as dws] - [uxbox.main.repo :as rp] - [uxbox.main.store :as st] - [uxbox.main.streams :as ms] - [uxbox.main.worker :as uw] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.math :as mth] - [uxbox.util.timers :as ts] - [uxbox.util.router :as rt] - [uxbox.util.transit :as t] - [uxbox.util.webapi :as wapi])) + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.main.constants :as c] + [app.main.data.workspace.common :as dwc] + [app.main.data.workspace.notifications :as dwn] + [app.main.data.workspace.persistence :as dwp] + [app.main.data.workspace.texts :as dwtxt] + [app.main.data.workspace.transforms :as dwt] + [app.main.data.workspace.selection :as dws] + [app.main.repo :as rp] + [app.main.store :as st] + [app.main.streams :as ms] + [app.main.worker :as uw] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom] + [app.common.math :as mth] + [app.util.timers :as ts] + [app.util.router :as rt] + [app.util.transit :as t] + [app.util.webapi :as wapi])) ;; --- Specs diff --git a/frontend/src/uxbox/main/data/workspace/common.cljs b/frontend/src/app/main/data/workspace/common.cljs similarity index 97% rename from frontend/src/uxbox/main/data/workspace/common.cljs rename to frontend/src/app/main/data/workspace/common.cljs index d81cb608a..977ad1b60 100644 --- a/frontend/src/uxbox/main/data/workspace/common.cljs +++ b/frontend/src/app/main/data/workspace/common.cljs @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.common +(ns app.main.data.workspace.common (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [clojure.set :as set] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.main.worker :as uw] - [uxbox.util.timers :as ts] - [uxbox.common.geom.shapes :as geom])) + [app.common.data :as d] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.main.worker :as uw] + [app.util.timers :as ts] + [app.common.geom.shapes :as geom])) ;; --- Protocols diff --git a/frontend/src/uxbox/main/data/workspace/drawing.cljs b/frontend/src/app/main/data/workspace/drawing.cljs similarity index 96% rename from frontend/src/uxbox/main/data/workspace/drawing.cljs rename to frontend/src/app/main/data/workspace/drawing.cljs index f823ddfa7..bc83b702f 100644 --- a/frontend/src/uxbox/main/data/workspace/drawing.cljs +++ b/frontend/src/app/main/data/workspace/drawing.cljs @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.drawing +(ns app.main.data.workspace.drawing "Drawing interactions." (:require [beicon.core :as rx] [potok.core :as ptk] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.uuid :as uuid] - [uxbox.main.data.workspace :as dw] - [uxbox.main.snap :as snap] - [uxbox.main.streams :as ms] - [uxbox.util.geom.path :as path])) + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.uuid :as uuid] + [app.main.data.workspace :as dw] + [app.main.snap :as snap] + [app.main.streams :as ms] + [app.util.geom.path :as path])) (declare handle-drawing) (declare handle-drawing-generic) diff --git a/frontend/src/uxbox/main/data/workspace/grid.cljs b/frontend/src/app/main/data/workspace/grid.cljs similarity index 95% rename from frontend/src/uxbox/main/data/workspace/grid.cljs rename to frontend/src/app/main/data/workspace/grid.cljs index 57e1b85bd..11f2f10db 100644 --- a/frontend/src/uxbox/main/data/workspace/grid.cljs +++ b/frontend/src/app/main/data/workspace/grid.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.grid +(ns app.main.data.workspace.grid (:require [beicon.core :as rx] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.spec :as us] - [uxbox.main.data.workspace.common :as dwc])) + [app.common.data :as d] + [app.common.spec :as us] + [app.main.data.workspace.common :as dwc])) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Grid diff --git a/frontend/src/uxbox/main/data/workspace/notifications.cljs b/frontend/src/app/main/data/workspace/notifications.cljs similarity index 92% rename from frontend/src/uxbox/main/data/workspace/notifications.cljs rename to frontend/src/app/main/data/workspace/notifications.cljs index 3ff79680e..868bca2ce 100644 --- a/frontend/src/uxbox/main/data/workspace/notifications.cljs +++ b/frontend/src/app/main/data/workspace/notifications.cljs @@ -7,24 +7,24 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.notifications +(ns app.main.data.workspace.notifications (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [clojure.set :as set] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.spec :as us] - [uxbox.main.repo :as rp] - [uxbox.main.store :as st] - [uxbox.main.streams :as ms] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.data.workspace.persistence :as dwp] - [uxbox.util.avatars :as avatars] - [uxbox.common.geom.point :as gpt] - [uxbox.util.time :as dt] - [uxbox.util.transit :as t] - [uxbox.util.websockets :as ws])) + [app.common.data :as d] + [app.common.spec :as us] + [app.main.repo :as rp] + [app.main.store :as st] + [app.main.streams :as ms] + [app.main.data.workspace.common :as dwc] + [app.main.data.workspace.persistence :as dwp] + [app.util.avatars :as avatars] + [app.common.geom.point :as gpt] + [app.util.time :as dt] + [app.util.transit :as t] + [app.util.websockets :as ws])) (declare handle-presence) (declare handle-pointer-update) diff --git a/frontend/src/uxbox/main/data/workspace/persistence.cljs b/frontend/src/app/main/data/workspace/persistence.cljs similarity index 96% rename from frontend/src/uxbox/main/data/workspace/persistence.cljs rename to frontend/src/app/main/data/workspace/persistence.cljs index d65bf157b..1cd9f9e36 100644 --- a/frontend/src/uxbox/main/data/workspace/persistence.cljs +++ b/frontend/src/app/main/data/workspace/persistence.cljs @@ -7,27 +7,27 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.persistence +(ns app.main.data.workspace.persistence (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.media :as cm] - [uxbox.common.geom.point :as gpt] - [uxbox.common.pages :as cp] - [uxbox.common.spec :as us] - [uxbox.main.data.dashboard :as dd] - [uxbox.main.data.messages :as dm] - [uxbox.main.data.media :as di] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.repo :as rp] - [uxbox.main.store :as st] - [uxbox.util.i18n :as i18n :refer [tr]] - [uxbox.util.object :as obj] - [uxbox.util.router :as rt] - [uxbox.util.time :as dt] - [uxbox.util.transit :as t])) + [app.common.data :as d] + [app.common.media :as cm] + [app.common.geom.point :as gpt] + [app.common.pages :as cp] + [app.common.spec :as us] + [app.main.data.dashboard :as dd] + [app.main.data.messages :as dm] + [app.main.data.media :as di] + [app.main.data.workspace.common :as dwc] + [app.main.repo :as rp] + [app.main.store :as st] + [app.util.i18n :as i18n :refer [tr]] + [app.util.object :as obj] + [app.util.router :as rt] + [app.util.time :as dt] + [app.util.transit :as t])) (declare persist-changes) (declare update-selection-index) diff --git a/frontend/src/uxbox/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs similarity index 95% rename from frontend/src/uxbox/main/data/workspace/selection.cljs rename to frontend/src/app/main/data/workspace/selection.cljs index 4c5593c29..fc5772c6d 100644 --- a/frontend/src/uxbox/main/data/workspace/selection.cljs +++ b/frontend/src/app/main/data/workspace/selection.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.selection +(ns app.main.data.workspace.selection (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.math :as mth] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.streams :as ms] - [uxbox.main.worker :as uw])) + [app.common.data :as d] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom] + [app.common.math :as mth] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.main.data.workspace.common :as dwc] + [app.main.streams :as ms] + [app.main.worker :as uw])) (s/def ::set-of-uuid (s/every uuid? :kind set?)) diff --git a/frontend/src/uxbox/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs similarity index 96% rename from frontend/src/uxbox/main/data/workspace/texts.cljs rename to frontend/src/app/main/data/workspace/texts.cljs index 2c00e331f..6054fd7aa 100644 --- a/frontend/src/uxbox/main/data/workspace/texts.cljs +++ b/frontend/src/app/main/data/workspace/texts.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.texts +(ns app.main.data.workspace.texts (:require ["slate" :as slate :refer [Editor Node Transforms Text]] ["slate-react" :as rslate] @@ -16,10 +16,10 @@ [clojure.walk :as walk] [goog.object :as gobj] [potok.core :as ptk] - [uxbox.common.geom.shapes :as geom] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.fonts :as fonts] - [uxbox.util.object :as obj])) + [app.common.geom.shapes :as geom] + [app.main.data.workspace.common :as dwc] + [app.main.fonts :as fonts] + [app.util.object :as obj])) (defn create-editor [] diff --git a/frontend/src/uxbox/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs similarity index 97% rename from frontend/src/uxbox/main/data/workspace/transforms.cljs rename to frontend/src/app/main/data/workspace/transforms.cljs index 57313fd38..1e05fe47e 100644 --- a/frontend/src/uxbox/main/data/workspace/transforms.cljs +++ b/frontend/src/app/main/data/workspace/transforms.cljs @@ -7,26 +7,26 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.data.workspace.transforms +(ns app.main.data.workspace.transforms "Events related with shapes transformations" (:require [beicon.core :as rx] [cljs.spec.alpha :as s] [beicon.core :as rx] [potok.core :as ptk] - [uxbox.common.data :as d] - [uxbox.common.spec :as us] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.data.workspace.selection :as dws] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.streams :as ms] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as gsh] - [uxbox.main.snap :as snap])) + [app.common.data :as d] + [app.common.spec :as us] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.main.data.workspace.common :as dwc] + [app.main.data.workspace.selection :as dws] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.streams :as ms] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as gsh] + [app.main.snap :as snap])) ;; -- Declarations diff --git a/frontend/src/uxbox/main/exports.cljs b/frontend/src/app/main/exports.cljs similarity index 89% rename from frontend/src/uxbox/main/exports.cljs rename to frontend/src/app/main/exports.cljs index 7a0bcdec1..1b2770f39 100644 --- a/frontend/src/uxbox/main/exports.cljs +++ b/frontend/src/app/main/exports.cljs @@ -7,25 +7,25 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.exports +(ns app.main.exports "The main logic for SVG export functionality." (:require [rumext.alpha :as mf] - [uxbox.common.uuid :as uuid] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.math :as mth] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.matrix :as gmt] - [uxbox.main.ui.shapes.frame :as frame] - [uxbox.main.ui.shapes.circle :as circle] - [uxbox.main.ui.shapes.icon :as icon] - [uxbox.main.ui.shapes.image :as image] - [uxbox.main.ui.shapes.path :as path] - [uxbox.main.ui.shapes.rect :as rect] - [uxbox.main.ui.shapes.text :as text] - [uxbox.main.ui.shapes.group :as group])) + [app.common.uuid :as uuid] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.math :as mth] + [app.common.geom.shapes :as geom] + [app.common.geom.point :as gpt] + [app.common.geom.matrix :as gmt] + [app.main.ui.shapes.frame :as frame] + [app.main.ui.shapes.circle :as circle] + [app.main.ui.shapes.icon :as icon] + [app.main.ui.shapes.image :as image] + [app.main.ui.shapes.path :as path] + [app.main.ui.shapes.rect :as rect] + [app.main.ui.shapes.text :as text] + [app.main.ui.shapes.group :as group])) (def ^:private default-color "#E8E9EA") ;; $color-canvas diff --git a/frontend/src/uxbox/main/fonts.clj b/frontend/src/app/main/fonts.clj similarity index 98% rename from frontend/src/uxbox/main/fonts.clj rename to frontend/src/app/main/fonts.clj index f1d510ad3..4c5d35d94 100644 --- a/frontend/src/uxbox/main/fonts.clj +++ b/frontend/src/app/main/fonts.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.fonts +(ns app.main.fonts "A fonts loading macros." (:require [cuerdas.core :as str] diff --git a/frontend/src/uxbox/main/fonts.cljs b/frontend/src/app/main/fonts.cljs similarity index 97% rename from frontend/src/uxbox/main/fonts.cljs rename to frontend/src/app/main/fonts.cljs index 5e7abf581..30f9a9b40 100644 --- a/frontend/src/uxbox/main/fonts.cljs +++ b/frontend/src/app/main/fonts.cljs @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.fonts +(ns app.main.fonts "Fonts management and loading logic." - (:require-macros [uxbox.main.fonts :refer [preload-gfonts]]) + (:require-macros [app.main.fonts :refer [preload-gfonts]]) (:require [beicon.core :as rx] [promesa.core :as p] [okulary.core :as l] [cuerdas.core :as str] - [uxbox.util.dom :as dom] - [uxbox.util.timers :as ts] - [uxbox.common.data :as d] + [app.util.dom :as dom] + [app.util.timers :as ts] + [app.common.data :as d] [clojure.set :as set])) (def google-fonts diff --git a/frontend/src/uxbox/main/refs.cljs b/frontend/src/app/main/refs.cljs similarity index 96% rename from frontend/src/uxbox/main/refs.cljs rename to frontend/src/app/main/refs.cljs index 916e88778..efb2c0c1d 100644 --- a/frontend/src/uxbox/main/refs.cljs +++ b/frontend/src/app/main/refs.cljs @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.refs +(ns app.main.refs "A collection of derived refs." (:require [beicon.core :as rx] [okulary.core :as l] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.uuid :as uuid] - [uxbox.main.constants :as c] - [uxbox.main.store :as st])) + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.uuid :as uuid] + [app.main.constants :as c] + [app.main.store :as st])) ;; ---- Global refs diff --git a/frontend/src/uxbox/main/repo.cljs b/frontend/src/app/main/repo.cljs similarity index 97% rename from frontend/src/uxbox/main/repo.cljs rename to frontend/src/app/main/repo.cljs index bc32f9466..02577b181 100644 --- a/frontend/src/uxbox/main/repo.cljs +++ b/frontend/src/app/main/repo.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.repo +(ns app.main.repo (:require [beicon.core :as rx] [cuerdas.core :as str] - [uxbox.config :as cfg] - [uxbox.util.http-api :as http])) + [app.config :as cfg] + [app.util.http-api :as http])) (defn- handle-response [response] diff --git a/frontend/src/uxbox/main/snap.cljs b/frontend/src/app/main/snap.cljs similarity index 96% rename from frontend/src/uxbox/main/snap.cljs rename to frontend/src/app/main/snap.cljs index 5c2e576f7..b7e9dffed 100644 --- a/frontend/src/uxbox/main/snap.cljs +++ b/frontend/src/app/main/snap.cljs @@ -7,18 +7,18 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.snap +(ns app.main.snap (:require [clojure.set :as set] [beicon.core :as rx] - [uxbox.common.uuid :refer [zero]] - [uxbox.common.math :as mth] - [uxbox.common.data :as d] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as gsh] - [uxbox.main.worker :as uw] - [uxbox.main.refs :as refs] - [uxbox.util.geom.snap-points :as sp])) + [app.common.uuid :refer [zero]] + [app.common.math :as mth] + [app.common.data :as d] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as gsh] + [app.main.worker :as uw] + [app.main.refs :as refs] + [app.util.geom.snap-points :as sp])) (def ^:private snap-accuracy 5) (def ^:private snap-distance-accuracy 10) diff --git a/frontend/src/uxbox/main/store.cljs b/frontend/src/app/main/store.cljs similarity index 92% rename from frontend/src/uxbox/main/store.cljs rename to frontend/src/app/main/store.cljs index 5512e9fc3..de7ca0bd9 100644 --- a/frontend/src/uxbox/main/store.cljs +++ b/frontend/src/app/main/store.cljs @@ -4,14 +4,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.store +(ns app.main.store (:require [beicon.core :as rx] [okulary.core :as l] [potok.core :as ptk] - [uxbox.common.uuid :as uuid] - [uxbox.util.storage :refer [storage]] - [uxbox.util.debug :refer [debug? logjs]])) + [app.common.uuid :as uuid] + [app.util.storage :refer [storage]] + [app.util.debug :refer [debug? logjs]])) (enable-console-print!) diff --git a/frontend/src/uxbox/main/streams.cljs b/frontend/src/app/main/streams.cljs similarity index 96% rename from frontend/src/uxbox/main/streams.cljs rename to frontend/src/app/main/streams.cljs index b8407b56b..cc5c720c9 100644 --- a/frontend/src/uxbox/main/streams.cljs +++ b/frontend/src/app/main/streams.cljs @@ -4,13 +4,13 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.main.streams +(ns app.main.streams "User interaction events and streams." (:require [beicon.core :as rx] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.common.geom.point :as gpt])) + [app.main.store :as st] + [app.main.refs :as refs] + [app.common.geom.point :as gpt])) ;; --- User Events diff --git a/frontend/src/uxbox/main/ui.cljs b/frontend/src/app/main/ui.cljs similarity index 85% rename from frontend/src/uxbox/main/ui.cljs rename to frontend/src/app/main/ui.cljs index f90ed07de..2cd4e3767 100644 --- a/frontend/src/uxbox/main/ui.cljs +++ b/frontend/src/app/main/ui.cljs @@ -7,31 +7,31 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui +(ns app.main.ui (:require [beicon.core :as rx] [cuerdas.core :as str] [potok.core :as ptk] [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.common.exceptions :as ex] - [uxbox.common.uuid :as uuid] - [uxbox.main.data.auth :refer [logout]] - [uxbox.main.data.messages :as dm] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.auth :refer [auth verify-token]] - [uxbox.main.ui.dashboard :refer [dashboard]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.cursors :as c] - [uxbox.main.ui.messages :as msgs] - [uxbox.main.ui.settings :as settings] - [uxbox.main.ui.static :refer [not-found-page not-authorized-page]] - [uxbox.main.ui.viewer :refer [viewer-page]] - [uxbox.main.ui.render :as render] - [uxbox.main.ui.workspace :as workspace] - [uxbox.util.i18n :as i18n :refer [tr t]] - [uxbox.util.timers :as ts])) + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.common.uuid :as uuid] + [app.main.data.auth :refer [logout]] + [app.main.data.messages :as dm] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.auth :refer [auth verify-token]] + [app.main.ui.dashboard :refer [dashboard]] + [app.main.ui.icons :as i] + [app.main.ui.cursors :as c] + [app.main.ui.messages :as msgs] + [app.main.ui.settings :as settings] + [app.main.ui.static :refer [not-found-page not-authorized-page]] + [app.main.ui.viewer :refer [viewer-page]] + [app.main.ui.render :as render] + [app.main.ui.workspace :as workspace] + [app.util.i18n :as i18n :refer [tr t]] + [app.util.timers :as ts])) ;; --- Routes diff --git a/frontend/src/uxbox/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs similarity index 80% rename from frontend/src/uxbox/main/ui/auth.cljs rename to frontend/src/app/main/ui/auth.cljs index e7d3f13d9..804b7abb4 100644 --- a/frontend/src/uxbox/main/ui/auth.cljs +++ b/frontend/src/app/main/ui/auth.cljs @@ -7,25 +7,25 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.auth +(ns app.main.ui.auth (:require [cljs.spec.alpha :as s] [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.auth :as da] - [uxbox.main.data.users :as du] - [uxbox.main.data.messages :as dm] - [uxbox.main.store :as st] - [uxbox.main.ui.auth.login :refer [login-page]] - [uxbox.main.ui.auth.recovery :refer [recovery-page]] - [uxbox.main.ui.auth.recovery-request :refer [recovery-request-page]] - [uxbox.main.ui.auth.register :refer [register-page]] - [uxbox.main.repo :as rp] - [uxbox.util.timers :as ts] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [tr t]] - [uxbox.util.router :as rt])) + [app.main.ui.icons :as i] + [app.main.data.auth :as da] + [app.main.data.users :as du] + [app.main.data.messages :as dm] + [app.main.store :as st] + [app.main.ui.auth.login :refer [login-page]] + [app.main.ui.auth.recovery :refer [recovery-page]] + [app.main.ui.auth.recovery-request :refer [recovery-request-page]] + [app.main.ui.auth.register :refer [register-page]] + [app.main.repo :as rp] + [app.util.timers :as ts] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [tr t]] + [app.util.router :as rt])) (mf/defc goodbye-page [{:keys [locale] :as props}] @@ -83,7 +83,7 @@ nil)) (fn [error] (case (:code error) - :uxbox.services.mutations.profile/email-already-exists + :app.services.mutations.profile/email-already-exists (let [msg (tr "errors.email-already-exists")] (ts/schedule 100 #(st/emit! (dm/error msg))) (st/emit! (rt/nav :settings-profile))) diff --git a/frontend/src/uxbox/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs similarity index 86% rename from frontend/src/uxbox/main/ui/auth/login.cljs rename to frontend/src/app/main/ui/auth/login.cljs index 24ef2a38e..2679b83d9 100644 --- a/frontend/src/uxbox/main/ui/auth/login.cljs +++ b/frontend/src/app/main/ui/auth/login.cljs @@ -7,25 +7,25 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.auth.login +(ns app.main.ui.auth.login (:require [cljs.spec.alpha :as s] [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.config :as cfg] - [uxbox.common.spec :as us] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.auth :as da] - [uxbox.main.repo :as rp] - [uxbox.main.store :as st] - [uxbox.main.ui.messages :as msgs] - [uxbox.main.data.messages :as dm] - [uxbox.main.ui.components.forms :refer [input submit-button form]] - [uxbox.util.object :as obj] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :refer [tr t]] - [uxbox.util.router :as rt])) + [app.config :as cfg] + [app.common.spec :as us] + [app.main.ui.icons :as i] + [app.main.data.auth :as da] + [app.main.repo :as rp] + [app.main.store :as st] + [app.main.ui.messages :as msgs] + [app.main.data.messages :as dm] + [app.main.ui.components.forms :refer [input submit-button form]] + [app.util.object :as obj] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :refer [tr t]] + [app.util.router :as rt])) (s/def ::email ::us/email) (s/def ::password ::us/not-empty-string) diff --git a/frontend/src/uxbox/main/ui/auth/recovery.cljs b/frontend/src/app/main/ui/auth/recovery.cljs similarity index 85% rename from frontend/src/uxbox/main/ui/auth/recovery.cljs rename to frontend/src/app/main/ui/auth/recovery.cljs index a345a7973..9fca6162f 100644 --- a/frontend/src/uxbox/main/ui/auth/recovery.cljs +++ b/frontend/src/app/main/ui/auth/recovery.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.auth.recovery +(ns app.main.ui.auth.recovery (:require [cljs.spec.alpha :as s] [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.common.spec :as us] - [uxbox.main.data.auth :as uda] - [uxbox.main.data.messages :as dm] - [uxbox.main.store :as st] - [uxbox.main.ui.components.forms :refer [input submit-button form]] - [uxbox.main.ui.navigation :as nav] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [t tr]] - [uxbox.util.router :as rt])) + [app.main.ui.icons :as i] + [app.common.spec :as us] + [app.main.data.auth :as uda] + [app.main.data.messages :as dm] + [app.main.store :as st] + [app.main.ui.components.forms :refer [input submit-button form]] + [app.main.ui.navigation :as nav] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [t tr]] + [app.util.router :as rt])) (s/def ::password-1 ::fm/not-empty-string) (s/def ::password-2 ::fm/not-empty-string) diff --git a/frontend/src/uxbox/main/ui/auth/recovery_request.cljs b/frontend/src/app/main/ui/auth/recovery_request.cljs similarity index 79% rename from frontend/src/uxbox/main/ui/auth/recovery_request.cljs rename to frontend/src/app/main/ui/auth/recovery_request.cljs index 06fb5e2a8..13fd3916c 100644 --- a/frontend/src/uxbox/main/ui/auth/recovery_request.cljs +++ b/frontend/src/app/main/ui/auth/recovery_request.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.auth.recovery-request +(ns app.main.ui.auth.recovery-request (:require [cljs.spec.alpha :as s] [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.common.spec :as us] - [uxbox.main.data.auth :as uda] - [uxbox.main.data.messages :as dm] - [uxbox.main.store :as st] - [uxbox.main.ui.components.forms :refer [input submit-button form]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.navigation :as nav] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [tr t]] - [uxbox.util.router :as rt])) + [app.common.spec :as us] + [app.main.data.auth :as uda] + [app.main.data.messages :as dm] + [app.main.store :as st] + [app.main.ui.components.forms :refer [input submit-button form]] + [app.main.ui.icons :as i] + [app.main.ui.navigation :as nav] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [tr t]] + [app.util.router :as rt])) (s/def ::email ::us/email) (s/def ::recovery-request-form (s/keys :req-un [::email])) diff --git a/frontend/src/uxbox/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs similarity index 83% rename from frontend/src/uxbox/main/ui/auth/register.cljs rename to frontend/src/app/main/ui/auth/register.cljs index d6d282e22..88bec2393 100644 --- a/frontend/src/uxbox/main/ui/auth/register.cljs +++ b/frontend/src/app/main/ui/auth/register.cljs @@ -7,23 +7,23 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.auth.register +(ns app.main.ui.auth.register (:require [cljs.spec.alpha :as s] [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.config :as cfg] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.auth :as uda] - [uxbox.main.store :as st] - [uxbox.main.data.auth :as da] - [uxbox.main.ui.components.forms :refer [input submit-button form]] - [uxbox.main.ui.navigation :as nav] - [uxbox.main.ui.messages :as msgs] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :refer [tr t]] - [uxbox.util.router :as rt])) + [app.config :as cfg] + [app.main.ui.icons :as i] + [app.main.data.auth :as uda] + [app.main.store :as st] + [app.main.data.auth :as da] + [app.main.ui.components.forms :refer [input submit-button form]] + [app.main.ui.navigation :as nav] + [app.main.ui.messages :as msgs] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :refer [tr t]] + [app.util.router :as rt])) (mf/defc demo-warning @@ -44,10 +44,10 @@ (defn- on-error [form error] (case (:code error) - :uxbox.services.mutations.profile/registration-disabled + :app.services.mutations.profile/registration-disabled (st/emit! (tr "errors.registration-disabled")) - :uxbox.services.mutations.profile/email-already-exists + :app.services.mutations.profile/email-already-exists (swap! form assoc-in [:errors :email] {:message "errors.email-already-exists"}) diff --git a/frontend/src/uxbox/main/ui/colorpicker.cljs b/frontend/src/app/main/ui/colorpicker.cljs similarity index 94% rename from frontend/src/uxbox/main/ui/colorpicker.cljs rename to frontend/src/app/main/ui/colorpicker.cljs index a03213175..272427d59 100644 --- a/frontend/src/uxbox/main/ui/colorpicker.cljs +++ b/frontend/src/app/main/ui/colorpicker.cljs @@ -4,13 +4,13 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.main.ui.colorpicker +(ns app.main.ui.colorpicker (:require [okulary.core :as l] - [uxbox.main.store :as st] + [app.main.store :as st] [goog.object :as gobj] [rumext.alpha :as mf] - [uxbox.util.color :refer [hex->rgb]] + [app.util.color :refer [hex->rgb]] ["react-color/lib/components/chrome/Chrome" :as pickerskin])) (mf/defc colorpicker diff --git a/frontend/src/uxbox/main/ui/components/context_menu.cljs b/frontend/src/app/main/ui/components/context_menu.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/components/context_menu.cljs rename to frontend/src/app/main/ui/components/context_menu.cljs index e07788b15..d912a587c 100644 --- a/frontend/src/uxbox/main/ui/components/context_menu.cljs +++ b/frontend/src/app/main/ui/components/context_menu.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.components.context-menu +(ns app.main.ui.components.context-menu (:require [rumext.alpha :as mf] [goog.object :as gobj] - [uxbox.main.ui.components.dropdown :refer [dropdown']] - [uxbox.common.uuid :as uuid] - [uxbox.util.data :refer [classnames]])) + [app.main.ui.components.dropdown :refer [dropdown']] + [app.common.uuid :as uuid] + [app.util.data :refer [classnames]])) (mf/defc context-menu {::mf/wrap-props false} diff --git a/frontend/src/uxbox/main/ui/components/dropdown.cljs b/frontend/src/app/main/ui/components/dropdown.cljs similarity index 93% rename from frontend/src/uxbox/main/ui/components/dropdown.cljs rename to frontend/src/app/main/ui/components/dropdown.cljs index 48f8f6d86..d6479d61f 100644 --- a/frontend/src/uxbox/main/ui/components/dropdown.cljs +++ b/frontend/src/app/main/ui/components/dropdown.cljs @@ -1,8 +1,8 @@ -(ns uxbox.main.ui.components.dropdown +(ns app.main.ui.components.dropdown (:require [rumext.alpha :as mf] - [uxbox.common.uuid :as uuid] - [uxbox.util.dom :as dom] + [app.common.uuid :as uuid] + [app.util.dom :as dom] [goog.events :as events] [goog.object :as gobj]) (:import goog.events.EventType diff --git a/frontend/src/uxbox/main/ui/components/editable_label.cljs b/frontend/src/app/main/ui/components/editable_label.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/components/editable_label.cljs rename to frontend/src/app/main/ui/components/editable_label.cljs index 07b36cf26..fa2de3487 100644 --- a/frontend/src/uxbox/main/ui/components/editable_label.cljs +++ b/frontend/src/app/main/ui/components/editable_label.cljs @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.components.editable-label +(ns app.main.ui.components.editable-label (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.util.dom :as dom] - [uxbox.util.timers :as timers] - [uxbox.util.data :refer [classnames]])) + [app.main.ui.icons :as i] + [app.main.ui.keyboard :as kbd] + [app.util.dom :as dom] + [app.util.timers :as timers] + [app.util.data :refer [classnames]])) (mf/defc editable-label [{:keys [ value on-change on-cancel edit readonly class-name]}] diff --git a/frontend/src/uxbox/main/ui/components/editable_select.cljs b/frontend/src/app/main/ui/components/editable_select.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/components/editable_select.cljs rename to frontend/src/app/main/ui/components/editable_select.cljs index b6957ebe4..4d9ffdb80 100644 --- a/frontend/src/uxbox/main/ui/components/editable_select.cljs +++ b/frontend/src/app/main/ui/components/editable_select.cljs @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.components.editable-select +(ns app.main.ui.components.editable-select (:require [rumext.alpha :as mf] - [uxbox.common.uuid :as uuid] - [uxbox.common.data :as d] - [uxbox.util.dom :as dom] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.components.dropdown :refer [dropdown]])) + [app.common.uuid :as uuid] + [app.common.data :as d] + [app.util.dom :as dom] + [app.main.ui.icons :as i] + [app.main.ui.components.dropdown :refer [dropdown]])) (mf/defc editable-select [{:keys [value type options class on-change placeholder]}] (let [state (mf/use-state {:id (uuid/next) diff --git a/frontend/src/uxbox/main/ui/components/file_uploader.cljs b/frontend/src/app/main/ui/components/file_uploader.cljs similarity index 90% rename from frontend/src/uxbox/main/ui/components/file_uploader.cljs rename to frontend/src/app/main/ui/components/file_uploader.cljs index 22e37029a..1d13fdade 100644 --- a/frontend/src/uxbox/main/ui/components/file_uploader.cljs +++ b/frontend/src/app/main/ui/components/file_uploader.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.components.file-uploader +(ns app.main.ui.components.file-uploader (:require [rumext.alpha :as mf] - [uxbox.main.data.workspace :as dw] - [uxbox.main.store :as st] - [uxbox.util.dom :as dom])) + [app.main.data.workspace :as dw] + [app.main.store :as st] + [app.util.dom :as dom])) (mf/defc file-uploader [{:keys [accept multi label-text label-class input-id input-ref on-selected] :as props}] diff --git a/frontend/src/uxbox/main/ui/components/forms.cljs b/frontend/src/app/main/ui/components/forms.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/components/forms.cljs rename to frontend/src/app/main/ui/components/forms.cljs index e5341bf31..a6793674f 100644 --- a/frontend/src/uxbox/main/ui/components/forms.cljs +++ b/frontend/src/app/main/ui/components/forms.cljs @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.components.forms +(ns app.main.ui.components.forms (:require [rumext.alpha :as mf] [cuerdas.core :as str] - [uxbox.common.data :as d] - [uxbox.main.ui.icons :as i] - [uxbox.util.object :as obj] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [t]] + [app.common.data :as d] + [app.main.ui.icons :as i] + [app.util.object :as obj] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [t]] ["react" :as react] - [uxbox.util.dom :as dom])) + [app.util.dom :as dom])) (def form-ctx (mf/create-context nil)) diff --git a/frontend/src/uxbox/main/ui/components/select.cljs b/frontend/src/app/main/ui/components/select.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/components/select.cljs rename to frontend/src/app/main/ui/components/select.cljs index fd733ea46..87a1da543 100644 --- a/frontend/src/uxbox/main/ui/components/select.cljs +++ b/frontend/src/app/main/ui/components/select.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.components.select +(ns app.main.ui.components.select (:require [rumext.alpha :as mf] - [uxbox.common.uuid :as uuid] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.components.dropdown :refer [dropdown]])) + [app.common.uuid :as uuid] + [app.main.ui.icons :as i] + [app.main.ui.components.dropdown :refer [dropdown]])) (mf/defc select [{:keys [default-value options class on-change]}] (let [state (mf/use-state {:id (uuid/next) diff --git a/frontend/src/uxbox/main/ui/components/tab_container.cljs b/frontend/src/app/main/ui/components/tab_container.cljs similarity index 96% rename from frontend/src/uxbox/main/ui/components/tab_container.cljs rename to frontend/src/app/main/ui/components/tab_container.cljs index 29292600b..10424269c 100644 --- a/frontend/src/uxbox/main/ui/components/tab_container.cljs +++ b/frontend/src/app/main/ui/components/tab_container.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.components.tab-container +(ns app.main.ui.components.tab-container (:require [rumext.alpha :as mf])) (mf/defc tab-element diff --git a/frontend/src/uxbox/main/ui/confirm.cljs b/frontend/src/app/main/ui/confirm.cljs similarity index 88% rename from frontend/src/uxbox/main/ui/confirm.cljs rename to frontend/src/app/main/ui/confirm.cljs index 09af7e2ed..2d15804e6 100644 --- a/frontend/src/uxbox/main/ui/confirm.cljs +++ b/frontend/src/app/main/ui/confirm.cljs @@ -5,14 +5,14 @@ ;; Copyright (c) 2016 Andrey Antukh ;; Copyright (c) 2016 Juan de la Cruz -(ns uxbox.main.ui.confirm +(ns app.main.ui.confirm (:require - [uxbox.main.ui.icons :as i] + [app.main.ui.icons :as i] [rumext.alpha :as mf] - [uxbox.main.ui.modal :as modal] - [uxbox.util.i18n :refer (tr)] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom])) + [app.main.ui.modal :as modal] + [app.util.i18n :refer (tr)] + [app.util.data :refer [classnames]] + [app.util.dom :as dom])) (mf/defc confirm-dialog [{:keys [message on-accept on-cancel hint cancel-text accept-text not-danger?] :as ctx}] diff --git a/frontend/src/uxbox/main/ui/cursors.clj b/frontend/src/app/main/ui/cursors.clj similarity index 98% rename from frontend/src/uxbox/main/ui/cursors.clj rename to frontend/src/app/main/ui/cursors.clj index 1b10738c1..414297d11 100644 --- a/frontend/src/uxbox/main/ui/cursors.clj +++ b/frontend/src/app/main/ui/cursors.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.cursors +(ns app.main.ui.cursors (:import java.net.URLEncoder) (:require [rumext.alpha] [clojure.java.io :as io] diff --git a/frontend/src/uxbox/main/ui/cursors.cljs b/frontend/src/app/main/ui/cursors.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/cursors.cljs rename to frontend/src/app/main/ui/cursors.cljs index c78b38846..d827bdf6c 100644 --- a/frontend/src/uxbox/main/ui/cursors.cljs +++ b/frontend/src/app/main/ui/cursors.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.cursors - (:require-macros [uxbox.main.ui.cursors :refer [cursor-ref +(ns app.main.ui.cursors + (:require-macros [app.main.ui.cursors :refer [cursor-ref cursor-fn]]) (:require [rumext.alpha :as mf] [cuerdas.core :as str] - [uxbox.util.timers :as ts])) + [app.util.timers :as ts])) (def create-artboard (cursor-ref :create-artboard)) (def create-ellipse (cursor-ref :create-ellipse)) @@ -40,7 +40,7 @@ (mf/use-effect (fn [] (ts/interval 100 #(reset! rotation inc)))) [:section.debug-icons-preview - (for [[key val] (sort-by first (ns-publics 'uxbox.main.ui.cursors))] + (for [[key val] (sort-by first (ns-publics 'app.main.ui.cursors))] (when (not= key 'debug-icons-preview) (let [value (deref val) value (if (fn? value) (value @rotation) value)] diff --git a/frontend/src/uxbox/main/ui/dashboard.cljs b/frontend/src/app/main/ui/dashboard.cljs similarity index 79% rename from frontend/src/uxbox/main/ui/dashboard.cljs rename to frontend/src/app/main/ui/dashboard.cljs index f290b5b3c..2fca71d5d 100644 --- a/frontend/src/uxbox/main/ui/dashboard.cljs +++ b/frontend/src/app/main/ui/dashboard.cljs @@ -7,24 +7,24 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.dashboard +(ns app.main.ui.dashboard (:require [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.common.exceptions :as ex] - [uxbox.common.uuid :as uuid] - [uxbox.common.spec :as us] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.main.ui.dashboard.sidebar :refer [sidebar]] - [uxbox.main.ui.dashboard.search :refer [search-page]] - [uxbox.main.ui.dashboard.project :refer [project-page]] - [uxbox.main.ui.dashboard.recent-files :refer [recent-files-page]] - [uxbox.main.ui.dashboard.libraries :refer [libraries-page]] - [uxbox.main.ui.dashboard.profile :refer [profile-section]] - [uxbox.util.router :as rt] - [uxbox.util.i18n :as i18n :refer [t]])) + [app.main.ui.icons :as i] + [app.common.exceptions :as ex] + [app.common.uuid :as uuid] + [app.common.spec :as us] + [app.main.store :as st] + [app.main.refs :as refs] + [app.main.ui.dashboard.sidebar :refer [sidebar]] + [app.main.ui.dashboard.search :refer [search-page]] + [app.main.ui.dashboard.project :refer [project-page]] + [app.main.ui.dashboard.recent-files :refer [recent-files-page]] + [app.main.ui.dashboard.libraries :refer [libraries-page]] + [app.main.ui.dashboard.profile :refer [profile-section]] + [app.util.router :as rt] + [app.util.i18n :as i18n :refer [t]])) (defn ^boolean uuid-str? [s] diff --git a/frontend/src/uxbox/main/ui/dashboard/common.cljs b/frontend/src/app/main/ui/dashboard/common.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/dashboard/common.cljs rename to frontend/src/app/main/ui/dashboard/common.cljs index f2c7ea06a..0acbd96be 100644 --- a/frontend/src/uxbox/main/ui/dashboard/common.cljs +++ b/frontend/src/app/main/ui/dashboard/common.cljs @@ -4,14 +4,14 @@ ;; ;; Copyright (c) 2019 Andrey Antukh -(ns uxbox.main.ui.dashboard.common +(ns app.main.ui.dashboard.common (:require [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.keyboard :as k] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as t :refer [tr]])) + [app.main.ui.icons :as i] + [app.main.ui.keyboard :as k] + [app.util.dom :as dom] + [app.util.i18n :as t :refer [tr]])) ;; --- Page Title diff --git a/frontend/src/uxbox/main/ui/dashboard/grid.cljs b/frontend/src/app/main/ui/dashboard/grid.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/dashboard/grid.cljs rename to frontend/src/app/main/ui/dashboard/grid.cljs index 8c5d278d6..ee4cc84a7 100644 --- a/frontend/src/uxbox/main/ui/dashboard/grid.cljs +++ b/frontend/src/app/main/ui/dashboard/grid.cljs @@ -1,22 +1,22 @@ -(ns uxbox.main.ui.dashboard.grid +(ns app.main.ui.dashboard.grid (:require [cuerdas.core :as str] [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.dashboard :as dsh] - [uxbox.main.store :as st] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.confirm :refer [confirm-dialog]] - [uxbox.main.ui.components.context-menu :refer [context-menu]] - [uxbox.main.worker :as wrk] - [uxbox.main.fonts :as fonts] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t tr]] - [uxbox.util.router :as rt] - [uxbox.util.timers :as ts] - [uxbox.util.time :as dt])) + [app.main.ui.icons :as i] + [app.main.data.dashboard :as dsh] + [app.main.store :as st] + [app.main.ui.modal :as modal] + [app.main.ui.keyboard :as kbd] + [app.main.ui.confirm :refer [confirm-dialog]] + [app.main.ui.components.context-menu :refer [context-menu]] + [app.main.worker :as wrk] + [app.main.fonts :as fonts] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t tr]] + [app.util.router :as rt] + [app.util.timers :as ts] + [app.util.time :as dt])) ;; --- Grid Item Thumbnail diff --git a/frontend/src/uxbox/main/ui/dashboard/libraries.cljs b/frontend/src/app/main/ui/dashboard/libraries.cljs similarity index 66% rename from frontend/src/uxbox/main/ui/dashboard/libraries.cljs rename to frontend/src/app/main/ui/dashboard/libraries.cljs index 179aacb5c..e44993768 100644 --- a/frontend/src/uxbox/main/ui/dashboard/libraries.cljs +++ b/frontend/src/app/main/ui/dashboard/libraries.cljs @@ -7,21 +7,21 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.dashboard.libraries +(ns app.main.ui.dashboard.libraries (:require [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.util.i18n :as i18n :refer [tr]] - [uxbox.util.dom :as dom] - [uxbox.util.router :as rt] - [uxbox.main.data.dashboard :as dsh] - [uxbox.main.store :as st] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.confirm :refer [confirm-dialog]] - [uxbox.main.ui.components.context-menu :refer [context-menu]] - [uxbox.main.ui.dashboard.grid :refer [grid]])) + [app.main.ui.icons :as i] + [app.util.i18n :as i18n :refer [tr]] + [app.util.dom :as dom] + [app.util.router :as rt] + [app.main.data.dashboard :as dsh] + [app.main.store :as st] + [app.main.ui.modal :as modal] + [app.main.ui.keyboard :as kbd] + [app.main.ui.confirm :refer [confirm-dialog]] + [app.main.ui.components.context-menu :refer [context-menu]] + [app.main.ui.dashboard.grid :refer [grid]])) (def files-ref (-> (comp vals :files) diff --git a/frontend/src/uxbox/main/ui/dashboard/profile.cljs b/frontend/src/app/main/ui/dashboard/profile.cljs similarity index 82% rename from frontend/src/uxbox/main/ui/dashboard/profile.cljs rename to frontend/src/app/main/ui/dashboard/profile.cljs index 897a94855..24de2be10 100644 --- a/frontend/src/uxbox/main/ui/dashboard/profile.cljs +++ b/frontend/src/app/main/ui/dashboard/profile.cljs @@ -8,19 +8,19 @@ ;; Copyright (c) 2015-2020 Andrey Antukh ;; Copyright (c) 2015-2020 Juan de la Cruz -(ns uxbox.main.ui.dashboard.profile +(ns app.main.ui.dashboard.profile (:require [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.main.data.auth :as da] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.dropdown :refer [dropdown]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.navigation :as nav] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.util.router :as rt])) + [app.main.data.auth :as da] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.dropdown :refer [dropdown]] + [app.main.ui.icons :as i] + [app.main.ui.navigation :as nav] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t]] + [app.util.router :as rt])) ;; --- Component: Profile diff --git a/frontend/src/uxbox/main/ui/dashboard/project.cljs b/frontend/src/app/main/ui/dashboard/project.cljs similarity index 87% rename from frontend/src/uxbox/main/ui/dashboard/project.cljs rename to frontend/src/app/main/ui/dashboard/project.cljs index 74175bc74..323f7de17 100644 --- a/frontend/src/uxbox/main/ui/dashboard/project.cljs +++ b/frontend/src/app/main/ui/dashboard/project.cljs @@ -7,21 +7,21 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.dashboard.project +(ns app.main.ui.dashboard.project (:require [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.util.dom :as dom] - [uxbox.util.router :as rt] - [uxbox.main.data.dashboard :as dsh] - [uxbox.main.store :as st] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.confirm :refer [confirm-dialog]] - [uxbox.main.ui.components.context-menu :refer [context-menu]] - [uxbox.main.ui.dashboard.grid :refer [grid]])) + [app.main.ui.icons :as i] + [app.util.i18n :as i18n :refer [t]] + [app.util.dom :as dom] + [app.util.router :as rt] + [app.main.data.dashboard :as dsh] + [app.main.store :as st] + [app.main.ui.modal :as modal] + [app.main.ui.keyboard :as kbd] + [app.main.ui.confirm :refer [confirm-dialog]] + [app.main.ui.components.context-menu :refer [context-menu]] + [app.main.ui.dashboard.grid :refer [grid]])) (def projects-ref (l/derived :projects st/state)) diff --git a/frontend/src/uxbox/main/ui/dashboard/recent_files.cljs b/frontend/src/app/main/ui/dashboard/recent_files.cljs similarity index 84% rename from frontend/src/uxbox/main/ui/dashboard/recent_files.cljs rename to frontend/src/app/main/ui/dashboard/recent_files.cljs index f8fe8d17d..7f12b14cf 100644 --- a/frontend/src/uxbox/main/ui/dashboard/recent_files.cljs +++ b/frontend/src/app/main/ui/dashboard/recent_files.cljs @@ -7,24 +7,24 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.dashboard.recent-files +(ns app.main.ui.dashboard.recent-files (:require [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.common.exceptions :as ex] - [uxbox.main.constants :as c] - [uxbox.main.data.dashboard :as dsh] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.confirm :refer [confirm-dialog]] - [uxbox.main.ui.dashboard.grid :refer [grid]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.modal :as modal] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t tr]] - [uxbox.util.router :as rt] - [uxbox.util.time :as dt])) + [app.common.exceptions :as ex] + [app.main.constants :as c] + [app.main.data.dashboard :as dsh] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.confirm :refer [confirm-dialog]] + [app.main.ui.dashboard.grid :refer [grid]] + [app.main.ui.icons :as i] + [app.main.ui.keyboard :as kbd] + [app.main.ui.modal :as modal] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t tr]] + [app.util.router :as rt] + [app.util.time :as dt])) ;; --- Component: Content diff --git a/frontend/src/uxbox/main/ui/dashboard/search.cljs b/frontend/src/app/main/ui/dashboard/search.cljs similarity index 88% rename from frontend/src/uxbox/main/ui/dashboard/search.cljs rename to frontend/src/app/main/ui/dashboard/search.cljs index 15e371607..6a3eb914c 100644 --- a/frontend/src/uxbox/main/ui/dashboard/search.cljs +++ b/frontend/src/app/main/ui/dashboard/search.cljs @@ -8,14 +8,14 @@ ;; Copyright (c) 2015-2017 Juan de la Cruz ;; Copyright (c) 2015-2020 Andrey Antukh -(ns uxbox.main.ui.dashboard.search +(ns app.main.ui.dashboard.search (:require [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.main.store :as st] - [uxbox.main.data.dashboard :as dsh] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.main.ui.dashboard.grid :refer [grid]])) + [app.main.store :as st] + [app.main.data.dashboard :as dsh] + [app.util.i18n :as i18n :refer [t]] + [app.main.ui.dashboard.grid :refer [grid]])) ;; --- Component: Search diff --git a/frontend/src/uxbox/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs similarity index 93% rename from frontend/src/uxbox/main/ui/dashboard/sidebar.cljs rename to frontend/src/app/main/ui/dashboard/sidebar.cljs index cb27076bc..78b83cedf 100644 --- a/frontend/src/uxbox/main/ui/dashboard/sidebar.cljs +++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs @@ -8,25 +8,25 @@ ;; Copyright (c) 2020 Andrey Antukh ;; Copyright (c) 2020 Juan de la Cruz -(ns uxbox.main.ui.dashboard.sidebar +(ns app.main.ui.dashboard.sidebar (:require [cuerdas.core :as str] [goog.functions :as f] [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.main.constants :as c] - [uxbox.main.data.dashboard :as dsh] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.confirm :refer [confirm-dialog]] - [uxbox.main.ui.dashboard.common :as common] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.modal :as modal] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t tr]] - [uxbox.util.router :as rt] - [uxbox.util.time :as dt])) + [app.main.constants :as c] + [app.main.data.dashboard :as dsh] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.confirm :refer [confirm-dialog]] + [app.main.ui.dashboard.common :as common] + [app.main.ui.icons :as i] + [app.main.ui.keyboard :as kbd] + [app.main.ui.modal :as modal] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t tr]] + [app.util.router :as rt] + [app.util.time :as dt])) ;; --- Component: Sidebar diff --git a/frontend/src/uxbox/main/ui/hooks.cljs b/frontend/src/app/main/ui/hooks.cljs similarity index 97% rename from frontend/src/uxbox/main/ui/hooks.cljs rename to frontend/src/app/main/ui/hooks.cljs index 527b3b702..178360b68 100644 --- a/frontend/src/uxbox/main/ui/hooks.cljs +++ b/frontend/src/app/main/ui/hooks.cljs @@ -7,19 +7,19 @@ ;; ;; Copyright (c) 2020 UXBOX Labs S.L -(ns uxbox.main.ui.hooks +(ns app.main.ui.hooks "A collection of general purpose react hooks." (:require [cljs.spec.alpha :as s] - [uxbox.common.spec :as us] + [app.common.spec :as us] [beicon.core :as rx] [goog.events :as events] [rumext.alpha :as mf] - [uxbox.util.transit :as t] - [uxbox.util.dom :as dom] - [uxbox.util.dom.dnd :as dnd] - [uxbox.util.webapi :as wapi] - [uxbox.util.timers :as ts] + [app.util.transit :as t] + [app.util.dom :as dom] + [app.util.dom.dnd :as dnd] + [app.util.webapi :as wapi] + [app.util.timers :as ts] ["mousetrap" :as mousetrap]) (:import goog.events.EventType)) diff --git a/frontend/src/uxbox/main/ui/icons.clj b/frontend/src/app/main/ui/icons.clj similarity index 96% rename from frontend/src/uxbox/main/ui/icons.clj rename to frontend/src/app/main/ui/icons.clj index f721ee039..393e3a974 100644 --- a/frontend/src/uxbox/main/ui/icons.clj +++ b/frontend/src/app/main/ui/icons.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.icons +(ns app.main.ui.icons (:require [rumext.alpha])) (def base-uri "/images/svg-sprite/symbol/svg/sprite.symbol.svg#icon-") diff --git a/frontend/src/uxbox/main/ui/icons.cljs b/frontend/src/app/main/ui/icons.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/icons.cljs rename to frontend/src/app/main/ui/icons.cljs index b99a5d7b6..e419a541a 100644 --- a/frontend/src/uxbox/main/ui/icons.cljs +++ b/frontend/src/app/main/ui/icons.cljs @@ -7,8 +7,8 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.icons - (:require-macros [uxbox.main.ui.icons :refer [icon-xref]]) +(ns app.main.ui.icons + (:require-macros [app.main.ui.icons :refer [icon-xref]]) (:require [rumext.alpha :as mf])) (def action (icon-xref :action)) @@ -62,9 +62,9 @@ (def loader (icon-xref :loader)) (def lock (icon-xref :lock)) (def lock-open (icon-xref :lock-open)) -(def logo (icon-xref :uxbox-logo)) +(def logo (icon-xref :app-logo)) (def logout (icon-xref :logout)) -(def logo-icon (icon-xref :uxbox-logo-icon)) +(def logo-icon (icon-xref :app-logo-icon)) (def lowercase (icon-xref :lowercase)) (def mail (icon-xref :mail)) (def minus (icon-xref :minus)) @@ -142,7 +142,7 @@ {::mf/wrap-props false} [props] [:section.debug-icons-preview - (for [[key val] (sort-by first (ns-publics 'uxbox.main.ui.icons))] + (for [[key val] (sort-by first (ns-publics 'app.main.ui.icons))] (when (not= key 'debug-icons-preview) [:div.icon-item {:key key} (deref val) diff --git a/frontend/src/uxbox/main/ui/keyboard.cljs b/frontend/src/app/main/ui/keyboard.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/keyboard.cljs rename to frontend/src/app/main/ui/keyboard.cljs index f78792659..9bc6d8499 100644 --- a/frontend/src/uxbox/main/ui/keyboard.cljs +++ b/frontend/src/app/main/ui/keyboard.cljs @@ -1,4 +1,4 @@ -(ns uxbox.main.ui.keyboard) +(ns app.main.ui.keyboard) (defn is-keycode? [keycode] diff --git a/frontend/src/uxbox/main/ui/loader.cljs b/frontend/src/app/main/ui/loader.cljs similarity index 82% rename from frontend/src/uxbox/main/ui/loader.cljs rename to frontend/src/app/main/ui/loader.cljs index 611efadb6..9981f0fb1 100644 --- a/frontend/src/uxbox/main/ui/loader.cljs +++ b/frontend/src/app/main/ui/loader.cljs @@ -4,11 +4,11 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.main.ui.loader +(ns app.main.ui.loader (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.store :as st])) + [app.main.ui.icons :as i] + [app.main.store :as st])) ;; --- Component diff --git a/frontend/src/uxbox/main/ui/messages.cljs b/frontend/src/app/main/ui/messages.cljs similarity index 87% rename from frontend/src/uxbox/main/ui/messages.cljs rename to frontend/src/app/main/ui/messages.cljs index f3da0b676..60e4eaf71 100644 --- a/frontend/src/uxbox/main/ui/messages.cljs +++ b/frontend/src/app/main/ui/messages.cljs @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.messages +(ns app.main.ui.messages (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.messages :as dm] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.util.timers :as ts])) + [app.main.ui.icons :as i] + [app.main.data.messages :as dm] + [app.main.refs :as refs] + [app.main.store :as st] + [app.util.data :refer [classnames]] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t]] + [app.util.timers :as ts])) (defn- type->icon [type] diff --git a/frontend/src/uxbox/main/ui/modal.cljs b/frontend/src/app/main/ui/modal.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/modal.cljs rename to frontend/src/app/main/ui/modal.cljs index dd721aa21..10615ea2b 100644 --- a/frontend/src/uxbox/main/ui/modal.cljs +++ b/frontend/src/app/main/ui/modal.cljs @@ -1,12 +1,12 @@ -(ns uxbox.main.ui.modal +(ns app.main.ui.modal (:require [cuerdas.core :as str] [goog.events :as events] [rumext.alpha :as mf] - [uxbox.main.store :as st] - [uxbox.main.ui.keyboard :as k] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom]) + [app.main.store :as st] + [app.main.ui.keyboard :as k] + [app.util.data :refer [classnames]] + [app.util.dom :as dom]) (:import goog.events.EventType)) (defonce state (atom nil)) diff --git a/frontend/src/uxbox/main/ui/navigation.cljs b/frontend/src/app/main/ui/navigation.cljs similarity index 82% rename from frontend/src/uxbox/main/ui/navigation.cljs rename to frontend/src/app/main/ui/navigation.cljs index e0ccd80f0..f623f7447 100644 --- a/frontend/src/uxbox/main/ui/navigation.cljs +++ b/frontend/src/app/main/ui/navigation.cljs @@ -1,9 +1,9 @@ -(ns uxbox.main.ui.navigation +(ns app.main.ui.navigation ;; TODO: deprecated (:require [rumext.alpha :refer-macros [html]] [goog.events :as events] - [uxbox.util.dom :as dom])) + [app.util.dom :as dom])) (defn link "Given an href and a component, return a link component that will navigate diff --git a/frontend/src/uxbox/main/ui/render.cljs b/frontend/src/app/main/ui/render.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/render.cljs rename to frontend/src/app/main/ui/render.cljs index 0eaec86f6..3831fca40 100644 --- a/frontend/src/uxbox/main/ui/render.cljs +++ b/frontend/src/app/main/ui/render.cljs @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.render +(ns app.main.ui.render (:require [cljs.spec.alpha :as s] [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.common.uuid :as uuid] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.math :as mth] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.matrix :as gmt] - [uxbox.main.exports :as exports] - [uxbox.main.repo :as repo])) + [app.common.uuid :as uuid] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.math :as mth] + [app.common.geom.shapes :as geom] + [app.common.geom.point :as gpt] + [app.common.geom.matrix :as gmt] + [app.main.exports :as exports] + [app.main.repo :as repo])) (mf/defc object-svg {::mf/wrap [mf/memo]} diff --git a/frontend/src/uxbox/main/ui/settings.cljs b/frontend/src/app/main/ui/settings.cljs similarity index 66% rename from frontend/src/uxbox/main/ui/settings.cljs rename to frontend/src/app/main/ui/settings.cljs index 07865712d..eb3ba01ee 100644 --- a/frontend/src/uxbox/main/ui/settings.cljs +++ b/frontend/src/app/main/ui/settings.cljs @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.settings +(ns app.main.ui.settings (:require [cuerdas.core :as str] [potok.core :as ptk] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.util.router :as rt] - [uxbox.main.ui.dashboard.profile :refer [profile-section]] - [uxbox.main.ui.settings.header :refer [header]] - [uxbox.main.ui.settings.password :refer [password-page]] - [uxbox.main.ui.settings.options :refer [options-page]] - [uxbox.main.ui.settings.profile :refer [profile-page]])) + [app.main.ui.icons :as i] + [app.main.refs :as refs] + [app.main.store :as st] + [app.util.router :as rt] + [app.main.ui.dashboard.profile :refer [profile-section]] + [app.main.ui.settings.header :refer [header]] + [app.main.ui.settings.password :refer [password-page]] + [app.main.ui.settings.options :refer [options-page]] + [app.main.ui.settings.profile :refer [profile-page]])) (mf/defc settings [{:keys [route] :as props}] diff --git a/frontend/src/uxbox/main/ui/settings/change_email.cljs b/frontend/src/app/main/ui/settings/change_email.cljs similarity index 84% rename from frontend/src/uxbox/main/ui/settings/change_email.cljs rename to frontend/src/app/main/ui/settings/change_email.cljs index 7a8b32ad7..9af293667 100644 --- a/frontend/src/uxbox/main/ui/settings/change_email.cljs +++ b/frontend/src/app/main/ui/settings/change_email.cljs @@ -7,23 +7,23 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.settings.change-email +(ns app.main.ui.settings.change-email (:require [cljs.spec.alpha :as s] [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.main.data.auth :as da] - [uxbox.main.data.messages :as dm] - [uxbox.main.data.users :as du] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.forms :refer [input submit-button form]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.messages :as msgs] - [uxbox.main.ui.modal :as modal] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [tr t]])) + [app.main.data.auth :as da] + [app.main.data.messages :as dm] + [app.main.data.users :as du] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.forms :refer [input submit-button form]] + [app.main.ui.icons :as i] + [app.main.ui.messages :as msgs] + [app.main.ui.modal :as modal] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [tr t]])) (s/def ::email-1 ::fm/email) (s/def ::email-2 ::fm/email) @@ -42,7 +42,7 @@ (defn- on-error [form error] (cond - (= (:code error) :uxbox.services.mutations.profile/email-already-exists) + (= (:code error) :app.services.mutations.profile/email-already-exists) (swap! form (fn [data] (let [error {:message (tr "errors.email-already-exists")}] (assoc-in data [:errors :email-1] error)))) diff --git a/frontend/src/uxbox/main/ui/settings/delete_account.cljs b/frontend/src/app/main/ui/settings/delete_account.cljs similarity index 80% rename from frontend/src/uxbox/main/ui/settings/delete_account.cljs rename to frontend/src/app/main/ui/settings/delete_account.cljs index f07b1ebcd..ca5854b36 100644 --- a/frontend/src/uxbox/main/ui/settings/delete_account.cljs +++ b/frontend/src/app/main/ui/settings/delete_account.cljs @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.settings.delete-account +(ns app.main.ui.settings.delete-account (:require [cljs.spec.alpha :as s] [rumext.alpha :as mf] - [uxbox.main.data.auth :as da] - [uxbox.main.data.users :as du] - [uxbox.main.store :as st] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.messages :as msgs] - [uxbox.main.ui.modal :as modal] - [uxbox.util.i18n :as i18n :refer [tr t]])) + [app.main.data.auth :as da] + [app.main.data.users :as du] + [app.main.store :as st] + [app.main.ui.icons :as i] + [app.main.ui.messages :as msgs] + [app.main.ui.modal :as modal] + [app.util.i18n :as i18n :refer [tr t]])) (mf/defc delete-account-modal [props] diff --git a/frontend/src/uxbox/main/ui/settings/header.cljs b/frontend/src/app/main/ui/settings/header.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/settings/header.cljs rename to frontend/src/app/main/ui/settings/header.cljs index 2d75645c1..9f35e5998 100644 --- a/frontend/src/uxbox/main/ui/settings/header.cljs +++ b/frontend/src/app/main/ui/settings/header.cljs @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.settings.header +(ns app.main.ui.settings.header (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.auth :as da] - [uxbox.main.store :as st] - [uxbox.util.i18n :as i18n :refer [tr t]] - [uxbox.util.router :as rt])) + [app.main.ui.icons :as i] + [app.main.data.auth :as da] + [app.main.store :as st] + [app.util.i18n :as i18n :refer [tr t]] + [app.util.router :as rt])) (mf/defc header [{:keys [section profile] :as props}] diff --git a/frontend/src/uxbox/main/ui/settings/options.cljs b/frontend/src/app/main/ui/settings/options.cljs similarity index 85% rename from frontend/src/uxbox/main/ui/settings/options.cljs rename to frontend/src/app/main/ui/settings/options.cljs index 31624ef8f..abc36957b 100644 --- a/frontend/src/uxbox/main/ui/settings/options.cljs +++ b/frontend/src/app/main/ui/settings/options.cljs @@ -7,19 +7,19 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.settings.options +(ns app.main.ui.settings.options (:require [rumext.alpha :as mf] [cljs.spec.alpha :as s] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.users :as udu] - [uxbox.main.data.messages :as dm] - [uxbox.main.ui.components.forms :refer [select submit-button form]] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [t tr]])) + [app.main.ui.icons :as i] + [app.main.data.users :as udu] + [app.main.data.messages :as dm] + [app.main.ui.components.forms :refer [select submit-button form]] + [app.main.refs :as refs] + [app.main.store :as st] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [t tr]])) (s/def ::lang (s/nilable ::fm/not-empty-string)) (s/def ::theme (s/nilable ::fm/not-empty-string)) diff --git a/frontend/src/uxbox/main/ui/settings/password.cljs b/frontend/src/app/main/ui/settings/password.cljs similarity index 86% rename from frontend/src/uxbox/main/ui/settings/password.cljs rename to frontend/src/app/main/ui/settings/password.cljs index 0daf893fb..77b030588 100644 --- a/frontend/src/uxbox/main/ui/settings/password.cljs +++ b/frontend/src/app/main/ui/settings/password.cljs @@ -7,23 +7,23 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.settings.password +(ns app.main.ui.settings.password (:require [rumext.alpha :as mf] [cljs.spec.alpha :as s] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.users :as udu] - [uxbox.main.data.messages :as dm] - [uxbox.main.ui.components.forms :refer [input submit-button form]] - [uxbox.main.store :as st] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [t tr]])) + [app.main.ui.icons :as i] + [app.main.data.users :as udu] + [app.main.data.messages :as dm] + [app.main.ui.components.forms :refer [input submit-button form]] + [app.main.store :as st] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [t tr]])) (defn- on-error [form error] (case (:code error) - :uxbox.services.mutations.profile/old-password-not-match + :app.services.mutations.profile/old-password-not-match (swap! form assoc-in [:errors :password-old] {:message (tr "errors.wrong-old-password")}) diff --git a/frontend/src/uxbox/main/ui/settings/profile.cljs b/frontend/src/app/main/ui/settings/profile.cljs similarity index 84% rename from frontend/src/uxbox/main/ui/settings/profile.cljs rename to frontend/src/app/main/ui/settings/profile.cljs index bf82a8c8f..2e2f0a23a 100644 --- a/frontend/src/uxbox/main/ui/settings/profile.cljs +++ b/frontend/src/app/main/ui/settings/profile.cljs @@ -7,25 +7,25 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.settings.profile +(ns app.main.ui.settings.profile (:require [cljs.spec.alpha :as s] [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.main.data.messages :as dm] - [uxbox.main.data.users :as udu] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.forms :refer [input submit-button form]] - [uxbox.main.ui.components.file-uploader :refer [file-uploader]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.messages :as msgs] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.settings.change-email :refer [change-email-modal]] - [uxbox.main.ui.settings.delete-account :refer [delete-account-modal]] - [uxbox.util.dom :as dom] - [uxbox.util.forms :as fm] - [uxbox.util.i18n :as i18n :refer [tr t]])) + [app.main.data.messages :as dm] + [app.main.data.users :as udu] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.forms :refer [input submit-button form]] + [app.main.ui.components.file-uploader :refer [file-uploader]] + [app.main.ui.icons :as i] + [app.main.ui.messages :as msgs] + [app.main.ui.modal :as modal] + [app.main.ui.settings.change-email :refer [change-email-modal]] + [app.main.ui.settings.delete-account :refer [delete-account-modal]] + [app.util.dom :as dom] + [app.util.forms :as fm] + [app.util.i18n :as i18n :refer [tr t]])) (s/def ::fullname ::fm/not-empty-string) (s/def ::email ::fm/email) diff --git a/frontend/src/uxbox/main/ui/shapes/attrs.cljs b/frontend/src/app/main/ui/shapes/attrs.cljs similarity index 93% rename from frontend/src/uxbox/main/ui/shapes/attrs.cljs rename to frontend/src/app/main/ui/shapes/attrs.cljs index 3da03551b..52c028170 100644 --- a/frontend/src/uxbox/main/ui/shapes/attrs.cljs +++ b/frontend/src/app/main/ui/shapes/attrs.cljs @@ -7,8 +7,8 @@ ;; ;; Copyright (c) 2016-2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.attrs - (:require [uxbox.util.object :as obj])) +(ns app.main.ui.shapes.attrs + (:require [app.util.object :as obj])) (defn- stroke-type->dasharray [style] diff --git a/frontend/src/uxbox/main/ui/shapes/circle.cljs b/frontend/src/app/main/ui/shapes/circle.cljs similarity index 84% rename from frontend/src/uxbox/main/ui/shapes/circle.cljs rename to frontend/src/app/main/ui/shapes/circle.cljs index fea695664..0b442ea16 100644 --- a/frontend/src/uxbox/main/ui/shapes/circle.cljs +++ b/frontend/src/app/main/ui/shapes/circle.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.circle +(ns app.main.ui.shapes.circle (:require [rumext.alpha :as mf] - [uxbox.main.ui.shapes.attrs :as attrs] - [uxbox.main.ui.shapes.custom-stroke :refer [shape-custom-stroke]] - [uxbox.common.geom.shapes :as geom] - [uxbox.util.object :as obj])) + [app.main.ui.shapes.attrs :as attrs] + [app.main.ui.shapes.custom-stroke :refer [shape-custom-stroke]] + [app.common.geom.shapes :as geom] + [app.util.object :as obj])) (mf/defc circle-shape {::mf/wrap-props false} diff --git a/frontend/src/uxbox/main/ui/shapes/custom_stroke.cljs b/frontend/src/app/main/ui/shapes/custom_stroke.cljs similarity index 97% rename from frontend/src/uxbox/main/ui/shapes/custom_stroke.cljs rename to frontend/src/app/main/ui/shapes/custom_stroke.cljs index 8062d9f9f..b2568e59d 100644 --- a/frontend/src/uxbox/main/ui/shapes/custom_stroke.cljs +++ b/frontend/src/app/main/ui/shapes/custom_stroke.cljs @@ -4,11 +4,11 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.main.ui.shapes.custom-stroke +(ns app.main.ui.shapes.custom-stroke (:require [rumext.alpha :as mf] - [uxbox.common.geom.shapes :as geom] - [uxbox.util.object :as obj])) + [app.common.geom.shapes :as geom] + [app.util.object :as obj])) ; The SVG standard does not implement yet the 'stroke-alignment' ; attribute, to define the position of the stroke relative to the diff --git a/frontend/src/uxbox/main/ui/shapes/frame.cljs b/frontend/src/app/main/ui/shapes/frame.cljs similarity index 88% rename from frontend/src/uxbox/main/ui/shapes/frame.cljs rename to frontend/src/app/main/ui/shapes/frame.cljs index 3225bcf70..77906c6b2 100644 --- a/frontend/src/uxbox/main/ui/shapes/frame.cljs +++ b/frontend/src/app/main/ui/shapes/frame.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.frame +(ns app.main.ui.shapes.frame (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.ui.shapes.attrs :as attrs] - [uxbox.common.geom.shapes :as geom] - [uxbox.util.object :as obj])) + [app.common.data :as d] + [app.main.ui.shapes.attrs :as attrs] + [app.common.geom.shapes :as geom] + [app.util.object :as obj])) (def frame-default-props {:fill-color "#ffffff"}) diff --git a/frontend/src/uxbox/main/ui/shapes/group.cljs b/frontend/src/app/main/ui/shapes/group.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/shapes/group.cljs rename to frontend/src/app/main/ui/shapes/group.cljs index 4526b0b56..5835b89d6 100644 --- a/frontend/src/uxbox/main/ui/shapes/group.cljs +++ b/frontend/src/app/main/ui/shapes/group.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.group +(ns app.main.ui.shapes.group (:require [rumext.alpha :as mf] - [uxbox.main.ui.shapes.attrs :as attrs] - [uxbox.util.debug :refer [debug?]] - [uxbox.common.geom.shapes :as geom])) + [app.main.ui.shapes.attrs :as attrs] + [app.util.debug :refer [debug?]] + [app.common.geom.shapes :as geom])) (defn group-shape [shape-wrapper] diff --git a/frontend/src/uxbox/main/ui/shapes/icon.cljs b/frontend/src/app/main/ui/shapes/icon.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/shapes/icon.cljs rename to frontend/src/app/main/ui/shapes/icon.cljs index 9d5835168..dbf759393 100644 --- a/frontend/src/uxbox/main/ui/shapes/icon.cljs +++ b/frontend/src/app/main/ui/shapes/icon.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.icon +(ns app.main.ui.shapes.icon (:require [rumext.alpha :as mf] - [uxbox.common.geom.shapes :as geom] - [uxbox.main.ui.shapes.attrs :as attrs] - [uxbox.util.object :as obj])) + [app.common.geom.shapes :as geom] + [app.main.ui.shapes.attrs :as attrs] + [app.util.object :as obj])) (mf/defc icon-shape {::mf/wrap-props false} diff --git a/frontend/src/uxbox/main/ui/shapes/image.cljs b/frontend/src/app/main/ui/shapes/image.cljs similarity index 86% rename from frontend/src/uxbox/main/ui/shapes/image.cljs rename to frontend/src/app/main/ui/shapes/image.cljs index 582abfbf8..9cb077b46 100644 --- a/frontend/src/uxbox/main/ui/shapes/image.cljs +++ b/frontend/src/app/main/ui/shapes/image.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.image +(ns app.main.ui.shapes.image (:require [rumext.alpha :as mf] - [uxbox.config :as cfg] - [uxbox.common.geom.shapes :as geom] - [uxbox.main.ui.shapes.attrs :as attrs] - [uxbox.util.object :as obj])) + [app.config :as cfg] + [app.common.geom.shapes :as geom] + [app.main.ui.shapes.attrs :as attrs] + [app.util.object :as obj])) (mf/defc image-shape {::mf/wrap-props false} diff --git a/frontend/src/uxbox/main/ui/shapes/path.cljs b/frontend/src/app/main/ui/shapes/path.cljs similarity index 90% rename from frontend/src/uxbox/main/ui/shapes/path.cljs rename to frontend/src/app/main/ui/shapes/path.cljs index 0145c98c0..bead937a4 100644 --- a/frontend/src/uxbox/main/ui/shapes/path.cljs +++ b/frontend/src/app/main/ui/shapes/path.cljs @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.path +(ns app.main.ui.shapes.path (:require [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.main.ui.shapes.attrs :as attrs] - [uxbox.main.ui.shapes.custom-stroke :refer [shape-custom-stroke]] - [uxbox.common.geom.shapes :as geom] - [uxbox.util.object :as obj])) + [app.main.ui.shapes.attrs :as attrs] + [app.main.ui.shapes.custom-stroke :refer [shape-custom-stroke]] + [app.common.geom.shapes :as geom] + [app.util.object :as obj])) ;; --- Path Shape diff --git a/frontend/src/uxbox/main/ui/shapes/rect.cljs b/frontend/src/app/main/ui/shapes/rect.cljs similarity index 83% rename from frontend/src/uxbox/main/ui/shapes/rect.cljs rename to frontend/src/app/main/ui/shapes/rect.cljs index bd68d0636..a1a7c8457 100644 --- a/frontend/src/uxbox/main/ui/shapes/rect.cljs +++ b/frontend/src/app/main/ui/shapes/rect.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.rect +(ns app.main.ui.shapes.rect (:require [rumext.alpha :as mf] - [uxbox.main.ui.shapes.attrs :as attrs] - [uxbox.main.ui.shapes.custom-stroke :refer [shape-custom-stroke]] - [uxbox.common.geom.shapes :as geom] - [uxbox.util.object :as obj])) + [app.main.ui.shapes.attrs :as attrs] + [app.main.ui.shapes.custom-stroke :refer [shape-custom-stroke]] + [app.common.geom.shapes :as geom] + [app.util.object :as obj])) (mf/defc rect-shape {::mf/wrap-props false} diff --git a/frontend/src/uxbox/main/ui/shapes/shape.cljs b/frontend/src/app/main/ui/shapes/shape.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/shapes/shape.cljs rename to frontend/src/app/main/ui/shapes/shape.cljs index 620e279fa..a4202b844 100644 --- a/frontend/src/uxbox/main/ui/shapes/shape.cljs +++ b/frontend/src/app/main/ui/shapes/shape.cljs @@ -7,5 +7,5 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.shapes.shape) +(ns app.main.ui.shapes.shape) diff --git a/frontend/src/uxbox/main/ui/shapes/text.cljs b/frontend/src/app/main/ui/shapes/text.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/shapes/text.cljs rename to frontend/src/app/main/ui/shapes/text.cljs index ee4b4a86d..75a7c2bd9 100644 --- a/frontend/src/uxbox/main/ui/shapes/text.cljs +++ b/frontend/src/app/main/ui/shapes/text.cljs @@ -4,14 +4,14 @@ ;; ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.main.ui.shapes.text +(ns app.main.ui.shapes.text (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.geom.matrix :as gmt] - [uxbox.main.fonts :as fonts] - [uxbox.util.object :as obj])) + [app.common.data :as d] + [app.common.geom.shapes :as geom] + [app.common.geom.matrix :as gmt] + [app.main.fonts :as fonts] + [app.util.object :as obj])) ;; --- Text Editor Rendering diff --git a/frontend/src/uxbox/main/ui/static.cljs b/frontend/src/app/main/ui/static.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/static.cljs rename to frontend/src/app/main/ui/static.cljs index f5ae32469..7e097168a 100644 --- a/frontend/src/uxbox/main/ui/static.cljs +++ b/frontend/src/app/main/ui/static.cljs @@ -7,11 +7,11 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.static +(ns app.main.ui.static (:require [cljs.spec.alpha :as s] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i])) + [app.main.ui.icons :as i])) (mf/defc not-found-page [{:keys [error] :as props}] diff --git a/frontend/src/uxbox/main/ui/viewer.cljs b/frontend/src/app/main/ui/viewer.cljs similarity index 84% rename from frontend/src/uxbox/main/ui/viewer.cljs rename to frontend/src/app/main/ui/viewer.cljs index 1ad883b08..d83d8cc64 100644 --- a/frontend/src/uxbox/main/ui/viewer.cljs +++ b/frontend/src/app/main/ui/viewer.cljs @@ -7,27 +7,27 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.viewer +(ns app.main.ui.viewer (:require [beicon.core :as rx] [goog.events :as events] [goog.object :as gobj] [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.common.exceptions :as ex] - [uxbox.main.data.viewer :as dv] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.dropdown :refer [dropdown]] - [uxbox.main.ui.hooks :as hooks] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.viewer.header :refer [header]] - [uxbox.main.ui.viewer.thumbnails :refer [thumbnails-panel]] - [uxbox.main.ui.viewer.shapes :refer [frame-svg]] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t tr]]) + [app.main.ui.icons :as i] + [app.common.exceptions :as ex] + [app.main.data.viewer :as dv] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.dropdown :refer [dropdown]] + [app.main.ui.hooks :as hooks] + [app.main.ui.keyboard :as kbd] + [app.main.ui.viewer.header :refer [header]] + [app.main.ui.viewer.thumbnails :refer [thumbnails-panel]] + [app.main.ui.viewer.shapes :refer [frame-svg]] + [app.util.data :refer [classnames]] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t tr]]) (:import goog.events.EventType)) (mf/defc main-panel diff --git a/frontend/src/uxbox/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/viewer/header.cljs rename to frontend/src/app/main/ui/viewer/header.cljs index 049f5476e..6a06a3fc9 100644 --- a/frontend/src/uxbox/main/ui/viewer/header.cljs +++ b/frontend/src/app/main/ui/viewer/header.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.viewer.header +(ns app.main.ui.viewer.header (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.messages :as dm] - [uxbox.main.data.viewer :as dv] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.dropdown :refer [dropdown]] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.util.router :as rt] - [uxbox.common.math :as mth] - [uxbox.common.uuid :as uuid] - [uxbox.util.webapi :as wapi])) + [app.main.ui.icons :as i] + [app.main.data.messages :as dm] + [app.main.data.viewer :as dv] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.dropdown :refer [dropdown]] + [app.util.data :refer [classnames]] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t]] + [app.util.router :as rt] + [app.common.math :as mth] + [app.common.uuid :as uuid] + [app.util.webapi :as wapi])) (mf/defc zoom-widget {:wrap [mf/memo]} diff --git a/frontend/src/uxbox/main/ui/viewer/shapes.cljs b/frontend/src/app/main/ui/viewer/shapes.cljs similarity index 90% rename from frontend/src/uxbox/main/ui/viewer/shapes.cljs rename to frontend/src/app/main/ui/viewer/shapes.cljs index f2e0f88bc..9f492a79a 100644 --- a/frontend/src/uxbox/main/ui/viewer/shapes.cljs +++ b/frontend/src/app/main/ui/viewer/shapes.cljs @@ -7,28 +7,28 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.viewer.shapes +(ns app.main.ui.viewer.shapes "The main container for a frame in viewer mode" (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.main.data.viewer :as dv] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.shapes.circle :as circle] - [uxbox.main.ui.shapes.frame :as frame] - [uxbox.main.ui.shapes.group :as group] - [uxbox.main.ui.shapes.icon :as icon] - [uxbox.main.ui.shapes.image :as image] - [uxbox.main.ui.shapes.path :as path] - [uxbox.main.ui.shapes.rect :as rect] - [uxbox.main.ui.shapes.text :as text] - [uxbox.util.object :as obj] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as geom])) + [app.common.data :as d] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.main.data.viewer :as dv] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.shapes.circle :as circle] + [app.main.ui.shapes.frame :as frame] + [app.main.ui.shapes.group :as group] + [app.main.ui.shapes.icon :as icon] + [app.main.ui.shapes.image :as image] + [app.main.ui.shapes.path :as path] + [app.main.ui.shapes.rect :as rect] + [app.main.ui.shapes.text :as text] + [app.util.object :as obj] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom])) (defn on-mouse-down [event {:keys [interactions] :as shape}] diff --git a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs b/frontend/src/app/main/ui/viewer/thumbnails.cljs similarity index 87% rename from frontend/src/uxbox/main/ui/viewer/thumbnails.cljs rename to frontend/src/app/main/ui/viewer/thumbnails.cljs index 4056a8c0f..0320ad150 100644 --- a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs +++ b/frontend/src/app/main/ui/viewer/thumbnails.cljs @@ -7,26 +7,26 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.viewer.thumbnails +(ns app.main.ui.viewer.thumbnails (:require [goog.events :as events] [goog.object :as gobj] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.common.data :as d] - [uxbox.main.store :as st] - [uxbox.main.data.viewer :as dv] - [uxbox.main.ui.components.dropdown :refer [dropdown']] - [uxbox.main.ui.shapes.frame :as frame] - [uxbox.main.exports :as exports] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.util.i18n :as i18n :refer [t tr]] - [uxbox.common.math :as mth] - [uxbox.util.router :as rt] - [uxbox.main.data.viewer :as vd]) + [app.main.ui.icons :as i] + [app.common.data :as d] + [app.main.store :as st] + [app.main.data.viewer :as dv] + [app.main.ui.components.dropdown :refer [dropdown']] + [app.main.ui.shapes.frame :as frame] + [app.main.exports :as exports] + [app.util.data :refer [classnames]] + [app.util.dom :as dom] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.util.i18n :as i18n :refer [t tr]] + [app.common.math :as mth] + [app.util.router :as rt] + [app.main.data.viewer :as vd]) (:import goog.events.EventType goog.events.KeyCodes)) diff --git a/frontend/src/uxbox/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs similarity index 76% rename from frontend/src/uxbox/main/ui/workspace.cljs rename to frontend/src/app/main/ui/workspace.cljs index 5f78278d3..21810ce43 100644 --- a/frontend/src/uxbox/main/ui/workspace.cljs +++ b/frontend/src/app/main/ui/workspace.cljs @@ -7,31 +7,31 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace +(ns app.main.ui.workspace (:require [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.constants :as c] - [uxbox.main.data.history :as udh] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.streams :as ms] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.hooks :as hooks] - [uxbox.main.ui.workspace.viewport :refer [viewport coordinates]] - [uxbox.main.ui.workspace.colorpalette :refer [colorpalette]] - [uxbox.main.ui.workspace.context-menu :refer [context-menu]] - [uxbox.main.ui.workspace.header :refer [header]] - [uxbox.main.ui.workspace.rules :refer [horizontal-rule vertical-rule]] - [uxbox.main.ui.workspace.scroll :as scroll] - [uxbox.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]] - [uxbox.main.ui.workspace.sidebar.history :refer [history-dialog]] - [uxbox.main.ui.workspace.left-toolbar :refer [left-toolbar]] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom] - [uxbox.common.geom.point :as gpt])) + [app.main.ui.icons :as i] + [app.main.constants :as c] + [app.main.data.history :as udh] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.streams :as ms] + [app.main.ui.keyboard :as kbd] + [app.main.ui.hooks :as hooks] + [app.main.ui.workspace.viewport :refer [viewport coordinates]] + [app.main.ui.workspace.colorpalette :refer [colorpalette]] + [app.main.ui.workspace.context-menu :refer [context-menu]] + [app.main.ui.workspace.header :refer [header]] + [app.main.ui.workspace.rules :refer [horizontal-rule vertical-rule]] + [app.main.ui.workspace.scroll :as scroll] + [app.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]] + [app.main.ui.workspace.sidebar.history :refer [history-dialog]] + [app.main.ui.workspace.left-toolbar :refer [left-toolbar]] + [app.util.data :refer [classnames]] + [app.util.dom :as dom] + [app.common.geom.point :as gpt])) ;; --- Workspace diff --git a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs b/frontend/src/app/main/ui/workspace/colorpalette.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/workspace/colorpalette.cljs rename to frontend/src/app/main/ui/workspace/colorpalette.cljs index 710ae5f1f..61bbc54dc 100644 --- a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs +++ b/frontend/src/app/main/ui/workspace/colorpalette.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.colorpalette +(ns app.main.ui.workspace.colorpalette (:require [beicon.core :as rx] [goog.events :as events] [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.common.math :as mth] - ;; [uxbox.main.data.library :as dlib] - [uxbox.main.data.workspace :as udw] - [uxbox.main.store :as st] - [uxbox.main.ui.components.context-menu :refer [context-menu]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.util.color :refer [hex->rgb]] - [uxbox.util.dom :as dom] - [uxbox.util.object :as obj])) + [app.common.math :as mth] + ;; [app.main.data.library :as dlib] + [app.main.data.workspace :as udw] + [app.main.store :as st] + [app.main.ui.components.context-menu :refer [context-menu]] + [app.main.ui.icons :as i] + [app.main.ui.keyboard :as kbd] + [app.util.color :refer [hex->rgb]] + [app.util.dom :as dom] + [app.util.object :as obj])) ;; --- Refs diff --git a/frontend/src/uxbox/main/ui/workspace/colorpicker.cljs b/frontend/src/app/main/ui/workspace/colorpicker.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/workspace/colorpicker.cljs rename to frontend/src/app/main/ui/workspace/colorpicker.cljs index e9153f77b..31ec33d0d 100644 --- a/frontend/src/uxbox/main/ui/workspace/colorpicker.cljs +++ b/frontend/src/app/main/ui/workspace/colorpicker.cljs @@ -5,11 +5,11 @@ ;; Copyright (c) 2016-2017 Juan de la Cruz ;; Copyright (c) 2016-2019 Andrey Antukh -(ns uxbox.main.ui.workspace.colorpicker +(ns app.main.ui.workspace.colorpicker (:require [rumext.alpha :as mf] - [uxbox.main.store :as st] - [uxbox.main.ui.colorpicker :as cp])) + [app.main.store :as st] + [app.main.ui.colorpicker :as cp])) ;; --- Color Picker Modal diff --git a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs similarity index 94% rename from frontend/src/uxbox/main/ui/workspace/context_menu.cljs rename to frontend/src/app/main/ui/workspace/context_menu.cljs index 7bf57ce2f..4488023f8 100644 --- a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs +++ b/frontend/src/app/main/ui/workspace/context_menu.cljs @@ -7,21 +7,21 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.context-menu +(ns app.main.ui.workspace.context-menu "A workspace specific context menu (mouse right click)." (:require [beicon.core :as rx] [okulary.core :as l] [potok.core :as ptk] [rumext.alpha :as mf] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.main.streams :as ms] - [uxbox.main.ui.icons :as i] - [uxbox.util.dom :as dom] - [uxbox.main.data.workspace :as dw] - [uxbox.main.ui.hooks :refer [use-rxsub]] - [uxbox.main.ui.components.dropdown :refer [dropdown]])) + [app.main.store :as st] + [app.main.refs :as refs] + [app.main.streams :as ms] + [app.main.ui.icons :as i] + [app.util.dom :as dom] + [app.main.data.workspace :as dw] + [app.main.ui.hooks :refer [use-rxsub]] + [app.main.ui.components.dropdown :refer [dropdown]])) (def menu-ref (l/derived :context-menu refs/workspace-local)) diff --git a/frontend/src/uxbox/main/ui/workspace/drawarea.cljs b/frontend/src/app/main/ui/workspace/drawarea.cljs similarity index 86% rename from frontend/src/uxbox/main/ui/workspace/drawarea.cljs rename to frontend/src/app/main/ui/workspace/drawarea.cljs index a954d0e1b..3037db9b4 100644 --- a/frontend/src/uxbox/main/ui/workspace/drawarea.cljs +++ b/frontend/src/app/main/ui/workspace/drawarea.cljs @@ -4,18 +4,18 @@ ;; ;; Copyright (c) 2015-2019 Andrey Antukh -(ns uxbox.main.ui.workspace.drawarea +(ns app.main.ui.workspace.drawarea "Drawing components." (:require [rumext.alpha :as mf] - [uxbox.main.data.workspace :as dw] - [uxbox.main.data.workspace.drawing :as dd] - [uxbox.main.store :as st] - [uxbox.main.ui.workspace.shapes :as shapes] - [uxbox.common.geom.shapes :as gsh] - [uxbox.common.data :as d] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t]])) + [app.main.data.workspace :as dw] + [app.main.data.workspace.drawing :as dd] + [app.main.store :as st] + [app.main.ui.workspace.shapes :as shapes] + [app.common.geom.shapes :as gsh] + [app.common.data :as d] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t]])) (declare generic-draw-area) (declare path-draw-area) diff --git a/frontend/src/uxbox/main/ui/workspace/frame_grid.cljs b/frontend/src/app/main/ui/workspace/frame_grid.cljs similarity index 94% rename from frontend/src/uxbox/main/ui/workspace/frame_grid.cljs rename to frontend/src/app/main/ui/workspace/frame_grid.cljs index 6f773a100..63ef40e27 100644 --- a/frontend/src/uxbox/main/ui/workspace/frame_grid.cljs +++ b/frontend/src/app/main/ui/workspace/frame_grid.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.frame-grid +(ns app.main.ui.workspace.frame-grid (:require [rumext.alpha :as mf] - [uxbox.main.refs :as refs] - [uxbox.common.pages :as cp] - [uxbox.common.geom.shapes :as gsh] - [uxbox.util.geom.grid :as gg])) + [app.main.refs :as refs] + [app.common.pages :as cp] + [app.common.geom.shapes :as gsh] + [app.util.geom.grid :as gg])) (mf/defc square-grid [{:keys [frame zoom grid] :as props}] (let [{:keys [color size] :as params} (-> grid :params) diff --git a/frontend/src/uxbox/main/ui/workspace/header.cljs b/frontend/src/app/main/ui/workspace/header.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/workspace/header.cljs rename to frontend/src/app/main/ui/workspace/header.cljs index e56bcaf42..ae84d8173 100644 --- a/frontend/src/uxbox/main/ui/workspace/header.cljs +++ b/frontend/src/app/main/ui/workspace/header.cljs @@ -8,23 +8,23 @@ ;; Copyright (c) 2015-2017 Andrey Antukh ;; Copyright (c) 2015-2017 Juan de la Cruz -(ns uxbox.main.ui.workspace.header +(ns app.main.ui.workspace.header (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i :include-macros true] - [uxbox.config :as cfg] - [uxbox.main.data.history :as udh] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.dropdown :refer [dropdown]] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.confirm :refer [confirm-dialog]] - [uxbox.main.ui.workspace.presence :as presence] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.util.data :refer [classnames]] - [uxbox.common.math :as mth] - [uxbox.util.router :as rt])) + [app.main.ui.icons :as i :include-macros true] + [app.config :as cfg] + [app.main.data.history :as udh] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.dropdown :refer [dropdown]] + [app.main.ui.modal :as modal] + [app.main.ui.confirm :refer [confirm-dialog]] + [app.main.ui.workspace.presence :as presence] + [app.util.i18n :as i18n :refer [t]] + [app.util.data :refer [classnames]] + [app.common.math :as mth] + [app.util.router :as rt])) ;; --- Zoom Widget diff --git a/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs b/frontend/src/app/main/ui/workspace/left_toolbar.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs rename to frontend/src/app/main/ui/workspace/left_toolbar.cljs index e1ef1e427..7c07d87f8 100644 --- a/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs +++ b/frontend/src/app/main/ui/workspace/left_toolbar.cljs @@ -8,17 +8,17 @@ ;; Copyright (c) 2015-2020 Andrey Antukh ;; Copyright (c) 2015-2020 Juan de la Cruz -(ns uxbox.main.ui.workspace.left-toolbar +(ns app.main.ui.workspace.left-toolbar (:require [rumext.alpha :as mf] - [uxbox.common.media :as cm] - [uxbox.main.refs :as refs] - [uxbox.main.data.workspace :as dw] - [uxbox.main.store :as st] - [uxbox.main.ui.components.file-uploader :refer [file-uploader]] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.main.ui.icons :as i])) + [app.common.media :as cm] + [app.main.refs :as refs] + [app.main.data.workspace :as dw] + [app.main.store :as st] + [app.main.ui.components.file-uploader :refer [file-uploader]] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t]] + [app.main.ui.icons :as i])) ;; --- Component: Left toolbar diff --git a/frontend/src/uxbox/main/ui/workspace/libraries.cljs b/frontend/src/app/main/ui/workspace/libraries.cljs similarity index 94% rename from frontend/src/uxbox/main/ui/workspace/libraries.cljs rename to frontend/src/app/main/ui/workspace/libraries.cljs index 9430f8a1e..65d9ebd86 100644 --- a/frontend/src/uxbox/main/ui/workspace/libraries.cljs +++ b/frontend/src/app/main/ui/workspace/libraries.cljs @@ -5,18 +5,18 @@ ;; Copyright (c) 2016 Andrey Antukh ;; Copyright (c) 2016 Juan de la Cruz -(ns uxbox.main.ui.workspace.libraries +(ns app.main.ui.workspace.libraries (:require [rumext.alpha :as mf] [cuerdas.core :as str] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :refer (tr)] - [uxbox.util.data :refer [classnames matches-search]] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.main.data.workspace :as dw] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.modal :as modal])) + [app.util.dom :as dom] + [app.util.i18n :refer (tr)] + [app.util.data :refer [classnames matches-search]] + [app.main.store :as st] + [app.main.refs :as refs] + [app.main.data.workspace :as dw] + [app.main.ui.icons :as i] + [app.main.ui.modal :as modal])) (mf/defc libraries-tab [{:keys [file libraries shared-files] :as props}] diff --git a/frontend/src/uxbox/main/ui/workspace/presence.cljs b/frontend/src/app/main/ui/workspace/presence.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/workspace/presence.cljs rename to frontend/src/app/main/ui/workspace/presence.cljs index 18906e868..001765f5f 100644 --- a/frontend/src/uxbox/main/ui/workspace/presence.cljs +++ b/frontend/src/app/main/ui/workspace/presence.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.presence +(ns app.main.ui.workspace.presence (:require [rumext.alpha :as mf] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.util.router :as rt])) + [app.main.refs :as refs] + [app.main.store :as st] + [app.util.router :as rt])) (def pointer-icon-path (str "M5.292 4.027L1.524.26l-.05-.01L0 0l.258 1.524 3.769 3.768zm-.45 " diff --git a/frontend/src/uxbox/main/ui/workspace/rules.cljs b/frontend/src/app/main/ui/workspace/rules.cljs similarity index 97% rename from frontend/src/uxbox/main/ui/workspace/rules.cljs rename to frontend/src/app/main/ui/workspace/rules.cljs index 58cb9e34b..bdd98a1b9 100644 --- a/frontend/src/uxbox/main/ui/workspace/rules.cljs +++ b/frontend/src/app/main/ui/workspace/rules.cljs @@ -7,11 +7,11 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.rules +(ns app.main.ui.workspace.rules (:require [rumext.alpha :as mf] - [uxbox.common.math :as mth] - [uxbox.util.object :as obj])) + [app.common.math :as mth] + [app.util.object :as obj])) (defn- calculate-step-size [zoom] diff --git a/frontend/src/uxbox/main/ui/workspace/scroll.cljs b/frontend/src/app/main/ui/workspace/scroll.cljs similarity index 94% rename from frontend/src/uxbox/main/ui/workspace/scroll.cljs rename to frontend/src/app/main/ui/workspace/scroll.cljs index 57d128956..29070de8c 100644 --- a/frontend/src/uxbox/main/ui/workspace/scroll.cljs +++ b/frontend/src/app/main/ui/workspace/scroll.cljs @@ -5,13 +5,13 @@ ;; Copyright (c) 2015-2017 Andrey Antukh ;; Copyright (c) 2015-2017 Juan de la Cruz -(ns uxbox.main.ui.workspace.scroll +(ns app.main.ui.workspace.scroll "Workspace scroll events handling." (:require [beicon.core :as rx] [potok.core :as ptk] - [uxbox.main.refs :as refs] - [uxbox.util.dom :as dom] - [uxbox.common.geom.point :as gpt])) + [app.main.refs :as refs] + [app.util.dom :as dom] + [app.common.geom.point :as gpt])) ;; FIXME: revisit this ns in order to find a better location for its functions ;; TODO: this need a good refactor (probably move to events with access to the state) diff --git a/frontend/src/uxbox/main/ui/workspace/selection.cljs b/frontend/src/app/main/ui/workspace/selection.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/workspace/selection.cljs rename to frontend/src/app/main/ui/workspace/selection.cljs index 661f323b8..87539d4bb 100644 --- a/frontend/src/uxbox/main/ui/workspace/selection.cljs +++ b/frontend/src/app/main/ui/workspace/selection.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.selection +(ns app.main.ui.workspace.selection "Selection handlers component." (:require [beicon.core :as rx] @@ -15,18 +15,18 @@ [potok.core :as ptk] [rumext.alpha :as mf] [rumext.util :refer [map->obj]] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.streams :as ms] - [uxbox.main.ui.cursors :as cur] - [uxbox.util.dom :as dom] - [uxbox.util.object :as obj] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.matrix :as gmt] - [uxbox.util.debug :refer [debug?]] - [uxbox.main.ui.workspace.shapes.outline :refer [outline]])) + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.streams :as ms] + [app.main.ui.cursors :as cur] + [app.util.dom :as dom] + [app.util.object :as obj] + [app.common.geom.shapes :as geom] + [app.common.geom.point :as gpt] + [app.common.geom.matrix :as gmt] + [app.util.debug :refer [debug?]] + [app.main.ui.workspace.shapes.outline :refer [outline]])) (def rotation-handler-size 25) diff --git a/frontend/src/uxbox/main/ui/workspace/shapes.cljs b/frontend/src/app/main/ui/workspace/shapes.cljs similarity index 79% rename from frontend/src/uxbox/main/ui/workspace/shapes.cljs rename to frontend/src/app/main/ui/workspace/shapes.cljs index 0d4ff2006..880691aef 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes.cljs +++ b/frontend/src/app/main/ui/workspace/shapes.cljs @@ -7,32 +7,32 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes +(ns app.main.ui.workspace.shapes "A workspace specific shapes wrappers." (:require [rumext.alpha :as mf] [beicon.core :as rx] - [uxbox.main.streams :as ms] - [uxbox.main.ui.hooks :as hooks] - [uxbox.main.ui.cursors :as cur] - [uxbox.main.ui.shapes.rect :as rect] - [uxbox.main.ui.shapes.circle :as circle] - [uxbox.main.ui.shapes.icon :as icon] - [uxbox.main.ui.shapes.image :as image] - [uxbox.main.data.workspace.selection :as dws] - [uxbox.main.store :as st] + [app.main.streams :as ms] + [app.main.ui.hooks :as hooks] + [app.main.ui.cursors :as cur] + [app.main.ui.shapes.rect :as rect] + [app.main.ui.shapes.circle :as circle] + [app.main.ui.shapes.icon :as icon] + [app.main.ui.shapes.image :as image] + [app.main.data.workspace.selection :as dws] + [app.main.store :as st] ;; Shapes that has some peculiarities are defined in its own - ;; namespace under uxbox.ui.workspace.shapes.* prefix, all the + ;; namespace under app.ui.workspace.shapes.* prefix, all the ;; others are defined using a generic wrapper implemented in ;; common. - [uxbox.main.ui.workspace.shapes.bounding-box :refer [bounding-box]] - [uxbox.main.ui.workspace.shapes.common :as common] - [uxbox.main.ui.workspace.shapes.frame :as frame] - [uxbox.main.ui.workspace.shapes.group :as group] - [uxbox.main.ui.workspace.shapes.path :as path] - [uxbox.main.ui.workspace.shapes.text :as text] - [uxbox.common.geom.shapes :as geom])) + [app.main.ui.workspace.shapes.bounding-box :refer [bounding-box]] + [app.main.ui.workspace.shapes.common :as common] + [app.main.ui.workspace.shapes.frame :as frame] + [app.main.ui.workspace.shapes.group :as group] + [app.main.ui.workspace.shapes.path :as path] + [app.main.ui.workspace.shapes.text :as text] + [app.common.geom.shapes :as geom])) (declare group-wrapper) (declare frame-wrapper) diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/bounding_box.cljs b/frontend/src/app/main/ui/workspace/shapes/bounding_box.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/workspace/shapes/bounding_box.cljs rename to frontend/src/app/main/ui/workspace/shapes/bounding_box.cljs index c2a2db2ff..b6b44c91f 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/bounding_box.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/bounding_box.cljs @@ -4,16 +4,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.bounding-box +(ns app.main.ui.workspace.shapes.bounding-box (:require [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.util.debug :as debug] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.util.debug :refer [debug?]] - [uxbox.main.refs :as refs] + [app.util.debug :as debug] + [app.common.geom.shapes :as geom] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.util.debug :refer [debug?]] + [app.main.refs :as refs] ["randomcolor" :as rdcolor])) (defn fixed diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/common.cljs b/frontend/src/app/main/ui/workspace/shapes/common.cljs similarity index 86% rename from frontend/src/uxbox/main/ui/workspace/shapes/common.cljs rename to frontend/src/app/main/ui/workspace/shapes/common.cljs index 60b630f8e..1967e9dbe 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/common.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/common.cljs @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.common +(ns app.main.ui.workspace.shapes.common (:require [rumext.alpha :as mf] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.util.dom :as dom] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as geom])) + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.keyboard :as kbd] + [app.util.dom :as dom] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom])) (defn- on-mouse-down [event {:keys [id type] :as shape}] diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs similarity index 87% rename from frontend/src/uxbox/main/ui/workspace/shapes/frame.cljs rename to frontend/src/app/main/ui/workspace/shapes/frame.cljs index ad8d0176a..56a4da92f 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/frame.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs @@ -7,23 +7,23 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.frame +(ns app.main.ui.workspace.shapes.frame (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.constants :as c] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.workspace.shapes.common :as common] - [uxbox.main.data.workspace.selection :as dws] - [uxbox.main.ui.shapes.frame :as frame] - [uxbox.common.geom.matrix :as gmt] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as geom] - [uxbox.util.dom :as dom] - [uxbox.main.streams :as ms] - [uxbox.util.timers :as ts])) + [app.common.data :as d] + [app.main.constants :as c] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.workspace.shapes.common :as common] + [app.main.data.workspace.selection :as dws] + [app.main.ui.shapes.frame :as frame] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom] + [app.util.dom :as dom] + [app.main.streams :as ms] + [app.util.timers :as ts])) (defn- frame-wrapper-factory-equals? [np op] diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/group.cljs b/frontend/src/app/main/ui/workspace/shapes/group.cljs similarity index 84% rename from frontend/src/uxbox/main/ui/workspace/shapes/group.cljs rename to frontend/src/app/main/ui/workspace/shapes/group.cljs index 2a777833c..0ef0d63bc 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/group.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/group.cljs @@ -7,19 +7,19 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.group +(ns app.main.ui.workspace.shapes.group (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.constants :as c] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.workspace.shapes.common :as common] - [uxbox.main.ui.shapes.group :as group] - [uxbox.util.dom :as dom] - [uxbox.main.streams :as ms] - [uxbox.util.timers :as ts])) + [app.common.data :as d] + [app.main.constants :as c] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.workspace.shapes.common :as common] + [app.main.ui.shapes.group :as group] + [app.util.dom :as dom] + [app.main.streams :as ms] + [app.util.timers :as ts])) (defn- group-wrapper-factory-equals? [np op] diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/interactions.cljs b/frontend/src/app/main/ui/workspace/shapes/interactions.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/workspace/shapes/interactions.cljs rename to frontend/src/app/main/ui/workspace/shapes/interactions.cljs index 08ecb273f..d8229c5e6 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/interactions.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/interactions.cljs @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.interactions +(ns app.main.ui.workspace.shapes.interactions "Visually show shape interactions in workspace" (:require [rumext.alpha :as mf] [cuerdas.core :as str] - [uxbox.util.data :as dt] - [uxbox.util.dom :as dom] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.shapes :as geom] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.main.data.workspace :as dw] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.workspace.shapes.outline :refer [outline]])) + [app.util.data :as dt] + [app.util.dom :as dom] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom] + [app.main.store :as st] + [app.main.refs :as refs] + [app.main.data.workspace :as dw] + [app.main.ui.keyboard :as kbd] + [app.main.ui.workspace.shapes.outline :refer [outline]])) (defn- get-click-interaction [shape] diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/outline.cljs b/frontend/src/app/main/ui/workspace/shapes/outline.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/workspace/shapes/outline.cljs rename to frontend/src/app/main/ui/workspace/shapes/outline.cljs index fa3befe0e..1b7efbd3f 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/outline.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/outline.cljs @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.outline +(ns app.main.ui.workspace.shapes.outline (:require [rumext.alpha :as mf] - [uxbox.common.geom.shapes :as gsh] - [uxbox.util.object :as obj] + [app.common.geom.shapes :as gsh] + [app.util.object :as obj] [rumext.util :refer [map->obj]] - [uxbox.main.ui.shapes.path :as path] - [uxbox.main.refs :as refs])) + [app.main.ui.shapes.path :as path] + [app.main.refs :as refs])) (mf/defc outline diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/path.cljs b/frontend/src/app/main/ui/workspace/shapes/path.cljs similarity index 75% rename from frontend/src/uxbox/main/ui/workspace/shapes/path.cljs rename to frontend/src/app/main/ui/workspace/shapes/path.cljs index 4990ba691..cb05c2a2a 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/path.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/path.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.path +(ns app.main.ui.workspace.shapes.path (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.constants :as c] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.shapes.path :as path] - [uxbox.main.ui.workspace.shapes.common :as common] - [uxbox.main.data.workspace.drawing :as dr] - [uxbox.util.dom :as dom] - [uxbox.util.interop :as itr] - [uxbox.main.streams :as ms] - [uxbox.util.timers :as ts])) + [app.common.data :as d] + [app.main.constants :as c] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.keyboard :as kbd] + [app.main.ui.shapes.path :as path] + [app.main.ui.workspace.shapes.common :as common] + [app.main.data.workspace.drawing :as dr] + [app.util.dom :as dom] + [app.util.interop :as itr] + [app.main.streams :as ms] + [app.util.timers :as ts])) (mf/defc path-wrapper {::mf/wrap-props false} diff --git a/frontend/src/uxbox/main/ui/workspace/shapes/text.cljs b/frontend/src/app/main/ui/workspace/shapes/text.cljs similarity index 94% rename from frontend/src/uxbox/main/ui/workspace/shapes/text.cljs rename to frontend/src/app/main/ui/workspace/shapes/text.cljs index 6e94ce282..290a60bcf 100644 --- a/frontend/src/uxbox/main/ui/workspace/shapes/text.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/text.cljs @@ -7,26 +7,26 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.shapes.text +(ns app.main.ui.workspace.shapes.text (:require [cuerdas.core :as str] [goog.events :as events] [goog.object :as gobj] [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.data.workspace :as dw] - [uxbox.main.data.workspace.texts :as dwt] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.cursors :as cur] - [uxbox.main.ui.workspace.shapes.common :as common] - [uxbox.main.ui.shapes.text :as text] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.fonts :as fonts] - [uxbox.util.color :as color] - [uxbox.util.dom :as dom] - [uxbox.common.geom.shapes :as geom] - [uxbox.util.object :as obj] + [app.common.data :as d] + [app.main.data.workspace :as dw] + [app.main.data.workspace.texts :as dwt] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.cursors :as cur] + [app.main.ui.workspace.shapes.common :as common] + [app.main.ui.shapes.text :as text] + [app.main.ui.keyboard :as kbd] + [app.main.fonts :as fonts] + [app.util.color :as color] + [app.util.dom :as dom] + [app.common.geom.shapes :as geom] + [app.util.object :as obj] ["slate" :as slate] ["slate-react" :as rslate]) (:import diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar.cljs b/frontend/src/app/main/ui/workspace/sidebar.cljs similarity index 77% rename from frontend/src/uxbox/main/ui/workspace/sidebar.cljs rename to frontend/src/app/main/ui/workspace/sidebar.cljs index 8745a299a..bba6a9d2d 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar.cljs @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar +(ns app.main.ui.workspace.sidebar (:require [rumext.alpha :as mf] [cuerdas.core :as str] - [uxbox.main.ui.workspace.sidebar.history :refer [history-toolbox]] - [uxbox.main.ui.workspace.sidebar.layers :refer [layers-toolbox]] - [uxbox.main.ui.workspace.sidebar.options :refer [options-toolbox]] - [uxbox.main.ui.workspace.sidebar.sitemap :refer [sitemap-toolbox]] - [uxbox.main.ui.workspace.sidebar.assets :refer [assets-toolbox]])) + [app.main.ui.workspace.sidebar.history :refer [history-toolbox]] + [app.main.ui.workspace.sidebar.layers :refer [layers-toolbox]] + [app.main.ui.workspace.sidebar.options :refer [options-toolbox]] + [app.main.ui.workspace.sidebar.sitemap :refer [sitemap-toolbox]] + [app.main.ui.workspace.sidebar.assets :refer [assets-toolbox]])) ;; --- Left Sidebar (Component) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/align.cljs b/frontend/src/app/main/ui/workspace/sidebar/align.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/workspace/sidebar/align.cljs rename to frontend/src/app/main/ui/workspace/sidebar/align.cljs index 4748f4ee2..f0af7e62e 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/align.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/align.cljs @@ -5,15 +5,15 @@ ;; Copyright (c) 2015-2016 Andrey Antukh ;; Copyright (c) 2015-2016 Juan de la Cruz -(ns uxbox.main.ui.workspace.sidebar.align +(ns app.main.ui.workspace.sidebar.align (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.data.workspace :as dw] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.common.uuid :as uuid])) + [app.main.ui.icons :as i] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.data.workspace :as dw] + [app.util.i18n :as i18n :refer [t]] + [app.common.uuid :as uuid])) (mf/defc align-options [] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/workspace/sidebar/assets.cljs rename to frontend/src/app/main/ui/workspace/sidebar/assets.cljs index 5c0b52cbb..9eb329726 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/assets.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs @@ -7,37 +7,37 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.assets +(ns app.main.ui.workspace.sidebar.assets (:require [okulary.core :as l] [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.config :as cfg] - [uxbox.common.data :as d] - [uxbox.common.media :as cm] - [uxbox.common.pages :as cp] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.geom.point :as gpt] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.workspace :as dw] - [uxbox.main.data.colors :as dcol] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.shapes.icon :as icon] - [uxbox.util.dom :as dom] - [uxbox.util.dom.dnd :as dnd] - [uxbox.util.timers :as timers] - [uxbox.common.uuid :as uuid] - [uxbox.util.i18n :as i18n :refer [tr]] - [uxbox.util.data :refer [classnames matches-search]] - [uxbox.util.router :as rt] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.colorpicker :refer [colorpicker most-used-colors]] - [uxbox.main.ui.components.tab-container :refer [tab-container tab-element]] - [uxbox.main.ui.components.file-uploader :refer [file-uploader]] - [uxbox.main.ui.components.context-menu :refer [context-menu]] - [uxbox.main.ui.workspace.libraries :refer [libraries-dialog]])) + [app.config :as cfg] + [app.common.data :as d] + [app.common.media :as cm] + [app.common.pages :as cp] + [app.common.geom.shapes :as geom] + [app.common.geom.point :as gpt] + [app.main.ui.icons :as i] + [app.main.data.workspace :as dw] + [app.main.data.colors :as dcol] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.keyboard :as kbd] + [app.main.ui.shapes.icon :as icon] + [app.util.dom :as dom] + [app.util.dom.dnd :as dnd] + [app.util.timers :as timers] + [app.common.uuid :as uuid] + [app.util.i18n :as i18n :refer [tr]] + [app.util.data :refer [classnames matches-search]] + [app.util.router :as rt] + [app.main.ui.modal :as modal] + [app.main.ui.colorpicker :refer [colorpicker most-used-colors]] + [app.main.ui.components.tab-container :refer [tab-container tab-element]] + [app.main.ui.components.file-uploader :refer [file-uploader]] + [app.main.ui.components.context-menu :refer [context-menu]] + [app.main.ui.workspace.libraries :refer [libraries-dialog]])) (mf/defc modal-edit-color [{:keys [color-value on-accept on-cancel] :as ctx}] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs b/frontend/src/app/main/ui/workspace/sidebar/history.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs rename to frontend/src/app/main/ui/workspace/sidebar/history.cljs index db91e562e..0d068410b 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/history.cljs @@ -5,19 +5,19 @@ ;; Copyright (c) 2015-2019 Andrey Antukh ;; Copyright (c) 2015-2017 Juan de la Cruz -(ns uxbox.main.ui.workspace.sidebar.history +(ns app.main.ui.workspace.sidebar.history (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.history :as udh] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.util.data :refer [read-string]] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :refer (tr)] - [uxbox.util.router :as r] - [uxbox.util.time :as dt])) + [app.main.ui.icons :as i] + [app.main.data.history :as udh] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.util.data :refer [read-string]] + [app.util.dom :as dom] + [app.util.i18n :refer (tr)] + [app.util.router :as r] + [app.util.time :as dt])) ;; --- History Item (Component) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs similarity index 94% rename from frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs rename to frontend/src/app/main/ui/workspace/sidebar/layers.cljs index 17f362550..5328160aa 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs @@ -8,27 +8,27 @@ ;; Copyright (c) 2015-2016 Juan de la Cruz ;; Copyright (c) 2015-2020 Andrey Antukh -(ns uxbox.main.ui.workspace.sidebar.layers +(ns app.main.ui.workspace.sidebar.layers (:require [okulary.core :as l] [rumext.alpha :as mf] [beicon.core :as rx] - [uxbox.main.ui.icons :as i] - [uxbox.common.data :as d] - [uxbox.common.uuid :as uuid] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.hooks :as hooks] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.shapes.icon :as icon] - [uxbox.util.object :as obj] - [uxbox.util.dom :as dom] - [uxbox.util.timers :as ts] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.util.perf :as perf])) + [app.main.ui.icons :as i] + [app.common.data :as d] + [app.common.uuid :as uuid] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.hooks :as hooks] + [app.main.ui.keyboard :as kbd] + [app.main.ui.shapes.icon :as icon] + [app.util.object :as obj] + [app.util.dom :as dom] + [app.util.timers :as ts] + [app.util.i18n :as i18n :refer [t]] + [app.util.perf :as perf])) ;; --- Helpers @@ -175,7 +175,7 @@ (st/emit! (dw/toggle-collapse (:id item))))) [dprops dref] (hooks/use-sortable - :data-type "uxbox/layer" + :data-type "app/layer" :on-drop on-drop :on-drag on-drag :on-hold on-hold diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs b/frontend/src/app/main/ui/workspace/sidebar/options.cljs similarity index 67% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options.cljs index f1b95c798..6b5dd80bc 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options.cljs @@ -7,31 +7,31 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options +(ns app.main.ui.workspace.sidebar.options (:require [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.common.spec :as us] - [uxbox.main.data.workspace :as udw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.tab-container :refer [tab-container tab-element]] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.workspace.sidebar.align :refer [align-options]] - [uxbox.main.ui.workspace.sidebar.options.circle :as circle] - [uxbox.main.ui.workspace.sidebar.options.exports :refer [exports-menu]] - [uxbox.main.ui.workspace.sidebar.options.frame :as frame] - [uxbox.main.ui.workspace.sidebar.options.group :as group] - [uxbox.main.ui.workspace.sidebar.options.icon :as icon] - [uxbox.main.ui.workspace.sidebar.options.image :as image] - [uxbox.main.ui.workspace.sidebar.options.text :as text] - [uxbox.main.ui.workspace.sidebar.options.page :as page] - [uxbox.main.ui.workspace.sidebar.options.multiple :as multiple] - [uxbox.main.ui.workspace.sidebar.options.interactions :refer [interactions-menu]] - [uxbox.main.ui.workspace.sidebar.options.path :as path] - [uxbox.main.ui.workspace.sidebar.options.rect :as rect] - [uxbox.main.ui.workspace.sidebar.options.text :as text] - [uxbox.util.i18n :as i18n :refer [tr t]])) + [app.common.spec :as us] + [app.main.data.workspace :as udw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.tab-container :refer [tab-container tab-element]] + [app.main.ui.icons :as i] + [app.main.ui.workspace.sidebar.align :refer [align-options]] + [app.main.ui.workspace.sidebar.options.circle :as circle] + [app.main.ui.workspace.sidebar.options.exports :refer [exports-menu]] + [app.main.ui.workspace.sidebar.options.frame :as frame] + [app.main.ui.workspace.sidebar.options.group :as group] + [app.main.ui.workspace.sidebar.options.icon :as icon] + [app.main.ui.workspace.sidebar.options.image :as image] + [app.main.ui.workspace.sidebar.options.text :as text] + [app.main.ui.workspace.sidebar.options.page :as page] + [app.main.ui.workspace.sidebar.options.multiple :as multiple] + [app.main.ui.workspace.sidebar.options.interactions :refer [interactions-menu]] + [app.main.ui.workspace.sidebar.options.path :as path] + [app.main.ui.workspace.sidebar.options.rect :as rect] + [app.main.ui.workspace.sidebar.options.text :as text] + [app.util.i18n :as i18n :refer [tr t]])) ;; --- Options diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/circle.cljs similarity index 77% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/circle.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/circle.cljs index 794849abc..287c2d9c2 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/circle.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.circle +(ns app.main.ui.workspace.sidebar.options.circle (:require [rumext.alpha :as mf] - [uxbox.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] - [uxbox.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) + [app.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] + [app.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) (mf/defc options [{:keys [shape] :as props}] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/exports.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/exports.cljs similarity index 93% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/exports.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/exports.cljs index f5ca72a1c..83a2c312f 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/exports.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/exports.cljs @@ -7,20 +7,20 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.exports +(ns app.main.ui.workspace.sidebar.options.exports (:require [cuerdas.core :as str] [beicon.core :as rx] [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.messages :as dm] - [uxbox.main.data.workspace :as udw] - [uxbox.main.store :as st] - [uxbox.util.object :as obj] - [uxbox.util.dom :as dom] - [uxbox.util.http-api :as http] - [uxbox.util.i18n :as i18n :refer [tr t]])) + [app.common.data :as d] + [app.main.ui.icons :as i] + [app.main.data.messages :as dm] + [app.main.data.workspace :as udw] + [app.main.store :as st] + [app.util.object :as obj] + [app.util.dom :as dom] + [app.util.http-api :as http] + [app.util.i18n :as i18n :refer [tr t]])) (defn- request-export [shape exports] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/fill.cljs similarity index 88% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/fill.cljs index 32b84111d..40572ed25 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/fill.cljs @@ -7,18 +7,18 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.fill +(ns app.main.ui.workspace.sidebar.options.fill (:require [rumext.alpha :as mf] - [uxbox.common.pages :as cp] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.data.workspace.texts :as dwt] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]] - [uxbox.util.i18n :as i18n :refer [tr t]] - [uxbox.util.object :as obj])) + [app.common.pages :as cp] + [app.main.data.workspace.common :as dwc] + [app.main.data.workspace.texts :as dwt] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.icons :as i] + [app.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]] + [app.util.i18n :as i18n :refer [tr t]] + [app.util.object :as obj])) (def fill-attrs [:fill-color :fill-opacity]) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/frame.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/frame.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/frame.cljs index c78baed5f..afb6e0e48 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/frame.cljs @@ -8,21 +8,21 @@ ;; Copyright (c) 2015-2020 Andrey Antukh ;; Copyright (c) 2015-2020 Juan de la Cruz -(ns uxbox.main.ui.workspace.sidebar.options.frame +(ns app.main.ui.workspace.sidebar.options.frame (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.util.dom :as dom] - [uxbox.common.geom.point :as gpt] - [uxbox.util.i18n :refer [tr]] - [uxbox.common.math :as math] - [uxbox.main.store :as st] - [uxbox.main.data.workspace :as udw] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.components.dropdown :refer [dropdown]] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] - [uxbox.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]] - [uxbox.main.ui.workspace.sidebar.options.frame-grid :refer [frame-grid]])) + [app.common.data :as d] + [app.util.dom :as dom] + [app.common.geom.point :as gpt] + [app.util.i18n :refer [tr]] + [app.common.math :as math] + [app.main.store :as st] + [app.main.data.workspace :as udw] + [app.main.ui.icons :as i] + [app.main.ui.components.dropdown :refer [dropdown]] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] + [app.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.frame-grid :refer [frame-grid]])) (declare +size-presets+) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/frame_grid.cljs similarity index 93% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/frame_grid.cljs index 8f6ebb302..198957675 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/frame_grid.cljs @@ -7,24 +7,24 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.frame-grid +(ns app.main.ui.workspace.sidebar.options.frame-grid (:require [rumext.alpha :as mf] - [uxbox.util.dom :as dom] - [uxbox.util.data :as d] - [uxbox.common.math :as mth] - [uxbox.common.data :refer [parse-integer]] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.main.data.workspace.grid :as dw] - [uxbox.util.geom.grid :as gg] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]] - [uxbox.main.ui.workspace.sidebar.options.rows.input-row :refer [input-row]] - [uxbox.main.ui.components.select :refer [select]] - [uxbox.main.ui.components.editable-select :refer [editable-select]] - [uxbox.main.ui.components.dropdown :refer [dropdown]] - [uxbox.util.i18n :as i18n :refer [tr t]])) + [app.util.dom :as dom] + [app.util.data :as d] + [app.common.math :as mth] + [app.common.data :refer [parse-integer]] + [app.main.store :as st] + [app.main.refs :as refs] + [app.main.data.workspace.grid :as dw] + [app.util.geom.grid :as gg] + [app.main.ui.icons :as i] + [app.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]] + [app.main.ui.workspace.sidebar.options.rows.input-row :refer [input-row]] + [app.main.ui.components.select :refer [select]] + [app.main.ui.components.editable-select :refer [editable-select]] + [app.main.ui.components.dropdown :refer [dropdown]] + [app.util.i18n :as i18n :refer [tr t]])) (mf/defc advanced-options [{:keys [visible? on-close children]}] (when visible? diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/group.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/group.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/group.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/group.cljs index d870ff216..8cba6c38c 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/group.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/group.cljs @@ -8,18 +8,18 @@ ;; Copyright (c) 2015-2020 Andrey Antukh ;; Copyright (c) 2015-2020 Juan de la Cruz -(ns uxbox.main.ui.workspace.sidebar.options.group +(ns app.main.ui.workspace.sidebar.options.group (:require [rumext.alpha :as mf] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.pages-helpers :as cph] - [uxbox.main.refs :as refs] - [uxbox.main.data.workspace.texts :as dwt] - [uxbox.main.ui.workspace.sidebar.options.multiple :refer [get-shape-attrs]] - [uxbox.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] - [uxbox.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]] - [uxbox.main.ui.workspace.sidebar.options.text :refer [text-fill-attrs + [app.common.geom.shapes :as geom] + [app.common.pages-helpers :as cph] + [app.main.refs :as refs] + [app.main.data.workspace.texts :as dwt] + [app.main.ui.workspace.sidebar.options.multiple :refer [get-shape-attrs]] + [app.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] + [app.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.text :refer [text-fill-attrs text-font-attrs text-align-attrs text-spacing-attrs diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/icon.cljs similarity index 76% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/icon.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/icon.cljs index 3b687a6bd..bba70abef 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/icon.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.icon +(ns app.main.ui.workspace.sidebar.options.icon (:require [rumext.alpha :as mf] - [uxbox.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] - [uxbox.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) + [app.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] + [app.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) (mf/defc options [{:keys [shape] :as props}] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/image.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/image.cljs similarity index 82% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/image.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/image.cljs index 01771378e..ba9402205 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/image.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/image.cljs @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.image +(ns app.main.ui.workspace.sidebar.options.image (:require [rumext.alpha :as mf] - [uxbox.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]])) + [app.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]])) (mf/defc options [{:keys [shape] :as props}] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/interactions.cljs similarity index 89% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/interactions.cljs index 9a973bffa..56f9e2180 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/interactions.cljs @@ -7,18 +7,18 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.interactions +(ns app.main.ui.workspace.sidebar.options.interactions (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.common.pages-helpers :as cph] - [uxbox.main.data.workspace :as dw] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.ui.components.dropdown :refer [dropdown]] - [uxbox.main.ui.icons :as i] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t]])) + [app.common.data :as d] + [app.common.pages-helpers :as cph] + [app.main.data.workspace :as dw] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.components.dropdown :refer [dropdown]] + [app.main.ui.icons :as i] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t]])) (mf/defc interactions-menu [{:keys [shape] :as props}] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/measures.cljs similarity index 93% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/measures.cljs index c104bd30c..fae050ac3 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/measures.cljs @@ -7,21 +7,21 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.measures +(ns app.main.ui.workspace.sidebar.options.measures (:require [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.common.data :as d] - [uxbox.util.dom :as dom] - [uxbox.util.data :refer [classnames]] - [uxbox.common.geom.shapes :as gsh] - [uxbox.common.geom.point :as gpt] - [uxbox.main.data.workspace :as udw] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.common.math :as math] - [uxbox.util.i18n :refer [t] :as i18n])) + [app.main.ui.icons :as i] + [app.main.store :as st] + [app.main.refs :as refs] + [app.common.data :as d] + [app.util.dom :as dom] + [app.util.data :refer [classnames]] + [app.common.geom.shapes :as gsh] + [app.common.geom.point :as gpt] + [app.main.data.workspace :as udw] + [app.main.data.workspace.common :as dwc] + [app.common.math :as math] + [app.util.i18n :refer [t] :as i18n])) (def measure-attrs [:proportion-lock :width :height :x :y :rotation :rx :ry :selrect]) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/multiple.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/multiple.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/multiple.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/multiple.cljs index e7026ff68..fd2df9729 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/multiple.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/multiple.cljs @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.multiple +(ns app.main.ui.workspace.sidebar.options.multiple (:require [rumext.alpha :as mf] - [uxbox.common.geom.shapes :as geom] - [uxbox.main.data.workspace.texts :as dwt] - [uxbox.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] - [uxbox.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]] - [uxbox.main.ui.workspace.sidebar.options.text :refer [text-fill-attrs + [app.common.geom.shapes :as geom] + [app.main.data.workspace.texts :as dwt] + [app.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] + [app.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]] + [app.main.ui.workspace.sidebar.options.text :refer [text-fill-attrs text-font-attrs text-align-attrs text-spacing-attrs diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/page.cljs similarity index 81% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/page.cljs index 7a13bab87..1c2137d0f 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/page.cljs @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.page +(ns app.main.ui.workspace.sidebar.options.page "Page options menu entries." (:require [rumext.alpha :as mf] [okulary.core :as l] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.data.workspace :as dw] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]])) + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.data.workspace :as dw] + [app.util.i18n :as i18n :refer [t]] + [app.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]])) (def options-iref (l/derived :options refs/workspace-data)) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/path.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/path.cljs similarity index 76% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/path.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/path.cljs index 16ce0d8dc..e3547846c 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/path.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/path.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.path +(ns app.main.ui.workspace.sidebar.options.path (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] - [uxbox.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) + [app.common.data :as d] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] + [app.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) (mf/defc options [{:keys [shape] :as props}] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rect.cljs similarity index 77% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/rect.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/rect.cljs index c73635576..f74aff236 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/rect.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.rect +(ns app.main.ui.workspace.sidebar.options.rect (:require [rumext.alpha :as mf] - [uxbox.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] - [uxbox.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) + [app.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-attrs fill-menu]] + [app.main.ui.workspace.sidebar.options.stroke :refer [stroke-attrs stroke-menu]])) (mf/defc options {::mf/wrap [mf/memo]} diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rows/color_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs similarity index 93% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/rows/color_row.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs index b318479e0..5db38a7cc 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rows/color_row.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs @@ -7,16 +7,16 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.rows.color-row +(ns app.main.ui.workspace.sidebar.options.rows.color-row (:require [rumext.alpha :as mf] - [uxbox.common.math :as math] - [uxbox.util.dom :as dom] - [uxbox.util.data :refer [classnames]] - [uxbox.util.i18n :as i18n :refer [tr]] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.workspace.colorpicker :refer [colorpicker-modal]] - [uxbox.common.data :as d])) + [app.common.math :as math] + [app.util.dom :as dom] + [app.util.data :refer [classnames]] + [app.util.i18n :as i18n :refer [tr]] + [app.main.ui.modal :as modal] + [app.main.ui.workspace.colorpicker :refer [colorpicker-modal]] + [app.common.data :as d])) (defn color-picker-callback [color handle-change-color disable-opacity] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rows/input_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/input_row.cljs similarity index 86% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/rows/input_row.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/rows/input_row.cljs index c71768428..4c7933334 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rows/input_row.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/input_row.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.rows.input-row +(ns app.main.ui.workspace.sidebar.options.rows.input-row (:require [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.ui.components.select :refer [select]] - [uxbox.main.ui.components.editable-select :refer [editable-select]] - [uxbox.util.dom :as dom])) + [app.common.data :as d] + [app.main.ui.components.select :refer [select]] + [app.main.ui.components.editable-select :refer [editable-select]] + [app.util.dom :as dom])) (mf/defc input-row [{:keys [label options value class min max on-change type placeholder]}] [:div.row-flex.input-row diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/stroke.cljs similarity index 91% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/stroke.cljs index f9d093846..dda7ac088 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/stroke.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.stroke +(ns app.main.ui.workspace.sidebar.options.stroke (:require [cuerdas.core :as str] [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.common.math :as math] - [uxbox.main.data.workspace.common :as dwc] - [uxbox.main.store :as st] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.workspace.colorpicker :refer [colorpicker-modal]] - [uxbox.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]] - [uxbox.util.data :refer [classnames]] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [tr t]] - [uxbox.util.object :as obj])) + [app.common.data :as d] + [app.common.math :as math] + [app.main.data.workspace.common :as dwc] + [app.main.store :as st] + [app.main.ui.icons :as i] + [app.main.ui.modal :as modal] + [app.main.ui.workspace.colorpicker :refer [colorpicker-modal]] + [app.main.ui.workspace.sidebar.options.rows.color-row :refer [color-row]] + [app.util.data :refer [classnames]] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [tr t]] + [app.util.object :as obj])) (def stroke-attrs [:stroke-style diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/text.cljs similarity index 96% rename from frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs rename to frontend/src/app/main/ui/workspace/sidebar/options/text.cljs index 635a70c03..f6c918db7 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/text.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.sidebar.options.text +(ns app.main.ui.workspace.sidebar.options.text (:require [rumext.alpha :as mf] [cuerdas.core :as str] [okulary.core :as l] - [uxbox.main.ui.icons :as i] - [uxbox.common.data :as d] - [uxbox.main.data.workspace :as dw] - [uxbox.main.data.workspace.texts :as dwt] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] - [uxbox.main.ui.workspace.sidebar.options.fill :refer [fill-menu]] - [uxbox.util.dom :as dom] - [uxbox.main.fonts :as fonts] - [uxbox.util.i18n :as i18n :refer [tr t]] + [app.main.ui.icons :as i] + [app.common.data :as d] + [app.main.data.workspace :as dw] + [app.main.data.workspace.texts :as dwt] + [app.main.store :as st] + [app.main.refs :as refs] + [app.main.ui.workspace.sidebar.options.measures :refer [measure-attrs measures-menu]] + [app.main.ui.workspace.sidebar.options.fill :refer [fill-menu]] + [app.util.dom :as dom] + [app.main.fonts :as fonts] + [app.util.i18n :as i18n :refer [tr t]] ["slate" :refer [Transforms]])) (def text-fill-attrs [:fill :opacity]) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs similarity index 90% rename from frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs rename to frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs index fe2be1d6a..d8befc0b1 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs @@ -5,23 +5,23 @@ ;; Copyright (c) 2015-2019 Andrey Antukh ;; Copyright (c) 2015-2016 Juan de la Cruz -(ns uxbox.main.ui.workspace.sidebar.sitemap +(ns app.main.ui.workspace.sidebar.sitemap (:require [cuerdas.core :as str] [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.common.data :as d] - [uxbox.main.ui.icons :as i] - [uxbox.main.data.workspace :as dw] - [uxbox.main.store :as st] - [uxbox.main.refs :as refs] - [uxbox.main.ui.confirm :refer [confirm-dialog]] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.modal :as modal] - [uxbox.main.ui.hooks :as hooks] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :as i18n :refer [t]] - [uxbox.util.router :as rt])) + [app.common.data :as d] + [app.main.ui.icons :as i] + [app.main.data.workspace :as dw] + [app.main.store :as st] + [app.main.refs :as refs] + [app.main.ui.confirm :refer [confirm-dialog]] + [app.main.ui.keyboard :as kbd] + [app.main.ui.modal :as modal] + [app.main.ui.hooks :as hooks] + [app.util.dom :as dom] + [app.util.i18n :as i18n :refer [t]] + [app.util.router :as rt])) ;; --- Page Item @@ -65,7 +65,7 @@ (st/emit! (dw/relocate-page id index)))) [dprops dref] (hooks/use-sortable - :data-type "uxbox/page" + :data-type "app/page" :on-drop on-drop :data {:id (:id page) :index index diff --git a/frontend/src/uxbox/main/ui/workspace/snap_distances.cljs b/frontend/src/app/main/ui/workspace/snap_distances.cljs similarity index 96% rename from frontend/src/uxbox/main/ui/workspace/snap_distances.cljs rename to frontend/src/app/main/ui/workspace/snap_distances.cljs index afd4e22a1..a7c884484 100644 --- a/frontend/src/uxbox/main/ui/workspace/snap_distances.cljs +++ b/frontend/src/app/main/ui/workspace/snap_distances.cljs @@ -1,19 +1,19 @@ -(ns uxbox.main.ui.workspace.snap-distances +(ns app.main.ui.workspace.snap-distances (:require [rumext.alpha :as mf] [beicon.core :as rx] - [uxbox.common.uuid :as uuid] - [uxbox.main.refs :as refs] - [uxbox.main.snap :as snap] - [uxbox.util.geom.snap-points :as sp] - [uxbox.common.geom.point :as gpt] + [app.common.uuid :as uuid] + [app.main.refs :as refs] + [app.main.snap :as snap] + [app.util.geom.snap-points :as sp] + [app.common.geom.point :as gpt] [cuerdas.core :as str] - [uxbox.common.pages :as cp] - [uxbox.common.data :as d] - [uxbox.common.geom.shapes :as gsh] - [uxbox.common.math :as mth] - [uxbox.main.worker :as uw] + [app.common.pages :as cp] + [app.common.data :as d] + [app.common.geom.shapes :as gsh] + [app.common.math :as mth] + [app.main.worker :as uw] [clojure.set :as set])) (def ^:private line-color "#D383DA") diff --git a/frontend/src/uxbox/main/ui/workspace/snap_points.cljs b/frontend/src/app/main/ui/workspace/snap_points.cljs similarity index 95% rename from frontend/src/uxbox/main/ui/workspace/snap_points.cljs rename to frontend/src/app/main/ui/workspace/snap_points.cljs index 95f2c3dd9..02c2b967a 100644 --- a/frontend/src/uxbox/main/ui/workspace/snap_points.cljs +++ b/frontend/src/app/main/ui/workspace/snap_points.cljs @@ -1,11 +1,11 @@ -(ns uxbox.main.ui.workspace.snap-points +(ns app.main.ui.workspace.snap-points (:require [rumext.alpha :as mf] [beicon.core :as rx] - [uxbox.main.refs :as refs] - [uxbox.main.snap :as snap] - [uxbox.util.geom.snap-points :as sp] - [uxbox.common.geom.point :as gpt])) + [app.main.refs :as refs] + [app.main.snap :as snap] + [app.util.geom.snap-points :as sp] + [app.common.geom.point :as gpt])) (def ^:private line-color "#D383DA") diff --git a/frontend/src/uxbox/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs similarity index 92% rename from frontend/src/uxbox/main/ui/workspace/viewport.cljs rename to frontend/src/app/main/ui/workspace/viewport.cljs index 1d037b0e8..416161c4f 100644 --- a/frontend/src/uxbox/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.ui.workspace.viewport +(ns app.main.ui.workspace.viewport (:require [clojure.set :as set] [cuerdas.core :as str] @@ -15,34 +15,34 @@ [goog.events :as events] [potok.core :as ptk] [rumext.alpha :as mf] - [uxbox.main.ui.icons :as i] - [uxbox.main.ui.cursors :as cur] - [uxbox.common.data :as d] - [uxbox.main.constants :as c] - [uxbox.main.data.workspace :as dw] - [uxbox.main.data.workspace.drawing :as dd] - [uxbox.main.refs :as refs] - [uxbox.main.store :as st] - [uxbox.main.streams :as ms] - [uxbox.main.ui.keyboard :as kbd] - [uxbox.main.ui.hooks :as hooks] - [uxbox.main.ui.workspace.shapes :refer [shape-wrapper frame-wrapper]] - [uxbox.main.ui.workspace.shapes.interactions :refer [interactions]] - [uxbox.main.ui.workspace.drawarea :refer [draw-area]] - [uxbox.main.ui.workspace.selection :refer [selection-handlers]] - [uxbox.main.ui.workspace.presence :as presence] - [uxbox.main.ui.workspace.snap-points :refer [snap-points]] - [uxbox.main.ui.workspace.snap-distances :refer [snap-distances]] - [uxbox.main.ui.workspace.frame-grid :refer [frame-grid]] - [uxbox.main.ui.workspace.shapes.outline :refer [outline]] - [uxbox.common.math :as mth] - [uxbox.util.dom :as dom] - [uxbox.util.dom.dnd :as dnd] - [uxbox.util.object :as obj] - [uxbox.common.geom.shapes :as gsh] - [uxbox.common.geom.point :as gpt] - [uxbox.util.perf :as perf] - [uxbox.common.uuid :as uuid]) + [app.main.ui.icons :as i] + [app.main.ui.cursors :as cur] + [app.common.data :as d] + [app.main.constants :as c] + [app.main.data.workspace :as dw] + [app.main.data.workspace.drawing :as dd] + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.streams :as ms] + [app.main.ui.keyboard :as kbd] + [app.main.ui.hooks :as hooks] + [app.main.ui.workspace.shapes :refer [shape-wrapper frame-wrapper]] + [app.main.ui.workspace.shapes.interactions :refer [interactions]] + [app.main.ui.workspace.drawarea :refer [draw-area]] + [app.main.ui.workspace.selection :refer [selection-handlers]] + [app.main.ui.workspace.presence :as presence] + [app.main.ui.workspace.snap-points :refer [snap-points]] + [app.main.ui.workspace.snap-distances :refer [snap-distances]] + [app.main.ui.workspace.frame-grid :refer [frame-grid]] + [app.main.ui.workspace.shapes.outline :refer [outline]] + [app.common.math :as mth] + [app.util.dom :as dom] + [app.util.dom.dnd :as dnd] + [app.util.object :as obj] + [app.common.geom.shapes :as gsh] + [app.common.geom.point :as gpt] + [app.util.perf :as perf] + [app.common.uuid :as uuid]) (:import goog.events.EventType)) ;; --- Coordinates Widget @@ -337,14 +337,14 @@ on-drag-enter (fn [e] - (when (or (dnd/has-type? e "uxbox/shape") + (when (or (dnd/has-type? e "app/shape") (dnd/has-type? e "Files") (dnd/has-type? e "text/uri-list")) (dom/prevent-default e))) on-drag-over (fn [e] - (when (or (dnd/has-type? e "uxbox/shape") + (when (or (dnd/has-type? e "app/shape") (dnd/has-type? e "Files") (dnd/has-type? e "text/uri-list")) (dom/prevent-default e))) @@ -366,8 +366,8 @@ (dom/prevent-default event) (cond - (dnd/has-type? event "uxbox/shape") - (let [shape (dnd/get-data event "uxbox/shape") + (dnd/has-type? event "app/shape") + (let [shape (dnd/get-data event "app/shape") point (gpt/point (.-clientX event) (.-clientY event)) viewport-coord (translate-point-to-viewport point) final-x (- (:x viewport-coord) (/ (:width shape) 2)) diff --git a/frontend/src/uxbox/main/worker.cljs b/frontend/src/app/main/worker.cljs similarity index 85% rename from frontend/src/uxbox/main/worker.cljs rename to frontend/src/app/main/worker.cljs index ab947058d..63e490834 100644 --- a/frontend/src/uxbox/main/worker.cljs +++ b/frontend/src/app/main/worker.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.main.worker +(ns app.main.worker (:require [cljs.spec.alpha :as s] - [uxbox.config :as cfg] - [uxbox.common.spec :as us] - [uxbox.util.worker :as uw])) + [app.config :as cfg] + [app.common.spec :as us] + [app.util.worker :as uw])) (defn on-error [instance error] diff --git a/frontend/src/uxbox/util/avatars.cljs b/frontend/src/app/util/avatars.cljs similarity index 95% rename from frontend/src/uxbox/util/avatars.cljs rename to frontend/src/app/util/avatars.cljs index dab27164a..1a67de9d2 100644 --- a/frontend/src/uxbox/util/avatars.cljs +++ b/frontend/src/app/util/avatars.cljs @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.avatars +(ns app.util.avatars (:require [cuerdas.core :as str] - [uxbox.util.object :as obj] + [app.util.object :as obj] ["randomcolor" :as rdcolor])) (defn generate diff --git a/frontend/src/uxbox/util/blob.cljs b/frontend/src/app/util/blob.cljs similarity index 97% rename from frontend/src/uxbox/util/blob.cljs rename to frontend/src/app/util/blob.cljs index ad555e70c..dac605648 100644 --- a/frontend/src/uxbox/util/blob.cljs +++ b/frontend/src/app/util/blob.cljs @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.blob +(ns app.util.blob "Helpers for work with HTML5 Blob objects.") ;; TODO: DEPRECATED diff --git a/frontend/src/uxbox/util/browser_history.js b/frontend/src/app/util/browser_history.js similarity index 93% rename from frontend/src/uxbox/util/browser_history.js rename to frontend/src/app/util/browser_history.js index da94b8a37..890c69f7d 100644 --- a/frontend/src/uxbox/util/browser_history.js +++ b/frontend/src/app/util/browser_history.js @@ -11,12 +11,12 @@ "use strict"; -goog.provide("uxbox.util.browser_history"); +goog.provide("app.util.browser_history"); goog.require("goog.history.Html5History"); goog.scope(function() { - const self = uxbox.util.browser_history; + const self = app.util.browser_history; const Html5History = goog.history.Html5History; class TokenTransformer { diff --git a/frontend/src/uxbox/util/color.cljs b/frontend/src/app/util/color.cljs similarity index 95% rename from frontend/src/uxbox/util/color.cljs rename to frontend/src/app/util/color.cljs index 7fa58773b..e861701fd 100644 --- a/frontend/src/uxbox/util/color.cljs +++ b/frontend/src/app/util/color.cljs @@ -7,11 +7,11 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.color +(ns app.util.color "Color conversion utils." (:require [cuerdas.core :as str] - [uxbox.common.math :as math] + [app.common.math :as math] [goog.color :as gcolor])) (defn rgb->str diff --git a/frontend/src/uxbox/util/data.cljs b/frontend/src/app/util/data.cljs similarity index 98% rename from frontend/src/uxbox/util/data.cljs rename to frontend/src/app/util/data.cljs index 7068c6d96..3792b7585 100644 --- a/frontend/src/uxbox/util/data.cljs +++ b/frontend/src/app/util/data.cljs @@ -4,12 +4,12 @@ ;; ;; Copyright (c) 2015-2019 Andrey Antukh -(ns uxbox.util.data +(ns app.util.data "A collection of data transformation utils." (:require [cljs.reader :as r] [cuerdas.core :as str])) -;; TODO: partially move to uxbox.common.data +;; TODO: partially move to app.common.data ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Data structure manipulation diff --git a/frontend/src/uxbox/util/debug.cljs b/frontend/src/app/util/debug.cljs similarity index 98% rename from frontend/src/uxbox/util/debug.cljs rename to frontend/src/app/util/debug.cljs index d997c3e5b..5269b8634 100644 --- a/frontend/src/uxbox/util/debug.cljs +++ b/frontend/src/app/util/debug.cljs @@ -1,4 +1,4 @@ -(ns uxbox.util.debug +(ns app.util.debug "Debugging utils") (def debug-options #{:bounding-boxes :group :events :rotation-handler :resize-handler :selection-center #_:simple-selection}) diff --git a/frontend/src/uxbox/util/dom.cljs b/frontend/src/app/util/dom.cljs similarity index 96% rename from frontend/src/uxbox/util/dom.cljs rename to frontend/src/app/util/dom.cljs index 6819f8863..8b28b400f 100644 --- a/frontend/src/uxbox/util/dom.cljs +++ b/frontend/src/app/util/dom.cljs @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.dom +(ns app.util.dom (:require [goog.dom :as dom] [cuerdas.core :as str] [beicon.core :as rx] [cuerdas.core :as str] - [uxbox.common.geom.point :as gpt] - [uxbox.util.blob :as blob] - [uxbox.util.transit :as ts])) + [app.common.geom.point :as gpt] + [app.util.blob :as blob] + [app.util.transit :as ts])) ;; --- Deprecated methods diff --git a/frontend/src/uxbox/util/dom/dnd.cljs b/frontend/src/app/util/dom/dnd.cljs similarity index 94% rename from frontend/src/uxbox/util/dom/dnd.cljs rename to frontend/src/app/util/dom/dnd.cljs index 2648b0d24..73143ba35 100644 --- a/frontend/src/uxbox/util/dom/dnd.cljs +++ b/frontend/src/app/util/dom/dnd.cljs @@ -5,12 +5,12 @@ ;; Copyright (c) 2015-2016 Andrey Antukh ;; Copyright (c) 2015-2016 Juan de la Cruz -(ns uxbox.util.dom.dnd +(ns app.util.dom.dnd "Drag & Drop interop helpers." (:require [cuerdas.core :as str] - [uxbox.util.data :refer (read-string)] - [uxbox.util.transit :as t])) + [app.util.data :refer (read-string)] + [app.util.transit :as t])) ;; This is the official documentation for the dnd API: ;; https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API @@ -55,11 +55,11 @@ (defn set-data! ([e data] - (set-data! e "uxbox/data" data)) + (set-data! e "app/data" data)) ([e data-type data] (let [dt (.-dataTransfer e)] (if (or (str/starts-with? data-type "application") - (str/starts-with? data-type "uxbox")) + (str/starts-with? data-type "app")) (.setData dt data-type (t/encode data)) (.setData dt data-type data)) e))) @@ -100,10 +100,10 @@ (defn get-data ([e] - (get-data e "uxbox/data")) + (get-data e "app/data")) ([e data-type] (let [dt (.-dataTransfer e)] - (if (or (str/starts-with? data-type "uxbox") + (if (or (str/starts-with? data-type "app") (= data-type "application/json")) (t/decode (.getData dt data-type)) (.getData dt data-type))))) diff --git a/frontend/src/uxbox/util/files.cljs b/frontend/src/app/util/files.cljs similarity index 95% rename from frontend/src/uxbox/util/files.cljs rename to frontend/src/app/util/files.cljs index 767fdd7af..f1a00123c 100644 --- a/frontend/src/uxbox/util/files.cljs +++ b/frontend/src/app/util/files.cljs @@ -4,11 +4,11 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.files +(ns app.util.files "A interop helpers for work with files." (:require [beicon.core :as rx] [cuerdas.core :as str] - [uxbox.util.blob :as blob])) + [app.util.blob :as blob])) ;; TODO: DEPRECATED diff --git a/frontend/src/uxbox/util/forms.cljs b/frontend/src/app/util/forms.cljs similarity index 97% rename from frontend/src/uxbox/util/forms.cljs rename to frontend/src/app/util/forms.cljs index 6d819b3e6..e9a6382fc 100644 --- a/frontend/src/uxbox/util/forms.cljs +++ b/frontend/src/app/util/forms.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.forms +(ns app.util.forms (:refer-clojure :exclude [uuid]) (:require [beicon.core :as rx] @@ -15,9 +15,9 @@ [cuerdas.core :as str] [potok.core :as ptk] [rumext.alpha :as mf] - [uxbox.common.spec :as us] - [uxbox.util.dom :as dom] - [uxbox.util.i18n :refer [tr]])) + [app.common.spec :as us] + [app.util.dom :as dom] + [app.util.i18n :refer [tr]])) ;; --- Handlers Helpers diff --git a/frontend/src/uxbox/util/geom/grid.cljs b/frontend/src/app/util/geom/grid.cljs similarity index 98% rename from frontend/src/uxbox/util/geom/grid.cljs rename to frontend/src/app/util/geom/grid.cljs index cffa86088..a8093557f 100644 --- a/frontend/src/uxbox/util/geom/grid.cljs +++ b/frontend/src/app/util/geom/grid.cljs @@ -7,10 +7,10 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.geom.grid +(ns app.util.geom.grid (:require - [uxbox.common.math :as mth] - [uxbox.common.geom.point :as gpt])) + [app.common.math :as mth] + [app.common.geom.point :as gpt])) (def ^:private default-items 12) diff --git a/frontend/src/uxbox/util/geom/path.cljs b/frontend/src/app/util/geom/path.cljs similarity index 85% rename from frontend/src/uxbox/util/geom/path.cljs rename to frontend/src/app/util/geom/path.cljs index baca15112..0ef690191 100644 --- a/frontend/src/uxbox/util/geom/path.cljs +++ b/frontend/src/app/util/geom/path.cljs @@ -7,8 +7,8 @@ ;; ;; Copyright (c) 2016-2017 Andrey Antukh -(ns uxbox.util.geom.path - (:require [uxbox.util.geom.path-impl-simplify :as impl-simplify])) +(ns app.util.geom.path + (:require [app.util.geom.path-impl-simplify :as impl-simplify])) (defn simplify ([points] diff --git a/frontend/src/uxbox/util/geom/path_impl_simplify.js b/frontend/src/app/util/geom/path_impl_simplify.js similarity index 96% rename from frontend/src/uxbox/util/geom/path_impl_simplify.js rename to frontend/src/app/util/geom/path_impl_simplify.js index b6956d70f..12fe81c8d 100644 --- a/frontend/src/uxbox/util/geom/path_impl_simplify.js +++ b/frontend/src/app/util/geom/path_impl_simplify.js @@ -11,10 +11,10 @@ "use strict"; -goog.provide("uxbox.util.geom.path_impl_simplify"); +goog.provide("app.util.geom.path_impl_simplify"); goog.scope(function() { - const self = uxbox.util.geom.path_impl_simplify; + const self = app.util.geom.path_impl_simplify; // square distance between 2 points function getSqDist(p1, p2) { diff --git a/frontend/src/uxbox/util/geom/snap_points.cljs b/frontend/src/app/util/geom/snap_points.cljs similarity index 91% rename from frontend/src/uxbox/util/geom/snap_points.cljs rename to frontend/src/app/util/geom/snap_points.cljs index 3be81b2bc..8859a96c6 100644 --- a/frontend/src/uxbox/util/geom/snap_points.cljs +++ b/frontend/src/app/util/geom/snap_points.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.geom.snap-points +(ns app.util.geom.snap-points (:require [cljs.spec.alpha :as s] [clojure.set :as set] - [uxbox.common.geom.shapes :as gsh] - [uxbox.common.geom.point :as gpt])) + [app.common.geom.shapes :as gsh] + [app.common.geom.point :as gpt])) (defn- frame-snap-points [{:keys [x y width height] :as frame}] (into #{(gpt/point x y) diff --git a/frontend/src/uxbox/util/heap_impl.js b/frontend/src/app/util/heap_impl.js similarity index 94% rename from frontend/src/uxbox/util/heap_impl.js rename to frontend/src/app/util/heap_impl.js index 3956202f6..53fe5915b 100644 --- a/frontend/src/uxbox/util/heap_impl.js +++ b/frontend/src/app/util/heap_impl.js @@ -10,11 +10,11 @@ "use strict"; -goog.provide("uxbox.util.heap_impl"); -goog.provide("uxbox.util.heap_impl.MinHeap"); +goog.provide("app.util.heap_impl"); +goog.provide("app.util.heap_impl.MinHeap"); goog.scope(function() { - const self = uxbox.util.heap_impl; + const self = app.util.heap_impl; const compare = (x, y) => x - y; diff --git a/frontend/src/uxbox/util/http.cljs b/frontend/src/app/util/http.cljs similarity index 98% rename from frontend/src/uxbox/util/http.cljs rename to frontend/src/app/util/http.cljs index 24d1a74f3..7668d4144 100644 --- a/frontend/src/uxbox/util/http.cljs +++ b/frontend/src/app/util/http.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.http +(ns app.util.http "A http client with rx streams interface." (:refer-clojure :exclude [get]) (:require @@ -15,7 +15,7 @@ [beicon.core :as rx] [clojure.string :as str] [goog.events :as events] - [uxbox.util.transit :as t]) + [app.util.transit :as t]) (:import [goog.net ErrorCode EventType] [goog.net.XhrIo ResponseType] diff --git a/frontend/src/uxbox/util/http_api.cljs b/frontend/src/app/util/http_api.cljs similarity index 95% rename from frontend/src/uxbox/util/http_api.cljs rename to frontend/src/app/util/http_api.cljs index db63dad2c..99b1787d2 100644 --- a/frontend/src/uxbox/util/http_api.cljs +++ b/frontend/src/app/util/http_api.cljs @@ -7,13 +7,13 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.http-api +(ns app.util.http-api "A specific customizations of http client for api access." (:require [beicon.core :as rx] [cuerdas.core :as str] - [uxbox.util.http :as http] - [uxbox.util.transit :as t])) + [app.util.http :as http] + [app.util.transit :as t])) (defn- conditional-decode [{:keys [body headers] :as response}] diff --git a/frontend/src/uxbox/util/i18n.cljs b/frontend/src/app/util/i18n.cljs similarity index 94% rename from frontend/src/uxbox/util/i18n.cljs rename to frontend/src/app/util/i18n.cljs index 560c30027..c1d9d4c21 100644 --- a/frontend/src/uxbox/util/i18n.cljs +++ b/frontend/src/app/util/i18n.cljs @@ -5,7 +5,7 @@ ;; Copyright (c) 2015-2016 Juan de la Cruz ;; Copyright (c) 2015-2019 Andrey Antukh -(ns uxbox.util.i18n +(ns app.util.i18n "A i18n foundation." (:require [beicon.core :as rx] @@ -13,9 +13,9 @@ [goog.object :as gobj] [okulary.core :as l] [rumext.alpha :as mf] - [uxbox.config :as cfg] - [uxbox.util.storage :refer [storage]] - [uxbox.util.transit :as t])) + [app.config :as cfg] + [app.util.storage :refer [storage]] + [app.util.transit :as t])) (defonce locale (l/atom (or (get storage ::locale) cfg/default-language))) diff --git a/frontend/src/uxbox/util/interop.cljs b/frontend/src/app/util/interop.cljs similarity index 96% rename from frontend/src/uxbox/util/interop.cljs rename to frontend/src/app/util/interop.cljs index 1f9a20a58..abdbca6b9 100644 --- a/frontend/src/uxbox/util/interop.cljs +++ b/frontend/src/app/util/interop.cljs @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.interop +(ns app.util.interop "Interop helpers.") ;; TODO: this can be optimized using es6-iterator-seq diff --git a/frontend/src/uxbox/util/intervaltree_impl.js b/frontend/src/app/util/intervaltree_impl.js similarity index 98% rename from frontend/src/uxbox/util/intervaltree_impl.js rename to frontend/src/app/util/intervaltree_impl.js index 3377b5797..fcb547981 100644 --- a/frontend/src/uxbox/util/intervaltree_impl.js +++ b/frontend/src/app/util/intervaltree_impl.js @@ -7,17 +7,17 @@ "use strict"; -goog.provide("uxbox.util.intervaltree_impl"); +goog.provide("app.util.intervaltree_impl"); goog.require("goog.asserts"); goog.require("goog.array"); goog.scope(function() { - const self = uxbox.util.intervaltree_impl; + const self = app.util.intervaltree_impl; const assert = goog.asserts.assert; const every = goog.array.every; - const ID_SYM = Symbol.for("uxbox.util.intervaltree:id-sym"); + const ID_SYM = Symbol.for("app.util.intervaltree:id-sym"); // --- Types Declaration diff --git a/frontend/src/uxbox/util/kdtree.cljs b/frontend/src/app/util/kdtree.cljs similarity index 92% rename from frontend/src/uxbox/util/kdtree.cljs rename to frontend/src/app/util/kdtree.cljs index e03e2360a..2173ee80c 100644 --- a/frontend/src/uxbox/util/kdtree.cljs +++ b/frontend/src/app/util/kdtree.cljs @@ -4,9 +4,9 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.kdtree +(ns app.util.kdtree "A cljs layer on top of js impl of kdtree located in `kdtree_impl.js`." - (:require [uxbox.util.kdtree-impl :as impl])) + (:require [app.util.kdtree-impl :as impl])) (defn create "Create an empty or initialized kd-tree instance." diff --git a/frontend/src/uxbox/util/kdtree_impl.js b/frontend/src/app/util/kdtree_impl.js similarity index 95% rename from frontend/src/uxbox/util/kdtree_impl.js rename to frontend/src/app/util/kdtree_impl.js index dcc20f198..d93c3010b 100644 --- a/frontend/src/uxbox/util/kdtree_impl.js +++ b/frontend/src/app/util/kdtree_impl.js @@ -13,16 +13,16 @@ "use strict"; -goog.provide("uxbox.util.kdtree_impl"); -goog.require("uxbox.util.heap_impl"); -goog.require("uxbox.util.lru_impl"); +goog.provide("app.util.kdtree_impl"); +goog.require("app.util.heap_impl"); +goog.require("app.util.lru_impl"); goog.require("goog.asserts"); goog.scope(function() { - const self = uxbox.util.kdtree_impl; + const self = app.util.kdtree_impl; - const heap = uxbox.util.heap_impl; - const lru = uxbox.util.lru_impl; + const heap = app.util.heap_impl; + const lru = app.util.lru_impl; const assert = goog.asserts.assert; // Hardcoded dimensions value; diff --git a/frontend/src/uxbox/util/lru_impl.js b/frontend/src/app/util/lru_impl.js similarity index 97% rename from frontend/src/uxbox/util/lru_impl.js rename to frontend/src/app/util/lru_impl.js index d3b0ed25e..68b8c87f0 100644 --- a/frontend/src/uxbox/util/lru_impl.js +++ b/frontend/src/app/util/lru_impl.js @@ -10,11 +10,11 @@ "use strict"; -goog.provide("uxbox.util.lru_impl"); +goog.provide("app.util.lru_impl"); goog.require("goog.asserts"); goog.scope(function() { - const self = uxbox.util.lru_impl; + const self = app.util.lru_impl; const assert = goog.asserts.assert; class Node { diff --git a/frontend/src/uxbox/util/object.cljs b/frontend/src/app/util/object.cljs similarity index 98% rename from frontend/src/uxbox/util/object.cljs rename to frontend/src/app/util/object.cljs index 8e0f2a596..bdcbe1f59 100644 --- a/frontend/src/uxbox/util/object.cljs +++ b/frontend/src/app/util/object.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.object +(ns app.util.object "A collection of helpers for work with javascript objects." (:refer-clojure :exclude [set! get get-in assoc!]) (:require diff --git a/frontend/src/uxbox/util/perf.clj b/frontend/src/app/util/perf.clj similarity index 68% rename from frontend/src/uxbox/util/perf.clj rename to frontend/src/app/util/perf.clj index 30d01d6a0..128d0a1ab 100644 --- a/frontend/src/uxbox/util/perf.clj +++ b/frontend/src/app/util/perf.clj @@ -4,14 +4,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.perf +(ns app.util.perf "Performance profiling for react components.") (defmacro with-measure [name & body] - `(let [start# (uxbox.util.perf/timestamp) + `(let [start# (app.util.perf/timestamp) res# (do ~@body) - end# (uxbox.util.perf/timestamp)] - (uxbox.util.perf/register-measure ~name (- end# start#)) + end# (app.util.perf/timestamp)] + (app.util.perf/register-measure ~name (- end# start#)) res#)) diff --git a/frontend/src/uxbox/util/perf.cljs b/frontend/src/app/util/perf.cljs similarity index 95% rename from frontend/src/uxbox/util/perf.cljs rename to frontend/src/app/util/perf.cljs index 6f6b493c0..1a7c43160 100644 --- a/frontend/src/uxbox/util/perf.cljs +++ b/frontend/src/app/util/perf.cljs @@ -4,11 +4,11 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.perf +(ns app.util.perf "Performance profiling for react components." - (:require-macros [uxbox.util.perf]) + (:require-macros [app.util.perf]) (:require - [uxbox.common.math :as math] + [app.common.math :as math] [rumext.alpha :as mf] [goog.functions :as f] ["react" :as react] @@ -85,7 +85,7 @@ (defn measurable [name f] (fn [& args] - (uxbox.util.perf/with-measure name + (app.util.perf/with-measure name (apply f args)))) (defn on-render-factory diff --git a/frontend/src/uxbox/util/quadtree.js b/frontend/src/app/util/quadtree.js similarity index 98% rename from frontend/src/uxbox/util/quadtree.js rename to frontend/src/app/util/quadtree.js index faea0c77f..823f77de4 100644 --- a/frontend/src/uxbox/util/quadtree.js +++ b/frontend/src/app/util/quadtree.js @@ -31,10 +31,10 @@ "use strict"; -goog.provide("uxbox.util.quadtree"); +goog.provide("app.util.quadtree"); goog.scope(function() { - const self = uxbox.util.quadtree; + const self = app.util.quadtree; class Node { constructor(bounds, data) { diff --git a/frontend/src/uxbox/util/range_tree.js b/frontend/src/app/util/range_tree.js similarity index 99% rename from frontend/src/uxbox/util/range_tree.js rename to frontend/src/app/util/range_tree.js index 5e5604766..ab3a9b51c 100644 --- a/frontend/src/uxbox/util/range_tree.js +++ b/frontend/src/app/util/range_tree.js @@ -15,7 +15,7 @@ */ "use strict"; -goog.provide("uxbox.util.range_tree"); +goog.provide("app.util.range_tree"); goog.require("cljs.core") goog.scope(function() { @@ -361,7 +361,7 @@ goog.scope(function() { } // External API to CLJS - const self = uxbox.util.range_tree; + const self = app.util.range_tree; self.make_tree = () => new RangeTree(); self.insert = (tree, value, data) => tree.insert(value, data); self.remove = (tree, value, data) => tree.remove(value, data); diff --git a/frontend/src/uxbox/util/router.cljs b/frontend/src/app/util/router.cljs similarity index 96% rename from frontend/src/uxbox/util/router.cljs rename to frontend/src/app/util/router.cljs index b3fb8ba00..8d6d8707e 100644 --- a/frontend/src/uxbox/util/router.cljs +++ b/frontend/src/app/util/router.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.router +(ns app.util.router (:refer-clojure :exclude [resolve]) (:require [beicon.core :as rx] @@ -15,9 +15,9 @@ [goog.events :as e] [potok.core :as ptk] [reitit.core :as r] - [uxbox.common.data :as d] - [uxbox.util.browser-history :as bhistory] - [uxbox.util.timers :as ts]) + [app.common.data :as d] + [app.util.browser-history :as bhistory] + [app.util.timers :as ts]) (:import goog.Uri goog.Uri.QueryData)) diff --git a/frontend/src/uxbox/util/storage.cljs b/frontend/src/app/util/storage.cljs similarity index 94% rename from frontend/src/uxbox/util/storage.cljs rename to frontend/src/app/util/storage.cljs index 851068af4..5ce01128c 100644 --- a/frontend/src/uxbox/util/storage.cljs +++ b/frontend/src/app/util/storage.cljs @@ -4,8 +4,8 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.storage - (:require [uxbox.util.transit :as t])) +(ns app.util.storage + (:require [app.util.transit :as t])) (defn- ^boolean is-worker? [] @@ -67,4 +67,4 @@ (get @data key not-found))))) (def storage - (make-storage "uxbox")) + (make-storage "app")) diff --git a/frontend/src/uxbox/util/theme.cljs b/frontend/src/app/util/theme.cljs similarity index 89% rename from frontend/src/uxbox/util/theme.cljs rename to frontend/src/app/util/theme.cljs index eb34cc371..d7611dd19 100644 --- a/frontend/src/uxbox/util/theme.cljs +++ b/frontend/src/app/util/theme.cljs @@ -6,17 +6,17 @@ ;; Copyright (c) 2015-2019 Andrey Antukh ;; Copyright (c) 2019-2020 Mathieu BRUNOT -(ns uxbox.util.theme +(ns app.util.theme "A theme manager." (:require [cuerdas.core :as str] [rumext.alpha :as mf] [beicon.core :as rx] [goog.object :as gobj] - [uxbox.config :as cfg] - [uxbox.util.dom :as dom] - [uxbox.util.transit :as t] - [uxbox.util.storage :refer [storage]])) + [app.config :as cfg] + [app.util.dom :as dom] + [app.util.transit :as t] + [app.util.storage :refer [storage]])) (defonce theme (get storage ::theme cfg/default-theme)) (defonce theme-sub (rx/subject)) diff --git a/frontend/src/uxbox/util/time.cljs b/frontend/src/app/util/time.cljs similarity index 98% rename from frontend/src/uxbox/util/time.cljs rename to frontend/src/app/util/time.cljs index 644f36084..f1220e914 100644 --- a/frontend/src/uxbox/util/time.cljs +++ b/frontend/src/app/util/time.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2015-2020 Andrey Antukh -(ns uxbox.util.time +(ns app.util.time (:require ["date-fns/format" :as df-format] ["date-fns/formatDistanceToNow" :as df-format-distance] diff --git a/frontend/src/uxbox/util/timers.cljs b/frontend/src/app/util/timers.cljs similarity index 97% rename from frontend/src/uxbox/util/timers.cljs rename to frontend/src/app/util/timers.cljs index ae866918f..7b405da7f 100644 --- a/frontend/src/uxbox/util/timers.cljs +++ b/frontend/src/app/util/timers.cljs @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.timers +(ns app.util.timers (:require [beicon.core :as rx])) (defn schedule diff --git a/frontend/src/uxbox/util/transit.cljs b/frontend/src/app/util/transit.cljs similarity index 94% rename from frontend/src/uxbox/util/transit.cljs rename to frontend/src/app/util/transit.cljs index 3b884b269..79b619e65 100644 --- a/frontend/src/uxbox/util/transit.cljs +++ b/frontend/src/app/util/transit.cljs @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.transit +(ns app.util.transit "A lightweight abstraction for transit serialization." (:require [cognitect.transit :as t] [linked.core :as lk] [linked.set :as lks] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.matrix :as gmt] - [uxbox.util.time :as dt])) + [app.common.geom.point :as gpt] + [app.common.geom.matrix :as gmt] + [app.util.time :as dt])) (deftype Blob [content] IDeref diff --git a/frontend/src/uxbox/util/webapi.cljs b/frontend/src/app/util/webapi.cljs similarity index 97% rename from frontend/src/uxbox/util/webapi.cljs rename to frontend/src/app/util/webapi.cljs index 287532135..f5b3eb75f 100644 --- a/frontend/src/uxbox/util/webapi.cljs +++ b/frontend/src/app/util/webapi.cljs @@ -7,14 +7,14 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.webapi +(ns app.util.webapi "HTML5 web api helpers." (:require [promesa.core :as p] [beicon.core :as rx] [cuerdas.core :as str] - [uxbox.common.data :as d] - [uxbox.util.transit :as t])) + [app.common.data :as d] + [app.util.transit :as t])) (defn read-file-as-text [file] diff --git a/frontend/src/uxbox/util/websockets.cljs b/frontend/src/app/util/websockets.cljs similarity index 97% rename from frontend/src/uxbox/util/websockets.cljs rename to frontend/src/app/util/websockets.cljs index 9d9d7c561..5a0ba1f6f 100644 --- a/frontend/src/uxbox/util/websockets.cljs +++ b/frontend/src/app/util/websockets.cljs @@ -7,11 +7,11 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.websockets +(ns app.util.websockets "A interface to webworkers exposed functionality." (:require [goog.events :as ev] - [uxbox.config :as cfg] + [app.config :as cfg] [beicon.core :as rx] [potok.core :as ptk]) (:import diff --git a/frontend/src/uxbox/util/worker.cljs b/frontend/src/app/util/worker.cljs similarity index 94% rename from frontend/src/uxbox/util/worker.cljs rename to frontend/src/app/util/worker.cljs index 329f43fd9..3458d1898 100644 --- a/frontend/src/uxbox/util/worker.cljs +++ b/frontend/src/app/util/worker.cljs @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.util.worker +(ns app.util.worker "A lightweight layer on top of webworkers api." (:require [beicon.core :as rx] - [uxbox.common.uuid :as uuid] - [uxbox.util.transit :as t])) + [app.common.uuid :as uuid] + [app.util.transit :as t])) (declare handle-response) (defrecord Worker [instance stream]) diff --git a/frontend/src/uxbox/util/zip.cljs b/frontend/src/app/util/zip.cljs similarity index 97% rename from frontend/src/uxbox/util/zip.cljs rename to frontend/src/app/util/zip.cljs index 169845e8c..d119e4ee5 100644 --- a/frontend/src/uxbox/util/zip.cljs +++ b/frontend/src/app/util/zip.cljs @@ -4,7 +4,7 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.util.zip +(ns app.util.zip "Helpers for make zip file (using jszip)." (:require [vendor.jszip] [beicon.core :as rx])) diff --git a/frontend/src/uxbox/worker.cljs b/frontend/src/app/worker.cljs similarity index 87% rename from frontend/src/uxbox/worker.cljs rename to frontend/src/app/worker.cljs index ddc819214..952d5e184 100644 --- a/frontend/src/uxbox/worker.cljs +++ b/frontend/src/app/worker.cljs @@ -7,22 +7,22 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.worker +(ns app.worker (:require [cljs.spec.alpha :as s] [promesa.core :as p] [beicon.core :as rx] [cuerdas.core :as str] - [uxbox.common.exceptions :as ex] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.worker.impl :as impl] - [uxbox.worker.selection] - [uxbox.worker.thumbnails] - [uxbox.worker.snaps] - [uxbox.util.object :as obj] - [uxbox.util.transit :as t] - [uxbox.util.worker :as w]) + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.worker.impl :as impl] + [app.worker.selection] + [app.worker.thumbnails] + [app.worker.snaps] + [app.util.object :as obj] + [app.util.transit :as t] + [app.util.worker :as w]) (:import goog.Uri)) ;; --- Messages Handling diff --git a/frontend/src/uxbox/worker/impl.cljs b/frontend/src/app/worker/impl.cljs similarity index 94% rename from frontend/src/uxbox/worker/impl.cljs rename to frontend/src/app/worker/impl.cljs index 83c4f7621..f114a2969 100644 --- a/frontend/src/uxbox/worker/impl.cljs +++ b/frontend/src/app/worker/impl.cljs @@ -4,10 +4,10 @@ ;; ;; Copyright (c) 2016 Andrey Antukh -(ns uxbox.worker.impl +(ns app.worker.impl (:require [okulary.core :as l] - [uxbox.util.transit :as t])) + [app.util.transit :as t])) (enable-console-print!) diff --git a/frontend/src/uxbox/worker/selection.cljs b/frontend/src/app/worker/selection.cljs similarity index 88% rename from frontend/src/uxbox/worker/selection.cljs rename to frontend/src/app/worker/selection.cljs index 9d11abd81..949fe9316 100644 --- a/frontend/src/uxbox/worker/selection.cljs +++ b/frontend/src/app/worker/selection.cljs @@ -7,19 +7,19 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.worker.selection +(ns app.worker.selection (:require [cljs.spec.alpha :as s] [okulary.core :as l] - [uxbox.common.data :as d] - [uxbox.common.exceptions :as ex] - [uxbox.common.geom.shapes :as geom] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.spec :as us] - [uxbox.common.uuid :as uuid] - [uxbox.util.quadtree :as qdt] - [uxbox.worker.impl :as impl])) + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.common.geom.shapes :as geom] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.spec :as us] + [app.common.uuid :as uuid] + [app.util.quadtree :as qdt] + [app.worker.impl :as impl])) (defonce state (l/atom {})) diff --git a/frontend/src/uxbox/worker/snaps.cljs b/frontend/src/app/worker/snaps.cljs similarity index 91% rename from frontend/src/uxbox/worker/snaps.cljs rename to frontend/src/app/worker/snaps.cljs index 2a7bc5d30..52024b2e6 100644 --- a/frontend/src/uxbox/worker/snaps.cljs +++ b/frontend/src/app/worker/snaps.cljs @@ -7,17 +7,17 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.worker.snaps +(ns app.worker.snaps (:require [okulary.core :as l] - [uxbox.common.uuid :as uuid] - [uxbox.common.pages :as cp] - [uxbox.common.pages-helpers :as cph] - [uxbox.common.data :as d] - [uxbox.worker.impl :as impl] - [uxbox.util.range-tree :as rt] - [uxbox.util.geom.snap-points :as snap] - [uxbox.util.geom.grid :as gg])) + [app.common.uuid :as uuid] + [app.common.pages :as cp] + [app.common.pages-helpers :as cph] + [app.common.data :as d] + [app.worker.impl :as impl] + [app.util.range-tree :as rt] + [app.util.geom.snap-points :as snap] + [app.util.geom.grid :as gg])) (defonce state (l/atom {})) diff --git a/frontend/src/uxbox/worker/thumbnails.cljs b/frontend/src/app/worker/thumbnails.cljs similarity index 90% rename from frontend/src/uxbox/worker/thumbnails.cljs rename to frontend/src/app/worker/thumbnails.cljs index 0d1e61c18..c3d62dc89 100644 --- a/frontend/src/uxbox/worker/thumbnails.cljs +++ b/frontend/src/app/worker/thumbnails.cljs @@ -7,15 +7,15 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns uxbox.worker.thumbnails +(ns app.worker.thumbnails (:require [rumext.alpha :as mf] [beicon.core :as rx] [promesa.core :as p] - [uxbox.main.fonts :as fonts] - [uxbox.main.exports :as exports] - [uxbox.worker.impl :as impl] - [uxbox.util.http-api :as http] + [app.main.fonts :as fonts] + [app.main.exports :as exports] + [app.worker.impl :as impl] + [app.util.http-api :as http] ["react-dom/server" :as rds])) (defn- handle-response diff --git a/frontend/tests/uxbox/test_util_geom.cljs b/frontend/tests/app/test_util_geom.cljs similarity index 94% rename from frontend/tests/uxbox/test_util_geom.cljs rename to frontend/tests/app/test_util_geom.cljs index ae79fabea..3fdf0dc5e 100644 --- a/frontend/tests/uxbox/test_util_geom.cljs +++ b/frontend/tests/app/test_util_geom.cljs @@ -1,8 +1,8 @@ -(ns uxbox.test-util-geom +(ns app.test-util-geom (:require [cljs.test :as t :include-macros true] [cljs.pprint :refer [pprint]] - [uxbox.common.geom.point :as gpt] - [uxbox.common.geom.matrix :as gmt])) + [app.common.geom.point :as gpt] + [app.common.geom.matrix :as gmt])) (t/deftest point-constructors-test (let [p (gpt/point 1 2)] diff --git a/frontend/tests/uxbox/test_util_range_tree.cljs b/frontend/tests/app/test_util_range_tree.cljs similarity index 98% rename from frontend/tests/uxbox/test_util_range_tree.cljs rename to frontend/tests/app/test_util_range_tree.cljs index 8e009c07a..507a8386b 100644 --- a/frontend/tests/uxbox/test_util_range_tree.cljs +++ b/frontend/tests/app/test_util_range_tree.cljs @@ -1,8 +1,8 @@ -(ns uxbox.test-util-range-tree +(ns app.test-util-range-tree (:require [cljs.test :as t :include-macros true] [cljs.pprint :refer [pprint]] - [uxbox.common.geom.point :as gpt] - [uxbox.util.range-tree :as rt])) + [app.common.geom.point :as gpt] + [app.util.range-tree :as rt])) (defn check-max-height [tree num-nodes]) (defn check-sorted [tree]) diff --git a/frontend/tools.clj b/frontend/tools.clj deleted file mode 100644 index 94bd8bf4d..000000000 --- a/frontend/tools.clj +++ /dev/null @@ -1,184 +0,0 @@ -(require '[clojure.pprint :refer [pprint]] - '[clojure.java.shell :as shell] - '[clojure.java.io :as io] - '[clojure.edn :as edn] - '[clojure.string :as str] - '[environ.core :refer [env]]) -(require '[cljs.build.api :as api] - '[cljs.repl :as repl] - '[cljs.repl.node :as node]) -(require '[rebel-readline.core] - '[rebel-readline.clojure.main] - '[rebel-readline.clojure.line-reader] - '[rebel-readline.clojure.service.local] - '[rebel-readline.cljs.service.local] - '[rebel-readline.cljs.repl]) - -(import 'java.io.ByteArrayOutputStream) - -(defmulti task first) - -(defmethod task :default - [args] - (let [all-tasks (-> task methods (dissoc :default) keys sort) - interposed (->> all-tasks (interpose ", ") (apply str))] - (println "Unknown or missing task. Choose one of:" interposed) - (System/exit 1))) - -;; --- Generic Build Options - -(def default-build-options - {:cache-analysis true - :parallel-build true - :language-in :ecmascript6 - :language-out :ecmascript5 - :anon-fn-naming-policy :mapped - :optimizations :none - :infer-externs true - :verbose true - :source-map true - :static-fns false - :pretty-print true - :elide-asserts false}) - -(def dist-build-options - {:optimizations :advanced - :pretty-print false - :static-fns true - ;; :fn-invoke-direct true - :elide-asserts true}) - -;; --- Specific Build Options - -(def main-build-options - {:output-dir "resources/public/js/main/" - :output-to "resources/public/js/main.js" - :main 'uxbox.main - :asset-path "/js/main"}) - -;; (def worker-build-options -;; {:main 'uxbox.worker -;; :target :webworker -;; :output-to "resources/public/js/worker.js" -;; :output-dir "resources/public/js/worker" -;; :asset-path "/js/worker"}) - -(def main-dist-build-options - (-> (merge default-build-options - main-build-options - dist-build-options) - (assoc :output-dir "target/dist/js/main/" - :source-map "target/dist/js/main.js.map" - :output-to "target/dist/js/main.js"))) - -(def main-dist-dbg-build-options - (assoc main-dist-build-options - :optimizations :advanced - :pseudo-names true - :pretty-print true - :output-dir "target/dist/dbg/js/main/" - :source-map "target/dist/dbg/js/main.js.map" - :output-to "target/dist/dbg/js/main.js")) - -;; (def worker-dist-build-options -;; (merge default-build-options -;; worker-build-options -;; dist-build-options -;; {:output-to "target/dist/js/worker.js" -;; :output-dir "target/dist/js/worker" -;; :source-map "target/dist/js/worker.js.map"})) - -;; (def worker-dist-dbg-build-options -;; (merge worker-dist-build-options -;; {:optimizations :advanced -;; :pseudo-names true -;; :pretty-print true -;; :output-to "target/dist/dbg/js/worker.js" -;; :output-dir "target/dist/dbg/js/worker" -;; :source-map "target/dist/dbg/js/worker.js.map"})) - -;; --- Tasks Definitions - -(defmethod task "dist:main" - [args] - (let [cfg main-dist-build-options] - ;; (pprint cfg) - (api/build (api/inputs "src") cfg))) - -;; (defmethod task "dist:worker" -;; [args] -;; (let [cfg worker-dist-build-options] -;; ;; (pprint cfg) -;; (api/build (api/inputs "src") cfg))) - -(defmethod task "dist-dbg:main" - [args] - (let [cfg main-dist-dbg-build-options] - ;; (pprint cfg) - (api/build (api/inputs "src") cfg))) - -;; (defmethod task "dist-dbg:worker" -;; [args] -;; (let [cfg worker-dist-dbg-build-options] -;; ;; (pprint cfg) -;; (api/build (api/inputs "src") cfg))) - -(defmethod task "dist:all" - [args] - (task ["dist:main"]) - #_(task ["dist:worker"]) - (task ["dist-dbg:main"]) - #_(task ["dist-dbg:worker"])) - -(defmethod task "repl:node" - [args] - (rebel-readline.core/with-line-reader - (rebel-readline.clojure.line-reader/create - (rebel-readline.cljs.service.local/create)) - (cljs.repl/repl - (node/repl-env) - :prompt (fn []) ;; prompt is handled by line-reader - :read (rebel-readline.cljs.repl/create-repl-read) - :output-dir "out" - :cache-analysis false))) - -;; --- Tests Tasks - -(defmethod task "build:tests" - [& args] - (api/build (api/inputs "src" "test") - (assoc default-build-options - :main 'uxbox.tests.main - :verbose true - :target :nodejs - :source-map true - :output-to "target/tests/main.js" - :output-dir "target/tests/main" - :optimizations :none))) - -(defmethod task "watch:tests" - [args] - (println "Start watch loop...") - (letfn [(run-tests [] - (let [{:keys [out err]} (shell/sh "node" "target/tests/main.js")] - (println out err))) - (start-watch [] - (try - (api/watch (api/inputs "src" "test") - (assoc default-build-options - :main 'uxbox.tests.main - :watch-fn run-tests - :target :nodejs - :source-map true - :output-to "target/tests/main.js" - :output-dir "target/tests/main" - :optimizations :none)) - (catch Exception e - (println "ERROR:" e) - (Thread/sleep 2000) - start-watch)))] - (trampoline start-watch))) - -;;; Build script entrypoint. This should be the last expression. - -(task *command-line-args*)