Skip to content

Commit

Permalink
Fix elm-review errors
Browse files Browse the repository at this point in the history
  • Loading branch information
henriquecbuss committed Sep 2, 2022
1 parent 7e5e7e8 commit ca26993
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 109 deletions.
4 changes: 2 additions & 2 deletions elm-book/elm.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"elm/html": "1.0.0",
"elm/http": "2.0.0",
"elm/json": "1.1.3",
"elm/parser": "1.1.0",
"elm/random": "1.0.0",
"elm/regex": "1.0.0",
"elm/svg": "1.0.1",
Expand All @@ -34,16 +33,17 @@
"hecrj/elm-slug": "1.0.2",
"justinmimbs/date": "3.2.1",
"krisajenkins/remotedata": "6.0.1",
"pablohirafuji/elm-syntax-highlight": "3.4.1",
"robinheghan/elm-phone-numbers": "1.0.0",
"rtfeldman/elm-iso8601-date-strings": "1.1.4",
"rtfeldman/elm-validate": "4.0.1",
"zwilias/elm-rosetree": "1.5.0"
},
"indirect": {
"elm/bytes": "1.0.8",
"elm/parser": "1.1.0",
"elm/virtual-dom": "1.0.2",
"lukewestby/elm-string-interpolate": "1.0.4",
"pablohirafuji/elm-syntax-highlight": "3.4.1",
"rtfeldman/elm-hex": "1.0.0"
}
},
Expand Down
8 changes: 4 additions & 4 deletions elm-book/src/elm/Book/Form/Checkbox.elm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ initModel =
type Msg
= ToggledBasicExample Bool
| ToggledErrorExample Bool
| BlurredField String
| BlurredField


update : Msg -> Model -> Model
Expand All @@ -45,7 +45,7 @@ update msg model =
ToggledErrorExample errorExample ->
{ model | errorExample = errorExample }

BlurredField _ ->
BlurredField ->
model


