diff --git a/src/clj/auto_ap/graphql/accounts.clj b/src/clj/auto_ap/graphql/accounts.clj index 3e0ea79a..7f03299c 100644 --- a/src/clj/auto_ap/graphql/accounts.clj +++ b/src/clj/auto_ap/graphql/accounts.clj @@ -11,8 +11,7 @@ (:account_set args) (merge-query {:query {:in ['?account-set] :where [['?e :account/account-set '?account-set]]} :args [(:account_set args)]}))] - (doto (->> - (d/query query) - (map first) - (->graphql )) - println))) + (->> + (d/query query) + (map first) + (->graphql )))) diff --git a/src/cljs/auto_ap/events.cljs b/src/cljs/auto_ap/events.cljs index eca15db8..821a8e25 100644 --- a/src/cljs/auto_ap/events.cljs +++ b/src/cljs/auto_ap/events.cljs @@ -46,7 +46,7 @@ [:address [:street1 :street2 :city :state :zip]]]] [:vendor [:id :name :default-expense-account [:primary-contact [:name :phone :email :id]] [:secondary-contact [:id :name :phone :email]] :print-as :invoice-reminder-schedule :code]] - [:accounts [:numeric-code :name :type :account_set]]]} + [:accounts [:numeric-code :name :type :account_set :id]]]} :on-success [::received-initial]}})))) (def vendor-query [:id :name :default-expense-account @@ -68,17 +68,19 @@ [:id :name :code [:address [:street1 :street2 :city :state :zip]] [:bank-accounts [:id :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id] ]]] [:vendor [:id :name :default-expense-account [:primary-contact [:name :phone :email :id]] [:secondary-contact [:id :name :phone :email]] :print-as :invoice-reminder-schedule :code]] - [:accounts [:numeric-code :name :type :account_set]]]} + [:accounts [:numeric-code :name :type :account_set :id]]]} :on-success [::received-initial]} :db (assoc db :user (assoc user :token token))})) (re-frame/reg-event-db ::received-initial - (fn [db [_ {clients :client vendors :vendor :as x}]] + (fn [db [_ {accounts :accounts clients :client vendors :vendor :as x}]] + (-> db (assoc :clients (by :id clients) ) (assoc :vendors (by :id vendors) ) + (assoc :accounts accounts ) (assoc :client (when (= 1 (count clients)) (->> clients first :id )))))) (re-frame/reg-event-db @@ -121,7 +123,7 @@ (re-frame/reg-event-fx ::set-active-page (fn [{:keys [db]} [_ handler params]] - (println "PARAMS" params) + (if (and (not= :login handler) (not (:user db))) {:redirect "/login" :db (assoc db :active-page :login diff --git a/src/cljs/auto_ap/routes.cljs b/src/cljs/auto_ap/routes.cljs index d1e3f109..e27143d6 100644 --- a/src/cljs/auto_ap/routes.cljs +++ b/src/cljs/auto_ap/routes.cljs @@ -9,6 +9,7 @@ "admin/" {"" :admin "clients" :admin-clients "users" :admin-users + "accounts" :admin-accounts "reminders" :admin-reminders "vendors" :admin-vendors "excel-import" :admin-excel-import diff --git a/src/cljs/auto_ap/subs.cljs b/src/cljs/auto_ap/subs.cljs index 8a12ca15..eaec6bbb 100644 --- a/src/cljs/auto_ap/subs.cljs +++ b/src/cljs/auto_ap/subs.cljs @@ -15,6 +15,11 @@ (when (:user db) (sort-by :name (vals (:clients db)))))) +(re-frame/reg-sub + ::accounts + (fn [db] + (:accounts db))) + (re-frame/reg-sub ::bank-accounts :<- [::clients] diff --git a/src/cljs/auto_ap/views/components/admin/side_bar.cljs b/src/cljs/auto_ap/views/components/admin/side_bar.cljs index fa3230ef..2ffe0e60 100644 --- a/src/cljs/auto_ap/views/components/admin/side_bar.cljs +++ b/src/cljs/auto_ap/views/components/admin/side_bar.cljs @@ -41,7 +41,13 @@ [:i {:class "fa fa-envelope-o"}]] [:span {:class "name"} "Users"]]] - + [:li.menu-item + [:a {:href (bidi/path-for routes/routes :admin-accounts), :class (str "item" (active-when ap = :admin-accounts))} + [:span {:class "icon"} + [:i {:class "fa fa-envelope-o"}]] + [:span {:class "name"} "Accounts"]]] + + [:li.menu-item [:a {:href (bidi/path-for routes/routes :admin-yodlee), :class (str "item" (active-when ap = :admin-yodlee))} [:span {:class "icon"} diff --git a/src/cljs/auto_ap/views/main.cljs b/src/cljs/auto_ap/views/main.cljs index a4163e3f..548101ed 100644 --- a/src/cljs/auto_ap/views/main.cljs +++ b/src/cljs/auto_ap/views/main.cljs @@ -17,6 +17,7 @@ [auto-ap.views.pages.admin :refer [admin-page]] [auto-ap.views.pages.home :refer [home-page]] [auto-ap.views.pages.admin.clients :refer [admin-clients-page]] + [auto-ap.views.pages.admin.accounts :refer [admin-accounts-page]] [auto-ap.views.pages.admin.vendors :refer [admin-vendors-page]] [auto-ap.views.pages.admin.excel-import :refer [admin-excel-import-page]] [auto-ap.views.pages.admin.users :refer [admin-users-page]] @@ -60,6 +61,9 @@ (defmethod page :admin-yodlee [_] (admin-yodlee-page)) +(defmethod page :admin-accounts [_] + (admin-accounts-page)) + (defmethod page :index [_] (home-page) )