consolidate field and field-entry

sparkboard · Dec 19, 2023 · d4bc453 · d4bc453
1 parent bb378a1
commit d4bc453
Show file tree

Hide file tree

Showing 13 changed files with 680 additions and 687 deletions.
diff --git a/src/sparkboard/app.cljc b/src/sparkboard/app.cljc
@@ -9,7 +9,7 @@
             [sparkboard.app.discussion.ui]
             [sparkboard.app.domain.ui]
             [sparkboard.app.entity.ui]
-            [sparkboard.app.field.ui]
+            [sparkboard.app.field.admin-ui]
             [sparkboard.app.member.ui]
             [sparkboard.app.notification.ui]
             [sparkboard.app.org.ui]

diff --git a/src/sparkboard/app/account/ui.cljc b/src/sparkboard/app/account/ui.cljc
@@ -5,7 +5,7 @@
             [re-db.api :as db]
             [sparkboard.app.account.data :as data]
             [sparkboard.app.entity.ui :as entity.ui]
-            [sparkboard.app.field-entry.ui :as entry.ui]
+            [sparkboard.app.field.ui :as field.ui]
             [sparkboard.app.form.ui :as form.ui]
             [sparkboard.app.views.header :as header]
             [sparkboard.app.views.radix :as radix]
@@ -85,9 +85,9 @@
 
 
        [:div.flex-v.gap-2
-        [entry.ui/text-field ?email]
+        [field.ui/text-field ?email]
         (when (= :password @!step)
-          [entry.ui/text-field ?password {:id "account-password"}])
+          [field.ui/text-field ?password {:id "account-password"}])
         (str (forms/visible-messages !account))
         [:button.btn.btn-primary.w-full.h-10.text-sm.p-3
          (tr :tr/continue-with-email)]]

diff --git a/src/sparkboard/app/board/ui.cljc b/src/sparkboard/app/board/ui.cljc
@@ -7,8 +7,8 @@
             [sparkboard.app.board.data :as data]
             [sparkboard.app.domain.ui :as domain.ui]
             [sparkboard.app.entity.ui :as entity.ui]
-            [sparkboard.app.field-entry.ui :as entry.ui]
             [sparkboard.app.field.ui :as field.ui]
+            [sparkboard.app.field.admin-ui :as field-admin.ui]
             [sparkboard.app.form.ui :as form.ui]
             [sparkboard.app.project.data :as project.data]
             [sparkboard.app.project.ui :as project.ui]
@@ -61,7 +61,7 @@
                                            :text  title
                                            :icon  [:img.w-5.h-5.rounded-sm {:src (asset.ui/asset-src avatar :avatar)}]})))})])
 
-       [entry.ui/text-field ?title {:label (tr :tr/title)}]
+       [field.ui/text-field ?title {:label (tr :tr/title)}]
        (domain.ui/domain-field ?domain)
        [form.ui/submit-form !board (tr :tr/create)]])))
 
@@ -71,8 +71,8 @@
   (ui/with-form [!member {:member/name ?name :member/password ?pass}]
     [:div
      [:h3 (tr :tr/register)]
-     [entry.ui/text-field ?name]
-     [entry.ui/text-field ?pass]
+     [field.ui/text-field ?name]
+     [field.ui/text-field ?pass]
      [:button {:on-click #(p/let [res (routing/POST route @!member)]
                             ;; TODO - how to determine POST success?
                             #_(when (http-ok? res)
@@ -153,13 +153,13 @@
     [:<>
      (header/entity board)
      [:div {:class form.ui/form-classes}
-      (entity.ui/use-persisted board :entity/title entry.ui/text-field {:class "text-lg"})
-      (entity.ui/use-persisted board :entity/description entry.ui/prose-field {:class "bg-gray-100 px-3 py-3"})
+      (entity.ui/use-persisted board :entity/title field.ui/text-field {:class "text-lg"})
+      (entity.ui/use-persisted board :entity/description field.ui/prose-field {:class "bg-gray-100 px-3 py-3"})
       (entity.ui/use-persisted board :entity/domain domain.ui/domain-field)
-      (entity.ui/use-persisted board :image/avatar entry.ui/image-field {:label (tr :tr/image.logo)})
+      (entity.ui/use-persisted board :image/avatar field.ui/image-field {:label (tr :tr/image.logo)})
 
-      (field.ui/fields-editor board :board/member-fields)
-      (field.ui/fields-editor board :board/project-fields)
+      (field-admin.ui/fields-editor board :board/member-fields)
+      (field-admin.ui/fields-editor board :board/project-fields)
 
       ;; TODO
       ;; - :board/project-sharing-buttons

diff --git a/src/sparkboard/app/chat/ui.cljc b/src/sparkboard/app/chat/ui.cljc
@@ -3,7 +3,7 @@
             [clojure.string :as str]
             [promesa.core :as p]
             [sparkboard.app.chat.data :as data]
-            [sparkboard.app.field-entry.ui :as entry.ui]
+            [sparkboard.app.field.ui :as field.ui]
             [sparkboard.app.member.data :as member.data]
             [sparkboard.app.views.radix :as radix]
             [sparkboard.app.views.ui :as ui]
@@ -61,7 +61,7 @@
         {:class (when (data/unread? account-id chat)
                   "bg-blue-500")}]]
       [:div.text-gray-700.hidden.md:line-clamp-2.text-sm
-       (entry.ui/show-prose
+       (field.ui/show-prose
          (cond-> (:chat.message/content last-message)
                  (sch/id= account-id (:entity/created-by last-message))
                  (update :prose/string (partial str (tr :tr/you) " "))))]]]))
@@ -86,7 +86,7 @@
               "bg-blue-500 text-white place-self-end"
               "bg-gray-100 text-gray-900 place-self-start")]
     :key   id}
-   (entry.ui/show-prose content)])
+   (field.ui/show-prose content)])
 
 (ui/defview chat-header [{:keys [account-id chat]}]
   (let [close-icon [icons/close "w-6 h-6 hover:opacity-50"]]
@@ -135,7 +135,7 @@
              (sort-by :entity/created-at)
              (map (partial chat-message params))
              doall)]
-       [entry.ui/auto-size
+       [field.ui/auto-size
         {:class       [search-classes
                        "m-1 whitespace-pre-wrap min-h-[38px] flex-none"]
          :type        "text"

diff --git a/src/sparkboard/app/domain/ui.cljc b/src/sparkboard/app/domain/ui.cljc
@@ -3,7 +3,7 @@
             [inside-out.forms :as forms]
             [promesa.core :as p]
             [sparkboard.app.domain.data :as data]
-            [sparkboard.app.field-entry.ui :as entry.ui]
+            [sparkboard.app.field.ui :as field.ui]
             [sparkboard.app.form.ui :as form.ui]
             [sparkboard.i18n :refer [tr]]
             [sparkboard.app.views.ui :as ui]))
@@ -29,7 +29,7 @@
      [:div.field-wrapper
       [form.ui/show-label ?domain]
       [:div.flex.gap-2.items-stretch
-       (entry.ui/text-field ?domain (merge {:wrap          (fn [v]
+       (field.ui/text-field ?domain (merge {:wrap          (fn [v]
                                                              (when-not (str/blank? v)
                                                                {:domain/name (data/qualify-domain (data/normalize-domain v))}))
                                             :unwrap        (fn [v]