Skip to content

Commit 0ac0865

Browse files
ankitShogunankitShogun
authored
Merge pull request #285 from beckn/staging
Staging
2 parents 56b6cc5 + da7d23b commit 0ac0865

File tree

621 files changed

+52084
-31009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

621 files changed

+52084
-31009
lines changed

‎.vscode/project.code-workspace

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
{
5252
"name": "taxi-bpp",
5353
"path": "../apps/taxi-bpp"
54+
},
55+
{
56+
"name": "retail",
57+
"path": "../apps/retail"
5458
}
5559
],
5660
"settings": {

‎apps/dhp/components/UI/DropDown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const DropDown = forwardRef<HTMLDivElement, Props>(({ dropDown }, ref) => {
5959
state === 'entering'
6060
? `animate-dropDown`
6161
: state === 'entered'
62-
? 'scale-y-100 opacity-100'
63-
: 'animate-dropDownExit'
62+
? 'scale-y-100 opacity-100'
63+
: 'animate-dropDownExit'
6464
}
6565
`}
6666
>

‎apps/dhp/components/header/menu/MegaMenu/MegaMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const MegaMenu = () => {
5353
state === 'entering'
5454
? 'animate-fadeEntering'
5555
: state === 'entered'
56-
? 'opacity-100'
57-
: 'animate-fadeExit'
56+
? 'opacity-100'
57+
: 'animate-fadeExit'
5858
}
5959
`}
6060
onClick={closeMegaMenuHandler}

‎apps/dhp/components/header/menu/SideBarMenu/SideBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const SideBar = () => {
4848
state === 'entering'
4949
? 'animate-fadeEntering'
5050
: state === 'entered'
51-
? 'opacity-100'
52-
: 'animate-fadeExit'
51+
? 'opacity-100'
52+
: 'animate-fadeExit'
5353
}
5454
`}
5555
onClick={closeNav}

‎apps/dhp/components/header/menu/SideBarMenu/SideNav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const SideNav = forwardRef<HTMLDivElement, Props>(({ state, onClose }, ref) => {
2222
state === 'entering'
2323
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
2424
: state === 'entered'
25-
? 'translate-x-0'
26-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
25+
? 'translate-x-0'
26+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
2727
}
2828
`}
2929
>

‎apps/dhp/components/header/menu/SideBarMenu/SideNavSide.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const SideNavSide = () => {
5252
state === 'entering'
5353
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
5454
: state === 'entered'
55-
? 'translate-x-0'
56-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
55+
? 'translate-x-0'
56+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
5757
}
5858
`}
5959
>

‎apps/dsep/components/UI/DropDown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const DropDown = forwardRef<HTMLDivElement, Props>(({ dropDown }, ref) => {
5959
state === 'entering'
6060
? `animate-dropDown`
6161
: state === 'entered'
62-
? 'scale-y-100 opacity-100'
63-
: 'animate-dropDownExit'
62+
? 'scale-y-100 opacity-100'
63+
: 'animate-dropDownExit'
6464
}
6565
`}
6666
>

‎apps/dsep/components/header/menu/MegaMenu/MegaMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const MegaMenu = () => {
5353
state === 'entering'
5454
? 'animate-fadeEntering'
5555
: state === 'entered'
56-
? 'opacity-100'
57-
: 'animate-fadeExit'
56+
? 'opacity-100'
57+
: 'animate-fadeExit'
5858
}
5959
`}
6060
onClick={closeMegaMenuHandler}

‎apps/dsep/components/header/menu/SideBarMenu/SideBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const SideBar = () => {
4848
state === 'entering'
4949
? 'animate-fadeEntering'
5050
: state === 'entered'
51-
? 'opacity-100'
52-
: 'animate-fadeExit'
51+
? 'opacity-100'
52+
: 'animate-fadeExit'
5353
}
5454
`}
5555
onClick={closeNav}

‎apps/dsep/components/header/menu/SideBarMenu/SideNav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const SideNav = forwardRef<HTMLDivElement, Props>(({ state, onClose }, ref) => {
2222
state === 'entering'
2323
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
2424
: state === 'entered'
25-
? 'translate-x-0'
26-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
25+
? 'translate-x-0'
26+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
2727
}
2828
`}
2929
>

‎apps/dsep/components/header/menu/SideBarMenu/SideNavSide.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const SideNavSide = () => {
5252
state === 'entering'
5353
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
5454
: state === 'entered'
55-
? 'translate-x-0'
56-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
55+
? 'translate-x-0'
56+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
5757
}
5858
`}
5959
>

