fixing animations.
This commit is contained in:
@@ -101,7 +101,9 @@
|
|||||||
[:a {:class "button is-danger is-block is-bold" :href (bidi/path-for routes/routes :index)}
|
[:a {:class "button is-danger is-block is-bold" :href (bidi/path-for routes/routes :index)}
|
||||||
[:span {:class "compose"} "Back"]]]]]
|
[:span {:class "compose"} "Back"]]]]]
|
||||||
[:div {:class "column messages hero is-fullheight", :id "message-feed"}
|
[: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"}
|
[:footer {:class "footer"}
|
||||||
[:div {:class "container"}
|
[:div {:class "container"}
|
||||||
[:div {:class "content has-text-centered"}
|
[: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)}
|
[:a {:class "button is-danger is-block is-bold" :href (bidi/path-for routes/routes :new-invoice)}
|
||||||
[:span {:class "compose"} "New Invoice"]]]]]
|
[:span {:class "compose"} "New Invoice"]]]]]
|
||||||
[:div {:class "column messages hero is-fullheight", :id "message-feed"}
|
[: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"}
|
[:footer {:class "footer"}
|
||||||
[:div {:class "container"}
|
[:div {:class "container"}
|
||||||
[:div {:class "content has-text-centered"}
|
[:div {:class "content has-text-centered"}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
(defmethod active-page :invoices []
|
(defmethod active-page :invoices []
|
||||||
[(with-meta
|
[(with-meta
|
||||||
(fn []
|
(fn []
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:h1.title "All invoices"]])
|
[:h1.title "All invoices"]])
|
||||||
{:component-did-mount (fn []
|
{:component-did-mount (fn []
|
||||||
(go
|
(go
|
||||||
|
|||||||
@@ -10,8 +10,5 @@
|
|||||||
[bidi.bidi :as bidi]))
|
[bidi.bidi :as bidi]))
|
||||||
|
|
||||||
(defn admin-page []
|
(defn admin-page []
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:div.hero
|
[:h1.title "Admin"]])
|
||||||
[:div.hero-body
|
|
||||||
[:div.container
|
|
||||||
[:h1.title "Admin"]]]]])
|
|
||||||
|
|||||||
@@ -25,56 +25,53 @@
|
|||||||
[:td email]])]]))
|
[:td email]])]]))
|
||||||
|
|
||||||
(defn admin-companies-page []
|
(defn admin-companies-page []
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:div.hero
|
(let [companies (re-frame/subscribe [::subs/companies])
|
||||||
[:div.hero-body
|
editing-company (:company @(re-frame/subscribe [::subs/admin]))]
|
||||||
[:div.container
|
|
||||||
(let [companies (re-frame/subscribe [::subs/companies])
|
[:div
|
||||||
editing-company (:company @(re-frame/subscribe [::subs/admin]))]
|
[:h1.title "Companies"]
|
||||||
|
[companies-table]
|
||||||
[: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
|
[horizontal-field
|
||||||
[:div.modal.is-active
|
[:label.label "Email"]
|
||||||
[:div.modal-background {:on-click (fn [] (re-frame/dispatch [::events/edit nil]))}]
|
[:div.control
|
||||||
|
[bind-field
|
||||||
[:div.modal-card
|
[:input.input {:type "email"
|
||||||
[:header.modal-card-head
|
:field :email
|
||||||
[:p.modal-card-title
|
:spec ::entity/name
|
||||||
(str "Edit " (:name editing-company))]
|
:event ::events/change
|
||||||
[:button.delete {:on-click (fn [] (re-frame/dispatch [::events/edit nil]))}]]
|
:subscription editing-company}]]]]
|
||||||
[:section.modal-card-body
|
|
||||||
|
|
||||||
[horizontal-field
|
(when (:saving? editing-company) [:div.is-overlay {:style {"backgroundColor" "rgba(150,150,150, 0.5)"}}])]
|
||||||
[:label.label "Name"]
|
|
||||||
[:div.control
|
[:footer.modal-card-foot
|
||||||
[bind-field
|
[:a.button.is-primary {:on-click (fn [] (re-frame/dispatch [::events/save]))}
|
||||||
[:input.input {:type "text"
|
[:span "Save"]
|
||||||
:field :name
|
(when (:saving? editing-company)
|
||||||
:spec ::entity/name
|
[:span.icon
|
||||||
:event ::events/change
|
[:i.fa.fa-spin.fa-spinner]])]]]])])])
|
||||||
: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]])]]]])])]]]])
|
|
||||||
|
|||||||
@@ -31,12 +31,8 @@
|
|||||||
(defn admin-reminders-page []
|
(defn admin-reminders-page []
|
||||||
[(with-meta
|
[(with-meta
|
||||||
(fn []
|
(fn []
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:div.hero
|
[:h1.title "Reminders"]
|
||||||
[:div.hero-body
|
[reminders-table]])
|
||||||
[:div.container
|
|
||||||
[:div
|
|
||||||
[:h1.title "Reminders"]
|
|
||||||
[reminders-table]]]]]])
|
|
||||||
{:component-did-mount (fn []
|
{:component-did-mount (fn []
|
||||||
(re-frame/dispatch [::events/mounted]))})])
|
(re-frame/dispatch [::events/mounted]))})])
|
||||||
|
|||||||
@@ -237,21 +237,18 @@
|
|||||||
(defn admin-vendors-page []
|
(defn admin-vendors-page []
|
||||||
[(with-meta
|
[(with-meta
|
||||||
(fn []
|
(fn []
|
||||||
[:div {:class "inbox-messages"}
|
[:div.inbox-messages
|
||||||
[:div.hero
|
(let [vendors (re-frame/subscribe [::subs/vendors])
|
||||||
[:div.hero-body
|
editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))]
|
||||||
[:div.container
|
|
||||||
(let [vendors (re-frame/subscribe [::subs/vendors])
|
[:div
|
||||||
editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))]
|
[:h1.title "Vendors"]
|
||||||
|
[vendors-table]
|
||||||
[: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
|
(when editing-vendor
|
||||||
[edit-dialog]
|
[edit-dialog]
|
||||||
)])]]]])
|
)])])
|
||||||
{:component-did-mount (fn []
|
{:component-did-mount (fn []
|
||||||
(re-frame/dispatch [::events/mounted]))})])
|
(re-frame/dispatch [::events/mounted]))})])
|
||||||
|
|||||||
@@ -93,7 +93,7 @@
|
|||||||
(fn []
|
(fn []
|
||||||
(let [invoice-page (re-frame/subscribe [::invoice-page])
|
(let [invoice-page (re-frame/subscribe [::invoice-page])
|
||||||
status (re-frame/subscribe [::subs/status])]
|
status (re-frame/subscribe [::subs/status])]
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:h1.title "Upload invoices"]
|
[:h1.title "Upload invoices"]
|
||||||
[dropzone]
|
[dropzone]
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,7 @@
|
|||||||
[auto-ap.routes :as routes]))
|
[auto-ap.routes :as routes]))
|
||||||
|
|
||||||
(defn index-page []
|
(defn index-page []
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:div.hero
|
[:h1.title "Dashboard"]
|
||||||
[:div.hero-body
|
[:h2.subtitle "To get started, "
|
||||||
[:div.container
|
[:a {:href (bidi/path-for routes/routes :import-invoices)} "Import some invoices"]]])
|
||||||
[:h1.title "Dashboard"]
|
|
||||||
[:h2.subtitle "To get started, "
|
|
||||||
[:a {:href (bidi/path-for routes/routes :import-invoices)} "Import some invoices"]]]]]])
|
|
||||||
|
|||||||
@@ -10,10 +10,7 @@
|
|||||||
[bidi.bidi :as bidi]))
|
[bidi.bidi :as bidi]))
|
||||||
|
|
||||||
(defn login-page []
|
(defn login-page []
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:div.hero
|
[:h1.title "Login"]
|
||||||
[:div.hero-body
|
[:h2.subtitle "To get started, "
|
||||||
[:div.container
|
[:a {:href login-url} "Login with Google"]]])
|
||||||
[:h1.title "Login"]
|
|
||||||
[:h2.subtitle "To get started, "
|
|
||||||
[:a {:href login-url} "Login with Google"]]]]]])
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
(defn new-invoice-page []
|
(defn new-invoice-page []
|
||||||
(let [form-data (re-frame/subscribe [::subs/new-invoice-form])]
|
(let [form-data (re-frame/subscribe [::subs/new-invoice-form])]
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:form
|
[:form
|
||||||
[:h1.title "New Invoice"]
|
[:h1.title "New Invoice"]
|
||||||
[:div.field
|
[:div.field
|
||||||
|
|||||||
@@ -9,10 +9,10 @@
|
|||||||
(fn []
|
(fn []
|
||||||
(let [invoices (re-frame/subscribe [::subs/unpaid-invoices])
|
(let [invoices (re-frame/subscribe [::subs/unpaid-invoices])
|
||||||
status (re-frame/subscribe [::subs/status])]
|
status (re-frame/subscribe [::subs/status])]
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:h1.title "Paid invoices"]
|
[:h1.title "Paid invoices"]
|
||||||
(if (:loading @status)
|
(if (:loading @status)
|
||||||
[:div {:class "inbox-messages"}
|
[:div
|
||||||
[:h1.title
|
[:h1.title
|
||||||
[:i.fa.fa-spin.fa-spinner]]]
|
[:i.fa.fa-spin.fa-spinner]]]
|
||||||
[:table {:class "table", :style {:width "100%"}}
|
[:table {:class "table", :style {:width "100%"}}
|
||||||
|
|||||||
Reference in New Issue
Block a user