Kuza one

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+# yarn lint-staged

apps/dsep/.env

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_BECKN_API_URL=https://api.osm-dev.becknprotocol.io
-NEXT_PUBLIC_API_URL=https://api-node-dev.mobilityreferencebap.becknprotocol.io
+NEXT_PUBLIC_API_URL=https://generic-client-layer.becknprotocol.io
 NEXT_PUBLIC_NOMINATIM_URL=https://nominatim.openstreetmap.org
 NEXT_PUBLIC_STRAPI_URL=https://strapi-bap.becknprotocol.io/api
 NEXT_PUBLIC_DSEP_URL=https://dsep-test.becknprotocol.io

apps/dsep/.gitignore

@@ -0,0 +1,37 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+/.pnp
+.pnp.js
+yarn.lock
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+.env*.local
+.env
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo

apps/dsep/components/cart/CartIcon.tsx

@@ -1,21 +1,15 @@
 import React, { useRef } from 'react'
 import Link from 'next/link'
 import { useDispatch, useSelector } from 'react-redux'
-import { Transition } from 'react-transition-group'
 import { AiOutlineShoppingCart } from 'react-icons/ai'
 import { cartUiActions } from '../../store/cartUI-slice'
-import CartBox from './CartBox'
 import { ICartUiRootState, ICartRootState } from '../../lib/types/cart'
 import { useLanguage } from '../../hooks/useLanguage'
 
 const Basket = () => {
   const dispatch = useDispatch()
-  const { locale } = useLanguage()
-  const showCartBox = useSelector((state: ICartUiRootState) => state.cartUi.cartBoxIsVisible)
   const cartItemQuantity = useSelector((state: ICartRootState) => state.cart.totalQuantity)
 
-  const nodeRef = useRef<HTMLDivElement>(null)
-
   function onMouseHoverHandler(toggle: boolean) {
     dispatch(cartUiActions.toggleCartBox(toggle))
   }
@@ -46,24 +40,6 @@ const Basket = () => {
           </span>
         </a>
       </Link>
-      <Transition
-        nodeRef={nodeRef}
-        in={showCartBox}
-        timeout={300}
-        mountOnEnter
-        unmountOnExit
-      >
-        {state => {
-          return (
-            <div
-              ref={nodeRef}
-              className="z-[100]"
-            >
-              <CartBox />
-            </div>
-          )
-        }}
-      </Transition>
     </div>
   )
 }

apps/dsep/components/cart/CartItem.tsx

@@ -1,53 +1,45 @@
-import { Box, Image, Text, Flex } from '@chakra-ui/react'
+import { Image } from '@chakra-ui/react'
 import { useRouter } from 'next/router'
 import React, { useState } from 'react'
 import { HiMinusSm, HiOutlinePlusSm, HiOutlineTrash } from 'react-icons/hi'
 import { useSelector } from 'react-redux'
 import { useDispatch } from 'react-redux'
 import { useLanguage } from '../../hooks/useLanguage'
 import useRequest from '../../hooks/useRequest'
-import { CartItemForRequest, DataPerBpp, ICartRootState, TransactionIdRootState } from '../../lib/types/cart'
-import { RetailItem } from '../../lib/types/products'
+import { ICartRootState } from '../../lib/types/cart'
 import { cartActions } from '../../store/cart-slice'
