Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
472aaca
package-lock.json
sunilsabatp Aug 9, 2022
5028fdc
feat: set up routes in profile
mohitb35 Aug 16, 2022
6347d88
feat: set up reusable tabbed view
mohitb35 Aug 16, 2022
5e32bd6
feat: configure tabbed view for manage payouts
mohitb35 Aug 16, 2022
abf25e9
feat: standardize form styles with StyledForm
mohitb35 Aug 16, 2022
497c3bf
feat: basic scaffolding for ManagePayouts
mohitb35 Aug 16, 2022
7627497
feat: create ui for payout schedule form
mohitb35 Aug 16, 2022
de99c36
feat: create ui for bank details form
mohitb35 Aug 17, 2022
5ecb745
feat: link up forms with react-hook-form
mohitb35 Aug 17, 2022
f6e63e8
feat: add error display to ReactHookFormSelect
mohitb35 Aug 18, 2022
cc31d46
feat: cleanup & handle errors for frequency select
mohitb35 Aug 18, 2022
520bc19
change the redeem endpoint in profile
sunilsabatp Aug 18, 2022
1d05fd7
feat: add placeholders where needed
mohitb35 Aug 18, 2022
2cc8d18
refactor: extract translations for managePayouts
mohitb35 Aug 18, 2022
f84e3bb
fix: change support link color
mohitb35 Aug 18, 2022
8a43ba0
fix the error message for redeem code
sunilsabatp Aug 22, 2022
fa20e79
fix codefactor error
sunilsabatp Aug 22, 2022
51f1942
removed unused entities
sunilsabatp Aug 22, 2022
0aad0ae
fix client-side exception issue
sunilsabatp Aug 23, 2022
b11c602
fix the button and validation for redeem modal
sunilsabatp Aug 25, 2022
f437e97
changed name of validate button
sunilsabatp Aug 26, 2022
9719b4e
pull the latest changes from remote
sunilsabatp Aug 26, 2022
50140c4
fix redeem modal
sunilsabatp Aug 31, 2022
78687a8
added button for successful redeem modal
sunilsabatp Sep 1, 2022
893b853
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Sep 2, 2022
24b3e99
merged develop
sunilsabatp Sep 2, 2022
7684044
fix codefactor suggested error
sunilsabatp Sep 2, 2022
9a1a8e3
defined type for data
sunilsabatp Sep 2, 2022
bb2ecad
defined type for userProfile
sunilsabatp Sep 2, 2022
42bf253
added max planting density textfield
sunilsabatp Sep 3, 2022
47781cb
feat: update page routes and tab navigation
mohitb35 Sep 5, 2022
7bddcba
feat: minor ui updates to forms
mohitb35 Sep 7, 2022
129089d
feat: populate PayoutScheduleForm from user data
mohitb35 Sep 7, 2022
7870f4d
feat: handle APIs to save payout info
mohitb35 Sep 7, 2022
0c040be
feat: handle processing state for Save button
mohitb35 Sep 7, 2022
676e360
feat: update BankDetailsForm UI
mohitb35 Sep 9, 2022
21d7ca7
feat: populate currency selector
mohitb35 Sep 9, 2022
7104231
feat: update validations for BankDetailsForm
mohitb35 Sep 12, 2022
b475d04
feat: handle api call to create account
mohitb35 Sep 12, 2022
a19a391
Merge branch 'develop' into feature/manage-payouts
mohitb35 Sep 13, 2022
3c41043
feat: show bank account creation success
mohitb35 Sep 13, 2022
2591f2a
feat: show save success message for schedule
mohitb35 Sep 13, 2022
52a5266
feat: set up PayoutsContext
mohitb35 Sep 13, 2022
ca02267
feat: fetch accounts
mohitb35 Sep 13, 2022
da4c1c6
fix the redeem code through route
sunilsabatp Sep 14, 2022
22cb635
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Sep 14, 2022
1ae2a8c
refactor: remove * (reqd. fields) from translation
mohitb35 Sep 14, 2022
4032b25
feat: create bank account list ui
mohitb35 Sep 14, 2022
e5645ea
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Sep 15, 2022
2e11b8b
feat: add loading effects for account list
mohitb35 Sep 15, 2022
49f78a7
feat: handle no bank account scenario
mohitb35 Sep 15, 2022
293e6f1
fix: don't send clean object while saving account
mohitb35 Sep 15, 2022
ea9ae0b
refactor: clean up Overview.tsx
mohitb35 Sep 15, 2022
f6e9d38
feat: add Edit Bank Details page
mohitb35 Sep 15, 2022
e053c1f
refactor: update component names
mohitb35 Sep 15, 2022
938d20b
chore: update eslint to allow unused vars with _
mohitb35 Sep 15, 2022
94b53c2
refactor: remove redundant null check
mohitb35 Sep 15, 2022
8786e74
feat: show Edit form with populated data
mohitb35 Sep 15, 2022
4a13150
feat: call /minPayoutAmounts if not called before
mohitb35 Sep 15, 2022
a86cc80
refactor: update structure of ManagePayouts
mohitb35 Sep 16, 2022
3f49d68
fix: prevent empty currency field in Edit Form
mohitb35 Sep 16, 2022
40bd3e2
new route to redeem code
sunilsabatp Sep 16, 2022
3467197
refactor: move submit logic out of BankDetailsForm
mohitb35 Sep 16, 2022
ba2f925
feat: set up ApiCustomError interface
mohitb35 Sep 16, 2022
fc510f1
feat: handle API to update bank account details
mohitb35 Sep 16, 2022
cc9487d
feat: stronger types while handling API responses
mohitb35 Sep 16, 2022
055b5fd
fix: resolve module not found for isApiCustomError
mohitb35 Sep 16, 2022
0519df8
fixed the route
sunilsabatp Sep 17, 2022
5afb945
removed loaduser from redeemmodal
sunilsabatp Sep 17, 2022
8df3f0f
center map
prachigarg19 Sep 19, 2022
a230235
replace dependency and condition
prachigarg19 Sep 19, 2022
6deb008
Revert "replace dependency and condition"
prachigarg19 Sep 19, 2022
cf37c04
change dependency and condition to center map
prachigarg19 Sep 19, 2022
981efdf
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Sep 19, 2022
42d2146
improve condition
prachigarg19 Sep 19, 2022
b6227a7
feat: show Manage Payouts in menu for tpo only
mohitb35 Sep 20, 2022
de7093f
defined type
sunilsabatp Sep 20, 2022
d00b4ad
feat: redirect non tpo accounts from manage a/c
mohitb35 Sep 20, 2022
dd82cec
feat: add min payout to BankAccountDetails
mohitb35 Sep 20, 2022
d4b8103
feat: add navigation from Manage Projects
mohitb35 Sep 20, 2022
64b3e62
fix: set default scheduleFrequency 'manual'
mohitb35 Sep 20, 2022
28e298a
preserve coordinates when we return from single project page
prachigarg19 Sep 20, 2022
50ec425
refactor: remove magic strings
mohitb35 Sep 21, 2022
a1d5342
clean up code
sunilsabatp Sep 21, 2022
81bfe18
fixed the structure of redeem modal
sunilsabatp Sep 21, 2022
dd3a513
handle another code
sunilsabatp Sep 22, 2022
4fe89a2
fixed the old route for to redeem code
sunilsabatp Sep 23, 2022
0a04fe1
fix the same code issue
sunilsabatp Sep 23, 2022
69a73be
fix same code issue for old route redeem code
sunilsabatp Sep 23, 2022
8f29ba8
typescript of redeemCode data
sunilsabatp Sep 26, 2022
70dcadc
made maxPlantingDensity optional
sunilsabatp Sep 26, 2022
8ecddb1
refactor: minor cleanup
mohitb35 Sep 26, 2022
25b4319
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Sep 26, 2022
ab045bc
fix: remove holderType from Add/Edit Bank A/C req.
mohitb35 Sep 27, 2022
573e8ca
Merge branch 'develop' into feature/manage-payouts
mohitb35 Sep 27, 2022
17ac72b
fix: update tab setup to work after merge
mohitb35 Sep 27, 2022
bfbc909
fix: update styles after merge commit
mohitb35 Sep 27, 2022
47bbec9
refactor: remove unused FormSteps component
mohitb35 Sep 27, 2022
b324850
fix: prevent double render of TabSteps
mohitb35 Sep 27, 2022
2545c2d
fix: prevent reload of DashboardView on tab change
mohitb35 Sep 27, 2022
54059bc
removed inline style from detailanalysis form
sunilsabatp Sep 29, 2022
7f71fea
resolved merged conflicts
sunilsabatp Sep 29, 2022
47c7b73
fix: send "" for payoutMinAmount for default a/c
mohitb35 Sep 29, 2022
d15a3e9
fix structure of modal
sunilsabatp Sep 29, 2022
a2a8aac
cleaned up the repetitive code
sunilsabatp Sep 29, 2022
a873daf
feat: always show signup form for logged in user
mohitb35 Sep 30, 2022
ff1eb98
feat: show space after end of form
mohitb35 Sep 30, 2022
05c3d0b
fix: make form fields responsive
mohitb35 Sep 30, 2022
bc6d6f6
Revert "feat: always show signup form for logged in user"
mohitb35 Sep 30, 2022
10fad90
style: remove console logs
mohitb35 Oct 4, 2022
fd789f7
refactor: remove inline styles for CTA buttons
mohitb35 Oct 4, 2022
b767573
Merge pull request #1554 from Plant-for-the-Planet-org/feature/redeem…
mariahosfeld Oct 4, 2022
8ef4028
Merge pull request #1570 from Plant-for-the-Planet-org/feature/center…
mariahosfeld Oct 4, 2022
c163b7f
increase padding
prachigarg19 Oct 5, 2022
c6ef347
fixed layout and validation for maxplanting density
sunilsabatp Oct 5, 2022
354b3fb
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Oct 5, 2022
e15c7aa
merged develop
sunilsabatp Oct 5, 2022
c6812a3
code factor raised error
sunilsabatp Oct 5, 2022
d0ffa0f
package-lock json
sunilsabatp Oct 5, 2022
9556e7d
downgraded @react/type
sunilsabatp Oct 5, 2022
8d754fa
Merge pull request #1578 from Plant-for-the-Planet-org/feature/comple…
mariahosfeld Oct 5, 2022
9c8fb67
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Oct 6, 2022
7fc381e
Merge pull request #1552 from Plant-for-the-Planet-org/feature/manage…
mariahosfeld Oct 6, 2022
afd9b83
Merge branch 'develop' of https://github.com/Plant-for-the-Planet-org…
sunilsabatp Oct 6, 2022
6b5b039
resolve merge conflict
sunilsabatp Oct 6, 2022
4caad78
Merge pull request #1561 from Plant-for-the-Planet-org/feature/maxDen…
mariahosfeld Oct 6, 2022
f250dce
clean up the code
sunilsabatp Oct 7, 2022
c6e38b3
resolve conflict
sunilsabatp Oct 7, 2022
450e711
defined type and refactor the code
sunilsabatp Oct 9, 2022
812a6b1
fix the route
sunilsabatp Oct 9, 2022
75d799b
fix codefactors raised error
sunilsabatp Oct 10, 2022
cfa5c30
Merge pull request #1568 from Plant-for-the-Planet-org/feature/new_ro…
mariahosfeld Oct 12, 2022
ce70552
Language update from LingoHub 🤖
norbertschuler Oct 12, 2022
194f17c
fix after login redeem process issue
sunilsabatp Oct 13, 2022
cec73f4
Merge pull request #1582 from Plant-for-the-Planet-org/feature/paddin…
mariahosfeld Oct 13, 2022
bb3215c
user check for redeem modal
sunilsabatp Oct 20, 2022
24e3d7b
Merge pull request #1588 from Plant-for-the-Planet-org/lingohub_langu…
mariahosfeld Oct 20, 2022
b598f4b
user check to new route redeem modal
sunilsabatp Oct 20, 2022
eafd748
Merge pull request #1589 from Plant-for-the-Planet-org/Fix/redeemCode…
mariahosfeld Oct 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,29 @@ module.exports = {
},
plugins: ['react', '@typescript-eslint', '@emotion', 'cypress'],
rules: {
// note you must disable the base rule as it can report incorrect errors
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': [
'warn', // or "error"
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^_',
},
],
'react/react-in-jsx-scope': 'off',
'react/jsx-props-no-spreading': 'off',
'no-use-before-define': 'off',
'react/jsx-filename-extension': [
1,
{ extensions: ['.js', '.jsx', '.tsx'] },
],
'react/no-unknown-property': [
2,
{
ignore: ['jsx', 'global'],
},
],
'react/jsx-indent': 'off',
'import/extensions': 'off',
'import/no-unresolved': 'off',
Expand Down
13,082 changes: 6,286 additions & 6,796 deletions package-lock.json

