notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

more reorg

Browse Source
This commit is contained in:
Bryce Covert
2019-01-24 19:10:07 -08:00
parent 5b10541c44
commit c2eb0c61e7
13 changed files with 258 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cljs/auto_ap/views/pages/admin.cljs
View File

@@ -4,11 +4,11 @@
[reagent.core :as reagent]
[auto-ap.subs :as subs]
[auto-ap.events :as events]
[auto-ap.views.utils :refer [login-url]]
[cljs.reader :as edn]
[auto-ap.routes :as routes]
[bidi.bidi :as bidi]))
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.utils :refer [login-url]]))
(defn admin-page []
[:div
[:h1.title "Admin"]])
[side-bar-layout {:side-bar [admin-side-bar {}]
:main [:div
[:h1.title "Admin"]]}])

8
src/cljs/auto_ap/views/pages/admin/clients.cljs
View File

@@ -6,6 +6,8 @@
[auto-ap.events :as events]
[auto-ap.entities.clients :as entity]
[auto-ap.views.components.address :refer [address-field]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.utils :refer [login-url dispatch-event dispatch-value-change bind-field horizontal-field]]
[auto-ap.views.components.modal :refer [action-modal]]
[cljs.reader :as edn]
@@ -109,7 +111,7 @@
[:td name]
[:td email]])]]))
(defn admin-clients-page []
(defn admin-clients-content []
[:div
(let [clients (re-frame/subscribe [::subs/clients])
editing-client (:client @(re-frame/subscribe [::subs/admin]))]
@@ -239,3 +241,7 @@
^{:key index} [:li [:strong "* " name] [:button.button {:on-click (dispatch-event [::remove-new-bank-account index])} [:span.icon [:i.fa.fa-times]]]])]]]
(when (:saving? editing-client) [:div.is-overlay {:style {"backgroundColor" "rgba(150,150,150, 0.5)"}}])]])])
(defn admin-clients-page []
[side-bar-layout {:side-bar [admin-side-bar {}]
:main [admin-clients-content]}])

8
src/cljs/auto_ap/views/pages/admin/users.cljs
View File

@@ -7,6 +7,8 @@
[auto-ap.events :as events]
[auto-ap.entities.clients :as entity]
[auto-ap.views.components.address :refer [address-field]]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.utils :refer [login-url dispatch-value-change bind-field horizontal-field dispatch-event]]
[auto-ap.views.components.modal :refer [modal action-modal]]
[auto-ap.utils :refer [by replace-if]]
@@ -112,7 +114,7 @@
(def admin-users-page
(def admin-users-content
(with-meta
(fn []
[:div
@@ -177,3 +179,7 @@
{:component-will-mount #(re-frame/dispatch-sync [::users-mounted {}]) }))
(defn admin-users-page []
[side-bar-layout {:side-bar [admin-side-bar {}]
:main [admin-users-content]}])

8
src/cljs/auto_ap/views/pages/admin/vendors.cljs
View File

@@ -9,6 +9,8 @@
[auto-ap.views.components.address :refer [address-field]]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
[auto-ap.views.components.modal :refer [modal]]
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[clojure.spec.alpha :as s]
[auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field]]
@@ -55,7 +57,7 @@
(vec (concat [dom keys] rest))))
(defn admin-vendors-page []
(defn admin-vendors-content []
[(with-meta
(fn []
[:div.inbox-messages
@@ -78,3 +80,7 @@
:id ::admin-vendor}]])])
{:component-did-mount (fn []
(re-frame/dispatch [::events/mounted]))})])
(defn admin-vendors-page []
[side-bar-layout {:side-bar [admin-side-bar {}]
:main [admin-vendors-content]}])

7
src/cljs/auto_ap/views/pages/checks.cljs
View File