‎apps/dsep/components/landingPage/LandingPage.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ const LandingPage: React.FC = () => {
6161
? type === 'course'
6262
? couresImageWhite
6363
: type === 'scholarship'
64-
? scholarshipImageWhite
65-
: jobsImageWhite
64+
? scholarshipImageWhite
65+
: jobsImageWhite
6666
: type === 'course'
67-
? coursesImageBlack
68-
: type === 'scholarship'
69-
? scholarshipImageBlack
70-
: jobsImageBlack
67+
? coursesImageBlack
68+
: type === 'scholarship'
69+
? scholarshipImageBlack
70+
: jobsImageBlack
7171
}
7272
text={type === 'course' ? t.courseImgText : type === 'scholarship' ? t.scholarshipImgText : t.jobsImgText}
7373
onClick={() => handleClick(type)}

‎apps/dsnp/components/UI/DropDown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const DropDown = forwardRef<HTMLDivElement, Props>(({ dropDown }, ref) => {
5959
state === 'entering'
6060
? `animate-dropDown`
6161
: state === 'entered'
62-
? 'scale-y-100 opacity-100'
63-
: 'animate-dropDownExit'
62+
? 'scale-y-100 opacity-100'
63+
: 'animate-dropDownExit'
6464
}
6565
`}
6666
>

‎apps/dsnp/components/header/menu/MegaMenu/MegaMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const MegaMenu = () => {
5353
state === 'entering'
5454
? 'animate-fadeEntering'
5555
: state === 'entered'
56-
? 'opacity-100'
57-
: 'animate-fadeExit'
56+
? 'opacity-100'
57+
: 'animate-fadeExit'
5858
}
5959
`}
6060
onClick={closeMegaMenuHandler}

‎apps/dsnp/components/header/menu/SideBarMenu/SideBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const SideBar = () => {
4848
state === 'entering'
4949
? 'animate-fadeEntering'
5050
: state === 'entered'
51-
? 'opacity-100'
52-
: 'animate-fadeExit'
51+
? 'opacity-100'
52+
: 'animate-fadeExit'
5353
}
5454
`}
5555
onClick={closeNav}

‎apps/dsnp/components/header/menu/SideBarMenu/SideNav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const SideNav = forwardRef<HTMLDivElement, Props>(({ state, onClose }, ref) => {
2222
state === 'entering'
2323
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
2424
: state === 'entered'
25-
? 'translate-x-0'
26-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
25+
? 'translate-x-0'
26+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
2727
}
2828
`}
2929
>

‎apps/dsnp/components/header/menu/SideBarMenu/SideNavSide.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const SideNavSide = () => {
5252
state === 'entering'
5353
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
5454
: state === 'entered'
55-
? 'translate-x-0'
56-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
55+
? 'translate-x-0'
56+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
5757
}
5858
`}
5959
>

‎apps/industry_4.0/components/UI/DropDown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const DropDown = forwardRef<HTMLDivElement, Props>(({ dropDown }, ref) => {
5959
state === 'entering'
6060
? `animate-dropDown`
6161
: state === 'entered'
62-
? 'scale-y-100 opacity-100'
63-
: 'animate-dropDownExit'
62+
? 'scale-y-100 opacity-100'
63+
: 'animate-dropDownExit'
6464
}
6565
`}
6666
>

‎apps/odr/components/UI/DropDown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ const DropDown = forwardRef<HTMLDivElement, Props>(({ dropDown }, ref) => {
5555
state === 'entering'
5656
? `animate-dropDown`
5757
: state === 'entered'
58-
? 'scale-y-100 opacity-100'
59-
: 'animate-dropDownExit'
58+
? 'scale-y-100 opacity-100'
59+
: 'animate-dropDownExit'
6060
}
6161
`}
6262
>

‎apps/odr/components/header/menu/MegaMenu/MegaMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ const MegaMenu = () => {
4949
state === 'entering'
5050
? 'animate-fadeEntering'
5151
: state === 'entered'
52-
? 'opacity-100'
53-
: 'animate-fadeExit'
52+
? 'opacity-100'
53+
: 'animate-fadeExit'
5454
}
5555
`}
5656
onClick={closeMegaMenuHandler}

‎apps/odr/components/header/menu/SideBarMenu/SideBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ const SideBar = () => {
4444
state === 'entering'
4545
? 'animate-fadeEntering'
4646
: state === 'entered'
47-
? 'opacity-100'
48-
: 'animate-fadeExit'
47+
? 'opacity-100'
48+
: 'animate-fadeExit'
4949
}
5050
`}
5151
onClick={closeNav}

‎apps/odr/components/header/menu/SideBarMenu/SideNav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const SideNav = forwardRef<HTMLDivElement, Props>(({ state, onClose }, ref) => {
2222
state === 'entering'
2323
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
2424
: state === 'entered'
25-
? 'translate-x-0'
26-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
25+
? 'translate-x-0'
26+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
2727
}
2828
`}
2929
>

