From ff1ba2dfde89cea253402a4ef089ea47bf648e2b Mon Sep 17 00:00:00 2001 From: didier amyot Date: Fri, 11 Sep 2020 09:38:28 -0400 Subject: [PATCH] Fixed couple of things. --- src/clj/skirmish/routes/core.clj | 3 +- src/cljs/skirmish/wui/components/topbar.cljs | 1 + .../skirmish/wui/components/users_page.cljs | 41 +++++++++++++++++++ src/cljs/skirmish/wui/core.cljs | 3 ++ src/cljs/skirmish/wui/pages.cljs | 5 ++- 5 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 src/cljs/skirmish/wui/components/users_page.cljs diff --git a/src/clj/skirmish/routes/core.clj b/src/clj/skirmish/routes/core.clj index 172e3d8..e3f7848 100644 --- a/src/clj/skirmish/routes/core.clj +++ b/src/clj/skirmish/routes/core.clj @@ -11,7 +11,8 @@ {:name :accounts :path "/accounts"} {:name :account :path "/accounts/:account-id"} {:name :securities :path "/securities"} - {:name :security :path "/securities/:sec-id"}]}) + {:name :security :path "/securities/:sec-id"} + {:name :transactions :path "/transactions"}]}) (def all-routes [ledger-routes]) diff --git a/src/cljs/skirmish/wui/components/topbar.cljs b/src/cljs/skirmish/wui/components/topbar.cljs index 0002e70..1aec8ef 100644 --- a/src/cljs/skirmish/wui/components/topbar.cljs +++ b/src/cljs/skirmish/wui/components/topbar.cljs @@ -40,6 +40,7 @@ [:a.navbar-item.is-tab {:href "/create-order" :class (top-bar-class state :create-order)} "Create Order"] [:a.navbar-item.is-tab {:href "/otc" :class (top-bar-class state :otc)} "Over The Counter"] [:a.navbar-item.is-tab {:href "/portfolio" :class (top-bar-class state :view-portfolio)} "Portfolio"] + [:a.navbar-item.is-tab {:href "/users" :class (top-bar-class state :users)} "Users"] [:a.navbar-item.is-tab {:href "/todo" :class (top-bar-class state :todo)} "Todo"]] [:div.navbar-end [:a.navbar-item {} "Skirmish Shitty Exchange"] diff --git a/src/cljs/skirmish/wui/components/users_page.cljs b/src/cljs/skirmish/wui/components/users_page.cljs new file mode 100644 index 0000000..cd74b77 --- /dev/null +++ b/src/cljs/skirmish/wui/components/users_page.cljs @@ -0,0 +1,41 @@ +(ns skirmish.wui.components.users-page + (:require [cljs-http.client :as http] + [cljs.core.async :refer [ resp :body :users))))) + +(defn users-table [] + (let [users (atom [])] + (get-users users) + #(create-users-table @users))) + +(defn page [state] + [:div + [:div.content + [:h5 "Users"] + [users-table]]]) diff --git a/src/cljs/skirmish/wui/core.cljs b/src/cljs/skirmish/wui/core.cljs index 619f4eb..76effa1 100644 --- a/src/cljs/skirmish/wui/core.cljs +++ b/src/cljs/skirmish/wui/core.cljs @@ -44,6 +44,9 @@ (session/put! :current-page #'pages/home-page) (swap! state #(into % {:page :home :user nil}))) +(secretary/defroute "/users" [] + (session/put! :current-page #'pages/users-page) + (swap! state #(into % {:page :users}))) (secretary/defroute "/securities" [] (session/put! :current-page #'pages/securities-page) diff --git a/src/cljs/skirmish/wui/pages.cljs b/src/cljs/skirmish/wui/pages.cljs index 745fd7a..db1d2f9 100644 --- a/src/cljs/skirmish/wui/pages.cljs +++ b/src/cljs/skirmish/wui/pages.cljs @@ -5,7 +5,8 @@ [skirmish.wui.components.create-order-page] [skirmish.wui.components.securities-page] [skirmish.wui.components.security-page] - [skirmish.wui.components.otc-page])) + [skirmish.wui.components.otc-page] + [skirmish.wui.components.users-page])) (def home-page skirmish.wui.components.home-page/page) @@ -20,3 +21,5 @@ (def security-page skirmish.wui.components.security-page/page) (def otc-page skirmish.wui.components.otc-page/page) + +(def users-page skirmish.wui.components.users-page/page) \ No newline at end of file