-import { getCartItemsPerBpp, getPayloadForQuoteRequest } from '../../utilities/cart-utils'
-import AddBillingButton from '../detailsCard/AddBillingButton'
-import DetailsCard from '../detailsCard/DetailsCard'
-import ScholarshipAddButton from '../scholarship/scholarshipAddButton/ScholarshipAddButton'
-import ProductPrice from '../UI/ProductPrice'
-import addShippingBtn from '../../public/images/offer.svg'
+import { getPayloadForSelectRequest } from '../../utilities/cart-utils'
+
+import { ParsedItemModel } from '../../types/search.types'
+import { Item } from '../../lib/types/select.types'
+import { ProductPrice } from '@beckn-ui/becknified-components'
 
 interface Props {
-  product: RetailItem
+  product: Item
   setIsLoadingForCartCountChange: Function
 }
 const CartItem: React.FC<Props> = ({ product, setIsLoadingForCartCountChange }) => {
   const quoteRequest = useRequest()
   const cartItems = useSelector((state: ICartRootState) => state.cart.items)
-  const transactionId = useSelector((state: { transactionId: TransactionIdRootState }) => state.transactionId)
-  const cartItemsPerBppPerProvider: DataPerBpp = getCartItemsPerBpp(cartItems as CartItemForRequest[])
-  const payLoadForQuoteRequest = getPayloadForQuoteRequest(cartItemsPerBppPerProvider, transactionId)
+  const payLoadForQuoteRequest = getPayloadForSelectRequest(cartItems)
   const apiUrl = process.env.NEXT_PUBLIC_API_URL
 
-  const scholarshipId = useSelector((state: any) => state.scholarshipCart.scholarshipId)
-  const scholarshipTitle = useSelector((state: any) => state.scholarshipCart.scholarshipTitle)
-
   const productQuantity = useSelector(
-    (state: ICartRootState) => state.cart.items.find(item => item.id === product.id)?.quantity
+    (state: ICartRootState) => state.cart.items.find(item => item.item.id === product.id)?.quantity
   )
   const [counter, setCounter] = useState(productQuantity)
   const dispatch = useDispatch()
   const { t } = useLanguage()
-  const router = useRouter()
 
   const fetchQuotes = () => {
     setIsLoadingForCartCountChange(true)
     quoteRequest
-      .fetchData(`${apiUrl}/client/v2/get_quote`, 'POST', payLoadForQuoteRequest)
+      .fetchData(`${apiUrl}/select`, 'POST', payLoadForQuoteRequest)
       .then(data => setIsLoadingForCartCountChange(false))
       .catch(e => console.error(e))
   }
 
-  function increment(product: RetailItem) {
+  function increment(product: ParsedItemModel) {
     setCounter(prev => ++prev!)
     dispatch(cartActions.addItemToCart({ product: product, quantity: 1 }))
     fetchQuotes()
@@ -59,12 +51,6 @@ const CartItem: React.FC<Props> = ({ product, setIsLoadingForCartCountChange })
     fetchQuotes()
   }
 
-  function onInputNumberChangeHandler(e: React.ChangeEvent<HTMLInputElement>) {
-    if (+e.currentTarget.value >= 1 && +e.currentTarget.value <= 10) {
-      setCounter(+e.currentTarget.value)
-    }
-  }
-
   return (
     <>
       <div className="flex items-center flex-wrap sm:my-4 sm:py-4 px-2 border-b-2 mb-4">
@@ -92,8 +78,10 @@ const CartItem: React.FC<Props> = ({ product, setIsLoadingForCartCountChange })
               }}
             >
               <Image
-                src={product.descriptor.images[0]}
-                alt={product.descriptor.name}
+                // TODO :- To check this after we get image from select
+                src=""
+                // src={product.images[0].url}
+                alt={'product-name'}
                 className="object-contain"
               />
             </div>
@@ -139,7 +127,7 @@ const CartItem: React.FC<Props> = ({ product, setIsLoadingForCartCountChange })
                 fontSize: '17px'
               }}
             >
-              {product.descriptor.name}
+              {product.name}
             </div>
           </a>
           {/* </Link> */}
@@ -161,45 +149,11 @@ const CartItem: React.FC<Props> = ({ product, setIsLoadingForCartCountChange })
 
             <ProductPrice
               price={parseFloat(product.price.value) * counter!}
-              isLargeSize
+              currencyType={product.price.currency}
             />
           </div>
         </div>
       </div>
-      <Box>
-        <Text
-          mb="10px"
-          fontSize={'17px'}
-        >
-          {t.scholarship}
-        </Text>
-        {scholarshipId ? (
-          <DetailsCard>
-            <Flex alignItems={'center'}>
-              <Image
-                alt="shippingBtnImage"
-                src={addShippingBtn}
-              />
-              <Text ml={'8px'}>
-                <span
-                  style={{
-                    fontWeight: 'bold'
-                  }}
-                >
-                  ‘{scholarshipId}-{scholarshipTitle}’
-                </span>
-              </Text>
-            </Flex>
-            <Text ml={'35px'}>{t.scholarshipApplied}</Text>
-          </DetailsCard>
-        ) : (
-          <ScholarshipAddButton
-            image={'+'}
-            text={t.checkforScholarship}
-            handleButtonClick={() => router.push('/myScholarship')}
-          />
-        )}
-      </Box>
     </>
   )
 }