Skip to content

Commit

Permalink
merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyShimwa committed Jul 26, 2024
2 parents c8d62a3 + c75ab18 commit ea9616e
Show file tree
Hide file tree
Showing 41 changed files with 3,346 additions and 303 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ module.exports = {
'react/self-closing-comp': 0,
'react/jsx-props-no-spreading': 0,
'@typescript-eslint/no-explicit-any': 0,
'jsx-a11y/label-has-associated-control': 0,
'jsx-a11y/control-has-associated-label': 0,
'react/no-array-index-key': 0,
'no-nested-ternary': 0,
'no-param-reassign': [
'error',
{ props: true, ignorePropertyModificationsFor: ['state'] },
Expand Down
6 changes: 6 additions & 0 deletions .hintrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
{
"button-name": "off"
}
],
"axe/parsing": [
"default",
{
"duplicate-id-active": "off"
}
]
}
}
112 changes: 44 additions & 68 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@mui/material": "^5.16.4",
"@react-jvectormap/core": "^1.0.4",
"@react-jvectormap/world": "^1.1.2",
"@reduxjs/toolkit": "^2.2.5",
"@reduxjs/toolkit": "^2.2.6",
"@testing-library/user-event": "^14.5.2",
"@types/react-redux": "^7.1.33",
"@types/react-router-dom": "^5.3.3",
Expand Down Expand Up @@ -59,7 +59,7 @@
"yup": "^1.4.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@types/dotenv": "^8.2.0",
"@types/jest": "^29.5.12",
Expand All @@ -68,7 +68,7 @@
"@types/node": "^20.14.7",
"@types/react": "^18.3.3",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^18.2.22",
"@types/react-dom": "^18.3.0",
"@types/react-simple-maps": "^3.0.4",
"@types/react-slider": "^1.3.6",
"@types/redux-mock-store": "^1.0.6",
Expand Down
8 changes: 4 additions & 4 deletions src/__test__/Checkout/checkout.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ describe('checkoutSlice', () => {
it('should handle initial state', () => {
expect(store.getState().checkout).toEqual({
checkout: {
id: 31,
totalAmount: 160,
id: -1,
totalAmount: 0,
status: 'Pending',
couponCode: '',
deliveryInfo: {
Expand Down Expand Up @@ -91,7 +91,7 @@ describe('checkoutSlice', () => {
city: 'Anytown',
zip: '12345',
},
id: 31,
id: -1,
orderDetails: [
{
id: 41,
Expand All @@ -102,7 +102,7 @@ describe('checkoutSlice', () => {
paid: true,
paymentInfo: null,
status: 'Pending',
totalAmount: 160,
totalAmount: 0,
trackingNumber: 'Tr280585',
updatedAt: '2024-07-22T11:01:20.291Z',
},
Expand Down
Loading

0 comments on commit ea9616e

Please sign in to comment.