Skip to content

Commit

Permalink
Merge pull request #1584 from Plant-for-the-Planet-org/develop
Browse files Browse the repository at this point in the history 
Release October 26th, 2022
  • Loading branch information
@mariahosfeld
mariahosfeld committed Oct 26, 2022
2 parents b56bba0 + eafd748 commit 6c34754
Show file tree
Hide file tree
Showing 170 changed files with 9,179 additions and 8,028 deletions.
16 changes: 16 additions & 0 deletions .eslintrc.js
View file
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
View file

Large diffs are not rendered by default.

55 changes: 29 additions & 26 deletions pages/_app.tsx
View file
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

1 comment on commit 6c34754

@vercel
Copy link

@vercel vercel bot commented on 6c34754 Oct 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

planet-webapp – ./

planet-webapp-git-main-planetapp.vercel.app
planet-webapp-planetapp.vercel.app
globalforest.vercel.app
www1.plant-for-the-planet.org

Please sign in to comment.