Merge pull request #64 from allanalves23/develop

Updates: Dependency updates
coder-mind-project · Jul 27, 2020 · 47ea0e7 · 47ea0e7
2 parents 0e3bf1e + dd60c08
commit 47ea0e7
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 65 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "react-google-invisible-recaptcha": "^0.2.11",
     "react-icons": "^3.7.0",
     "react-infinite-scroller": "^1.2.4",
-    "react-redux": "^7.1.0",
+    "react-redux": "^7.2.1",
     "react-router-dom": "^5.0.1",
     "react-scripts": "^3.3.0",
     "react-select": "^3.0.4",
@@ -60,12 +60,12 @@
     ]
   },
   "devDependencies": {
-    "eslint": "^6.8.0",
+    "eslint": "^6.6.0",
     "eslint-config-airbnb": "^18.0.1",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.18.3",
-    "eslint-plugin-react-hooks": "^1.7.0"
+    "eslint-plugin-react-hooks": "^4.0.8"
   }
 }
diff --git a/src/components/Articles/Article/ArticleImages.jsx b/src/components/Articles/Article/ArticleImages.jsx
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { articleType } from '@/types';
 
 import {
-  ExpansionPanel,
-  ExpansionPanelDetails,
+  Accordion,
+  AccordionDetails,
   Icon,
   Typography,
   Box,
@@ -25,7 +25,7 @@ import { bindActionCreators } from 'redux';
 import ArticleImage from './ArticleImage';
 
 import {
-  CustomExpansionPanelSummary,
+  CustomAccordionSummary,
   ArticleLogoArea,
   ArticleSecondaryImageArea,
   ArticleHeaderImageArea,
@@ -172,14 +172,14 @@ function ArticleImages(props) {
   ]);
 
   return (
-    <ExpansionPanel expanded={expanded}>
-      <CustomExpansionPanelSummary
+    <Accordion expanded={expanded}>
+      <CustomAccordionSummary
         onClick={toogleDetails}
         expandIcon={<Icon>expand_more</Icon>}
       >
         <Typography variant="h6" component="h2">Imagens</Typography>
-      </CustomExpansionPanelSummary>
-      <ExpansionPanelDetails>
+      </CustomAccordionSummary>
+      <AccordionDetails>
         <RemoveArticleImgDialog
           open={isOpenedRemoveDialog}
           onClose={removeImage}
@@ -265,8 +265,8 @@ function ArticleImages(props) {
             </Box>
           </ArticleHeaderImageArea>
         </Box>
-      </ExpansionPanelDetails>
-    </ExpansionPanel>
+      </AccordionDetails>
+    </Accordion>
   );
 }
 

diff --git a/src/components/Articles/Article/ArticleInfo.jsx b/src/components/Articles/Article/ArticleInfo.jsx
@@ -4,16 +4,16 @@ import { articleType } from '@/types';
 
 import { displayFullDate } from '@/config/masks';
 import {
-  ExpansionPanel,
-  ExpansionPanelDetails,
+  Accordion,
+  AccordionDetails,
   Icon,
   Typography,
   Box,
 } from '@material-ui/core';
 
 import CustomChip from '@/components/Chip.jsx';
 
-import { CustomExpansionPanelSummary } from './styles';
+import { CustomAccordionSummary } from './styles';
 
 function ArticleInfo(props) {
   const {
@@ -70,14 +70,14 @@ function ArticleInfo(props) {
   }
 
   return (
-    <ExpansionPanel expanded={expanded}>
-      <CustomExpansionPanelSummary
+    <Accordion expanded={expanded}>
+      <CustomAccordionSummary
         onClick={toogleDetails}
         expandIcon={<Icon>expand_more</Icon>}
       >
         <Typography variant="h6" component="h2">Informações</Typography>
-      </CustomExpansionPanelSummary>
-      <ExpansionPanelDetails>
+      </CustomAccordionSummary>
+      <AccordionDetails>
         <Box>
           <Box display="flex" alignItems="center" mb={1}>
             <Typography variant="body2" component="span">
@@ -124,8 +124,8 @@ function ArticleInfo(props) {
             </Typography>
           </Box>
         </Box>
-      </ExpansionPanelDetails>
-    </ExpansionPanel>
+      </AccordionDetails>
+    </Accordion>
   );
 }
 

diff --git a/src/components/Articles/Article/ArticleMoreOptions.jsx b/src/components/Articles/Article/ArticleMoreOptions.jsx
@@ -5,8 +5,8 @@ import { articleType } from '@/types';
 import { Redirect } from 'react-router-dom';
 
 import {
-  ExpansionPanel,
-  ExpansionPanelDetails,
+  Accordion,
+  AccordionDetails,
   Icon,
   Typography,
   TextField,
@@ -41,7 +41,7 @@ import { CustomTooltip } from '@/components/styles';
 import RemoveArticleDialog from '@/components/Articles/RemoveArticleDialog.jsx';
 import SectionDescription from './SectionDescription';
 
-import { CustomExpansionPanelSummary, BoxSocialMedia } from './styles';
+import { CustomAccordionSummary, BoxSocialMedia } from './styles';
 
 function ArticleMoreOptions(props) {
   const {
@@ -181,15 +181,15 @@ function ArticleMoreOptions(props) {
   }, [article, socialRepository, socialRepositoryType, socialVideo, socialVideoType, mounted]);
 
   return (
-    <ExpansionPanel expanded={expanded}>
-      <CustomExpansionPanelSummary
+    <Accordion expanded={expanded}>
+      <CustomAccordionSummary
         onClick={toogleDetails}
         expandIcon={<Icon>expand_more</Icon>}
       >
         <Typography variant="h6" component="h2">Mais opções</Typography>
-      </CustomExpansionPanelSummary>
+      </CustomAccordionSummary>
       {redirect && <Redirect to={redirect} />}
-      <ExpansionPanelDetails>
+      <AccordionDetails>
         <Box width="100%">
           <BoxSocialMedia>
             <CustomTooltip
@@ -362,8 +362,8 @@ function ArticleMoreOptions(props) {
             </Box>
           )}
         </Box>
-      </ExpansionPanelDetails>
-    </ExpansionPanel>
+      </AccordionDetails>
+    </Accordion>
   );
 }
 

diff --git a/src/components/Articles/Article/ArticleThemesAndCategories.jsx b/src/components/Articles/Article/ArticleThemesAndCategories.jsx
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import { appTheme, articleType } from '@/types';
 
 import {
-  ExpansionPanel,
+  Accordion,
   Box,
   Typography,
-  ExpansionPanelDetails,
+  AccordionDetails,
   Icon,
   Button,
 } from '@material-ui/core';
@@ -20,7 +20,7 @@ import { error } from '@/config/toasts';
 
 import CustomAsyncSelect from '@/components/AsyncSelect.jsx';
 
-import { CustomExpansionPanelSummary, CustomLink } from './styles';
+import { CustomAccordionSummary, CustomLink } from './styles';
 
 function ArticleThemesAndCategories(props) {
   const {
@@ -143,14 +143,14 @@ function ArticleThemesAndCategories(props) {
   }, [isSaved]);
 
   return (
-    <ExpansionPanel expanded={expanded}>
-      <CustomExpansionPanelSummary
+    <Accordion expanded={expanded}>
+      <CustomAccordionSummary
         onClick={toogleDetails}
         expandIcon={<Icon>expand_more</Icon>}
       >
         <Typography variant="h6" component="h2">Temas & Categorias</Typography>
-      </CustomExpansionPanelSummary>
-      <ExpansionPanelDetails>
+      </CustomAccordionSummary>
+      <AccordionDetails>
         <Box width="100%">
           <Box mb={2}>
             <CustomAsyncSelect
@@ -205,8 +205,8 @@ function ArticleThemesAndCategories(props) {
             )}
           </Box>
         </Box>
-      </ExpansionPanelDetails>
-    </ExpansionPanel>
+      </AccordionDetails>
+    </Accordion>
   );
 }
 
@@ -224,7 +224,6 @@ ArticleThemesAndCategories.defaultProps = {
   expanded: false,
 };
 
-
 const mapStateToProps = (state) => ({ themeApp: state.theme });
 const mapDispatchToProps = (dispatch) => bindActionCreators({ callToast: toastEmitter }, dispatch);
 

diff --git a/src/components/Articles/Article/styles.js b/src/components/Articles/Article/styles.js
@@ -5,7 +5,7 @@ import {
   Icon,
   Box,
   Paper,
-  ExpansionPanelSummary,
+  AccordionSummary,
 } from '@material-ui/core';
 
 import { devices, sizes } from '@/config/devices';
@@ -152,8 +152,8 @@ export const ArticleSettingsContent = styled(Box)({
   overflowX: 'hidden',
 });
 
-export const CustomExpansionPanelSummary = styled(ExpansionPanelSummary)({
-  '& .MuiExpansionPanelSummary-content': {
+export const CustomAccordionSummary = styled(AccordionSummary)({
+  '& .MuiAccordionSummary-content': {
     margin: '20px 0',
   },
 });

diff --git a/src/components/Users/MyAccount/CustomPanelSummary.jsx b/src/components/Users/MyAccount/CustomPanelSummary.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {
-  ExpansionPanelSummary,
+  AccordionSummary,
   Grid,
   Box,
   Icon,
@@ -24,7 +24,7 @@ function CustomPanelSummary(props) {
   } = props;
 
   return (
-    <ExpansionPanelSummary
+    <AccordionSummary
       expandIcon={(
         <Icon>
           {expandIcon}
@@ -51,7 +51,7 @@ function CustomPanelSummary(props) {
           )
         }
       </Grid>
-    </ExpansionPanelSummary>
+    </AccordionSummary>
   );
 }
 

diff --git a/src/components/Users/MyAccount/MyAccount.jsx b/src/components/Users/MyAccount/MyAccount.jsx
@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import { userType } from '@/types';
 import {
-  ExpansionPanel,
-  ExpansionPanelDetails,
+  Accordion,
+  AccordionDetails,
   Grid,
   Box,
   CircularProgress,
@@ -92,7 +92,7 @@ function MyAccount(props) {
       {userState && !loading
           && (
           <Grid item xs={12}>
-            <ExpansionPanel
+            <Accordion
               expanded={expanded === 'general_information'}
               onChange={handleChange('general_information')}
             >
@@ -102,11 +102,11 @@ function MyAccount(props) {
                 description="Dados gerais e essenciais para seu cadastro"
                 expanded={Boolean(expanded === 'general_information')}
               />
-              <ExpansionPanelDetails>
+              <AccordionDetails>
                 <GeneralInformation user={userState} />
-              </ExpansionPanelDetails>
-            </ExpansionPanel>
-            <ExpansionPanel
+              </AccordionDetails>
+            </Accordion>
+            <Accordion
               expanded={expanded === 'extra_information'}
               onChange={handleChange('extra_information')}
             >
@@ -116,11 +116,11 @@ function MyAccount(props) {
                 description="Informações complementares, estarão públicas para qualquer leitor"
                 expanded={Boolean(expanded === 'extra_information')}
               />
-              <ExpansionPanelDetails>
+              <AccordionDetails>
                 <ExtraInformation isActive={expanded === 'extra_information'} />
-              </ExpansionPanelDetails>
-            </ExpansionPanel>
-            <ExpansionPanel
+              </AccordionDetails>
+            </Accordion>
+            <Accordion
               expanded={expanded === 'configurations'}
               onChange={handleChange('configurations')}
             >
@@ -130,10 +130,10 @@ function MyAccount(props) {
                 description="Opções avançadas sobre sua conta e preferências"
                 expanded={Boolean(expanded === 'configurations')}
               />
-              <ExpansionPanelDetails>
+              <AccordionDetails>
                 <Configurations />
-              </ExpansionPanelDetails>
-            </ExpansionPanel>
+              </AccordionDetails>
+            </Accordion>
           </Grid>
           )
       }

diff --git a/src/config/axios.js b/src/config/axios.js
@@ -40,6 +40,6 @@ export function setAuthToken(newToken) {
 
 axios.interceptors.response.use(success, error);
 axios.defaults.baseURL = backendUrl;
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 20000;
 
 export default { setAuthToken };