Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
480ddf7
added conservation page and button
rishsingh07 Nov 25, 2021
b271fb7
created new files for conservation forms
rishsingh07 Nov 29, 2021
521ac8f
updated fields according to the api requests
rishsingh07 Nov 30, 2021
bea0564
added submit button, changed few paths, added two buttons to add proj…
rishsingh07 Dec 9, 2021
cec291a
still in progress
rishsingh07 Dec 9, 2021
d6120e9
optimised code, implied both forms in one page and file, did few css …
rishsingh07 Dec 22, 2021
a3f0b3b
turned vertical forms into linear ones
rishsingh07 Jan 7, 2022
4d39068
resolved onflicts
rishsingh07 Jan 7, 2022
9278085
translation fixed
rishsingh07 Jan 10, 2022
d08f7bd
invalid error bug solved and removed consoles
rishsingh07 Jan 11, 2022
7c77964
Merge branch 'develop' into feature/conservation_manageProjects
norbertschuler Jan 15, 2022
fbd09ba
removed extra components for conservation
rishsingh07 Jan 17, 2022
89fd8db
resolved conflict
rishsingh07 Jan 17, 2022
2812b34
detailed analysis form fixed
rishsingh07 Jan 18, 2022
bfa1848
removed extra files and codes
rishsingh07 Jan 20, 2022
c7e9df0
optimised code
rishsingh07 Jan 20, 2022
cf0ddab
purpose restoration to trees as per the api
rishsingh07 Jan 20, 2022
a029488
if country not present then no displaying country
rishsingh07 Jan 21, 2022
09c504b
resolved conflicts
rishsingh07 Jan 21, 2022
8f44715
coordinates validated, but wrong message is displaying,so will fix in…
rishsingh07 Jan 21, 2022
cc06d0c
validation message localised
rishsingh07 Jan 24, 2022
3371bf8
latlong coords issue fixed
rishsingh07 Jan 24, 2022
c0c2cf0
Merge branch 'develop' into feature/conservation_manageProjects
sagararyal Jan 25, 2022
c76a64f
wrapped step abel when in mobile view and aligned input fields
rishsingh07 Jan 31, 2022
e9cbe4e
project site input fix
rishsingh07 Jan 31, 2022
a7f5363
starting year error handled
rishsingh07 Feb 1, 2022
d980efd
added field descriptions in the info icon
rishsingh07 Feb 1, 2022
ef9de2e
error handling and starting protection year error display is fixed
rishsingh07 Feb 2, 2022
09f002a
handled NaN in conservation projects in project list
rishsingh07 Feb 2, 2022
882f1a5
error handled for planting density
rishsingh07 Feb 4, 2022
15c4c2b
ecosystem bug solved
rishsingh07 Feb 8, 2022
7e2df42
Merge branch 'develop' into feature/conservation_manageProjects
norbertschuler Feb 19, 2022
9c371a0
conservation manage
sunilsabatp Mar 28, 2022
7662de4
worked on UI of manage project
sunilsabatp Apr 2, 2022
ff923a0
created a new component
sunilsabatp Apr 3, 2022
9768d2d
added the necessary textfield into the conservation form
sunilsabatp Apr 4, 2022
a3be94d
worked on conservation form new fields
sunilsabatp Apr 6, 2022
002c287
Merge branch 'develop' into feature/conservation_manageProjects
sunilsabatp Apr 6, 2022
a9114c7
Merge branch 'develop' into feature/conservation_manageProjects
sunilsabatp Apr 6, 2022
19bab34
added limitation to basic detail form
sunilsabatp Apr 7, 2022
aec44fd
moved publish project field to final stage of form
sunilsabatp Apr 8, 2022
7593222
add mui 5
Shreyaschorge Apr 12, 2022
51fc007
Updates CssBaseline Component to v5 and adds dependencies
Shreyaschorge Apr 12, 2022
a3d1d0d
update Filters component to MUI 5 for
mohitb35 Apr 12, 2022
39a9a53
update SearchBar component to MUI5
mohitb35 Apr 12, 2022
898c157
update SingleProjectDetails to MUI5
mohitb35 Apr 12, 2022
6af63ce
Change ServerStyleSheet import
Shreyaschorge Apr 13, 2022
ab37e91
Upgrades Cancel Donation Form Components to v5
Shreyaschorge Apr 13, 2022
83f6ba0
Upgrade CircularProgress to v5
Shreyaschorge Apr 13, 2022
aeee63c
created new screen file for routes in edit project
sunilsabatp Apr 13, 2022
b94c197
Fix CircularProgress import
Shreyaschorge Apr 13, 2022
5d947e9
Remove old donation code
Shreyaschorge Apr 13, 2022
10a4020
Upgrade ReactivateModal Components to v5
Shreyaschorge Apr 13, 2022
eefbed3
Upgrade Components of PauseModal to v5
Shreyaschorge Apr 13, 2022
a326698
Upgrade EditDonation Components and MaterialTextField Component to v5
Shreyaschorge Apr 13, 2022
7936e7b
restrict the tab access on certain route
sunilsabatp Apr 13, 2022
9ec4d25
Remove Unused Code
Shreyaschorge Apr 14, 2022
b704019
Upgrade ToggleSwitvh Componenet to v5
Shreyaschorge Apr 14, 2022
a9bea7c
Get color from theme in ToggleSwitch Component
Shreyaschorge Apr 14, 2022
207b765
Upgrade LinearProgress Componenet to v5
Shreyaschorge Apr 14, 2022
227207f
Upgrade Components SelectLanguageAndCountry to v5
Shreyaschorge Apr 14, 2022
8e73950
Upgrade Components in Explore to v5
Shreyaschorge Apr 14, 2022
3de1470
Upgrade Components in ImageDropdown and SitesDropdown to v5
Shreyaschorge Apr 14, 2022
48e6dde
Upgrade components in Stats to v5
Shreyaschorge Apr 14, 2022
116a1cd
Add babel and eslint configurations
Shreyaschorge Apr 18, 2022
c22d7c0
Upgrade Components in CopyToClipboard and Embeded Modal to v5
Shreyaschorge Apr 18, 2022
5cd8053
Upgrade Components of RedeemModal to v5
Shreyaschorge Apr 18, 2022
74ab050
Upgrade Componets in [code] to v5
Shreyaschorge Apr 18, 2022
2791227
Upgrade Components in AddTargetModal to v5
Shreyaschorge Apr 18, 2022
8e2bd6a
Upgrade Components in setting modal to v5
Shreyaschorge Apr 18, 2022
c1f9d76
Upgrade Components in PlantingLocation to v5
Shreyaschorge Apr 18, 2022
04fdcdc
Upgrade Components in EditProfile to v5
Shreyaschorge Apr 18, 2022
8b476ae
Upgrade Components in RegisterTrees to v5
Shreyaschorge Apr 18, 2022
1ee6005
Replace import of mui-latest to @mui/material
Shreyaschorge Apr 18, 2022
379fcc9
Upgrade Autocomplete to v5
Shreyaschorge Apr 19, 2022
57c37ec
Upgrade Step Stepper and StepLabel to v5
Shreyaschorge Apr 19, 2022
203bff6
Upgrade CircularProgress in TreeCounter to v5 and remove makeStyles
Shreyaschorge Apr 19, 2022
bc2e5b5
Fix input varient in searchBar
Shreyaschorge Apr 19, 2022
e57d5e5
Fix Step styles
Shreyaschorge Apr 19, 2022
365fc34
Use makeStyle from mui/styles
Shreyaschorge Apr 20, 2022
0156f04
Upgrade components in CompleteSignup to v5
Shreyaschorge Apr 20, 2022
3c14d79
Upgrade components in BootstrapInput to v5
Shreyaschorge Apr 20, 2022
921c11c
Upgrade components in SampleTreeCard to v5
Shreyaschorge Apr 20, 2022
efcb6f4
Upgrade DatePicker to v5
Shreyaschorge Apr 21, 2022
11a62bf
Remove unused packages
Shreyaschorge Apr 21, 2022
fa25d59
Fix last commit
Shreyaschorge Apr 21, 2022
a5fd555
Merge branch 'feature/upgrade-to-mui-5' of https://github.com/Plant-f…
Shreyaschorge Apr 21, 2022
edb37f4
Fix last commit
Shreyaschorge Apr 21, 2022
265bb8d
Add development env
Shreyaschorge Apr 21, 2022
3e12720
Resolve confilcts
Shreyaschorge Apr 21, 2022
b6be292
Upgrade components in ProjectSpending to v5
Shreyaschorge Apr 21, 2022
271f1fa
Upgrade components in ProjectSites to v5
Shreyaschorge Apr 21, 2022
a463fb9
Upgrade mui components in ProjectCertificate to v5
Shreyaschorge Apr 21, 2022
07ac03f
Upgrade mui components in BasicDetails to v5
Shreyaschorge Apr 21, 2022
bb5f6d1
Upgrade mui components in DetailedAnalysis to v5
Shreyaschorge Apr 21, 2022
3fe472e
Upgrade mui components in ManageProjects to v5
Shreyaschorge Apr 21, 2022
9486ab7
Add Mui ThemeProvider at app level
Shreyaschorge Apr 22, 2022
8d83bfa
Remove Mui v4 dependency
Shreyaschorge Apr 22, 2022
48cc7a4
add validation to project spending
sunilsabatp Apr 24, 2022
1663525
Merge branch 'feature/conservation_manageProjects' of https://github.…
sunilsabatp Apr 24, 2022
e15d204
fix the api key of restoration form and remove the console
sunilsabatp Apr 25, 2022
89a0799
fix the routes for restoration form
sunilsabatp Apr 28, 2022
3f6e392
fix the switch of detailAnalysis
sunilsabatp May 1, 2022
93ad7fb
publish project switch made visible after review submit
sunilsabatp May 2, 2022
6ff464f
fix the route of restoration and conservation form
sunilsabatp May 2, 2022
100404a
fix the Back Arrow button width and color
sunilsabatp May 2, 2022
4933547
fix the alignment of Tab
sunilsabatp May 3, 2022
5338c28
add exit button to review
sunilsabatp May 3, 2022
b07a753
fix the minor bugs of restoration and conservation form
sunilsabatp May 4, 2022
bfda649
remove site status field from conservation form
sunilsabatp May 5, 2022
7da6ddc
add loader to projectContainer
sunilsabatp May 5, 2022
5221ecd
responsive of conservation form and restoration form
sunilsabatp May 9, 2022
899022f
Restore fontSize, lineHeight and letterSpacing
Shreyaschorge May 9, 2022
7ea3908
fix the API and responsive of conservation and restoration form
sunilsabatp May 9, 2022
d9a7bb9
Merge branch 'feature/conservation_manageProjects' of https://github.…
sunilsabatp May 9, 2022
d9fd4b3
fix the bugs of breaking UI after manuall relode
sunilsabatp May 10, 2022
1bc4fa9
Add null checks for projectMeta
Shreyaschorge May 10, 2022
6c747ba
Merge branch 'feature/conservation_manageProjects' of https://github.…
Shreyaschorge May 10, 2022
a770101
fix the API key of conservation form
sunilsabatp May 10, 2022
d404da6
Merge branch 'feature/conservation_manageProjects' of https://github.…
sunilsabatp May 10, 2022
e57fdd7
Fix Alert Color
Shreyaschorge May 10, 2022
ef102fa
Merge branch 'feature/conservation_manageProjects' of https://github.…
Shreyaschorge May 10, 2022
61eed94
fix metadata of conservation form
sunilsabatp May 11, 2022
7419980
Merge branch 'feature/conservation_manageProjects' of https://github.…
sunilsabatp May 11, 2022
8d66b81
Fixed formatting issue
Shreyaschorge May 11, 2022
81bb7a5
Merge branch 'feature/conservation_manageProjects' of https://github.…
Shreyaschorge May 11, 2022
df56228
allow the decimal values for certain input
sunilsabatp May 12, 2022
489e8ba
Merge branch 'feature/conservation_manageProjects' of https://github.…
sunilsabatp May 12, 2022
e4d76e2
Remove Unused code
Shreyaschorge May 13, 2022
7e34a6d
change API keys of project manage
sunilsabatp May 13, 2022
9fc40cb
Merge branch 'feature/conservation_manageProjects' of https://github.…
sunilsabatp May 13, 2022
8964d60
Revert "fix: remove duplicate main challenge"
sunilsabatp May 13, 2022
0bec5fe
Revert "Merge pull request #1477 from Plant-for-the-Planet-org/Fix/ex…
sunilsabatp May 13, 2022
b0dc970
Revert "Merge pull request #1476 from Plant-for-the-Planet-org/featur…
sunilsabatp May 13, 2022
eb260df
Merge branch 'Fix/project_meta' into feature/conservation_manageProjects
sunilsabatp May 13, 2022
9433ce8
disable explore for single project
sunilsabatp May 13, 2022
75c6e1c
Update ToggleSwitch.tsx
sagararyal May 14, 2022
ebb03b2
add visitorAssistance api key into metadata
sunilsabatp May 16, 2022
58b4cab
add status field to project sites for conservation form
sunilsabatp May 18, 2022
2ac1c15
add metadata for single project
sunilsabatp May 18, 2022
94965fc
change the name of label for status field
sunilsabatp May 18, 2022
9a1eacb
fix the value of status field
sunilsabatp May 19, 2022
effba5a
fix the layout for manage project
sunilsabatp May 19, 2022
976b2c5
fix the responsiveness for manage project
sunilsabatp May 19, 2022
6133231
Remove disableShrink attribute
Shreyaschorge May 19, 2022
63f2dad
Merge branch 'feature/conservation_manageProjects' of https://github.…
Shreyaschorge May 19, 2022
b69f43b
fix the metadata for single project
sunilsabatp May 19, 2022
4177b88
Merge branch 'feature/conservation_manageProjects' of https://github.…
sunilsabatp May 19, 2022
4f1948f
enable donation and feature for single project based on condition
sunilsabatp May 20, 2022
35fcef2
fix firstTreePlanted api for view of single project
sunilsabatp May 20, 2022
ed94f6e
error handling for manage project
sunilsabatp May 20, 2022
5510c10
Merge branch 'develop' into feature/conservation_manageProjects
sagararyal May 20, 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
6 changes: 2 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"presets": [
"next/babel"
]
}
"presets": ["next/babel"]
}
3 changes: 0 additions & 3 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
## Development Defaults
## Used by `next dev` or `npm run dev`
## Overridded by the ones set in Vercel

## For running development builds on local use - `.env.development.local`

## `.env.development` stays in git with default or empty values

API_ENDPOINT=app-development.plant-for-the-planet.org
AUTH0_CUSTOM_DOMAIN=pftp.eu.auth0.com
AUTH0_CLIENT_ID=yxABVrSIbmSO6QeTfZjkJefDnW2vrE7y
Expand Down
7 changes: 6 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = {
plugins: [
'react',
'@typescript-eslint',
'@emotion'
],
rules: {
'react/react-in-jsx-scope': 'off',
Expand All @@ -36,7 +37,11 @@ module.exports = {
'@typescript-eslint/no-empty-function': 'off',
'no-empty-pattern': 'off',
'react/display-name': 'off',
'react/no-find-dom-node': 'off'
'react/no-find-dom-node': 'off',
"@emotion/jsx-import": "error",
"@emotion/no-vanilla": "error",
"@emotion/import-from-emotion": "error",
"@emotion/styled-import": "error"
},
globals: {
React: 'writable',
Expand Down
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"semi": true,
"trailingComma": "es5",
"singleQuote": true,
"printWidth": 80,
"tabWidth": 2,
"useTabs": false
}
8 changes: 0 additions & 8 deletions .prettierrc.js

This file was deleted.

Loading