- {children}
-
- {/* */}
-
-
-
- )
- }}
-
@@ -92,8 +78,10 @@ const CartItem: React.FC = ({ product, setIsLoadingForCartCountChange })
}}
>
@@ -139,7 +127,7 @@ const CartItem: React.FC
- {cartItems.length
- ? cartItems.map((cartItem: RetailItem) => {
+ {cartItemsFromSelect.length
+ ? cartItemsFromSelect.map((cartItem: Item) => {
return (
= ({ setIsLoadingForCartCountChange
)
})
: null}
+
+
+
+ {scholarshipId ? (
+
+
+
+
+
+
+
+
+
+ ) : (
+ router.push('/myScholarship')}
+ />
+ )}
+
- {t.orderSummary} -
-
-
+ {t.orderSummary}
+
+
+
+ {title}
+
+
+ {message}
+
+
+)
+
+export default CustomToast
diff --git a/apps/dsep/components/landingPage/LandingPage.tsx b/apps/dsep/components/landingPage/LandingPage.tsx
index 1aa49adac..e30e85c40 100644
--- a/apps/dsep/components/landingPage/LandingPage.tsx
+++ b/apps/dsep/components/landingPage/LandingPage.tsx
@@ -1,10 +1,10 @@
import React, { useState } from 'react'
import Router from 'next/router'
+import { SearchInput } from '@beckn-ui/becknified-components'
+import { Box, Flex, Text, Image } from '@chakra-ui/react'
import ImageCard from './ImageCard'
import { useLanguage } from '../../hooks/useLanguage'
-import { Box, Flex, Text, Input, Image } from '@chakra-ui/react'
-
import beckenFooter from '../../public/images/beckenFooterLogo.svg'
import couresImageWhite from '../../public/images/landing-page-icons/CoursesWhite.svg'
import coursesImageBlack from '../../public/images/landing-page-icons/CoursesBlack.svg'
@@ -29,6 +29,13 @@ const LandingPage: React.FC = () => {
setActiveCard(type)
}
+ const searchIconClickHandler = (e: any) => {
+ if (searchTerm) {
+ navigateToSearchResults()
+ }
+ e.preventDefault()
+ }
+
return (
{
))}
-
-
+ setSearchTerm(e.target.value)}
- onKeyDown={event => event.key === 'Enter' && navigateToSearchResults()}
- _focusVisible={{
- borderColor: 'transparent',
- boxShadow: 'transparent'
- }}
+ onChangeHandler={(e: React.BaseSyntheticEvent) => setSearchTerm(e.target.value)}
+ searchIcon={'/images/searchIcon.svg'}
+ searchIconClickHandler={searchIconClickHandler}
+ onEnterHandler={(e: { key: string }) => e.key === 'Enter' && navigateToSearchResults()}
+ placeHolder={`Search for ${activeCard}`}
/>
-
- {
- if (searchTerm) {
- navigateToSearchResults()
- }
- e.preventDefault()
- }}
- alt={'search icon'}
- />
-
-
+
= ({ children }) => {
const { locale } = useLanguage()
@@ -21,51 +22,56 @@ const Layout: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
return (
-
-
- Skill Seeker
-
-
+
)
}
diff --git a/apps/dsep/components/productCard/product-card-renderer.tsx b/apps/dsep/components/productCard/product-card-renderer.tsx
new file mode 100644
index 000000000..16ad6a041
--- /dev/null
+++ b/apps/dsep/components/productCard/product-card-renderer.tsx
@@ -0,0 +1,127 @@
+import { Flex, Box, Image, Text } from '@chakra-ui/react'
+import { useRouter } from 'next/router'
+import React, { useEffect, useState } from 'react'
+import { useLanguage } from '../../hooks/useLanguage'
+import StarIcon from '../../public/images/Star.svg'
+import { toBinary } from '../../utilities/common-utils'
+import ProductPrice from '../UI/ProductPrice'
+
+const ProductCardRenderer = (data: any) => {
+ // const [distance, setDistance] = useState(0)
+ const { dataSource } = data
+ const { t } = useLanguage()
+ const router = useRouter()
+ const encodedProduct = window.btoa(toBinary(JSON.stringify(dataSource)))
+
+ const extraInfoMapper: { [key: string]: string } = {
+ // TODO :- To add the mapping of duration
+ ['Duration']: '1 month',
+ ['Sold by']: dataSource.providerName
+ }
+
+ // TODO :- to do some refactoring here and get some components from buolding block
+ return (
+ {
+ localStorage.setItem('selectedItem', JSON.stringify(dataSource))
+ router.push(`/product?productDetails=${encodedProduct}`)
+ }}
+ minH={'168px'}
+ maxH={'100%'}
+ boxShadow="0px 20px 25px rgba(0, 0, 0, 0.10), 0px 8px 10px rgba(0, 0, 0, 0.10)"
+ mt={'64px'}
+ mx={{ md: 6 }}
+ rounded="xl"
+ bg="#fff"
+ position="relative"
+ mb={'20px'}
+ >
+
+
+
+
+
+
+
+ {dataSource.item.name}
+
+
+
+ {Object.keys(extraInfoMapper).map((key, idx) => {
+ return (
+
+ {key}:
+
+ {extraInfoMapper[key]}
+
+
+ )
+ })}
+
+
+
+
+ {dataSource.item.rating}
+
+
+
+ {/* */}
+
+
+ )
+}
+
+export default ProductCardRenderer
diff --git a/apps/dsep/components/productDetails/index.tsx b/apps/dsep/components/productDetails/index.tsx
index d730f39d0..72c46c59f 100644
--- a/apps/dsep/components/productDetails/index.tsx
+++ b/apps/dsep/components/productDetails/index.tsx
@@ -1,30 +1,134 @@
-import React from 'react'
-import { RetailItem } from '../../lib/types/products'
-import ImageSection from './ImageSection'
-import DetailsSection from './DetailsSection'
+import React, { useEffect, useState } from 'react'
+import { ProductSummary, ProductDescription, ProductPrice } from '@beckn-ui/becknified-components'
+import { Flex, Box, Text, useTheme } from '@chakra-ui/react'
+import router from 'next/router'
+import StarRatingComponent from 'react-star-rating-component'
+import { ParsedItemModel } from '../../types/search.types'
+import { Button, Typography } from '@beckn-ui/molecules'
+import { useLanguage } from '../../hooks/useLanguage'
+import { useDispatch } from 'react-redux'
+import { toast } from 'react-toastify'
+import { cartActions } from '../../store/cart-slice'
interface Props {
- product: RetailItem
+ product: ParsedItemModel
}
const ProductDetails: React.FC = ({ product }) => {
+ const { t } = useLanguage()
+ const [counter, setCounter] = useState(1)
+ const { theme } = useTheme()
+
+ useEffect(() => {
+ return () => {
+ setCounter(1)
+ }
+ }, [product])
+
+ const dispatch = useDispatch()
+
+ function addToCartHandler() {
+ dispatch(
+ cartActions.addItemToCart({
+ product: product,
+ quantity: counter
+ })
+ )
+ toast.success(t.productAddedToCartMsg, {
+ theme: theme === 'dark' ? 'dark' : 'light'
+ })
+ }
+
return (
-
+
+
+
+ {product.item.short_desc}
+
+
+
+ {product.item.rating ? `${parseFloat(product.item.rating)} Stars` : null}
+
+
+ {/*
+
+
+
+
+ {
+ // router.push('/assemblyDetails')
+ addToCartHandler()
+ }}
+ >
+
+
+
+
+ = ({ productList }) => {
const { t } = useLanguage()
-
const [selectedRadioBtn, setSelectedRadioBtn] = useState('all')
- const dispatch = useDispatch()
+ const [sortedProductList, setSortedProductList] = useState([])
+
+ useEffect(() => {
+ setSortedProductList(productList)
+ }, [productList])
useEffect(() => {
- dispatch(
- SortedProductsListActions.sortProductsList({
- productsList: productList,
- sortBasedOn: selectedRadioBtn
- })
- )
- }, [dispatch, productList, selectedRadioBtn])
+ const clonedproductList = structuredClone(productList)
+ if (selectedRadioBtn === 'expensive') {
+ return setSortedProductList(clonedproductList.sort(sortByExpensive))
+ }
- const sortedProductList = useSelector((state: IProductListRootState) => state.sortedProductsList.productsList)
+ if (selectedRadioBtn === 'cheapest') {
+ return setSortedProductList(clonedproductList.sort(sortByCheapest))
+ }
+
+ if (selectedRadioBtn === 'all') {
+ return setSortedProductList(clonedproductList)
+ }
+ }, [selectedRadioBtn])
function onChangeHandler(e: React.ChangeEvent) {
setSelectedRadioBtn(e.currentTarget.id)
}
return (
- = ({ selectedBtn: selectedRadioBtn, onChangeSelected
return (
{
const { t } = useLanguage()
const [formData, setFormData] = useState({ email: '', password: '' })
const [formErrors, setFormErrors] = useState({ email: '', password: '' })
const [isFormFilled, setIsFormFilled] = useState(false)
+ const toast = useToast()
+ // TODO :- we can uncomment this if we want something to change on the basis of breakpoint
+ // const breakpoint = useBreakpoint()
+ // const mobileBreakpoints = ['base', 'sm', 'md', 'lg']
const baseUrl = process.env.NEXT_PUBLIC_STRAPI_URL
const handleInputChange = (e: React.ChangeEvent) => {
@@ -67,77 +67,70 @@ const SignIn = () => {
Cookies.set('userEmail', email)
Router.push('/homePage')
} else {
- console.error('Sign In failed')
+ const errorData = await response.json()
+ toast({
+ render: () => (
+
-
-
-
-
-
-
+ {
+ Router.push('/signUp')
+ },
+ disabled: false,
+ variant: 'outline',
+ colorScheme: 'primary'
+ }
+ ],
+
+ inputs: [
+ {
+ type: 'text',
+ name: 'email',
+ value: formData.email,
+ handleChange: handleInputChange,
+ label: t.email,
+ error: formErrors.email
+ },
+ {
+ type: 'password',
+ name: 'password',
+ value: formData.password,
+ handleChange: handleInputChange,
+ label: t.password,
+ error: formErrors.password
+ }
+ ]
+ }}
+ />
)
}
diff --git a/apps/dsep/hooks/useRequest.tsx b/apps/dsep/hooks/useRequest.tsx
index 29ec9c534..0963c3e6b 100644
--- a/apps/dsep/hooks/useRequest.tsx
+++ b/apps/dsep/hooks/useRequest.tsx
@@ -3,7 +3,7 @@ import axios from 'axios'
import { ResponseModel } from '../lib/types/responseModel'
const useRequest = () => {
- const [data, setData] = useState<(ResponseModel & ResponseModel[]) | null>(null)
+ const [data, setData] = useState(null)
const [loading, setLoading] = useState(false)
const [error, setError] = useState('')
diff --git a/apps/dsep/lib/types/cart.ts b/apps/dsep/lib/types/cart.ts
index f0233b1ec..5659b3b09 100644
--- a/apps/dsep/lib/types/cart.ts
+++ b/apps/dsep/lib/types/cart.ts
@@ -1,22 +1,7 @@
+import { ParsedItemModel } from '../../types/search.types'
import { IProductDetails, RetailItem, TSlug } from './products'
-export interface ICartProduct {
- image: any
- name: string
- slug: TSlug
- price: number
- discount?: number
- brand: string
- category: string[]
- starRating: number
- isOffer?: boolean
- details?: IProductDetails[]
- registerDate?: string
- quantity: number
- totalPrice: number
-}
-
-export interface CartRetailItem extends RetailItem {
+export interface CartRetailItem extends ParsedItemModel {
quantity: number
totalPrice: number
}
diff --git a/apps/dsep/lib/types/confirm.types.ts b/apps/dsep/lib/types/confirm.types.ts
new file mode 100644
index 000000000..4db447e44
--- /dev/null
+++ b/apps/dsep/lib/types/confirm.types.ts
@@ -0,0 +1,130 @@
+interface Context {
+ domain: string
+ action: string
+ version: string
+ bpp_id: string
+ bpp_uri: string
+ country: string
+ city: string
+ location: {
+ country: {
+ name: string
+ code: string
+ }
+ city: {
+ name: string
+ code: string
+ }
+ }
+ bap_id: string
+ bap_uri: string
+ transaction_id: string
+ message_id: string
+ ttl: string
+ timestamp: string
+}
+
+interface Image {
+ url: string
+ size_type: string
+}
+
+interface Measure {
+ value: number
+ unit: string
+}
+
+interface AvailableQuantity {
+ count: number
+ measure: Measure
+}
+
+interface TagList {
+ value: string
+}
+
+interface Tag {
+ display: boolean
+ list: TagList[]
+}
+
+interface Price {
+ value: number
+ currency: string
+}
+
+interface Fulfillment {
+ rateable: boolean
+ tracking: boolean
+ id?: string
+ type?: string
+ rating?: number
+}
+
+interface BreakupItem {
+ title: string
+ price: Price
+ item?: { id: string } // Optional for breakup items without item id
+}
+
+interface QuoteBreakup {
+ [key: string]: BreakupItem // Index signature for dynamic breakup items
+}
+
+interface Quote {
+ price: Price
+ breakup: QuoteBreakup
+}
+
+interface BillingAddress {
+ name: string
+ address: string
+ state: { name: string }
+ city: { name: string }
+ email: string
+ phone: string
+}
+
+interface CancellationTerm {
+ state: string
+ cancellation_fee: {
+ amount: Price
+ }
+}
+
+interface Message {
+ orderId: string
+ provider: {
+ id: string
+ name: string
+ short_desc: string
+ long_desc: string
+ rating: string
+ images: Image[]
+ }
+ items: {
+ id: string
+ name: string
+ code: string
+ short_desc: string
+ long_desc: string
+ price: Price
+ quantity: {
+ available: AvailableQuantity
+ }
+ tags: Tag[]
+ }
+ fulfillments: Fulfillment[]
+ quote: Quote
+ billing: BillingAddress
+ cancellation_terms: CancellationTerm[]
+}
+
+interface ConfirmResponseData {
+ context: Context
+ message: Message
+}
+
+export interface ConfirmResponseModel {
+ data: ConfirmResponseData[]
+}
diff --git a/apps/dsep/lib/types/init.types.ts b/apps/dsep/lib/types/init.types.ts
new file mode 100644
index 000000000..614952bb7
--- /dev/null
+++ b/apps/dsep/lib/types/init.types.ts
@@ -0,0 +1,145 @@
+interface Location {
+ country: {
+ name: string
+ code: string
+ }
+ city: {
+ name: string
+ code: string
+ }
+}
+
+interface Context {
+ domain: string
+ action: string
+ version: string
+ bpp_id: string
+ bpp_uri: string
+ country: string
+ city: string
+ location: Location
+ bap_id: string
+ bap_uri: string
+ transaction_id: string
+ message_id: string
+ ttl: string
+ timestamp: string
+}
+
+interface Price {
+ value: string
+ currency: string
+}
+
+interface Image {
+ url: string
+ size_type?: string
+}
+
+interface Provider {
+ id: string
+ name: string
+ short_desc: string
+ long_desc: string
+ rating?: string
+ images: Image
+}
+
+interface Measure {
+ value: string
+ unit: string
+}
+
+interface AvailableQuantity {
+ count: number
+ measure: Measure
+}
+
+interface Quantity {
+ available: AvailableQuantity
+}
+
+interface Tag {
+ display: boolean
+ list: { value: string }[]
+}
+
+interface Item {
+ id: string
+ name: string
+ short_desc: string
+ long_desc: string
+ price: Price
+ quantity: Quantity
+ tags: Tag[]
+}
+
+interface Fulfillment {
+ rateable?: boolean
+ tracking?: boolean
+ id?: string
+ type?: string
+ rating?: string
+}
+
+interface QuoteBreakup {
+ title: string
+ price: Price
+ item: {
+ id: string
+ }
+}
+
+interface Quote {
+ price: Price
+ breakup: QuoteBreakup[]
+}
+
+interface State {
+ name: string
+}
+
+interface City {
+ name: string
+}
+
+interface Billing {
+ name: string
+ address: string
+ state: State
+ city: City
+ email: string
+ phone: string
+}
+
+interface CancellationFee {
+ amount: Price
+}
+
+interface CancellationTerms {
+ state: string
+ cancellation_fee: CancellationFee
+}
+
+interface Order {
+ type: string
+ provider: Provider
+ items: Item[]
+ fulfillments: Fulfillment[]
+ quote: Quote
+ billing: Billing
+ cancellation_terms: CancellationTerms[]
+}
+
+interface Message {
+ order: Order
+}
+
+export interface InitResponseItem {
+ context: Context
+ message: Message
+}
+
+export interface InitResponseModel {
+ data: InitResponseItem[]
+}
diff --git a/apps/dsep/lib/types/select.types.ts b/apps/dsep/lib/types/select.types.ts
new file mode 100644
index 000000000..5d476c8ca
--- /dev/null
+++ b/apps/dsep/lib/types/select.types.ts
@@ -0,0 +1,119 @@
+import { CurrencyType } from '@beckn-ui/becknified-components'
+
+interface Location {
+ city: {
+ name: string
+ code: string
+ }
+ country: {
+ name: string
+ code: string
+ }
+}
+
+interface Context {
+ domain: string
+ action: string
+ version: string
+ bpp_id: string
+ bpp_uri: string
+ country: string
+ city: string
+ location: Location
+ bap_id: string
+ bap_uri: string
+ transaction_id: string
+ message_id: string
+ ttl: string
+ timestamp: string
+}
+
+interface Price {
+ value: string
+ currency: CurrencyType
+}
+
+interface Image {
+ url: string
+ size_type?: string
+}
+
+interface Provider {
+ id: string
+ name: string
+ short_desc?: string
+ long_desc?: string
+ images?: Image
+}
+
+interface Quantity {
+ available: {
+ count: number
+ measure?: {
+ value: string
+ unit: string
+ }
+ }
+}
+
+interface Category {
+ id: string
+ name: string
+}
+
+interface Tag {
+ display: boolean
+ list: (null | string)[]
+ name?: string
+ value?: string
+}
+
+interface XInput {
+ url: string
+ mime_type: string
+ html: string
+}
+
+export interface Item {
+ id: string
+ xinput?: XInput
+ name: string
+ short_desc?: string
+ long_desc?: string
+ price: Price
+ quantity?: Quantity
+ categories?: Category[]
+ tags: Tag[]
+ rating?: string
+ rateable?: boolean
+ time?: {
+ label: string
+ duration: string
+ range: {
+ start: string
+ end: string
+ }
+ }
+}
+
+interface Order {
+ type: string
+ quote?: {
+ price: Price
+ }
+ provider: Provider
+ items: Item[]
+}
+
+interface Message {
+ order: Order
+}
+
+export interface SelectData {
+ context: Context
+ message: Message
+}
+
+export interface SelectResponseModel {
+ data: SelectData[]
+}
diff --git a/apps/dsep/locales/en.ts b/apps/dsep/locales/en.ts
index 1ca319776..45e536efc 100644
--- a/apps/dsep/locales/en.ts
+++ b/apps/dsep/locales/en.ts
@@ -289,7 +289,7 @@ const en: { [key: string]: string } = {
orderBtn: 'Order',
localStores: 'Local stores in',
cartLoader: 'Getting Quotes',
- initializingOrderLoader: 'Please wait while we set things up for you',
+ initializingOrderLoader: 'while we set things up for you',
confirmingOrderLoader: "We're preparing your course",
orderConfirm: 'Order Confirmed!',
confirmOrderMessage: 'Thank you! Our delivery agent will deliver your order',
@@ -329,8 +329,6 @@ const en: { [key: string]: string } = {
errorAddress: 'Address is required',
errorZipcode: 'Zip Code is required',
errorZipcode2: 'Invalid Zip Code',
- confirmMessage1: 'Get ready to embark your learning ',
- confirmMessage2: 'journey!',
sendOtpButton: 'Send OTP',
verifyMobile: 'Verify your Mobile Number',
otpMessage1: 'Have sent an OTP to your mobile',
@@ -342,7 +340,7 @@ const en: { [key: string]: string } = {
catalogLoader: 'Please Wait!',
catalogSubLoader: 'Fetching store catalog from the network',
coursesCatalogLoader: 'we are looking for courses related to your search',
- quoteRequestLoader: 'Please wait! Your order is getting processed',
+ quoteRequestLoader: 'Your order is getting processed',
estimatedDelivery: 'Estimated delivery time',
orderId: 'Order ID',
pending: 'Pending',
@@ -432,6 +430,8 @@ const en: { [key: string]: string } = {
searchCourses: 'Search Courses',
fetchingCourses: 'Fetching Courses',
fetchingJobs: 'Fetching Jobs',
- errorPassword: 'Invalid password'
+ errorPassword: 'Invalid password',
+ confirm: 'Confirm',
+ confirmMessageSubtext: 'Get ready to embark your learning journey!'
}
export default en
diff --git a/apps/dsep/package.json b/apps/dsep/package.json
index 70ad4ebb6..2c97ee445 100644
--- a/apps/dsep/package.json
+++ b/apps/dsep/package.json
@@ -59,6 +59,7 @@
"react-star-rating-component": "^1.4.1",
"react-toastify": "^9.0.7",
"react-transition-group": "^4.4.5",
+ "redux-persist": "^6.0.0",
"slick-carousel": "^1.8.1",
"stripe": "^9.1.0",
"url-loader": "^4.1.1"
diff --git a/apps/dsep/pages/_app.tsx b/apps/dsep/pages/_app.tsx
index d4f095961..af7ac0145 100644
--- a/apps/dsep/pages/_app.tsx
+++ b/apps/dsep/pages/_app.tsx
@@ -11,6 +11,7 @@ import { ChakraProvider } from '@chakra-ui/react'
import '../styles/globals.css'
import { Garuda } from 'garudaa'
+import { BecknProvider } from '@beckn-ui/molecules'
Garuda.init({
projectId: '656dad5ed5a5a7d831fc43ac',
@@ -28,11 +29,18 @@ Garuda.identify({
function MyApp({ Component, pageProps }: AppProps) {
return (
-
+
-
+
)
}
diff --git a/apps/dsep/pages/cart.tsx b/apps/dsep/pages/cart.tsx
index f80ba1e33..7ff47dbf2 100644
--- a/apps/dsep/pages/cart.tsx
+++ b/apps/dsep/pages/cart.tsx
@@ -5,22 +5,17 @@ import { useDispatch, useSelector } from 'react-redux'
import CartList from '../components/cart/CartList'
import OrderSummaryBox from '../components/cart/OrderSummaryBox'
import { useLanguage } from '../hooks/useLanguage'
-import Loader from '../components/loader/Loader'
import useRequest from '../hooks/useRequest'
-import {
- DataPerBpp,
- CartItemForRequest,
- ICartRootState,
- TransactionIdRootState,
- CartRetailItem
-} from '../lib/types/cart'
+import { ICartRootState } from '../lib/types/cart'
import { responseDataActions } from '../store/responseData-slice'
-import { getCartItemsPerBpp, getItemsForCart, getPayloadForQuoteRequest } from '../utilities/cart-utils'
+import { getItemsForCart, getPayloadForSelectRequest } from '../utilities/cart-utils'
import EmptyCart from '../components/cart/EmptyCart'
import { Box } from '@chakra-ui/react'
+import { Item, SelectResponseModel } from '../lib/types/select.types'
+import LoaderWithMessage from '@beckn-ui/molecules/src/components/LoaderWithMessage/loader-with-message'
const Cart = () => {
- const [itemsForCart, setItemsForCart] = useState(null)
+ const [itemsForCart, setItemsForCart] = useState(null)
const [isLoadingForCartCountChange, setIsLoadingForCartCountChange] = useState(false)
const quoteRequest = useRequest()
@@ -30,13 +25,12 @@ const Cart = () => {
const apiUrl = process.env.NEXT_PUBLIC_API_URL
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)
useEffect(() => {
if (localStorage && !localStorage.getItem('quoteResponse')) {
- quoteRequest.fetchData(`${apiUrl}/client/v2/get_quote`, 'POST', payLoadForQuoteRequest)
+ quoteRequest.fetchData(`${apiUrl}/select`, 'POST', payLoadForQuoteRequest)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [])
@@ -46,7 +40,9 @@ const Cart = () => {
dispatch(responseDataActions.addQuoteResponse(quoteRequest.data))
localStorage.setItem('quoteResponse', JSON.stringify(quoteRequest.data))
- const items = getItemsForCart(quoteRequest.data)
+ const selectResponse: SelectResponseModel = quoteRequest.data
+
+ const items = getItemsForCart(selectResponse.data)
setItemsForCart(items)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -57,7 +53,8 @@ const Cart = () => {
const cachedQuoteResults = localStorage.getItem('quoteResponse')
if (cachedQuoteResults) {
const parsedCachedResults = JSON.parse(cachedQuoteResults)
- setItemsForCart(parsedCachedResults)
+ const items = getItemsForCart(parsedCachedResults.data)
+ setItemsForCart(items)
}
}
}, [])
@@ -67,17 +64,28 @@ const Cart = () => {
}
if (quoteRequest.loading || isLoadingForCartCountChange) {
- return
+
+ )
+ }
+ if (!cartItems.length) {
+ return {
>
{/*
diff --git a/apps/dsep/pages/checkoutPage.tsx b/apps/dsep/pages/checkoutPage.tsx
index 02fa0a15e..6a5f66f1a 100644
--- a/apps/dsep/pages/checkoutPage.tsx
+++ b/apps/dsep/pages/checkoutPage.tsx
@@ -1,29 +1,28 @@
import React, { useEffect, useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
-import { Box, Flex, Text, Stack, Checkbox, Image } from '@chakra-ui/react'
-import DetailsCard from '../components/detailsCard/DetailsCard'
+import { Box, Flex, Text, Checkbox, Image } from '@chakra-ui/react'
+import { DetailCard } from '@beckn-ui/becknified-components'
import ItemDetails from '../components/detailsCard/ItemDetails'
-import ButtonComp from '../components/button/Button'
import { useLanguage } from '../hooks/useLanguage'
import ShippingOrBillingDetails from '../components/detailsCard/ShippingOrBillingDetails'
-import PaymentDetails from '../components/detailsCard/PaymentDetails'
import AddShippingButton from '../components/detailsCard/AddShippingButton'
import addShippingBtn from '../public/images/offer.svg'
-import { CartItemForRequest, DataPerBpp, ICartRootState, TransactionIdRootState } from '../lib/types/cart'
-import { getCartItemsPerBpp } from '../utilities/cart-utils'
+import { ICartRootState } from '../lib/types/cart'
import useRequest from '../hooks/useRequest'
import { responseDataActions } from '../store/responseData-slice'
-import {
- areShippingAndBillingDetailsSame,
- getPayloadForInitRequest,
- getSubTotalAndDeliveryCharges,
- getTotalCartItems
-} from '../utilities/checkout-utils'
-import Loader from '../components/loader/Loader'
-import AddBillingButton from '../components/detailsCard/AddBillingButton'
+import { areShippingAndBillingDetailsSame, getPaymentBreakDown, handleFormSubmit } from '../utilities/checkout-utils'
+
import { useRouter } from 'next/router'
import Cookies from 'js-cookie'
import axios from 'axios'
+import ShippingSection from '@beckn-ui/becknified-components/src/components/checkout/shipping-section'
+import addBillingButton from '../public/images/addShippingBtn.svg'
+import { SelectResponseModel } from '../lib/types/select.types'
+import { Typography } from '@beckn-ui/molecules'
+import { InitResponseModel } from '../lib/types/init.types'
+import LoaderWithMessage from '@beckn-ui/molecules/src/components/LoaderWithMessage/loader-with-message'
+import PaymentDetails from '@beckn-ui/becknified-components/src/components/checkout/payment-details'
+import BecknButton from '@beckn-ui/molecules/src/components/button/Button'
export type ShippingFormData = {
name: string
@@ -41,25 +40,18 @@ const CheckoutPage = () => {
address: '151-E, Janpath Road, New Delhi',
pinCode: '201016'
})
-
- const [isBillingAddressSameAsShippingAddress, setIsBillingAddressSameAsShippingAddress] = useState(true)
-
- const [billingFormData, setBillingFormData] = useState({
- name: '',
- mobileNumber: '',
- email: '',
- address: '',
- pinCode: ''
- })
+ // TODO :- check for refactoring and some issue fix in this component
+ const [isLoadingForInit, setIsLoadingForInit] = useState(false)
+ const [isError, setIsError] = useState(false)
+ const [initData, setInitData] = useState(null)
+ const [selectResponse, setSelectResponse] = useState(null)
const router = useRouter()
- const initRequest = useRequest()
const dispatch = useDispatch()
const { t, locale } = useLanguage()
const apiUrl = process.env.NEXT_PUBLIC_API_URL
const strapiUrl = process.env.NEXT_PUBLIC_STRAPI_URL
const cartItems = useSelector((state: ICartRootState) => state.cart.items)
- const transactionId = useSelector((state: { transactionId: TransactionIdRootState }) => state.transactionId)
const totalAmount = useSelector((state: ICartRootState) => state.cart.totalAmount)
const scholarshipId = useSelector((state: any) => state.scholarshipCart.scholarshipId)
@@ -73,6 +65,19 @@ const CheckoutPage = () => {
}
}
+ useEffect(() => {
+ if (localStorage && localStorage.getItem('initResult')) {
+ setInitData(JSON.parse(localStorage.getItem('initResult') as string))
+ }
+ }, [])
+
+ useEffect(() => {
+ if (localStorage && localStorage.getItem('quoteResponse')) {
+ const parsedSelectResponse: SelectResponseModel = JSON.parse(localStorage.getItem('quoteResponse') as string)
+ setSelectResponse(parsedSelectResponse)
+ }
+ }, [])
+
useEffect(() => {
const email = Cookies.get('userEmail') as string
axios
@@ -82,29 +87,31 @@ const CheckoutPage = () => {
const documents = profileResponse.data.attributes.documents.data
const profileData = profileResponse.data.attributes
- const { name, phone, address, zip_code } = profileData
- setFormData({
- address: address ? address : '',
- email,
- mobileNumber: phone,
- pinCode: zip_code ? zip_code : '',
- name
+ const { phone } = profileData
+ setFormData(prevData => {
+ return {
+ ...prevData,
+ email,
+ mobileNumber: phone
+ }
})
})
- .catch(e => console.error(e))
+ .catch(e => {
+ console.error(e)
+ })
}, [])
useEffect(() => {
if (localStorage) {
if (localStorage.getItem('userPhone')) {
- const copiedFormData = structuredClone(formData)
- const copiedBillingFormData = structuredClone(billingFormData)
+ const userPhone = localStorage.getItem('userPhone') as string
+ setFormData(prevData => {
+ return {
+ ...prevData,
- copiedFormData.mobileNumber = localStorage.getItem('userPhone') as string
- copiedBillingFormData.mobileNumber = localStorage.getItem('userPhone') as string
-
- setFormData(copiedFormData)
- setBillingFormData(copiedBillingFormData)
+ mobileNumber: userPhone
+ }
+ })
}
}
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -115,23 +122,9 @@ const CheckoutPage = () => {
if (localStorage.getItem('shippingAdress')) {
setFormData(JSON.parse(localStorage.getItem('shippingAdress') as string))
}
- if (localStorage.getItem('billingAddress')) {
- setBillingFormData(JSON.parse(localStorage.getItem('billingAddress') as string))
- }
}
}, [])
- useEffect(() => {
- if (initRequest.data) {
- if (typeof window !== 'undefined') {
- localStorage.setItem('initResult', JSON.stringify(initRequest.data))
- }
-
- dispatch(responseDataActions.addInitResponse(initRequest.data))
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [initRequest.data])
-
useEffect(() => {
const shippingAddressComplete = Object.values(formData).every(value => value.length > 0)
if (shippingAddressComplete && typeof window !== 'undefined') {
@@ -139,51 +132,28 @@ const CheckoutPage = () => {
}
}, [formData])
- useEffect(() => {
- const isBillingAddressComplete = Object.values(billingFormData).every(value => value.length > 0)
-
- if (isBillingAddressComplete && typeof window !== 'undefined') {
- localStorage.setItem('billingAddress', JSON.stringify(billingFormData))
- }
- setIsBillingAddressSameAsShippingAddress(
- areShippingAndBillingDetailsSame(isBillingAddressComplete, formData, billingFormData)
- )
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [billingFormData])
-
- const formSubmitHandler = () => {
- if (formData) {
- // TODO :_ To check this again
-
- // if (isBillingAddressSameAsShippingAddress) {
- // const copiedFormData = structuredClone(formData);
- // setBillingFormData(copiedFormData);
- // }
-
- const cartItemsPerBppPerProvider: DataPerBpp = getCartItemsPerBpp(cartItems as CartItemForRequest[])
-
- const payLoadForInitRequest = getPayloadForInitRequest(
- cartItemsPerBppPerProvider,
- transactionId,
- formData,
- billingFormData
- )
- initRequest.fetchData(`${apiUrl}/client/v2/initialize_order`, 'POST', payLoadForInitRequest)
- }
+ if (!selectResponse) {
+ return <>
}
- if (initRequest.loading) {
- return
+
+ )
}
- const isInitResultPresent = () => {
- if (typeof window !== 'undefined') {
- if (localStorage.getItem('initResult')) {
- return true
- }
- }
-
- return !!initRequest.data
+ if (isError) {
+ // TODO :- render toast on the error
+ return <>
}
return (
@@ -196,70 +166,59 @@ const CheckoutPage = () => {
{/* start Item Details */}
- {t.overview}
+
-
+
{cartItems.map(item => {
return (
<>
+
- {/* end item details */}
- {/* start shipping detals */}
- {!isInitResultPresent() ? (
-
-
- {t.billing}
-
-
-
-
- ) : (
-
-
- {t.billing}
-
-
-
- )}
- {/* end shipping detals */}
+ {
+ setFormData({ ...(formData as ShippingFormData) })
+ return handleFormSubmit(
+ formData as ShippingFormData,
+ selectResponse,
+ setInitData,
+ setIsLoadingForInit,
+ setIsError,
+ apiUrl as string
+ )
+ },
+ submitButton: { text: 'Save Billing Details' },
+ values: formData,
+ onChange: data => () => {
+ console.log('data in the change', data)
+ }
+ }}
+ />
{scholarshipTitle.length !== 0 && (
{
{t.scholarship}
-
+
{
{t.scholarshipApplied}
-
+
)}
{/* start payment details */}
- {initRequest.data && (
+ {!!initData && (
{
>
{t.paymentText}
-
-
+
+ {initData.data.map((data, idx) => {
+ return (
+
)}
- {/* end payment details */}
-
- {!isInitResultPresent() ? (
-
- {}}
- isDisabled={true}
- />
-
- ) : (
- router.push('/paymentMode')}
- isDisabled={false}
+
+ router.push('/orderConfirmation')}
/>
- )}
+
)
}
diff --git a/apps/dsep/pages/orderConfirmation.tsx b/apps/dsep/pages/orderConfirmation.tsx
index 259fdff70..b28779d5b 100644
--- a/apps/dsep/pages/orderConfirmation.tsx
+++ b/apps/dsep/pages/orderConfirmation.tsx
@@ -1,186 +1,168 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
import { useRouter } from 'next/router'
-import { Box, HStack, Image, Stack, Text, VStack } from '@chakra-ui/react'
import axios from 'axios'
import Cookies from 'js-cookie'
-import { useSelector } from 'react-redux'
+import { Box } from '@chakra-ui/react'
+import { ConfirmationPage } from '@beckn-ui/becknified-components'
+import { LoaderWithMessage } from '@beckn-ui/molecules'
+
import { useLanguage } from '../hooks/useLanguage'
+import orderConfirmmark from '../public/images/orderConfirmmark.svg'
import useRequest from '../hooks/useRequest'
-import { getInitMetaDataPerBpp, getPayloadForConfirmRequest } from '../utilities/confirm-utils'
-import Loader from '../components/loader/Loader'
-import { TransactionIdRootState } from '../lib/types/cart'
-import Button from '../components/button/Button'
-import ConfirmOrder from '../components/confirmOrder/ConfirmOrder'
+import { getPayloadForConfirmRequest } from '../utilities/confirm-utils'
+
+import { InitResponseModel } from '../lib/types/init.types'
+
+import { ConfirmResponseModel } from '../lib/types/confirm.types'
const OrderConfirmation = () => {
const { t } = useLanguage()
const confirmRequest = useRequest()
const router = useRouter()
- const initResponse = useSelector((state: any) => state.initResponse.initResponse)
- const transactionId = useSelector((state: { transactionId: TransactionIdRootState }) => state.transactionId)
+ const [isLoading, setIsLoading] = useState(true)
+ const [confirmResponse, setConfirmResponse] = useState(null)
+ const [isError, setIsError] = useState(false)
const apiUrl = process.env.NEXT_PUBLIC_API_URL
const strapiUrl = process.env.NEXT_PUBLIC_STRAPI_URL
useEffect(() => {
- if (initResponse) {
- const initMetaDataPerBpp = getInitMetaDataPerBpp(initResponse)
-
- const payLoadForConfirmRequest = getPayloadForConfirmRequest(
- initMetaDataPerBpp,
- transactionId,
- localStorage.getItem('userPhone') as string
- )
- confirmRequest.fetchData(`${apiUrl}/client/v2/confirm`, 'POST', payLoadForConfirmRequest)
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [])
-
- useEffect(() => {
- if (!initResponse && localStorage && localStorage.getItem('initResult')) {
- const parsedInitResult = JSON.parse(localStorage.getItem('initResult') as string)
- const initMetaDataPerBpp = getInitMetaDataPerBpp(parsedInitResult)
+ if (localStorage && localStorage.getItem('initResult')) {
+ const parsedInitResult: InitResponseModel = JSON.parse(localStorage.getItem('initResult') as string)
+ const payLoad = getPayloadForConfirmRequest(parsedInitResult)
+ setIsLoading(true)
+ axios
+ .post(`${apiUrl}/confirm`, payLoad)
+ .then(res => {
+ const data = res.data
+ setConfirmResponse(data)
+ localStorage.setItem('confirmResponse', JSON.stringify(data))
- const payLoadForConfirmRequest = getPayloadForConfirmRequest(
- initMetaDataPerBpp,
- transactionId,
- localStorage.getItem('userPhone') as string
- )
- confirmRequest.fetchData(`${apiUrl}/client/v2/confirm`, 'POST', payLoadForConfirmRequest)
+ setIsLoading(false)
+ })
+ .catch(err => {
+ setIsError(true)
+ setIsLoading(false)
+ console.error(err)
+ })
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [])
- useEffect(() => {
- if (confirmRequest.data) {
- const bearerToken = Cookies.get('authToken')
- const context = confirmRequest.data[0].message.responses[0].context
- const order = confirmRequest.data[0].message.responses[0].message.order
+ // TODO :- To enable this code for strapi order history call when the issue is fixed in the confirm response
+ // useEffect(() => {
+ // if (confirmResponse) {
+ // const bearerToken = Cookies.get('authToken')
+ // const context = confirmResponse.data[0].context
+ // const order = confirmResponse.data[0].message
- const orderPayLoad = {
- context: context,
- message: {
- order: {
- id: order.id,
- provider: {
- id: order.provider.id,
- descriptor: order.provider.descriptor
- },
- items: [
- {
- id: order.items[0].id,
- descriptor: order.items[0].descriptor,
- price: {
- value: order.items[0].price.value,
- currency: order.items[0].price.currency
- },
- tags: order.items[0].tags
- }
- ],
- fulfillments: [order.fulfillment],
- billing: {
- name: order.billing.name,
- address: order.billing.address.door,
- email: order.billing.email,
- phone: order.billing.phone
- },
- quote: {
- price: order.quote.price,
- breakup: order.quote.breakup
- },
- payments: [
- {
- type: order.payment.type,
- status: order.payment.status,
- params: {
- amount: order.payment.params.amount,
- currency: order.payment.params.currency
- }
- }
- ]
- }
- },
- category: {
- set: [1]
- }
- }
+ // const orderPayLoad = {
+ // context: context,
+ // message: {
+ // order: {
+ // id: order.orderId,
+ // provider: {
+ // id: order.provider.id,
+ // descriptor: order.provider.name
+ // },
+ // items: [
+ // {
+ // id: order.items[0].id,
+ // descriptor: order.items[0].descriptor,
+ // price: {
+ // value: order.items[0].price.value,
+ // currency: order.items[0].price.currency
+ // },
+ // tags: order.items[0].tags
+ // }
+ // ],
+ // fulfillments: [order.fulfillment],
+ // billing: {
+ // name: order.billing.name,
+ // address: order.billing.address.door,
+ // email: order.billing.email,
+ // phone: order.billing.phone
+ // },
+ // quote: {
+ // price: order.quote.price,
+ // breakup: order.quote.breakup
+ // },
+ // payments: [
+ // {
+ // type: order.payment.type,
+ // status: order.payment.status,
+ // params: {
+ // amount: order.payment.params.amount,
+ // currency: order.payment.params.currency
+ // }
+ // }
+ // ]
+ // }
+ // },
+ // category: {
+ // set: [1]
+ // }
+ // }
- const axiosConfig = {
- headers: {
- Authorization: `Bearer ${bearerToken}`,
- 'Content-Type': 'application/json' // You can set the content type as needed
- }
- }
- axios
- .post(`${strapiUrl}/orders`, orderPayLoad, axiosConfig)
- .then(res => {})
- .catch(err => console.error(err))
- }
- }, [confirmRequest.data])
+ // const axiosConfig = {
+ // headers: {
+ // Authorization: `Bearer ${bearerToken}`,
+ // 'Content-Type': 'application/json' // You can set the content type as needed
+ // }
+ // }
+ // axios
+ // .post(`${strapiUrl}/orders`, orderPayLoad, axiosConfig)
+ // .then(res => {})
+ // .catch(err => console.error(err))
+ // }
+ // }, [confirmRequest.data])
- if (confirmRequest.loading) {
+ if (isLoading) {
return (
-
+
)
}
- const handleViewCource = () => {
- if (confirmRequest.data) {
- localStorage.setItem('confirmData', JSON.stringify(confirmRequest.data))
- router.push('/orderDetails')
- }
- }
- const learningHistoryHandler = (): void => {
- router.push('/myLearningOrderHistory')
+ if (isError) {
+ return <>
}
return (
-
-
-
- {t.orderPlaced}
-
-
-
- {t.confirmMessage1}
- {t.confirmMessage2} -
-
-
- }
- />
-
-
-
-
-
+ {
+ router.push('/orderDetails')
+ },
+ disabled: false,
+ variant: 'solid',
+ colorScheme: 'primary'
+ },
+ {
+ text: t.myLearnings,
+ handleClick: () => {
+ router.push('/myLearningOrderHistor')
+ },
+ disabled: false,
+ variant: 'outline',
+ colorScheme: 'primary'
+ }
+ ]
+ }}
+ />
)
}
diff --git a/apps/dsep/pages/product.tsx b/apps/dsep/pages/product.tsx
index 420377c1c..158751cc4 100644
--- a/apps/dsep/pages/product.tsx
+++ b/apps/dsep/pages/product.tsx
@@ -1,18 +1,18 @@
import Router from 'next/router'
import React, { useEffect, useState } from 'react'
import ProductDetails from '../components/productDetails'
-import { RetailItem } from '../lib/types/products'
+import { ParsedItemModel } from '../types/search.types'
import { fromBinary } from '../utilities/common-utils'
const Product = () => {
- const [product, setProduct] = useState(null)
+ const [product, setProduct] = useState(null)
+ const { productDetails } = Router.query
useEffect(() => {
- const { productDetails } = Router.query
if (productDetails) {
setProduct(JSON.parse(fromBinary(window.atob(productDetails as string))))
}
- }, [])
+ }, [productDetails])
if (!product) {
return <>
diff --git a/apps/dsep/pages/search.tsx b/apps/dsep/pages/search.tsx
index 547485d14..19efac726 100644
--- a/apps/dsep/pages/search.tsx
+++ b/apps/dsep/pages/search.tsx
@@ -1,6 +1,8 @@
import React, { useEffect, useState } from 'react'
import { useDispatch } from 'react-redux'
import { Box } from '@chakra-ui/react'
+import { LoaderWithMessage } from '@beckn-ui/molecules'
+import { ProductCard, Sort } from '@beckn-ui/becknified-components'
import SearchBar from '../components/header/SearchBar'
import ProductList from '../components/productList/ProductList'
import useRequest from '../hooks/useRequest'
@@ -9,51 +11,27 @@ import { RetailItem } from '../lib/types/products'
import Loader from '../components/loader/Loader'
import { useLanguage } from '../hooks/useLanguage'
import { useRouter } from 'next/router'
+import { getParsedSearchlist } from '../utilities/search-utils'
+import { ParsedItemModel, SearchResponseModel } from '../types/search.types'
+import CustomToast from '../components/customToast/custom-toast'
+import ProductCardRenderer from '../components/productCard/product-card-renderer'
//Mock data for testing search API. Will remove after the resolution of CORS issue
const Search = () => {
- const [items, setItems] = useState([])
+ const [items, setItems] = useState([])
const router = useRouter()
const [searchKeyword, setSearchKeyword] = useState(router.query?.searchTerm || '')
const dispatch = useDispatch()
- const [providerId, setProviderId] = useState('')
const { t, locale } = useLanguage()
- const [tagValue, setTagValue] = useState('')
const apiUrl = process.env.NEXT_PUBLIC_API_URL
const { data, loading, error, fetchData } = useRequest()
- const categoryMap = {
- Books: { en: 'BookEnglish', fa: 'BookFrench' },
- restaurant: { en: 'FoodEnglish', fa: 'FoodFrench' }
- }
-
- useEffect(() => {
- if (!!searchKeyword) {
- localStorage.removeItem('searchItems')
- localStorage.setItem('optionTags', JSON.stringify({ name: searchKeyword }))
- window.dispatchEvent(new Event('storage-optiontags'))
- fetchDataForSearch()
- }
- if (localStorage) {
- const stringifiedOptiontags = localStorage.getItem('optionTags')
- const stringifiedSelectedOption = localStorage.getItem('selectedOption')
- if (stringifiedOptiontags) {
- const providerId = JSON.parse(stringifiedOptiontags).providerId
- setProviderId(providerId)
- }
- if (stringifiedSelectedOption) {
- setTagValue(JSON.parse(stringifiedSelectedOption).tagValue)
- }
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [searchKeyword])
-
const searchPayload = {
context: {
- domain: 'retail'
+ domain: 'dsep:courses'
},
message: {
criteria: {
@@ -64,16 +42,14 @@ const Search = () => {
}
}
- const fetchDataForSearch = () => fetchData(`${apiUrl}/client/v2/search`, 'POST', searchPayload)
+ const fetchDataForSearch = () => fetchData(`${apiUrl}/search`, 'POST', searchPayload)
useEffect(() => {
if (localStorage && !localStorage.getItem('searchItems')) {
- if (providerId) {
- fetchData(`${apiUrl}/client/v2/search`, 'POST', searchPayload)
- }
+ fetchData(`${apiUrl}/search`, 'POST', searchPayload)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [providerId])
+ }, [])
useEffect(() => {
if (localStorage) {
@@ -84,37 +60,21 @@ const Search = () => {
}
}
}, [])
- console.log(items)
useEffect(() => {
if (data) {
- dispatch(responseDataActions.addTransactionId(data.context.transaction_id))
- const allItems = data.message.catalogs.flatMap((catalog: any) => {
- if (catalog.message && catalog.message.catalog && catalog.message.catalog['bpp/providers'].length > 0) {
- const providers = catalog.message.catalog['bpp/providers']
- return providers.flatMap((provider: any) => {
- if (provider.items && provider.items.length > 0) {
- return provider.items.map((item: RetailItem) => {
- return {
- bpp_id: catalog.context.bpp_id,
- bpp_uri: catalog.context.bpp_uri,
- ...item,
- providerId: provider.id,
- locations: provider.locations,
- bppName: catalog.message.catalog['bpp/descriptor'].name
- }
- })
- }
- return []
- })
- }
- return []
- })
- localStorage.setItem('searchItems', JSON.stringify(allItems))
- setItems(allItems)
+ const parsedItems = getParsedSearchlist(data.data as SearchResponseModel[])
+ dispatch(responseDataActions.addTransactionId(data.data[0].context.transaction_id))
+
+ localStorage.setItem('searchItems', JSON.stringify(parsedItems))
+ setItems(parsedItems)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [data])
+ if (error) {
+ return <>
+ }
+
return (
<>
{
}}
/>
-
+
+ ) : (
+
-
-
-
-
-
diff --git a/apps/dsep/public/images/HomePageLogo.svg b/apps/dsep/public/images/HomePageLogo.svg
deleted file mode 100644
index cd1b1f604..000000000
--- a/apps/dsep/public/images/HomePageLogo.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
diff --git a/apps/dsep/public/images/SkillUpLogo.svg b/apps/dsep/public/images/SkillUpLogo.svg
deleted file mode 100644
index 5010029b7..000000000
--- a/apps/dsep/public/images/SkillUpLogo.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/apps/dsep/public/images/skillUpHomeLogo.svg b/apps/dsep/public/images/skillUpHomeLogo.svg
new file mode 100644
index 000000000..277f2b4c0
--- /dev/null
+++ b/apps/dsep/public/images/skillUpHomeLogo.svg
@@ -0,0 +1,17 @@
+
diff --git a/apps/dsep/store/cart-slice.ts b/apps/dsep/store/cart-slice.ts
index 24084e40c..ec874f258 100644
--- a/apps/dsep/store/cart-slice.ts
+++ b/apps/dsep/store/cart-slice.ts
@@ -1,6 +1,7 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit'
import { ICart } from '../lib/types/cart'
import { RetailItem } from '../lib/types/products'
+import { ParsedItemModel } from '../types/search.types'
import { calculateDiscountPercentage } from '../utilities/calculateDiscountPercentage'
const initialState: ICart = {
@@ -16,20 +17,21 @@ const cartSlice = createSlice({
addItemToCart(
state: ICart,
action: PayloadAction<{
- product: RetailItem
+ product: ParsedItemModel
quantity: number
}>
) {
const newItem = action.payload.product
- const existingItem = state.items.find(item => item.id === newItem.id)
+ const existingItem = state.items.find(item => item.item.id === newItem.item.id)
state.totalQuantity = state.totalQuantity + action.payload.quantity
- state.totalAmount = state.totalAmount + action.payload.quantity * parseFloat(action.payload.product.price.value)
+ state.totalAmount =
+ state.totalAmount + action.payload.quantity * parseFloat(action.payload.product.item.price.value)
if (!existingItem) {
- const totalPrice = parseFloat(newItem.price.value) * action.payload.quantity
+ const totalPrice = parseFloat(newItem.item.price.value) * action.payload.quantity
state.items.push({
...newItem,
@@ -38,7 +40,8 @@ const cartSlice = createSlice({
})
} else {
const totalPrice =
- parseFloat(existingItem.price.value) + parseFloat(existingItem.price.value) * action.payload.quantity
+ parseFloat(existingItem.item.price.value) +
+ parseFloat(existingItem.item.price.value) * action.payload.quantity
existingItem.quantity += action.payload.quantity
existingItem.totalPrice = totalPrice
@@ -50,17 +53,17 @@ const cartSlice = createSlice({
action: PayloadAction //slug.current as payload
) {
const productSlug = action.payload
- const existingItem = state.items.find(item => item.id === productSlug)
+ const existingItem = state.items.find(item => item.item.id === productSlug)
state.totalQuantity--
- state.totalAmount = state.totalAmount - parseFloat(existingItem?.price.value!)
+ state.totalAmount = state.totalAmount - parseFloat(existingItem?.item.price.value!)
if (existingItem?.quantity === 1) {
- state.items = state.items.filter(item => item.id !== productSlug)
+ state.items = state.items.filter(item => item.item.id !== productSlug)
} else {
existingItem!.quantity--
- existingItem!.totalPrice = existingItem!.totalPrice - parseFloat(existingItem?.price.value!)
+ existingItem!.totalPrice = existingItem!.totalPrice - parseFloat(existingItem?.item.price.value!)
}
},
diff --git a/apps/dsep/store/index.ts b/apps/dsep/store/index.ts
index e1d284a7e..a8c7ff0d2 100644
--- a/apps/dsep/store/index.ts
+++ b/apps/dsep/store/index.ts
@@ -1,4 +1,5 @@
-import { configureStore } from '@reduxjs/toolkit'
+import { combineReducers, configureStore } from '@reduxjs/toolkit'
+import { persistStore, persistReducer } from 'redux-persist'
import specialOfferProductsReducer from './specialOfferProducts-slice'
import newestProductReducer from './newestProduct-slice'
import SortedProductsListReducer from './sortedProductList-slice'
@@ -7,35 +8,43 @@ import cartSliceReducer from './cart-slice'
import userInfoReducer from './user-slice'
import sideNavBarReducer from './sideNavBar-slice'
import megaMenuReducer from './megaMenu-slice'
-import activeMenuItemReducer from './activeMenuItem-slice'
import settingBoxReducer from './settingBox-slice'
import scholarshipCartReducer from './scholarshipCart-slice'
import favoriteReducer from './favorite-slice'
import responseDataReducer from './responseData-slice'
+import storage from './storage'
-const store = configureStore({
- reducer: {
- specialOfferProductsList: specialOfferProductsReducer,
- newestProductsList: newestProductReducer,
- sortedProductsList: SortedProductsListReducer,
- cartUi: cartUiReducer,
- cart: cartSliceReducer,
- userInfo: userInfoReducer,
- sideNavBar: sideNavBarReducer,
- megaMenu: megaMenuReducer,
- activeMenuItem: activeMenuItemReducer,
- settingBox: settingBoxReducer,
- favorite: favoriteReducer,
- transactionId: responseDataReducer,
- quoteResponse: responseDataReducer,
- customerDetails: responseDataReducer,
- initResponse: responseDataReducer,
- scholarshipCart: scholarshipCartReducer
- },
+const persistConfig = {
+ key: 'root',
+ storage
+}
+
+const rootReducer = combineReducers({
+ specialOfferProductsList: specialOfferProductsReducer,
+ newestProductsList: newestProductReducer,
+ sortedProductsList: SortedProductsListReducer,
+ cartUi: cartUiReducer,
+ cart: cartSliceReducer,
+ userInfo: userInfoReducer,
+ sideNavBar: sideNavBarReducer,
+ megaMenu: megaMenuReducer,
+ settingBox: settingBoxReducer,
+ favorite: favoriteReducer,
+ transactionId: responseDataReducer,
+ quoteResponse: responseDataReducer,
+ customerDetails: responseDataReducer,
+ initResponse: responseDataReducer,
+ scholarshipCart: scholarshipCartReducer
+})
+
+const persistedReducer = persistReducer(persistConfig, rootReducer)
+
+export const store = configureStore({
+ reducer: persistedReducer,
middleware: getDefaultMiddleware =>
getDefaultMiddleware({
serializableCheck: false
})
})
-export default store
+export const persistor = persistStore(store)
diff --git a/apps/dsep/store/storage.ts b/apps/dsep/store/storage.ts
new file mode 100644
index 000000000..3a285bbe4
--- /dev/null
+++ b/apps/dsep/store/storage.ts
@@ -0,0 +1,19 @@
+import createWebStorage from 'redux-persist/lib/storage/createWebStorage'
+
+const createNoopStorage = () => {
+ return {
+ getItem(_key: any) {
+ return Promise.resolve(null)
+ },
+ setItem(_key: any, value: any) {
+ return Promise.resolve(value)
+ },
+ removeItem(_key: any) {
+ return Promise.resolve()
+ }
+ }
+}
+
+const storage = typeof window !== 'undefined' ? createWebStorage('local') : createNoopStorage()
+
+export default storage
diff --git a/apps/dsep/styles/globals.css b/apps/dsep/styles/globals.css
index 2ada04283..653214042 100644
--- a/apps/dsep/styles/globals.css
+++ b/apps/dsep/styles/globals.css
@@ -59,6 +59,10 @@ body {
color: rgb(var(--color-text-base));
}
+main {
+ background: #fbfcff;
+}
+
ul {
list-style: unset !important;
}
diff --git a/apps/dsep/types/common.types.ts b/apps/dsep/types/common.types.ts
new file mode 100644
index 000000000..0ca15a543
--- /dev/null
+++ b/apps/dsep/types/common.types.ts
@@ -0,0 +1,4 @@
+export interface Coordinate {
+ latitude: number
+ longitude: number
+}
diff --git a/apps/dsep/types/search.types.ts b/apps/dsep/types/search.types.ts
new file mode 100644
index 000000000..f5e748a42
--- /dev/null
+++ b/apps/dsep/types/search.types.ts
@@ -0,0 +1,112 @@
+import { CurrencyType } from '@beckn-ui/becknified-components'
+
+interface Location {
+ id: string
+ city: {
+ code: string
+ name: string
+ }
+ gps: string
+}
+
+interface Price {
+ value: string
+ currency: CurrencyType
+}
+
+interface Tag {
+ code: string
+ name: string
+ display: boolean
+ list?: Array<{
+ name: string
+ value: string
+ }>
+}
+
+interface Fulfillment {
+ id: string
+ type: string
+ tracking: boolean
+ tags: Tag[]
+}
+
+interface Image {
+ url: string
+ size_type: string
+}
+
+interface Item {
+ long_desc: string
+ short_desc: string
+ id: string
+ name: string
+ price: Price
+ locations: Location[]
+ fulfillments: Fulfillment[]
+ images: Image[]
+ tags: Tag[]
+ rating: string
+}
+
+interface LocationProvider {
+ id: string
+ name: string
+ rating: string
+ locations: Location[]
+ items: Item[]
+ images: Image[]
+}
+
+interface Message {
+ name: string
+ providers: LocationProvider[]
+}
+
+interface Context {
+ domain: string
+ action: string
+ version: string
+ bpp_id: string
+ bpp_uri: string
+ country: string
+ city: string
+ location: {
+ country: {
+ code: string
+ }
+ }
+ bap_id: string
+ bap_uri: string
+ transaction_id: string
+ message_id: string
+ ttl: string
+ timestamp: string
+}
+
+export interface SearchResponseModel {
+ context: Context
+ message: Message
+}
+
+export interface ParsedItemModel {
+ bppId: string
+ bppUri: string
+ domain: string
+ transactionId: string
+ providerId: string
+ providerName: string
+ item: Item
+ rating: string
+ // providerCoordinates: Coordinate
+}
+
+export interface AssemblyData {
+ type: string
+ colour: string
+ shape: string
+ length: string
+ width: string
+ quantity?: number
+ weight: string
+}
diff --git a/apps/dsep/utilities/cart-utils.ts b/apps/dsep/utilities/cart-utils.ts
index a5b3b5656..f8e506710 100644
--- a/apps/dsep/utilities/cart-utils.ts
+++ b/apps/dsep/utilities/cart-utils.ts
@@ -1,8 +1,9 @@
-import { CartItemForRequest, CartRetailItem, DataPerBpp } from '../lib/types/cart'
-import { ResponseModel } from '../lib/types/responseModel'
+import { CartItemForRequest, CartRetailItem } from '../lib/types/cart'
+import { Item, SelectData } from '../lib/types/select.types'
+import { ParsedItemModel } from '../types/search.types'
export const getCartItemsPerBpp = (cart: CartItemForRequest[]) => {
- const itemsPerBpp = {}
+ const itemsPerBpp: Record = {}
cart.map((item: CartItemForRequest) => {
const bppId = item.bpp_id
@@ -17,59 +18,75 @@ export const getCartItemsPerBpp = (cart: CartItemForRequest[]) => {
return itemsPerBpp
}
-export const getPayloadForQuoteRequest = (
- cartItemsPerBppPerProvider: DataPerBpp,
- transactionId: { transactionId: string }
-) => {
- const payload: any = {
- selectRequestDto: []
- }
-
- Object.keys(cartItemsPerBppPerProvider).forEach(bppId => {
- const cartItem: any = {
- context: {
- transaction_id: transactionId.transactionId,
- bpp_id: bppId,
- bpp_uri: cartItemsPerBppPerProvider[bppId][0].bpp_uri,
- domain: 'retail'
- },
- message: {
- order: {
- items: [],
- provider: {
- id: cartItemsPerBppPerProvider[bppId][0].providerId
- },
- locations: cartItemsPerBppPerProvider[bppId][0].locations
- }
- }
- }
- cartItemsPerBppPerProvider[bppId].forEach((item: any) => {
- if (item.bpp_id === bppId) {
- const itemObject = {
- quantity: {
- count: item.quantity
- },
- id: item.id
- }
- cartItem.message.order.items.push(itemObject)
- }
- })
-
- payload.selectRequestDto.push(cartItem)
- })
- return payload
-}
-
-export const getItemsForCart = (quoteData: ResponseModel[]) => {
- const items: CartRetailItem[] = []
+export const getItemsForCart = (quoteData: SelectData[]) => {
+ const items: Item[] = []
quoteData.forEach(data => {
- const { catalogs } = data.message
- const { order } = catalogs
+ const { order } = data.message
const { items: orderItems } = order
+ // const { items: orderItems } = order
items.push(...orderItems)
})
return items
}
+
+export const getPayloadForSelectRequest = (cartItems: CartRetailItem[]) => {
+ const payload: any = { data: [] }
+
+ // Group cart items by bppId
+ const groupedByBppId: Record = cartItems.reduce(
+ (acc: Record, item) => {
+ if (!acc[item.bppId]) {
+ acc[item.bppId] = []
+ }
+ acc[item.bppId].push(item)
+ return acc
+ },
+ {}
+ )
+
+ Object.entries(groupedByBppId).forEach(([bppId, items]) => {
+ const context = {
+ transaction_id: items[0].transactionId,
+ bpp_id: bppId,
+ bpp_uri: items[0].bppUri,
+ domain: items[0].domain
+ }
+
+ // Group items by providerName within each bppId
+ const groupedByProvider: Record = items.reduce(
+ (acc: Record, item) => {
+ if (!acc[item.providerName]) {
+ acc[item.providerName] = []
+ }
+ acc[item.providerName].push(item)
+ return acc
+ },
+ {}
+ )
+
+ const message = {
+ orders: Object.entries(groupedByProvider).map(([providerName, providerItems]) => {
+ const provider = { id: providerItems[0].providerId }
+ const items = providerItems.map(item => ({
+ id: item.item.id,
+ tags: [
+ {
+ descriptor: {
+ name: `select-${item.item.id}`
+ }
+ }
+ ]
+ }))
+
+ return { provider, items }
+ })
+ }
+
+ payload.data.push({ context, message })
+ })
+
+ return payload
+}
diff --git a/apps/dsep/utilities/checkout-utils.ts b/apps/dsep/utilities/checkout-utils.ts
index f40f534dc..d5fa67e42 100644
--- a/apps/dsep/utilities/checkout-utils.ts
+++ b/apps/dsep/utilities/checkout-utils.ts
@@ -1,97 +1,12 @@
+import axios from 'axios'
import { CartRetailItem, DataPerBpp } from '../lib/types/cart'
+import { InitResponseItem, InitResponseModel } from '../lib/types/init.types'
import { ResponseModel } from '../lib/types/responseModel'
+import { SelectResponseModel } from '../lib/types/select.types'
import { ShippingFormData } from '../pages/checkoutPage'
import { areObjectPropertiesEqual } from './common-utils'
-export const getPayloadForInitRequest = (
- cartItemsPerBppPerProvider: DataPerBpp,
- transactionId: { transactionId: string },
- customerAddress: ShippingFormData,
- billingFormData: ShippingFormData
-) => {
- const payload: any = {
- initRequestDto: []
- }
-
- Object.keys(cartItemsPerBppPerProvider).forEach(bppId => {
- const cartItem: any = {
- context: {
- transaction_id: transactionId.transactionId,
- bpp_id: bppId,
- bpp_uri: cartItemsPerBppPerProvider[bppId][0].bpp_uri,
- domain: 'retail'
- },
- message: {
- order: {
- items: [],
- provider: {
- id: cartItemsPerBppPerProvider[bppId][0].providerId,
- locations: [
- {
- id: cartItemsPerBppPerProvider[bppId][0].location_id
- }
- ]
- },
- addOns: [],
- offers: [],
- billing: {
- name: customerAddress.name,
- phone: customerAddress.mobileNumber,
- address: {
- door: '',
- building: customerAddress.address,
- city: customerAddress.address,
- state: customerAddress.address,
- country: 'IND',
- area_code: customerAddress.pinCode
- },
- email: 'testemail1@mailinator.com'
- },
- fulfillment: {
- type: 'HOME-DELIVERY',
- end: {
- location: {
- gps: cartItemsPerBppPerProvider[bppId][0].locations[0].gps,
- address: {
- door: '',
- building: customerAddress.address,
- street: customerAddress.address,
- city: customerAddress.address,
- state: customerAddress.address,
- country: 'IND',
- area_code: '560076'
- }
- },
- contact: {
- phone: '9191223433',
- email: 'testemail1@mailinator.com'
- }
- },
- customer: {
- person: {
- name: customerAddress.name
- }
- },
- id: cartItemsPerBppPerProvider[bppId][0].providerId
- }
- }
- }
- }
- cartItemsPerBppPerProvider[bppId].forEach((item: any) => {
- if (item.bpp_id === bppId) {
- const itemObject = {
- quantity: {
- count: item.quantity
- },
- id: item.id
- }
- cartItem.message.order.items.push(itemObject)
- }
- })
- payload.initRequestDto.push(cartItem)
- })
- return payload
-}
+const APIKEY = process.env.NEXT_PUBLIC_GOOGLE_API_KEY as string
export const getSubTotalAndDeliveryCharges = (initData: (ResponseModel & ResponseModel[]) | null) => {
let subTotal = 0
@@ -134,3 +49,170 @@ export const areShippingAndBillingDetailsSame = (
}
return !isBillingAddressComplete
}
+
+const extractAddressComponents = (result: any) => {
+ let country = null,
+ state = null,
+ city = null
+
+ for (const component of result.address_components) {
+ if (component.types.includes('country')) {
+ country = component.long_name
+ } else if (component.types.includes('administrative_area_level_1')) {
+ state = component.long_name
+ } else if (component.types.includes('locality')) {
+ city = component.long_name
+ }
+ }
+ return { country, state, city }
+}
+async function addressComponentsFromPincode(pincode: string) {
+ try {
+ const url = `https://maps.googleapis.com/maps/api/geocode/json?address=${pincode}&key=${APIKEY}`
+ const response = await axios.get(url)
+
+ const { country, state, city } = extractAddressComponents(response.data.results[0])
+
+ return { country, state, city }
+ } catch (error) {
+ console.error('Failed to geocode the pindcode', error)
+ }
+}
+
+export const getPayloadForInitRequest = async (selectResponse: SelectResponseModel, formData: ShippingFormData) => {
+ const { address, email, mobileNumber, name, pinCode } = formData
+ const cityData = await addressComponentsFromPincode(pinCode)
+ console.log('cityyyData', cityData)
+ let initPayload: any = {
+ data: []
+ }
+
+ selectResponse.data.forEach(res => {
+ const { transaction_id, bpp_id, bpp_uri, domain } = res.context
+ const { order } = res.message
+ const { items, provider, type, quote } = order
+ const { id: providerId } = provider
+
+ const context = {
+ transaction_id,
+ bpp_id,
+ bpp_uri,
+ domain
+ }
+
+ const message = {
+ orders: [
+ {
+ provider: {
+ id: providerId
+ },
+ items: items,
+ fulfillments: [
+ // TODO :- we have to map this with real data that ( fulfillment shoould come in select which is not coming)
+ {
+ id: '',
+ customer: {
+ contact: {
+ email,
+ mobileNumber
+ },
+ person: {
+ name
+ }
+ },
+ stops: [
+ {
+ type: 'end',
+ location: {
+ gps: '1.3806217468119772, 103.74636438437074',
+ address: address,
+ city: {
+ name: cityData?.city
+ },
+ country: {
+ code: ''
+ },
+ area_code: pinCode,
+ state: {
+ name: cityData?.state
+ }
+ },
+ contact: {
+ phone: mobileNumber
+ }
+ }
+ ]
+ }
+ ],
+ billing: {
+ name,
+ address,
+ state: {
+ name: cityData?.state
+ },
+ city: {
+ name: cityData?.city
+ },
+ email,
+ phone: mobileNumber
+ }
+ }
+ ]
+ }
+
+ initPayload.data.push({
+ context: context,
+ message: message
+ })
+ })
+ console.log('initPayload', initPayload)
+ return initPayload
+}
+
+export const handleFormSubmit = async (
+ formData: ShippingFormData,
+ selectResponse: SelectResponseModel,
+ setInitData: React.Dispatch>,
+ setIsLoadingForInit: React.Dispatch>,
+ setIsError: React.Dispatch>,
+ apiUrl: string
+) => {
+ setIsLoadingForInit(true)
+ try {
+ const initPayload = await getPayloadForInitRequest(selectResponse, formData)
+ console.log(initPayload)
+ axios
+ .post(`${apiUrl}/init`, initPayload)
+ .then(res => {
+ console.log('resss', res)
+ localStorage.setItem('initResult', JSON.stringify(res.data))
+ setInitData(res.data)
+ setIsLoadingForInit(false)
+ })
+ .catch(e => {
+ setIsError(true)
+ setIsLoadingForInit(false)
+ console.error(e)
+ })
+ } catch (error) {
+ console.error(error)
+ }
+}
+
+export const getPaymentBreakDown = (initData: InitResponseItem) => {
+ const { message } = initData
+ const { order } = message
+ const { quote } = order
+ const { breakup, price } = quote
+ const totalPricewithCurrent = `${price.currency} ${price.value}`
+
+ const breakUpMap: Record = {}
+ breakup.forEach(item => {
+ const {
+ title,
+ price: { currency, value }
+ } = item
+ breakUpMap[title] = `${currency} ${value} `
+ })
+ return { breakUpMap, totalPricewithCurrent }
+}
diff --git a/apps/dsep/utilities/confirm-utils.ts b/apps/dsep/utilities/confirm-utils.ts
index bf4b0541a..914e29edd 100644
--- a/apps/dsep/utilities/confirm-utils.ts
+++ b/apps/dsep/utilities/confirm-utils.ts
@@ -1,20 +1,6 @@
+import { InitResponseModel } from '../lib/types/init.types'
import { ResponseModel } from '../lib/types/responseModel'
-export const getInitMetaDataPerBpp = (initRes: ResponseModel[]) => {
- const itemsPerBpp = {}
- initRes.forEach(res => {
- const bppId = res.context.bpp_id
- const bpp_uri = res.context.bpp_uri
-
- itemsPerBpp[bppId] = {
- ...res.message.catalogs.responses[0].message.order,
- bpp_uri
- }
- })
-
- return itemsPerBpp
-}
-
export const getConfirmMetaDataForBpp = (initRes: ResponseModel[]) => {
const itemsPerBpp = {}
initRes.forEach(res => {
@@ -30,67 +16,57 @@ export const getConfirmMetaDataForBpp = (initRes: ResponseModel[]) => {
return itemsPerBpp
}
-export const getPayloadForConfirmRequest = (
- initMetaDataPerBpp: any,
- transactionId: { transactionId: string },
- userId: string
-) => {
- const payload: any = {
- confirmRequestDto: [],
- userId: userId
+export const getPayloadForConfirmRequest = (initResponse: InitResponseModel) => {
+ let payload: any = {
+ data: []
}
- Object.keys(initMetaDataPerBpp).forEach(bppId => {
- const confirmItem: any = {
- context: {
- transaction_id: transactionId.transactionId,
- bpp_id: bppId,
- bpp_uri: initMetaDataPerBpp[bppId].bpp_uri,
- domain: 'retail'
- },
+ initResponse.data.forEach(response => {
+ const { bpp_id, bpp_uri, transaction_id, domain } = response.context
+ const { order } = response.message
+ const { billing, fulfillments, items, provider, quote } = order
+ const { price } = quote
+ const { currency, value } = price
+
+ const context = {
+ transaction_id: transaction_id,
+ bpp_id: bpp_id,
+ bpp_uri: bpp_uri,
+ domain: domain
+ }
- message: {
- order: {
+ const message = {
+ orders: [
+ {
provider: {
- id: initMetaDataPerBpp[bppId].provider.id
+ id: provider.id
},
- addOns: [],
- offers: [],
- billing: initMetaDataPerBpp[bppId].billing,
- fulfillment: {
- type: initMetaDataPerBpp[bppId].fulfillment.type,
- end: {
- location: {
- gps: initMetaDataPerBpp[bppId].fulfillment.end.location.gps,
- address: initMetaDataPerBpp[bppId].billing.address
+ items: items,
+ fulfillments: fulfillments,
+ billing: billing,
+ payments: [
+ {
+ collected_by: 'BPP',
+ params: {
+ amount: value,
+ currency: currency,
+ bank_account_number: '',
+ bank_code: '',
+ bank_account_name: ''
},
- contact: {
- phone: initMetaDataPerBpp[bppId].billing.phone,
- email: 'testemail1@mailinator.com'
- }
- },
- customer: {
- person: {
- name: initMetaDataPerBpp[bppId].billing.name
- }
- },
- id: initMetaDataPerBpp[bppId].fulfillment.id
- },
- payment: initMetaDataPerBpp[bppId].payment,
- items: []
+ status: 'PAID',
+ type: 'PRE-ORDER',
+ transaction_id: transaction_id
+ }
+ ]
}
- }
+ ]
}
- initMetaDataPerBpp[bppId].items.forEach((item: any) => {
- const itemObject = {
- quantity: item.quantity,
- id: item.id
- }
- confirmItem.message.order.items.push(itemObject)
+ payload.data.push({
+ context,
+ message
})
-
- payload.confirmRequestDto.push(confirmItem)
})
return payload
diff --git a/apps/dsep/utilities/search-utils.ts b/apps/dsep/utilities/search-utils.ts
new file mode 100644
index 000000000..e146b4714
--- /dev/null
+++ b/apps/dsep/utilities/search-utils.ts
@@ -0,0 +1,36 @@
+// import { ParsedItemModel, SearchResponseModel } from '../types/search.types'
+
+import { ParsedItemModel, SearchResponseModel } from '../types/search.types'
+
+export const getParsedSearchlist = (data: SearchResponseModel[]) => {
+ const itemsarray: ParsedItemModel[] = []
+ data.forEach(entry => {
+ const context = entry.context
+ const message = entry.message
+ const domain = context.domain
+ const transactionId = context.transaction_id
+ const bppId = context.bpp_id
+ const bppUri = context.bpp_uri
+
+ message.providers.forEach(provider => {
+ const providerId = provider.id
+ const rating = provider.rating
+
+ provider?.items?.forEach(item => {
+ itemsarray.push({
+ bppId: bppId,
+ bppUri: bppUri,
+ domain,
+ transactionId,
+ providerId: providerId,
+ providerName: provider.name,
+ item,
+ rating
+ // providerCoordinates
+ })
+ })
+ })
+ })
+
+ return itemsarray
+}
diff --git a/apps/dsnp/pages/orderDetails/index.tsx b/apps/dsnp/pages/orderDetails/index.tsx
new file mode 100644
index 000000000..74fd4c623
--- /dev/null
+++ b/apps/dsnp/pages/orderDetails/index.tsx
@@ -0,0 +1,3 @@
+import OrderDetails from './orderDetails'
+
+export default orderDetails
diff --git a/apps/dsnp/pages/orderDetails/order b/apps/dsnp/pages/orderDetails/order
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/dsnp/pages/orderDetails.tsx b/apps/dsnp/pages/orderDetails/orderDetails.tsx
similarity index 100%
rename from apps/dsnp/pages/orderDetails.tsx
rename to apps/dsnp/pages/orderDetails/orderDetails.tsx
diff --git a/apps/dsnp/pages/orderDetails/orderSummary.tsx b/apps/dsnp/pages/orderDetails/orderSummary.tsx
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/mobility-bap/.prettierignore b/apps/mobility-bap/.prettierignore
new file mode 100644
index 000000000..a02ef09e5
--- /dev/null
+++ b/apps/mobility-bap/.prettierignore
@@ -0,0 +1,4 @@
+/node_modules/
+/coverage/
+/.next/
+/public/
diff --git a/apps/mobility-bap/Jenkinsfile b/apps/mobility-bap/Jenkinsfile
new file mode 100644
index 000000000..65d08c9ab
--- /dev/null
+++ b/apps/mobility-bap/Jenkinsfile
@@ -0,0 +1,29 @@
+pipeline {
+ agent any
+ stages {
+ stage('Executing Shell Script On Server') {
+ steps {
+ script {
+ sshagent(credentials: ['"${credentials}"']) {
+ sh '''
+ ssh -t -t ${userName}@${hostIP} -o StrictHostKeyChecking=no << EOF
+ ${listOfCommands}
+ logout
+ EOF
+ '''
+ }
+ }
+ }
+ }
+ }
+ post {
+ always {
+ cleanWs(cleanWhenNotBuilt: false,
+ deleteDirs: true,
+ disableDeferredWipeout: true,
+ notFailBuild: true,
+ patterns: [[pattern: '.gitignore', type: 'INCLUDE'],
+ [pattern: '.propsfile', type: 'EXCLUDE']])
+ }
+ }
+}
diff --git a/apps/mobility-bap/components/BottomModal/BottomModal.tsx b/apps/mobility-bap/components/BottomModal/BottomModal.tsx
new file mode 100644
index 000000000..348e298bf
--- /dev/null
+++ b/apps/mobility-bap/components/BottomModal/BottomModal.tsx
@@ -0,0 +1,48 @@
+import { useState } from 'react'
+import { Transition } from '@headlessui/react'
+import { AiOutlineClose } from 'react-icons/ai'
+import { useLanguage } from '../../hooks/useLanguage'
+import { Image } from '@chakra-ui/react'
+
+interface ModalProps {
+ isOpen: boolean
+ onClose: () => void
+ children: React.ReactNode
+ partialClose?: boolean
+}
+
+const Modal: React.FC = ({ isOpen, onClose, children, partialClose }) => {
+ const { t } = useLanguage()
+ return (
+ onClose()}
+ >
+
+ )
+}
+
+export default Modal
diff --git a/apps/mobility-bap/components/BottomModal/index.tsx b/apps/mobility-bap/components/BottomModal/index.tsx
new file mode 100644
index 000000000..88b5f609a
--- /dev/null
+++ b/apps/mobility-bap/components/BottomModal/index.tsx
@@ -0,0 +1,3 @@
+import BottomModal from './BottomModal'
+
+export default BottomModal
diff --git a/apps/mobility-bap/components/Map/CenterMarker.svg b/apps/mobility-bap/components/Map/CenterMarker.svg
new file mode 100644
index 000000000..55bb20190
--- /dev/null
+++ b/apps/mobility-bap/components/Map/CenterMarker.svg
@@ -0,0 +1,3 @@
+
diff --git a/apps/mobility-bap/components/Map/Map.tsx b/apps/mobility-bap/components/Map/Map.tsx
new file mode 100644
index 000000000..90439a655
--- /dev/null
+++ b/apps/mobility-bap/components/Map/Map.tsx
@@ -0,0 +1,148 @@
+import { MapContainer, TileLayer, Marker, Popup, useMap, ZoomControl } from 'react-leaflet'
+import { Image } from '@chakra-ui/react'
+import React, { useEffect, useState } from 'react'
+import Control from 'react-leaflet-custom-control'
+import 'leaflet/dist/leaflet.css'
+import { GiHamburgerMenu } from 'react-icons/gi'
+import { data } from './StoreMarkerData'
+import Icon from './store-marker.svg'
+import SelectedIcon from './SelectedMarker.svg'
+import CenterMarker from './CenterMarker.svg'
+import L from 'leaflet'
+import { isEmpty } from 'lodash'
+
+interface MapProps {
+ coords: { lat: number; long: number }
+ handleModalOpen: () => void
+ handleOptionDetailOpen: () => void
+ setSelectedStore: React.Dispatch>
+ selectedStore: any
+ // Using any for now since exact structure is not clear
+ stores: any[]
+}
+
+const Map: React.FC = ({
+ stores,
+ selectedStore,
+ coords,
+ handleModalOpen,
+ handleOptionDetailOpen,
+ setSelectedStore
+}) => {
+ const { lat, long } = coords
+ const [userLocation, setUserLocation] = useState<[number, number] | null>(null)
+ const [flyToUserLocation, setFlyToUserLocation] = useState(false)
+
+ useEffect(() => {
+ // Get the user's current location using the browser's geolocation API
+ navigator.geolocation.getCurrentPosition(
+ position => {
+ setUserLocation([position.coords.latitude, position.coords.longitude])
+ },
+ error => {
+ console.error('Error getting user location:', error)
+ }
+ )
+ }, [])
+
+ // Custom hook to zoom the map to the user's location
+ const ZoomToUserLocation = () => {
+ let map = useMap()
+
+ if (userLocation && flyToUserLocation) {
+ map.flyTo(userLocation, 12)
+ }
+
+ return null
+ }
+
+ const customIcon = new L.Icon({
+ iconUrl: Icon,
+ iconSize: [25, 35],
+ iconAnchor: [5, 30]
+ })
+
+ const customCenterMarker = new L.Icon({
+ iconUrl: CenterMarker,
+ iconSize: [40, 50],
+ iconAnchor: [5, 30]
+ })
+
+ const customSelectedIcon = new L.Icon({
+ iconUrl: Icon,
+ iconSize: [35, 45],
+ iconAnchor: [5, 30]
+ })
+
+ function MapView() {
+ let map = useMap()
+ map.setView([lat, long], map.getZoom())
+ return null
+ }
+
+ return (
+
+
+
+
+ {!isEmpty(stores) &&
+ stores.map((item: any, index: number) => {
+ const isSelected = item.lat === selectedStore?.lat && item.lon === selectedStore?.lon
+ const IconToUse = isSelected ? customSelectedIcon : customIcon
+ return (
+ {
+ setSelectedStore(item)
+ handleOptionDetailOpen()
+ }
+ }}
+ >
+ )
+ })}
+
+ )
+}
+
+// React memo not working for some reason
+//TODO Needed because the map is re-rendered even if the co-ords are same causing a flickering issue on the map. Will fix this later
+export default React.memo(Map, (prevProps, nextProps) => {
+ if (prevProps.coords.lat === nextProps.coords.lat && prevProps.coords.long === nextProps.coords.long) {
+ return true
+ }
+ return false
+})
diff --git a/apps/mobility-bap/components/Map/MapSearch.tsx b/apps/mobility-bap/components/Map/MapSearch.tsx
new file mode 100644
index 000000000..81b8a6085
--- /dev/null
+++ b/apps/mobility-bap/components/Map/MapSearch.tsx
@@ -0,0 +1,126 @@
+import React, { useState, useEffect } from 'react'
+import { Spinner } from '@chakra-ui/react'
+import { GoSearch } from 'react-icons/go'
+import { isEmpty } from 'lodash'
+import { Image } from '@chakra-ui/react'
+import { useLanguage } from '../../hooks/useLanguage'
+import useDebounce from '../../hooks/useDebounce'
+
+interface LocalNameFormat {
+ primaryName: string
+ secondaryName: string
+}
+
+function formatLocationName(name: string): LocalNameFormat {
+ const index = name.indexOf(',')
+ if (index !== -1) {
+ return {
+ primaryName: name.slice(0, index).trim(),
+ secondaryName: name.slice(index + 1).trim()
+ }
+ } else {
+ return {
+ primaryName: name.trim(),
+ secondaryName: ''
+ }
+ }
+}
+
+export interface SearchBarProp {
+ setQuery: React.Dispatch>
+ locations: any[]
+ query: string
+ handleLocationClick: (lat: number, long: number) => void
+ fetchResults: (query: string) => void
+ setShowSuggestions: React.Dispatch>
+}
+
+const SearchBar: React.FC = ({
+ setQuery,
+ locations,
+ query,
+ handleLocationClick,
+ fetchResults,
+ setShowSuggestions
+}) => {
+ const { t } = useLanguage()
+
+ //TODO Pseudo loading for now. Need to figure out to do this using map load events
+ const [loading, setLoading] = useState(false)
+
+ const [value, setValue] = useState('')
+
+ const debouncedValue = useDebounce(value, 300)
+
+ useEffect(() => {
+ setShowSuggestions(!isEmpty(value) && locations && !isEmpty(locations))
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [locations, value])
+
+ useEffect(() => {
+ setLoading(true)
+ setTimeout(() => {
+ setLoading(false)
+ }, 500)
+ }, [debouncedValue])
+
+ useEffect(() => {
+ // setQuery(debouncedValue);
+ fetchResults(debouncedValue)
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [debouncedValue])
+
+ return (
+ <>
+ >
+}
+
+const OptionCard: React.FC = ({
+ optionMeta: { tagName, tagValue, title },
+ optionIcons: { iconUrl, iconUrlLight },
+ isSelected,
+ setOption
+}) => {
+ const { t } = useLanguage()
+ return (
+ = props => {
+ const goBack = () => Router.back()
+ return (
+
+
+ goBack()}
+ cursor={'pointer'}
+ >
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+
+ {props.appHeaderText}
+
+
+
+ )
+}
diff --git a/apps/mobility-bap/components/button/Button.tsx b/apps/mobility-bap/components/button/Button.tsx
new file mode 100644
index 000000000..403ab7399
--- /dev/null
+++ b/apps/mobility-bap/components/button/Button.tsx
@@ -0,0 +1,36 @@
+import React, { ReactElement, useState } from 'react'
+import { Button as ButtonComp } from '@chakra-ui/react'
+
+export interface ButtonPropsModel {
+ buttonText: string | ReactElement
+ background: string
+ color: string
+ handleOnClick?: () => void
+ isDisabled: boolean
+}
+
+const Button: React.FC = props => {
+ const isDisabled = props.isDisabled
+
+ return (
+ <>
+
+ {props.buttonText}
+
+
+ )
+}
+
+export default Button
diff --git a/apps/mobility-bap/components/header/Logo.tsx b/apps/mobility-bap/components/header/Logo.tsx
new file mode 100644
index 000000000..dab51de2f
--- /dev/null
+++ b/apps/mobility-bap/components/header/Logo.tsx
@@ -0,0 +1,25 @@
+import { Image } from '@chakra-ui/react'
+import Link from 'next/link'
+import React from 'react'
+
+const Logo = () => {
+ return (
+
+
+ = ({ searchString, handleChange }) => {
+ const { t } = useLanguage()
+ const [searchText, setSearchText] = useState(searchString)
+
+ const inputChangeHandler = (event: React.BaseSyntheticEvent) => {
+ setSearchText(event.target.value)
+ }
+
+ const handleSubmit = () => {
+ handleChange(searchText)
+ }
+
+ return (
+ {values[pathName]}
+ default:
+ return (
+
+
+ {name}
+
+
+ )
+ }
+}
+
+export interface TopHeaderProps {
+ handleMenuClick?: () => void
+}
+
+const TopHeader: React.FC = ({ handleMenuClick }) => {
+ const [isMenuModalOpen, setMenuModalOpen] = useState(false)
+ const { t, locale } = useLanguage()
+ const router = useRouter()
+
+ const handleMenuModalClose = () => {
+ setMenuModalOpen(false)
+ }
+
+ return (
+ <>
+
+
+
+ )
+}
+
+const BottomHeader = () => {
+ const [optionTags, setOptionTags] = useState()
+ const { t, locale } = useLanguage()
+
+ useEffect(() => {
+ setOptionTags(JSON.parse(localStorage.getItem('optionTags') as string))
+ }, [])
+
+ const router = useRouter()
+
+ return (
+
+
+ )
+}
+
+const Header = () => {
+ const router = useRouter()
+
+ const renderTopHeader = !topHeaderBlackList.includes(router.pathname)
+ const renderBottomHeader = !bottomHeaderBlackList.includes(router.pathname)
+
+ return (
+ = ({ language, onCloseBox }) => {
+ const { t, locale } = useLanguage()
+ const router = useRouter()
+ const [lang, setLang] = useState(locale)
+
+ function onChangeHandler(e: React.ChangeEvent) {
+ setLang(e.currentTarget.id)
+ }
+
+ return (
+
+
+ (null)
+ const { t } = useLanguage()
+ const dispatch = useDispatch()
+ function showMegaMenuHandler() {
+ dispatch(megaMenuActions.openMegaMenu())
+ }
+ function closeMegaMenuHandler() {
+ dispatch(megaMenuActions.closeMegaMenu())
+ }
+ const isMegaMenuOpen = useSelector((state: IMegaMenuRootState) => state.megaMenu.isMegaMenuOpen)
+
+ return (
+ ()
+ const dispatch = useDispatch()
+ function activeItem(submenuList: IDropDown[] | undefined, activeItemIndex: number, activeItemName: string) {
+ setSubMenuItems(submenuList)
+ dispatch(activeMenuItemActions.setActiveMenuItemIndex(activeItemIndex))
+ dispatch(activeMenuItemActions.setActiveMenuItemText(activeItemName))
+ }
+
+ useEffect(() => {
+ setSubMenuItems(menuItems[0].productsGroup)
+ return () => {
+ dispatch(activeMenuItemActions.setActiveMenuItemIndex(0))
+ dispatch(activeMenuItemActions.setActiveMenuItemText('digital'))
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [])
+
+ return (
+ = ({ subMenuItems }) => {
+ const { t, locale } = useLanguage()
+ const ArrowDirection = locale === 'en' ? HiChevronRight : HiChevronLeft
+ const dispatch = useDispatch()
+
+ const activeMenuItemText = useSelector((state: IActiveMenuItemRootState) => state.activeMenuItem.activeMenuItemText)
+
+ return (
+ (null)
+ const dispatch = useDispatch()
+ const isNavbarOpen = useSelector((state: ISideNavBarRootState) => state.sideNavBar.isNavbarOpen)
+ const closeNav = () => {
+ dispatch(sideNavBarActions.closeNavbar())
+ }
+
+ const openNavBar = () => {
+ dispatch(sideNavBarActions.openNavbar())
+ }
+
+ return (
+
+}
+
+const SideNav = forwardRef(({ state, onClose }, ref) => {
+ const { locale } = useRouter()
+ return (
+ (null)
+ const { t, locale } = useLanguage()
+
+ const BackArrow = locale === 'en' ? HiOutlineArrowSmLeft : HiOutlineArrowSmRight
+
+ return (
+ <>
+ {dropDownList.length ? (
+
+ {state => {
+ return (
+
+ ) : null}
+
+ )
+}
+
+SideNavSide.displayName = 'SideNavSide'
+export default SideNavSide
diff --git a/apps/mobility-bap/components/header/menu/SideBarMenu/index.tsx b/apps/mobility-bap/components/header/menu/SideBarMenu/index.tsx
new file mode 100644
index 000000000..ee5e76ebb
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/SideBarMenu/index.tsx
@@ -0,0 +1,14 @@
+import React from 'react'
+import SideBar from './SideBar'
+import SideNavSide from './SideNavSide'
+
+const index = () => {
+ return (
+ = ({ theme, Icon, currentTheme }) => {
+ const { t } = useLanguage()
+ const { setTheme } = useTheme()
+ const dispatch = useDispatch()
+ const isSettingBoxOpen = useSelector((state: ISettingBoxRootState) => state.settingBox.isOpen)
+
+ function onThemeClickHandler() {
+ setTheme(theme)
+ isSettingBoxOpen && dispatch(settingBoxActions.closeSettingBox())
+ }
+
+ return (
+ = ({ onClose }) => {
+ const { t } = useLanguage()
+ const dispatch = useDispatch()
+ function onLogoutClickHandler() {
+ dispatch(userInfoActions.userLogout())
+ jsCookie.remove('userInfo')
+ onClose()
+ }
+ return (
+ (null)
+
+ function onClose() {
+ setIsUserBoxOpen(prev => prev && false)
+ }
+
+ function onIconClickHandler() {
+ setIsUserBoxOpen(prev => !prev)
+ }
+
+ return (
+
+
+
+ Open Street Commerce
+
+
+
+ )
+}
+
+export default Layout
diff --git a/apps/mobility-bap/components/loader/Loader.tsx b/apps/mobility-bap/components/loader/Loader.tsx
new file mode 100644
index 000000000..885042bf1
--- /dev/null
+++ b/apps/mobility-bap/components/loader/Loader.tsx
@@ -0,0 +1,34 @@
+import { Spinner, Text } from '@chakra-ui/react'
+import React from 'react'
+
+interface LoaderPropsModel {
+ loadingText?: string
+ subLoadingText?: string
+ stylesForLoadingText?: React.CSSProperties
+}
+
+const Loader: React.FC = props => {
+ return (
+ = props => {
+ const [hover, setHover] = useState(null)
+
+ return (
+
+ {props.ratingText}
+
+ {[...Array(props.count || 5)].map((star, index) => {
+ const ratingValue = index + 1
+ return (
+
+ )
+ })}
+
+
+ )
+}
+export default StarRating
diff --git a/apps/mobility-bap/global.d.ts b/apps/mobility-bap/global.d.ts
new file mode 100644
index 000000000..ba29177a1
--- /dev/null
+++ b/apps/mobility-bap/global.d.ts
@@ -0,0 +1,5 @@
+interface Date {
+ addDays: (days: number) => Date
+}
+
+//to fix error that when I want to add function (addDays) to Date.prototype, happen.
diff --git a/apps/mobility-bap/hooks/useCountdown.tsx b/apps/mobility-bap/hooks/useCountdown.tsx
new file mode 100644
index 000000000..0fd5d782c
--- /dev/null
+++ b/apps/mobility-bap/hooks/useCountdown.tsx
@@ -0,0 +1,38 @@
+import { useEffect, useState } from 'react'
+
+Date.prototype.addDays = function (days: number): Date {
+ var date = new Date(this.valueOf())
+ date.setDate(date.getDate() + days)
+ return date
+}
+
+var date = new Date()
+
+const getReturnValues = (countDown: number) => {
+ // calculate time left
+ const days = Math.floor(countDown / (1000 * 60 * 60 * 24))
+ const hours = Math.floor((countDown % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+ const minutes = Math.floor((countDown % (1000 * 60 * 60)) / (1000 * 60))
+ const seconds = Math.floor((countDown % (1000 * 60)) / 1000)
+
+ return [days, hours, minutes, seconds]
+}
+
+const useCountdown = (targetDate: number) => {
+ var expireDate = date.addDays(targetDate)
+ const countDownDate = new Date(expireDate).getTime()
+
+ const [countDown, setCountDown] = useState(countDownDate - new Date().getTime())
+
+ useEffect(() => {
+ const interval = setInterval(() => {
+ setCountDown(countDownDate - new Date().getTime())
+ }, 1000)
+
+ return () => clearInterval(interval)
+ }, [countDownDate])
+
+ return getReturnValues(countDown)
+}
+
+export { useCountdown }
diff --git a/apps/mobility-bap/hooks/useDebounce.tsx b/apps/mobility-bap/hooks/useDebounce.tsx
new file mode 100644
index 000000000..f22a669af
--- /dev/null
+++ b/apps/mobility-bap/hooks/useDebounce.tsx
@@ -0,0 +1,19 @@
+import { useState, useEffect } from 'react'
+
+const useDebounce = (value: string, delay: number): string => {
+ const [debouncedValue, setDebouncedValue] = useState(value)
+
+ useEffect(() => {
+ const timer = setTimeout(() => {
+ setDebouncedValue(value)
+ }, delay)
+
+ return () => {
+ clearTimeout(timer)
+ }
+ }, [value, delay])
+
+ return debouncedValue
+}
+
+export default useDebounce
diff --git a/apps/mobility-bap/hooks/useExchangeRateGBPToIRR.tsx b/apps/mobility-bap/hooks/useExchangeRateGBPToIRR.tsx
new file mode 100644
index 000000000..f7dfbf852
--- /dev/null
+++ b/apps/mobility-bap/hooks/useExchangeRateGBPToIRR.tsx
@@ -0,0 +1,39 @@
+import { useEffect, useState } from 'react'
+import { irrCurrencyFormat } from '../utilities/currencyFormat'
+
+const API_KEY = '230967b967bfa5f86ca99d6c'
+const URL = `https://v6.exchangerate-api.com/v6/${API_KEY}/pair/GBP/IRR`
+
+export const useExchangeRateGBPToIRR = (price: number) => {
+ const [exchangePrice, setExchangePrice] = useState(0)
+ const hardRateExchange = 52230.27 // each Pound into Rial
+ useEffect(() => {
+ const fetchExchangeRate = async () => {
+ try {
+ const result = await fetch(`${URL}/${price}`)
+ if (result.ok) {
+ const data = await result.json()
+ const irToman = Math.floor(data.conversion_result / 1000) * 1000 //common currency in Iran
+ setExchangePrice(irToman)
+ } else {
+ const priceWithHardRateExchange = price * hardRateExchange
+ const irToman = Math.floor(priceWithHardRateExchange / 1000) * 1000
+ setExchangePrice(irToman)
+ throw new Error()
+ }
+ } catch (e) {
+ console.log(
+ `⚠ Error: the server responded with a status of 429 ()=> free account has reached the number of requests allowed by free plan and price exchange is based on hard number`
+ )
+ }
+ }
+ if (price > 0) {
+ // fetchExchangeRate();
+ const priceWithHardRateExchange = price * hardRateExchange
+ const irToman = Math.ceil(priceWithHardRateExchange / 1000) * 1000
+ setExchangePrice(irToman)
+ }
+ }, [price])
+
+ return irrCurrencyFormat(exchangePrice)
+}
diff --git a/apps/mobility-bap/hooks/useLanguage.tsx b/apps/mobility-bap/hooks/useLanguage.tsx
new file mode 100644
index 000000000..f30556c73
--- /dev/null
+++ b/apps/mobility-bap/hooks/useLanguage.tsx
@@ -0,0 +1,9 @@
+import { useRouter } from 'next/router'
+import en from '../locales/en'
+import fa from '../locales/fa'
+
+export const useLanguage = () => {
+ const { locale } = useRouter()
+ const t = locale === 'en' ? en : fa
+ return { t, locale }
+}
diff --git a/apps/mobility-bap/hooks/useLocalStorage.tsx b/apps/mobility-bap/hooks/useLocalStorage.tsx
new file mode 100644
index 000000000..0a82af44f
--- /dev/null
+++ b/apps/mobility-bap/hooks/useLocalStorage.tsx
@@ -0,0 +1,25 @@
+import { useState, useEffect } from 'react'
+
+type ValueSetter = (value: T | ((prevValue: T) => T)) => void
+
+export function useLocalStorage(key: string, initialValue: T): [T, ValueSetter] {
+ const [storedValue, setStoredValue] = useState(() => {
+ try {
+ const item = window.localStorage.getItem(key)
+ return item ? JSON.parse(item) : initialValue
+ } catch (error) {
+ console.error(`Error retrieving localStorage item ${key}:`, error)
+ return initialValue
+ }
+ })
+
+ useEffect(() => {
+ try {
+ window.localStorage.setItem(key, JSON.stringify(storedValue))
+ } catch (error) {
+ console.error(`Error setting localStorage item ${key}:`, error)
+ }
+ }, [key, storedValue])
+
+ return [storedValue, setStoredValue]
+}
diff --git a/apps/mobility-bap/hooks/useRequest.tsx b/apps/mobility-bap/hooks/useRequest.tsx
new file mode 100644
index 000000000..29ec9c534
--- /dev/null
+++ b/apps/mobility-bap/hooks/useRequest.tsx
@@ -0,0 +1,29 @@
+import { useState } from 'react'
+import axios from 'axios'
+import { ResponseModel } from '../lib/types/responseModel'
+
+const useRequest = () => {
+ const [data, setData] = useState<(ResponseModel & ResponseModel[]) | null>(null)
+ const [loading, setLoading] = useState(false)
+ const [error, setError] = useState('')
+
+ const fetchData = async (url: string, method = 'POST', payLoad: any = null) => {
+ try {
+ setLoading(true)
+ const response = await axios.request({
+ url,
+ method,
+ data: payLoad
+ })
+ setData(response.data)
+ } catch (error: any) {
+ setError(error.message)
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ return { data, loading, error, fetchData }
+}
+
+export default useRequest
diff --git a/apps/mobility-bap/hooks/useWindowDimensions.tsx b/apps/mobility-bap/hooks/useWindowDimensions.tsx
new file mode 100644
index 000000000..106af28f2
--- /dev/null
+++ b/apps/mobility-bap/hooks/useWindowDimensions.tsx
@@ -0,0 +1,35 @@
+import { useState, useEffect } from 'react'
+
+export function useWindowDimensions() {
+ let width, height
+ if (typeof window !== 'undefined') {
+ width = window.innerWidth
+ height = window.innerHeight
+ } else {
+ width = 0
+ height = 0
+ }
+
+ const [windowDimensions, setWindowDimensions] = useState({
+ width,
+ height
+ })
+
+ useEffect(() => {
+ function getWindowDimensions() {
+ const { innerWidth: width, innerHeight: height } = window
+ return {
+ width,
+ height
+ }
+ }
+ function handleResize() {
+ setWindowDimensions(getWindowDimensions())
+ }
+
+ window.addEventListener('resize', handleResize)
+ return () => window.removeEventListener('resize', handleResize)
+ }, [])
+
+ return windowDimensions
+}
diff --git a/apps/mobility-bap/lib/client.ts b/apps/mobility-bap/lib/client.ts
new file mode 100644
index 000000000..e1e9f4529
--- /dev/null
+++ b/apps/mobility-bap/lib/client.ts
@@ -0,0 +1,16 @@
+import sanityClient from '@sanity/client'
+import imageUrlBuilder from '@sanity/image-url'
+
+//connect to sanity
+export const client = sanityClient({
+ projectId: '3c4n15ly',
+ dataset: 'production',
+ apiVersion: '2022-06-04',
+ useCdn: true,
+ token: process.env.NEXT_PUBLIC_SANITY_TOKEN
+})
+
+//be able to use sanity images
+const builder = imageUrlBuilder(client)
+
+export const urlFor = (source: any) => builder.image(source)
diff --git a/apps/mobility-bap/lib/config.ts b/apps/mobility-bap/lib/config.ts
new file mode 100644
index 000000000..1a294571c
--- /dev/null
+++ b/apps/mobility-bap/lib/config.ts
@@ -0,0 +1,5 @@
+const config = {
+ projectId: '3c4n15ly',
+ dataset: 'production'
+}
+export default config
diff --git a/apps/mobility-bap/lib/types/activeMenuItem.ts b/apps/mobility-bap/lib/types/activeMenuItem.ts
new file mode 100644
index 000000000..c7c376833
--- /dev/null
+++ b/apps/mobility-bap/lib/types/activeMenuItem.ts
@@ -0,0 +1,8 @@
+export interface IActiveMenuItem {
+ activeMenuItemIndex: number
+ activeMenuItemText: string
+}
+
+export interface IActiveMenuItemRootState {
+ activeMenuItem: IActiveMenuItem
+}
diff --git a/apps/mobility-bap/lib/types/breadcrumb.ts b/apps/mobility-bap/lib/types/breadcrumb.ts
new file mode 100644
index 000000000..7406360ef
--- /dev/null
+++ b/apps/mobility-bap/lib/types/breadcrumb.ts
@@ -0,0 +1,4 @@
+export interface IBreadcrumb {
+ breadcrumb: string
+ href: string
+}
diff --git a/apps/mobility-bap/lib/types/cart.ts b/apps/mobility-bap/lib/types/cart.ts
new file mode 100644
index 000000000..f0233b1ec
--- /dev/null
+++ b/apps/mobility-bap/lib/types/cart.ts
@@ -0,0 +1,61 @@
+import { IProductDetails, RetailItem, TSlug } from './products'
+
+export interface ICartProduct {
+ image: any
+ name: string
+ slug: TSlug
+ price: number
+ discount?: number
+ brand: string
+ category: string[]
+ starRating: number
+ isOffer?: boolean
+ details?: IProductDetails[]
+ registerDate?: string
+ quantity: number
+ totalPrice: number
+}
+
+export interface CartRetailItem extends RetailItem {
+ quantity: number
+ totalPrice: number
+}
+
+export interface CartItemForRequest extends CartRetailItem {
+ bpp_id: string
+ bpp_uri: string
+ providerId: string
+ locations: any
+}
+
+// export interface
+
+export interface ICartUI {
+ cartBoxIsVisible: boolean
+}
+
+export interface ICart {
+ items: CartRetailItem[]
+ totalQuantity: number
+ totalAmount: number
+}
+
+export type ItemPerBpp = Record
+
+//RootState interface => use for state type in useSelector hook
+
+export interface ICartUiRootState {
+ cartUi: ICartUI
+}
+
+export interface ICartRootState {
+ cart: ICart
+}
+
+export interface TransactionIdRootState {
+ transactionId: string
+}
+
+export interface DataPerBpp {
+ [key: string]: CartItemForRequest[]
+}
diff --git a/apps/mobility-bap/lib/types/categories.ts b/apps/mobility-bap/lib/types/categories.ts
new file mode 100644
index 000000000..2caf51ead
--- /dev/null
+++ b/apps/mobility-bap/lib/types/categories.ts
@@ -0,0 +1,8 @@
+import { TSlug } from './products'
+
+export interface ICategory {
+ title: string
+ slug: TSlug
+ description?: string
+ parents?: any
+}
diff --git a/apps/mobility-bap/lib/types/dropDown.ts b/apps/mobility-bap/lib/types/dropDown.ts
new file mode 100644
index 000000000..8028e0735
--- /dev/null
+++ b/apps/mobility-bap/lib/types/dropDown.ts
@@ -0,0 +1,5 @@
+export interface IDropDown {
+ title: string
+ url?: string
+ subtitles: string[]
+}
diff --git a/apps/mobility-bap/lib/types/favorite.ts b/apps/mobility-bap/lib/types/favorite.ts
new file mode 100644
index 000000000..969383cc8
--- /dev/null
+++ b/apps/mobility-bap/lib/types/favorite.ts
@@ -0,0 +1,8 @@
+import { RetailItem } from './products'
+export interface IFavorite {
+ items: RetailItem[]
+}
+
+export interface IFavoriteRootState {
+ favorite: IFavorite
+}
diff --git a/apps/mobility-bap/lib/types/megaMenu.ts b/apps/mobility-bap/lib/types/megaMenu.ts
new file mode 100644
index 000000000..e0d524d60
--- /dev/null
+++ b/apps/mobility-bap/lib/types/megaMenu.ts
@@ -0,0 +1,7 @@
+export interface IMegaMenuShow {
+ isMegaMenuOpen: boolean
+}
+
+export interface IMegaMenuRootState {
+ megaMenu: IMegaMenuShow
+}
diff --git a/apps/mobility-bap/lib/types/offerProductsState.ts b/apps/mobility-bap/lib/types/offerProductsState.ts
new file mode 100644
index 000000000..f2afa2b29
--- /dev/null
+++ b/apps/mobility-bap/lib/types/offerProductsState.ts
@@ -0,0 +1,5 @@
+import { IProduct } from './products'
+
+export interface IOfferProducts {
+ specialOfferProducts: IProduct[] | []
+}
diff --git a/apps/mobility-bap/lib/types/pagePathsParams.ts b/apps/mobility-bap/lib/types/pagePathsParams.ts
new file mode 100644
index 000000000..bfc4f4a05
--- /dev/null
+++ b/apps/mobility-bap/lib/types/pagePathsParams.ts
@@ -0,0 +1,21 @@
+export interface ICategoryPathsParams {
+ category: string
+}
+
+export interface ISubCategoryPathsParams {
+ category: string
+ subCategory: string
+}
+
+export interface ITitlePathsParams {
+ category: string
+ subCategory: string
+ title: string
+}
+
+export interface ISlugPathsParams {
+ slug: { current: string }
+ category: string
+ subCategory: string
+ title: string
+}
diff --git a/apps/mobility-bap/lib/types/productList.ts b/apps/mobility-bap/lib/types/productList.ts
new file mode 100644
index 000000000..68b4d9770
--- /dev/null
+++ b/apps/mobility-bap/lib/types/productList.ts
@@ -0,0 +1,9 @@
+import { RetailItem } from './products'
+
+export interface IProductList {
+ productsList: RetailItem[] | []
+}
+
+export interface IProductListRootState {
+ sortedProductsList: IProductList
+}
diff --git a/apps/mobility-bap/lib/types/products.ts b/apps/mobility-bap/lib/types/products.ts
new file mode 100644
index 000000000..f40aae382
--- /dev/null
+++ b/apps/mobility-bap/lib/types/products.ts
@@ -0,0 +1,110 @@
+export interface IProductDetails {
+ processor?: string
+ screen?: string
+ operating_system?: string
+ ram?: string
+ ssd?: string
+ ports?: string
+ graphic?: string
+ warranty?: string
+ back_camera?: string
+ front_camera?: string
+ battery?: string
+ frequency_response?: string
+ microphone?: boolean
+ wireless?: boolean
+ wireless_standby_time?: boolean
+ connectionType?: string[]
+ connectors?: string[]
+ bluetooth?: boolean
+ noise_cancelling?: boolean
+ sound_isolating?: boolean
+}
+
+export type TSlug = {
+ _type: string
+ current: string
+}
+
+export type TImage = {
+ _key: string
+ _type: 'image'
+ asset: {
+ _ref: string
+ _type: 'reference'
+ }
+}
+
+export interface IProduct {
+ image: any
+ name: string
+ slug: TSlug
+ price: number
+ discount?: number
+ details?: IProductDetails[]
+ brand: string
+ category: string[]
+ isOffer?: boolean
+ registerDate?: string
+ timeStamp?: number
+ starRating: number
+}
+
+/**
+ * New types for the retail
+ */
+
+export interface RetailItem {
+ extended_attributes?: any
+ price: {
+ listed_value?: string
+ currency?: string
+ value: string
+ }
+ matched?: boolean
+ id: string
+ descriptor: {
+ images: string[]
+ name: string
+ short_desc: string
+ long_desc: string
+ }
+ location_id?: string
+ recommended?: boolean
+ tags: {
+ fulfillment_start_loc?: string
+ Category?: string
+ Trekking?: string
+ Himalayas?: string
+ fulfillment_end_time?: string
+ Country?: string
+ Ladakh?: string
+ Treks?: string
+ Package?: string
+ Leh?: string
+ fulfillment_end_loc?: string
+ authorName: string
+ rating: string
+ foodType?: string
+ }
+}
+
+export interface IndustryItem {
+ extended_attributes?: any
+ price: {
+ currency?: string
+ value: string
+ }
+ id: string
+ descriptor: {
+ images: string[]
+ name: string
+ short_desc: string
+ long_desc: string
+ }
+ tags: {
+ assembly?: string
+ automated?: string
+ }
+ bppName?: string
+}
diff --git a/apps/mobility-bap/lib/types/responseModel.ts b/apps/mobility-bap/lib/types/responseModel.ts
new file mode 100644
index 000000000..048c64863
--- /dev/null
+++ b/apps/mobility-bap/lib/types/responseModel.ts
@@ -0,0 +1,23 @@
+export interface RetailContext {
+ action?: string
+ bap_id?: string
+ bap_uri?: string
+ bpp_id: string
+ bpp_uri: string
+ city?: string
+ core_version?: string
+ country?: string
+ domain?: string
+ max_callbacks?: number
+ message_id?: string
+ timestamp?: string
+ transaction_id: string
+ ttl?: string
+}
+
+export interface ResponseModel {
+ context: RetailContext
+ message: any
+ // Hacky fix
+ name: string
+}
diff --git a/apps/mobility-bap/lib/types/search.ts b/apps/mobility-bap/lib/types/search.ts
new file mode 100644
index 000000000..fc0c8e241
--- /dev/null
+++ b/apps/mobility-bap/lib/types/search.ts
@@ -0,0 +1,4 @@
+export interface SearchBarPropsModel {
+ searchString: string | string[] | undefined
+ handleChange: Function
+}
diff --git a/apps/mobility-bap/lib/types/settingBox.ts b/apps/mobility-bap/lib/types/settingBox.ts
new file mode 100644
index 000000000..87cb00502
--- /dev/null
+++ b/apps/mobility-bap/lib/types/settingBox.ts
@@ -0,0 +1,7 @@
+export interface ISettingBox {
+ isOpen: boolean
+}
+
+export interface ISettingBoxRootState {
+ settingBox: ISettingBox
+}
diff --git a/apps/mobility-bap/lib/types/sidebar.ts b/apps/mobility-bap/lib/types/sidebar.ts
new file mode 100644
index 000000000..390a42db1
--- /dev/null
+++ b/apps/mobility-bap/lib/types/sidebar.ts
@@ -0,0 +1,11 @@
+import { IDropDown } from './dropDown'
+
+export interface ISideNavBar {
+ isSidebarOpen: boolean
+ isNavbarOpen: boolean
+ dropDownList: IDropDown[]
+}
+
+export interface ISideNavBarRootState {
+ sideNavBar: ISideNavBar
+}
diff --git a/apps/mobility-bap/lib/types/user.ts b/apps/mobility-bap/lib/types/user.ts
new file mode 100644
index 000000000..a6c0ac3f6
--- /dev/null
+++ b/apps/mobility-bap/lib/types/user.ts
@@ -0,0 +1,18 @@
+export interface IUser {
+ _id?: any
+ name?: string
+ password?: string
+ email: string
+ isAdmin?: boolean
+ token?: string
+}
+
+export interface IUserInfo {
+ userInformation: IUser | null
+}
+
+//RootState interface=> used for state type in useSelector hook
+
+export interface IUserInfoRootState {
+ userInfo: IUserInfo
+}
diff --git a/apps/mobility-bap/locales/en.ts b/apps/mobility-bap/locales/en.ts
new file mode 100644
index 000000000..9b97656cc
--- /dev/null
+++ b/apps/mobility-bap/locales/en.ts
@@ -0,0 +1,361 @@
+const en: { [key: string]: string } = {
+ mainPage: 'ZiShop Main Page',
+ search: 'Search',
+ login: 'Login',
+ logout: 'Logout',
+ favorites: 'Favorites',
+ delete: 'Delete',
+ thereAreNoFavorites: 'currently, there are no favorite items',
+ signIn: 'Sign in',
+ seeCart: 'See Cart',
+ product: 'Product',
+ totalAmount: 'Total Amount',
+ totalQuantity: 'Total Quantity',
+ payableAmount: 'Payable Amount',
+ loginAndOrder: 'Login and Order',
+ orderSummary: 'Order Summary',
+ cartIsEmpty: 'Cart is empty',
+ categories: 'Categories',
+ seeAllProduct: 'See All product in this category',
+ offer: 'Offers and Discounts',
+ bestSells: 'The Best-Sells',
+ mainMenu: 'Main Menu',
+ language: 'Language: ',
+ fa: 'français - Fr',
+ en: 'English - En',
+ theme: 'Theme: ',
+ dark: 'Dark',
+ light: 'Light',
+ digital: 'Digital',
+ laptop: 'Laptop and Accessories',
+ asus: 'Asus',
+ apple: 'Apple',
+ dell: 'Dell',
+ lenovo: 'Lenovo',
+ samsung: 'Samsung',
+ hp: 'HP',
+ huawei: 'HUAWEI',
+ acer: 'Acer',
+ msi: 'MSI',
+ mobile: 'Mobile and Accessories',
+ nokia: 'Nokia',
+ xiaomi: 'Xiaomi',
+ motorola: 'Motorola',
+ lg: 'LG',
+ sony: 'Sony',
+ computer: 'Computer and Accessories',
+ monitor: 'Monitor',
+ mouse: 'Mouse',
+ keyboard: 'Keyboard',
+ hard: 'Hard, Flash memory and SSD',
+ other: 'Other',
+ tablet: 'Tablet',
+ powerBank: 'Power Bank',
+ speaker: 'Bluetooth Speaker and wire',
+ headphones: 'Headphone, Headset and Hands free',
+ fashion: 'Fashion and Clothes',
+ women: "Women's Fashion",
+ dress: 'Dress',
+ skirt: 'Skirt',
+ jeans: 'Jeans',
+ pants: 'Pants',
+ tShirt: 'T-shirt',
+ scarf: 'Scarf',
+ shirt: 'Shirt',
+ tie: 'Tie',
+ overalls: 'Overalls',
+ mittens: 'Mittens',
+ babyApron: 'Baby Apron',
+ shoes: 'Shoes',
+ watch: 'Watch',
+ wallet: 'Wallet',
+ hat: 'Hat',
+ belt: 'Belt',
+ men: "Men's Fashion",
+ child: "Child's Fashion",
+ toys: 'Toys and Baby',
+ cosmetic: 'Cosmetic',
+ home: 'Furniture and kitchen',
+ stationery: 'Books, Stationery and Art',
+ noProduct: 'There are no products in this category yet! New products will be added soon.',
+ digitalBT: 'Have the best Experiences',
+ digitalBD:
+ 'We provide the best Experience with the most popular Brands. With a warranty of 18 months, you can be confident in your choice',
+ stationeryBT: 'Variety in choice',
+ stationeryBD:
+ 'When it comes to Beauty and Efficiency. We specialize in providing stationery and office sets that are beautiful and high quality.',
+ toyBT: 'Entertainment and the growth of Creativity',
+ toyBD: 'Products with the best quality and anti-allergy to create happy moments',
+ houseBT: 'Modern Home',
+ houseBD:
+ 'enjoy beautiful moments of satisfaction and peace with your loved ones at home with products designed according to the most recent and prominent styles.',
+ fashionBT: 'Beauty and Comfort',
+ fashionBD:
+ 'You will find the best fabrics, the hottest designs, and the most popular brands at reasonable prices. Look your best and stand out among the crowd.',
+ beautyBT: 'Accentuates your Beauty',
+ beautyBD:
+ 'allergen-free, people with all skin types can find products they need. Approved by the World Health Organization, products from world-renowned brands.',
+ deliver: 'express delivery',
+ cash: 'payment on the spot',
+ support: '24/7 support',
+ warrantyBenefit: 'Guarantee the originality',
+ return: 'commodity-back guarantee',
+ offers: 'Special Offers',
+ newest: 'Newest Goods',
+ seeAll: 'See All',
+ specialSale: 'Special Sale',
+ seeAllNewProducts: 'See All New Products',
+ digitalCategoryDescription: 'We offer the newest products at the most competitive prices',
+ fashionCategoryDescription: 'The most popular brands with the most reasonable prices',
+ beautyCategoryDescription: 'Anti-allergy products suitable for all skin types from reputable brands',
+ sportCategoryDescription: 'High-quality and durable products',
+ houseCategoryDescription: 'In accordance with the designs of the day',
+ toyCategoryDescription: 'A combination of entertainment and creativity',
+ stationeryCategoryTitle: 'Books, Stationery and Art',
+ stationeryCategoryDescription: 'Variety in choice',
+ seeAllProducts: 'See All Products',
+ expireDiscount: 'Discount for this Product was Expire.',
+ days: 'Days',
+ hours: 'Hours',
+ mins: 'Mins',
+ seconds: 'Seconds',
+ larisaTitle: 'Larissa Furniture',
+ larisaDescription:
+ 'Larissa beautiful sofa with its private design can give a unique beauty to your reception decoration.',
+ byNow: 'Add to cart',
+ see: 'See Product',
+ romanoTitle: 'Romano furniture',
+ romanoDescription: 'Romano sofa has an impressive beauty and can multiply the charm of your home decoration.',
+ popularBrands: 'Popular Brands',
+ zishopMap: 'Zishop Map',
+ aboutUs: 'About Us',
+ contactUs: 'Contact Us',
+ saleInZishop: 'Sale In Zishop',
+ careerOpportunities: 'Career Opportunities',
+ customerServices: 'Customer Services',
+ commonQuestions: 'Common Questions',
+ returnProcedures: 'Return Procedures',
+ privacy: 'Privacy',
+ shoppingGuide: 'Shopping Guide',
+ howToPlaceAnOrder: 'How To Place An Order?',
+ orderSubmissionProcedure: 'Order Submission Procedure',
+ paymentMethods: 'Payment Methods',
+ beWithUs: 'Be With Us!',
+ emailRegister: 'Stay up to date with the latest discounts by emailing us',
+ yourEmail: 'Please Enter Your Email',
+ register: 'Register',
+ copyRight: '© 2022 ZiShop. All rights reserved - Designed and Developed with ',
+ sort: 'Sort based on: ',
+ all: 'All',
+ newestProducts: 'Newest',
+ cheapest: 'Cheapest',
+ popular: 'The Most Popular',
+ expensive: 'Most Expensive',
+ details: 'Product Details',
+ back_camera: 'Main Camera',
+ battery: 'Battery',
+ front_camera: 'Front Camera',
+ operating_system: 'Operating System',
+ processor: 'CPU',
+ ram: 'RAM',
+ screen: 'Screen',
+
+ resolution: 'Resolution',
+ display_type: 'Display Type',
+ viewing_angle: 'Viewing Angle',
+ response_time: 'Response Time',
+ refresh_rate: 'Refresh Rate',
+ panel_technology: 'Panel Technology',
+ input_output_types: 'Input/Output Types',
+
+ true: 'Yes',
+ false: 'No',
+ bluetooth: 'Bluetooth',
+ frequency_response: 'Frequency Response',
+ sound_isolating: 'Sound Isolating',
+ microphone: 'Microphone',
+ noise_cancelling: 'Noise Cancelling',
+ wireless: 'Wireless',
+ wireless_standby_time: 'Battery life in standby mode',
+ connectionType: 'Connection Type',
+ connectors: 'Connectors',
+
+ multimedia_keys: 'Multimedia Keys',
+ number_of_buttons: 'Number Of Buttons(Including Scroll Wheel)',
+ width: 'Width',
+ height: 'Height',
+ depth: 'Depth',
+ curved: 'Curved',
+ built_in_speakers: 'Built-in Speakers',
+ mechanical_keys: 'Mechanical Keys',
+ backlit_keys: 'Backlit Keys',
+ ergonomic_design: 'Ergonomic Design',
+ designed_for_gaming: 'Designed For Gaming',
+
+ graphic: 'Graphic',
+ ports: 'Ports',
+ ssd: 'SSD Hard',
+ warranty: 'Warranty',
+ addToCart: 'Add to Cart',
+ stars: 'Star',
+ price: 'Product price',
+ similarProducts: 'You May Be Interested In',
+ cart: 'Shopping Cart',
+ hi: 'Hi!',
+ loginExplanation:
+ 'Besides registering, you can also test the template with test account information(email: test@info.com - Password: 123456)',
+ testAccount: 'test account',
+ userName: 'User Name',
+ password: 'Password',
+ email: 'Email',
+ enterYourUserName: 'Please Enter Your UserName',
+ enterYourPassword: 'Please Enter Your Password',
+ enterYourEmail: 'Please Enter Your Email',
+ doHaveAnAccount: "Don't You Have An Account? ",
+ alreadyHaveAnAccount: 'Already You Have An Account? ',
+ signUp: 'Sign Up',
+ Invalid_email_or_password: 'Invalid email or password',
+ Email_already_exists: 'Email already exists',
+ aboutLongText:
+ 'The ZShop store template was written to consolidate my front-end knowledge, using technologies such as Nextjs, Typescript, React, Tailwindcss, etc. as a portfolio. I would like to thank CafeDX and engineer Seyed Mehdi Hasanpour for his support.',
+ aboutEnjoy: 'I hope you enjoy watching and working with this template.',
+ myName: 'Kehyshow',
+ cafeDX: 'Work is meant to improve life, not the opposite.',
+ productAddedToCartMsg: 'Product added to cart successfully',
+ /**
+ * New strings that are added
+ */
+
+ BrowseByCategory: 'Browse by Category',
+ meatAndFish: 'Meat & Fish',
+ fruitsVegetablesTitle: 'Fruits and Vegetables',
+ frozenFood: 'Frozen Food',
+ beverages: 'Beverages',
+ snacks: 'Snacks',
+ dairy: 'Dairy',
+ cashOnDelivery: 'Cash on Delivery',
+ selectPaymentMethod: 'Select payment method',
+ orderDetails: 'Order details',
+ trackOrder: 'Track Order',
+ proceedToPay: 'Proceed',
+ proceedToCheckout: 'Proceed to Checkout',
+ backToHome: 'Go back to home',
+ contactSupport: 'Contact Support',
+ orderDeliveredOnTime: 'Order Delivered on time!',
+ shareYourfeedback: 'Please share your feedback with us',
+ submitReview: 'Submit Review',
+ skipForNow: 'Skip for now',
+ orderConfirmed: 'Order Confirmed',
+ orderConfirmedMssg: 'ABC Mart has confirmed your order',
+ orderConfirmedTime: '10.13 AM',
+ agentAssigned: 'Delivery Agent Assigned',
+ agentAssignedMssg: 'Steve our delivery partner is at the store to pick up your order',
+ agentAssignedTime: '10.35AM',
+ OFD: 'Out for delivery',
+ OFDMssg: 'Order has been picked up! Our delivery partner is on their way to your location for delivery.',
+ OFDTime: '11.27AM',
+ orderDeliveredMssg: 'Order has been delivered ',
+ orderDeliveredTime: '12.23 PM',
+ checkout: 'Checkout',
+ items: 'Items',
+ shipping: 'Shipping',
+ billing: 'Billing',
+ changeText: 'Change',
+ paymentText: 'Payment',
+ orderDetailsCheckboxText: 'Same as Shipping Details',
+ subtotalText: 'Subtotal',
+ deliveryChargesText: 'Delivery Charges',
+ totalText: 'Total',
+ orderpolicyText: 'Order policy',
+ orderPolicyText:
+ 'In publishing and graphic design, Lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document or a typeface without relying on In publishing and graphic design, Lorem ipsum is a placeholder text commonly used to demonstrate the visual form of a document or a typeface without relying on',
+ readMoreText: 'Read more',
+ readLessText: 'Read Less',
+ addShippingdetailsBtnText: 'Add Shipping Details',
+ orderHistory: 'Order history',
+ bottomModalTitle: 'Search',
+ optionRestaurants: 'Restaurants',
+ optionRestaurant: 'Restaurant',
+ restaurants: 'Restaurants in',
+ optionStores: 'Retail Stores',
+ optionHotels: 'Hotels',
+ optionBooks: 'Book Stores',
+ categoryLoadPrimary: 'Please wait!',
+ categoryLoadSecondary: 'Fetching store catalog from the network',
+ shopButton: 'Shop',
+ summary: 'Summary',
+ fulfillment: 'Fulfillment ',
+ order: 'Order',
+ localStores: 'Local stores in',
+ cartLoader: 'Getting Quotes',
+ initializingOrderLoader: 'Please wait while we set things up for you',
+ confirmingOrderLoader: 'Please wait while we confirm your order',
+ orderConfirm: 'Order Confirmed!',
+ confirmOrderMessage: 'Thank you! Our delivery agent will deliver your order',
+ currencySymbol: '€',
+ saveShippingDetails: 'Save Shipping Details',
+ saveBillingDetails: 'Save Billing Details',
+ addBillingDetails: 'Add Billing Details',
+ explorePlaces: 'Explore Nearby Places',
+ comingSoon: 'Coming Soon !',
+ confirmOrder: 'Confirm Order',
+ orderPlacedAt: 'Placed At',
+ ordersFulfilled: 'Orders Fulfilled',
+ subTotal: 'Sub Total',
+ deliveryCharge: 'Delivery Charges',
+ total: 'Total',
+ status: 'Status',
+ paymentMethod: 'Payment Method',
+ cards: 'Debit & Credit Cards',
+ addCard: 'Add',
+ orderPlaced: 'Order Placed!',
+ inStoreShopping: 'In-store-shopping',
+ delivery: 'Delivery',
+ clickAndCollect: 'Click & Collect',
+ dineIn: 'Dine-in',
+ takeAway: 'Takeaway',
+ bookstore: 'Bookstore',
+ formName: 'Name',
+ formNumber: 'Mobile Number',
+ formEmail: 'Email ID',
+ formAddress: 'Complete Address',
+ formZipCode: 'Zip Code',
+ errorName: 'Name is required',
+ errorNumber: 'Mobile Number is required',
+ errorNumber2: 'Invalid Mobile Number',
+ errorNumber3: 'Mobile Number must have 10 digits',
+ errorEmail: 'Email is required',
+ errorEmail2: 'Email Mobile Number',
+ errorAddress: 'Complete Address is required',
+ errorZipcode: 'Zip code is required',
+ errorZipcode2: 'Invalid Zip code',
+ confirmMessage1: 'Thank you! Your order will be',
+ confirmMessage2: 'confirmed shortly',
+ sendOtpButton: 'Send OTP',
+ verifyMobile: 'Verify your Mobile Number',
+ otpMessage1: 'Have sent an OTP to your mobile',
+ otpMessage2: 'number ending with',
+ otpPlaceholder: 'Enter OTP here',
+ loginButton: 'Login',
+ errorOtp1: 'OTP is required',
+ errorOtp2: 'OTP must have 6 digits',
+ catalogLoader: 'Please Wait!',
+ catalogSubLoader: 'Fetching store catalog from the network',
+ quoteRequestLoader: 'Please wait! Your order is getting processed',
+ estimatedDelivery: 'Estimated delivery time',
+ orderId: 'Order ID',
+ pending: 'Pending',
+ confirmed: 'Confirmed',
+ delivered: 'Delivered',
+ confirmationPending: 'Confirmation Pending',
+ itemsConfirmed: 'Items Confirmed',
+ orderPacked: 'Order Packed',
+ outForDelivery: 'Order Out for Delivery',
+ orderDelivered: 'Order Delivered',
+ rateStore: 'Rate the store',
+ rateDeliveryExperience: 'Rate the delivery experience',
+ addCommentsHere: 'Add your comments here',
+ writeExperience: 'Write about your experience..',
+ completed: 'Completed'
+}
+export default en
diff --git a/apps/mobility-bap/locales/fa.ts b/apps/mobility-bap/locales/fa.ts
new file mode 100644
index 000000000..f7f764ef9
--- /dev/null
+++ b/apps/mobility-bap/locales/fa.ts
@@ -0,0 +1,350 @@
+const fa: { [key: string]: string } = {
+ mainPage: 'Page principale de ZiShop',
+ search: 'Recherche',
+ login: 'Connexion',
+ logout: 'Se déconnecter',
+ favorites: 'Favoris',
+ delete: 'Supprimer',
+ thereAreNoFavorites: "actuellement, il n'y a pas d'articles favoris",
+ signIn: "S'identifier",
+ seeCart: 'Voir le panier',
+ product: 'Produit',
+ totalAmount: 'Montant total',
+ totalQuantity: 'Quantité totale',
+ payableAmount: 'Montant payable',
+ loginAndOrder: 'Se connecter et commander',
+ orderSummary: 'Récapitulatif de la commande',
+ cartIsEmpty: 'Le panier est vide',
+ categories: 'Catégories',
+ seeAllProduct: 'Voir tous les produits de cette catégorie',
+ offer: 'Offres et réductions',
+ bestSells: 'Les meilleures ventes',
+ mainMenu: 'Menu principal',
+ language: 'Langue: ',
+ fa: 'français - Fa',
+ en: 'Anglais - En',
+ theme: 'Thème: ',
+ dark: 'Sombre',
+ light: 'Lumière',
+ digital: 'Numérique',
+ laptop: 'Ordinateur portable et accessoires',
+ asus: 'Asus',
+ apple: 'Pomme',
+ dell: 'Dell',
+ lenovo: 'Lenovo',
+ samsung: 'Samsung',
+ hp: 'CV',
+ huawei: 'HUAWEI',
+ acer: 'Acer',
+ msi: 'MSI',
+ mobile: 'Mobile et Accessoires',
+ nokia: 'Nokia',
+ xiaomi: 'Xiaomi',
+ motorola: 'Motorola',
+ lg: 'LG',
+ sony: 'Sony',
+ computer: 'Ordinateur et Accessoires',
+ monitor: 'Moniteur',
+ mouse: 'Souris',
+ keyboard: 'Clavier',
+ hard: 'Disque dur, mémoire Flash et SSD',
+ other: 'Autre',
+ tablet: 'Tablette',
+ powerBank: "Banque d'alimentation",
+ speaker: 'Haut-parleur Bluetooth et fil',
+ headphones: 'Casque, casque et mains libres',
+ fashion: 'Mode et vêtements',
+ women: 'La mode des femmes',
+ dress: 'Robe',
+ skirt: 'Jupe',
+ jeans: 'jeans',
+ pants: 'Pantalon',
+ tShirt: 'T-shirt',
+ scarf: 'Foulard',
+ shirt: 'Chemise',
+ tie: 'Cravate',
+ overalls: 'Salopette',
+ mittens: 'Mitaines',
+ babyApron: 'Tablier bébé',
+ shoes: 'Chaussures',
+ watch: 'Montre',
+ wallet: 'Portefeuille',
+ hat: 'Chapeau',
+ belt: 'Ceinture',
+ men: 'La mode masculine',
+ child: 'Mode enfantine',
+ toys: 'Jouets et Bébé',
+ cosmetic: 'Cosmétique',
+ home: 'Meubles et cuisine',
+ stationery: 'Livres, Papeterie et Art',
+ noProduct: "Il n'y a pas encore de produits dans cette catégorie ! ",
+ digitalBT: 'Vivez les meilleures expériences',
+ digitalBD: 'Nous fournissons la meilleure expérience avec les marques les plus populaires. ',
+ stationeryBT: 'Variété de choix',
+ stationeryBD: "Quand il s'agit de Beauté et d'Efficacité. ",
+ toyBT: 'Divertissement et croissance de la créativité',
+ toyBD: 'Des produits de la meilleure qualité et anti-allergiques pour créer des moments heureux',
+ houseBT: 'Maison moderne',
+ houseBD:
+ 'profitez de beaux moments de satisfaction et de paix avec vos proches à la maison avec des produits conçus selon les styles les plus récents et les plus en vue.',
+ fashionBT: 'Beauté et confort',
+ fashionBD:
+ 'Vous trouverez les meilleurs tissus, les designs les plus en vogue et les marques les plus populaires à des prix raisonnables. ',
+ beautyBT: 'Accentue votre Beauté',
+ beautyBD: 'sans allergènes, les personnes de tous types de peau peuvent trouver les produits dont elles ont besoin. ',
+ deliver: 'livraison express',
+ cash: 'paiement sur place',
+ support: 'Assistance 24h/24 et 7j/7',
+ warrantyBenefit: "Garantir l'originalité",
+ return: 'garantie de remboursement des marchandises',
+ offers: 'Offres spéciales',
+ newest: 'Marchandises les plus récentes',
+ seeAll: 'Voir tout',
+ specialSale: 'Vente spéciale',
+ seeAllNewProducts: 'Voir tous les nouveaux produits',
+ digitalCategoryDescription: 'Nous offrons les produits les plus récents aux prix les plus compétitifs',
+ fashionCategoryDescription: 'Les marques les plus populaires avec les prix les plus raisonnables',
+ beautyCategoryDescription: 'Produits anti-allergiques adaptés à tous les types de peau de marques réputées',
+ sportCategoryDescription: 'Des produits de qualité et durables',
+ houseCategoryDescription: 'Conforme aux dessins du jour',
+ toyCategoryDescription: 'Une combinaison de divertissement et de créativité',
+ stationeryCategoryTitle: 'Livres, Papeterie et Art',
+ stationeryCategoryDescription: 'Variété de choix',
+ seeAllProducts: 'Voir tous les produits',
+ expireDiscount: 'La remise pour ce produit était Expire.',
+ days: 'Jours',
+ hours: 'Heures',
+ mins: 'Minutes',
+ seconds: 'Secondes',
+ larisaTitle: 'Meubles Larissa',
+ larisaDescription:
+ 'Le beau canapé Larissa avec son design privé peut donner une beauté unique à votre décoration de réception.',
+ byNow: 'Ajouter au panier',
+ see: 'Voir le produit',
+ romanoTitle: 'Meubles romans',
+ romanoDescription:
+ 'Le canapé Romano a une beauté impressionnante et peut multiplier le charme de la décoration de votre maison.',
+ popularBrands: 'Marques populaires',
+ zishopMap: 'Carte de Zishop',
+ aboutUs: 'À propos de nous',
+ contactUs: 'Contactez-nous',
+ saleInZishop: 'Vente à Zishop',
+ careerOpportunities: 'Opportunités de carrière',
+ customerServices: 'Service client',
+ commonQuestions: 'Questions courantes',
+ returnProcedures: 'Procédures de retour',
+ privacy: 'Confidentialité',
+ shoppingGuide: "Guide d'achat",
+ howToPlaceAnOrder: 'Comment passer une commande ?',
+ orderSubmissionProcedure: 'Procédure de soumission de commande',
+ paymentMethods: 'méthodes de payement',
+ beWithUs: 'Soyez avec nous!',
+ emailRegister: 'Restez au courant des dernières réductions en nous envoyant un e-mail',
+ yourEmail: 'Veuillez saisir votre e-mail',
+ register: 'Enregistrer',
+ copyRight: '© 2022 ZiShop. ',
+ sort: 'Trier en fonction de : ',
+ all: 'Tous',
+ newestProducts: 'Le plus récent',
+ cheapest: 'Le moins cher',
+ popular: 'Le plus populaire',
+ expensive: 'Le plus cher',
+ details: 'détails du produit',
+ back_camera: 'Caméra principale',
+ battery: 'Batterie',
+ front_camera: 'Caméra frontale',
+ operating_system: 'Système opérateur',
+ processor: 'CPU',
+ ram: 'RAM',
+ screen: 'Filtrer',
+ resolution: 'Résolution',
+ display_type: "Type d'affichage",
+ viewing_angle: 'Angle de vue',
+ response_time: 'Temps de réponse',
+ refresh_rate: 'Fréquence de rafraîchissement',
+ panel_technology: 'Technologie des panneaux',
+ input_output_types: "Types d'entrée/sortie",
+ true: 'Oui',
+ false: 'Non',
+ bluetooth: 'Bluetooth',
+ frequency_response: 'Fréquence de réponse',
+ sound_isolating: 'Isolation acoustique',
+ microphone: 'Microphone',
+ noise_cancelling: 'Suppression du bruit',
+ wireless: 'Sans fil',
+ wireless_standby_time: 'Autonomie de la batterie en mode veille',
+ connectionType: 'Type de connexion',
+ connectors: 'Connecteurs',
+ multimedia_keys: 'Touches multimédia',
+ number_of_buttons: 'Nombre de boutons (y compris la molette de défilement)',
+ width: 'Largeur',
+ height: 'Hauteur',
+ depth: 'Profondeur',
+ curved: 'Incurvé',
+ built_in_speakers: 'Haut-parleurs intégrés',
+ mechanical_keys: 'Clés mécaniques',
+ backlit_keys: 'Touches rétroéclairées',
+ ergonomic_design: 'Design ergonomique',
+ designed_for_gaming: 'Conçu pour les jeux',
+ graphic: 'Graphique',
+ ports: 'Ports',
+ ssd: 'Disque dur SSD',
+ warranty: 'garantie',
+ addToCart: 'AJOUTER AU PANIER',
+ stars: 'Étoile',
+ price: 'Prix du produit',
+ similarProducts: 'Vous etes peut etre intéressé',
+ cart: 'Panier',
+ hi: 'Salut!',
+ loginExplanation:
+ 'En plus de vous inscrire, vous pouvez également tester le modèle avec les informations du compte de test (e-mail : test@info.com - Mot de passe : 123456)',
+ testAccount: "compte d'essai",
+ userName: "Nom d'utilisateur",
+ password: 'Mot de passe',
+ email: 'E-mail',
+ enterYourUserName: "S'il vous plaît entrez votre nom d'utilisateur",
+ enterYourPassword: "S'il vous plait entrez votre mot de passe",
+ enterYourEmail: 'Veuillez saisir votre e-mail',
+ doHaveAnAccount: "Vous n'avez pas de compte ? ",
+ alreadyHaveAnAccount: 'Vous avez déjà un compte ? ',
+ signUp: "S'inscrire",
+ Invalid_email_or_password: 'email ou mot de passe invalide',
+ Email_already_exists: "l'email existe déjà",
+ aboutLongText:
+ 'Le modèle de magasin ZShop a été écrit pour consolider mes connaissances frontales, en utilisant des technologies telles que Nextjs, Typescript, React, Tailwindcss, etc. en tant que portefeuille. ',
+ aboutEnjoy: "J'espère que vous apprécierez regarder et travailler avec ce modèle.",
+ myName: 'Kehyshow',
+ cafeDX: "Le travail a pour but d'améliorer la vie, et non l'inverse.",
+ productAddedToCartMsg: 'Produit ajouté au panier avec succès',
+ BrowseByCategory: 'Parcourir par catégorie',
+ meatAndFish: 'Viande',
+ fruitsVegetablesTitle: 'Fruits et légumes',
+ frozenFood: 'Des surgelés',
+ beverages: 'Breuvages',
+ snacks: 'Collations',
+ dairy: 'Laitier',
+ cashOnDelivery: 'Paiement à la réception',
+ selectPaymentMethod: 'Sélectionnez le mode de paiement',
+ orderDetails: 'Détails de la commande',
+ trackOrder: 'Suivi de commande',
+ proceedToPay: 'Procéder au paiement',
+ backToHome: 'Retournez à la maison',
+ contactSupport: 'Contactez le support',
+ orderDeliveredOnTime: 'Commande livrée à temps !',
+ shareYourfeedback: "S'il vous plaît partagez vos commentaires avec nous",
+ submitReview: 'Poster le commentaire',
+ skipForNow: 'Passer pour le moment',
+ orderConfirmed: 'Commande confirmée',
+ orderConfirmedMssg: 'ABC Mart a confirmé votre commande',
+ orderConfirmedTime: '10h13',
+ agentAssigned: "Un livreur s'occupe de vous",
+ agentAssignedMssg: 'Steve notre transporteur est au magasin pour récupérer votre commande.',
+ agentAssignedTime: '10h35',
+ OFD: 'En cours de livraison',
+ OFDMssg: 'La commande a été récupérée ! ',
+ orderDeliveredMssg: 'La commande a été retirée ! Notre transporteur est en chemin pour vous livrer',
+ orderDeliveredTime: '12h23',
+ checkout: 'Vérifier',
+ items: 'Articles',
+ shipping: 'Expédition',
+ billing: 'Facturation',
+ changeText: 'Changer',
+ paymentText: 'Paiement',
+ orderDetailsCheckboxText: "Identique aux détails d'expédition",
+ subtotalText: 'Total',
+ deliveryChargesText: 'Frais de livraison',
+ totalText: 'Total',
+ orderpolicyText: 'Politique de commande',
+ orderPolicyText:
+ "Dans l'édition et la conception graphique, Lorem ipsum est un texte d'espace réservé couramment utilisé pour démontrer la forme visuelle d'un document ou d'une police de caractères sans s'appuyer sur Dans l'édition et la conception graphique, Lorem ipsum est un texte d'espace réservé couramment utilisé pour démontrer la forme visuelle d'un document ",
+ readMoreText: 'En savoir plus',
+ readLessText: 'Lire moins',
+ addShippingdetailsBtnText: 'Ajouter les détails de livraison',
+ orderHistory: 'Historique des commandes',
+ bottomModalTitle: 'Recherche',
+ optionRestaurants: 'Restaurants',
+ optionRestaurant: 'Restaurant',
+ restaurants: 'Restaurants à',
+ optionStores: 'Commerces',
+ optionHotels: 'Hôtels',
+ optionBooks: 'Librairies',
+ categoryLoadPrimary: "S'il vous plaît, attendez!",
+ categoryLoadSecondary: 'Récupération du catalogue du magasin à partir du réseau',
+ shopButton: 'magasiner',
+ summary: 'Summary',
+ fulfillment: 'Fulfillment ',
+ order: 'Commande',
+ localStores: 'Commerces de proximité',
+ cartLoader: 'Obtention des devis',
+ initializingOrderLoader: 'Veuillez patienter pendant que nous préparons les choses pour vous',
+ confirmingOrderLoader: 'Veuillez patienter pendant que nous confirmons votre commande',
+ orderConfirm: 'Commande confirmée!',
+ confirmOrderMessage: 'Merci ! Notre agent de livraison vous livrera votre commande.',
+ currencySymbol: '€',
+ saveShippingDetails: "Enregistrer l'expédition détails",
+ saveBillingDetails: 'Enregistrer les détails de facturation',
+ addBillingDetails: 'Ajouter les détails de facturation',
+ comingSoon: 'À venir !',
+ proceedToCheckout: 'Vérifier',
+ confirmOrder: 'Confirmer la commande',
+ orderPlacedAt: 'Passée à ',
+ ordersFulfilled: 'Commande honorée',
+ subTotal: 'Sous-total',
+ deliveryCharge: 'Frais de livraison',
+ total: 'Total',
+ status: 'Statut',
+ paymentMethod: 'Méthode de paiement',
+ explorePlaces: 'Explorer les lieux à proximité',
+ cards: 'Cartes bancaires',
+ addCard: 'Ajouter',
+ orderPlaced: 'commande passée',
+ inStoreShopping: 'Achats en magasin',
+ delivery: 'Livraison',
+ clickAndCollect: 'Click & Collect',
+ dineIn: 'Service sur place',
+ takeAway: 'À emporte',
+ bookstore: 'Librairie',
+ formName: 'Nom',
+ formNumber: 'Numéro de téléphone portable',
+ formEmail: 'Adresse e-mail',
+ formAddress: 'Adresse complète',
+ formZipCode: 'Code Interphone',
+ errorName: 'Le nom est requis',
+ errorNumber: 'Le numéro de téléphone portable est requis',
+ errorNumber2: 'Numéro de téléphone portable invalide',
+ errorNumber3: 'Le numéro de téléphone portable doit comporter 10 chiffres',
+ errorEmail: "L'e-mail est requis",
+ errorEmail2: 'Adresse e-mail invalide',
+ errorAddress: "L'adresse complète est requise",
+ errorZipcode: 'Le code interphone est requis',
+ errorZipcode2: 'Code nterphone invalide',
+ confirmMessage1: 'Merci ! Notre commande sera',
+ confirmMessage2: 'confirmée sous peu',
+ sendOtpButton: 'Envoyer',
+ verifyMobile: 'Vérifier le numéro de téléphone',
+ otpMessage1: 'Un code a été envoyé à votre téléphone',
+ otpMessage2: 'se termine par',
+ otpPlaceholder: 'Entrez le code ici',
+ loginButton: 'Se connecter',
+ errorOtp1: 'Code requis',
+ errorOtp2: 'Code invalide',
+ catalogLoader: 'Veuillez patienter !',
+ catalogSubLoader: 'Récupération du catalogue du magasin depuis le réseau',
+ quoteRequestLoader: "S'il vous plaît, attendez! Votre commande est en cours de traitement",
+ estimatedDelivery: 'Délai de livraison estimé au ',
+ orderId: 'De la livraison',
+ pending: 'En attente',
+ confirmed: 'Confirmé',
+ delivered: 'Livrée',
+ confirmationPending: 'Confirmation en attente',
+ itemsConfirmed: 'Articles confirmés',
+ orderPacked: 'Commande emballée',
+ outForDelivery: 'Prêt pour la livraison',
+ orderDelivered: 'Commande livrée',
+ rateStore: 'Évaluer le magasin',
+ rateDeliveryExperience: "Évaluer l'expérience de livraison",
+ addCommentsHere: 'Ajoutez vos commentaires ici',
+ writeExperience: 'Décrivez votre expérience..',
+ completed: 'Complété'
+}
+export default fa
diff --git a/apps/mobility-bap/mock/banner.js b/apps/mobility-bap/mock/banner.js
new file mode 100644
index 000000000..33616eb6a
--- /dev/null
+++ b/apps/mobility-bap/mock/banner.js
@@ -0,0 +1,22 @@
+export const bannerContent = [
+ {
+ title: 'larisaTitle',
+ description: 'larisaDescription',
+ buttonText: 'see',
+ imgSrc: '/images/banners-img/home1.webp',
+ imgWidth: 980,
+ imgHeight: 500,
+ numberOfDiscountDate: 9,
+ href: '/'
+ },
+ {
+ title: 'romanoTitle',
+ description: 'romanoDescription',
+ buttonText: 'see',
+ imgSrc: '/images/banners-img/home2.webp',
+ imgWidth: 980,
+ imgHeight: 500,
+ numberOfDiscountDate: 7,
+ href: '/'
+ }
+]
diff --git a/apps/mobility-bap/mock/benefits.js b/apps/mobility-bap/mock/benefits.js
new file mode 100644
index 000000000..2a90a085d
--- /dev/null
+++ b/apps/mobility-bap/mock/benefits.js
@@ -0,0 +1,22 @@
+export const benefitContent = [
+ {
+ imgSrc: '/images/benefit-icons/005-delivery-truck-2.webp',
+ title: 'deliver'
+ },
+ {
+ imgSrc: '/images/benefit-icons/003-cash-on-delivery.webp',
+ title: 'cash'
+ },
+ {
+ imgSrc: '/images/benefit-icons/004-headphones.webp',
+ title: 'support'
+ },
+ {
+ imgSrc: '/images/benefit-icons/006-best-seller.webp',
+ title: 'warrantyBenefit'
+ }
+ // {
+ // imgSrc: "/images/benefit-icons/007-return.png",
+ // title: "return",
+ // },
+]
diff --git a/apps/mobility-bap/mock/brand.js b/apps/mobility-bap/mock/brand.js
new file mode 100644
index 000000000..8d2a49622
--- /dev/null
+++ b/apps/mobility-bap/mock/brand.js
@@ -0,0 +1,122 @@
+export const brandContent = [
+ {
+ id: 1,
+ name: 'adidas',
+ imgSrc: '/images/brand-logo-img/adidas.webp'
+ },
+ {
+ id: 2,
+ name: 'apple',
+ imgSrc: '/images/brand-logo-img/apple.webp'
+ },
+ {
+ id: 3,
+ name: 'asus',
+ imgSrc: '/images/brand-logo-img/asus.webp'
+ },
+ {
+ id: 4,
+ name: 'benq',
+ imgSrc: '/images/brand-logo-img/benq.webp'
+ },
+ {
+ id: 5,
+ name: 'bvlgari',
+ imgSrc: '/images/brand-logo-img/bvlgari.webp'
+ },
+ {
+ id: 6,
+ name: 'del',
+ imgSrc: '/images/brand-logo-img/del.webp'
+ },
+ {
+ id: 7,
+ name: 'dior',
+ imgSrc: '/images/brand-logo-img/dior.webp'
+ },
+ {
+ id: 8,
+ name: 'dolce-gabbana',
+ imgSrc: '/images/brand-logo-img/dolce-gabbana.webp'
+ },
+ {
+ id: 9,
+ name: 'gucci',
+ imgSrc: '/images/brand-logo-img/gucci.webp'
+ },
+ {
+ id: 10,
+ name: 'hp',
+ imgSrc: '/images/brand-logo-img/hp.webp'
+ },
+ {
+ id: 11,
+ name: 'lg',
+ imgSrc: '/images/brand-logo-img/lg.webp'
+ },
+ {
+ id: 12,
+ name: 'loreal',
+ imgSrc: '/images/brand-logo-img/loreal.webp'
+ },
+ {
+ id: 13,
+ name: 'louis-vuitton',
+ imgSrc: '/images/brand-logo-img/louis-vuitton.webp'
+ },
+ {
+ id: 14,
+ name: 'mac',
+ imgSrc: '/images/brand-logo-img/mac.webp'
+ },
+ {
+ id: 15,
+ name: 'maybelline',
+ imgSrc: '/images/brand-logo-img/maybelline.webp'
+ },
+ {
+ id: 16,
+ name: 'msi',
+ imgSrc: '/images/brand-logo-img/msi.webp'
+ },
+ {
+ id: 17,
+ name: 'patek-philippe',
+ imgSrc: '/images/brand-logo-img/patek-philippe.webp'
+ },
+ {
+ id: 18,
+ name: 'puma',
+ imgSrc: '/images/brand-logo-img/puma.webp'
+ },
+ {
+ id: 19,
+ name: 'rolex',
+ imgSrc: '/images/brand-logo-img/rolex.webp'
+ },
+ {
+ id: 20,
+ name: 'samsung',
+ imgSrc: '/images/brand-logo-img/samsung.webp'
+ },
+ {
+ id: 21,
+ name: 'sony',
+ imgSrc: '/images/brand-logo-img/sony.webp'
+ },
+ {
+ id: 22,
+ name: 'toshiba',
+ imgSrc: '/images/brand-logo-img/toshiba.webp'
+ },
+ {
+ id: 23,
+ name: 'versace',
+ imgSrc: '/images/brand-logo-img/versace.webp'
+ },
+ {
+ id: 24,
+ name: 'xiaomi',
+ imgSrc: '/images/brand-logo-img/xiaomi.webp'
+ }
+]
diff --git a/apps/mobility-bap/mock/category-lg.js b/apps/mobility-bap/mock/category-lg.js
new file mode 100644
index 000000000..f1f2edd31
--- /dev/null
+++ b/apps/mobility-bap/mock/category-lg.js
@@ -0,0 +1,123 @@
+export const categoryLgContent = [
+ {
+ name: 'digital',
+ title: 'fruitsVegetablesTitle',
+ description: 'digitalCategoryDescription',
+ styles: {
+ backgroundColor: 'var(--digital-category-bgc)',
+ flexDirection: 'row',
+ paddingBlock: '2rem',
+ paddingInline: '1rem',
+ gridRow: 'span 6 / span 6',
+ gridColumn: 'span 3 / span 3'
+ },
+ href: '/digital',
+ imgSrc: '/images/category-img/fruits-Vegetable.svg',
+ imgWidth: 190,
+ imgHeight: 240
+ },
+ {
+ name: 'fashion',
+ title: 'frozenFood',
+ description: 'fashionCategoryDescription',
+ styles: {
+ backgroundColor: 'var(--fashion-category-bgc)',
+ flexDirection: 'row',
+ paddingInline: '1rem',
+ paddingBlock: 'unset',
+ gridRow: 'span 6 / span 6',
+ gridColumn: 'span 3 / span 3'
+ },
+ href: '/fashion',
+ imgSrc: '/images/category-img/frozen-food.svg',
+ imgWidth: 240,
+ imgHeight: 250
+ },
+ {
+ name: 'beauty',
+ title: 'beverages',
+ description: 'beautyCategoryDescription',
+ styles: {
+ backgroundColor: 'var(--beauty-category-bgc)',
+ flexDirection: 'row',
+ paddingInline: '1rem',
+ paddingBlock: '0.5rem',
+ gridRow: 'span 3 / span 3',
+ gridColumn: 'span 3 / span 3'
+ },
+ href: '/beauty',
+ imgSrc: '/images/category-img/beverages.svg',
+ imgWidth: 170,
+ imgHeight: 150
+ },
+ {
+ name: 'sport',
+ title: 'meatAndFish',
+ description: 'sportCategoryDescription',
+ styles: {
+ backgroundColor: 'var(--sport-category-bgc)',
+ flexDirection: 'row-reverse',
+ paddingInline: 'unset',
+ paddingBlock: '0.5rem',
+ gridRow: 'span 3 / span 3',
+ gridColumn: 'span 3 / span 3'
+ },
+ href: '/sport',
+ imgSrc: '/images/category-img/meat-and-fish.svg',
+ imgWidth: 130,
+ imgHeight: 150
+ },
+ {
+ name: 'house',
+ title: 'snacks',
+ description: 'houseCategoryDescription',
+ styles: {
+ backgroundColor: 'var(--house-category-bgc)',
+ flexDirection: 'row',
+ paddingInline: '1rem',
+ paddingBlock: 'unset',
+ gridRow: 'span 2 / span 2',
+ gridColumn: 'span 5 / span 5'
+ },
+ href: '/house',
+ imgSrc: '/images/category-img/snacks.svg',
+ imgWidth: 320,
+ imgHeight: 240
+ },
+ {
+ name: 'toy',
+ title: 'dairy',
+ description: 'toyCategoryDescription',
+ styles: {
+ backgroundColor: 'var(--toy-category-bgc)',
+ flexDirection: 'column',
+ paddingInline: '0.5rem',
+ paddingBlock: '0.5rem',
+ textAlign: 'center',
+ gridRow: 'span 2 / span 2',
+ gridColumn: 'span 2 / span 2'
+ },
+ href: '/toy',
+ imgSrc: '/images/category-img/dairy.svg',
+ imgWidth: 130,
+ imgHeight: 110
+ },
+ {
+ name: 'stationery',
+ title: 'stationeryCategoryTitle',
+ description: 'stationeryCategoryDescription',
+ styles: {
+ backgroundColor: 'var(--stationery-category-bgc)',
+ flexDirection: 'row',
+ paddingInline: '0.75rem',
+ paddingBlock: 'unset',
+ gridRow: 'span 2 / span 2',
+ gridColumn: 'span 2 / span 2'
+ },
+ href: '/stationery',
+ imgSrc: '/images/category-img/stationery-category.webp',
+ imgWidth: 130,
+ imgHeight: 250,
+ imgCustomStyles: { alignSelf: 'flex-start' }
+ }
+]
diff --git a/apps/mobility-bap/mock/category-sm.js b/apps/mobility-bap/mock/category-sm.js
new file mode 100644
index 000000000..372933252
--- /dev/null
+++ b/apps/mobility-bap/mock/category-sm.js
@@ -0,0 +1,44 @@
+export const categorySmContent = [
+ {
+ bgc: 'digitalCategory',
+ imgSrc: 'fruits-Vegetable.svg',
+ categoryTitle: 'fruitsVegetablesTitle',
+ href: '/digital'
+ },
+ {
+ bgc: 'fashionCategory',
+ imgSrc: 'frozen-food.svg',
+ categoryTitle: 'frozenFood',
+ href: '/fashion'
+ },
+ {
+ bgc: 'beautyCategory',
+ imgSrc: 'beverages.svg',
+ categoryTitle: 'beverages',
+ href: '/beauty'
+ },
+ {
+ bgc: 'sportCategory',
+ imgSrc: 'meat-and-fish.svg',
+ categoryTitle: 'meatAndFish',
+ href: '/sport'
+ },
+ {
+ bgc: 'houseCategory',
+ imgSrc: 'snacks.svg',
+ categoryTitle: 'snacks',
+ href: '/house'
+ },
+ {
+ bgc: 'toyCategory',
+ imgSrc: 'dairy.svg',
+ categoryTitle: 'dairy',
+ href: '/toy'
+ },
+ {
+ bgc: 'stationeryCategory',
+ imgSrc: 'stationery-category.webp',
+ categoryTitle: 'stationeryCategoryTitle',
+ href: '/stationery'
+ }
+]
diff --git a/apps/mobility-bap/mock/footer.js b/apps/mobility-bap/mock/footer.js
new file mode 100644
index 000000000..101b9c81f
--- /dev/null
+++ b/apps/mobility-bap/mock/footer.js
@@ -0,0 +1,83 @@
+import { FaLinkedin, FaTwitterSquare, FaTelegramPlane } from 'react-icons/fa'
+import { AiFillInstagram } from 'react-icons/ai'
+
+export const footerContent = [
+ {
+ title: 'zishopMap',
+ subtitles: [
+ {
+ text: 'aboutUs',
+ href: '/about'
+ },
+ {
+ text: 'contactUs',
+ href: '/blank'
+ },
+ {
+ text: 'saleInZishop',
+ href: '/blank'
+ },
+ {
+ text: 'careerOpportunities',
+ href: '/blank'
+ }
+ ]
+ },
+ {
+ title: 'customerServices',
+ subtitles: [
+ {
+ text: 'commonQuestions',
+ href: '/blank'
+ },
+ {
+ text: 'returnProcedures',
+ href: '/blank'
+ },
+ {
+ text: 'privacy',
+ href: '/blank'
+ }
+ ]
+ },
+ {
+ title: 'shoppingGuide',
+ subtitles: [
+ {
+ text: 'howToPlaceAnOrder',
+ href: '/blank'
+ },
+ {
+ text: 'orderSubmissionProcedure',
+ href: '/blank'
+ },
+ {
+ text: 'paymentMethods',
+ href: '/blank'
+ }
+ ]
+ }
+]
+
+export const socialMedia = [
+ {
+ name: 'instagram',
+ icon: AiFillInstagram,
+ href: '/'
+ },
+ {
+ name: 'linkedin',
+ icon: FaLinkedin,
+ href: '/'
+ },
+ {
+ name: 'twitter',
+ icon: FaTwitterSquare,
+ href: '/'
+ },
+ {
+ name: 'telegram',
+ icon: FaTelegramPlane,
+ href: '/'
+ }
+]
diff --git a/apps/mobility-bap/mock/menuItems.js b/apps/mobility-bap/mock/menuItems.js
new file mode 100644
index 000000000..72d273663
--- /dev/null
+++ b/apps/mobility-bap/mock/menuItems.js
@@ -0,0 +1,79 @@
+import { BsLaptop, BsBook } from 'react-icons/bs'
+import { IoShirtOutline, IoShirtSharp } from 'react-icons/io5'
+import { MdOutlineToys } from 'react-icons/md'
+import { RiHeartPulseLine, RiFireLine } from 'react-icons/ri'
+import { AiOutlineHome, AiOutlinePercentage } from 'react-icons/ai'
+import { BiFootball } from 'react-icons/bi'
+
+import { ImMobile } from 'react-icons/im'
+import { FiMonitor, FiHeadphones } from 'react-icons/fi'
+
+import { GiLargeDress } from 'react-icons/gi'
+import { FaBaby, FaRedhat } from 'react-icons/fa'
+
+const menuItems = [
+ {
+ category: 'digital',
+ icon: BsLaptop,
+ productsGroup: [
+ {
+ title: 'laptop',
+ icon: BsLaptop,
+ subtitles: ['asus', 'apple', 'dell', 'lenovo', 'samsung', 'hp', 'huawei', 'acer', 'msi']
+ },
+ {
+ title: 'mobile',
+ icon: ImMobile,
+ subtitles: ['samsung', 'apple', 'nokia', 'xiaomi', 'motorola', 'lg', 'sony']
+ },
+ {
+ title: 'computer',
+ icon: FiMonitor,
+ subtitles: ['monitor', 'mouse', 'keyboard', 'hard']
+ },
+ {
+ title: 'other',
+ icon: FiHeadphones,
+ subtitles: ['tablet', 'powerBank', 'speaker', 'headphones']
+ }
+ ]
+ },
+ {
+ category: 'fashion',
+ icon: IoShirtOutline,
+ productsGroup: [
+ {
+ title: 'women',
+ icon: GiLargeDress,
+ subtitles: ['dress', 'skirt', 'jeans', 'pants', 'tShirt', 'shoes', 'scarf']
+ },
+ {
+ title: 'men',
+ icon: IoShirtSharp,
+ subtitles: ['shirt', 'pants', 'tie', 'tShirt', 'shoes', 'jeans']
+ },
+ {
+ title: 'child',
+ icon: FaBaby,
+ subtitles: ['overalls', 'mittens', 'babyApron', 'shoes', 'tShirt']
+ },
+ {
+ title: 'other',
+ icon: FaRedhat,
+ subtitles: ['watch', 'wallet', 'hat', 'belt']
+ }
+ ]
+ },
+ { category: 'toys', icon: MdOutlineToys },
+ { category: 'cosmetic', icon: RiHeartPulseLine },
+ { category: 'home', icon: AiOutlineHome },
+ { category: 'sport', icon: BiFootball },
+ { category: 'stationery', icon: BsBook }
+]
+
+export default menuItems
+
+export const extraMenu = [
+ { title: 'offer', icon: AiOutlinePercentage, href: '/offers' },
+ { title: 'bestSells', icon: RiFireLine, href: '/' }
+]
diff --git a/apps/mobility-bap/mock/slider.js b/apps/mobility-bap/mock/slider.js
new file mode 100644
index 000000000..ecd123352
--- /dev/null
+++ b/apps/mobility-bap/mock/slider.js
@@ -0,0 +1,44 @@
+export const sliderContent = [
+ {
+ ID: 1,
+ title: 'digitalBT',
+ description: 'digitalBD',
+ bgImg: "url('/images/slider-img/digital-banner.webp')",
+ url: '/'
+ },
+ {
+ ID: 2,
+ title: 'stationeryBT',
+ description: 'stationeryBD',
+ bgImg: "url('/images/slider-img/stationery-banner.webp')",
+ url: '/'
+ },
+ {
+ ID: 3,
+ title: 'toyBT',
+ description: 'toyBD',
+ bgImg: "url('/images/slider-img/toy-banner.webp')",
+ url: '/'
+ },
+ {
+ ID: 4,
+ title: 'houseBT',
+ description: 'houseBD',
+ bgImg: "url('/images/slider-img/house-banner.webp')",
+ url: '/'
+ },
+ {
+ ID: 5,
+ title: 'fashionBT',
+ description: 'fashionBD',
+ bgImg: "url('/images/slider-img/fashion-banner.webp')",
+ url: '/'
+ },
+ {
+ ID: 6,
+ title: 'beautyBT',
+ description: 'beautyBD',
+ bgImg: "url('/images/slider-img/beauty-banner.webp')",
+ url: '/'
+ }
+]
diff --git a/apps/mobility-bap/mock/sortRadioInput.js b/apps/mobility-bap/mock/sortRadioInput.js
new file mode 100644
index 000000000..032175d06
--- /dev/null
+++ b/apps/mobility-bap/mock/sortRadioInput.js
@@ -0,0 +1 @@
+export const radioBtnValue = ['all', 'cheapest', 'expensive']
diff --git a/apps/mobility-bap/next-env.d.ts b/apps/mobility-bap/next-env.d.ts
new file mode 100644
index 000000000..4f11a03dc
--- /dev/null
+++ b/apps/mobility-bap/next-env.d.ts
@@ -0,0 +1,5 @@
+///
+
+
+
+ )
+}
+
+export default MyApp
diff --git a/apps/mobility-bap/pages/_document.tsx b/apps/mobility-bap/pages/_document.tsx
new file mode 100644
index 000000000..6c4908511
--- /dev/null
+++ b/apps/mobility-bap/pages/_document.tsx
@@ -0,0 +1,34 @@
+import { Html, Head, Main, NextScript } from 'next/document'
+export default function Document() {
+ return (
+
+
+
+
+
+
+
+
+
+
+ ('')
+ // const [coords, setCoords] = useState({
+ // lat: 48.719242,
+ // long: 2.346078,
+ // });
+ const [coords, setCoords] = useState({
+ lat: 48.800345,
+ long: 2.346078
+ })
+
+ const [isOptionModalOpen, setIsOptionModalOpen] = useState(true)
+ const [isOptionDetailOpen, setIsOptionDetailOpen] = useState(false)
+ const [isMenuModalOpen, setIsMenuModalOpen] = useState(true)
+ const [option, setOption] = useState(initialOption)
+
+ //TODO local store and coords states can be removed in further iterations
+ const [stores, setStores] = useState([])
+ // const [selectedStore, setSelectedStore] = useState(null);
+ const [selectedStore, setSelectedStore] = useState(null)
+
+ const { data: searchedLocationData, loading, error, fetchData } = useRequest()
+ const { data: locationData, loading: loadingLocation, error: locationError, fetchData: fetchLocation } = useRequest()
+ const { data: storesByLocation, loading: loadingStores, error: errorStores, fetchData: fetchStores } = useRequest()
+ const router = useRouter()
+
+ useEffect(() => {
+ setOption(JSON.parse(localStorage.getItem('selectedOption') as string))
+ }, [])
+
+ useEffect(() => {
+ localStorage.setItem('selectedOption', JSON.stringify(option))
+ }, [option])
+
+ const handleModalOpen = () => {
+ setIsOptionModalOpen(prevState => !prevState)
+ }
+
+ const handleModalClose = () => {
+ setIsOptionModalOpen(false)
+ }
+
+ const handleOptionDetailOpen = () => {
+ setIsOptionDetailOpen(prevState => !prevState)
+ }
+
+ const handleOptionDetailClose = () => {
+ setIsOptionDetailOpen(false)
+ setSelectedStore(null)
+ }
+
+ const handleLocationClick = (lat: number, long: number) => {
+ setCoords({ lat, long })
+ }
+
+ const fetchLocationByQuery = (query: string) => {
+ const url = `${process.env.NEXT_PUBLIC_NOMINATIM_URL}/search?format=jsonv2&q=${query}`
+
+ fetchData(url, 'GET')
+ }
+
+ const fetchLocationNameByCoords = (lat: number, long: number) => {
+ const url = `${process.env.NEXT_PUBLIC_NOMINATIM_URL}/reverse?format=jsonv2&lat=${lat}&lon=${long}`
+
+ fetchLocation(url, 'GET')
+ }
+
+ const fetchStoresByLocation = (lat: number, long: number, tagValue: string, tagName: string) => {
+ // static tagName and tagValue for now
+ const url = `${process.env.NEXT_PUBLIC_BECKN_API_URL}/stores?tagName=becknified&tagValue=true&latitude=${lat}&longitude=${long}&filter=${tagValuetoApiMap[tagValue]}`
+
+ // Only fetch when Books are selected for now
+ fetchStores(url, 'GET')
+ }
+
+ useEffect(() => {
+ // Not refilling stores if option is empty
+ if (storesByLocation && !isEmpty(option.tagValue)) {
+ setStores(storesByLocation)
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [storesByLocation])
+
+ useEffect(() => {
+ if (isEmpty(query) && !isEmpty(coords)) {
+ fetchLocationNameByCoords(coords.lat, coords.long)
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [coords])
+
+ useEffect(() => {
+ if (
+ !isEmpty(coords) &&
+ !isEmpty(option?.tagValue) &&
+ (option?.tagValue === StoreType.books || option?.tagValue === StoreType.restaurant)
+ ) {
+ fetchStoresByLocation(coords.lat, coords.long, option?.tagValue, option?.tagName)
+ }
+ if (option?.tagValue !== StoreType.books) {
+ setStores([])
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [coords, option])
+
+ //resetting option state and stores when location changes
+ useEffect(() => {
+ // setOption(initialOption);
+ setStores([])
+ }, [coords])
+
+ return (
+ ('')
+ // const [coords, setCoords] = useState({
+ // lat: 48.719242,
+ // long: 2.346078,
+ // });
+ const [coords, setCoords] = useState({
+ lat: 48.800345,
+ long: 2.346078
+ })
+
+ const [isOptionModalOpen, setIsOptionModalOpen] = useState(true)
+ const [isOptionDetailOpen, setIsOptionDetailOpen] = useState(false)
+ const [isMenuModalOpen, setIsMenuModalOpen] = useState(true)
+ const [option, setOption] = useState(initialOption)
+
+ //TODO local store and coords states can be removed in further iterations
+ const [stores, setStores] = useState([])
+ // const [selectedStore, setSelectedStore] = useState(null);
+ const [selectedStore, setSelectedStore] = useState(null)
+
+ const { data: searchedLocationData, loading, error, fetchData } = useRequest()
+ const { data: locationData, loading: loadingLocation, error: locationError, fetchData: fetchLocation } = useRequest()
+ const { data: storesByLocation, loading: loadingStores, error: errorStores, fetchData: fetchStores } = useRequest()
+ const router = useRouter()
+
+ useEffect(() => {
+ setOption(JSON.parse(localStorage.getItem('selectedOption') as string))
+ }, [])
+
+ useEffect(() => {
+ localStorage.setItem('selectedOption', JSON.stringify(option))
+ }, [option])
+
+ const handleModalOpen = () => {
+ setIsOptionModalOpen(prevState => !prevState)
+ }
+
+ const handleModalClose = () => {
+ setIsOptionModalOpen(false)
+ }
+
+ const handleOptionDetailOpen = () => {
+ setIsOptionDetailOpen(prevState => !prevState)
+ }
+
+ const handleOptionDetailClose = () => {
+ setIsOptionDetailOpen(false)
+ setSelectedStore(null)
+ }
+
+ const handleLocationClick = (lat: number, long: number) => {
+ setCoords({ lat, long })
+ }
+
+ const fetchLocationByQuery = (query: string) => {
+ const url = `${process.env.NEXT_PUBLIC_NOMINATIM_URL}/search?format=jsonv2&q=${query}`
+
+ fetchData(url, 'GET')
+ }
+
+ const fetchLocationNameByCoords = (lat: number, long: number) => {
+ const url = `${process.env.NEXT_PUBLIC_NOMINATIM_URL}/reverse?format=jsonv2&lat=${lat}&lon=${long}`
+
+ fetchLocation(url, 'GET')
+ }
+
+ const fetchStoresByLocation = (lat: number, long: number, tagValue: string, tagName: string) => {
+ // static tagName and tagValue for now
+ const url = `${process.env.NEXT_PUBLIC_BECKN_API_URL}/stores?tagName=becknified&tagValue=true&latitude=${lat}&longitude=${long}&filter=${tagValuetoApiMap[tagValue]}`
+
+ // Only fetch when Books are selected for now
+ fetchStores(url, 'GET')
+ }
+
+ useEffect(() => {
+ // Not refilling stores if option is empty
+ if (storesByLocation && !isEmpty(option.tagValue)) {
+ setStores(storesByLocation)
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [storesByLocation])
+
+ useEffect(() => {
+ if (isEmpty(query) && !isEmpty(coords)) {
+ fetchLocationNameByCoords(coords.lat, coords.long)
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [coords])
+
+ useEffect(() => {
+ if (
+ !isEmpty(coords) &&
+ !isEmpty(option?.tagValue) &&
+ (option?.tagValue === StoreType.books || option?.tagValue === StoreType.restaurant)
+ ) {
+ fetchStoresByLocation(coords.lat, coords.long, option?.tagValue, option?.tagName)
+ }
+ if (option?.tagValue !== StoreType.books) {
+ setStores([])
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [coords, option])
+
+ //resetting option state and stores when location changes
+ useEffect(() => {
+ // setOption(initialOption);
+ setStores([])
+ }, [coords])
+
+ return (
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {t.orderPlaced}
+
+
+
+ {t.confirmMessage1}
+ {t.confirmMessage2} +
+
+
+ )
+}
+
+export default OrderConfirmation
diff --git a/apps/mobility-bap/pages/paymentMode.tsx b/apps/mobility-bap/pages/paymentMode.tsx
new file mode 100644
index 000000000..8b8bb35b8
--- /dev/null
+++ b/apps/mobility-bap/pages/paymentMode.tsx
@@ -0,0 +1,81 @@
+import React, { useState } from 'react'
+import { Box, Flex, Text, Image, Card, CardBody } from '@chakra-ui/react'
+import { useRouter } from 'next/router'
+import { useDispatch } from 'react-redux'
+import Button from '../components/button/Button'
+import CardWithCheckBox from '../components/card/Card'
+import { useLanguage } from '../hooks/useLanguage'
+import creditCardImg from '../public/images/creditCardImg.svg'
+import { cartActions } from '../store/cart-slice'
+
+function PaymentMode() {
+ const [checked, setChecked] = useState(false)
+
+ const { t } = useLanguage()
+ const router = useRouter()
+ const dispatch = useDispatch()
+
+ return (
+ <>
+
+ {/*
+
+ {t.cards}
+
+ {t.addCard}
+
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+
+
+
+ Other
+
+
+
+
+
+ )
+}
+
+export default PaymentMode
diff --git a/apps/mobility-bap/pages/search.tsx b/apps/mobility-bap/pages/search.tsx
new file mode 100644
index 000000000..c23a2ee42
--- /dev/null
+++ b/apps/mobility-bap/pages/search.tsx
@@ -0,0 +1,166 @@
+import { useEffect, useState } from 'react'
+import { useDispatch } from 'react-redux'
+import { Box } from '@chakra-ui/react'
+import SearchBar from '../components/header/SearchBar'
+import ProductList from '../components/productList/ProductList'
+import useRequest from '../hooks/useRequest'
+import { responseDataActions } from '../store/responseData-slice'
+import { RetailItem } from '../lib/types/products'
+import Loader from '../components/loader/Loader'
+import { useLanguage } from '../hooks/useLanguage'
+
+//Mock data for testing search API. Will remove after the resolution of CORS issue
+
+const Search = () => {
+ const [items, setItems] = useState([])
+ const dispatch = useDispatch()
+ const [providerId, setProviderId] = useState('')
+ const { t, locale } = useLanguage()
+ const [tagValue, setTagValue] = useState('')
+ const [searchString, setSearchString] = useState('')
+
+ const apiUrl = process.env.NEXT_PUBLIC_API_URL
+
+ const { data, loading, error, fetchData } = useRequest()
+
+ const categoryMap = {
+ Books: { en: 'BookEnglish', fa: 'BookFrench' },
+ restaurant: { en: 'FoodEnglish', fa: 'FoodFrench' }
+ }
+
+ useEffect(() => {
+ if (localStorage) {
+ const stringifiedOptiontags = localStorage.getItem('optionTags')
+ const stringifiedSelectedOption = localStorage.getItem('selectedOption')
+ if (stringifiedOptiontags) {
+ const providerId = JSON.parse(stringifiedOptiontags).providerId
+ setProviderId(providerId)
+ }
+ if (stringifiedSelectedOption) {
+ setTagValue(JSON.parse(stringifiedSelectedOption).tagValue)
+ }
+ }
+ }, [])
+
+ const categoryName = () => {
+ if (tagValue && categoryMap[tagValue]) {
+ return categoryMap[tagValue][locale] || categoryMap[tagValue]['en']
+ }
+ }
+
+ const searchPayload = {
+ context: {
+ domain: 'retail'
+ },
+ message: {
+ criteria: {
+ dropLocation: '48.85041854,2.343660801',
+ categoryName: categoryName(),
+ providerId: providerId
+ }
+ }
+ }
+
+ const fetchDataForSearch = (searchString: string) =>
+ fetchData(`${apiUrl}/client/v2/search`, 'POST', {
+ ...searchPayload,
+ message: {
+ ...searchPayload.message,
+ criteria: {
+ ...searchPayload.message.criteria,
+ searchString: searchString
+ }
+ }
+ })
+
+ useEffect(() => {
+ if (localStorage && !localStorage.getItem('searchItems')) {
+ if (providerId) {
+ fetchData(`${apiUrl}/client/v2/search`, 'POST', searchPayload)
+ }
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [providerId])
+
+ useEffect(() => {
+ if (localStorage) {
+ const cachedSearchResults = localStorage.getItem('searchItems')
+ if (cachedSearchResults) {
+ const parsedCachedResults = JSON.parse(cachedSearchResults)
+ setItems(parsedCachedResults)
+ }
+ }
+ }, [])
+
+ useEffect(() => {
+ if (data) {
+ dispatch(responseDataActions.addTransactionId(data.context.transaction_id))
+ const allItems = data.message.catalogs.flatMap((catalog: any) => {
+ if (catalog.message && catalog.message.catalog && catalog.message.catalog['bpp/providers'].length > 0) {
+ const providers = catalog.message.catalog['bpp/providers']
+ return providers.flatMap((provider: any) => {
+ if (provider.items && provider.items.length > 0) {
+ return provider.items.map((item: RetailItem) => {
+ return {
+ bpp_id: catalog.context.bpp_id,
+ bpp_uri: catalog.context.bpp_uri,
+ ...item,
+ providerId: provider.id,
+ locations: provider.locations,
+ bppName: catalog.message.catalog['bpp/descriptor'].name
+ }
+ })
+ }
+ return []
+ })
+ }
+ return []
+ })
+ localStorage.setItem('searchItems', JSON.stringify(allItems))
+ setItems(allItems)
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [data])
+
+ return (
+ <>
+
+ {
+ localStorage.removeItem('searchItems')
+ setSearchString(text)
+ fetchDataForSearch(text)
+ }}
+ />
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+
+
+ {t.orderId}
+
+ 456789120
+
+
+ {t.estimatedDelivery} 21st Jun 2021, 12:21pm
+
+
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {t.orderConfirmed}
+
+
+
+ {t.orderConfirmedTime}
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {t.orderConfirmedMssg}
+
+
+
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {t.agentAssigned}
+
+
+
+ {activeSteps[1] ? t.agentAssignedTime : null}
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {activeSteps[1] ? t.agentAssignedMssg : '--'}
+
+
+
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {t.OFD}
+
+
+
+ {activeSteps[2] ? t.OFDTime : null}
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {activeSteps[2] ? t.OFDMssg : '--'}
+
+
+
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+ {t.orderDelivered}
+
+
+
+ {activeSteps[3] ? t.orderDeliveredTime : null}
+
+
+
+
+ {activeSteps[3] ? t.orderDeliveredMssg : '--'}
+
+
+
+
+
+ )
+}
+
+export default TrackOrder
diff --git a/apps/mobility-bap/postcss.config.js b/apps/mobility-bap/postcss.config.js
new file mode 100644
index 000000000..ab57af99b
--- /dev/null
+++ b/apps/mobility-bap/postcss.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+ plugins: {
+ 'postcss-import': {},
+ tailwindcss: {},
+ autoprefixer: {}
+ }
+}
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanwebblack.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanwebblack.ttf
new file mode 100644
index 000000000..580c70004
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanwebblack.ttf differ
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanwebbold.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanwebbold.ttf
new file mode 100644
index 000000000..1c6bbd43b
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanwebbold.ttf differ
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanwebextrablack.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanwebextrablack.ttf
new file mode 100644
index 000000000..b85362bce
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanwebextrablack.ttf differ
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanwebextrabold.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanwebextrabold.ttf
new file mode 100644
index 000000000..b3e78a7bc
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanwebextrabold.ttf differ
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanweblight.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanweblight.ttf
new file mode 100644
index 000000000..9e81193e3
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanweblight.ttf differ
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanwebmedium.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanwebmedium.ttf
new file mode 100644
index 000000000..4dc2ad776
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanwebmedium.ttf differ
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanwebregular.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanwebregular.ttf
new file mode 100644
index 000000000..fc0ba6806
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanwebregular.ttf differ
diff --git a/apps/mobility-bap/public/fonts/ttf/iranyekanwebthin.ttf b/apps/mobility-bap/public/fonts/ttf/iranyekanwebthin.ttf
new file mode 100644
index 000000000..e2bc63773
Binary files /dev/null and b/apps/mobility-bap/public/fonts/ttf/iranyekanwebthin.ttf differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanwebblack.woff b/apps/mobility-bap/public/fonts/woff/iranyekanwebblack.woff
new file mode 100644
index 000000000..7deeec932
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanwebblack.woff differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanwebbold.woff b/apps/mobility-bap/public/fonts/woff/iranyekanwebbold.woff
new file mode 100644
index 000000000..7707c6f1c
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanwebbold.woff differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanwebextrablack.woff b/apps/mobility-bap/public/fonts/woff/iranyekanwebextrablack.woff
new file mode 100644
index 000000000..bbd1827a4
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanwebextrablack.woff differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanwebextrabold.woff b/apps/mobility-bap/public/fonts/woff/iranyekanwebextrabold.woff
new file mode 100644
index 000000000..bc49fb0a7
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanwebextrabold.woff differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanweblight.woff b/apps/mobility-bap/public/fonts/woff/iranyekanweblight.woff
new file mode 100644
index 000000000..af6daaa1b
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanweblight.woff differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanwebmedium.woff b/apps/mobility-bap/public/fonts/woff/iranyekanwebmedium.woff
new file mode 100644
index 000000000..84896bbf8
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanwebmedium.woff differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanwebregular.woff b/apps/mobility-bap/public/fonts/woff/iranyekanwebregular.woff
new file mode 100644
index 000000000..bfbe54766
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanwebregular.woff differ
diff --git a/apps/mobility-bap/public/fonts/woff/iranyekanwebthin.woff b/apps/mobility-bap/public/fonts/woff/iranyekanwebthin.woff
new file mode 100644
index 000000000..c5c9ae117
Binary files /dev/null and b/apps/mobility-bap/public/fonts/woff/iranyekanwebthin.woff differ
diff --git a/apps/mobility-bap/public/robots.txt b/apps/mobility-bap/public/robots.txt
new file mode 100644
index 000000000..8f081968b
--- /dev/null
+++ b/apps/mobility-bap/public/robots.txt
@@ -0,0 +1,9 @@
+# *
+User-agent: *
+Allow: /
+
+# Host
+Host: undefined
+
+# Sitemaps
+Sitemap: undefined/sitemap.xml
diff --git a/apps/mobility-bap/public/sitemap-0.xml b/apps/mobility-bap/public/sitemap-0.xml
new file mode 100644
index 000000000..befe7bd34
--- /dev/null
+++ b/apps/mobility-bap/public/sitemap-0.xml
@@ -0,0 +1,24 @@
+
+
+undefined 2023-08-28T16:44:22.269Z daily 0.7 undefined/about 2023-08-28T16:44:22.269Z daily 0.7 undefined/blank 2023-08-28T16:44:22.269Z daily 0.7 undefined/cart 2023-08-28T16:44:22.269Z daily 0.7 undefined/checkoutPage 2023-08-28T16:44:22.269Z daily 0.7 undefined/favorite 2023-08-28T16:44:22.269Z daily 0.7 undefined/feedback 2023-08-28T16:44:22.269Z daily 0.7 undefined/homePage 2023-08-28T16:44:22.269Z daily 0.7 undefined/login 2023-08-28T16:44:22.269Z daily 0.7 undefined/mobileOtp 2023-08-28T16:44:22.269Z daily 0.7 undefined/newestProducts 2023-08-28T16:44:22.269Z daily 0.7 undefined/offers 2023-08-28T16:44:22.269Z daily 0.7 undefined/orderConfirmation 2023-08-28T16:44:22.269Z daily 0.7 undefined/orderDetails 2023-08-28T16:44:22.269Z daily 0.7 undefined/orderHistory 2023-08-28T16:44:22.269Z daily 0.7 undefined/paymentMode 2023-08-28T16:44:22.269Z daily 0.7 undefined/product 2023-08-28T16:44:22.269Z daily 0.7 undefined/search 2023-08-28T16:44:22.269Z daily 0.7 undefined/signUp 2023-08-28T16:44:22.269Z daily 0.7 undefined/trackOrder 2023-08-28T16:44:22.269Z daily 0.7 undefined/fa/offers 2023-08-28T16:44:22.269Z daily 0.7
\ No newline at end of file
diff --git a/apps/mobility-bap/public/sitemap.xml b/apps/mobility-bap/public/sitemap.xml
new file mode 100644
index 000000000..cdcce6fe3
--- /dev/null
+++ b/apps/mobility-bap/public/sitemap.xml
@@ -0,0 +1,4 @@
+
+
+undefined/sitemap-0.xml
\ No newline at end of file
diff --git a/apps/dsep/store/activeMenuItem-slice.ts b/apps/mobility-bap/store/activeMenuItem-slice.ts
similarity index 100%
rename from apps/dsep/store/activeMenuItem-slice.ts
rename to apps/mobility-bap/store/activeMenuItem-slice.ts
diff --git a/apps/mobility-bap/store/cart-slice.ts b/apps/mobility-bap/store/cart-slice.ts
new file mode 100644
index 000000000..24084e40c
--- /dev/null
+++ b/apps/mobility-bap/store/cart-slice.ts
@@ -0,0 +1,75 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { ICart } from '../lib/types/cart'
+import { RetailItem } from '../lib/types/products'
+import { calculateDiscountPercentage } from '../utilities/calculateDiscountPercentage'
+
+const initialState: ICart = {
+ items: [],
+ totalQuantity: 0,
+ totalAmount: 0
+}
+
+const cartSlice = createSlice({
+ name: 'cart',
+ initialState,
+ reducers: {
+ addItemToCart(
+ state: ICart,
+ action: PayloadAction<{
+ product: RetailItem
+ quantity: number
+ }>
+ ) {
+ const newItem = action.payload.product
+
+ const existingItem = state.items.find(item => item.id === newItem.id)
+
+ state.totalQuantity = state.totalQuantity + action.payload.quantity
+
+ state.totalAmount = state.totalAmount + action.payload.quantity * parseFloat(action.payload.product.price.value)
+
+ if (!existingItem) {
+ const totalPrice = parseFloat(newItem.price.value) * action.payload.quantity
+
+ state.items.push({
+ ...newItem,
+ quantity: action.payload.quantity,
+ totalPrice
+ })
+ } else {
+ const totalPrice =
+ parseFloat(existingItem.price.value) + parseFloat(existingItem.price.value) * action.payload.quantity
+
+ existingItem.quantity += action.payload.quantity
+ existingItem.totalPrice = totalPrice
+ }
+ },
+
+ removeItemFromCart(
+ state: ICart,
+ action: PayloadAction //slug.current as payload
+ ) {
+ const productSlug = action.payload
+ const existingItem = state.items.find(item => item.id === productSlug)
+
+ state.totalQuantity--
+
+ state.totalAmount = state.totalAmount - parseFloat(existingItem?.price.value!)
+
+ if (existingItem?.quantity === 1) {
+ state.items = state.items.filter(item => item.id !== productSlug)
+ } else {
+ existingItem!.quantity--
+ existingItem!.totalPrice = existingItem!.totalPrice - parseFloat(existingItem?.price.value!)
+ }
+ },
+
+ clearCart(state: ICart) {
+ return { ...initialState }
+ }
+ }
+})
+
+export const cartActions = cartSlice.actions
+
+export default cartSlice.reducer
diff --git a/apps/mobility-bap/store/cartUI-slice.ts b/apps/mobility-bap/store/cartUI-slice.ts
new file mode 100644
index 000000000..52ba16626
--- /dev/null
+++ b/apps/mobility-bap/store/cartUI-slice.ts
@@ -0,0 +1,20 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { ICartUI } from '../lib/types/cart'
+
+const initialState: ICartUI = {
+ cartBoxIsVisible: false
+}
+
+const cartUiSlice = createSlice({
+ name: 'cartUi',
+ initialState,
+ reducers: {
+ toggleCartBox(state, action: PayloadAction) {
+ state.cartBoxIsVisible = action.payload
+ }
+ }
+})
+
+export const cartUiActions = cartUiSlice.actions
+
+export default cartUiSlice.reducer
diff --git a/apps/mobility-bap/store/favorite-slice.ts b/apps/mobility-bap/store/favorite-slice.ts
new file mode 100644
index 000000000..6ecb362b1
--- /dev/null
+++ b/apps/mobility-bap/store/favorite-slice.ts
@@ -0,0 +1,30 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { IFavorite } from '../lib/types/favorite'
+import { RetailItem } from '../lib/types/products'
+
+const initialState: IFavorite = {
+ items: []
+}
+
+const favoriteSlice = createSlice({
+ name: 'favorite',
+ initialState,
+ reducers: {
+ addToFavorite(state, action: PayloadAction) {
+ state.items.push({
+ ...action.payload
+ })
+ },
+ removeFromFavorite(state, action: PayloadAction) {
+ const productSlug = action.payload
+ state.items = state.items.filter(item => item.id !== productSlug)
+ },
+ clearCart(state) {
+ state = initialState
+ }
+ }
+})
+
+export const favoriteActions = favoriteSlice.actions
+
+export default favoriteSlice.reducer
diff --git a/apps/mobility-bap/store/index.ts b/apps/mobility-bap/store/index.ts
new file mode 100644
index 000000000..4487f48cc
--- /dev/null
+++ b/apps/mobility-bap/store/index.ts
@@ -0,0 +1,39 @@
+import { configureStore } from '@reduxjs/toolkit'
+import specialOfferProductsReducer from './specialOfferProducts-slice'
+import newestProductReducer from './newestProduct-slice'
+import SortedProductsListReducer from './sortedProductList-slice'
+import cartUiReducer from './cartUI-slice'
+import cartSliceReducer from './cart-slice'
+import userInfoReducer from './user-slice'
+import sideNavBarReducer from './sideNavBar-slice'
+import megaMenuReducer from './megaMenu-slice'
+import activeMenuItemReducer from './activeMenuItem-slice'
+import settingBoxReducer from './settingBox-slice'
+import favoriteReducer from './favorite-slice'
+import responseDataReducer from './responseData-slice'
+
+const store = configureStore({
+ reducer: {
+ specialOfferProductsList: specialOfferProductsReducer,
+ newestProductsList: newestProductReducer,
+ sortedProductsList: SortedProductsListReducer,
+ cartUi: cartUiReducer,
+ cart: cartSliceReducer,
+ userInfo: userInfoReducer,
+ sideNavBar: sideNavBarReducer,
+ megaMenu: megaMenuReducer,
+ activeMenuItem: activeMenuItemReducer,
+ settingBox: settingBoxReducer,
+ favorite: favoriteReducer,
+ transactionId: responseDataReducer,
+ quoteResponse: responseDataReducer,
+ customerDetails: responseDataReducer,
+ initResponse: responseDataReducer
+ },
+ middleware: getDefaultMiddleware =>
+ getDefaultMiddleware({
+ serializableCheck: false
+ })
+})
+
+export default store
diff --git a/apps/mobility-bap/store/megaMenu-slice.ts b/apps/mobility-bap/store/megaMenu-slice.ts
new file mode 100644
index 000000000..9e7b0bfb8
--- /dev/null
+++ b/apps/mobility-bap/store/megaMenu-slice.ts
@@ -0,0 +1,23 @@
+import { createSlice } from '@reduxjs/toolkit'
+import { IMegaMenuShow } from '../lib/types/megaMenu'
+
+const initialState: IMegaMenuShow = {
+ isMegaMenuOpen: false
+}
+
+const megaMenuSlice = createSlice({
+ name: 'megaMenu',
+ initialState,
+ reducers: {
+ openMegaMenu(state) {
+ state.isMegaMenuOpen = true
+ },
+ closeMegaMenu(state) {
+ state.isMegaMenuOpen = false
+ }
+ }
+})
+
+export const megaMenuActions = megaMenuSlice.actions
+
+export default megaMenuSlice.reducer
diff --git a/apps/mobility-bap/store/newestProduct-slice.ts b/apps/mobility-bap/store/newestProduct-slice.ts
new file mode 100644
index 000000000..829e9bfcf
--- /dev/null
+++ b/apps/mobility-bap/store/newestProduct-slice.ts
@@ -0,0 +1,22 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+
+import { RetailItem } from '../lib/types/products'
+import { IProductList } from '../lib/types/productList'
+
+const initialState: IProductList = {
+ productsList: []
+}
+
+const newestProductsSlice = createSlice({
+ name: 'newestProducts',
+ initialState,
+ reducers: {
+ addProducts(state, action: PayloadAction) {
+ state.productsList = action.payload
+ }
+ }
+})
+
+export const newestProductsActions = newestProductsSlice.actions
+
+export default newestProductsSlice.reducer
diff --git a/apps/mobility-bap/store/responseData-slice.ts b/apps/mobility-bap/store/responseData-slice.ts
new file mode 100644
index 000000000..2ffb14c3c
--- /dev/null
+++ b/apps/mobility-bap/store/responseData-slice.ts
@@ -0,0 +1,33 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { ResponseModel } from '../lib/types/responseModel'
+import { ShippingFormData } from '../pages/checkoutPage'
+
+const initialState = {
+ transactionId: '',
+ quoteResponse: null as (ResponseModel & ResponseModel[]) | null,
+ customerDetails: null as ShippingFormData | null,
+ initResponse: null as (ResponseModel & ResponseModel[]) | null
+}
+
+const responseDataSlice = createSlice({
+ name: 'responseData',
+ initialState,
+ reducers: {
+ addTransactionId(state, action: PayloadAction) {
+ state.transactionId = action.payload
+ },
+ addQuoteResponse(state, action: PayloadAction<(ResponseModel & ResponseModel[]) | null>) {
+ state.quoteResponse = action.payload
+ },
+ addCustomerDetails(state, action: PayloadAction) {
+ state.customerDetails = action.payload
+ },
+ addInitResponse(state, action: PayloadAction<(ResponseModel & ResponseModel[]) | null>) {
+ state.initResponse = action.payload
+ }
+ }
+})
+
+export const responseDataActions = responseDataSlice.actions
+
+export default responseDataSlice.reducer
diff --git a/apps/mobility-bap/store/settingBox-slice.ts b/apps/mobility-bap/store/settingBox-slice.ts
new file mode 100644
index 000000000..77f71a767
--- /dev/null
+++ b/apps/mobility-bap/store/settingBox-slice.ts
@@ -0,0 +1,26 @@
+import { createSlice } from '@reduxjs/toolkit'
+import { ISettingBox } from '../lib/types/settingBox'
+
+const initialState: ISettingBox = {
+ isOpen: false
+}
+
+const settingBoxSlice = createSlice({
+ name: 'settingBox',
+ initialState,
+ reducers: {
+ openSettingBox(state) {
+ state.isOpen = true
+ },
+ closeSettingBox(state) {
+ state.isOpen = false
+ },
+ toggleSettingBox(state) {
+ state.isOpen = !state.isOpen
+ }
+ }
+})
+
+export const settingBoxActions = settingBoxSlice.actions
+
+export default settingBoxSlice.reducer
diff --git a/apps/mobility-bap/store/sideNavBar-slice.ts b/apps/mobility-bap/store/sideNavBar-slice.ts
new file mode 100644
index 000000000..0ba7dff09
--- /dev/null
+++ b/apps/mobility-bap/store/sideNavBar-slice.ts
@@ -0,0 +1,40 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { IDropDown } from '../lib/types/dropDown'
+import { ISideNavBar } from '../lib/types/sidebar'
+
+const initialState: ISideNavBar = {
+ isSidebarOpen: false,
+ isNavbarOpen: false,
+ dropDownList: []
+}
+
+const sideNavBarSlice = createSlice({
+ name: 'sideNavBar',
+ initialState,
+ reducers: {
+ openSidebar(state) {
+ state.isSidebarOpen = true
+ },
+
+ openNavbar(state) {
+ state.isNavbarOpen = true
+ },
+
+ closeSidebar(state) {
+ state.isSidebarOpen = false
+ },
+
+ closeNavbar(state) {
+ state.isSidebarOpen = false
+ state.isNavbarOpen = false
+ },
+
+ setSidebarEntries(state, action: PayloadAction) {
+ state.dropDownList = action.payload
+ }
+ }
+})
+
+export const sideNavBarActions = sideNavBarSlice.actions
+
+export default sideNavBarSlice.reducer
diff --git a/apps/mobility-bap/store/sortedProductList-slice.ts b/apps/mobility-bap/store/sortedProductList-slice.ts
new file mode 100644
index 000000000..b5c8e0d75
--- /dev/null
+++ b/apps/mobility-bap/store/sortedProductList-slice.ts
@@ -0,0 +1,40 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+
+import { IProductList } from '../lib/types/productList'
+import { RetailItem } from '../lib/types/products'
+import { sortByCheapest, sortByExpensive } from '../utilities/sortByCost'
+
+const initialState: IProductList = {
+ productsList: []
+}
+
+const SortedProductsListSlice = createSlice({
+ name: 'sortedProductsList',
+ initialState,
+ reducers: {
+ sortProductsList(
+ state,
+ action: PayloadAction<{
+ productsList: RetailItem[]
+ sortBasedOn: string
+ }>
+ ) {
+ switch (action.payload.sortBasedOn) {
+ case 'all':
+ state.productsList = action.payload.productsList
+ break
+ case 'cheapest': {
+ state.productsList = state.productsList.sort(sortByCheapest)
+ break
+ }
+ case 'expensive': {
+ state.productsList = state.productsList.sort(sortByExpensive)
+ break
+ }
+ }
+ }
+ }
+})
+export const SortedProductsListActions = SortedProductsListSlice.actions
+
+export default SortedProductsListSlice.reducer
diff --git a/apps/mobility-bap/store/specialOfferProducts-slice.ts b/apps/mobility-bap/store/specialOfferProducts-slice.ts
new file mode 100644
index 000000000..67a432fa4
--- /dev/null
+++ b/apps/mobility-bap/store/specialOfferProducts-slice.ts
@@ -0,0 +1,22 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+
+import { IProduct } from '../lib/types/products'
+import { IOfferProducts } from '../lib/types/offerProductsState'
+
+const initialState: IOfferProducts = {
+ specialOfferProducts: []
+}
+
+const specialOfferProductsSlice = createSlice({
+ name: 'specialOfferProducts',
+ initialState,
+ reducers: {
+ addProducts(state, action: PayloadAction) {
+ state.specialOfferProducts = action.payload
+ }
+ }
+})
+
+export const specialOfferProductsActions = specialOfferProductsSlice.actions
+
+export default specialOfferProductsSlice.reducer
diff --git a/apps/mobility-bap/store/user-slice.ts b/apps/mobility-bap/store/user-slice.ts
new file mode 100644
index 000000000..a4f8c8c61
--- /dev/null
+++ b/apps/mobility-bap/store/user-slice.ts
@@ -0,0 +1,23 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import Cookies from 'js-cookie'
+import { IUser, IUserInfo } from '../lib/types/user'
+
+const initialState: IUserInfo = {
+ userInformation: Cookies.get('userInfo') ? JSON.parse(Cookies.get('userInfo')!) : null
+}
+
+const userInfoSlice = createSlice({
+ name: 'userInfo',
+ initialState,
+ reducers: {
+ userLogin(state, action: PayloadAction) {
+ state.userInformation = action.payload
+ },
+ userLogout(state) {
+ state.userInformation = null
+ }
+ }
+})
+export const userInfoActions = userInfoSlice.actions
+
+export default userInfoSlice.reducer
diff --git a/apps/mobility-bap/styles/globals.css b/apps/mobility-bap/styles/globals.css
new file mode 100644
index 000000000..b87cc096a
--- /dev/null
+++ b/apps/mobility-bap/styles/globals.css
@@ -0,0 +1,271 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer base {
+ :root {
+ --color-primary: 167, 27, 74; /* #A71B4A*/
+ --color-secondary: 74, 76, 90; /* #4a4c5a*/
+
+ --color-bg: 243, 244, 245; /* #f3f4f5*/
+ --color-bg-side: 252, 251, 255; /* #fcfdff*/
+ --color-bg-black: 0, 0, 0;
+ --digital-category-bgc: #ade8f4;
+ --fashion-category-bgc: #ffddd2;
+ --beauty-category-bgc: #ddd92a;
+ --sport-category-bgc: #ffd60a;
+ --house-category-bgc: #ccd5ae;
+ --toy-category-bgc: #cce3de;
+ --stationery-category-bgc: #fbb13c;
+ --disabled-btn-color: 234, 207, 219; /*"#EACFDB"*/
+
+ --color-text-base: 66, 71, 80; /* #424750*/
+ --color-text-muted: 107, 114, 128; /*#6b7280*/
+ --color-text-side: 255, 231, 231; /*#fff*/
+ --text-color: 255, 255, 255; /* #fff added for white color */
+ --pending-status-color: 189, 148, 43, 1; /*#BD942B*/
+ --delivered-status-color: 80, 201, 23, 1; /*#50C917*/
+ --font-family: iranyekan, 'IRANSans', 'Tahoma';
+ }
+
+ .dark {
+ --color-bg: 15, 23, 42; /* #0f172a*/
+ --color-bg-side: 30, 41, 59; /* #1e293b*/
+ --digital-category-bgc: #0d4c76;
+ --fashion-category-bgc: #892a19;
+ --beauty-category-bgc: #6d305f;
+ --sport-category-bgc: #650606;
+ --house-category-bgc: #164c4b;
+ --toy-category-bgc: #6d3d4b;
+ --stationery-category-bgc: #6a4202;
+
+ --color-text-base: 226, 232, 240; /*#e2e8f0*/
+ --color-text-muted: 140, 154, 175; /*#8c9aaf*/
+ --color-text-side: 255, 231, 231; /*#fff*/
+ }
+
+ html[dir='ltr'] {
+ --font-family: 'Poppins', 'Roboto', 'sans-serif';
+ }
+}
+
+html,
+body {
+ margin: 0;
+ padding: 0;
+ font-family: var(--font-family);
+ background-color: rgb(var(--color-bg));
+ color: rgb(var(--color-text-base));
+}
+
+ul {
+ list-style: unset !important;
+}
+
+a {
+ color: inherit;
+ text-decoration: none;
+}
+
+* {
+ box-sizing: border-box;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: bold;
+ src: url('/fonts/woff/iranyekanwebbold.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanwebbold.ttf') format('truetype');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: 100;
+ src: url('/fonts/woff/iranyekanwebthin.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanwebthin.ttf') format('truetype');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: 300;
+ src: url('/fonts/woff/iranyekanweblight.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanweblight.ttf') format('truetype');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: normal;
+ src: url('/fonts/woff/iranyekanwebregular.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanwebregular.ttf') format('truetype');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: 500;
+ src: url('/fonts/woff/iranyekanwebmedium.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanwebmedium.ttf') format('truetype');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: 800;
+ src: url('/fonts/woff/iranyekanwebextrabold.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanwebextrabold.ttf') format('truetype');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: 850;
+ src: url('/fonts/woff/iranyekanwebblack.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanwebblack.ttf') format('truetype');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: iranyekan;
+ font-style: normal;
+ font-weight: 900;
+ src: url('/fonts/woff/iranyekanwebextrablack.woff') format('woff'),
+ /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+ url('/fonts/ttf/iranyekanwebextrablack.ttf') format('truetype');
+ font-display: swap;
+}
+
+.slick-dots li button::before {
+ font-size: 12px !important;
+}
+.image_section > span {
+ width: 220px !important;
+ height: 240px !important;
+}
+
+.slick-prev.slick-disabled:before,
+.slick-next.slick-disabled:before {
+ opacity: 0.45 !important;
+}
+
+.slick-prev:before,
+.slick-next:before {
+ opacity: 9 !important;
+ content: '' !important;
+}
+
+@media (min-width: 1024px) {
+ .slick-dots li button:before {
+ font-size: 12px;
+ }
+ .slick-dots {
+ padding-bottom: 40px !important;
+ }
+}
+
+::-webkit-scrollbar {
+ width: 0.5rem;
+ height: 0.5rem;
+}
+
+::-webkit-scrollbar-track {
+ background-color: rgb(var(--color-bg));
+}
+
+::-webkit-scrollbar-thumb {
+ /* background-color: #a71b4a; */
+ border-radius: 100vw;
+}
+
+/* input */
+
+input,
+select {
+ font-family: inherit;
+ color: inherit;
+ font-size: inherit;
+}
+
+input:focus,
+select:focus {
+ background-color: transparent;
+}
+
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+textarea:-webkit-autofill,
+textarea:-webkit-autofill:hover,
+textarea:-webkit-autofill:focus,
+select:-webkit-autofill,
+select:-webkit-autofill:hover,
+select:-webkit-autofill:focus {
+ -webkit-box-shadow: 0 0 0px 1000px transparent inset;
+ box-shadow: 0 0 0px 1000px transparent inset;
+ transition: background-color 5000s ease-in-out 0s;
+}
+
+::placeholder {
+ color: #b9b9b9;
+ font-size: 14px;
+}
+/* .chakra-accordion__icon {
+ height: 24px !important;
+ width: 24px !important;
+ position: absolute;
+ right: 15px;
+ top: 15px;
+} */
+
+.object-contain {
+ object-fit: unset !important;
+}
+
+.app_header_b {
+ /* margin-left: -20px; */
+ /* margin-right: -20px; */
+ padding: 0px 20px;
+ box-shadow: 0px 4px 30px rgba(0, 0, 0, 0.1) !important;
+}
+.border_radius_all {
+ border-radius: 12px !important;
+}
+.css-690el4[aria-checked='true'],
+.css-690el4[data-checked] {
+ background-color: #a71b4a !important;
+ border-color: #a71b4a !important;
+}
+.css-690el4 {
+ border: 1px solid !important;
+ border-color: #a71b4a !important;
+}
+.product_description_text p {
+ font-size: 15px;
+}
+.product_description_text p:first-child {
+ padding-bottom: 10px;
+ padding-top: 10px;
+}
+.product_description_text ul li {
+ padding-bottom: 5px;
+
+ /* list-style-position: inside; */
+
+ margin-left: 16px;
+}
diff --git a/apps/mobility-bap/tailwind.config.js b/apps/mobility-bap/tailwind.config.js
new file mode 100644
index 000000000..5a80527b1
--- /dev/null
+++ b/apps/mobility-bap/tailwind.config.js
@@ -0,0 +1,100 @@
+/** @type {import('tailwindcss').Config} */
+function withOpacity(variableName) {
+ return ({ opacityValue }) => {
+ if (opacityValue !== undefined) {
+ return `rgba(var(${variableName}), ${opacityValue})`
+ }
+ return `rgba(var(${variableName}))`
+ }
+}
+
+module.exports = {
+ darkMode: 'class',
+ mode: 'jit',
+ content: ['./pages/**/*.{js,ts,jsx,tsx}', './components/**/*.{js,ts,jsx,tsx}'],
+ theme: {
+ extend: {
+ colors: {
+ palette: {
+ primary: withOpacity('--color-primary'),
+ secondary: withOpacity('--color-secondary')
+ }
+ },
+ textColor: {
+ palette: {
+ base: withOpacity('--color-text-base'),
+ mute: withOpacity('--color-text-muted'),
+ side: withOpacity('--color-text-side')
+ }
+ },
+ backgroundColor: {
+ palette: {
+ fill: withOpacity('--color-bg'),
+ card: withOpacity('--color-bg-side'),
+ dark: withOpacity('--color-bg-dark'),
+ digitalCategory: 'var(--digital-category-bgc)',
+ fashionCategory: 'var(--fashion-category-bgc)',
+ beautyCategory: 'var( --beauty-category-bgc)',
+ sportCategory: 'var(--sport-category-bgc)',
+ houseCategory: 'var(--house-category-bgc)',
+ toyCategory: 'var(--toy-category-bgc)',
+ stationeryCategory: 'var(--stationery-category-bgc)'
+ }
+ },
+ fontFamily: {
+ farsi: "'iranyekan', 'IRANSans', 'Tahoma'",
+ english: "'Poppins', 'Roboto', 'sans-serif'"
+ },
+ keyframes: {
+ sidenavLTR: {
+ '0%': {
+ transform: 'translateX(-100%)'
+ },
+ '100%': {
+ transform: 'translateX(0px)'
+ }
+ },
+ sidenavRTL: {
+ '0%': {
+ transform: 'translateX(100%)'
+ },
+ '100%': {
+ transform: 'translateX(0px)'
+ }
+ },
+ fade: {
+ '0%': {
+ opacity: 0
+ },
+ '100%': {
+ opacity: 1
+ }
+ },
+ dropDown: {
+ '0%': {
+ opacity: 0,
+ transform: 'scaleY(0)'
+ },
+ '100%': {
+ opacity: 1,
+ transform: 'scaleY(1)'
+ }
+ }
+ },
+ animation: {
+ sidenavLTREntering: 'sidenavLTR 0.3s ease-in-out forwards',
+ sidenavRTLEntering: 'sidenavRTL 0.3s ease-in-out forwards',
+ sidenavLTRExit: 'sidenavLTR 0.3s ease-in-out reverse forwards',
+ sidenavRTLExit: 'sidenavRTL 0.3s ease-in-out reverse forwards',
+ fadeEntering: 'fade 0.3s forwards',
+ fadeExit: 'fade 0.3s reverse forwards',
+ dropDown: 'dropDown 0.3s forwards',
+ dropDownExit: 'dropDown 0.3s reverse forwards'
+ },
+ backgroundImage: {
+ offersBG: "url('/images/carouselBox-bg/offersbg.webp')"
+ }
+ }
+ },
+ plugins: []
+}
diff --git a/apps/mobility-bap/tsconfig.json b/apps/mobility-bap/tsconfig.json
new file mode 100644
index 000000000..54652790b
--- /dev/null
+++ b/apps/mobility-bap/tsconfig.json
@@ -0,0 +1,26 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "target": "es5",
+ "lib": ["dom", "dom.iterable", "esnext"],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": true,
+ "forceConsistentCasingInFileNames": true,
+ "noEmit": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "node",
+ "resolveJsonModule": true,
+ "types": ["node"],
+ "isolatedModules": true,
+ "jsx": "preserve",
+ "incremental": true,
+ "baseUrl": ".",
+ "paths": {
+ "@/components/*": ["components/*"]
+ }
+ },
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+ "exclude": ["node_modules"]
+}
diff --git a/apps/mobility-bap/utilities/auth.ts b/apps/mobility-bap/utilities/auth.ts
new file mode 100644
index 000000000..297ebe0ea
--- /dev/null
+++ b/apps/mobility-bap/utilities/auth.ts
@@ -0,0 +1,8 @@
+import jwt from 'jsonwebtoken'
+import { IUser } from '../lib/types/user'
+
+export const signToken = (user: IUser) => {
+ return jwt.sign(user, process.env.JWT_SECRET as string, {
+ expiresIn: '30d'
+ })
+}
diff --git a/apps/mobility-bap/utilities/common-utils.ts b/apps/mobility-bap/utilities/common-utils.ts
new file mode 100644
index 000000000..0ca62856b
--- /dev/null
+++ b/apps/mobility-bap/utilities/common-utils.ts
@@ -0,0 +1,40 @@
+export const toBinary = (objectString: string) => {
+ const codeUnits = Uint16Array.from({ length: objectString.length }, (element, index) =>
+ objectString.charCodeAt(index)
+ )
+ const charCodes = new Uint8Array(codeUnits.buffer)
+
+ let result = ''
+ charCodes.forEach(char => {
+ result += String.fromCharCode(char)
+ })
+ return result
+}
+
+export const fromBinary = (binary: string) => {
+ const bytes = Uint8Array.from({ length: binary.length }, (element, index) => binary.charCodeAt(index))
+ const charCodes = new Uint16Array(bytes.buffer)
+
+ let result = ''
+ charCodes.forEach(char => {
+ result += String.fromCharCode(char)
+ })
+ return result
+}
+
+export const areObjectPropertiesEqual = (obj1: any, obj2: any) => {
+ const keys1 = Object.keys(obj1)
+ const keys2 = Object.keys(obj2)
+
+ if (keys1.length !== keys2.length) {
+ return false
+ }
+
+ for (let key of keys1) {
+ if (obj1[key] !== obj2[key]) {
+ return false
+ }
+ }
+
+ return true
+}
diff --git a/apps/mobility-bap/utilities/confirm-utils.ts b/apps/mobility-bap/utilities/confirm-utils.ts
new file mode 100644
index 000000000..bf4b0541a
--- /dev/null
+++ b/apps/mobility-bap/utilities/confirm-utils.ts
@@ -0,0 +1,162 @@
+import { ResponseModel } from '../lib/types/responseModel'
+
+export const getInitMetaDataPerBpp = (initRes: ResponseModel[]) => {
+ const itemsPerBpp = {}
+ initRes.forEach(res => {
+ const bppId = res.context.bpp_id
+ const bpp_uri = res.context.bpp_uri
+
+ itemsPerBpp[bppId] = {
+ ...res.message.catalogs.responses[0].message.order,
+ bpp_uri
+ }
+ })
+
+ return itemsPerBpp
+}
+
+export const getConfirmMetaDataForBpp = (initRes: ResponseModel[]) => {
+ const itemsPerBpp = {}
+ initRes.forEach(res => {
+ const bppId = res.context.bpp_id
+ const bpp_uri = res.context.bpp_uri
+
+ itemsPerBpp[bppId] = {
+ ...res.message.responses[0].message.order,
+ bpp_uri
+ }
+ })
+
+ return itemsPerBpp
+}
+
+export const getPayloadForConfirmRequest = (
+ initMetaDataPerBpp: any,
+ transactionId: { transactionId: string },
+ userId: string
+) => {
+ const payload: any = {
+ confirmRequestDto: [],
+ userId: userId
+ }
+
+ Object.keys(initMetaDataPerBpp).forEach(bppId => {
+ const confirmItem: any = {
+ context: {
+ transaction_id: transactionId.transactionId,
+ bpp_id: bppId,
+ bpp_uri: initMetaDataPerBpp[bppId].bpp_uri,
+ domain: 'retail'
+ },
+
+ message: {
+ order: {
+ provider: {
+ id: initMetaDataPerBpp[bppId].provider.id
+ },
+ addOns: [],
+ offers: [],
+ billing: initMetaDataPerBpp[bppId].billing,
+ fulfillment: {
+ type: initMetaDataPerBpp[bppId].fulfillment.type,
+ end: {
+ location: {
+ gps: initMetaDataPerBpp[bppId].fulfillment.end.location.gps,
+ address: initMetaDataPerBpp[bppId].billing.address
+ },
+ contact: {
+ phone: initMetaDataPerBpp[bppId].billing.phone,
+ email: 'testemail1@mailinator.com'
+ }
+ },
+ customer: {
+ person: {
+ name: initMetaDataPerBpp[bppId].billing.name
+ }
+ },
+ id: initMetaDataPerBpp[bppId].fulfillment.id
+ },
+ payment: initMetaDataPerBpp[bppId].payment,
+ items: []
+ }
+ }
+ }
+
+ initMetaDataPerBpp[bppId].items.forEach((item: any) => {
+ const itemObject = {
+ quantity: item.quantity,
+ id: item.id
+ }
+ confirmItem.message.order.items.push(itemObject)
+ })
+
+ payload.confirmRequestDto.push(confirmItem)
+ })
+
+ return payload
+}
+
+export const getPayloadForStatusRequest = (
+ confirmOrderMetaDataPerBpp: any,
+ transactionId: { transactionId: string }
+) => {
+ const payload: any = {
+ statusRequestDto: []
+ }
+
+ Object.keys(confirmOrderMetaDataPerBpp).forEach(bppId => {
+ const statusItem: any = {
+ context: {
+ transaction_id: transactionId.transactionId,
+ bpp_id: bppId,
+ bpp_uri: confirmOrderMetaDataPerBpp[bppId].bpp_uri,
+ domain: 'retail'
+ },
+
+ message: {
+ order_id: confirmOrderMetaDataPerBpp[bppId].id
+ }
+ }
+
+ payload.statusRequestDto.push(statusItem)
+ })
+
+ return payload
+}
+
+export const getPayloadForTrackRequest = (
+ confirmOrderMetaDataPerBpp: any,
+ transactionId: { transactionId: string }
+) => {
+ const payload: any = {
+ trackRequestDto: []
+ }
+
+ Object.keys(confirmOrderMetaDataPerBpp).forEach(bppId => {
+ const statusItem: any = {
+ context: {
+ transaction_id: transactionId.transactionId,
+ bpp_id: bppId,
+ bpp_uri: confirmOrderMetaDataPerBpp[bppId].bpp_uri,
+ domain: 'retail'
+ },
+
+ message: {
+ order_id: confirmOrderMetaDataPerBpp[bppId].id
+ }
+ }
+
+ payload.trackRequestDto.push(statusItem)
+ })
+
+ return payload
+}
+
+export const getOrderPlacementTimeline = (timeStamp: string) => {
+ const localDateAndTime = new Date(timeStamp)
+ const localTime = localDateAndTime.toLocaleTimeString()
+ const localDate = localDateAndTime.toDateString()
+ const localDateWithoutDay = localDate.split(' ').slice(1).join(' ')
+
+ return `${localDateWithoutDay}, ${localTime}`
+}
diff --git a/apps/mobility-bap/utilities/currencyFormat.ts b/apps/mobility-bap/utilities/currencyFormat.ts
new file mode 100644
index 000000000..00012cd95
--- /dev/null
+++ b/apps/mobility-bap/utilities/currencyFormat.ts
@@ -0,0 +1,9 @@
+// Rial currency format
+export const irrCurrencyFormat = (price: number | undefined) => {
+ return price ? new Intl.NumberFormat('fa-IR').format(price) : null
+}
+
+//pound currency format
+export const gbpCurrencyFormat = (price: number | undefined) => {
+ return price ? new Intl.NumberFormat('en-GB').format(price) : null
+}
diff --git a/apps/mobility-bap/utilities/detailsForm-utils.ts b/apps/mobility-bap/utilities/detailsForm-utils.ts
new file mode 100644
index 000000000..551ab3088
--- /dev/null
+++ b/apps/mobility-bap/utilities/detailsForm-utils.ts
@@ -0,0 +1,41 @@
+import { ShippingFormData } from '../pages/checkoutPage'
+
+export interface FormErrors {
+ name?: string
+ mobileNumber?: string
+ email?: string
+ address?: string
+ zipCode?: string
+}
+
+export const validateForm = (formData: ShippingFormData): FormErrors => {
+ const errors: FormErrors = {}
+
+ if (formData.name.trim() === '') {
+ errors.name = 'errorName'
+ }
+
+ if (formData.mobileNumber.trim() === '') {
+ errors.mobileNumber = 'errorNumber'
+ } else if (!/^\d{10}$/.test(formData.mobileNumber)) {
+ errors.mobileNumber = 'errorNumber2'
+ }
+
+ if (formData.email.trim() === '') {
+ errors.email = 'errorEmail'
+ } else if (!/^\S+@\S+\.\S+$/.test(formData.email)) {
+ errors.email = 'errorEmail2'
+ }
+
+ if (formData.address.trim() === '') {
+ errors.address = 'errorAddress'
+ }
+
+ if (formData.zipCode.trim() === '') {
+ errors.zipCode = 'errorZipcode'
+ } else if (!/^\d{5}$/.test(formData.zipCode)) {
+ errors.zipCode = 'errorZipcode2'
+ }
+
+ return errors
+}
diff --git a/apps/mobility-bap/utilities/error.ts b/apps/mobility-bap/utilities/error.ts
new file mode 100644
index 000000000..1f5b60102
--- /dev/null
+++ b/apps/mobility-bap/utilities/error.ts
@@ -0,0 +1,4 @@
+const getError = (err: any) =>
+ err.response && err.response.data && err.response.data.message ? err.response.data.message : err.message
+
+export { getError }
diff --git a/apps/mobility-bap/utilities/sortByCost.ts b/apps/mobility-bap/utilities/sortByCost.ts
new file mode 100644
index 000000000..ea06410d1
--- /dev/null
+++ b/apps/mobility-bap/utilities/sortByCost.ts
@@ -0,0 +1,9 @@
+import { RetailItem } from '../lib/types/products'
+
+export const sortByExpensive = (product1: RetailItem, product2: RetailItem): number => {
+ return parseFloat(product2.price.value) - parseFloat(product1.price.value)
+}
+
+export const sortByCheapest = (product1: RetailItem, product2: RetailItem): number => {
+ return parseFloat(product1.price.value) - parseFloat(product2.price.value)
+}
diff --git a/apps/mobility-bap/utilities/sortByPopularity.ts b/apps/mobility-bap/utilities/sortByPopularity.ts
new file mode 100644
index 000000000..f6753420d
--- /dev/null
+++ b/apps/mobility-bap/utilities/sortByPopularity.ts
@@ -0,0 +1,10 @@
+// import { IProduct, RetailItem } from "../lib/types/products";
+
+// export const sortByPoPularity = (
+// product1: RetailItem,
+// product2: RetailItem
+// ): number => {
+// return product2.starRating - product1.starRating;
+// };
+
+export {}
diff --git a/apps/mobility-bap/utilities/sortByTimeStamp.ts b/apps/mobility-bap/utilities/sortByTimeStamp.ts
new file mode 100644
index 000000000..ddfd6137d
--- /dev/null
+++ b/apps/mobility-bap/utilities/sortByTimeStamp.ts
@@ -0,0 +1,28 @@
+// import { IProduct, RetailItem } from "../lib/types/products";
+
+// export function getTimeStamp(date: string) {
+// const creationProductDate = new Date(date);
+// return creationProductDate.getTime();
+// }
+
+// export const sortByTimeStamp = (
+// product1: IProduct,
+// product2: IProduct
+// ): number => {
+// if (product2?.timeStamp && product1?.timeStamp) {
+// return product2?.timeStamp - product1?.timeStamp;
+// }
+// return 0;
+// };
+
+// export const newestProductsFn = (products: RetailItem[]) => {
+// const productsWithTimeStamp = products.map((product) => {
+// return {
+// ...product,
+// timeStamp: getTimeStamp(product.registerDate!),
+// };
+// });
+// return productsWithTimeStamp.sort(sortByTimeStamp);
+// };
+
+export {}
diff --git a/apps/retail/components/cart/cart.types.ts b/apps/retail/components/cart/cart.types.ts
new file mode 100644
index 000000000..80fdc8a1b
--- /dev/null
+++ b/apps/retail/components/cart/cart.types.ts
@@ -0,0 +1,28 @@
+export type SelectItem = {
+ id: string
+ selected: { quantity: { count: number } }
+}
+
+export type SelectItems = SelectItem[]
+
+export type SelectFulfillments = { id: string }[]
+
+export type SelectOrder = {
+ items: SelectItems
+ provider: { id: string }
+ fulfillments: SelectFulfillments
+}
+
+export type SelectContext = {
+ transaction_id: string
+ bpp_id: string
+ bpp_uri: string
+ domain: string
+}
+
+export type SelectSingleData = {
+ context: SelectContext
+ message: { orders: SelectOrder[] }
+}
+
+export type SelectData = SelectSingleData[]
diff --git a/apps/retail/components/cart/cart.utils.tsx b/apps/retail/components/cart/cart.utils.tsx
new file mode 100644
index 000000000..f8e239c41
--- /dev/null
+++ b/apps/retail/components/cart/cart.utils.tsx
@@ -0,0 +1,73 @@
+import { SelectData } from './cart.types'
+
+export const getSelectPayload = (inputData: any, transactionId: string, domain = 'retail'): { data: SelectData } => {
+ const transaction_id = transactionId
+
+ const resultData = []
+
+ const bppGroups = inputData.reduce((acc, item) => {
+ if (!acc[item.bpp_id]) {
+ acc[item.bpp_id] = []
+ }
+ acc[item.bpp_id].push(item)
+ return acc
+ }, {})
+
+ Object.entries(bppGroups).forEach(([bpp_id, items]) => {
+ console.log('Dank', bpp_id)
+ const context = {
+ transaction_id,
+ bpp_id,
+ bpp_uri: items[0].bpp_uri,
+ domain
+ }
+
+ const orders = []
+
+ const providerGroups = items.reduce((acc, item) => {
+ const providerKey = `${item.providerId}`
+ if (!acc[providerKey]) {
+ acc[providerKey] = []
+ }
+ acc[providerKey].push(item)
+ return acc
+ }, {})
+
+ Object.values(providerGroups).forEach(group => {
+ group.forEach(item => {
+ const orderIndex = orders.findIndex(order => order.provider.id === item.providerId)
+ const newItem = {
+ id: item.id,
+ quantity: {
+ selected: {
+ count: item.quantity
+ }
+ }
+ }
+
+ if (orderIndex > -1) {
+ orders[orderIndex].items.push(newItem)
+ } else {
+ orders.push({
+ items: [newItem],
+ provider: {
+ id: item.providerId
+ },
+ fulfillments:
+ item.fulfillments &&
+ item.fulfillments.map(fulfillment => ({
+ id: fulfillment.id
+ }))
+ })
+ }
+ })
+ })
+
+ resultData.push({
+ context,
+ message: { orders }
+ })
+ })
+
+ return { data: resultData }
+}
diff --git a/apps/retail/components/cart/index.tsx b/apps/retail/components/cart/index.tsx
new file mode 100644
index 000000000..25eb7e79a
--- /dev/null
+++ b/apps/retail/components/cart/index.tsx
@@ -0,0 +1,3 @@
+import Cart from './cart'
+
+export default Cart
diff --git a/apps/retail/components/checkout/checkout.utils.tsx b/apps/retail/components/checkout/checkout.utils.tsx
new file mode 100644
index 000000000..087d490db
--- /dev/null
+++ b/apps/retail/components/checkout/checkout.utils.tsx
@@ -0,0 +1,286 @@
+import { CartRetailItem, DataPerBpp } from '@lib/types/cart'
+import { ResponseModel } from '@lib/types/responseModel'
+import { ShippingFormData } from '../checkout'
+import { areObjectPropertiesEqual } from '@utils/common-utils'
+import { ShippingFormInitialValuesType } from '@beckn-ui/becknified-components'
+
+export const getPayloadForInitRequest = (
+ cartItemsPerBppPerProvider: DataPerBpp,
+ transactionId: { transactionId: string },
+ customerAddress: ShippingFormInitialValuesType,
+ billingFormData: ShippingFormInitialValuesType
+) => {
+ const payload: any = {
+ initRequestDto: []
+ }
+
+ Object.keys(cartItemsPerBppPerProvider).forEach(bppId => {
+ const cartItem: any = {
+ context: {
+ transaction_id: transactionId.transactionId,
+ bpp_id: bppId,
+ bpp_uri: cartItemsPerBppPerProvider[bppId][0].bpp_uri,
+ domain: 'retail'
+ },
+ message: {
+ order: {
+ items: [],
+ provider: {
+ id: cartItemsPerBppPerProvider[bppId][0].providerId,
+ locations: [
+ {
+ id: cartItemsPerBppPerProvider[bppId][0].location_id
+ }
+ ]
+ },
+ addOns: [],
+ offers: [],
+ billing: {
+ name: customerAddress.name,
+ phone: customerAddress.mobileNumber,
+ address: {
+ door: '',
+ building: customerAddress.address,
+ city: customerAddress.address,
+ state: customerAddress.address,
+ country: 'IND',
+ area_code: customerAddress.pinCode
+ },
+ email: 'testemail1@mailinator.com'
+ },
+ fulfillment: {
+ type: 'HOME-DELIVERY',
+ end: {
+ location: {
+ gps: cartItemsPerBppPerProvider[bppId][0].locations[0].gps,
+ address: {
+ door: '',
+ building: customerAddress.address,
+ street: customerAddress.address,
+ city: customerAddress.address,
+ state: customerAddress.address,
+ country: 'IND',
+ area_code: '560076'
+ }
+ },
+ contact: {
+ phone: '9191223433',
+ email: 'testemail1@mailinator.com'
+ }
+ },
+ customer: {
+ person: {
+ name: customerAddress.name
+ }
+ },
+ id: cartItemsPerBppPerProvider[bppId][0].providerId
+ }
+ }
+ }
+ }
+ cartItemsPerBppPerProvider[bppId].forEach((item: any) => {
+ if (item.bpp_id === bppId) {
+ const itemObject = {
+ quantity: {
+ count: item.quantity
+ },
+ id: item.id
+ }
+ cartItem.message.order.items.push(itemObject)
+ }
+ })
+ payload.initRequestDto.push(cartItem)
+ })
+ return payload
+}
+
+export const getSubTotalAndDeliveryCharges = (initData: any) => {
+ let subTotal = 0
+ let totalDeliveryCharge = 0
+ let currencySymbol
+
+ if (initData && initData.length > 0) {
+ initData.forEach(data => {
+ const deliveryAmount = parseFloat(data.message.order.quote.breakup[1].price.value).toFixed(2)
+ totalDeliveryCharge += parseFloat(deliveryAmount)
+
+ const subTotalAmount = parseFloat(data.message.order.quote.breakup[0].price.value).toFixed(2)
+
+ currencySymbol = data.message.order.quote.price.currency
+
+ subTotal += parseFloat(parseFloat(subTotalAmount).toFixed(2))
+ })
+ }
+
+ return { subTotal, totalDeliveryCharge, currencySymbol }
+}
+
+export const getTotalCartItems = (cartItems: CartRetailItem[]) => {
+ let quantity = 0
+
+ cartItems.forEach(item => {
+ quantity += item.quantity
+ })
+
+ return quantity
+}
+
+export const areShippingAndBillingDetailsSame = (
+ isBillingAddressComplete: boolean,
+ formData: ShippingFormData,
+ billingFormData: ShippingFormData
+) => {
+ if (isBillingAddressComplete) {
+ return areObjectPropertiesEqual(formData, billingFormData)
+ }
+ return !isBillingAddressComplete
+}
+
+const extractAddressComponents = (result: any) => {
+ let country = null,
+ state = null,
+ city = null
+
+ for (const component of result.address_components) {
+ if (component.types.includes('country')) {
+ country = component.long_name
+ } else if (component.types.includes('administrative_area_level_1')) {
+ state = component.long_name
+ } else if (component.types.includes('locality')) {
+ city = component.long_name
+ }
+ }
+ return { country, state, city }
+}
+
+const geocodeFromPincode = async (pincode: any) => {
+ const geocoder = new window.google.maps.Geocoder()
+ try {
+ const response = await geocoder.geocode({ address: pincode })
+ console.log('Dank', response)
+ if (response.results.length > 0) {
+ const { country, state, city } = extractAddressComponents(response.results[0])
+ const lat = response.results[0].geometry.location.lat()
+ const lng = response.results[0].geometry.location.lng()
+ return { country, state, city, lat, lng }
+ } else {
+ console.log('No results found')
+ }
+ } catch (error) {
+ console.error(error)
+ }
+}
+
+export const getInitPayload = async (
+ deliveryAddress: any,
+ billingAddress: any,
+ cartItems: any,
+ transaction_id: string,
+ domain: string = 'retail:1.1.0'
+) => {
+ const cityData = await geocodeFromPincode(deliveryAddress.pinCode)
+
+ const bppGroups = cartItems.reduce((acc, item) => {
+ if (!acc[item.bpp_id]) {
+ acc[item.bpp_id] = []
+ }
+ acc[item.bpp_id].push(item)
+ return acc
+ }, {})
+
+ const data = Object.entries(bppGroups).map(([bpp_id, items]) => {
+ return {
+ context: {
+ transaction_id: transaction_id,
+ bpp_id: bpp_id,
+ bpp_uri: items[0].bpp_uri,
+ domain: domain
+ },
+ message: {
+ orders: transformOrdersByProvider(items)
+ }
+ }
+ })
+
+ function transformOrdersByProvider(items) {
+ const providerGroups = items.reduce((acc, item) => {
+ const providerKey = `${item.bpp_id}_${item.providerId}`
+ if (!acc[providerKey]) {
+ acc[providerKey] = []
+ }
+ acc[providerKey].push(item)
+ return acc
+ }, {})
+
+ return Object.values(providerGroups).map(group => {
+ const providerId = group[0].providerId
+ const items = group.map(item => ({
+ id: item.id,
+ quantity: {
+ selected: {
+ count: item.quantity
+ }
+ }
+ }))
+
+ const fulfillments = [
+ {
+ id: '3',
+ type: 'standard-shipping',
+ stops: [
+ {
+ location: {
+ gps: `${cityData.lat},${cityData.lng}`,
+ address: deliveryAddress.address,
+ city: {
+ name: cityData?.city
+ },
+ state: {
+ name: cityData?.state
+ },
+ country: {
+ code: 'IND'
+ },
+ area_code: deliveryAddress.pinCode
+ },
+ contact: {
+ phone: deliveryAddress.mobileNumber,
+ email: deliveryAddress.email
+ }
+ }
+ ]
+ }
+ ]
+
+ return {
+ provider: {
+ id: providerId
+ },
+ items,
+ fulfillments,
+ customer: {
+ person: {
+ name: deliveryAddress.name
+ },
+ contact: {
+ phone: deliveryAddress.mobileNumber
+ }
+ },
+ billing: {
+ name: billingAddress.name,
+ phone: billingAddress.mobileNumber,
+ address: billingAddress.address,
+ email: billingAddress.email,
+ city: {
+ name: cityData?.city
+ },
+ state: {
+ name: cityData?.state
+ }
+ }
+ }
+ })
+ }
+
+ return { data }
+}
diff --git a/apps/retail/components/checkout/index.tsx b/apps/retail/components/checkout/index.tsx
new file mode 100644
index 000000000..eb9a164a4
--- /dev/null
+++ b/apps/retail/components/checkout/index.tsx
@@ -0,0 +1,3 @@
+import checkout from '../checkout'
+
+export default checkout
diff --git a/apps/retail/components/filter/Filter.tsx b/apps/retail/components/filter/Filter.tsx
index 8a3f91a19..4673c62d3 100644
--- a/apps/retail/components/filter/Filter.tsx
+++ b/apps/retail/components/filter/Filter.tsx
@@ -56,21 +56,27 @@ export const theme = extendTheme({
}
})
-const Filter = () => {
+const Filter = ({ handleApplyFilter, handleResetFilter }) => {
const [formData, setFormData] = useState({})
+ const [sortBy, setSortBy] = useState('')
const handleChange = (name: string, value: string) => {
+ setSortBy(value)
setFormData(prevData => ({
...prevData,
[name]: value
}))
}
-
+ const resetFilter = () => {
+ setSortBy('')
+ setFormData({})
+ handleResetFilter()
+ }
return (
<>
{
Reset
@@ -93,32 +101,8 @@ const Filter = () => {
-
- Search by
-
-
-
-
-
-
- Service Type
+ Sort By Price
+
-
- Rating
-
-
-
-
-
-
- Deals & Discounts
+ Filter By Rating
- {/* */}
diff --git a/apps/retail/components/header/CartIcon.tsx b/apps/retail/components/header/CartIcon.tsx
new file mode 100644
index 000000000..ba89dd4cc
--- /dev/null
+++ b/apps/retail/components/header/CartIcon.tsx
@@ -0,0 +1,44 @@
+import React from 'react'
+import { MouseEventHandler } from 'react'
+import { Box, Flex, Text, Image } from '@chakra-ui/react'
+
+function CartIconWithCount({
+ itemCount = 2,
+ handleClick
+}: {
+ itemCount: number
+ handleClick?: MouseEventHandler
+}) {
+ return (
+
+
+ {itemCount}
+
+
+ )
+}
+
+export default CartIconWithCount
diff --git a/apps/retail/components/header/index.tsx b/apps/retail/components/header/index.tsx
index 413dc70c1..49aa7ef4e 100644
--- a/apps/retail/components/header/index.tsx
+++ b/apps/retail/components/header/index.tsx
@@ -1,15 +1,18 @@
import React, { useEffect, useState } from 'react'
import { BottomModal } from '@beckn-ui/molecules'
-import { Box, Divider, Flex, HStack, Image, Text } from '@chakra-ui/react'
-import { useRouter } from 'next/router'
+import { useTheme, Box, Divider, Flex, HStack, Image, Text } from '@chakra-ui/react'
+import { Router, useRouter } from 'next/router'
import styles from './header.module.css'
+import { useSelector, useDispatch } from 'react-redux'
+import { logout } from '@store/authSlice'
import { useLanguage } from '../../hooks/useLanguage'
import Qrcode from '@components/qrCode/Qrcode'
-import BottomModalScan from '@components/BottomModal/BottomModalScan'
import BecknButton from '@beckn-ui/molecules/src/components/button/Button'
+import CartIconWithCount from './CartIcon'
import TopSheet from '@components/topSheet/TopSheet'
+import { ICartRootState } from '@lib/types'
type PathnameObjectType = { [key: string]: string }
@@ -19,27 +22,26 @@ const cartIconBlackList: string[] = [
'/trackOrder',
'/feedback',
'/orderHistory',
- '/',
+ '/signin',
'/mobileOtp',
- '/cart',
'/checkoutPage',
'/paymentMode',
- '/search',
- '/product',
'/signUp',
- '/invoiceDetails'
+ '/invoiceDetails',
+ '/',
+ '/cart'
]
-const backIconList = ['/', '/homePage']
+const backIconList = ['/', '/signin']
-const homeIconBlackList = ['/', '/homePage', '/mobileOtp', '/paymentMode', '/signUp']
+const homeIconBlackList = ['/', '/signin', '/mobileOtp', '/paymentMode', '/signUp']
const storeHeaderBlackList = [
'/checkoutPage',
'/orderHistory',
'/orderDetails',
'/cart',
- '/homePage',
+ '/',
'/orderConfirmation',
'feedback',
'/',
@@ -50,14 +52,16 @@ const storeHeaderBlackList = [
'/assemblyDetails',
'/updateShippingDetails',
'/orderCancellation',
- '/profile'
+ '/profile',
+ '/search',
+ '/checkout'
]
const headerValues: PathnameObjectType = {
'/checkoutPage': 'Review Purchase Order',
- '/orderHistory': 'Order History',
+ '/orderHistory': 'My Orders',
'/orderDetails': 'Order Details',
'/invoiceDetails': 'Invoice Details',
- '/': 'Sign In',
+ '/signin': 'Sign In',
'/signUp': 'Sign Up',
'/cart': 'Cart',
'/paymentMode': 'Select Payment Method',
@@ -65,8 +69,9 @@ const headerValues: PathnameObjectType = {
'/updateShippingDetails': 'Shipping Details',
'/orderCancellation': 'Order Cancel',
'/feedback': '',
- '/profile': 'Profile'
- // '/search':'Search results'
+ '/profile': 'Profile',
+ '/search': 'Search results',
+ '/checkout': 'Billing & Shipping'
}
const headerValuesFrench: PathnameObjectType = {
@@ -84,10 +89,10 @@ const topHeaderBlackList: string[] = []
const bottomHeaderBlackList = ['/orderConfirmation']
-const menuIconWhiteList = ['/homePage', '/search', '/profile']
+const menuIconWhiteList = ['/', '/search', '/profile']
const orderIconList = ['/orderDetails']
const invoiceDownloadIcon = ['/invoiceDetails']
-const currentLocation = ['/homePage']
+const currentLocation = ['/']
const getHeaderTitleForPage = (name: string, logo: string, pathName: string, locale: string | undefined) => {
const values = locale === 'en' ? headerValues : headerValuesFrench
@@ -109,6 +114,7 @@ export interface TopHeaderProps {
const TopHeader: React.FC = ({ handleMenuClick }) => {
const [isMenuModalOpen, setMenuModalOpen] = useState(false)
+ const dispatch = useDispatch()
const { t, locale } = useLanguage()
const router = useRouter()
@@ -125,10 +131,10 @@ const TopHeader: React.FC = ({ handleMenuClick }) => {
>
- {/*
{!homeIconBlackList.includes(router.pathname) && (
@@ -140,7 +146,7 @@ const TopHeader: React.FC = ({ handleMenuClick }) => {
const user = localStorage.getItem('userPhone') as string
localStorage.clear()
localStorage.setItem('userPhone', user)
- router.push(`/homePage`)
+ router.push(`/`)
}}
src="/images/Home_icon.svg"
alt="home Icon"
@@ -162,33 +168,73 @@ const TopHeader: React.FC = ({ handleMenuClick }) => {
{/* Menu Modal */}
- {
- router.push('/orderHistory')
- setMenuModalOpen(false)
- }}
- className={styles.top_header_modal}
- >
-
+
+ {
+ router.push('/profile')
+ setMenuModalOpen(false)
+ }}
+ className={styles.top_header_modal}
+ >
+
+ {
+ router.push('/orderHistory')
+ setMenuModalOpen(false)
+ }}
+ className={styles.top_header_modal}
+ >
+
+ {
+ dispatch(logout())
+ router.push('/signin')
+ setMenuModalOpen(false)
+ }}
+ className={styles.top_header_modal}
+ >
+
+
)
}
+const getLocalStorage = (item: string) => {
+ if (typeof window !== 'undefined' && window.localStorage) {
+ return localStorage.getItem(item)
+ } else {
+ return ''
+ }
+}
const BottomHeader = () => {
const [optionTags, setOptionTags] = useState()
const { t, locale } = useLanguage()
const [isOrderModalOpen, setOrderModalOpen] = useState(false)
const [isInvoiceModalOpen, setInvoiceModalOpen] = useState(false)
+ const cartItems = useSelector((state: ICartRootState) => state.cart.items)
+ const theme = useTheme()
+ const storedHeaderText = getLocalStorage('selectCardHeaderText')
const [currentAddress, setCurrentAddress] = useState('')
const [loadingForCurrentAddress, setLoadingForCurrentAddress] = useState(true)
@@ -289,25 +335,26 @@ const BottomHeader = () => {
/>
)}
- {getHeaderTitleForPage(optionTags?.name, optionTags?.logo, router.pathname, locale)}
+ {getHeaderTitleForPage(
+ // optionTags?.name,
+ storedHeaderText as string,
+ optionTags?.logo,
+ router.pathname,
+ locale
+ )}
setOrderModalOpen(true)}
- src="/images/orderDetailsIcon.svg"
+ src="/images/downloadInvoice.svg"
alt="order icon"
mr={'20px'}
/>
@@ -327,6 +374,7 @@ const BottomHeader = () => {
title=""
isOpen={isOrderModalOpen}
onClose={handleOrderModalClose}
+ responsive={true}
>
{
@@ -342,10 +390,10 @@ const BottomHeader = () => {
{t['invoiceDetails']}
-
{
-
+
)
}
diff --git a/apps/retail/components/layout/Layout.tsx b/apps/retail/components/layout/Layout.tsx
index 9c4e07f49..7a1b4f6b4 100644
--- a/apps/retail/components/layout/Layout.tsx
+++ b/apps/retail/components/layout/Layout.tsx
@@ -25,8 +25,8 @@ const Layout: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
})
return (
- //
-
+ //
+
Kuza One
@@ -57,8 +57,8 @@ const Layout: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
rtl={locale === 'en' ? false : true}
position={locale === 'en' ? 'top-right' : 'top-left'}
/>
-
- //
+
+ //
)
}
diff --git a/apps/retail/components/orderDetailComponents/Shipping.tsx b/apps/retail/components/orderDetailComponents/Shipping.tsx
new file mode 100644
index 000000000..d42c4e4aa
--- /dev/null
+++ b/apps/retail/components/orderDetailComponents/Shipping.tsx
@@ -0,0 +1,85 @@
+import React from 'react'
+import {Typography} from '@beckn-ui/molecules'
+import {Box,Stack,StackDivider,Flex,Image} from '@chakra-ui/react'
+
+export interface ShippingBlockProps {
+ title?:string
+ name:{
+ icon:any,
+ text:string
+ }
+ address:{
+ icon:any,
+ text:string
+ }
+ mobile:{
+ icon:any,
+ text:string
+ },
+ responsive?:boolean
+
+}
+
+ const ShippingBlock:React.FC = ({
+ title,name,address,mobile,responsive
+ })=> {
+ return (
+
+ {title &&
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default ShippingBlock
\ No newline at end of file
diff --git a/apps/retail/components/orderDetailComponents/ViewMoreOrder.tsx b/apps/retail/components/orderDetailComponents/ViewMoreOrder.tsx
new file mode 100644
index 000000000..3685a328a
--- /dev/null
+++ b/apps/retail/components/orderDetailComponents/ViewMoreOrder.tsx
@@ -0,0 +1,103 @@
+import {
+ Modal,
+ ModalOverlay,
+ ModalContent,
+ Flex,
+ ModalCloseButton,
+ Divider,
+ ModalBody,
+ Box,
+ Text,
+ Image
+} from '@chakra-ui/react'
+import React from 'react'
+import { Button, Typography } from '@beckn-ui/molecules'
+import ButtonComp from '../button/Button'
+import crossIcon from '../../public/images/crossIcon.svg'
+import { useLanguage } from '../../hooks/useLanguage'
+import { currencyMap } from '@lib/config'
+
+export interface ViewMoreOrderModalProps {
+ isOpen: boolean
+ onOpen: () => void
+ onClose: () => void
+ items: any
+ orderId: string
+}
+
+const ViewMoreOrderModal: React.FC = props => {
+ const { t } = useLanguage()
+ console.log('Dank view', props.items)
+ return (
+ <>
+
+
+
+
+ {t.orderId}: {props.orderId}
+
+
+ {/* eslint-disable-next-line jsx-a11y/alt-text */}
+
+
+
+
+
+
+ {props.items.map((item: any) => {
+ return (
+
+
+ {item.name}
+
+ x {item.quantity.selected.count}
+
+
+
+ )
+ })}
+
+
+
+
+
+
+ )
+}
+
+export default ViewMoreOrderModal
diff --git a/apps/retail/components/signIn/SignIn.tsx b/apps/retail/components/signIn/SignIn.tsx
index 88d7296e2..e5c62ac08 100644
--- a/apps/retail/components/signIn/SignIn.tsx
+++ b/apps/retail/components/signIn/SignIn.tsx
@@ -1,18 +1,17 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
import Logo from '../../public/images/Logo.svg'
import AlternateLogo from '../../public/images/KuzaLogo.svg'
import { useLanguage } from '@hooks/useLanguage'
import { SignInPropsModel } from './SignIn.types'
import { FormErrors, signInValidateForm } from '@utils/form-utils'
-import { useBreakpoint } from '@chakra-ui/react'
+import { useDispatch } from 'react-redux'
+import { useLoginMutation } from '@services/Users'
import { BecknAuth } from '@beckn-ui/becknified-components'
-import api from '../../services/Users'
import { FaGoogle } from 'react-icons/fa'
import Router from 'next/router'
-import { Box, useToast, Text } from '@chakra-ui/react'
-import Cookies from 'js-cookie'
+import { Box, useToast, Text, useBreakpoint } from '@chakra-ui/react'
const SignIn = () => {
const { t } = useLanguage()
@@ -20,13 +19,12 @@ const SignIn = () => {
const [formData, setFormData] = useState({ email: '', password: '' })
const [formErrors, setFormErrors] = useState({ email: '', password: '' })
const [isFormFilled, setIsFormFilled] = useState(false)
- const toast = useToast()
const breakpoint = useBreakpoint()
- // const [updatePost, result] = useSignInMutation()
const mobileBreakpoints = ['base', 'sm', 'md', 'lg']
const currentLogo = mobileBreakpoints.includes(breakpoint) ? Logo : AlternateLogo
+ const [login, { isLoading }] = useLoginMutation()
- const baseUrl = process.env.NEXT_PUBLIC_STRAPI_URL
+ const toast = useToast()
const handleInputChange = (e: React.ChangeEvent) => {
const { name, value } = e.target
@@ -56,37 +54,20 @@ const SignIn = () => {
}
try {
- const response = await fetch(`${baseUrl}/auth/local`, {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(signInData)
- })
-
- if (response.ok) {
- const data = await response.json()
- const token = data.jwt
-
- Cookies.set('authToken', token)
- Router.push('/homePage')
- } else {
- const errorData = await response.json()
- toast({
- render: () => (
- (false)
+ const [error, setError] = useState('')
+
+ const fetchData = async (url: string, method = 'POST', payLoad: any = null) => {
+ try {
+ setLoading(true)
+ const response = await axios.request({
+ url,
+ method,
+ data: payLoad
+ })
+ setData(response.data)
+ } catch (error: any) {
+ setError(error.message)
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ return { data, loading, error, fetchData }
+}
+
+export default useRequest
diff --git a/apps/retail/lib/config.ts b/apps/retail/lib/config.ts
new file mode 100644
index 000000000..ce27ad1ae
--- /dev/null
+++ b/apps/retail/lib/config.ts
@@ -0,0 +1,6 @@
+export const DOMAIN = 'retail:1.1.0'
+
+export const currencyMap = {
+ EUR: '€',
+ INR: '₹'
+}
diff --git a/apps/retail/lib/types/beckn/index.ts b/apps/retail/lib/types/beckn/index.ts
new file mode 100644
index 000000000..74b6aa9b0
--- /dev/null
+++ b/apps/retail/lib/types/beckn/index.ts
@@ -0,0 +1 @@
+export * from './search'
diff --git a/apps/retail/lib/types/beckn/search.ts b/apps/retail/lib/types/beckn/search.ts
new file mode 100644
index 000000000..4f2994b7b
--- /dev/null
+++ b/apps/retail/lib/types/beckn/search.ts
@@ -0,0 +1,113 @@
+import { Coordinate } from '@utils/homePage.utils'
+
+interface Location {
+ id: string
+ city: {
+ code: string
+ name: string
+ }
+ gps: string
+}
+
+interface Price {
+ value: string
+ currency: string
+}
+
+interface Tag {
+ code: string
+ name: string
+ display: boolean
+ list?: Array<{
+ name: string
+ value: string
+ }>
+}
+
+interface Fulfillment {
+ id: string
+ type: string
+ tracking: boolean
+ tags: Tag[]
+}
+
+interface Image {
+ url: string
+ size_type: string
+}
+
+export interface Item {
+ rating: number
+ long_desc: string
+ short_desc: string
+ id: string
+ name: string
+ price: Price
+ locations: Location[]
+ fulfillments: Fulfillment[]
+ images: Image[]
+ tags: Tag[]
+ rating?: string
+}
+
+interface LocationProvider {
+ id: string
+ name: string
+ rating: string
+ locations: Location[]
+ items: Item[]
+ images: Image[]
+}
+
+interface Message {
+ name: string
+ providers: LocationProvider[]
+}
+
+interface Context {
+ domain: string
+ action: string
+ version: string
+ bpp_id: string
+ bpp_uri: string
+ country: string
+ city: string
+ location: {
+ country: {
+ code: string
+ }
+ }
+ bap_id: string
+ bap_uri: string
+ transaction_id: string
+ message_id: string
+ ttl: string
+ timestamp: string
+}
+
+export interface SearchResponseModel {
+ context: Context
+ message: Message
+}
+
+export interface ParsedItemModel {
+ id: string
+ bppId: string
+ bppUri: string
+ domain: string
+ transactionId: string
+ providerId: string
+ providerName: string
+ item: Item
+ providerCoordinates: Coordinate
+}
+
+export interface AssemblyData {
+ type: string
+ colour: string
+ shape: string
+ length: string
+ width: string
+ quantity?: number
+ weight: string
+}
diff --git a/apps/retail/lib/types/beckn/select.ts b/apps/retail/lib/types/beckn/select.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/retail/lib/types/cart.ts b/apps/retail/lib/types/cart.ts
new file mode 100644
index 000000000..056665113
--- /dev/null
+++ b/apps/retail/lib/types/cart.ts
@@ -0,0 +1,71 @@
+import { IProductDetails, RetailItem, TSlug } from './products'
+import { Item } from '@lib/types'
+
+export interface ICartProduct {
+ image: any
+ id?: string
+ name: string
+ slug: TSlug
+ price: number
+ discount?: number
+ brand: string
+ category: string[]
+ starRating: number
+ isOffer?: boolean
+ details?: IProductDetails[]
+ registerDate?: string
+ quantity: number
+ totalPrice: number
+}
+
+export interface CartRetailItem extends Item {
+ quantity: number
+ totalPrice: number
+}
+
+export interface CartItemForRequest extends CartRetailItem {
+ currency: any
+ bpp_id: string
+ bpp_uri: string
+ providerId: string
+ locations: any
+}
+
+// export interface
+
+export interface ICartUI {
+ cartBoxIsVisible: boolean
+}
+
+export interface ICart {
+ items: CartItemForRequest[]
+ totalQuantity: number
+ totalAmount: number
+}
+
+export type ItemPerBpp = Record
+
+//RootState interface => use for state type in useSelector hook
+
+export interface ICartUiRootState {
+ cartUi: ICartUI
+}
+
+export interface ICartRootState {
+ cart: ICart
+}
+
+export interface TransactionIdRootState {
+ transactionId: string
+}
+
+export interface DataPerBpp {
+ [key: string]: CartItemForRequest[]
+}
+
+export type LocalStorageCartItem = {
+ product: ICartProduct
+ quantity: number
+}
+
+export type LocalStorageCart = LocalStorageCartItem[]
diff --git a/apps/retail/lib/types/discovery.ts b/apps/retail/lib/types/discovery.ts
new file mode 100644
index 000000000..c79a71249
--- /dev/null
+++ b/apps/retail/lib/types/discovery.ts
@@ -0,0 +1,3 @@
+export interface DiscoveryRootState {
+ transactionId: string
+}
diff --git a/apps/retail/lib/types/index.ts b/apps/retail/lib/types/index.ts
new file mode 100644
index 000000000..87035b7e9
--- /dev/null
+++ b/apps/retail/lib/types/index.ts
@@ -0,0 +1,6 @@
+import { LocalStorage } from './localstorage'
+export * from './cart'
+export * from './discovery'
+export * from './beckn'
+
+export { LocalStorage }
diff --git a/apps/retail/lib/types/localstorage.ts b/apps/retail/lib/types/localstorage.ts
new file mode 100644
index 000000000..dcd73e222
--- /dev/null
+++ b/apps/retail/lib/types/localstorage.ts
@@ -0,0 +1,4 @@
+export enum LocalStorage {
+ Product = 'productDetails',
+ Cart = 'cart'
+}
diff --git a/apps/retail/locales/en.ts b/apps/retail/locales/en.ts
index b6bd745cd..6be5d7041 100644
--- a/apps/retail/locales/en.ts
+++ b/apps/retail/locales/en.ts
@@ -105,6 +105,12 @@ const en: { [key: string]: string } = {
enterCity: 'Enter City /Town',
enterPincode: 'Enter Pincode',
enterState: 'Enter State / Province',
- enterCountry: 'Enter Country'
+ enterCountry: 'Enter Country',
+ // New Translations
+ orderHistoryIcon: 'My Orders',
+ profileIcon: 'My Profile',
+ logoutIcon: 'Logout',
+ placedAt: 'Placed at',
+ ordersFulfilled: 'Orders Fulfilled'
}
export default en
diff --git a/apps/retail/middleware.ts b/apps/retail/middleware.ts
new file mode 100644
index 000000000..c78d317bb
--- /dev/null
+++ b/apps/retail/middleware.ts
@@ -0,0 +1,28 @@
+// middleware.ts
+
+import { NextRequest, NextResponse } from 'next/server'
+
+export default function middleware(req: NextRequest) {
+ // TypeScript will correctly understand the type of `loggedin`
+ const loggedin = req.cookies.get('authToken')
+ const { pathname } = req.nextUrl
+ console.log('Dank', pathname, loggedin)
+
+ if (loggedin && (pathname === '/signin' || pathname === '/signUp')) {
+ // Correctly redirect to the home page if the user is already logged in
+ return NextResponse.redirect(new URL('/', req.url))
+ }
+
+ if (!loggedin && pathname !== '/signin') {
+ // Redirect to the signin page if the user is not logged in
+ return NextResponse.redirect(new URL('/signin', req.url))
+ }
+
+ // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()`
+ // for other cases to let the request continue.
+ return NextResponse.next()
+}
+
+export const config = {
+ matcher: ['/', '/((?!api|static|.*\\..*|_next).*)']
+}
diff --git a/apps/retail/package.json b/apps/retail/package.json
index a74b2f707..37e5e1cdf 100644
--- a/apps/retail/package.json
+++ b/apps/retail/package.json
@@ -58,6 +58,7 @@
"react-star-rating-component": "^1.4.1",
"react-toastify": "^9.0.7",
"react-transition-group": "^4.4.5",
+ "redux-persist": "^6.0.0",
"slick-carousel": "^1.8.1",
"stripe": "^9.1.0",
"url-loader": "^4.1.1"
@@ -75,5 +76,8 @@
"prettier": "^3.0.3",
"tailwindcss": "^3.1.4",
"typescript": "4.6.4"
+ },
+ "resolutions": {
+ "@types/react": "^17.0.39"
}
}
diff --git a/apps/retail/pages/_app.tsx b/apps/retail/pages/_app.tsx
index c87af32f5..fb758c468 100644
--- a/apps/retail/pages/_app.tsx
+++ b/apps/retail/pages/_app.tsx
@@ -11,8 +11,9 @@ import 'react-toastify/dist/ReactToastify.css'
import '../styles/globals.css'
import { Provider } from 'react-redux'
-import store from '@store/index'
+import store, { persistor } from '@store/index'
import { Garuda } from 'garudaa'
+import { PersistGate } from 'redux-persist/integration/react'
Garuda.init({
projectId: '65c0d663cbe90cafae9185f6',
@@ -24,16 +25,21 @@ function MyApp({ Component, pageProps }: AppProps) {
theme={{
color: {
primary: '#F6D046',
- secondary: '#84B3F9',
+ secondary: '#53A052',
textPrimary: '#1A202C',
textSecondary: '#6B7280'
}
}}
>
-
-
+
+
+
+
)
diff --git a/apps/retail/pages/_document.tsx b/apps/retail/pages/_document.tsx
index faade8d93..85d992e58 100644
--- a/apps/retail/pages/_document.tsx
+++ b/apps/retail/pages/_document.tsx
@@ -22,7 +22,7 @@ export default function Document() {
/>
diff --git a/apps/retail/pages/cart.tsx b/apps/retail/pages/cart.tsx
index 20e161a5a..2c0fd3f3f 100644
--- a/apps/retail/pages/cart.tsx
+++ b/apps/retail/pages/cart.tsx
@@ -1,8 +1,78 @@
-import EmptyCart from '@components/emptyCart/EmptyCart'
+import { useRouter } from 'next/router'
+
import React from 'react'
+import { useEffect, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { useLanguage } from '@hooks/useLanguage'
+import { Cart as BecknCart } from '@beckn-ui/becknified-components'
+import { useSelectMutation } from '@services/select'
+import { getSelectPayload } from '@components/cart/cart.utils'
+import { cartActions } from '@store/cart-slice'
+import { DOMAIN } from '@lib/config'
+
+import { ICartRootState } from '@lib/types'
+import { DiscoveryRootState } from '@store/discovery-slice'
+
+const Cart = () => {
+ const [fetchQuotes, { isLoading }] = useSelectMutation()
+ const dispatch = useDispatch()
+
+ const router = useRouter()
+ const { t } = useLanguage()
+
+ const { items, totalQuantity } = useSelector((state: ICartRootState) => state.cart)
+ const totalAmount = useSelector((state: ICartRootState) => state.cart.totalAmount)
+ const { transactionId, productList } = useSelector((state: DiscoveryRootState) => state.discovery)
+
+ useEffect(() => {
+ fetchQuotes(getSelectPayload(items, transactionId, DOMAIN))
+ }, [totalQuantity])
+
+ const onOrderClick = () => {
+ router.push('/checkout')
+ }
-const cart = () => {
- return ({
+ name: 'Antoine Dubois',
+ mobileNumber: '0612345678',
+ email: 'antoine.dubois@gmail.com',
+ address: '15 Rue du Soleil, Paris, France',
+ pinCode: '201002'
+ })
+
+ const [submittedDetails, setSubmittedDetails] = useState({
+ name: 'Antoine Dubois',
+ mobileNumber: '0612345678',
+ email: 'antoine.dubois@gmail.com',
+ address: '15 Rue du Soleil, Paris, France',
+ pinCode: '201002'
+ })
+
+ const [isBillingAddressSameAsShippingAddress, setIsBillingAddressSameAsShippingAddress] = useState(true)
+
+ const [billingFormData, setBillingFormData] = useState({
+ name: 'Antoine Dubois',
+ mobileNumber: '0612345678',
+ email: 'antoine.dubois@gmail.com',
+ address: '15 Rue du Soleil, Paris, France',
+ pinCode: '75001'
+ })
+
+ const [isBillingSame, setIsBillingSame] = useState(true)
+
+ const router = useRouter()
+ const initRequest = useRequest()
+ const dispatch = useDispatch()
+ const [initialize, { isLoading }] = useInitMutation()
+ const { t, locale } = useLanguage()
+ const cartItems = useSelector((state: ICartRootState) => state.cart.items)
+ const initResponse = useSelector((state: CheckoutRootState) => state.checkout.initResponse)
+ const isBillingSameRedux = useSelector((state: CheckoutRootState) => state.checkout.isBillingSame)
+ const { transactionId, productList } = useSelector((state: DiscoveryRootState) => state.discovery)
+ useEffect(() => {
+ if (localStorage) {
+ if (localStorage.getItem('userPhone')) {
+ const copiedFormData = structuredClone(formData)
+ const copiedBillingFormData = structuredClone(billingFormData)
+
+ copiedFormData.mobileNumber = localStorage.getItem('userPhone') as string
+ copiedBillingFormData.mobileNumber = localStorage.getItem('userPhone') as string
+
+ setFormData(copiedFormData)
+ setBillingFormData(copiedBillingFormData)
+ }
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [])
+
+ useEffect(() => {
+ if (typeof window !== 'undefined') {
+ if (localStorage.getItem('shippingAdress')) {
+ setFormData(JSON.parse(localStorage.getItem('shippingAdress') as string))
+ }
+ if (localStorage.getItem('billingAddress')) {
+ setBillingFormData(JSON.parse(localStorage.getItem('billingAddress') as string))
+ }
+ }
+ }, [])
+
+ useEffect(() => {
+ const shippingAddressComplete = Object.values(formData).every(value => value.length > 0)
+ if (shippingAddressComplete && typeof window !== 'undefined') {
+ localStorage.setItem('shippingAdress', JSON.stringify(formData))
+ }
+ }, [formData])
+
+ useEffect(() => {
+ const isBillingAddressComplete = Object.values(billingFormData).every(value => value.length > 0)
+
+ if (isBillingAddressComplete && typeof window !== 'undefined') {
+ localStorage.setItem('billingAddress', JSON.stringify(billingFormData))
+ }
+ setIsBillingAddressSameAsShippingAddress(
+ areShippingAndBillingDetailsSame(isBillingAddressComplete, formData, billingFormData)
+ )
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [billingFormData])
+
+ // useEffect(()=>{
+ // setIsBillingSame(isBillingSameRedux)
+ // },[])
+
+ const formSubmitHandler = (data: any) => {
+ if (data) {
+ getInitPayload(data, billingFormData, cartItems, transactionId, DOMAIN)
+ .then(res => {
+ console.log('Dank checkout', res)
+ return initialize(res)
+ })
+ .then(response => {
+ console.log('Dank', response)
+ })
+ // TODO :_ To check this again
+
+ // if (isBillingAddressSameAsShippingAddress) {
+ // const copiedFormData = structuredClone(data);
+ // setBillingFormData(copiedFormData);
+ // }
+
+ // const cartItemsPerBppPerProvider: DataPerBpp = getCartItemsPerBpp(cartItems as CartItemForRequest[])
+
+ // const payLoadForInitRequest = getPayloadForInitRequest(
+ // cartItemsPerBppPerProvider,
+ // transactionId,
+ // data,
+ // billingFormData
+ // )
+ // initRequest.fetchData(`${apiUrl}/client/v2/initialize_order`, 'POST', payLoadForInitRequest)
+ }
+ }
+
+ const isInitResultPresent = () => {
+ return !!initResponse && initResponse.length > 0
+ }
+
+ return (
+ <>
+ {/* start Item Details */}
+ ({
+ title: singleItem.name,
+ description: singleItem.short_desc,
+ quantity: singleItem.quantity,
+ price: singleItem.price.value,
+ currency: singleItem.price.currency,
+ image: singleItem.images[0].url
+ }))
+ },
+ shipping: {
+ showDetails: isInitResultPresent(),
+ shippingDetails: {
+ name: submittedDetails.name,
+ location: submittedDetails.address,
+ number: submittedDetails.mobileNumber,
+ title: 'Shipping'
+ },
+ shippingForm: {
+ onSubmit: formSubmitHandler,
+ submitButton: { text: 'Save Shipping Details' },
+ values: formData,
+ onChange: data => setSubmittedDetails(data)
+ }
+ },
+ billing: {
+ sectionSubtitle: 'Add Billing Details',
+ sectionTitle: 'Billing',
+ formTitle: 'Add Billing Details',
+ isBilling: true,
+ isChecked: isBillingSameRedux,
+ onCheckChange: () => {
+ // setIsBillingSame(!isBillingSame)
+ dispatch(checkoutActions.setIsBillingSame({ isBillingSame: !isBillingSameRedux }))
+ },
+ showDetails: isInitResultPresent(),
+ shippingDetails: {
+ name: submittedDetails.name,
+ location: submittedDetails.address,
+ number: submittedDetails.mobileNumber,
+ title: 'Billing'
+ },
+ shippingForm: {
+ onSubmit: formSubmitHandler,
+ submitButton: { text: 'Save Shipping Details' },
+ values: formData,
+ onChange: data => setSubmittedDetails(data)
+ }
+ },
+ payment: {
+ title: 'Payment',
+ paymentDetails: {
+ hasBoxShadow: false,
+ paymentBreakDown: {
+ ['Tax & Delivery']: `${currencyMap[getSubTotalAndDeliveryCharges(initResponse).currencySymbol as string]} ${
+ getSubTotalAndDeliveryCharges(initResponse).totalDeliveryCharge
+ }`,
+ Subtotal: `${currencyMap[getSubTotalAndDeliveryCharges(initResponse).currencySymbol as string]} ${getSubTotalAndDeliveryCharges(initResponse).subTotal}`
+ },
+
+ totalText: 'Total',
+ totalValueWithSymbol: `${currencyMap[getSubTotalAndDeliveryCharges(initResponse).currencySymbol as string]}${
+ getSubTotalAndDeliveryCharges(initResponse).subTotal +
+ getSubTotalAndDeliveryCharges(initResponse).totalDeliveryCharge
+ }`
+ }
+ },
+ loader: {
+ text: 'Initializing your request'
+ },
+ pageCTA: {
+ text: 'Proceed to Checkout',
+ handleClick: () => {
+ dispatch(cartActions.clearCart())
+ router.push('/paymentMode')
+ }
+ }
+ }}
+ isLoading={isLoading}
+ hasInitResult={isInitResultPresent()}
+ />
+
+ )
+}
+export default CheckoutPage
diff --git a/apps/retail/pages/index.tsx b/apps/retail/pages/index.tsx
index 95e917a51..b0ce5f525 100644
--- a/apps/retail/pages/index.tsx
+++ b/apps/retail/pages/index.tsx
@@ -1,17 +1,89 @@
-import { Box } from '@chakra-ui/react'
-import React, { useEffect } from 'react'
-import Signin from '@components/signIn/SignIn'
+/* eslint-disable react-hooks/rules-of-hooks */
+import { Box, Flex, Image, Text, useBreakpoint } from '@chakra-ui/react'
+import axios from 'axios'
+import { useRouter } from 'next/router'
+import React, { useEffect, useState } from 'react'
+import KuzaLogo from '@public/images/Kuza-mini.svg'
+import AlternateLogo from '@public/images/KuzaLogo.svg'
+import TopSheet from '@components/topSheet/TopSheet'
+import { useLanguage } from '@hooks/useLanguage'
+import beckenFooter from '../public/images/footer.svg'
+import SearchInput from '@beckn-ui/becknified-components/src/components/search-input'
+
+const HomePage = () => {
+ const [searchTerm, setSearchTerm] = useState('')
+ const breakpoint = useBreakpoint()
+ const mobileBreakpoints = ['base', 'sm', 'md', 'lg']
+ const currentLogo = mobileBreakpoints.includes(breakpoint) ? KuzaLogo : AlternateLogo
+ const { t } = useLanguage()
+
+ const router = useRouter()
-const MobileLogin = () => {
useEffect(() => {
- localStorage.clear()
+ if (localStorage) {
+ localStorage.clear()
+ }
}, [])
+ const navigateToSearchResults = () => {
+ localStorage.setItem('optionTags', JSON.stringify({ name: searchTerm }))
+ router.push(`/search?searchTerm=${searchTerm}`)
+ }
+
+ const searchIconClickHandler = (e: any) => {
+ if (searchTerm) {
+ navigateToSearchResults()
+ }
+ e.preventDefault()
+ }
+
return (
-
-
+ <>
+
+ setSearchTerm(e.target.value)}
+ searchIcon={'/images/search.svg'}
+ searchIconClickHandler={searchIconClickHandler}
+ onEnterHandler={(e: { key: string }) => e.key === 'Enter' && navigateToSearchResults()}
+ placeHolder="Search for anything"
+ />
+
+
+
+ {t.footerText}
+
+
+
+
)
}
-export default MobileLogin
+export default HomePage
diff --git a/apps/retail/pages/invoiceDetails.tsx b/apps/retail/pages/invoiceDetails.tsx
index 9109e7d12..bb9416523 100644
--- a/apps/retail/pages/invoiceDetails.tsx
+++ b/apps/retail/pages/invoiceDetails.tsx
@@ -1,6 +1,7 @@
import DetailsCard from '@beckn-ui/becknified-components/src/components/checkout/details-card'
import React, { useEffect, useState } from 'react'
import PaymentDetails from '@beckn-ui/becknified-components/src/components/checkout/payment-details'
+import {DetailCard} from '@beckn-ui/becknified-components'
import Accordion from '@beckn-ui/molecules/src/components/accordion/Accordion'
import Typography from '@beckn-ui/molecules/src/components/typography/typography'
import { Box, Flex, HStack, Stack } from '@chakra-ui/react'
@@ -8,6 +9,7 @@ import Qrcode from '@components/qrCode/Qrcode'
import { useLanguage } from '@hooks/useLanguage'
import { getPaymentBreakDown } from '@utils/checkout-utils'
import { StatusResponseModel } from '../types/status.types'
+import { formatTimestamp } from '@utils/confirm-utils'
const invoiceDetails = () => {
const [statusData, setStatusData] = useState([])
@@ -31,11 +33,17 @@ const invoiceDetails = () => {
},
items
}
- }
+ },
+ context:{timestamp}
} = statusData[0]
const { name } = items
+ const filteredOrder = statusData.filter(res => {
+ const {state} = res.message.order.fulfillments[0]
+ state && res.message.order.fulfillments[0].state.descriptor.short_desc === 'Delivered'
+ })
+
const { t } = useLanguage()
return (
{
maxH={'calc(100vh - 100px)'}
overflowY="scroll"
>
-
-
-
+
-
-
+
+
-
-
+
+
{
totalText="Total"
totalValueWithSymbol={getPaymentBreakDown(statusData).totalPricewithCurrent}
/>
-
+
{
const { t } = useLanguage()
const router = useRouter()
- const [isLoading, setIsLoading] = useState(true)
const [confirmData, setConfirmData] = useState([])
+ const [confirm, { isLoading, data }] = useConfirmMutation()
+ const dispatch = useDispatch()
+ const initResponse = useSelector((state: CheckoutRootState) => state.checkout.initResponse)
+ const confirmResponse = useSelector((state: CheckoutRootState) => state.checkout.confirmResponse)
const apiUrl = process.env.NEXT_PUBLIC_API_URL
const strapiUrl = process.env.NEXT_PUBLIC_STRAPI_URL
@@ -29,29 +37,15 @@ const OrderConfirmation = () => {
}
useEffect(() => {
- if (localStorage && localStorage.getItem('initResult')) {
- const parsedInitResult: InitResponseModel[] = JSON.parse(localStorage.getItem('initResult') as string)
- const payLoad = getPayloadForConfirm(parsedInitResult)
- setIsLoading(true)
- axios
- .post(`${apiUrl}/confirm`, payLoad)
- .then(res => {
- const responseData: ConfirmResponseModel[] = res.data.data
- setConfirmData(responseData)
- localStorage.setItem('confirmResponse', JSON.stringify(responseData))
-
- setIsLoading(false)
- })
- .catch(err => {
- setIsLoading(false)
- console.error(err)
- })
+ if (initResponse && initResponse.length > 0) {
+ const payLoad = getPayloadForConfirm(initResponse)
+ confirm(payLoad)
}
}, [])
useEffect(() => {
- if (confirmData.length > 0) {
- const ordersPayload = getPayloadForOrderHistoryPost(confirmData)
+ if (confirmResponse && confirmResponse.length > 0) {
+ const ordersPayload = getPayloadForOrderHistoryPost(confirmResponse)
axios
.post(`${strapiUrl}/orders`, ordersPayload, axiosConfig)
.then(res => {
@@ -59,7 +53,7 @@ const OrderConfirmation = () => {
})
.catch(err => console.error(err))
}
- }, [confirmData])
+ }, [confirmResponse])
if (isLoading) {
return (
@@ -77,33 +71,53 @@ const OrderConfirmation = () => {
}
return (
- {
- router.push('/orderDetails')
- },
- disabled: false,
- variant: 'solid',
- colorScheme: 'primary'
- },
- {
- text: 'Go Back Home',
- handleClick: () => {
- router.push('/homePage')
+
+ 0 && confirmResponse[0].message.orderId.slice(0, 8)}...`,
+ trackOrderMessage: `You can track your order in "My Order" section`,
+
+ buttons: [
+ {
+ text: 'View Details',
+ handleClick: () => {
+ const orderId = confirmResponse[0].message.orderId
+ const bppId = confirmResponse[0].context.bppId
+ const bppUri = confirmResponse[0].context.bppUri
+
+ dispatch(orderActions.addSelectedOrder({ orderDetails: { orderId, bppId, bppUri } }))
+ const orderObjectForStatusCall = {
+ bppId: bppId,
+ bppUri: bppUri,
+ orderId: orderId
+ }
+ localStorage.setItem('selectedOrder', JSON.stringify(orderObjectForStatusCall))
+ dispatch(checkoutActions.clearState())
+ router.push('/orderDetails')
+ },
+ disabled: false,
+ variant: 'solid',
+ colorScheme: 'primary'
},
- disabled: false,
- variant: 'outline',
- colorScheme: 'primary'
- }
- ]
- }}
- />
+ {
+ text: 'Go Back Home',
+ handleClick: () => {
+ router.push('/')
+ dispatch(checkoutActions.clearState())
+ },
+ disabled: false,
+ variant: 'outline',
+ colorScheme: 'primary'
+ }
+ ]
+ }}
+ />
+
)
}
diff --git a/apps/retail/pages/orderDetails.tsx b/apps/retail/pages/orderDetails.tsx
index d2e18aef5..014bf42f0 100644
--- a/apps/retail/pages/orderDetails.tsx
+++ b/apps/retail/pages/orderDetails.tsx
@@ -1,10 +1,28 @@
import React, { useEffect, useState } from 'react'
import axios from 'axios'
import Router, { useRouter } from 'next/router'
-import { Box, Card, CardBody, Divider, Flex, Image, Radio, RadioGroup, Stack, Text, Textarea } from '@chakra-ui/react'
-import { BottomModal, Typography } from '@beckn-ui/molecules'
+import {
+ Box,
+ Card,
+ CardBody,
+ Divider,
+ Flex,
+ Image,
+ Radio,
+ RadioGroup,
+ Stack,
+ StackDivider,
+ Text,
+ Textarea,
+ useDisclosure
+} from '@chakra-ui/react'
+import { Accordion, BottomModal, Typography } from '@beckn-ui/molecules'
+import { useDispatch, useSelector } from 'react-redux'
+import ViewMoreOrderModal from '@components/orderDetailComponents/ViewMoreOrder'
+import { discoveryActions, DiscoveryRootState } from '@store/discovery-slice'
import { DetailCard, OrderStatusProgress, OrderStatusProgressProps } from '@beckn-ui/becknified-components'
import { StatusResponseModel, SupportModel } from '../types/status.types'
+import useResponsive from '@beckn-ui/becknified-components/src/hooks/useResponsive'
import { useLanguage } from '@hooks/useLanguage'
import { formatTimestamp, getPayloadForOrderStatus } from '@utils/confirm-utils'
import BecknButton from '@beckn-ui/molecules/src/components/button/Button'
@@ -12,6 +30,14 @@ import BottomModalScan from '@components/BottomModal/BottomModalScan'
import { ConfirmResponseModel } from '../types/confirm.types'
import LoaderWithMessage from '@components/loader/LoaderWithMessage'
import { UIState, DataState, ProcessState } from '../types/order-details.types'
+import CallphoneIcon from '../public/images/CallphoneIcon.svg'
+import locationIcon from '../public/images/locationIcon.svg'
+import nameIcon from '../public/images/nameIcon.svg'
+import { OrdersRootState } from '@store/order-slice'
+import ShippingBlock from '@components/orderDetailComponents/Shipping'
+import { DOMAIN } from '@lib/config'
+import PaymentDetails from '@beckn-ui/becknified-components/src/components/checkout/payment-details'
+import { getPaymentBreakDown } from '@utils/checkout-utils'
const OrderDetails = () => {
const [uiState, setUiState] = useState({
@@ -36,9 +62,14 @@ const OrderDetails = () => {
radioValue: ''
})
const router = useRouter()
+ console.log('Dank', router.query)
const { t } = useLanguage()
const apiUrl = process.env.NEXT_PUBLIC_API_URL
+ const { isOpen, onOpen, onClose } = useDisclosure()
const [orderStatusMap, setOrderStatusMap] = useState([])
+ const { isDesktop } = useResponsive()
+ const { transactionId } = useSelector((state: DiscoveryRootState) => state.discovery)
+ const orderMetaData = useSelector((state: OrdersRootState) => state.orders.selectedOrderDetails)
const [currentStatusLabel, setCurrentStatusLabel] = useState('')
useEffect(() => {
@@ -183,14 +214,15 @@ const OrderDetails = () => {
if (localStorage && localStorage.getItem('selectedOrder')) {
const selectedOrderData = JSON.parse(localStorage.getItem('selectedOrder') as string)
const { bppId, bppUri, orderId } = selectedOrderData
+ //DANKTODO
const statusPayload = {
data: [
{
context: {
- transaction_id: '',
+ transaction_id: transactionId,
bpp_id: bppId,
bpp_uri: bppUri,
- domain: 'supply-chain-services:assembly'
+ domain: DOMAIN
},
message: {
order_id: orderId
@@ -521,11 +553,41 @@ const OrderDetails = () => {
}
}
+ const ordersLength = data.statusData.length
+ const { timestamp } = data.statusData[0].context
+ const productName = data.statusData[0].message.order.items.name
+ const { order } = data.statusData[0].message
+ const {
+ billing,
+ fulfillments,
+ quote: { breakup, price }
+ } = order
+ const { address, name, phone } = billing
+ const {
+ customer: {
+ contact: { phone: shippingPhone },
+ person: { name: shippingName }
+ },
+ stops
+ } = fulfillments[0]
+ const {
+ location: { address: shipmentAddress }
+ } = stops[0]
+
+ const filteredOrder = data.statusData.filter(res => {
+ const { state } = res.message.order.fulfillments[0]
+ state && res.message.order.fulfillments[0].state.descriptor.short_desc === 'Delivered'
+ })
+
return (
{processState.allOrderDelivered && (
{
)}
- {/* Display progress summary */}
-
-
+
+
+
+
+
+
+
+
+
- {/* Display order status details */}
-
-
- <>
-
-
+
+
+
+
+
-
-
-
-
+
- {/* Display order status progress */}
-
- {orderStatusMap.map((status: OrderStatusProgressProps, index: number) => (
-
-
-
-
- {/* Display main bottom modal */}
-
- {uiState.isLoadingForTrackAndSupport ? (
-
-
- ) : (
-
- {menuItems(data.trackUrl as string).map((menuItem, index) => (
+ {/* DANKTODO */}
+ {/* Display order status details */}
+
+
+ <>
-
- ))}
-
-
+
+ {data.statusData[0]?.message?.order?.items[0]?.name}
+
+
+ +{data.statusData[0].message.order.items.length - 1}
+
+
+
- ))}
-
- )}
-
+
+
+ {orderStatusMap.map((status: OrderStatusProgressProps, index: number) => (
+
+
+
+
+
+ {/* shipping and billing address */}
+
+
- {uiState.isLoadingForCancel ? (
-
+ {
- setProcessState(prevValue => ({
- ...prevValue,
- radioValue: value
- }))
- setUiState(prevValue => ({
- ...prevValue,
- isProceedDisabled: false
- }))
- }}
- value={processState.radioValue}
- pl="20px"
+
+ )}
+
+ {isDesktop && (
+
+
+ )}
+
+ {isDesktop && (
+
+
+ )}
+
+ {!isDesktop && (
+
+
- {orderCancelReason.map(reasonObj => (
-
+
+ )}
+
+ {/* Display main bottom modal */}
+
+ {uiState.isLoadingForTrackAndSupport ? (
+
+
+ ) : (
+
+ {menuItems(data.trackUrl as string).map((menuItem, index) => (
+
+
+ ))}
+
- {reasonObj.reason}
-
+
-
+
+
)
}
diff --git a/apps/dsep/components/customToast/custom-toast.tsx b/apps/dsep/components/customToast/custom-toast.tsx
new file mode 100644
index 000000000..ec1aa57e5
--- /dev/null
+++ b/apps/dsep/components/customToast/custom-toast.tsx
@@ -0,0 +1,31 @@
+import { Box, Text } from '@chakra-ui/react'
+
+const CustomToast: React.FC<{ title: string; message: string }> = ({ title, message }) => (
+
+
+
+
-
+ {scholarshipId ? (
+ {t.subtotalText}
+
-
- {scholarshipId ? (
- {t.subtotalText}
-
-
- ) : null}
- {t.scholaarshipApplied}
-00
-
-
+ />
+ {t.totalText}
-
+
+ ) : null}
+ {t.scholaarshipApplied}
+00
+
- {t.totalText}
+
-
+
+
+ Skill Seeker
+
+
+
+ {children}
+
+ {/* */}
+
+
-
+
-
-
-
-
- {/*
+ ))}
+
+
+
)
}
diff --git a/apps/dsep/components/productList/Sort.tsx b/apps/dsep/components/productList/Sort.tsx
index 28975e063..cad0aacb0 100644
--- a/apps/dsep/components/productList/Sort.tsx
+++ b/apps/dsep/components/productList/Sort.tsx
@@ -15,7 +15,6 @@ const Sort: React.FC
- {sortedProductList && sortedProductList.length ? (
-
-
-
+
+
+ {sortedProductList.map((item, idx) => (
+
- ) : (
-
- {sortedProductList.map((product: RetailItem) => {
- return (
-
- {t.noProduct}
- )} -
-
-
-
-
- {formErrors.email &&
- {formErrors.email}
}
-
-
-
- {formErrors.password &&
- {formErrors.password}
}
-
-
- {t.confirmMessage2} -
- {loading ? (
-
+
+ {loading ? (
+
-
- ) : (
-
-
-
-
-
- {formErrors.name &&
- {formErrors.name}
}
-
-
-
- {formErrors.email &&
- {formErrors.email}
}
-
-
-
- {formErrors.password &&
- {formErrors.password}
}
-
+
+
+
+
+
+
+ setFlyToUserLocation(true)}
+ src="/images/LocateMe.svg"
+ alt="..."
+ />
+
+
+
+ {!isEmpty(value) && locations && !isEmpty(locations) && (
+
+ {locations.map((singleLocation, index) => {
+ const { primaryName, secondaryName } = formatLocationName(singleLocation.display_name)
+ return (
+
+ )}
+
+ )
+}
+
+export default SearchBar
diff --git a/apps/mobility-bap/components/Map/OptionCard.tsx b/apps/mobility-bap/components/Map/OptionCard.tsx
new file mode 100644
index 000000000..eb9e27c8b
--- /dev/null
+++ b/apps/mobility-bap/components/Map/OptionCard.tsx
@@ -0,0 +1,79 @@
+import React from 'react'
+import { IconType } from 'react-icons'
+import cs from 'classnames'
+import { useLanguage } from '../../hooks/useLanguage'
+import { toast } from 'react-toastify'
+
+type OptionMeta = {
+ tagValue: string
+ tagName: string
+ title?: string
+}
+
+type OptionIcons = {
+ iconUrl: string
+ iconUrlLight: string
+}
+
+interface OptionCardProps {
+ optionMeta: OptionMeta
+ optionIcons: OptionIcons
+ isSelected?: boolean
+ setOption: React.Dispatch {
+ handleLocationClick(singleLocation.lat, singleLocation.lon)
+ setQuery(primaryName)
+ setValue('')
+ }}
+ >
+
+ )
+ })}
+
+
+ {primaryName}
+{secondaryName}
+ {
+ if (tagValue !== 'Books' && tagValue !== 'restaurant') {
+ toast.info(`${t.comingSoon}`, {
+ theme: 'light',
+ position: 'top-center',
+ className: 'bg-[#fff] text-[#000]'
+ })
+ } else {
+ setOption({
+ tagName,
+ tagValue
+ })
+ }
+ }}
+ >
+ {/*
+ )
+}
+
+export default OptionCard
diff --git a/apps/mobility-bap/components/Map/SelectedMarker.svg b/apps/mobility-bap/components/Map/SelectedMarker.svg
new file mode 100644
index 000000000..3fe4e3b0f
--- /dev/null
+++ b/apps/mobility-bap/components/Map/SelectedMarker.svg
@@ -0,0 +1,4 @@
+
diff --git a/apps/mobility-bap/components/Map/StoreMarkerData.js b/apps/mobility-bap/components/Map/StoreMarkerData.js
new file mode 100644
index 000000000..8e7934824
--- /dev/null
+++ b/apps/mobility-bap/components/Map/StoreMarkerData.js
@@ -0,0 +1,1010 @@
+export const data = {
+ version: 0.6,
+ generator: 'Overpass API 0.7.60.6 e2dc3e5b',
+ osm3s: {
+ timestamp_osm_base: '2023-06-20T10:53:59Z',
+ copyright:
+ 'The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.'
+ },
+ elements: [
+ {
+ type: 'node',
+ id: 252590177,
+ lat: 48.86841,
+ lon: 2.3793255,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '93',
+ 'addr:postcode': '75011',
+ 'addr:street': 'Rue Jean-Pierre Timbaud',
+ amenity: 'restaurant',
+ bar: 'yes',
+ cuisine: 'regional;french',
+ internet_access: 'wlan',
+ 'internet_access:ssid': 'Cannibale_Café',
+ level: '0',
+ name: 'Cannibale Café',
+ opening_hours: 'Mo-Su 07:30-02:00; Sa 09:00-02:00; Su 09:00-24:00',
+ outdoor_seating: 'yes',
+ phone: '+33 1 49 29 95 59',
+ reservation: 'yes',
+ smoking: 'outside',
+ website: 'https://www.cannibalecafe.com',
+ wheelchair: 'limited'
+ }
+ },
+ {
+ type: 'node',
+ id: 289439792,
+ lat: 48.8686679,
+ lon: 2.3066263,
+ tags: {
+ amenity: 'restaurant',
+ name: 'Spoon'
+ }
+ },
+ {
+ type: 'node',
+ id: 688020622,
+ lat: 48.8683074,
+ lon: 2.341731,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '17',
+ 'contact:phone': '+33 1 42 60 31 90',
+ 'contact:postcode': '75002',
+ 'contact:street': 'Rue Notre-Dame-des-Victoires',
+ name: 'Saturne',
+ 'name:en': 'Saturne',
+ source: 'cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2010'
+ }
+ },
+ {
+ type: 'node',
+ id: 692331225,
+ lat: 48.8682798,
+ lon: 2.3485268,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '95',
+ 'contact:postcode': '75002',
+ 'contact:street': "Rue d'Aboukir",
+ 'contact:website': 'https://www.echo-paris.com/',
+ cuisine: 'american;diner',
+ name: 'Echo',
+ opening_hours: 'We-Fr 09:00-16:00; Sa-Su 10:00-17:00',
+ source: 'cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2010'
+ }
+ },
+ {
+ type: 'node',
+ id: 706743990,
+ lat: 48.868273,
+ lon: 2.3614921,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-18',
+ microbrewery: 'no',
+ name: 'Le Pachyderme',
+ outdoor_seating: 'yes',
+ self_service: 'no',
+ 'toilets:wheelchair': 'no',
+ wheelchair: 'limited'
+ }
+ },
+ {
+ type: 'node',
+ id: 792056043,
+ lat: 48.8685089,
+ lon: 2.3894343,
+ tags: {
+ amenity: 'restaurant',
+ name: "L'Entrepot's",
+ 'toilets:wheelchair': 'no',
+ wheelchair: 'limited'
+ }
+ },
+ {
+ type: 'node',
+ id: 833088653,
+ lat: 48.8683182,
+ lon: 2.298485,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'italian',
+ name: 'Villa Sophia'
+ }
+ },
+ {
+ type: 'node',
+ id: 1490922341,
+ lat: 48.8682398,
+ lon: 2.3365168,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-19',
+ cuisine: 'sushi;japanese',
+ name: 'Fuji Sushi',
+ toilets: 'yes',
+ 'toilets:access': 'customers',
+ 'toilets:disposal': 'flush',
+ 'toilets:position': 'seated',
+ 'toilets:wheelchair': 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 1670265992,
+ lat: 48.8686409,
+ lon: 2.35998,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-18',
+ cuisine: 'chinese',
+ name: 'Han Shi Fang',
+ opening_hours: 'We-Su 12:00-14:30; Mo-Su 18:00-22:30',
+ phone: '+33 1 53 72 90 16',
+ wheelchair: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 1686639133,
+ lat: 48.8685076,
+ lon: 2.326929,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:housename': 'Castille',
+ 'contact:housenumber': '37',
+ 'contact:postcode': '75001',
+ 'contact:street': 'Rue Cambon',
+ 'contact:website': 'http://www.castille.com',
+ cuisine: 'italian',
+ name: "L'Assagio",
+ source: 'http://www.castille.com',
+ wheelchair: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 1799874666,
+ lat: 48.8685692,
+ lon: 2.2245926,
+ tags: {
+ 'access:covid19': 'no',
+ amenity: 'restaurant',
+ check_date: '2023-06-03',
+ 'contact:city': 'Suresnes',
+ 'contact:housenumber': '5',
+ 'contact:phone': '+33 1 41 11 00 60',
+ 'contact:postcode': '92150',
+ 'contact:street': 'Rue Jules Ferry',
+ 'contact:website': 'http://www.vallonduliban.com',
+ cuisine: 'lebanese',
+ 'delivery:covid19': 'only',
+ name: 'Vallon du Liban',
+ 'opening_hours:covid19': 'Mo-Sa 10:00-14:30,18:00-21:00',
+ 'takeaway:covid19': 'only'
+ }
+ },
+ {
+ type: 'node',
+ id: 1918939891,
+ lat: 48.8685479,
+ lon: 2.3683248,
+ tags: {
+ 'addr:housenumber': '2',
+ 'addr:street': 'Rue de la Fontaine au Roi',
+ amenity: 'restaurant',
+ 'breakfast:brunch': 'Sa-Su',
+ check_date: '2023-04-09',
+ 'contact:instagram': 'tawletparis',
+ 'contact:phone': '+33 6 73 92 49 12',
+ 'contact:website': 'https://www.soukeltayeb.com/tawlet/11/tawlet-paris',
+ cuisine: 'lebanese',
+ email: 'parisreservation@tawlet.com',
+ food: 'cuisine libanaise',
+ level: '0',
+ name: 'Tawlet',
+ opening_hours: 'Mo-Sa 12:00-14:00,19:30-22:00; Su 12:00-14:00',
+ outdoor_seating: 'yes',
+ reservation: 'yes'
+ }
+ },
+ {
+ type: 'node',
+ id: 1930249941,
+ lat: 48.8683213,
+ lon: 2.389647,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '6',
+ 'addr:postcode': '75020',
+ 'addr:street': 'Rue Sorbier',
+ amenity: 'restaurant',
+ email: 'contact@lelieudit.com',
+ name: 'Le Lieu Dit',
+ opening_hours: 'Tu-Su 16:00-02:00',
+ phone: '+33 1 40332629',
+ website: 'http://lelieudit.com/',
+ wheelchair: 'yes'
+ }
+ },
+ {
+ type: 'node',
+ id: 3086152504,
+ lat: 48.8684431,
+ lon: 2.3706292,
+ tags: {
+ 'addr:housenumber': '23',
+ 'addr:street': 'Rue de la Fontaine au Roi',
+ amenity: 'restaurant',
+ check_date: '2023-04-22',
+ cuisine: 'italian',
+ internet_access: 'no',
+ name: 'La Trottinette',
+ 'opening_hours:covid19': 'off',
+ outdoor_seating: 'yes',
+ 'payment:credit_cards': 'yes',
+ 'payment:mastercard': 'yes',
+ 'payment:visa': 'yes',
+ phone: '+33 7 60 91 93 51',
+ wheelchair: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 3576432681,
+ lat: 48.8683753,
+ lon: 2.3433303,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'tacos',
+ name: 'Coyo Taco'
+ }
+ },
+ {
+ type: 'node',
+ id: 3701380596,
+ lat: 48.8683026,
+ lon: 2.3256832,
+ tags: {
+ amenity: 'restaurant',
+ name: 'Caepus',
+ wheelchair: 'yes'
+ }
+ },
+ {
+ type: 'node',
+ id: 3701384270,
+ lat: 48.8685365,
+ lon: 2.3254094,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2022-10-01',
+ name: 'Nelly',
+ wheelchair: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 3701384271,
+ lat: 48.8684636,
+ lon: 2.3254367,
+ tags: {
+ amenity: 'restaurant',
+ name: 'Cuizines'
+ }
+ },
+ {
+ type: 'node',
+ id: 4081690989,
+ lat: 48.8684342,
+ lon: 2.3478844,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'chinese',
+ karaoke: 'yes',
+ name: 'Meet & Taste',
+ opening_hours: 'Tu-Su 13:00-22:30'
+ }
+ },
+ {
+ type: 'node',
+ id: 4365816270,
+ lat: 48.8682811,
+ lon: 2.4191129,
+ tags: {
+ amenity: 'restaurant',
+ name: "L'Amandine"
+ }
+ },
+ {
+ type: 'node',
+ id: 4405645654,
+ lat: 48.8683919,
+ lon: 2.2267087,
+ tags: {
+ 'addr:city': 'Suresnes',
+ 'addr:housenumber': '11',
+ 'addr:postcode': '92150',
+ 'addr:street': 'Rue des Bourets',
+ amenity: 'restaurant',
+ name: 'Les Rives'
+ }
+ },
+ {
+ type: 'node',
+ id: 4405645665,
+ lat: 48.8685823,
+ lon: 2.2267824,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'thai',
+ name: 'Chang Thai'
+ }
+ },
+ {
+ type: 'node',
+ id: 4405645666,
+ lat: 48.8686228,
+ lon: 2.226687,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'japanese',
+ name: 'Yamato',
+ phone: '+33 1 41 38 28 00',
+ website: 'http://yamato-suresnes.fr'
+ }
+ },
+ {
+ type: 'node',
+ id: 4684318340,
+ lat: 48.8684825,
+ lon: 2.3248349,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '7',
+ 'contact:postcode': '75008',
+ 'contact:street': 'Rue du Chevalier de Saint-George',
+ cuisine: 'italian',
+ name: 'Ferona'
+ }
+ },
+ {
+ type: 'node',
+ id: 4792366420,
+ lat: 48.8685504,
+ lon: 2.3749726,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-11',
+ 'contact:housenumber': '140',
+ 'contact:street': 'Rue Saint-Maur',
+ name: 'Le Myrobolant',
+ opening_hours: 'Mo-We 10:00-23:45; Th-Sa 10:00-02:00',
+ 'opening_hours:covid19': 'open',
+ phone: '+33 1 71 28 84 79',
+ 'takeaway:covid19': 'yes'
+ }
+ },
+ {
+ type: 'node',
+ id: 4876150813,
+ lat: 48.8682778,
+ lon: 2.398126,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '26',
+ 'contact:phone': '+33 9 81 42 68 88',
+ 'contact:postcode': '75020',
+ 'contact:street': 'Rue de la Chine',
+ 'contact:website': 'https://www.atelierfratelli.fr/',
+ name: 'Atelier Fratelli',
+ wheelchair: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 4968226339,
+ lat: 48.8682947,
+ lon: 2.4008547,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'japanese',
+ name: 'Sushi Sun II'
+ }
+ },
+ {
+ type: 'node',
+ id: 5026230530,
+ lat: 48.8682306,
+ lon: 2.3711863,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-04-15',
+ 'contact:website': 'https://franginsparis.fr',
+ name: 'Frangins'
+ }
+ },
+ {
+ type: 'node',
+ id: 5030473225,
+ lat: 48.8684606,
+ lon: 2.2820539,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '112',
+ 'contact:phone': '+33 1 48 25 49 20',
+ 'contact:postcode': '75016',
+ 'contact:street': 'Avenue Victor Hugo',
+ 'contact:website': 'http://www.masa-paris.fr/',
+ cuisine: 'fine_dining',
+ name: 'MaSa'
+ }
+ },
+ {
+ type: 'node',
+ id: 5036805722,
+ lat: 48.8683814,
+ lon: 2.3477384,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'argentinian',
+ indoor_seating: 'yes',
+ name: 'Caminito',
+ 'name:fr': 'Caminito',
+ outdoor_seating: 'yes'
+ }
+ },
+ {
+ type: 'node',
+ id: 5062019472,
+ lat: 48.8684028,
+ lon: 2.3664068,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-04-07',
+ cuisine: 'pizza',
+ name: "Nolita's",
+ 'opening_hours:covid19': 'off'
+ }
+ },
+ {
+ type: 'node',
+ id: 5230354821,
+ lat: 48.8682611,
+ lon: 2.3504636,
+ tags: {
+ amenity: 'restaurant',
+ name: 'Scarabee'
+ }
+ },
+ {
+ type: 'node',
+ id: 5327269521,
+ lat: 48.8685684,
+ lon: 2.2816776,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'italian',
+ name: 'Giulio Rebellato',
+ operator: 'Famille Rebellato',
+ phone: '+33 1 47 27 50 26',
+ website: 'https://www.rebellato.com'
+ }
+ },
+ {
+ type: 'node',
+ id: 5501780720,
+ lat: 48.86856,
+ lon: 2.3547945,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '6',
+ 'contact:phone': '+33 9 54 70 66 57',
+ 'contact:postcode': '75010',
+ 'contact:street': 'Rue Blondel',
+ description: 'Restaurant sénégalais.',
+ name: 'Le Djoliba',
+ opening_hours: 'Mo-Su 12:00-24:00'
+ }
+ },
+ {
+ type: 'node',
+ id: 5537765794,
+ lat: 48.8682814,
+ lon: 2.222624,
+ tags: {
+ 'addr:housenumber': '1',
+ 'addr:postcode': '92150',
+ 'addr:street': 'Rue de la Gare de Longchamp',
+ amenity: 'restaurant',
+ name: 'Bar des Amis',
+ 'opening_hours:covid19': 'off',
+ phone: '+33147724401'
+ }
+ },
+ {
+ type: 'node',
+ id: 5599022934,
+ lat: 48.8684918,
+ lon: 2.34155,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'japanese',
+ name: 'Saveurs Zen',
+ takeaway: 'yes'
+ }
+ },
+ {
+ type: 'node',
+ id: 5922608644,
+ lat: 48.8684756,
+ lon: 2.4042436,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '32',
+ 'addr:postcode': '75020',
+ 'addr:street': 'Rue du Surmelin',
+ amenity: 'restaurant',
+ cuisine: 'pizza',
+ name: 'Ma Pizza',
+ phone: '+33 1 77 32 57 96'
+ }
+ },
+ {
+ type: 'node',
+ id: 6356590086,
+ lat: 48.8684222,
+ lon: 2.3664704,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2022-07-29',
+ name: 'Cavalier',
+ 'survey:date': '2020-07-11'
+ }
+ },
+ {
+ type: 'node',
+ id: 6445733494,
+ lat: 48.8686176,
+ lon: 2.2817137,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'pizza;italian',
+ name: 'Pizzeria Rebellato',
+ operator: 'Famille Rebellato',
+ phone: '+33 1 44 05 08 08',
+ website: 'https://www.rebellato.com'
+ }
+ },
+ {
+ type: 'node',
+ id: 6578764687,
+ lat: 48.8682613,
+ lon: 2.3902713,
+ tags: {
+ amenity: 'restaurant',
+ name: 'La Dérive',
+ source: 'survey'
+ }
+ },
+ {
+ type: 'node',
+ id: 6641610085,
+ lat: 48.8682861,
+ lon: 2.3368525,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '5',
+ 'contact:phone': '+33 1 42 96 04 88',
+ 'contact:postcode': '75002',
+ 'contact:street': 'Rue de Louvois',
+ cuisine: 'japanese',
+ description: 'Restaurant japonais spécialisé en bento',
+ name: 'Chez Miki',
+ opening_hours: 'Mo 12:00-14:30; Tu-Sa 12:00-14:30, 19:00-22:30; Su 19:00-22:30'
+ }
+ },
+ {
+ type: 'node',
+ id: 7023953785,
+ lat: 48.8683405,
+ lon: 2.3350373,
+ tags: {
+ amenity: 'restaurant',
+ 'contact:city': 'Paris',
+ 'contact:housenumber': '1',
+ 'contact:phone': '+33 1 42 96 16 61',
+ 'contact:postcode': '75002',
+ 'contact:street': 'Rue Monsigny',
+ cuisine: 'italian',
+ 'diet:vegetarian': 'yes',
+ name: 'Villa Dondelli'
+ }
+ },
+ {
+ type: 'node',
+ id: 7447391351,
+ lat: 48.8682905,
+ lon: 2.373936,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '57',
+ 'addr:postcode': '75011',
+ 'addr:street': 'Rue de la Fontaine au Roi',
+ amenity: 'restaurant',
+ check_date: '2023-03-11',
+ name: "Le p'tit deux"
+ }
+ },
+ {
+ type: 'node',
+ id: 7447391352,
+ lat: 48.8682779,
+ lon: 2.373876,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-11',
+ name: 'La Passion'
+ }
+ },
+ {
+ type: 'node',
+ id: 7543127685,
+ lat: 48.868538,
+ lon: 2.3699693,
+ tags: {
+ 'addr:housenumber': '17',
+ 'addr:postcode': '75011',
+ 'addr:street': 'Rue de la Fontaine au Roi',
+ amenity: 'restaurant',
+ bar: 'no',
+ check_date: '2023-04-22',
+ cuisine: 'peruvian',
+ email: 'alpaso@picaflor.fr',
+ internet_access: 'no',
+ level: '0',
+ name: 'Picaflor al paso',
+ note: "horaires d'ouverture très aléatoires",
+ outdoor_seating: 'no',
+ 'payment:mastercard': 'yes',
+ 'payment:visa': 'yes',
+ phone: '+33 6 69 19 06 01',
+ takeaway: 'only',
+ website: 'https://www.picafloralpaso.com/',
+ wheelchair: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 7595455047,
+ lat: 48.8682283,
+ lon: 2.3725524,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-11',
+ name: 'Bloom',
+ opening_hours: 'Mo-Fr 12:00-15:00',
+ phone: '+33 7 85 46 11 18',
+ takeaway: 'only',
+ website: 'http://bloom-restaurant.fr/'
+ }
+ },
+ {
+ type: 'node',
+ id: 7995599846,
+ lat: 48.8685828,
+ lon: 2.3435702,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'sushi;sashimi',
+ delivery: 'yes',
+ level: '0',
+ name: 'Restaurant asiatique',
+ outdoor_seating: 'no',
+ smoking: 'no',
+ takeaway: 'yes',
+ wheelchair: 'yes'
+ }
+ },
+ {
+ type: 'node',
+ id: 8305863270,
+ lat: 48.868469,
+ lon: 2.3719492,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '117',
+ 'addr:postcode': '75011',
+ 'addr:street': 'Avenue Parmentier',
+ amenity: 'restaurant',
+ check_date: '2023-03-11',
+ 'contact:instagram': 'https://www.instagram.com/cadence.paris/',
+ cuisine: 'french',
+ 'diet:meat': 'yes',
+ 'diet:vegetarian': 'yes',
+ email: 'bonappetit@cadencecadence.fr',
+ name: 'cadence',
+ opening_hours: 'Mo-Fr 12:00-14:00,18:00-23:00; Sa 12:00-15:30,18:00-01:00',
+ phone: '+33 986153065',
+ website: 'https://www.cadencecadence.fr/'
+ }
+ },
+ {
+ type: 'node',
+ id: 8376827624,
+ lat: 48.868319,
+ lon: 2.3751558,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-04-15',
+ cuisine: 'pizza',
+ name: '400° laboratorio',
+ outdoor_seating: 'yes',
+ 'survey:date': '2022-05-21'
+ }
+ },
+ {
+ type: 'node',
+ id: 8587058178,
+ lat: 48.868259,
+ lon: 2.3749238,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-11',
+ name: 'Le flamboyant'
+ }
+ },
+ {
+ type: 'node',
+ id: 8787334023,
+ lat: 48.8686397,
+ lon: 2.3862179,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '1',
+ 'addr:postcode': '75020',
+ 'addr:street': "Rue d'Eupatoria",
+ amenity: 'restaurant',
+ bar: 'no',
+ brewery: 'no',
+ check_date: '2023-04-22',
+ cuisine: 'italian',
+ delivery: 'no',
+ highchair: 'no',
+ internet_access: 'no',
+ level: '0',
+ name: 'Dilia',
+ opening_hours: 'Th-Mo 19:30-22:30; Th-Su 12:30-14:00',
+ outdoor_seating: 'yes',
+ 'payment:mastercard': 'yes',
+ 'payment:visa': 'yes',
+ phone: '+33 953562414',
+ reservation: 'yes',
+ takeaway: 'no',
+ website: 'http://www.dilia.fr/',
+ wheelchair: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 8793139852,
+ lat: 48.8685045,
+ lon: 2.3701736,
+ tags: {
+ 'addr:housenumber': '19',
+ 'addr:street': 'Rue de la Fontaine au Roi',
+ amenity: 'restaurant',
+ check_date: '2023-04-22',
+ 'contact:instagram': 'restaurant_vantre',
+ 'contact:phone': '+33148061696',
+ cuisine: 'french',
+ name: 'Vantre',
+ opening_hours: 'Mo-Fr 12:00-14:00,19:30-22:00',
+ website: 'http://www.vantre.fr/'
+ }
+ },
+ {
+ type: 'node',
+ id: 8813020831,
+ lat: 48.8683757,
+ lon: 2.3726204,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-09',
+ name: "P'tit Resto"
+ }
+ },
+ {
+ type: 'node',
+ id: 9196018021,
+ lat: 48.8683105,
+ lon: 2.3367286,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'korean',
+ name: 'Hang Ari',
+ opening_hours: 'Tu-Su 12:00-14:30, 19:00-22:30',
+ phone: '+33 1 44 50 44 50'
+ }
+ },
+ {
+ type: 'node',
+ id: 9753023878,
+ lat: 48.8682766,
+ lon: 2.3877051,
+ tags: {
+ 'addr:housenumber': '67',
+ 'addr:street': 'Rue de Ménilmontant, 75020 Paris',
+ amenity: 'restaurant',
+ check_date: '2023-04-24',
+ 'contact:phone': '+33 1 40 30 22 97',
+ name: 'Becquetance',
+ opening_hours: 'Mo-Fr 12:00-15:00,19:00-24:00; Sa-Su off',
+ outdoor_seating: 'yes',
+ reservation: 'yes',
+ takeaway: 'no',
+ website: 'https://www.instagram.com/becquetance_paris/'
+ }
+ },
+ {
+ type: 'node',
+ id: 9821175640,
+ lat: 48.8685726,
+ lon: 2.3900923,
+ tags: {
+ amenity: 'restaurant',
+ name: 'Pacific Bowl'
+ }
+ },
+ {
+ type: 'node',
+ id: 9845296414,
+ lat: 48.8682431,
+ lon: 2.3897383,
+ tags: {
+ amenity: 'restaurant',
+ name: 'il parigino',
+ website: 'https://ilparigino.com'
+ }
+ },
+ {
+ type: 'node',
+ id: 9985705703,
+ lat: 48.8682277,
+ lon: 2.3307632,
+ tags: {
+ amenity: 'restaurant',
+ bar: 'yes',
+ cuisine: 'french',
+ name: 'Royal Vendôme'
+ }
+ },
+ {
+ type: 'node',
+ id: 10220756525,
+ lat: 48.8682975,
+ lon: 2.3367866,
+ tags: {
+ amenity: 'restaurant',
+ cuisine: 'korean',
+ name: 'Kimchi',
+ opening_hours: 'Mo-Sa 12:00-14:00, Mo,Tu,Th-Sa 19:00-22:00'
+ }
+ },
+ {
+ type: 'node',
+ id: 10283141386,
+ lat: 48.8684709,
+ lon: 2.3608529,
+ tags: {
+ amenity: 'restaurant',
+ check_date: '2023-03-18',
+ name: 'Martin',
+ website: 'https://www.marriott.com/en-us/hotels/parpr-renaissance-paris-republique-hotel/dining/'
+ }
+ },
+ {
+ type: 'node',
+ id: 10559135909,
+ lat: 48.8683454,
+ lon: 2.2980754,
+ tags: {
+ amenity: 'restaurant',
+ name: 'Côme Marceau'
+ }
+ },
+ {
+ type: 'node',
+ id: 10620314388,
+ lat: 48.8684578,
+ lon: 2.355482,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '326',
+ 'addr:postcode': '75003',
+ 'addr:street': 'Rue Saint-Martin',
+ amenity: 'restaurant',
+ cuisine: 'peruvian',
+ indoor_seating: 'yes',
+ name: 'Mikuna',
+ opening_hours: 'Mo-Sa 11:45-14:30, 18:30-23:00; Su 10:00-14:30',
+ outdoor_seating: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 10620314394,
+ lat: 48.8683999,
+ lon: 2.3554616,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '326',
+ 'addr:postcode': '75003',
+ 'addr:street': 'Rue Saint-Martin',
+ amenity: 'restaurant',
+ cuisine: 'japanese',
+ indoor_seating: 'yes',
+ name: 'Poketea Factory',
+ outdoor_seating: 'no'
+ }
+ },
+ {
+ type: 'node',
+ id: 10620314395,
+ lat: 48.8682532,
+ lon: 2.3553777,
+ tags: {
+ 'addr:city': 'Paris',
+ 'addr:housenumber': '324',
+ 'addr:postcode': '75003',
+ 'addr:street': 'Rue Saint-Martin',
+ amenity: 'restaurant',
+ cuisine: 'vietnamese',
+ name: 'Sen Viet'
+ }
+ }
+ ]
+}
+
+export const optionData = [
+ {
+ tagName: 'amenity',
+ tagValue: 'Books',
+ title: 'optionBooks',
+ iconUrl: '/images/store-options/Books.svg',
+ iconUrl_light: '/images/store-options/Books_light.svg'
+ },
+ {
+ tagName: 'amenity',
+ tagValue: 'restaurant',
+ title: 'optionRestaurants',
+ iconUrl: '/images/store-options/Restaurants.svg',
+ iconUrl_light: '/images/store-options/Restaurants_light.svg'
+ },
+
+ {
+ tagName: 'amenity',
+ tagValue: 'Shopping',
+ title: 'optionStores',
+ iconUrl: '/images/store-options/Shopping.svg',
+ iconUrl_light: '/images/store-options/Shopping_light.svg'
+ },
+
+ {
+ tagName: 'amenity',
+ tagValue: 'Hotels',
+ title: 'optionHotels',
+ iconUrl: '/images/store-options/Hotels.svg',
+ iconUrl_light: '/images/store-options/Hotels_light.svg'
+ }
+]
diff --git a/apps/mobility-bap/components/Map/index.tsx b/apps/mobility-bap/components/Map/index.tsx
new file mode 100644
index 000000000..f97ef1214
--- /dev/null
+++ b/apps/mobility-bap/components/Map/index.tsx
@@ -0,0 +1,3 @@
+import Map from './Map'
+
+export default Map
diff --git a/apps/mobility-bap/components/Map/store-marker.svg b/apps/mobility-bap/components/Map/store-marker.svg
new file mode 100644
index 000000000..beba769ea
--- /dev/null
+++ b/apps/mobility-bap/components/Map/store-marker.svg
@@ -0,0 +1,4 @@
+
diff --git a/apps/mobility-bap/components/appHeader/AppHeader.tsx b/apps/mobility-bap/components/appHeader/AppHeader.tsx
new file mode 100644
index 000000000..f2634fc90
--- /dev/null
+++ b/apps/mobility-bap/components/appHeader/AppHeader.tsx
@@ -0,0 +1,41 @@
+import React from 'react'
+import Router from 'next/router'
+import { Box, Card, CardBody, Image, Text } from '@chakra-ui/react'
+import backArrow from '/public/images/Back.svg'
+
+export interface AppHeaderPropsModel {
+ appHeaderText: string
+}
+
+export const AppHeader: React.FC
+ {/* eslint-disable-next-line @next/next/no-img-element */}
+ 
+
+ + {t[`${title}`]} +
+
+ event.key === 'Enter' && handleSubmit()}
+ />
+
+ )
+}
+
+export default SearchBar
diff --git a/apps/mobility-bap/components/header/Settings.tsx b/apps/mobility-bap/components/header/Settings.tsx
new file mode 100644
index 000000000..e3f2c4bc0
--- /dev/null
+++ b/apps/mobility-bap/components/header/Settings.tsx
@@ -0,0 +1,53 @@
+import React from 'react'
+import { AiOutlineSetting, AiOutlineDown } from 'react-icons/ai'
+import { useDispatch, useSelector } from 'react-redux'
+import { settingBoxActions } from '../../store/settingBox-slice'
+import Language from './language/Language'
+import { useLanguage } from '../../hooks/useLanguage'
+import { ISettingBoxRootState } from '../../lib/types/settingBox'
+
+// Settings is just Language selector for now
+const Settings = () => {
+ const dispatch = useDispatch()
+ const { t, locale } = useLanguage()
+
+ const isSettingBoxOpen = useSelector((state: ISettingBoxRootState) => state.settingBox.isOpen)
+
+ function toggleShowSettingBox() {
+ dispatch(settingBoxActions.toggleSettingBox())
+ }
+
+ function onCloseSettingBox() {
+ dispatch(settingBoxActions.closeSettingBox())
+ }
+
+ return (
+
+
+ )
+}
+
+export default Settings
diff --git a/apps/mobility-bap/components/header/index.tsx b/apps/mobility-bap/components/header/index.tsx
new file mode 100644
index 000000000..211072d18
--- /dev/null
+++ b/apps/mobility-bap/components/header/index.tsx
@@ -0,0 +1,219 @@
+import React, { useEffect, useState } from 'react'
+import BottomModal from '../BottomModal'
+import { Box, Image, Text } from '@chakra-ui/react'
+import Settings from './Settings'
+import { useRouter } from 'next/router'
+
+import { useLanguage } from '../../hooks/useLanguage'
+
+type PathnameObjectType = { [key: string]: string }
+
+const cartIconBlackList: string[] = [
+ '/orderConfirmation',
+ '/orderDetails',
+ '/trackOrder',
+ '/feedback',
+ '/orderHistory',
+ '/',
+ '/mobileOtp',
+ '/cart',
+ '/checkoutPage',
+ '/paymentMode'
+]
+
+const backIconList = ['/', '/orderDetails']
+
+const homeIconBlackList = ['/orderHistory', '/', '/homePage', '/mobileOtp']
+
+const storeHeaderBlackList = [
+ '/checkoutPage',
+ '/orderHistory',
+ '/orderDetails',
+ '/cart',
+ '/homePage',
+ '/orderConfirmation',
+ 'feedback',
+ '/',
+ '/mobileOtp',
+ '/paymentMode'
+]
+const headerValues: PathnameObjectType = {
+ '/checkoutPage': 'Billing & Shipping',
+ '/orderHistory': 'Order History',
+ '/orderDetails': 'Order Details',
+ '/': 'Sign In',
+ '/mobileOtp': 'Sign In',
+ '/cart': 'Cart',
+ '/paymentMode': 'Select Payment Method',
+ feedback: 'Feedback'
+}
+
+const headerValuesFrench: PathnameObjectType = {
+ '/checkoutPage': 'Facturation et Livraison',
+ '/orderHistory': 'Historique des Commandes',
+ '/orderDetails': 'Détails de la Commande',
+ '/': 'Se Connecter',
+ '/mobileOtp': 'Se Connecter',
+ '/cart': 'Panier',
+ '/paymentMode': 'Sélectionner la Méthode de Paiement',
+ feedback: "Retour d'Information"
+}
+
+const topHeaderBlackList: string[] = []
+
+const bottomHeaderBlackList = ['/homePage', '/orderConfirmation']
+
+const menuIconWhiteList = ['/homePage']
+
+const languageIconWhiteList = ['/homePage', '/', '/mobileOtp']
+
+const getHeaderTitleForPage = (name: string, logo: string, pathName: string, locale: string | undefined) => {
+ const values = locale === 'en' ? headerValues : headerValuesFrench
+ switch (true) {
+ case storeHeaderBlackList.includes(pathName):
+ return
+ {locale == 'en' ? 'En' : 'Fr'}
+
+ {isSettingBoxOpen ? (
+ <>
+
+
+
+
+ ) : null}
+
+
+
+ {/* Menu Modal */}
+
+
+
+
+
+ {languageIconWhiteList.includes(router.pathname) && setMenuModalOpen(true)}
+ className="block"
+ src="/images/3-dots.svg"
+ alt="menu icon"
+ />
+ )}
+
+ {!homeIconBlackList.includes(router.pathname) && (
+ {
+ // localStorage.clear();
+ // router.push("/");
+ const user = localStorage.getItem('userPhone') as string
+ localStorage.clear()
+ localStorage.setItem('userPhone', user)
+ router.push('/homePage')
+ }}
+ src="/images/Home_icon.svg"
+ alt="home Icon"
+ />
+ )}
+
+ {
+ router.push('/orderHistory')
+ }}
+ className="flex gap-2 py-5"
+ >
+
+
+
+
+
+
+ {!backIconList.includes(router.pathname) && (
+
+
+ {getHeaderTitleForPage(optionTags?.name, optionTags?.logo, router.pathname, locale)}
+ router.back()}>
+
+ )}
+ {!cartIconBlackList.includes(router.pathname)}
+
+ {renderTopHeader &&
+ )
+}
+
+export default Header
diff --git a/apps/mobility-bap/components/header/language/Language.tsx b/apps/mobility-bap/components/header/language/Language.tsx
new file mode 100644
index 000000000..bdb4a2e63
--- /dev/null
+++ b/apps/mobility-bap/components/header/language/Language.tsx
@@ -0,0 +1,66 @@
+import React, { useEffect, useState } from 'react'
+import { useDispatch } from 'react-redux'
+import { settingBoxActions } from '../../../store/settingBox-slice'
+import { MdLanguage } from 'react-icons/md'
+import { useLanguage } from '../../../hooks/useLanguage'
+import LanguageItem from './LanguageItem'
+
+const Language = () => {
+ const { t, locale } = useLanguage()
+ const dispatch = useDispatch()
+ const [openLang, setOpenLang] = useState(false)
+
+ function onCloseLangBox(isOpen: boolean) {
+ setOpenLang(isOpen)
+ }
+
+ return (
+
+
+ )
+}
+
+export default Language
diff --git a/apps/mobility-bap/components/header/language/LanguageItem.tsx b/apps/mobility-bap/components/header/language/LanguageItem.tsx
new file mode 100644
index 000000000..4c92b2f93
--- /dev/null
+++ b/apps/mobility-bap/components/header/language/LanguageItem.tsx
@@ -0,0 +1,51 @@
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+import React, { useState } from 'react'
+import { useLanguage } from '../../../hooks/useLanguage'
+
+interface Props {
+ language: string
+ onCloseBox: (isLangOpen: boolean) => void
+}
+const LanguageItem: React.FC
+
+
+ {t.language}
+
+ dispatch(settingBoxActions.closeSettingBox())}
+ />
+ dispatch(settingBoxActions.closeSettingBox())}
+ />
+
+ setOpenLang(prevState => !prevState)}
+ >
+
+ {openLang ? (
+ <>
+ {locale === 'en' ? 'En' : 'Fr'}
+ setOpenLang(false)}
+ >
+
+
+
+ ) : null}
+ onCloseBox(false)}
+ >
+
+
+
+
+
+ )
+}
+
+export default LanguageItem
diff --git a/apps/mobility-bap/components/header/menu/MegaMenu/ExtraMenu.tsx b/apps/mobility-bap/components/header/menu/MegaMenu/ExtraMenu.tsx
new file mode 100644
index 000000000..94501bdd5
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/MegaMenu/ExtraMenu.tsx
@@ -0,0 +1,30 @@
+import React from 'react'
+import Link from 'next/link'
+import { extraMenu } from '../../../../mock/menuItems'
+import { useLanguage } from '../../../../hooks/useLanguage'
+
+const ExtraMenu = () => {
+ const { t } = useLanguage()
+ return (
+
+ {extraMenu.map(menuItem => {
+ return (
+
+ )
+}
+
+export default ExtraMenu
diff --git a/apps/mobility-bap/components/header/menu/MegaMenu/MegaMenu.tsx b/apps/mobility-bap/components/header/menu/MegaMenu/MegaMenu.tsx
new file mode 100644
index 000000000..5fc4236ac
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/MegaMenu/MegaMenu.tsx
@@ -0,0 +1,73 @@
+import React, { useRef } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { megaMenuActions } from '../../../../store/megaMenu-slice'
+import { Transition } from 'react-transition-group'
+import { useLanguage } from '../../../../hooks/useLanguage'
+import { GoGrabber } from 'react-icons/go'
+import MenusContainer from './MenusContainer'
+import { IMegaMenuRootState } from '../../../../lib/types/megaMenu'
+
+const MegaMenu = () => {
+ const nodeRef = useRef
+
+ )
+ })}
+
+
+ {state => {
+ return (
+
+
+ )
+}
+
+export default MegaMenu
diff --git a/apps/mobility-bap/components/header/menu/MegaMenu/MenusContainer.tsx b/apps/mobility-bap/components/header/menu/MegaMenu/MenusContainer.tsx
new file mode 100644
index 000000000..aabf263c1
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/MegaMenu/MenusContainer.tsx
@@ -0,0 +1,36 @@
+import React, { useState, useEffect } from 'react'
+import { useDispatch } from 'react-redux'
+import { activeMenuItemActions } from '../../../../store/activeMenuItem-slice'
+import menuItems from '../../../../mock/menuItems'
+import MenuItems from '../../../UI/MenuItems/MenuItems'
+import { IDropDown } from '../../../../lib/types/dropDown'
+import SubMenu from './SubMenu'
+const MenusContainer = () => {
+ const [subMenuItems, setSubMenuItems] = useState
+
+
+ {t.CategoryOfGoods}
+
+
+
+ )
+ }}
+
+
+
+
+
+ )
+}
+
+export default MenusContainer
diff --git a/apps/mobility-bap/components/header/menu/MegaMenu/SubMenu.tsx b/apps/mobility-bap/components/header/menu/MegaMenu/SubMenu.tsx
new file mode 100644
index 000000000..acdecc386
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/MegaMenu/SubMenu.tsx
@@ -0,0 +1,94 @@
+import React from 'react'
+import Link from 'next/link'
+import { useLanguage } from '../../../../hooks/useLanguage'
+import { IDropDown } from '../../../../lib/types/dropDown'
+import { useDispatch, useSelector } from 'react-redux'
+import { megaMenuActions } from '../../../../store/megaMenu-slice'
+import { IActiveMenuItemRootState } from '../../../../lib/types/activeMenuItem'
+import { HiChevronRight, HiChevronLeft } from 'react-icons/hi'
+
+interface Props {
+ subMenuItems: IDropDown[] | undefined
+}
+const SubMenu: React.FC
+
+
+ )
+}
+
+export default SubMenu
diff --git a/apps/mobility-bap/components/header/menu/MegaMenu/index.tsx b/apps/mobility-bap/components/header/menu/MegaMenu/index.tsx
new file mode 100644
index 000000000..1b44d45b5
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/MegaMenu/index.tsx
@@ -0,0 +1,14 @@
+import React from 'react'
+import ExtraMenu from './ExtraMenu'
+import MegaMenu from './MegaMenu'
+
+const index = () => {
+ return (
+
+ {subMenuItems ? (
+ <>
+
+ dispatch(megaMenuActions.closeMegaMenu())}
+ >
+ {t.seeAllProduct}
+
+
+
+ +
+ {subMenuItems && activeMenuItemText ? (
+ <>
+ {subMenuItems.map((menuTitle, index) => {
+ return (
+
+
+
+ dispatch(megaMenuActions.closeMegaMenu())}
+ >
+ {t[`${menuTitle.title}`]}
+
+
+ {menuTitle.subtitles.map((subTitle, index) => {
+ return (
+
+ dispatch(megaMenuActions.closeMegaMenu())}
+ >
+ {t[`${subTitle}`]}
+
+
+ )
+ })}
+
+ )
+ })}
+
+ ) : (
+ {t.noProduct}
+ )} +
+
+ )
+}
+
+export default index
diff --git a/apps/mobility-bap/components/header/menu/SideBarMenu/SideBar.tsx b/apps/mobility-bap/components/header/menu/SideBarMenu/SideBar.tsx
new file mode 100644
index 000000000..14a684af8
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/SideBarMenu/SideBar.tsx
@@ -0,0 +1,65 @@
+import React, { useRef } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { sideNavBarActions } from '../../../../store/sideNavBar-slice'
+import { Transition } from 'react-transition-group'
+import { GoGrabber } from 'react-icons/go'
+import { ISideNavBarRootState } from '../../../../lib/types/sidebar'
+import SideNav from './SideNav'
+
+const SideBar = () => {
+ const nodeRef = useRef
+
+ {state => {
+ return (
+ <>
+
+
+ )
+}
+
+export default SideBar
diff --git a/apps/mobility-bap/components/header/menu/SideBarMenu/SideNav.tsx b/apps/mobility-bap/components/header/menu/SideBarMenu/SideNav.tsx
new file mode 100644
index 000000000..4c964a90b
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/SideBarMenu/SideNav.tsx
@@ -0,0 +1,50 @@
+import React, { forwardRef } from 'react'
+import { useRouter } from 'next/router'
+import { IoClose } from 'react-icons/io5'
+import SideNavContent from './SideNavContent'
+import Logo from '../../Logo'
+
+interface Props {
+ state?: string
+ onClose: () => void
+ children?: React.ReactNode
+ ref: React.HTMLProps
+
+
+
+
+ )
+})
+
+SideNav.displayName = 'SideNav'
+
+export default SideNav
diff --git a/apps/mobility-bap/components/header/menu/SideBarMenu/SideNavContent.tsx b/apps/mobility-bap/components/header/menu/SideBarMenu/SideNavContent.tsx
new file mode 100644
index 000000000..0d5595cf3
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/SideBarMenu/SideNavContent.tsx
@@ -0,0 +1,47 @@
+import React from 'react'
+import Link from 'next/link'
+import { useLanguage } from '../../../../hooks/useLanguage'
+import { extraMenu } from '../../../../mock/menuItems'
+import { useDispatch } from 'react-redux'
+import { sideNavBarActions } from '../../../../store/sideNavBar-slice'
+import { activeMenuItemActions } from '../../../../store/activeMenuItem-slice'
+import { IDropDown } from '../../../../lib/types/dropDown'
+import MenuItems from '../../../UI/MenuItems/MenuItems'
+
+const SideNavContent = () => {
+ const { t } = useLanguage()
+ const dispatch = useDispatch()
+ const openNav = (sidebarSideContent: IDropDown[] = [], activeItemName: string, activeItemIndex: number) => {
+ dispatch(sideNavBarActions.setSidebarEntries(sidebarSideContent))
+ dispatch(sideNavBarActions.openSidebar())
+ dispatch(activeMenuItemActions.setActiveMenuItemText(activeItemName))
+ dispatch(activeMenuItemActions.setActiveMenuItemIndex(activeItemIndex))
+ }
+ return (
+
+
+
+
+ +
+
+ )
+}
+
+export default SideNavContent
diff --git a/apps/mobility-bap/components/header/menu/SideBarMenu/SideNavSide.tsx b/apps/mobility-bap/components/header/menu/SideBarMenu/SideNavSide.tsx
new file mode 100644
index 000000000..8ee8247cf
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/SideBarMenu/SideNavSide.tsx
@@ -0,0 +1,119 @@
+import React, { useRef } from 'react'
+import { Transition } from 'react-transition-group'
+import { HiOutlineArrowSmRight, HiOutlineArrowSmLeft, HiChevronRight, HiChevronLeft } from 'react-icons/hi'
+import DropDown from '../../../UI/DropDown'
+import { useDispatch, useSelector } from 'react-redux'
+import { sideNavBarActions } from '../../../../store/sideNavBar-slice'
+import { ISideNavBarRootState } from '../../../../lib/types/sidebar'
+import { useLanguage } from '../../../../hooks/useLanguage'
+import Link from 'next/link'
+import { IActiveMenuItemRootState } from '../../../../lib/types/activeMenuItem'
+
+const SideNavSide = () => {
+ const dispatch = useDispatch()
+
+ const dropDownList = useSelector((state: ISideNavBarRootState) => state.sideNavBar.dropDownList)
+
+ const isSidebarOpen = useSelector((state: ISideNavBarRootState) => state.sideNavBar.isSidebarOpen)
+
+ const activeMenuItemText = useSelector((state: IActiveMenuItemRootState) => state.activeMenuItem.activeMenuItemText)
+
+ const closeSidebar = () => {
+ dispatch(sideNavBarActions.closeSidebar())
+ }
+
+ const closeNavbar = () => {
+ dispatch(sideNavBarActions.closeNavbar())
+ }
+
+ const nodeRef = useRef
+ {extraMenu.map(menuItem => {
+ return (
+
+
+
+
+ )
+ })}
+ +
{t.CategoryOfGoods}
+
+
+ + + {dropDownList.map(item => { + return ( +
+ )
+ }}
+
+
+
+ {t.mainMenu}
++ + + {dropDownList.map(item => { + return ( +
+
+ )
+ })}
+
+
+ )
+}
+
+export default index
diff --git a/apps/mobility-bap/components/header/menu/index.tsx b/apps/mobility-bap/components/header/menu/index.tsx
new file mode 100644
index 000000000..8da269e2e
--- /dev/null
+++ b/apps/mobility-bap/components/header/menu/index.tsx
@@ -0,0 +1,14 @@
+import React from 'react'
+import SideBarMenu from './SideBarMenu'
+import MegaMenu from './MegaMenu'
+
+const index = () => {
+ return (
+ <>
+
+
+ )
+}
+
+export default Theme
diff --git a/apps/mobility-bap/components/header/theme/ThemeItem.tsx b/apps/mobility-bap/components/header/theme/ThemeItem.tsx
new file mode 100644
index 000000000..623514925
--- /dev/null
+++ b/apps/mobility-bap/components/header/theme/ThemeItem.tsx
@@ -0,0 +1,47 @@
+import { useTheme } from 'next-themes'
+import React from 'react'
+import { IconType } from 'react-icons'
+import { useLanguage } from '../../../hooks/useLanguage'
+import { useDispatch, useSelector } from 'react-redux'
+import { settingBoxActions } from '../../../store/settingBox-slice'
+import { ISettingBoxRootState } from '../../../lib/types/settingBox'
+
+interface Props {
+ theme: string
+ currentTheme?: string
+ Icon: IconType
+}
+const ThemeItem: React.FC
+
+ {t.theme}
+
+
+ {renderThemeChanger()}
+
+
+
+ )
+}
+
+export default ThemeItem
diff --git a/apps/mobility-bap/components/header/user/LoginBtn.tsx b/apps/mobility-bap/components/header/user/LoginBtn.tsx
new file mode 100644
index 000000000..3a17e2afd
--- /dev/null
+++ b/apps/mobility-bap/components/header/user/LoginBtn.tsx
@@ -0,0 +1,36 @@
+import React from 'react'
+import { useLanguage } from '../../../hooks/useLanguage'
+import { HiOutlineLogin } from 'react-icons/hi'
+import Link from 'next/link'
+
+const LoginBtn = () => {
+ const { t } = useLanguage()
+ return (
+
+
+ {t[`${theme}`]}
+
+
+ + {t.login} | {t.signUp} +
+
+
+
+
+ )
+}
+
+export default LoginBtn
diff --git a/apps/mobility-bap/components/header/user/UserAccountBox.tsx b/apps/mobility-bap/components/header/user/UserAccountBox.tsx
new file mode 100644
index 000000000..1cbc4777a
--- /dev/null
+++ b/apps/mobility-bap/components/header/user/UserAccountBox.tsx
@@ -0,0 +1,67 @@
+import Link from 'next/link'
+import React from 'react'
+import { useDispatch } from 'react-redux'
+import { userInfoActions } from '../../../store/user-slice'
+import { useLanguage } from '../../../hooks/useLanguage'
+import { AiOutlineHeart } from 'react-icons/ai'
+import { IoLogOutOutline } from 'react-icons/io5'
+import jsCookie from 'js-cookie'
+
+interface Props {
+ onClose: () => void
+}
+const UserAccountBox: React.FC
+
+ )
+}
+
+export default UserAccountBox
diff --git a/apps/mobility-bap/components/header/user/UserAccountBtn.tsx b/apps/mobility-bap/components/header/user/UserAccountBtn.tsx
new file mode 100644
index 000000000..2c4a42219
--- /dev/null
+++ b/apps/mobility-bap/components/header/user/UserAccountBtn.tsx
@@ -0,0 +1,60 @@
+import React, { useRef, useState } from 'react'
+import { AiOutlineUser } from 'react-icons/ai'
+import { HiChevronDown } from 'react-icons/hi'
+import { Transition } from 'react-transition-group'
+import UserAccountBox from './UserAccountBox'
+
+const UserAccountBtn = () => {
+ const [isUserBoxOpen, setIsUserBoxOpen] = useState(false)
+ const nodeRef = useRef-
+
-
+
+
+
+ {t.favorites} + + +
+ -
+
+
+
+ {t.logout} + + +
+
+
+ {state => {
+ return (
+ <>
+
+
+
+ )
+}
+
+export default UserAccountBtn
diff --git a/apps/mobility-bap/components/header/user/index.tsx b/apps/mobility-bap/components/header/user/index.tsx
new file mode 100644
index 000000000..ceaf66bef
--- /dev/null
+++ b/apps/mobility-bap/components/header/user/index.tsx
@@ -0,0 +1,12 @@
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { IUserInfoRootState } from '../../../lib/types/user'
+import UserAccountBtn from './UserAccountBtn'
+import LoginBtn from './LoginBtn'
+
+const User = () => {
+ const userInfo = useSelector((state: IUserInfoRootState) => state.userInfo.userInformation)
+ return
+
+
+
+
+ )
+ }}
+ {userInfo ?
+}
+
+export default User
diff --git a/apps/mobility-bap/components/layout/Layout.tsx b/apps/mobility-bap/components/layout/Layout.tsx
new file mode 100644
index 000000000..12d6f3c1b
--- /dev/null
+++ b/apps/mobility-bap/components/layout/Layout.tsx
@@ -0,0 +1,73 @@
+import React from 'react'
+import { Provider } from 'react-redux'
+import Head from 'next/head'
+import { ThemeProvider } from 'next-themes'
+import { useRouter } from 'next/router'
+import Header from '../header'
+import store from '../../store/index'
+import Footer from '../footer'
+import { ToastContainer } from 'react-toastify'
+import { useLanguage } from '../../hooks/useLanguage'
+import NextNProgress from 'nextjs-progressbar'
+import cs from 'classnames'
+
+const Layout: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
+ const { locale } = useLanguage()
+ const router = useRouter()
+ const isHomepage = router.pathname === '/homePage'
+ const isSearch = router.pathname === '/search'
+ const paddingStyles = 'px-5 xl:px-16'
+ const marginStyles = 'mt-[100px]'
+
+ return (
+
+
+ {children}
+
+ {/* */}
+
+
+
+ {props.loadingText}
+
+ )}
+ {props.subLoadingText && {props.subLoadingText} }
+
+ )
+}
+
+export default React.memo(Loader)
diff --git a/apps/mobility-bap/components/starRating/StarRating.tsx b/apps/mobility-bap/components/starRating/StarRating.tsx
new file mode 100644
index 000000000..7ec8f6e7e
--- /dev/null
+++ b/apps/mobility-bap/components/starRating/StarRating.tsx
@@ -0,0 +1,53 @@
+import { Box, Text } from '@chakra-ui/react'
+import React, { useState } from 'react'
+import { FaStar } from 'react-icons/fa'
+
+export interface StarRatingProps {
+ rating: number
+ setRating: (rating: number) => void
+ count?: number
+ size?: number
+ transition: string
+ ratingText: string
+}
+
+const StarRating: React.FC
+
+
+
+ )}
+
+ )
+}
+
+export default Homepage
diff --git a/apps/mobility-bap/pages/index.tsx b/apps/mobility-bap/pages/index.tsx
new file mode 100644
index 000000000..ba53c7b99
--- /dev/null
+++ b/apps/mobility-bap/pages/index.tsx
@@ -0,0 +1,337 @@
+import React, { useRef, useEffect, useState } from 'react'
+import { Transition } from 'react-transition-group'
+import dynamic from 'next/dynamic'
+import BottomModal from '../components/BottomModal'
+import OptionCard from '../components/Map/OptionCard'
+import { optionData } from '../components/Map/StoreMarkerData'
+import { useRouter } from 'next/router'
+import useRequest from '../hooks/useRequest'
+import cs from 'classnames'
+import { Image } from '@chakra-ui/react'
+import { useLanguage } from '../hooks/useLanguage'
+import { Button } from '@beckn-ui/molecules'
+import MapSearch from '../components/Map/MapSearch'
+import { isEmpty } from 'lodash'
+
+const tagValuetoApiMap: { [key: string]: string } = {
+ Books: 'books',
+ restaurant: 'bakery'
+}
+
+enum StoreType {
+ books = 'Books',
+ restaurant = 'restaurant'
+}
+
+type Coords = {
+ lat: number
+ long: number
+}
+type OptionType = {
+ tagName: string
+ tagValue: string
+ title?: string
+}
+
+const initialOption: OptionType = {
+ tagName: '',
+ tagValue: ''
+}
+
+const duration = 300
+
+const defaultStyle = {
+ transition: `height ${duration}ms ease-in-out`,
+ height: '4rem'
+}
+
+const transitionStyles = {
+ entering: { height: '12rem' },
+ entered: { height: '12rem' },
+ exiting: { height: '3.8rem' },
+ exited: { height: '3.8rem' }
+}
+
+const getProperImages = (selectedStore: any) => {
+ if (selectedStore && selectedStore.tags) {
+ if (selectedStore.tags.image) return selectedStore.tags.image
+ else return selectedStore.tags.images
+ } else return ''
+}
+
+const staticTagsList = ['inStoreShopping', 'delivery', 'clickAndCollect']
+
+const getStaticTags = (tag: string) => {
+ if (tag === StoreType.books) return ['inStoreShopping', 'delivery', 'clickAndCollect']
+ else return ['dineIn', 'takeAway', 'delivery']
+}
+
+const Homepage = () => {
+ const MapWithNoSSR = dynamic(() => import('../components/Map'), {
+ ssr: false
+ })
+
+ const nodeRef = useRef(null)
+ const [showSuggestions, setShowSuggestions] = useState(false)
+
+ const { t, locale } = useLanguage()
+
+ // create a state value called query in typescript
+ const [query, setQuery] = useState
+
+
+
+
+ {state => (
+
+
+
+
+
+ )}
+ setIsMenuModalOpen(prev => !prev)}>
+
+ {t.explorePlaces}
+
+ {optionData.map((currentOption, index) => {
+ const isSelected = option ? option.tagValue === currentOption.tagValue : false
+ const optionMeta = {
+ tagName: currentOption.tagName,
+ tagValue: currentOption.tagValue,
+ title: currentOption.title
+ }
+ const optionIcons = {
+ iconUrl: currentOption.iconUrl,
+ iconUrlLight: currentOption.iconUrl_light
+ }
+ return (
+
+
+
+ + {t[option?.tagValue === StoreType.books ? 'localStores' : 'restaurants']}{' '} + {query ? query : locationData?.name}{' '} +
+
+
+ + {selectedStore?.tags.name} -{' '} + {option?.tagValue === StoreType.books ? t.bookstore : t.optionRestaurant} +
+
+ {getProperImages(selectedStore)
+ .split(',')
+ .map((singleImage: string, i: number) => {
+ return (
+
+ + {selectedStore?.tags['addr:full'] || selectedStore?.tags['addr:street']} +
+
+ {getStaticTags(option?.tagValue).map((tag, i) => {
+ return (
+
+
+
+
+
+ )
+ })}
+ {t[`${tag}`]}
+
+
+
+
+ )}
+
+ )
+}
+
+export default Homepage
diff --git a/apps/mobility-bap/pages/orderConfirmation.tsx b/apps/mobility-bap/pages/orderConfirmation.tsx
new file mode 100644
index 000000000..9a7a8f736
--- /dev/null
+++ b/apps/mobility-bap/pages/orderConfirmation.tsx
@@ -0,0 +1,99 @@
+import React, { useEffect } from 'react'
+import { useRouter } from 'next/router'
+import { Box, Image, Stack, Text } from '@chakra-ui/react'
+import { useSelector } from 'react-redux'
+import orderConfirmmark from '../public/images/orderConfirmmark.svg'
+import { useLanguage } from '../hooks/useLanguage'
+import useRequest from '../hooks/useRequest'
+import { getInitMetaDataPerBpp, getPayloadForConfirmRequest } from '../utilities/confirm-utils'
+import Loader from '../components/loader/Loader'
+import { TransactionIdRootState } from '../lib/types/cart'
+
+const OrderConfirmation = () => {
+ const { t } = useLanguage()
+ const confirmRequest = useRequest()
+ const router = useRouter()
+ const initResponse = useSelector((state: any) => state.initResponse.initResponse)
+
+ const transactionId = useSelector((state: { transactionId: TransactionIdRootState }) => state.transactionId)
+
+ const apiUrl = process.env.NEXT_PUBLIC_API_URL
+
+ useEffect(() => {
+ if (initResponse) {
+ const initMetaDataPerBpp = getInitMetaDataPerBpp(initResponse)
+
+ const payLoadForConfirmRequest = getPayloadForConfirmRequest(
+ initMetaDataPerBpp,
+ transactionId,
+ localStorage.getItem('userPhone') as string
+ )
+ confirmRequest.fetchData(`${apiUrl}/client/v2/confirm`, 'POST', payLoadForConfirmRequest)
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [])
+
+ useEffect(() => {
+ if (!initResponse && localStorage && localStorage.getItem('initResult')) {
+ const parsedInitResult = JSON.parse(localStorage.getItem('initResult') as string)
+ const initMetaDataPerBpp = getInitMetaDataPerBpp(parsedInitResult)
+
+ const payLoadForConfirmRequest = getPayloadForConfirmRequest(
+ initMetaDataPerBpp,
+ transactionId,
+ localStorage.getItem('userPhone') as string
+ )
+ confirmRequest.fetchData(`${apiUrl}/client/v2/confirm`, 'POST', payLoadForConfirmRequest)
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [])
+
+ useEffect(() => {
+ if (confirmRequest.data) {
+ localStorage.setItem('confirmData', JSON.stringify(confirmRequest.data))
+ const timeout = setTimeout(() => {
+ router.push('/orderDetails')
+ }, 3000)
+
+ // Clean up the timeout on component unmount
+ return () => {
+ clearTimeout(timeout)
+ }
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [confirmRequest.data])
+
+ if (confirmRequest.loading) {
+ return
+
+
+
+
+ {state => (
+
+
+
+
+
+ )}
+ setIsMenuModalOpen(prev => !prev)}>
+
+ {t.explorePlaces}
+
+ {optionData.map((currentOption, index) => {
+ const isSelected = option ? option.tagValue === currentOption.tagValue : false
+ const optionMeta = {
+ tagName: currentOption.tagName,
+ tagValue: currentOption.tagValue,
+ title: currentOption.title
+ }
+ const optionIcons = {
+ iconUrl: currentOption.iconUrl,
+ iconUrlLight: currentOption.iconUrl_light
+ }
+ return (
+
+
+
+ + {t[option?.tagValue === StoreType.books ? 'localStores' : 'restaurants']}{' '} + {query ? query : locationData?.name}{' '} +
+
+
+ + {selectedStore?.tags.name} -{' '} + {option?.tagValue === StoreType.books ? t.bookstore : t.optionRestaurant} +
+
+ {getProperImages(selectedStore)
+ .split(',')
+ .map((singleImage: string, i: number) => {
+ return (
+
+ + {selectedStore?.tags['addr:full'] || selectedStore?.tags['addr:street']} +
+
+ {getStaticTags(option?.tagValue).map((tag, i) => {
+ return (
+
+
+
+
+
+ )
+ })}
+ {t[`${tag}`]}
++ {t.confirmMessage2} +
+ {loading ? (
+
+
+ )
+}
+
+export default Search
diff --git a/apps/mobility-bap/pages/trackOrder.tsx b/apps/mobility-bap/pages/trackOrder.tsx
new file mode 100644
index 000000000..1ef510f4d
--- /dev/null
+++ b/apps/mobility-bap/pages/trackOrder.tsx
@@ -0,0 +1,266 @@
+import { Text, Stack, Image, Divider, Flex, Box } from '@chakra-ui/react'
+import React, { useEffect, useState } from 'react'
+import { useRouter } from 'next/router'
+import { AppHeader } from '../components/appHeader/AppHeader'
+import { useLanguage } from '../hooks/useLanguage'
+import trackOrderMap from '../public/images/trackOrderMap.svg'
+import orderConfirmed from '../public/images/orderConfirmed.svg'
+import deliveryAgentBlack from '../public/images/deliveryAgentBlack.svg'
+import deliveryAgentRed from '../public/images/deliveryAgentRed.svg'
+import ofdRed from '../public/images/ofdRed.svg'
+import ofdBlack from '../public/images/ofdBlack.svg'
+import orderDeliveredRed from '../public/images/orderDeliveredRed.svg'
+import orderDeliveredBlack from '../public/images/orderDeliveredBlack.svg'
+import lineRed from '../public/images/lineRed.svg'
+import lineBlack from '../public/images/lineBlack.svg'
+
+const TrackOrder = () => {
+ const [activeSteps, setActiveSteps] = useState([true, false, false, false])
+ const { t } = useLanguage()
+ const router = useRouter()
+
+ useEffect(() => {
+ const interval = setInterval(() => {
+ setActiveSteps(prevSteps => {
+ const updatedSteps = [...prevSteps]
+ const nextActiveIndex = prevSteps.findIndex(isActive => !isActive)
+ if (nextActiveIndex !== -1) {
+ updatedSteps[nextActiveIndex] = true
+ }
+ return updatedSteps
+ })
+ }, 3000)
+
+ return () => {
+ clearInterval(interval)
+ }
+ }, [])
+
+ const getStepColor = (stepIndex: number) => {
+ return activeSteps[stepIndex] ? 'rgba(var(--color-primary))' : '#000000'
+ }
+
+ const getStepImage = (stepIndex: number) => {
+ switch (stepIndex) {
+ case 0:
+ return orderConfirmed
+ case 1:
+ return activeSteps[1] ? deliveryAgentRed : deliveryAgentBlack
+ case 2:
+ return activeSteps[2] ? ofdRed : ofdBlack
+ case 3:
+ return activeSteps[3] ? orderDeliveredRed : orderDeliveredBlack
+ case 4:
+ return router.push('/feedback')
+ default:
+ return null
+ }
+ }
+
+ const getStepLineImage = (stepIndex: number) => {
+ return activeSteps[stepIndex] ? lineRed : lineBlack
+ }
+
+ useEffect(() => {
+ const isAllStepsCompleted = activeSteps.every(isActive => isActive)
+
+ if (isAllStepsCompleted) {
+ router.push('/feedback')
+ }
+ }, [activeSteps, router])
+
+ return (
+ <>
+ {/*
+
+ ) : (
+
{!cartIconBlackList.includes(router.pathname) && (
- router.push('/cart')}
- cursor="pointer"
- >
-
+ router.push('/cart')}
+ />
)}
{orderIconList.includes(router.pathname) && (
+ ({
+ id: singleItem.id,
+ quantity: singleItem.quantity,
+ name: singleItem.name,
+ image: singleItem.images[0].url,
+ price: Number(singleItem.price.value),
+ symbol: singleItem.price.currency,
+ handleIncrement: id => {
+ const selectedItem = productList.find(singleItem => singleItem.id === id)
+ if (selectedItem) {
+ dispatch(cartActions.addItemToCart({ product: selectedItem, quantity: 1 }))
+ }
+ },
+ handleDecrement: id => {
+ dispatch(cartActions.removeItemFromCart(id))
+ }
+ })),
+ loader: { text: 'Loading cart' },
+ orderSummary: {
+ totalAmount: {
+ price: totalAmount,
+ currencyType: items[0].price.currency
+ },
+ totalQuantity: {
+ text: totalQuantity.toString(),
+ variant: 'subTitleSemibold'
+ },
+ pageCTA: {
+ text: 'Proceed to checkout',
+ handleClick: onOrderClick
+ }
+ }
+ }}
+ />
+
+ )
}
-export default cart
+export default Cart
diff --git a/apps/retail/pages/checkout.tsx b/apps/retail/pages/checkout.tsx
new file mode 100644
index 000000000..7cacefa1f
--- /dev/null
+++ b/apps/retail/pages/checkout.tsx
@@ -0,0 +1,249 @@
+import React, { useEffect, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { Box, Flex, Text, Stack, Checkbox } from '@chakra-ui/react'
+import { DOMAIN } from '@lib/config'
+import { useLanguage } from '../hooks/useLanguage'
+
+import { CartItemForRequest, DataPerBpp, ICartRootState, TransactionIdRootState } from '@lib/types/cart'
+import {
+ getInitPayload,
+ areShippingAndBillingDetailsSame,
+ getPayloadForInitRequest,
+ getSubTotalAndDeliveryCharges
+} from '@components/checkout/checkout.utils'
+import useRequest from '../hooks/useRequest'
+import { useInitMutation } from '@services/init'
+import { responseDataActions } from '../store/responseData-slice'
+
+import { Checkout } from '@beckn-ui/becknified-components'
+
+import { Router, useRouter } from 'next/router'
+import { ShippingFormInitialValuesType } from '@beckn-ui/becknified-components'
+import { CheckoutRootState, checkoutActions } from '@store/checkout-slice'
+import { cartActions } from '@store/cart-slice'
+
+export type ShippingFormData = {
+ name: string
+ mobileNumber: string
+ email: string
+ address: string
+ zipCode: string
+}
+
+export const currencyMap = {
+ EUR: '€',
+ INR: '₹'
+}
+
+const CheckoutPage = () => {
+ const [formData, setFormData] = useState