From 38751e9619c3a27c7348a8735f68aa1bd8d292ae Mon Sep 17 00:00:00 2001 From: awb99 Date: Mon, 18 Sep 2023 16:34:39 -0500 Subject: [PATCH] dep bump goldly page-loader --- {lib => app}/astro/README.md | 0 {lib => app}/astro/data/point.edn | 0 {lib => app}/astro/deps.edn | 0 {lib => app}/astro/src/astro.clj | 0 {lib => app}/astro/src/astro/marks.clj | 0 {lib => app}/astro/src/astro/moon.clj | 0 {lib => app}/astro/src/astro/windowstats.clj | 0 {lib => app}/astro/src/bad.txt | 0 app/demo/deps.edn | 11 ++--- app/demo/src/demo/goldly/page/main.cljs | 42 ++++++++----------- .../src/demo/goldly/page/test/layout.cljs | 6 +-- app/demo/src/demo/goldly/page/test/test.cljs | 10 +---- app/demo/src/ta-config.edn | 8 ++-- {lib => app}/gann/deps.edn | 0 {lib => app}/gann/resources/ext/gann.edn | 5 ++- {lib => app}/gann/src/notebook/gann/algo.clj | 0 {lib => app}/gann/src/notebook/gann/box.clj | 0 .../gann/src/notebook/gann/chartmaker.clj | 0 {lib => app}/gann/src/notebook/gann/svg.clj | 0 .../gann/src/notebook/gann/window.clj | 0 {lib => app}/gann/src/notebook/svg_demo.clj | 0 {lib => app}/gann/src/ta/gann/algo.clj | 0 {lib => app}/gann/src/ta/gann/box.clj | 0 {lib => app}/gann/src/ta/gann/chartmaker.clj | 0 {lib => app}/gann/src/ta/gann/db.clj | 0 .../src/ta/gann}/page/gann.cljs | 14 +++---- {lib => app}/gann/src/ta/gann/parse.clj | 0 {lib => app}/gann/src/ta/gann/square.clj | 0 {lib => app}/gann/src/ta/gann/svg_plot.clj | 0 {lib => app}/gann/src/ta/gann/svg_view.clj | 0 {lib => app}/gann/src/ta/gann/window.clj | 0 {lib => app}/joseph/deps.edn | 0 app/joseph/resources/ext/joseph.edn | 32 ++++++++++++++ .../joseph/src/joseph/lib/live_pl.cljs | 5 +-- .../joseph/src/joseph/lib/loader.cljs | 3 +- .../joseph/src/joseph/lib/quote_table.cljs | 18 ++++---- .../joseph/src/joseph/lib/select.cljs | 0 .../joseph/src/joseph/lib/trade_filter.cljs | 4 +- .../joseph/src/joseph/lib/viz_filter.cljs | 3 -- {lib => app}/joseph/src/joseph/nav.clj | 0 {lib => app}/joseph/src/joseph/page/live.cljs | 21 ++++------ .../joseph/src/joseph/page/live2.cljs | 12 ++---- {lib => app}/joseph/src/joseph/page/nav.cljs | 12 +----- .../joseph/src/joseph/page/tradingview.cljs | 18 +++----- {lib => app}/joseph/src/joseph/realtime.clj | 0 {lib => app}/joseph/src/joseph/trades.clj | 0 {lib => app}/joseph/src/joseph/upload.clj | 0 {lib => app}/joseph/src/joseph/upload.cljs | 0 {lib => app}/joseph/trades-upload.edn | 0 {lib => app}/joseph/upload-file.sh | 0 {lib => app}/joseph/upload-prod.sh | 0 lib/joseph/resources/ext/joseph.edn | 22 ---------- lib/tradingview/resources/ext/tradingview.edn | 32 +++++++++++--- .../goldly/page/tradingview_algo.cljs | 6 +-- .../goldly/page/tradingview_udf.cljs | 6 +-- lib/trateg/resources/ext/trateg.edn | 12 ++++-- .../trateg/src/ta/viz}/lib/layout.cljs | 5 +-- .../trateg/src/ta/viz}/lib/loader.cljs | 6 +-- .../trateg/src/ta/viz}/lib/ui.cljs | 10 +---- .../trateg/src/ta/viz}/page/backtest.cljs | 17 +++----- .../trateg/src/ta/viz}/page/series.cljs | 11 +++-- .../trateg/src/ta/viz}/page/warehouse.cljs | 11 ++--- .../trateg/src/ta/viz}/view/backtest.cljs | 6 +-- .../trateg/src/ta/viz}/view/tsymbol.cljs | 2 +- .../trateg/src/ta/viz}/view/vega_list.cljs | 2 +- .../trateg/src/ta/viz}/view/vega_nav.cljs | 2 +- 66 files changed, 167 insertions(+), 207 deletions(-) rename {lib => app}/astro/README.md (100%) rename {lib => app}/astro/data/point.edn (100%) rename {lib => app}/astro/deps.edn (100%) rename {lib => app}/astro/src/astro.clj (100%) rename {lib => app}/astro/src/astro/marks.clj (100%) rename {lib => app}/astro/src/astro/moon.clj (100%) rename {lib => app}/astro/src/astro/windowstats.clj (100%) rename {lib => app}/astro/src/bad.txt (100%) rename {lib => app}/gann/deps.edn (100%) rename {lib => app}/gann/resources/ext/gann.edn (79%) rename {lib => app}/gann/src/notebook/gann/algo.clj (100%) rename {lib => app}/gann/src/notebook/gann/box.clj (100%) rename {lib => app}/gann/src/notebook/gann/chartmaker.clj (100%) rename {lib => app}/gann/src/notebook/gann/svg.clj (100%) rename {lib => app}/gann/src/notebook/gann/window.clj (100%) rename {lib => app}/gann/src/notebook/svg_demo.clj (100%) rename {lib => app}/gann/src/ta/gann/algo.clj (100%) rename {lib => app}/gann/src/ta/gann/box.clj (100%) rename {lib => app}/gann/src/ta/gann/chartmaker.clj (100%) rename {lib => app}/gann/src/ta/gann/db.clj (100%) rename app/{demo/src/demo/goldly => gann/src/ta/gann}/page/gann.cljs (95%) rename {lib => app}/gann/src/ta/gann/parse.clj (100%) rename {lib => app}/gann/src/ta/gann/square.clj (100%) rename {lib => app}/gann/src/ta/gann/svg_plot.clj (100%) rename {lib => app}/gann/src/ta/gann/svg_view.clj (100%) rename {lib => app}/gann/src/ta/gann/window.clj (100%) rename {lib => app}/joseph/deps.edn (100%) create mode 100644 app/joseph/resources/ext/joseph.edn rename {lib => app}/joseph/src/joseph/lib/live_pl.cljs (96%) rename {lib => app}/joseph/src/joseph/lib/loader.cljs (92%) rename {lib => app}/joseph/src/joseph/lib/quote_table.cljs (52%) rename {lib => app}/joseph/src/joseph/lib/select.cljs (100%) rename {lib => app}/joseph/src/joseph/lib/trade_filter.cljs (95%) rename {lib => app}/joseph/src/joseph/lib/viz_filter.cljs (99%) rename {lib => app}/joseph/src/joseph/nav.clj (100%) rename {lib => app}/joseph/src/joseph/page/live.cljs (87%) rename {lib => app}/joseph/src/joseph/page/live2.cljs (90%) rename {lib => app}/joseph/src/joseph/page/nav.cljs (94%) rename {lib => app}/joseph/src/joseph/page/tradingview.cljs (92%) rename {lib => app}/joseph/src/joseph/realtime.clj (100%) rename {lib => app}/joseph/src/joseph/trades.clj (100%) rename {lib => app}/joseph/src/joseph/upload.clj (100%) rename {lib => app}/joseph/src/joseph/upload.cljs (100%) rename {lib => app}/joseph/trades-upload.edn (100%) rename {lib => app}/joseph/upload-file.sh (100%) rename {lib => app}/joseph/upload-prod.sh (100%) delete mode 100644 lib/joseph/resources/ext/joseph.edn rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/lib/layout.cljs (89%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/lib/loader.cljs (94%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/lib/ui.cljs (86%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/page/backtest.cljs (94%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/page/series.cljs (82%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/page/warehouse.cljs (80%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/view/backtest.cljs (96%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/view/tsymbol.cljs (97%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/view/vega_list.cljs (94%) rename {app/demo/src/demo/goldly => lib/trateg/src/ta/viz}/view/vega_nav.cljs (97%) diff --git a/lib/astro/README.md b/app/astro/README.md similarity index 100% rename from lib/astro/README.md rename to app/astro/README.md diff --git a/lib/astro/data/point.edn b/app/astro/data/point.edn similarity index 100% rename from lib/astro/data/point.edn rename to app/astro/data/point.edn diff --git a/lib/astro/deps.edn b/app/astro/deps.edn similarity index 100% rename from lib/astro/deps.edn rename to app/astro/deps.edn diff --git a/lib/astro/src/astro.clj b/app/astro/src/astro.clj similarity index 100% rename from lib/astro/src/astro.clj rename to app/astro/src/astro.clj diff --git a/lib/astro/src/astro/marks.clj b/app/astro/src/astro/marks.clj similarity index 100% rename from lib/astro/src/astro/marks.clj rename to app/astro/src/astro/marks.clj diff --git a/lib/astro/src/astro/moon.clj b/app/astro/src/astro/moon.clj similarity index 100% rename from lib/astro/src/astro/moon.clj rename to app/astro/src/astro/moon.clj diff --git a/lib/astro/src/astro/windowstats.clj b/app/astro/src/astro/windowstats.clj similarity index 100% rename from lib/astro/src/astro/windowstats.clj rename to app/astro/src/astro/windowstats.clj diff --git a/lib/astro/src/bad.txt b/app/astro/src/bad.txt similarity index 100% rename from lib/astro/src/bad.txt rename to app/astro/src/bad.txt diff --git a/app/demo/deps.edn b/app/demo/deps.edn index 5889dbd8..9d1a7188 100644 --- a/app/demo/deps.edn +++ b/app/demo/deps.edn @@ -6,15 +6,16 @@ techascent/tech.viz {:mvn/version "6.00-beta-16-2"} ; com.clojure-goes-fast/clj-memory-meter {:mvn/version "0.1.0"} com.taoensso/timbre {:mvn/version "6.2.2"} ; clj/cljs logging - org.pinkgorilla/reval {:mvn/version "0.5.137"} + org.pinkgorilla/reval {:mvn/version "0.5.139"} ; ta ta/trateg {:local/root "../../lib/trateg" :deps/manifest :deps} ta/data {:local/root "../../lib/data" :deps/manifest :deps} ta/tradingview {:local/root "../../lib/tradingview" :deps/manifest :deps} ta/indicator {:local/root "../../lib/indicator" :deps/manifest :deps} - ta/astro {:local/root "../../lib/astro" :deps/manifest :deps} - ta/gann {:local/root "../../lib/gann" :deps/manifest :deps} - joseph/joseph {:local/root "../../lib/joseph" :deps/manifest :deps} + ; apps + ta/astro {:local/root "../../app/astro" :deps/manifest :deps} + ta/gann {:local/root "../../app/gann" :deps/manifest :deps} + joseph/joseph {:local/root "../../app/joseph" :deps/manifest :deps} ;com.clojure-goes-fast/clj-memory-meter {:mvn/version "0.1.0"} ;; @@ -41,7 +42,7 @@ } :docs ; RUN SERVICES (keep running) - {:extra-deps {org.pinkgorilla/goldly-docs {:mvn/version "0.4.616"} + {:extra-deps {org.pinkgorilla/goldly-docs {:mvn/version "0.4.618"} com.fzakaria/slf4j-timbre {:mvn/version "0.4.0"}} :extra-paths ["target/webly" ; to include the sci-bindings info "node_modules" diff --git a/app/demo/src/demo/goldly/page/main.cljs b/app/demo/src/demo/goldly/page/main.cljs index 49276096..aa4fe245 100644 --- a/app/demo/src/demo/goldly/page/main.cljs +++ b/app/demo/src/demo/goldly/page/main.cljs @@ -1,8 +1,6 @@ (ns demo.goldly.page.main (:require - [reagent.core :as r] - [goldly.page :as page] - [demo.goldly.lib.ui :refer [link-dispatch link-href]])) + [ta.viz.lib.ui :refer [link-dispatch link-href]])) ; main page @@ -12,14 +10,14 @@ ; trateg web ui [:div.bg-blue-300.m-5 [:h1.text-xl.text-red-600 "trateg "] - + ; tradingview [:p.text-blue.text-xl "tradingview"] - [link-dispatch [:bidi/goto :tradingview/algo] "tradingview-algo"] - [link-dispatch [:bidi/goto :tradingview/udf] "tradingview-udf"] - + [link-dispatch [:bidi/goto 'ta.tradingview.goldly.page.tradingview-algo/tvalgo-page] "tradingview-algo"] + [link-dispatch [:bidi/goto 'ta.tradingview.goldly.page.tradingview-udf/tradingview-page] "tradingview-udf"] + ; backtest [:p.text-blue.text-xl "backtest"] [link-href "/algo/backtest" "backtester"] - + ; warehouse [:p.text-blue.text-xl "warehouse"] [link-href "/warehouse" "warehouse"] [link-href "/series" "series"]] @@ -28,33 +26,27 @@ [:div.bg-blue-300.m-5 [:h1.text-xl.text-red-600 "joseph"] [link-href "/joseph" "tradingview"] - [link-dispatch [:bidi/goto :joseph/nav] "nav"] - [link-dispatch [:bidi/goto :joseph/live] "live"]] + [link-dispatch [:bidi/goto 'joseph.page.nav/page-joseph-nav] "nav"] + [link-dispatch [:bidi/goto 'joseph.page.live/page-joseph-live] "live"] + [link-dispatch [:bidi/goto 'joseph.page.live2/page-live-trading] "live v2"]] [:div.bg-blue-300.m-5 [:h1.text-xl.text-red-600 "gann tools"] - [link-href "/gann" "gann chart"] - - ] + [link-href "/gann" "gann chart"]] ; test [:div.bg-blue-300.m-5 [:p.text-blue.text-xl "test"] - [link-dispatch [:bidi/goto :test/test] "test-page"] - [link-dispatch [:bidi/goto :test/layout1] "layout-1"] - [link-dispatch [:bidi/goto :test/layout2] "layout-2"] - - ] + [link-dispatch [:bidi/goto 'demo.goldly.page.test.test/test-page] "test-page"] + [link-dispatch [:bidi/goto 'demo.goldly.page.test.layout/page-layout-1] "layout-1"] + [link-dispatch [:bidi/goto 'demo.goldly.page.test.layout/page-layout-2] "layout-2"]] ; goldly developer tools [:div.bg-blue-300.m-5 - [:p.text-blue.text-xl "goldly developer tools"] - [link-dispatch [:bidi/goto :viewer :query-params {}] "notebook viewer"] - [link-dispatch [:bidi/goto :scratchpad] "scratchpad"] - [link-dispatch [:bidi/goto :environment] "environment"] - [link-dispatch [:bidi/goto :devtools] "devtools help"]] + [link-dispatch [:bidi/goto 'reval.goldly.page.notebook-viewer/viewer-page :query-params {}] "notebook viewer"] + [link-dispatch [:bidi/goto 'scratchpad.page.scratchpad/scratchpad] "scratchpad"] + [link-dispatch [:bidi/goto 'goldly.devtools.page.runtime/runtime-page] "environment"] + [link-dispatch [:bidi/goto 'goldly.devtools.page.help/devtools-page] "devtools help"]] ; ]) - -(page/add main-page :user/main) diff --git a/app/demo/src/demo/goldly/page/test/layout.cljs b/app/demo/src/demo/goldly/page/test/layout.cljs index 6924f499..518d92ac 100644 --- a/app/demo/src/demo/goldly/page/test/layout.cljs +++ b/app/demo/src/demo/goldly/page/test/layout.cljs @@ -1,8 +1,7 @@ (ns demo.goldly.page.test.layout (:require - [goldly.page :as page] [site :refer [ipsum]] - [demo.goldly.lib.layout :as layout])) + [ta.viz.lib.layout :as layout])) (defn page-layout-1 [_route] (layout/left-right-top {:top "top" @@ -14,6 +13,3 @@ :left [:div.bg-blue-500.w-full.h-full.overflow-scroll (ipsum 5)] :right [:div.bg-green-500.w-full.h-full (ipsum 100)]})) - -(page/add page-layout-1 :test/layout1) -(page/add page-layout-2 :test/layout2) \ No newline at end of file diff --git a/app/demo/src/demo/goldly/page/test/test.cljs b/app/demo/src/demo/goldly/page/test/test.cljs index 594fd0bb..c92bf23f 100644 --- a/app/demo/src/demo/goldly/page/test/test.cljs +++ b/app/demo/src/demo/goldly/page/test/test.cljs @@ -1,8 +1,7 @@ (ns demo.goldly.page.test.test (:require [reagent.core :as r] - [goldly.page :as page] - [demo.goldly.view.tsymbol :refer [symbol-picker]] + [ta.viz.view.tsymbol :refer [symbol-picker]] [joseph.upload :refer [upload-file-ui]] )) @@ -33,9 +32,4 @@ [:div.w-64 [symbol-picker symbol-atom [:symbol]] [upload-file-ui] - ]]) - - - - -(page/add test-page :test/test) + ]]) \ No newline at end of file diff --git a/app/demo/src/ta-config.edn b/app/demo/src/ta-config.edn index f6c51978..80f5b03c 100644 --- a/app/demo/src/ta-config.edn +++ b/app/demo/src/ta-config.edn @@ -21,10 +21,10 @@ ; runtime :autoload-cljs-dir ["demo/goldly/page" "demo/goldly/page/test"] - :routes {:app {"" :user/main - "test/" {"test" :test/test - "layout1" :test/layout1 - "layout2" :test/layout2 + :routes {:app {"" demo.goldly.page.main/main-page + "test/" {"test" demo.goldly.page.test.test/test-page + "layout1" demo.goldly.page.test.layout/page-layout-1 + "layout2" demo.goldly.page.test.layout/page-layout-2 }} :api {"arrow" :dataset/arrow}}} diff --git a/lib/gann/deps.edn b/app/gann/deps.edn similarity index 100% rename from lib/gann/deps.edn rename to app/gann/deps.edn diff --git a/lib/gann/resources/ext/gann.edn b/app/gann/resources/ext/gann.edn similarity index 79% rename from lib/gann/resources/ext/gann.edn rename to app/gann/resources/ext/gann.edn index 7abedbde..5cb87eef 100644 --- a/lib/gann/resources/ext/gann.edn +++ b/app/gann/resources/ext/gann.edn @@ -8,7 +8,8 @@ ta.gann.svg-plot/gann-svg-web ta.gann.svg-plot/get-boxes]} - :cljs-routes {"gann" :gann} - + :cljs-routes {"gann" ta.gann.page.gann/gann-page} + :sci-cljs-ns [ta.gann.page.gann] + } diff --git a/lib/gann/src/notebook/gann/algo.clj b/app/gann/src/notebook/gann/algo.clj similarity index 100% rename from lib/gann/src/notebook/gann/algo.clj rename to app/gann/src/notebook/gann/algo.clj diff --git a/lib/gann/src/notebook/gann/box.clj b/app/gann/src/notebook/gann/box.clj similarity index 100% rename from lib/gann/src/notebook/gann/box.clj rename to app/gann/src/notebook/gann/box.clj diff --git a/lib/gann/src/notebook/gann/chartmaker.clj b/app/gann/src/notebook/gann/chartmaker.clj similarity index 100% rename from lib/gann/src/notebook/gann/chartmaker.clj rename to app/gann/src/notebook/gann/chartmaker.clj diff --git a/lib/gann/src/notebook/gann/svg.clj b/app/gann/src/notebook/gann/svg.clj similarity index 100% rename from lib/gann/src/notebook/gann/svg.clj rename to app/gann/src/notebook/gann/svg.clj diff --git a/lib/gann/src/notebook/gann/window.clj b/app/gann/src/notebook/gann/window.clj similarity index 100% rename from lib/gann/src/notebook/gann/window.clj rename to app/gann/src/notebook/gann/window.clj diff --git a/lib/gann/src/notebook/svg_demo.clj b/app/gann/src/notebook/svg_demo.clj similarity index 100% rename from lib/gann/src/notebook/svg_demo.clj rename to app/gann/src/notebook/svg_demo.clj diff --git a/lib/gann/src/ta/gann/algo.clj b/app/gann/src/ta/gann/algo.clj similarity index 100% rename from lib/gann/src/ta/gann/algo.clj rename to app/gann/src/ta/gann/algo.clj diff --git a/lib/gann/src/ta/gann/box.clj b/app/gann/src/ta/gann/box.clj similarity index 100% rename from lib/gann/src/ta/gann/box.clj rename to app/gann/src/ta/gann/box.clj diff --git a/lib/gann/src/ta/gann/chartmaker.clj b/app/gann/src/ta/gann/chartmaker.clj similarity index 100% rename from lib/gann/src/ta/gann/chartmaker.clj rename to app/gann/src/ta/gann/chartmaker.clj diff --git a/lib/gann/src/ta/gann/db.clj b/app/gann/src/ta/gann/db.clj similarity index 100% rename from lib/gann/src/ta/gann/db.clj rename to app/gann/src/ta/gann/db.clj diff --git a/app/demo/src/demo/goldly/page/gann.cljs b/app/gann/src/ta/gann/page/gann.cljs similarity index 95% rename from app/demo/src/demo/goldly/page/gann.cljs rename to app/gann/src/ta/gann/page/gann.cljs index 46de06c1..b26aeb69 100644 --- a/app/demo/src/demo/goldly/page/gann.cljs +++ b/app/gann/src/ta/gann/page/gann.cljs @@ -1,12 +1,13 @@ -(ns demo.goldly.page.gann +(ns ta.gann.page.gann (:require [reagent.core :as r] - [goldly.service.core :refer [run-a run-cb]] - [goldly.page :as page] [ui.aggrid :refer [aggrid]] + [ui.rnd :refer [rnd]] [input] - [demo.goldly.lib.ui :refer [link-href to-fixed rnd]] ; todo: move rnd + to-fixed out of user - [demo.goldly.view.tsymbol :refer [symbol-picker]])) + [goldly.service.core :refer [run-a run-cb]] + [goldly.js :refer [to-fixed]] + [ta.viz.lib.ui :refer [link-href]] + [ta.viz.view.tsymbol :refer [symbol-picker]])) (defn round-number-digits [digits number] ; digits is first parameter, so it can easily be applied (data last) @@ -73,7 +74,7 @@ (run-a *state [:data] 'ta.gann.svg-plot/gann-svg-web p-with-size-rootbox) - (run-a *state [:boxes] :gann/boxes p-with-size-rootbox))) + (run-a *state [:boxes] 'ta.gann.svg-plot/get-boxes p-with-size-rootbox))) (defn save-rootbox [] (let [root-box (:root @*state)] @@ -190,4 +191,3 @@ ;[:div.bg-gray-500.mt-12 "params:" (pr-str (:params @*state))] ])) -(page/add gann-page :gann) diff --git a/lib/gann/src/ta/gann/parse.clj b/app/gann/src/ta/gann/parse.clj similarity index 100% rename from lib/gann/src/ta/gann/parse.clj rename to app/gann/src/ta/gann/parse.clj diff --git a/lib/gann/src/ta/gann/square.clj b/app/gann/src/ta/gann/square.clj similarity index 100% rename from lib/gann/src/ta/gann/square.clj rename to app/gann/src/ta/gann/square.clj diff --git a/lib/gann/src/ta/gann/svg_plot.clj b/app/gann/src/ta/gann/svg_plot.clj similarity index 100% rename from lib/gann/src/ta/gann/svg_plot.clj rename to app/gann/src/ta/gann/svg_plot.clj diff --git a/lib/gann/src/ta/gann/svg_view.clj b/app/gann/src/ta/gann/svg_view.clj similarity index 100% rename from lib/gann/src/ta/gann/svg_view.clj rename to app/gann/src/ta/gann/svg_view.clj diff --git a/lib/gann/src/ta/gann/window.clj b/app/gann/src/ta/gann/window.clj similarity index 100% rename from lib/gann/src/ta/gann/window.clj rename to app/gann/src/ta/gann/window.clj diff --git a/lib/joseph/deps.edn b/app/joseph/deps.edn similarity index 100% rename from lib/joseph/deps.edn rename to app/joseph/deps.edn diff --git a/app/joseph/resources/ext/joseph.edn b/app/joseph/resources/ext/joseph.edn new file mode 100644 index 00000000..edd361cc --- /dev/null +++ b/app/joseph/resources/ext/joseph.edn @@ -0,0 +1,32 @@ +{:name "joseph" + ; runtime + :api-routes {"joseph/" {:post {"upload" joseph.upload/wrapped-save-file}}} + :clj-services {:name "joseph" + :permission #{:dev} + :symbols [joseph.nav/calc-nav-browser + joseph.trades/load-trades + joseph.realtime/realtime-snapshot + joseph.realtime/realtime-snapshot-stocks + joseph.realtime/daily-snapshot-futures]} + + :cljs-routes {"joseph" {"" joseph.page.tradingview/tradingview-trades-page + "/nav" joseph.page.nav/page-joseph-nav + "/live" joseph.page.live/page-joseph-live + "/live2" joseph.page.live2/page-live-trading}} + + :sci-cljs-ns [; lib + joseph.lib.live-pl + joseph.lib.loader + joseph.lib.quote-table + joseph.lib.select + joseph.lib.trade-filter + joseph.lib.viz-filter + ; root + joseph.upload + ; page + joseph.page.live + joseph.page.live2 + joseph.page.nav + joseph.page.tradingview] + } + diff --git a/lib/joseph/src/joseph/lib/live_pl.cljs b/app/joseph/src/joseph/lib/live_pl.cljs similarity index 96% rename from lib/joseph/src/joseph/lib/live_pl.cljs rename to app/joseph/src/joseph/lib/live_pl.cljs index 1f45b6af..902da232 100644 --- a/lib/joseph/src/joseph/lib/live_pl.cljs +++ b/app/joseph/src/joseph/lib/live_pl.cljs @@ -1,14 +1,11 @@ (ns joseph.lib.live-pl (:require - [goldly.js :refer [to-fixed]] - )) - + [goldly.js :refer [to-fixed]])) (defn round-number-digits [digits number] ; digits is first parameter, so it can easily be applied (data last) (if (nil? number) "" (to-fixed number digits))) - (defn current-pl [{:keys [qty side entry-price]} current-price] (let [change (- current-price entry-price) qty2 (if (= side :long) diff --git a/lib/joseph/src/joseph/lib/loader.cljs b/app/joseph/src/joseph/lib/loader.cljs similarity index 92% rename from lib/joseph/src/joseph/lib/loader.cljs rename to app/joseph/src/joseph/lib/loader.cljs index 61cb30d6..e3a8edb6 100644 --- a/lib/joseph/src/joseph/lib/loader.cljs +++ b/app/joseph/src/joseph/lib/loader.cljs @@ -3,8 +3,7 @@ [reagent.core :as r] [promesa.core :as p] [goldly.service.core :as service] - [ui.webly :refer [notify]] - )) + [ui.webly :refer [notify]])) (defn clj [init-value fun & args] (let [a (r/atom init-value) diff --git a/lib/joseph/src/joseph/lib/quote_table.cljs b/app/joseph/src/joseph/lib/quote_table.cljs similarity index 52% rename from lib/joseph/src/joseph/lib/quote_table.cljs rename to app/joseph/src/joseph/lib/quote_table.cljs index 1eabb49c..82591d8a 100644 --- a/lib/joseph/src/joseph/lib/quote_table.cljs +++ b/app/joseph/src/joseph/lib/quote_table.cljs @@ -12,16 +12,16 @@ (defn quote-table [quotes] [aggrid {:box :fl :data quotes - :columns [{:field :symbol} - {:field :date} - {:field :time} + :columns [{:field :symbol :width 50} + {:field :date :width 50} + {:field :time :width 50} ;{:field :timezone} - {:field :open} - {:field :high} - {:field :low} - {:field :close} - {:field :volume} - {:field :changepercent} + {:field :open :width 50} + {:field :high :width 50} + {:field :low :width 50} + {:field :close :width 50} + {:field :volume :width 50} + {:field :changepercent :width 50} ;{:field :lastprice} ;{:field :lastvolume} ] diff --git a/lib/joseph/src/joseph/lib/select.cljs b/app/joseph/src/joseph/lib/select.cljs similarity index 100% rename from lib/joseph/src/joseph/lib/select.cljs rename to app/joseph/src/joseph/lib/select.cljs diff --git a/lib/joseph/src/joseph/lib/trade_filter.cljs b/app/joseph/src/joseph/lib/trade_filter.cljs similarity index 95% rename from lib/joseph/src/joseph/lib/trade_filter.cljs rename to app/joseph/src/joseph/lib/trade_filter.cljs index fc8ac1aa..19385b2a 100644 --- a/lib/joseph/src/joseph/lib/trade_filter.cljs +++ b/app/joseph/src/joseph/lib/trade_filter.cljs @@ -1,8 +1,6 @@ (ns joseph.lib.trade-filter (:require - [clojure.string :as str] - - )) + [clojure.string :as str])) (defn live-trade? [{:keys [exit-date]}] diff --git a/lib/joseph/src/joseph/lib/viz_filter.cljs b/app/joseph/src/joseph/lib/viz_filter.cljs similarity index 99% rename from lib/joseph/src/joseph/lib/viz_filter.cljs rename to app/joseph/src/joseph/lib/viz_filter.cljs index be557d0b..415ad46d 100644 --- a/lib/joseph/src/joseph/lib/viz_filter.cljs +++ b/app/joseph/src/joseph/lib/viz_filter.cljs @@ -2,11 +2,8 @@ (:require [clojure.string :as str])) - - (def all "*") - (defn filter-viz-eq [key value list] (let [disabled? (or (nil? value) (str/blank? value) diff --git a/lib/joseph/src/joseph/nav.clj b/app/joseph/src/joseph/nav.clj similarity index 100% rename from lib/joseph/src/joseph/nav.clj rename to app/joseph/src/joseph/nav.clj diff --git a/lib/joseph/src/joseph/page/live.cljs b/app/joseph/src/joseph/page/live.cljs similarity index 87% rename from lib/joseph/src/joseph/page/live.cljs rename to app/joseph/src/joseph/page/live.cljs index 0920f2cb..4543503d 100644 --- a/lib/joseph/src/joseph/page/live.cljs +++ b/app/joseph/src/joseph/page/live.cljs @@ -2,19 +2,15 @@ (:require [reagent.core :as r] [clojure.string :as str] - [goldly.page :as page] - - ; ui - [demo.goldly.lib.layout :as layout] - [joseph.lib.select :refer [select-string]] + ; trateg + [ta.viz.lib.layout :as layout] [ta.viz.trades-table :refer [trades-table-live]] - ; load data - [demo.goldly.lib.loader :refer [clj->p]] - ;data helper + [ta.viz.lib.loader :refer [clj->p]] + ; joseph + [joseph.lib.select :refer [select-string]] [joseph.lib.live-pl :refer [trades-with-pl]] [joseph.lib.trade-filter :refer [filter-trades]] - [joseph.lib.quote-table :refer [quote-table]] - )) + [joseph.lib.quote-table :refer [quote-table]])) (defn accounts [trades] (->> trades @@ -70,7 +66,4 @@ :loading [:p "loading"] :error [:p "error!"] :data [live-trade-ui (:data @trades-ra)] - [:p "unknown: status:" (pr-str @trades-ra)])))) - - -(page/add page-joseph-live :joseph/live) + [:p "unknown: status:" (pr-str @trades-ra)])))) \ No newline at end of file diff --git a/lib/joseph/src/joseph/page/live2.cljs b/app/joseph/src/joseph/page/live2.cljs similarity index 90% rename from lib/joseph/src/joseph/page/live2.cljs rename to app/joseph/src/joseph/page/live2.cljs index 0c496ffa..50411b30 100644 --- a/lib/joseph/src/joseph/page/live2.cljs +++ b/app/joseph/src/joseph/page/live2.cljs @@ -2,14 +2,13 @@ (:require [reagent.core :as r] [reagent.ratom :refer [make-reaction]] - [goldly.page :as page] ; trateg - ; pure ui-functions - [demo.goldly.lib.layout :as layout] + [ta.viz.lib.layout :as layout] [ta.viz.trades-table :refer [trades-table-live]] + ; joseph - pure ui [joseph.lib.quote-table :refer [quote-table]] [joseph.lib.select :refer [select-string]] - ; data helper + ; joseph - data helper [joseph.lib.loader :refer [clj]] [joseph.lib.viz-filter :as vf] [joseph.lib.trade-filter :refer [filter-trades]] @@ -49,7 +48,4 @@ (defn page-live-trading [_route] - [live-dashboard]) - - -(page/add page-live-trading :joseph/live2) \ No newline at end of file + [live-dashboard]) \ No newline at end of file diff --git a/lib/joseph/src/joseph/page/nav.cljs b/app/joseph/src/joseph/page/nav.cljs similarity index 94% rename from lib/joseph/src/joseph/page/nav.cljs rename to app/joseph/src/joseph/page/nav.cljs index 445a7514..b6359b4f 100644 --- a/lib/joseph/src/joseph/page/nav.cljs +++ b/app/joseph/src/joseph/page/nav.cljs @@ -2,15 +2,13 @@ (:require [tick.core :as t] [re-frame.core :as rf] - [goldly.page :as page] [goldly :refer [eventhandler]] [container :refer [tab]] [ta.viz.nav-vega :refer [nav-vega]] [ta.viz.nav-table :refer [nav-table]] [ta.viz.trades-table :refer [trades-table]] - [demo.goldly.lib.loader :refer [clj->p]] - [demo.goldly.lib.layout :as layout] - )) + [ta.viz.lib.loader :refer [clj->p]] + [ta.viz.lib.layout :as layout])) (defn hack-date [row] ; inst converts a tick data to a javascript/date @@ -71,9 +69,3 @@ "trades" [trades-table (:trades (:data @nav))]]}] [:p "unknown: status:" (pr-str @nav)])))) - - - - -(page/add page-joseph-nav :joseph/nav) - diff --git a/lib/joseph/src/joseph/page/tradingview.cljs b/app/joseph/src/joseph/page/tradingview.cljs similarity index 92% rename from lib/joseph/src/joseph/page/tradingview.cljs rename to app/joseph/src/joseph/page/tradingview.cljs index 37fb13e6..7bb4ca7d 100644 --- a/lib/joseph/src/joseph/page/tradingview.cljs +++ b/app/joseph/src/joseph/page/tradingview.cljs @@ -7,16 +7,15 @@ [tick.core :as tick] [ui.aggrid :refer [aggrid]] [input] - [goldly.page :as page] - [demo.goldly.lib.loader :refer [clj->a]] - [demo.goldly.lib.ui :refer [link-href]] - ;[demo.goldly.view.tsymbol :refer [symbol-picker]] + [ta.viz.lib.loader :refer [clj->a]] + [ta.viz.lib.ui :refer [link-href]] + ;[ta.viz.view.tsymbol :refer [symbol-picker]] [ta.tradingview.goldly.algo.context :as c] [ta.tradingview.goldly.algo.tradingview :refer [tradingview-algo]] [ta.tradingview.goldly.page.tradingview-algo :refer []] [ta.tradingview.goldly.interact :refer [tv-widget-atom]] [ta.tradingview.goldly.interact2 :refer [goto-date!]] - [joseph.lib.trade-filter :refer [filter-trades]] + [joseph.lib.trade-filter :refer [filter-trades]] )) @@ -125,7 +124,7 @@ [:p "unknown: status:" (pr-str @trades)])]))) -(defn trades-page [_route] +(defn tradingview-trades-page [_route] [:div.h-screen.w-screen.bg-red-500 {;:class "h-full.w-full" :style {:display "flex"}} ;.flex.flex-row. @@ -139,9 +138,4 @@ ;:min-width "300" :flex "25%" }} - [trades-view]] - - - ]) - -(page/add trades-page :joseph/trades) + [trades-view]]]) diff --git a/lib/joseph/src/joseph/realtime.clj b/app/joseph/src/joseph/realtime.clj similarity index 100% rename from lib/joseph/src/joseph/realtime.clj rename to app/joseph/src/joseph/realtime.clj diff --git a/lib/joseph/src/joseph/trades.clj b/app/joseph/src/joseph/trades.clj similarity index 100% rename from lib/joseph/src/joseph/trades.clj rename to app/joseph/src/joseph/trades.clj diff --git a/lib/joseph/src/joseph/upload.clj b/app/joseph/src/joseph/upload.clj similarity index 100% rename from lib/joseph/src/joseph/upload.clj rename to app/joseph/src/joseph/upload.clj diff --git a/lib/joseph/src/joseph/upload.cljs b/app/joseph/src/joseph/upload.cljs similarity index 100% rename from lib/joseph/src/joseph/upload.cljs rename to app/joseph/src/joseph/upload.cljs diff --git a/lib/joseph/trades-upload.edn b/app/joseph/trades-upload.edn similarity index 100% rename from lib/joseph/trades-upload.edn rename to app/joseph/trades-upload.edn diff --git a/lib/joseph/upload-file.sh b/app/joseph/upload-file.sh similarity index 100% rename from lib/joseph/upload-file.sh rename to app/joseph/upload-file.sh diff --git a/lib/joseph/upload-prod.sh b/app/joseph/upload-prod.sh similarity index 100% rename from lib/joseph/upload-prod.sh rename to app/joseph/upload-prod.sh diff --git a/lib/joseph/resources/ext/joseph.edn b/lib/joseph/resources/ext/joseph.edn deleted file mode 100644 index 87fdfebe..00000000 --- a/lib/joseph/resources/ext/joseph.edn +++ /dev/null @@ -1,22 +0,0 @@ -{:name "joseph" - ; runtime - :api-routes {"joseph/" {:post {"upload" joseph.upload/wrapped-save-file}}} - :clj-services {:name "joseph" - :permission #{:dev} - :symbols [joseph.nav/calc-nav-browser - joseph.trades/load-trades - joseph.realtime/realtime-snapshot - joseph.realtime/realtime-snapshot-stocks - joseph.realtime/daily-snapshot-futures - ]} - - :autoload-cljs-dir ["joseph/page"] - :cljs-routes {"joseph" {"" :joseph/trades - "/nav" :joseph/nav - "/live" :joseph/live - "/live2" :joseph/live2 - } - - } - } - diff --git a/lib/tradingview/resources/ext/tradingview.edn b/lib/tradingview/resources/ext/tradingview.edn index 2b57ef79..9282061b 100644 --- a/lib/tradingview/resources/ext/tradingview.edn +++ b/lib/tradingview/resources/ext/tradingview.edn @@ -22,11 +22,33 @@ ta.tradingview.handler-datasource/symbol-info ta.tradingview.handler-datasource/symbol-search ta.tradingview.handler-datasource/server-time]} - - :autoload-cljs-dir ["ta/tradingview/goldly/page"] - :cljs-routes {"algo/tradingview" :tradingview/algo - "tradingview" :tradingview/udf} - + :cljs-routes {"algo/tradingview" ta.tradingview.goldly.page.tradingview-algo/tvalgo-page + "tradingview" ta.tradingview.goldly.page.tradingview-udf/tradingview-page} + :sci-cljs-ns [; algo + ta.tradingview.goldly.algo.context + ta.tradingview.goldly.algo.indicator-config + ta.tradingview.goldly.algo.indicator + ta.tradingview.goldly.algo.interaction + ta.tradingview.goldly.algo.tradingview + ; feed + ta.tradingview.goldly.feed.algo2 + ta.tradingview.goldly.feed.random + ta.tradingview.goldly.feed.udf + ; indicator + ta.tradingview.goldly.indicator.bar-colorer + ; root + ta.tradingview.goldly.dialog + ta.tradingview.goldly.helper + ta.tradingview.goldly.interact + ta.tradingview.goldly.interact2 + ta.tradingview.goldly.tradingview + ; view + ta.tradingview.goldly.view.aggrid + ; page + ta.tradingview.goldly.page.tradingview-algo + ta.tradingview.goldly.page.tradingview-udf + + ] } \ No newline at end of file diff --git a/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_algo.cljs b/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_algo.cljs index 4a62a069..7f6dc33d 100644 --- a/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_algo.cljs +++ b/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_algo.cljs @@ -2,12 +2,10 @@ (:require [reagent.core :as r] [goldly.service.core :refer [run-a]] - [goldly.page :as page] [input] [ta.tradingview.goldly.algo.context :as c] [ta.tradingview.goldly.dialog :refer [show-algo-dialog show-table-dialog]] - [ta.tradingview.goldly.algo.tradingview :refer [tradingview-algo]] - )) + [ta.tradingview.goldly.algo.tradingview :refer [tradingview-algo]])) (defonce algo-ctx (c/create-algo-context "moon" {:symbol "QQQ" :frequency "D"})) @@ -60,5 +58,3 @@ (defn tvalgo-page [_route] [:div.h-screen.w-screen.bg-red-500 [algo-ui]]) - -(page/add tvalgo-page :tradingview/algo) diff --git a/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_udf.cljs b/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_udf.cljs index f27a6913..33a31721 100644 --- a/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_udf.cljs +++ b/lib/tradingview/src/ta/tradingview/goldly/page/tradingview_udf.cljs @@ -1,11 +1,9 @@ (ns ta.tradingview.goldly.page.tradingview-udf (:require - [goldly.page :as page] [ta.tradingview.goldly.tradingview :refer [tradingview-chart]] [ta.tradingview.goldly.feed.udf :refer [get-tradingview-options-udf-feed]] [ta.tradingview.goldly.interact2 :as interact] - [ta.tradingview.goldly.interact :refer [tv-widget-atom]] - )) + [ta.tradingview.goldly.interact :refer [tv-widget-atom]])) (defn goto-symbol [s] [:a.pr-5.bg-blue-300 {:on-click #(interact/set-symbol @tv-widget-atom s "1D")} s]) @@ -19,5 +17,3 @@ [goto-symbol "TLT"]] [tradingview-chart {:feed (get-tradingview-options-udf-feed :ta) :options {:autosize true}}]]]) - -(page/add tradingview-page :tradingview/udf) diff --git a/lib/trateg/resources/ext/trateg.edn b/lib/trateg/resources/ext/trateg.edn index 08f1ff76..97b6236e 100644 --- a/lib/trateg/resources/ext/trateg.edn +++ b/lib/trateg/resources/ext/trateg.edn @@ -18,9 +18,13 @@ ; testing ta.helper.date/now-datetime]} :cljs-routes {;warehouse - "warehouse" :user/warehouse - "series" :user/series - ;backtest - "algo/backtest" :algo/backtest} + "warehouse" ta.viz.page.warehouse/warehouse-page + "series" ta.viz.page.series/series-page + "algo/backtest" ta.viz.page.backtest/algo-backtest-page} + + :sci-cljs-ns [; viz + ta.viz.nav-table + ta.viz.nav-vega + ta.viz.trades-table] } \ No newline at end of file diff --git a/app/demo/src/demo/goldly/lib/layout.cljs b/lib/trateg/src/ta/viz/lib/layout.cljs similarity index 89% rename from app/demo/src/demo/goldly/lib/layout.cljs rename to lib/trateg/src/ta/viz/lib/layout.cljs index d2212a0c..661d3c83 100644 --- a/app/demo/src/demo/goldly/lib/layout.cljs +++ b/lib/trateg/src/ta/viz/lib/layout.cljs @@ -1,7 +1,6 @@ -(ns demo.goldly.lib.layout +(ns ta.viz.lib.layout (:require - [spaces])) - + [spaces])) (defn left-right-top [{:keys [top left right]}] [spaces/viewport diff --git a/app/demo/src/demo/goldly/lib/loader.cljs b/lib/trateg/src/ta/viz/lib/loader.cljs similarity index 94% rename from app/demo/src/demo/goldly/lib/loader.cljs rename to lib/trateg/src/ta/viz/lib/loader.cljs index ba0c553a..feeead46 100644 --- a/app/demo/src/demo/goldly/lib/loader.cljs +++ b/lib/trateg/src/ta/viz/lib/loader.cljs @@ -1,10 +1,8 @@ -(ns demo.goldly.lib.loader +(ns ta.viz.lib.loader (:require [reagent.core :as r] [promesa.core :as p] - [goldly.service.core :refer [clj]] - )) - + [goldly.service.core :refer [clj]])) (defn clj->p [fun & args] (println "loading clj fun: " fun " args: " args) diff --git a/app/demo/src/demo/goldly/lib/ui.cljs b/lib/trateg/src/ta/viz/lib/ui.cljs similarity index 86% rename from app/demo/src/demo/goldly/lib/ui.cljs rename to lib/trateg/src/ta/viz/lib/ui.cljs index 4fb919f2..9bad5eb4 100644 --- a/app/demo/src/demo/goldly/lib/ui.cljs +++ b/lib/trateg/src/ta/viz/lib/ui.cljs @@ -1,11 +1,8 @@ -(ns demo.goldly.lib.ui +(ns ta.viz.lib.ui (:require [re-frame.core :as rf] [layout] [site] - [goldly.page :as page] - [goldly.js] ; to-fixed - [ui.rnd] ; rnd )) ;; links @@ -36,13 +33,10 @@ ; {:text "feedback" :link "https://github.com/pink-gorilla/goldly/issues" :special? true} ]}]) -(defn add-page-site [fn-page name] +#_(defn add-page-site [fn-page name] (let [wrapped-page (fn [route] [layout/header-main ; .w-screen.h-screen [site-header] [fn-page route]])] (page/add wrapped-page name))) -(def to-fixed goldly.js/to-fixed) - -(def rnd ui.rnd/rnd) diff --git a/app/demo/src/demo/goldly/page/backtest.cljs b/lib/trateg/src/ta/viz/page/backtest.cljs similarity index 94% rename from app/demo/src/demo/goldly/page/backtest.cljs rename to lib/trateg/src/ta/viz/page/backtest.cljs index 61784587..7e364957 100644 --- a/app/demo/src/demo/goldly/page/backtest.cljs +++ b/lib/trateg/src/ta/viz/page/backtest.cljs @@ -1,18 +1,15 @@ -(ns demo.goldly.page.backtest +(ns ta.viz.page.backtest (:require [reagent.core :as r] - [goldly.service.core :refer [run-a]] - [goldly.page :as page] [ui.highcharts :refer [highstock]] [input] + [goldly.service.core :refer [run-a]] [ta.tradingview.goldly.tradingview :refer [tradingview-chart]] [ta.tradingview.goldly.interact :refer [tv-widget-atom ]] [ta.tradingview.goldly.interact2 :refer [set-symbol chart-active wrap-chart-ready add-shape]] [ta.tradingview.goldly.view.aggrid :refer [study-table]] - [demo.goldly.lib.ui :refer [link-href]] - [demo.goldly.view.backtest :refer [navs-chart navs-view roundtrips-view metrics-view]] - - )) + [ta.viz.lib.ui :refer [link-href]] + [ta.viz.view.backtest :refer [navs-chart navs-view roundtrips-view metrics-view]])) (defonce algo-state (r/atom {:algos [] @@ -149,8 +146,6 @@ [algo-menu] [page-renderer data page]]))) -(defn algo-page [_route] +(defn algo-backtest-page [_route] [:div.h-screen.w-screen.bg-red-500 - [algo-ui]]) - -(page/add algo-page :algo/backtest) + [algo-ui]]) \ No newline at end of file diff --git a/app/demo/src/demo/goldly/page/series.cljs b/lib/trateg/src/ta/viz/page/series.cljs similarity index 82% rename from app/demo/src/demo/goldly/page/series.cljs rename to lib/trateg/src/ta/viz/page/series.cljs index 7644e8a7..69085810 100644 --- a/app/demo/src/demo/goldly/page/series.cljs +++ b/lib/trateg/src/ta/viz/page/series.cljs @@ -1,11 +1,10 @@ -(ns demo.goldly.page.series +(ns ta.viz.page.series (:require [reagent.core :as r] - [goldly.page :as page] [ta.tradingview.goldly.view.aggrid :refer [bars-table]] - [demo.goldly.lib.loader :refer [clj->a]] - [demo.goldly.lib.ui :refer [link-href]] - [demo.goldly.view.tsymbol :refer [symbol-picker]] + [ta.viz.lib.loader :refer [clj->a]] + [ta.viz.lib.ui :refer [link-href]] + [ta.viz.view.tsymbol :refer [symbol-picker]] )) @@ -42,4 +41,4 @@ ; ] ]]) -(page/add series-page :user/series) + diff --git a/app/demo/src/demo/goldly/page/warehouse.cljs b/lib/trateg/src/ta/viz/page/warehouse.cljs similarity index 80% rename from app/demo/src/demo/goldly/page/warehouse.cljs rename to lib/trateg/src/ta/viz/page/warehouse.cljs index 57ac612c..28257a6c 100644 --- a/app/demo/src/demo/goldly/page/warehouse.cljs +++ b/lib/trateg/src/ta/viz/page/warehouse.cljs @@ -1,8 +1,7 @@ -(ns demo.goldly.page.warehouse +(ns ta.viz.page.warehouse (:require - [goldly.page :as page] - [demo.goldly.lib.loader :refer [clj->p]] - [demo.goldly.lib.ui :refer [link-href]] + [ta.viz.lib.loader :refer [clj->p]] + [ta.viz.lib.ui :refer [link-href]] [ta.tradingview.goldly.view.aggrid :refer [table]])) (defn warehouse-overview-view [wh f] @@ -25,6 +24,4 @@ [warehouse-overview-view :stocks "D"] [warehouse-overview-view :crypto "D"] ; ] - ]]) - -(page/add warehouse-page :user/warehouse) + ]]) \ No newline at end of file diff --git a/app/demo/src/demo/goldly/view/backtest.cljs b/lib/trateg/src/ta/viz/view/backtest.cljs similarity index 96% rename from app/demo/src/demo/goldly/view/backtest.cljs rename to lib/trateg/src/ta/viz/view/backtest.cljs index 00656659..30b66511 100644 --- a/app/demo/src/demo/goldly/view/backtest.cljs +++ b/lib/trateg/src/ta/viz/view/backtest.cljs @@ -1,8 +1,8 @@ -(ns demo.goldly.view.backtest +(ns ta.viz.view.backtest (:require - [demo.goldly.lib.ui :refer [to-fixed]] [ui.aggrid :refer [aggrid]] - [demo.goldly.view.vega-nav :refer [vega-nav-plot]])) + [goldly.js :refer [to-fixed]] + [ta.viz.view.vega-nav :refer [vega-nav-plot]])) (defn round-number-digits [digits number] ; digits is first parameter, so it can easily be applied (data last) diff --git a/app/demo/src/demo/goldly/view/tsymbol.cljs b/lib/trateg/src/ta/viz/view/tsymbol.cljs similarity index 97% rename from app/demo/src/demo/goldly/view/tsymbol.cljs rename to lib/trateg/src/ta/viz/view/tsymbol.cljs index ace1949a..a0d47357 100644 --- a/app/demo/src/demo/goldly/view/tsymbol.cljs +++ b/lib/trateg/src/ta/viz/view/tsymbol.cljs @@ -1,4 +1,4 @@ -(ns demo.goldly.view.tsymbol +(ns ta.viz.view.tsymbol (:require [reagent.core :as r] [layout] diff --git a/app/demo/src/demo/goldly/view/vega_list.cljs b/lib/trateg/src/ta/viz/view/vega_list.cljs similarity index 94% rename from app/demo/src/demo/goldly/view/vega_list.cljs rename to lib/trateg/src/ta/viz/view/vega_list.cljs index 406cd29f..bc9ad688 100644 --- a/app/demo/src/demo/goldly/view/vega_list.cljs +++ b/lib/trateg/src/ta/viz/view/vega_list.cljs @@ -1,4 +1,4 @@ -(ns demo.goldly.view.vega-list +(ns ta.viz.view.vega-list (:require [ui.vega.plot :refer [list-plot]])) diff --git a/app/demo/src/demo/goldly/view/vega_nav.cljs b/lib/trateg/src/ta/viz/view/vega_nav.cljs similarity index 97% rename from app/demo/src/demo/goldly/view/vega_nav.cljs rename to lib/trateg/src/ta/viz/view/vega_nav.cljs index a644efa5..9128e5c5 100644 --- a/app/demo/src/demo/goldly/view/vega_nav.cljs +++ b/lib/trateg/src/ta/viz/view/vega_nav.cljs @@ -1,4 +1,4 @@ -(ns demo.goldly.view.vega-nav +(ns ta.viz.view.vega-nav (:require [ui.vega :refer [vegalite]]))