@@ -5,6 +5,7 @@
[reagent.core :as reagent]
[goog.string :as gstring]
[auto-ap.views.components.sorter :refer [sorted-column]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.components.paginator :refer [paginator]]
[auto-ap.events :as events]
[auto-ap.views.utils :refer [dispatch-event date->str ]]
@@ -172,8 +173,7 @@
]))]]]))))
(def checks-page
(def checks-content
(with-meta
(fn []
(let [current-client @(re-frame/subscribe [::subs/client])]
@@ -187,3 +187,6 @@
(re-frame/dispatch [::params-change params]))}]]))
{:component-will-mount #(re-frame/dispatch-sync [::params-change {}]) }))
(defn checks-page []
[side-bar-layout {:side-bar [:div]
:main [checks-content]}])

10
src/cljs/auto_ap/views/pages/paid_invoices.cljs
View File

@@ -5,11 +5,11 @@
[auto-ap.events :as events]
[auto-ap.views.utils :refer [dispatch-event]]
[auto-ap.utils :refer [by replace-if]]
[auto-ap.views.main :refer [side-bar-layout]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]]
[auto-ap.views.pages.check :as check]
[auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table]
[auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog]
[auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
[auto-ap.subs :as subs]))
@@ -27,9 +27,6 @@
(re-frame/reg-event-fx
::params-change
(fn [cofx [_ params]]
(println "HERE")
{:db (-> (:db cofx)
(assoc-in [:status :loading] true)
(assoc-in [::params] params))
@@ -63,14 +60,11 @@
(dissoc ::change-expense-accounts))})))
(def paid-invoices-content
(with-meta
(fn []
(let [current-client @(re-frame/subscribe [::subs/client])]
[:div
[:h1.title "Paid invoices"]
[invoice-table {:id :paid
:params (re-frame/subscribe [::params])
:invoice-page (re-frame/subscribe [::invoice-page])

6
src/cljs/auto_ap/views/pages/transactions.cljs
View File

@@ -7,6 +7,7 @@
[auto-ap.views.components.sorter :refer [sorted-column]]
[auto-ap.views.components.modal :refer [action-modal]]
[auto-ap.views.components.paginator :refer [paginator]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.events :as events]
[auto-ap.views.utils :refer [dispatch-event date->str bind-field]]
[auto-ap.utils :refer [by]]
@@ -196,7 +197,7 @@
(fn [db]
(-> db ::notification)))
(def transactions-page
(def transactions-content
(with-meta
(fn []
@@ -235,4 +236,7 @@
(re-frame/dispatch [::params-change params]))}]
[manual-yodlee-import-modal]]))
{:component-will-mount #(re-frame/dispatch-sync [::params-change {}]) }))
(defn transactions-page []
[side-bar-layout {:side-bar [:div]
:main [transactions-content]}])

35
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -9,7 +9,7 @@
[auto-ap.entities.invoice :as invoice]
[auto-ap.entities.vendors :as vendor]
[bidi.bidi :as bidi]
[auto-ap.views.main :refer [side-bar-layout]]
[auto-ap.views.components.layouts :refer [side-bar-layout]]
[auto-ap.routes :as routes]
[auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
@@ -681,30 +681,28 @@
updated))))
(defn vendor-filter []
(let [{:keys [vendor-filter]} @(re-frame/subscribe [::invoice-page])])
[:div.field
[:div.control
[bind-field
[typeahead {:matches (map (fn [x] [(:id x) (:name x)]) @(re-frame/subscribe [::subs/vendors]))
:type "typeahead"
:auto-focus true
:field [:vendor-id]
:text-field [:vendor-name]
:event [::change-selected-vendor]
:spec (s/nilable ::invoice/vendor-id)
:subscription vendor-filter}]]]])
(def unpaid-invoices-content
(with-meta
(fn [_]
(let [{:keys [checked print-checks-shown? print-checks-loading? advanced-print-shown? vendor-filter]} @(re-frame/subscribe [::invoice-page])
current-client @(re-frame/subscribe [::subs/client])
{check-results-shown? :shown? pdf-url :pdf-url} @(re-frame/subscribe [::check-results])]
[:div
[:h1.title "Unpaid invoices"]
[:div.field.has-addons.is-extended
[:p.control [:a.button.is-static "Filter Vendor"]]
[:div.control {:style {:width "500px"}}
[bind-field
[typeahead {:matches (map (fn [x] [(:id x) (:name x)]) @(re-frame/subscribe [::subs/vendors]))
:type "typeahead"
:auto-focus true
:field [:vendor-id]
:text-field [:vendor-name]
:event [::change-selected-vendor]
:spec (s/nilable ::invoice/vendor-id)
:subscription vendor-filter}]]]]
[:div.is-pulled-right
[:button.button.is-danger {:on-click (dispatch-event [::new-invoice])} "New Invoice"]
@@ -779,7 +777,10 @@
{:component-will-mount #(re-frame/dispatch-sync [::params-change {}]) }))
(defn unpaid-invoices-page []
[side-bar-layout {:side-bar [invoices-side-bar]
[side-bar-layout {:side-bar [invoices-side-bar {}
[:div [:p.menu-label "Vendor"]
[vendor-filter]]
]
:main [unpaid-invoices-content]
:bottom [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor])
:save-event [::events/save-vendor]