diff --git a/resources/public/css/main.css b/resources/public/css/main.css index 838ae25d..dd368350 100644 --- a/resources/public/css/main.css +++ b/resources/public/css/main.css @@ -204,17 +204,10 @@ nav.navbar .navbar-item.is-active { background-color: #fff; } .aside .compose { - height: 95px; margin:0 -10px; padding: 25px 30px; } -.aside .compose .button { - color: #F6F7F7; -} -.aside .compose .button .compose { - font-size: 14px; - font-weight: 700; -} + .aside .main { padding: 40px 10px 40px 30px; color: #6F7B7E; diff --git a/src/cljs/auto_ap/events.cljs b/src/cljs/auto_ap/events.cljs index 92464426..87da7859 100644 --- a/src/cljs/auto_ap/events.cljs +++ b/src/cljs/auto_ap/events.cljs @@ -102,7 +102,7 @@ (println (:auto-ap.forms/forms db)) (-> db (update-in [:modal-state id] #(merge % state)) - (dissoc :auto-ap.forms/forms) + #_(dissoc :auto-ap.forms/forms) ))) (re-frame/reg-event-db @@ -118,7 +118,7 @@ (println (:auto-ap.forms/forms db)) (-> db (update-in [:modal-state] #(dissoc % id)) - (dissoc :auto-ap.forms/forms)))) + (update :auto-ap.forms/forms dissoc id)))) (re-frame/reg-event-fx ::set-active-page diff --git a/src/cljs/auto_ap/views/components/invoices/side_bar.cljs b/src/cljs/auto_ap/views/components/invoices/side_bar.cljs index 382093ad..977eef66 100644 --- a/src/cljs/auto_ap/views/components/invoices/side_bar.cljs +++ b/src/cljs/auto_ap/views/components/invoices/side_bar.cljs @@ -47,6 +47,6 @@ [:div rest] [:div {:class "compose has-text-centered"} - [:a {:class "button is-danger is-block is-bold" #_#_:href (bidi/path-for routes/routes :index) + [:a {:class "button is-primary is-outlined is-block is-bold" :on-click (dispatch-event [::events/modal-status :auto-ap.views.main/user-editing-vendor {:visible? true}])} - [:span {:class "compose"} "New Vendor"]]]])) + [:span "New Vendor"]]]])) diff --git a/src/cljs/auto_ap/views/pages/transactions.cljs b/src/cljs/auto_ap/views/pages/transactions.cljs index 7a050bde..6f4afc77 100644 --- a/src/cljs/auto_ap/views/pages/transactions.cljs +++ b/src/cljs/auto_ap/views/pages/transactions.cljs @@ -6,6 +6,7 @@ [auto-ap.views.components.date-range-filter :refer [date-range-filter]] [auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]] [auto-ap.views.components.modal :refer [action-modal]] + [auto-ap.views.components.vendor-dialog :refer [vendor-dialog]] [auto-ap.views.components.paginator :refer [paginator]] [auto-ap.views.components.sorter :refer [sorted-column]] [auto-ap.views.pages.transactions.form :as edit] @@ -105,7 +106,7 @@ [:div [:h1.title "Transactions"] (when (= "admin" (:user/role user)) - (list + [:div (when (:message @notification) (list [:div.notification @@ -119,11 +120,8 @@ [:li (:description-original transaction) "-" (:details error)])]]))) [:div.is-pulled-right [:div.buttons - (comment - [:button.button.is-danger {:on-click (dispatch-event [::manual/opening])} - "Manage Rules"]) [:button.button.is-danger {:on-click (dispatch-event [::manual/opening])} - "Manual Yodlee Import"]]])) + "Manual Yodlee Import"]]]]) [table/table {:id :transactions :params (re-frame/subscribe [::params]) :transaction-page (re-frame/subscribe [::transaction-page]) @@ -147,8 +145,17 @@ [:div [date-range-filter {:on-change-event [::change-selected-date-range] - :value (:date-range-filter @(re-frame/subscribe [::transaction-page]))}]]] + :value (:date-range-filter @(re-frame/subscribe [::transaction-page]))}]] + + [:div {:class " compose"} + [:a {:class "button is-primary is-outlined is-block " + :on-click (dispatch-event [::events/modal-status :auto-ap.views.main/user-editing-vendor {:visible? true}])} + [:span "New Vendor"]]]] :main [transactions-content] + + :bottom [:div [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor]) + :save-event [::events/save-vendor] + :change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]] :right-side-bar [appearing-side-bar {:visible? transaction-bar-active?} [edit/form {:edit-completed [::edit-completed]}]]}])) diff --git a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs index b73b6666..341fc88e 100644 --- a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs +++ b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs @@ -635,8 +635,8 @@ (when (= 1 (count (set (map (comp :id :vendor) (vals checked-invoices))))) ^{:key "handwritten"} [:a.dropdown-item {:on-click (dispatch-event [::handwrite-checks])} "Handwritten Check..."]) ^{:key "advanced"} [:a.dropdown-item {:on-click (dispatch-event [::advanced-print-checks])} "Advanced..."])]])]] - [:div.is-pulled-right - (into [:div.tags {:style {:margin-right ".5 rem;"}}] (map (fn [[id invoice]] [:span.tag.is-medium (:invoice-number invoice) [:button.delete.is-small {:on-click (dispatch-event [::toggle-check id invoice])}]]) checked-invoices))]] + [:div.is-pulled-right {:style {:margin-right "0.5rem"}} + (into [:div.tags ] (map (fn [[id invoice]] [:span.tag.is-medium (:invoice-number invoice) [:button.delete.is-small {:on-click (dispatch-event [::toggle-check id invoice])}]]) checked-invoices))]] )) (defn check-results-dialog []