‎apps/odr/components/header/menu/SideBarMenu/SideNavSide.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const SideNavSide = () => {
5252
state === 'entering'
5353
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
5454
: state === 'entered'
55-
? 'translate-x-0'
56-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
55+
? 'translate-x-0'
56+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
5757
}
5858
`}
5959
>

‎apps/odr/components/productList/ProductList.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ export const getTransformedDataFromOdrResponse = (scholarShips: ScholarshipSearc
291291
context: { transactionId, bppId, bppUri },
292292
scholarshipProviders
293293
} = platformData
294-
294+
if (!scholarshipProviders) break
295295
for (const provider of scholarshipProviders) {
296296
const { id: providerId, name: providerName, items, images: providerImages, longDesc: providerDesc } = provider
297297

‎apps/osm/components/UI/DropDown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const DropDown = forwardRef<HTMLDivElement, Props>(({ dropDown }, ref) => {
5959
state === 'entering'
6060
? `animate-dropDown`
6161
: state === 'entered'
62-
? 'scale-y-100 opacity-100'
63-
: 'animate-dropDownExit'
62+
? 'scale-y-100 opacity-100'
63+
: 'animate-dropDownExit'
6464
}
6565
`}
6666
>

‎apps/osm/components/header/menu/MegaMenu/MegaMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const MegaMenu = () => {
5353
state === 'entering'
5454
? 'animate-fadeEntering'
5555
: state === 'entered'
56-
? 'opacity-100'
57-
: 'animate-fadeExit'
56+
? 'opacity-100'
57+
: 'animate-fadeExit'
5858
}
5959
`}
6060
onClick={closeMegaMenuHandler}

‎apps/osm/components/header/menu/SideBarMenu/SideBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const SideBar = () => {
4848
state === 'entering'
4949
? 'animate-fadeEntering'
5050
: state === 'entered'
51-
? 'opacity-100'
52-
: 'animate-fadeExit'
51+
? 'opacity-100'
52+
: 'animate-fadeExit'
5353
}
5454
`}
5555
onClick={closeNav}

‎apps/osm/components/header/menu/SideBarMenu/SideNav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const SideNav = forwardRef<HTMLDivElement, Props>(({ state, onClose }, ref) => {
2222
state === 'entering'
2323
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
2424
: state === 'entered'
25-
? 'translate-x-0'
26-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
25+
? 'translate-x-0'
26+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
2727
}
2828
`}
2929
>

‎apps/osm/components/header/menu/SideBarMenu/SideNavSide.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const SideNavSide = () => {
5252
state === 'entering'
5353
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
5454
: state === 'entered'
55-
? 'translate-x-0'
56-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
55+
? 'translate-x-0'
56+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
5757
}
5858
`}
5959
>

‎apps/playground/components/UI/DropDown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const DropDown = forwardRef<HTMLDivElement, Props>(({ dropDown }, ref) => {
5959
state === 'entering'
6060
? `animate-dropDown`
6161
: state === 'entered'
62-
? 'scale-y-100 opacity-100'
63-
: 'animate-dropDownExit'
62+
? 'scale-y-100 opacity-100'
63+
: 'animate-dropDownExit'
6464
}
6565
`}
6666
>

‎apps/playground/components/header/menu/MegaMenu/MegaMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const MegaMenu = () => {
5353
state === 'entering'
5454
? 'animate-fadeEntering'
5555
: state === 'entered'
56-
? 'opacity-100'
57-
: 'animate-fadeExit'
56+
? 'opacity-100'
57+
: 'animate-fadeExit'
5858
}
5959
`}
6060
onClick={closeMegaMenuHandler}

‎apps/playground/components/header/menu/SideBarMenu/SideBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const SideBar = () => {
4848
state === 'entering'
4949
? 'animate-fadeEntering'
5050
: state === 'entered'
51-
? 'opacity-100'
52-
: 'animate-fadeExit'
51+
? 'opacity-100'
52+
: 'animate-fadeExit'
5353
}
5454
`}
5555
onClick={closeNav}

‎apps/playground/components/header/menu/SideBarMenu/SideNav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const SideNav = forwardRef<HTMLDivElement, Props>(({ state, onClose }, ref) => {
2222
state === 'entering'
2323
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
2424
: state === 'entered'
25-
? 'translate-x-0'
26-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
25+
? 'translate-x-0'
26+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
2727
}
2828
`}
2929
>

‎apps/playground/components/header/menu/SideBarMenu/SideNavSide.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const SideNavSide = () => {
5252
state === 'entering'
5353
? 'ltr:animate-sidenavLTREntering rtl:animate-sidenavRTLEntering'
5454
: state === 'entered'
55-
? 'translate-x-0'
56-
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
55+
? 'translate-x-0'
56+
: 'ltr:animate-sidenavLTRExit rtl:animate-sidenavRTLExit'
5757
}
5858
`}
5959
>

‎apps/regen-agri/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "next/core-web-vitals"
2+
"extends": "next/core-web-vitals"
33
}

0 commit comments

Comments
 (0)