add styling to form inputs #5
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -22,36 +22,38 @@ | |||||
| :ident (fn [] [:component/id :header]) | ||||||
| :initial-state {}} | ||||||
| (let [load-user (get props [df/marker-table :load-progress])] | ||||||
| (div :.flex.justify-between.items-center.my-4 | ||||||
| (div :.text-grey-100 "Should I Train?") | ||||||
| (when-not load-user | ||||||
| (div :.flex.flex-end | ||||||
| (when (:user/authenticated? user) (div :.flex | ||||||
| (p :.mr-2.text-grey-100 (str "Hello " (or (:user/name user) "from the ui/Root component") "!")) | ||||||
| (button :.text-grey-100 {:onClick #(on-signout)} "Sign out"))) | ||||||
| (when (not (:user/authenticated? user)) (button :.text-grey-100 {:onClick #(github-signin)} "Sign in with GitHub"))))))) | ||||||
|
|
||||||
| (def ui-header (comp/factory Header)) | ||||||
|
|
||||||
| (defn field [{:keys [label valid? error-message input-class id] :as props}] | ||||||
| (let [input-props (-> props | ||||||
| (dissoc :label :valid? :error-message :input-class :options))] | ||||||
| (div | ||||||
| (dom/label :.relative.block.bg-white.border.rounded-lg.shadow-sm.px-6.py-4.cursor-pointer.sm:flex.sm:justify-between.focus:outline-none.text-gray-700 {:htmlFor label} label) | ||||||
| (input-class input-props) | ||||||
|
There was a problem hiding this comment. This There was a problem hiding this comment. you have to add |
||||||
| (dom/div {:classes [(when valid? "hidden")]} | ||||||
| error-message)))) | ||||||
|
|
||||||
| (defsc Question [this {:question/keys [id label byline options]}] | ||||||
| {:query [:question/id | ||||||
| :question/label | ||||||
| :question/byline | ||||||
| :ui/selected | ||||||
| {:question/options [:option/label | ||||||
| :option/value]}] | ||||||
| :ident (fn [] [:question/id id]) | ||||||
| :initial-state {}} | ||||||
| (div :.mb-4.p-4.bg-gray-700.rounded.max-w-fit | ||||||
| (h2 :.text-xl.text-gray-100 label) | ||||||
| (p :.text-gray-300.mb-2.italic byline) | ||||||
|
Comment on lines
+48
to
+56
There was a problem hiding this comment. Adds byline because some questions rely on it There was a problem hiding this comment. hey look, you added fulcro code 😎 There was a problem hiding this comment. Probably only want to show the byline when its available so we avoid empty tags
Suggested change
There was a problem hiding this comment. ahhh good call, that's real nice syntax |
||||||
| (map (fn [o] | ||||||
| (field {:input-class input | ||||||
| :name id | ||||||
|
|
@@ -75,8 +77,8 @@ | |||||
| (when id | ||||||
| (div | ||||||
| (div :.flex.items-center.gap-1.mb3 | ||||||
| (h2 :.text-3xl.text-gray-100.mb-2 label) | ||||||
| (p :.text-gray-100 "v" version)) | ||||||
| (dom/form | ||||||
| (map ui-question questions))))) | ||||||
|
|
||||||
|
|
@@ -89,7 +91,7 @@ | |||||
| {:header (comp/get-query Header)} | ||||||
| {:quiz (comp/get-query Quiz)}] | ||||||
| :initial-state {:root/user {} :header {} :quiz {}}} | ||||||
| (div :.container.mx-auto.text-gray-100 | ||||||
|
Comment on lines
-92
to
+94
There was a problem hiding this comment. I was getting fancy with that zinc color lol There was a problem hiding this comment. I do eventually want to customize the tailwind config with the color pallet I have in #4 but keeping it simple for now |
||||||
| (ui-header (comp/computed (:header props) {:on-signout #(comp/transact! this [(mut/delete-root-user nil)]) :user user})) | ||||||
| (when (:quiz props) | ||||||
| (ui-quiz (:quiz props))))) | ||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's cool that this file updates based on the classes that are used. Nice overview of styling.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
even though locally generated files probably shouldn't be committed huh?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah i didnt add a gitignore for this.. probably want to remove it from github