@@ -204,7 +204,7 @@ articleLoaded
setFavorited /\ isFavorited <- useState favorited
setNewComment /\ newComment <- useState'
setCommentTA /\ commentTA <- useState'
- setFavoritesCount /\ favoritesCount <- useMemoized ((_ <|> pure favC) >>> dedup)
+ setFavoritesCount /\ favoritesCount <- useMemoized' ((_ <|> pure favC) >>> dedup)
let followAttrs' = followAttrs username currentUser isFollowing setFollowing
let followText' = followText isFollowing
let
@@ -213,7 +213,7 @@ articleLoaded
, currentUser <#> \cu -> D.Style := if isSignedIn cu then "" else "display: none;"
, doFavoriting currentUser slug isFavorited favoritesCount setFavoritesCount setFavorited
]
- let favoriteText = nut (text (isFavorited <#> if _ then "Favorited" else "Favorite Post"))
+ let favoriteText = fixed [ text (isFavorited <#> if _ then "Favorited" else "Favorite Post") ]
let img = pure (D.Src := image)
let
myImg = currentUser <#>
@@ -224,10 +224,10 @@ articleLoaded
SignedOut -> Nothing
)
let authProf = pure (D.Href := "/#/profile/" <> username)
- let authorName = nut (text_ username)
- let fCount = nut (text (show <$> favoritesCount))
+ let authorName = fixed [ text_ username ]
+ let fCount = fixed [ text (show <$> favoritesCount) ]
article_ ~~
- { title: nut (D.h1_ [ text_ title ])
+ { title: fixed [ D.h1_ [ text_ title ] ]
, image1: img
, image2: img
, image3: myImg
@@ -235,14 +235,14 @@ articleLoaded
, authProf2: authProf
, authProf3: authProf
, authProf4: authProf
- , body: nut (D.p_ [ text_ body ])
- , description: nut (D.p_ [ text_ description ])
+ , body: fixed [ D.p_ [ text_ body ] ]
+ , description: fixed [ D.p_ [ text_ description ] ]
, author1: authorName
, author2: authorName
, author3: authorName
, author4: authorName
- , commentTextArea: nut
- ( D.textarea
+ , commentTextArea: fixed
+ [ D.textarea
( oneOf
[ injectElementT setCommentTA
, pure $ D.Class := "form-control"
@@ -251,7 +251,7 @@ articleLoaded
]
)
[]
- )
+ ]
, commentButtonCommand: oneOf
[ click $ ({ cu: _, ta: _ } <$> currentUser <*> commentTA) <#> \{ cu, ta } -> do
v <- value ta
@@ -261,7 +261,7 @@ articleLoaded
Right c -> liftEffect $ setNewComment c.comment
Left e -> throwError (error (show e))
]
- , lastUpdated: nut (text_ (prettyDate updatedAt))
+ , lastUpdated: fixed [ text_ (prettyDate updatedAt) ]
, favoriteAttrs1: favoriteAttrs
, favoriteAttrs2: favoriteAttrs
, favoriteText1: favoriteText
@@ -271,35 +271,66 @@ articleLoaded
, followText1: followText'
, followText2: followText'
, postComment: oneOf [ currentUser <#> \cu -> D.Style := if isSignedIn cu then "" else "display: none;" ]
- , articleHeader: nut $ D.h2_ [ text_ title ]
+ , articleHeader: fixed [ D.h2_ [ text_ title ] ]
, favoritesCount1: fCount
, favoritesCount2: fCount
- , commentList: nut $ ezDyn_ D.div $
- ({ cu: _, com: _ } <$> currentUser <*> (newComment <|> oneOfMap pure comments)) <#> \{ cu, com } { remove } -> do
- let profile = pure (D.Href := "/#/profile/" <> com.author.username)
- let
- common =
- { body: nut (text_ com.body)
- , imgsrc: pure (D.Src := com.author.image)
- , profile1: profile
- , profile2: profile
- , username: nut (text_ com.author.username)
- , date: nut (text_ (prettyDate com.updatedAt))
- }
- maybe (theirComment_ ~~ common)
- ( \u -> do
- let
- deleteAction = click $ pure do
- launchAff_ $ deleteComment u.token slug com.id
- remove
-
- myComment_ ~~ (common `union` { deleteAction })
- )
- ( case cu of
- SignedIn u
- | u.username == com.author.username -> Just u
- | otherwise -> Nothing
- SignedOut -> Nothing
-
- )
+ , commentList: D.div_
+ [ ezDyn $
+ (({ cu: _, com: _ }) <$> currentUser <*> (newComment <|> oneOfMap pure comments)) <#> \{ cu, com } { remove } -> do
+ let profile = pure (D.Href := "/#/profile/" <> com.author.username)
+ let
+ common =
+ { body: fixed [ text_ com.body ]
+ , imgsrc: pure (D.Src := com.author.image)
+ , profile1: profile
+ , profile2: profile
+ , username: fixed [ text_ com.author.username ]
+ , date: fixed [ text_ (prettyDate com.updatedAt) ]
+ }
+ maybe (theirComment_ ~~ common)
+ ( \u -> do
+ let
+ deleteAction = click $ pure do
+ launchAff_ $ deleteComment u.token slug com.id
+ remove
+
+ myComment_ ~~ (common `union` { deleteAction })
+ )
+ ( case cu of
+ SignedIn u
+ | u.username == com.author.username -> Just u
+ | otherwise -> Nothing
+ SignedOut -> Nothing
+
+ )
+ ]
+ ----------
+ -- , commentList: fixed [ ezDyn_ D.div $
+ -- ({ cu: _, com: _ } <$> currentUser <*> (newComment <|> oneOfMap pure comments)) <#> \{ cu, com } { remove } -> do
+ -- let profile = pure (D.Href := "/#/profile/" <> com.author.username)
+ -- let
+ -- common =
+ -- { body: nut (text_ com.body)
+ -- , imgsrc: pure (D.Src := com.author.image)
+ -- , profile1: profile
+ -- , profile2: profile
+ -- , username: nut (text_ com.author.username)
+ -- , date: nut (text_ (prettyDate com.updatedAt))
+ -- }
+ -- maybe (theirComment_ ~~ common)
+ -- ( \u -> do
+ -- let
+ -- deleteAction = click $ pure do
+ -- launchAff_ $ deleteComment u.token slug com.id
+ -- remove
+
+ -- myComment_ ~~ (common `union` { deleteAction })
+ -- )
+ -- ( case cu of
+ -- SignedIn u
+ -- | u.username == com.author.username -> Just u
+ -- | otherwise -> Nothing
+ -- SignedOut -> Nothing
+
+ -- )]
}
diff --git a/src/Components/Create.purs b/src/Components/Create.purs
index de04280..4892473 100644
--- a/src/Components/Create.purs
+++ b/src/Components/Create.purs
@@ -14,13 +14,13 @@ import Data.String.Utils (words)
import Data.Tuple.Nested ((/\))
import Data.Validation.Semigroup (V, invalid, toEither)
import Deku.Attribute ((:=))
-import Deku.Control (blank, switcher_, text_)
-import Deku.Core (Domable)
+import Deku.Control (blank, text_, (<#~>))
+import Deku.Core (Domable, fixed)
import Deku.DOM as D
-import Deku.Do (useState, useState')
import Deku.Do as Deku
+import Deku.Hooks (useState, useState')
import Deku.Listeners (click, injectElementT)
-import Deku.Pursx (nut, (~~))
+import Deku.Pursx ((~~))
import Effect.Aff (launchAff_)
import Effect.Class (liftEffect)
import FRP.Event (Event)
@@ -49,8 +49,8 @@ create_ =
create :: forall lock payload. Event User -> Domable lock payload
create user =
create_ ~~
- { formMatter: nut
- ( Deku.do
+ { formMatter: fixed
+ [ Deku.do
setErrors /\ errors <- useState []
setTitle /\ title <- useState Nothing
setDescription /\ description <- useState Nothing
@@ -59,10 +59,10 @@ create user =
setTags /\ tags <- useState []
let errorMessages = ((title <|> description <|> (bodyFocus $> Nothing) <|> (tags $> Nothing) <|> pure Nothing) $> []) <|> errors
D.div_
- [ errorMessages # switcher_ D.div case _ of
+ [D.div_ [errorMessages <#~> case _ of
[] -> blank
errs -> D.ul (oneOf [ pure $ D.Class := "error-messages" ])
- (map (D.li_ <<< pure <<< text_) errs)
+ (map (D.li_ <<< pure <<< text_) errs)]
, D.div_
[ largeTextField "Article Title" (Just >>> setTitle)
, textField "What's this article about?" (Just >>> setDescription)
@@ -111,7 +111,7 @@ create user =
[ text_ "Publish Article" ]
]
]
- )
+ ]
}
where
withErrors :: Array String -> Maybe String -> V (Array String) String
diff --git a/src/Components/Following.purs b/src/Components/Following.purs
index db3ebfb..c122e96 100644
--- a/src/Components/Following.purs
+++ b/src/Components/Following.purs
@@ -7,9 +7,9 @@ import API.Types (AuthState, isSignedIn, whenSignedIn)
import Data.Foldable (oneOf)
import Deku.Attribute (Attribute, (:=))
import Deku.Control (text)
+import Deku.Core (Domable, fixed)
import Deku.DOM as D
import Deku.Listeners (click)
-import Deku.Pursx (PursxElement, nut)
import Effect (Effect)
import Effect.Aff (launchAff_)
import FRP.Event (Event)
@@ -33,5 +33,5 @@ followAttrs username currentUser isFollowing setFollowing = oneOf
void $ follow cu'.token username
]
-followText :: forall lock payload. Event Boolean -> PursxElement lock payload
-followText isFollowing = nut (text (isFollowing <#> if _ then "Following" else "Follow"))
+followText :: forall lock payload. Event Boolean -> Domable lock payload
+followText isFollowing = fixed [text (isFollowing <#> if _ then "Following" else "Follow")]
diff --git a/src/Components/Home.purs b/src/Components/Home.purs
index 9d570c3..f5f9113 100644
--- a/src/Components/Home.purs
+++ b/src/Components/Home.purs
@@ -10,13 +10,13 @@ import Data.Foldable (oneOf)
import Data.Tuple.Nested ((/\))
import Date (prettyDate)
import Deku.Attribute ((:=))
-import Deku.Control (blank, switcher_, text, text_)
-import Deku.Core (Domable)
+import Deku.Control (blank, text, text_, (<#~>))
+import Deku.Core (Domable, fixed)
import Deku.DOM as D
-import Deku.Do (useState, useState')
import Deku.Do as Deku
+import Deku.Hooks (useState, useState')
import Deku.Listeners (click)
-import Deku.Pursx (nut, (~~))
+import Deku.Pursx ((~~))
import Effect.Aff (launchAff_)
import Effect.Class (liftEffect)
import FRP.Event (Event)
@@ -38,7 +38,7 @@ articlePreview
} = Deku.do
setFavoritesCount /\ favoritesCount <- useState fcount
setFavorited /\ isFavorited <- useState favorited
- let fc = nut (text (show <$> favoritesCount))
+ let fc = fixed [text (show <$> favoritesCount)]
let
signedOutButton = oneOf
[ pure $ D.Class := "text-success btn-sm pull-xs-right"
@@ -61,10 +61,10 @@ articlePreview
, signedOutButton
, signedInButton
, href: pure (D.Href := "/#/article/" <> slug)
- , username: nut (text_ username)
- , title: nut (D.h1_ [ text_ title ])
- , description: nut (D.p_ [ text_ description ])
- , date: nut (text_ (prettyDate updatedAt))
+ , username: fixed [text_ username]
+ , title: fixed [D.h1_ [ text_ title ]]
+ , description: fixed [D.p_ [ text_ description ]]
+ , date: fixed [text_ (prettyDate updatedAt)]
, favoritesCount1: fc
, favoritesCount2: fc
}
@@ -156,11 +156,11 @@ home currentUser articleLoadStatus tagsLoadStatus = Deku.do
setArticles /\ articles <- useState'
setTab /\ tab <- useState Global
home_ ~~
- { articlePreviews: nut
- ( (articleLoadStatus <|> articles) # switcher_ D.div case _ of
+ { articlePreviews: fixed
+ [ D.div_ [(articleLoadStatus <|> articles) <#~> case _ of
ArticlesLoading -> loading
- ArticlesLoaded a -> D.div_ (map (articlePreview currentUser) a.articles)
- )
+ ArticlesLoaded a -> D.div_ (map (articlePreview currentUser) a.articles)]
+ ]
, feedAttributes: oneOf
[ { cu: _, ct: _ } <$> currentUser <*> tab <#> \{ cu, ct } -> D.Class := "nav-link"
<>
@@ -193,8 +193,8 @@ home currentUser articleLoadStatus tagsLoadStatus = Deku.do
liftEffect $ setTab Global
getArticles >>= liftEffect <<< setArticles <<< ArticlesLoaded
]
- , tags: nut
- ( tagsLoadStatus # switcher_ D.div case _ of
+ , tags: fixed
+ [ D.div_ [tagsLoadStatus <#~> case _ of
TagsLoading -> blank
TagsLoaded tags -> D.div (oneOf [ pure $ D.Class := "tag-list" ])
( map
@@ -210,8 +210,8 @@ home currentUser articleLoadStatus tagsLoadStatus = Deku.do
[ text_ tag ]
)
tags.tags
- )
- )
+ )]
+ ]
}
where
loading :: Domable lock payload
diff --git a/src/Components/Login.purs b/src/Components/Login.purs
index 9f72a6d..ef18f76 100644
--- a/src/Components/Login.purs
+++ b/src/Components/Login.purs
@@ -13,13 +13,13 @@ import Data.Maybe (Maybe(..), maybe)
import Data.Tuple.Nested ((/\))
import Data.Validation.Semigroup (V, invalid, toEither)
import Deku.Attribute ((:=))
-import Deku.Control (blank, switcher_, text_)
-import Deku.Core (Domable)
+import Deku.Control (blank, text_, (<#~>))
+import Deku.Core (Domable, fixed)
import Deku.DOM as D
-import Deku.Do (useState)
import Deku.Do as Deku
+import Deku.Hooks (useState)
import Deku.Listeners (click)
-import Deku.Pursx (nut, (~~))
+import Deku.Pursx ((~~))
import Effect (Effect)
import Effect.Aff (launchAff_)
import Effect.Class (liftEffect)
@@ -43,21 +43,24 @@ login_ =