diff --git a/advanced/part1/src/Page/Profile.elm b/advanced/part1/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/advanced/part1/src/Page/Profile.elm +++ b/advanced/part1/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/advanced/part2/src/Page/Profile.elm b/advanced/part2/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/advanced/part2/src/Page/Profile.elm +++ b/advanced/part2/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/advanced/part3/src/Page/Profile.elm b/advanced/part3/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/advanced/part3/src/Page/Profile.elm +++ b/advanced/part3/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/advanced/part4/src/Page/Profile.elm b/advanced/part4/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/advanced/part4/src/Page/Profile.elm +++ b/advanced/part4/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/intro/part5/src/Page/Profile.elm b/intro/part5/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/intro/part5/src/Page/Profile.elm +++ b/intro/part5/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/intro/part6/src/Page/Profile.elm b/intro/part6/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/intro/part6/src/Page/Profile.elm +++ b/intro/part6/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/intro/part7/src/Page/Profile.elm b/intro/part7/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/intro/part7/src/Page/Profile.elm +++ b/intro/part7/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/intro/part8/src/Page/Profile.elm b/intro/part8/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/intro/part8/src/Page/Profile.elm +++ b/intro/part8/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none diff --git a/intro/part9/src/Page/Profile.elm b/intro/part9/src/Page/Profile.elm index 30d0b46..12ee6e2 100644 --- a/intro/part9/src/Page/Profile.elm +++ b/intro/part9/src/Page/Profile.elm @@ -211,10 +211,15 @@ view model = Loaded feed -> div [ class "container" ] [ div [ class "row" ] - [ div [ class "col-xs-12 col-md-10 offset-md-1" ] <| - div [ class "articles-toggle" ] - [ viewTabs model.feedTab ] - :: (Feed.viewArticles model.timeZone feed |> List.map (Html.map GotFeedMsg)) + [ div [ class "col-xs-12 col-md-10 offset-md-1" ] + [ div [ class "articles-toggle" ] <| + List.concat + [ [ viewTabs model.feedTab ] + , Feed.viewArticles model.timeZone feed + |> List.map (Html.map GotFeedMsg) + , [ Feed.viewPagination ClickedFeedPage feed ] + ] + ] ] ] @@ -305,6 +310,7 @@ type Msg | ClickedFollow Cred UnfollowedAuthor | ClickedUnfollow Cred FollowedAuthor | ClickedTab FeedTab + | ClickedFeedPage Int | CompletedFollowChange (Result Http.Error Author) | CompletedAuthorLoad (Result ( Username, Http.Error ) Author) | CompletedFeedLoad (Result ( Username, Http.Error ) Feed.Model) @@ -337,6 +343,11 @@ update msg model = , fetchFeed model.session tab (currentUsername model) 1 ) + ClickedFeedPage page -> + ( { model | feedPage = page } + , fetchFeed model.session model.feedTab (currentUsername model) page + ) + CompletedFollowChange (Ok newAuthor) -> ( { model | author = Loaded newAuthor } , Cmd.none