Large diffs are not rendered by default.

55 changes: 29 additions & 26 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { ThemeProvider as MuiThemeProvider } from '@mui/material';
import materialTheme from '../src/theme/themeStyles';
import QueryParamsProvider from '../src/features/common/Layout/QueryParamsContext';
import { PlanetCashProvider } from '../src/features/common/Layout/PlanetCashContext';
import { PayoutsProvider } from '../src/features/common/Layout/PayoutsContext';

const VideoContainer = dynamic(
() => import('../src/features/common/LandingVideo'),
Expand Down Expand Up @@ -223,32 +224,34 @@ export default function PlanetWeb({ Component, pageProps, err }: any) {
<QueryParamsProvider>
<UserPropsProvider>
<PlanetCashProvider>
<Layout>
<ProjectPropsProvider>
<BulkCodeProvider>
{isMap ? (
<>
{project ? (
<MapLayout />
) : projects ? (
<MapLayout />
) : null}
<div
style={
config.tenantName === 'planet' ||
config.tenantName === 'ttc'
? {}
: { display: 'none' }
}
>
<PlayButton setshowVideo={setshowVideo} />
</div>
</>
) : null}
<Component {...ProjectProps} />
</BulkCodeProvider>
</ProjectPropsProvider>
</Layout>
<PayoutsProvider>
<Layout>
<ProjectPropsProvider>
<BulkCodeProvider>
{isMap ? (
<>
{project ? (
<MapLayout />
) : projects ? (
<MapLayout />
) : null}
<div
style={
config.tenantName === 'planet' ||
config.tenantName === 'ttc'
? {}
: { display: 'none' }
}
>
<PlayButton setshowVideo={setshowVideo} />
</div>
</>
) : null}
<Component {...ProjectProps} />
</BulkCodeProvider>
</ProjectPropsProvider>
</Layout>
</PayoutsProvider>
</PlanetCashProvider>
</UserPropsProvider>
</QueryParamsProvider>
Expand Down
Loading