From c8e959bd40a1aaff9d1ae6cc19f75daa5fe24b03 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 13 Apr 2018 16:09:32 -0700 Subject: [PATCH] fixing animations. --- src/cljs/auto_ap/views/main.cljs | 8 +- src/cljs/auto_ap/views/pages.cljs | 2 +- src/cljs/auto_ap/views/pages/admin.cljs | 7 +- .../auto_ap/views/pages/admin/companies.cljs | 97 +++++++++---------- .../auto_ap/views/pages/admin/reminders.cljs | 10 +- .../auto_ap/views/pages/admin/vendors.cljs | 25 +++-- .../auto_ap/views/pages/import_invoices.cljs | 2 +- src/cljs/auto_ap/views/pages/index.cljs | 11 +-- src/cljs/auto_ap/views/pages/login.cljs | 11 +-- src/cljs/auto_ap/views/pages/new_invoice.cljs | 2 +- .../auto_ap/views/pages/paid_invoices.cljs | 4 +- 11 files changed, 82 insertions(+), 97 deletions(-) diff --git a/src/cljs/auto_ap/views/main.cljs b/src/cljs/auto_ap/views/main.cljs index 87d4cbc7..c92f38f9 100644 --- a/src/cljs/auto_ap/views/main.cljs +++ b/src/cljs/auto_ap/views/main.cljs @@ -101,7 +101,9 @@ [:a {:class "button is-danger is-block is-bold" :href (bidi/path-for routes/routes :index)} [:span {:class "compose"} "Back"]]]]] [:div {:class "column messages hero is-fullheight", :id "message-feed"} - ^{:key (str "active-page-" (:name @company))} [pages/active-page ap]]] + ^{:key (str "active-page-" (:name @company))} + [:div.inbox-messages + [pages/active-page ap]]]] [:footer {:class "footer"} [:div {:class "container"} [:div {:class "content has-text-centered"} @@ -181,7 +183,9 @@ [:a {:class "button is-danger is-block is-bold" :href (bidi/path-for routes/routes :new-invoice)} [:span {:class "compose"} "New Invoice"]]]]] [:div {:class "column messages hero is-fullheight", :id "message-feed"} - ^{:key (str "active-page-" (:name @company))} [pages/active-page ap]]] + ^{:key (str "active-page-" (:name @company))} + [:div.inbox-messages + [pages/active-page ap]]]] [:footer {:class "footer"} [:div {:class "container"} [:div {:class "content has-text-centered"} diff --git a/src/cljs/auto_ap/views/pages.cljs b/src/cljs/auto_ap/views/pages.cljs index ed56d056..9d7153af 100644 --- a/src/cljs/auto_ap/views/pages.cljs +++ b/src/cljs/auto_ap/views/pages.cljs @@ -52,7 +52,7 @@ (defmethod active-page :invoices [] [(with-meta (fn [] - [:div {:class "inbox-messages"} + [:div [:h1.title "All invoices"]]) {:component-did-mount (fn [] (go diff --git a/src/cljs/auto_ap/views/pages/admin.cljs b/src/cljs/auto_ap/views/pages/admin.cljs index f911ee6c..1f48b2a4 100644 --- a/src/cljs/auto_ap/views/pages/admin.cljs +++ b/src/cljs/auto_ap/views/pages/admin.cljs @@ -10,8 +10,5 @@ [bidi.bidi :as bidi])) (defn admin-page [] - [:div {:class "inbox-messages"} - [:div.hero - [:div.hero-body - [:div.container - [:h1.title "Admin"]]]]]) + [:div + [:h1.title "Admin"]]) diff --git a/src/cljs/auto_ap/views/pages/admin/companies.cljs b/src/cljs/auto_ap/views/pages/admin/companies.cljs index 87369a10..9a1b7af3 100644 --- a/src/cljs/auto_ap/views/pages/admin/companies.cljs +++ b/src/cljs/auto_ap/views/pages/admin/companies.cljs @@ -25,56 +25,53 @@ [:td email]])]])) (defn admin-companies-page [] - [:div {:class "inbox-messages"} - [:div.hero - [:div.hero-body - [:div.container - (let [companies (re-frame/subscribe [::subs/companies]) - editing-company (:company @(re-frame/subscribe [::subs/admin]))] - - [:div - [:h1.title "Companies"] - [companies-table] + [:div + (let [companies (re-frame/subscribe [::subs/companies]) + editing-company (:company @(re-frame/subscribe [::subs/admin]))] + + [:div + [:h1.title "Companies"] + [companies-table] + + + + (when editing-company + [:div.modal.is-active + [:div.modal-background {:on-click (fn [] (re-frame/dispatch [::events/edit nil]))}] + [:div.modal-card + [:header.modal-card-head + [:p.modal-card-title + (str "Edit " (:name editing-company))] + [:button.delete {:on-click (fn [] (re-frame/dispatch [::events/edit nil]))}]] + [:section.modal-card-body + [horizontal-field + [:label.label "Name"] + [:div.control + [bind-field + [:input.input {:type "text" + :field :name + :spec ::entity/name + :event ::events/change + :subscription editing-company}]]]] - (when editing-company - [:div.modal.is-active - [:div.modal-background {:on-click (fn [] (re-frame/dispatch [::events/edit nil]))}] - - [:div.modal-card - [:header.modal-card-head - [:p.modal-card-title - (str "Edit " (:name editing-company))] - [:button.delete {:on-click (fn [] (re-frame/dispatch [::events/edit nil]))}]] - [:section.modal-card-body - - [horizontal-field - [:label.label "Name"] - [:div.control - [bind-field - [:input.input {:type "text" - :field :name - :spec ::entity/name - :event ::events/change - :subscription editing-company}]]]] - - [horizontal-field - [:label.label "Email"] - [:div.control - [bind-field - [:input.input {:type "email" - :field :email - :spec ::entity/name - :event ::events/change - :subscription editing-company}]]]] - - - (when (:saving? editing-company) [:div.is-overlay {:style {"backgroundColor" "rgba(150,150,150, 0.5)"}}])] - - [:footer.modal-card-foot - [:a.button.is-primary {:on-click (fn [] (re-frame/dispatch [::events/save]))} - [:span "Save"] - (when (:saving? editing-company) - [:span.icon - [:i.fa.fa-spin.fa-spinner]])]]]])])]]]]) + [horizontal-field + [:label.label "Email"] + [:div.control + [bind-field + [:input.input {:type "email" + :field :email + :spec ::entity/name + :event ::events/change + :subscription editing-company}]]]] + + + (when (:saving? editing-company) [:div.is-overlay {:style {"backgroundColor" "rgba(150,150,150, 0.5)"}}])] + + [:footer.modal-card-foot + [:a.button.is-primary {:on-click (fn [] (re-frame/dispatch [::events/save]))} + [:span "Save"] + (when (:saving? editing-company) + [:span.icon + [:i.fa.fa-spin.fa-spinner]])]]]])])]) diff --git a/src/cljs/auto_ap/views/pages/admin/reminders.cljs b/src/cljs/auto_ap/views/pages/admin/reminders.cljs index 470252cf..c5068a60 100644 --- a/src/cljs/auto_ap/views/pages/admin/reminders.cljs +++ b/src/cljs/auto_ap/views/pages/admin/reminders.cljs @@ -31,12 +31,8 @@ (defn admin-reminders-page [] [(with-meta (fn [] - [:div {:class "inbox-messages"} - [:div.hero - [:div.hero-body - [:div.container - [:div - [:h1.title "Reminders"] - [reminders-table]]]]]]) + [:div + [:h1.title "Reminders"] + [reminders-table]]) {:component-did-mount (fn [] (re-frame/dispatch [::events/mounted]))})]) diff --git a/src/cljs/auto_ap/views/pages/admin/vendors.cljs b/src/cljs/auto_ap/views/pages/admin/vendors.cljs index 33ee4bf3..091c7420 100644 --- a/src/cljs/auto_ap/views/pages/admin/vendors.cljs +++ b/src/cljs/auto_ap/views/pages/admin/vendors.cljs @@ -237,21 +237,18 @@ (defn admin-vendors-page [] [(with-meta (fn [] - [:div {:class "inbox-messages"} - [:div.hero - [:div.hero-body - [:div.container - (let [vendors (re-frame/subscribe [::subs/vendors]) - editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))] - - [:div - [:h1.title "Vendors"] - [vendors-table] + [:div.inbox-messages + (let [vendors (re-frame/subscribe [::subs/vendors]) + editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))] + + [:div + [:h1.title "Vendors"] + [vendors-table] - [:a.button.is-primary.is-large {:on-click (dispatch-event [::events/new])} "New vendor"] + [:a.button.is-primary.is-large {:on-click (dispatch-event [::events/new])} "New vendor"] - (when editing-vendor - [edit-dialog] - )])]]]]) + (when editing-vendor + [edit-dialog] + )])]) {:component-did-mount (fn [] (re-frame/dispatch [::events/mounted]))})]) diff --git a/src/cljs/auto_ap/views/pages/import_invoices.cljs b/src/cljs/auto_ap/views/pages/import_invoices.cljs index 04e67e1a..df6639bc 100644 --- a/src/cljs/auto_ap/views/pages/import_invoices.cljs +++ b/src/cljs/auto_ap/views/pages/import_invoices.cljs @@ -93,7 +93,7 @@ (fn [] (let [invoice-page (re-frame/subscribe [::invoice-page]) status (re-frame/subscribe [::subs/status])] - [:div {:class "inbox-messages"} + [:div [:h1.title "Upload invoices"] [dropzone] diff --git a/src/cljs/auto_ap/views/pages/index.cljs b/src/cljs/auto_ap/views/pages/index.cljs index 8976fad7..1b44f288 100644 --- a/src/cljs/auto_ap/views/pages/index.cljs +++ b/src/cljs/auto_ap/views/pages/index.cljs @@ -3,10 +3,7 @@ [auto-ap.routes :as routes])) (defn index-page [] - [:div {:class "inbox-messages"} - [:div.hero - [:div.hero-body - [:div.container - [:h1.title "Dashboard"] - [:h2.subtitle "To get started, " - [:a {:href (bidi/path-for routes/routes :import-invoices)} "Import some invoices"]]]]]]) + [:div + [:h1.title "Dashboard"] + [:h2.subtitle "To get started, " + [:a {:href (bidi/path-for routes/routes :import-invoices)} "Import some invoices"]]]) diff --git a/src/cljs/auto_ap/views/pages/login.cljs b/src/cljs/auto_ap/views/pages/login.cljs index b14d1072..66c6788e 100644 --- a/src/cljs/auto_ap/views/pages/login.cljs +++ b/src/cljs/auto_ap/views/pages/login.cljs @@ -10,10 +10,7 @@ [bidi.bidi :as bidi])) (defn login-page [] - [:div {:class "inbox-messages"} - [:div.hero - [:div.hero-body - [:div.container - [:h1.title "Login"] - [:h2.subtitle "To get started, " - [:a {:href login-url} "Login with Google"]]]]]]) + [:div + [:h1.title "Login"] + [:h2.subtitle "To get started, " + [:a {:href login-url} "Login with Google"]]]) diff --git a/src/cljs/auto_ap/views/pages/new_invoice.cljs b/src/cljs/auto_ap/views/pages/new_invoice.cljs index 06a5c90f..13e539bd 100644 --- a/src/cljs/auto_ap/views/pages/new_invoice.cljs +++ b/src/cljs/auto_ap/views/pages/new_invoice.cljs @@ -5,7 +5,7 @@ (defn new-invoice-page [] (let [form-data (re-frame/subscribe [::subs/new-invoice-form])] - [:div {:class "inbox-messages"} + [:div [:form [:h1.title "New Invoice"] [:div.field diff --git a/src/cljs/auto_ap/views/pages/paid_invoices.cljs b/src/cljs/auto_ap/views/pages/paid_invoices.cljs index 146199e1..fe45bbba 100644 --- a/src/cljs/auto_ap/views/pages/paid_invoices.cljs +++ b/src/cljs/auto_ap/views/pages/paid_invoices.cljs @@ -9,10 +9,10 @@ (fn [] (let [invoices (re-frame/subscribe [::subs/unpaid-invoices]) status (re-frame/subscribe [::subs/status])] - [:div {:class "inbox-messages"} + [:div [:h1.title "Paid invoices"] (if (:loading @status) - [:div {:class "inbox-messages"} + [:div [:h1.title [:i.fa.fa-spin.fa-spinner]]] [:table {:class "table", :style {:width "100%"}}