diff --git a/resources/public/output.css b/resources/public/output.css index 96983899..73530dec 100644 --- a/resources/public/output.css +++ b/resources/public/output.css @@ -1357,10 +1357,6 @@ input:checked + .toggle-bg { height: min-content; } -.h-\[90vh\] { - height: 90vh; -} - .max-h-96 { max-height: 24rem; } @@ -1373,10 +1369,6 @@ input:checked + .toggle-bg { max-height: 90vh; } -.max-h-\[100vh\] { - max-height: 100vh; -} - .max-h-\[80vh\] { max-height: 80vh; } @@ -1454,19 +1446,6 @@ input:checked + .toggle-bg { width: 100vw; } -.w-min { - width: -moz-min-content; - width: min-content; -} - -.w-8\/12 { - width: 66.666667%; -} - -.w-6\/12 { - width: 50%; -} - .w-1\/4 { width: 25%; } @@ -1495,10 +1474,6 @@ input:checked + .toggle-bg { max-width: 1024px; } -.max-w-xs { - max-width: 20rem; -} - .flex-1 { flex: 1 1 0%; } @@ -1717,10 +1692,6 @@ input:checked + .toggle-bg { place-items: center; } -.content-center { - align-content: center; -} - .items-start { align-items: flex-start; } @@ -3630,10 +3601,6 @@ input:checked + .toggle-bg { padding: 1.5rem; } - .sm\:p-12 { - padding: 3rem; - } - .sm\:py-5 { padding-top: 1.25rem; padding-bottom: 1.25rem; diff --git a/src/clj/auto_ap/ssr/admin/accounts.clj b/src/clj/auto_ap/ssr/admin/accounts.clj index f3657e02..6978f1d5 100644 --- a/src/clj/auto_ap/ssr/admin/accounts.clj +++ b/src/clj/auto_ap/ssr/admin/accounts.clj @@ -296,7 +296,7 @@ "New override") [:div#form-errors [:span.error-content]] ] - (com/validated-save-button {:errors []} + (com/validated-save-button {:errors []} ;; TODO "Save account"))]])) (defn new-client-override [{ {:keys [index]} :query-params}] diff --git a/src/clj/auto_ap/ssr/users.clj b/src/clj/auto_ap/ssr/users.clj index aad8b8f5..2b327f95 100644 --- a/src/clj/auto_ap/ssr/users.clj +++ b/src/clj/auto_ap/ssr/users.clj @@ -270,54 +270,53 @@ (defn user-edit-dialog [request] (let [user (some-> request - :route-params - :db/id - (#(dc/pull (dc/db conn) default-read %)))] - (html-response - (com/modal - {} - [:form {:hx-ext "response-targets" - :hx-put (str (bidi/path-for ssr-routes/only-routes - :user-edit-save - :request-method :put)) - :hx-swap "outerHTML swap:300ms" - :hx-target-400 "#form-errors .error-content" - :class "w-full"} - [:fieldset {:class "hx-disable"} - (com/modal-card - {} - [:div.flex [:div.p-2 "User"] [:p.ml-2.rounded.bg-gray-200.p-2.dark:bg-gray-600 (:user/name user)]] - [:div.space-y-6 - (com/hidden {:name "db/id" - :value (:db/id user)}) - (com/field {:label "Role"} - (com/select {:name "user/role" - :class "w-36" - :autofocus true - :id "role" - :value (name (:user/role user)) - :options [["none" "None"] - ["power-user" "Power user"] - ["manager" "Manager"] - ["admin" "Admin"] - ["user" "User"]]})) - (com/field {:label "Clients"} - (com/typeahead {:name "user/clients" - :class "w-full" - :multiple "multiple" - :url (bidi/path-for ssr-routes/only-routes - :company-search) - :id "clients" - :value (map - (fn [client] - [(:db/id client) (:client/name client)]) - (:user/clients user)) - :size :small})) - [:div#form-errors [:span.error-content]] - (com/button {:color :primary :type "submit"} - "Save")] - [:div])]]) - :headers {"hx-trigger" "modalopen"}))) + :route-params + :db/id + (#(dc/pull (dc/db conn) default-read %)))] + (html-response + (com/modal + {} + [:form {:hx-ext "response-targets" + :hx-put (str (bidi/path-for ssr-routes/only-routes + :user-edit-save + :request-method :put)) + :hx-swap "outerHTML swap:300ms" + :hx-target-400 "#form-errors .error-content" + :class "w-full"} + [:fieldset {:class "hx-disable"} + (com/modal-card + {} + [:div.flex [:div.p-2 "User"] [:p.ml-2.rounded.bg-gray-200.p-2.dark:bg-gray-600 (:user/name user)]] + [:div.space-y-6 + (com/hidden {:name "db/id" + :value (:db/id user)}) + (com/field {:label "Role"} + (com/select {:name "user/role" + :class "w-36" + :autofocus true + :id "role" + :value (name (:user/role user)) + :options [["none" "None"] + ["power-user" "Power user"] + ["manager" "Manager"] + ["admin" "Admin"] + ["user" "User"]]})) + (com/field {:label "Clients"} + (com/typeahead {:name "user/clients" + :class "w-full" + :multiple "multiple" + :url (bidi/path-for ssr-routes/only-routes + :company-search) + :id "clients" + :value (map + (fn [client] + [(:db/id client) (:client/name client)]) + (:user/clients user)) + :size :small})) + [:div#form-errors [:span.error-content]]] + (com/validated-save-button {:errors []} ;; TODO + "Save user"))]]) + :headers {"hx-trigger" "modalopen"}))) (def key->handler (apply-middleware-to-all-handlers