Expand Down Expand Up @@ -78,7 +78,7 @@ view model =
in
Form.Checkbox.view options
{ onCheck = ToggledBasicExample
, onBlur = BlurredField "basic-example-checkbox"
, onBlur = BlurredField
, value = model.basicExample
, error = Html.text ""
, hasError = False
Expand All @@ -97,7 +97,7 @@ viewWithError model =
in
Form.Checkbox.view options
{ onCheck = ToggledErrorExample
, onBlur = BlurredField "example-with-error-checkbox"
, onBlur = BlurredField
, value = model.errorExample
, error = Book.Helpers.viewError [] True (Just "Something went wrong")
, hasError = True
Expand Down
56 changes: 1 addition & 55 deletions elm-book/src/elm/Book/Form/DatePicker.elm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Book.Form.DatePicker exposing (Model, Msg, chapter, initModel, updateSharedState)
module Book.Form.DatePicker exposing (Model, chapter, initModel)

import Book.Helpers
import Date
Expand Down Expand Up @@ -32,64 +32,10 @@ initModel =
-- UPDATE


type Msg
= NoOp
| GotRelativeDatePickerMsg (Form.DatePicker.Options Msg) (Form.DatePicker.ViewConfig Msg) Form.DatePicker.Msg
| GotAbsoluteDatePickerMsg (Form.DatePicker.Options Msg) (Form.DatePicker.ViewConfig Msg) Form.DatePicker.Msg
| GotErrorDatePickerMsg (Form.DatePicker.Options Msg) (Form.DatePicker.ViewConfig Msg) Form.DatePicker.Msg


type alias SharedState x =
{ x | datepickerModel : Model }


updateSharedState : Msg -> SharedState x -> ( SharedState x, Cmd Msg )
updateSharedState msg sharedState =
let
model =
sharedState.datepickerModel
in
case msg of
NoOp ->
( sharedState, Cmd.none )

GotRelativeDatePickerMsg options viewConfig subMsg ->
let
( newModel, subCmd ) =
Form.DatePicker.update options
viewConfig
subMsg
sharedState.datepickerModel.relative
in
( { sharedState | datepickerModel = { model | relative = newModel } }
, Cmd.map (GotRelativeDatePickerMsg options viewConfig) subCmd
)

GotAbsoluteDatePickerMsg options viewConfig subMsg ->
let
( newModel, subCmd ) =
Form.DatePicker.update options
viewConfig
subMsg
sharedState.datepickerModel.absolute
in
( { sharedState | datepickerModel = { model | absolute = newModel } }
, Cmd.map (GotAbsoluteDatePickerMsg options viewConfig) subCmd
)

GotErrorDatePickerMsg options viewConfig subMsg ->
let
( newModel, subCmd ) =
Form.DatePicker.update options
viewConfig
subMsg
sharedState.datepickerModel.withError
in
( { sharedState | datepickerModel = { model | withError = newModel } }
, Cmd.map (GotErrorDatePickerMsg options viewConfig) subCmd
)



-- CHAPTER

Expand Down
2 changes: 1 addition & 1 deletion elm-book/src/elm/Book/Form/File.elm
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ viewSideBySide :
-> { image : String, error : Maybe String }
-> Html (ElmBook.Msg x)
viewSideBySide options { image, error } =
Html.div [ Html.Attributes.class "grid grid-cols-2 gap-4" ]
Html.div [ class "grid grid-cols-2 gap-4" ]
[ Form.File.view
(options
|> Form.File.withLabel "Without image selected"
Expand Down
17 changes: 5 additions & 12 deletions elm-book/src/elm/Book/Form/Radio.elm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type Msg
= SelectedFruit (Maybe Fruit)
| SelectedVerticalFruit (Maybe Fruit)
| SelectedErrorFruit (Maybe Fruit)
| BlurredField String
| BlurredField


update : Msg -> Model -> Model
Expand All @@ -50,7 +50,7 @@ update msg model =
SelectedErrorFruit errorFruit ->
{ model | selectedErrorFruit = errorFruit }

BlurredField _ ->
BlurredField ->
model


Expand All @@ -66,13 +66,6 @@ updateSharedState msg sharedState =
defaultOptions : { id : String } -> Form.Radio.Options (Maybe Fruit) msg
defaultOptions { id } =
let
allOptions =
Book.Helpers.allFruits
|> List.map
(\fruit ->
( Just fruit, Html.text (Book.Helpers.fruitToString fruit) )
)

addOptions radio =
List.foldl
(\fruit ->
Expand All @@ -99,7 +92,7 @@ view model =
in
Form.Radio.view options
{ onSelect = SelectedFruit
, onBlur = BlurredField "fruit-picker-radio"
, onBlur = BlurredField
, value = model.selectedFruit
, error = Html.text ""
, hasError = False
Expand All @@ -115,7 +108,7 @@ viewVertical model =
in
Form.Radio.view options
{ onSelect = SelectedVerticalFruit
, onBlur = BlurredField "fruit-picker-vertical-radio"
, onBlur = BlurredField
, value = model.selectedVerticalFruit
, error = Html.text ""
, hasError = False
Expand Down Expand Up @@ -151,7 +144,7 @@ viewWithError model =
in
Form.Radio.view options
{ onSelect = SelectedErrorFruit
, onBlur = BlurredField "fruit-picker-error-radio"
, onBlur = BlurredField
, value = model.selectedErrorFruit
, error = Book.Helpers.viewError [] True (Just "Something went wrong")
, hasError = True
Expand Down
18 changes: 1 addition & 17 deletions elm-book/src/elm/Book/Form/RichText.elm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Book.Form.RichText exposing (Model, Msg, chapter, initModel, updateSharedState)
module Book.Form.RichText exposing (Model, Msg, chapter, initModel)

import Book.Helpers
import ElmBook.Actions as Actions
Expand Down Expand Up @@ -35,22 +35,6 @@ type alias SharedState x =
{ x | richTextModel : Model }


updateSharedState : Msg -> SharedState x -> ( SharedState x, Cmd Msg )
updateSharedState msg sharedState =
case msg of
GotRichTextMsg subMsg ->
let
( newModel, subCmd ) =
Form.RichText.update subMsg sharedState.richTextModel
in
( { sharedState | richTextModel = newModel }
, Cmd.map GotRichTextMsg subCmd
)

NoOp ->
( sharedState, Cmd.none )


update : Msg -> Form.RichText.Model -> ( Form.RichText.Model, Cmd Msg )
update msg richtextModel =
case msg of
Expand Down
8 changes: 4 additions & 4 deletions elm-book/src/elm/Book/Form/Select.elm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ initModel =
type Msg
= SelectedFruit Fruit
| SelectedFruitWithError Fruit
| BlurredField String
| BlurredField


update : Msg -> Model -> Model
Expand All @@ -44,7 +44,7 @@ update msg model =
SelectedFruitWithError fruit ->
{ model | selectedFruitWithError = fruit }

BlurredField _ ->
BlurredField ->
model


Expand Down Expand Up @@ -86,7 +86,7 @@ viewBasic model =
in
Form.Select.view options
{ onSelect = SelectedFruit
, onBlur = BlurredField "fruit-picker-example"
, onBlur = BlurredField
, value = model.selectedFruit
, error = Html.text ""
, hasError = False
Expand Down Expand Up @@ -125,7 +125,7 @@ viewWithError error model =
in
Form.Select.view options
{ onSelect = SelectedFruitWithError
, onBlur = BlurredField "fruit-error-example"
, onBlur = BlurredField
, value = model.selectedFruitWithError
, error = Book.Helpers.viewError [] True (Just error)
, hasError = True
Expand Down
18 changes: 4 additions & 14 deletions elm-book/src/elm/Book/Form/Text.elm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import Html exposing (Html)

type alias Model =
{ basicExample : String
, textareaExample : String
, currencyExample : String
, maskExample : String
}
Expand All @@ -24,7 +23,6 @@ type alias Model =
initModel : Model
initModel =
{ basicExample = ""
, textareaExample = ""
, currencyExample = ""
, maskExample = ""
}
Expand All @@ -37,10 +35,8 @@ initModel =
type Msg
= NoOp
| ChangedBasicExample String
| ChangedTextareaExample String
| ChangedCurrencyExample String
| ChangedMaskExample String
| BlurredField String


update : Msg -> Model -> Model
Expand All @@ -52,18 +48,12 @@ update msg model =
ChangedBasicExample basicExample ->
{ model | basicExample = basicExample }

ChangedTextareaExample textareaExample ->
{ model | textareaExample = textareaExample }

ChangedCurrencyExample currencyExample ->
{ model | currencyExample = currencyExample }

ChangedMaskExample maskExample ->
{ model | maskExample = maskExample }

BlurredField _ ->
model


updateSharedState : Msg -> { x | textModel : Model } -> { x | textModel : Model }
updateSharedState msg sharedState =
Expand All @@ -86,7 +76,7 @@ viewBasic model =
in
Form.Text.view options
{ onChange = ChangedBasicExample
, onBlur = BlurredField "basic-example"
, onBlur = NoOp
, value = model.basicExample
, error = Html.text ""
, hasError = False
Expand All @@ -109,7 +99,7 @@ viewTextarea model =
in
Form.Text.view options
{ onChange = ChangedBasicExample
, onBlur = BlurredField "textarea-example"
, onBlur = NoOp
, value = model.basicExample
, error = Html.text ""
, hasError = False
Expand All @@ -130,7 +120,7 @@ viewWithCurrency model =
in
Form.Text.view options
{ onChange = ChangedCurrencyExample
, onBlur = BlurredField "currency-example"
, onBlur = NoOp
, value = model.currencyExample
, error = Html.text ""
, hasError = False
Expand All @@ -152,7 +142,7 @@ viewWithMask model =
in
Form.Text.view options
{ onChange = ChangedMaskExample
, onBlur = BlurredField "phone-example"
, onBlur = NoOp
, value = model.maskExample
, error = Html.text ""
, hasError = False
Expand Down

0 comments on commit ca26993

Please sign in to comment.