Merge branch 'main' of github.com:NitroDevs/FShopOnWeb

NitroDevs · Nov 6, 2022 · bfadaa9 · bfadaa9
2 parents 35a0ba1 + a5a0fef
commit bfadaa9
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 17 deletions.
diff --git a/src/Microsoft.eShopWeb.Web/Basket/Basket.Domain.fs b/src/Microsoft.eShopWeb.Web/Basket/Basket.Domain.fs
@@ -40,3 +40,31 @@ module BasketDomain =
     { Id = 1
       Items = List.mapi mapCatalogItem catalogItems
       BuyerId = None }
+
+  let addItemToBasket basket (catalogItem: CatalogItem) =
+    // let id = form.TryGetString "id" |> Option.map int
+    let item: BasketItem option =
+      basket.Items |> List.tryFind (fun i -> i.CatalogItemId = catalogItem.Id)
+
+    match item with
+    | None ->
+      let items =
+        basket.Items
+        |> List.append [ (mapCatalogItem (basket.Items.Length + 1) catalogItem) ]
+
+      { basket with Items = items }
+    | Some item ->
+      let quantity = item.Quantity + 1
+
+      let items =
+        basket.Items
+        |> List.map (fun i ->
+          if i.CatalogItemId = catalogItem.Id then
+            { i with Quantity = quantity }
+          else
+            i)
+
+      { basket with Items = items }
+
+// TODO:
+// let getCatalogItemById =
diff --git a/src/Microsoft.eShopWeb.Web/Home/CatalogGrid.Component.fs b/src/Microsoft.eShopWeb.Web/Home/CatalogGrid.Component.fs
@@ -13,7 +13,7 @@ module CatalogGridComponent =
       div
         [ class' "esh-catalog-item col-md-4" ]
         [ form
-            [ method "post"; action "/Basket" ]
+            [ method "post"; action "/basket" ]
             [ img [ src item.PictureUri; class' "esh-catalog-thumbnail" ]
               input [ class' "esh-catalog-button"; type' "submit"; value "[ ADD TO BASKET ]" ]
               div [ class' "esh-catalog-name" ] [ span [] [ raw item.Name ] ]

diff --git a/src/Microsoft.eShopWeb.Web/Home/CatalogPager.Component.fs b/src/Microsoft.eShopWeb.Web/Home/CatalogPager.Component.fs
@@ -8,11 +8,20 @@ module CatalogPagerComponent =
   type Props = { CurrentPage: int; ItemsCount: int }
 
   module private Template =
+    type State =
+      { PagingText: string
+        PreviousClass: string
+        NextClass: string }
 
-    let pagingText props =
+    let calculateState props =
       let currentPage = 1
       let pageSize = 10
-      let totalPages = (props.ItemsCount / pageSize) + 1
+
+      let totalPages =
+        match (props.ItemsCount / pageSize) with
+        | 0 -> 1
+        | _ -> (props.ItemsCount / pageSize)
+
       let morePagesAvailable = props.ItemsCount > pageSize
       let hasPreviousPage = currentPage > 1
       let hasNextPage = currentPage < totalPages
@@ -23,9 +32,27 @@ module CatalogPagerComponent =
         | false -> props.ItemsCount
 
       let currentItemIndex = (pageSize * (currentPage - 1)) + 1
-      sprintf "Showing %d of %d products - Page %d - %d" currentItemIndex totalItemsOnPage currentPage totalPages
+
+      let previousClass =
+        match hasPreviousPage with
+        | true -> "esh-pager-item-left esh-pager-item--navigable esh-pager-item"
+        | false -> "esh-pager-item-left esh-pager-item--navigable esh-pager-item is-disabled"
+
+      let nextClass =
+        match hasNextPage with
+        | true -> "esh-pager-item-right esh-pager-item--navigable esh-pager-item"
+        | false -> "esh-pager-item-right esh-pager-item--navigable esh-pager-item is-disabled"
+
+      let pagingText =
+        sprintf "Showing %d of %d products - Page %d - %d" currentItemIndex totalItemsOnPage currentPage totalPages
+
+      { PagingText = pagingText
+        NextClass = nextClass
+        PreviousClass = previousClass }
 
   let cmpt props =
+    let state = Template.calculateState props
+
     div
       [ class' "esh-pager" ]
       [ div
@@ -36,17 +63,8 @@ module CatalogPagerComponent =
                   []
                   [ div
                       [ class' "col-md-2 col-xs-12" ]
-                      [ a
-                          [ class' "esh-pager-item-left esh-pager-item--navigable esh-pager-item is-disabled"
-                            href "/?pageId=-1" ]
-                          [ raw "Previous" ] ]
-                    div
-                      [ class' "col-md-8 col-xs-12" ]
-                      [ span [ class' "esh-pager-item" ] [ raw (Template.pagingText props) ] ]
+                      [ a [ class' state.PreviousClass; href "/?pageId=-1" ] [ raw "Previous" ] ]
+                    div [ class' "col-md-8 col-xs-12" ] [ span [ class' "esh-pager-item" ] [ raw state.PagingText ] ]
                     div
                       [ class' "col-md-2 col-xs-12" ]
-                      [ a
-                          [ class' "esh-pager-item-right esh-pager-item--navigable esh-pager-item is-disabled"
-                            id "Next"
-                            href "/?pageId=1" ]
-                          [ raw "Next" ] ] ] ] ] ]
+                      [ a [ class' state.NextClass; id "Next"; href "/?pageId=1" ] [ raw "Next" ] ] ] ] ] ]
diff --git a/src/Microsoft.eShopWeb.Web/Program.fs b/src/Microsoft.eShopWeb.Web/Program.fs
@@ -66,7 +66,7 @@ module Program =
       endpoints
         [ get "/" HomePage.handler
 
-          get "/basket" BasketPage.handler
+          post "/basket" BasketPage.handler
 
           //get "/catalogItems/{id:guid}" (Request.mapRoute getCatalogItemByIdFromRoute responseHandler)
           ]