diff --git a/.eslintrc.json b/.eslintrc.json index abacd10..15c2854 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -22,5 +22,6 @@ "@typescript-eslint" ], "rules": { + "react/react-in-jsx-scope": "off" } } diff --git a/src/components/NotificationQuestionsCard/NotificationQuestionsCard.tsx b/src/components/NotificationQuestionsCard/NotificationQuestionsCard.tsx index 9938a23..19621bd 100644 --- a/src/components/NotificationQuestionsCard/NotificationQuestionsCard.tsx +++ b/src/components/NotificationQuestionsCard/NotificationQuestionsCard.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react' +import { useState } from 'react' import Image from 'next/image' import getAPIClient from '../../services/ssrApi'; import { FaqQuestionsCardBody, FaqQuestionsCardHeader, CommonQuestionsCardView } from './NotificationQuestionsCardView' diff --git a/src/components/accumulatedEconomyTitle/AccumulatedEconomyTitle.tsx b/src/components/accumulatedEconomyTitle/AccumulatedEconomyTitle.tsx index 381b263..e11cd3d 100644 --- a/src/components/accumulatedEconomyTitle/AccumulatedEconomyTitle.tsx +++ b/src/components/accumulatedEconomyTitle/AccumulatedEconomyTitle.tsx @@ -1,4 +1,3 @@ -import React from 'react' import { AccumulatedEconomyTitleView } from './AccumulatedEconomyTitleView' export default function AccumulatedEconomyTitle({value}: {value: string}) { diff --git a/src/components/administrativeHeader/AdministrativeHeader.tsx b/src/components/administrativeHeader/AdministrativeHeader.tsx index d72e521..6d8ed8a 100644 --- a/src/components/administrativeHeader/AdministrativeHeader.tsx +++ b/src/components/administrativeHeader/AdministrativeHeader.tsx @@ -4,7 +4,7 @@ import InputLabel from '@mui/material/InputLabel'; import MenuItem from '@mui/material/MenuItem'; import Select, { SelectChangeEvent } from '@mui/material/Select'; import TextField from '@mui/material/TextField'; -import React, { useState } from 'react' +import { useState } from 'react' import { AdministrativeHeaderView } from './AdministrativeHeaderView'; diff --git a/src/components/administrativeTables/ClientsTable.tsx b/src/components/administrativeTables/ClientsTable.tsx index 01453d7..8ea1290 100644 --- a/src/components/administrativeTables/ClientsTable.tsx +++ b/src/components/administrativeTables/ClientsTable.tsx @@ -10,7 +10,7 @@ import TablePagination from '@mui/material/TablePagination'; import TableRow from '@mui/material/TableRow'; import TableSortLabel from '@mui/material/TableSortLabel'; import { visuallyHidden } from '@mui/utils'; -import React, { useEffect, useState } from 'react'; +import { forwardRef, useEffect, useState } from 'react'; import Image from 'next/image'; @@ -43,7 +43,7 @@ const style = { p: 4, overflowY: 'scroll' }; -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref, ) { @@ -213,9 +213,8 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface ], "fields": ["unidade"], "distinct": true - }).then(res => setUnits(res.data.data)).catch(res => { - setOpenSnackError(true) - }) + }).then(res => setUnits(res.data.data)) + .catch(() => setOpenSnackError(true)) return units } diff --git a/src/components/administrativeTables/FaqTable.tsx b/src/components/administrativeTables/FaqTable.tsx index 9a6a0d7..aad0d6d 100644 --- a/src/components/administrativeTables/FaqTable.tsx +++ b/src/components/administrativeTables/FaqTable.tsx @@ -17,7 +17,7 @@ import TableRow from '@mui/material/TableRow'; import TableSortLabel from '@mui/material/TableSortLabel'; import { visuallyHidden } from '@mui/utils'; import { GetServerSideProps } from 'next'; -import React, { useEffect, useState } from 'react'; +import { useEffect, useState } from 'react'; import getAPIClient from '../../services/ssrApi'; import { TableView, StyledStatus } from './TableView'; diff --git a/src/components/administrativeTables/NotificationsTable.tsx b/src/components/administrativeTables/NotificationsTable.tsx index 345be97..4bdd5ba 100644 --- a/src/components/administrativeTables/NotificationsTable.tsx +++ b/src/components/administrativeTables/NotificationsTable.tsx @@ -19,7 +19,7 @@ import Toolbar from '@mui/material/Toolbar'; import Tooltip from '@mui/material/Tooltip'; import Typography from '@mui/material/Typography'; import { visuallyHidden } from '@mui/utils'; -import React, { useState, useEffect } from 'react'; +import { useState, useEffect } from 'react'; import { TableView, StyledStatus } from './TableView'; diff --git a/src/components/banner/Banner.tsx b/src/components/banner/Banner.tsx index 0fef8e4..5c3f6ef 100644 --- a/src/components/banner/Banner.tsx +++ b/src/components/banner/Banner.tsx @@ -1,4 +1,3 @@ -import React from 'react' import Image from 'next/image' import { BannerView } from './BannerView' diff --git a/src/components/buttonGroup/ButtonGroup.tsx b/src/components/buttonGroup/ButtonGroup.tsx index ba949e4..74e179a 100644 --- a/src/components/buttonGroup/ButtonGroup.tsx +++ b/src/components/buttonGroup/ButtonGroup.tsx @@ -1,11 +1,10 @@ -import React from 'react' - import ToggleButton from '@mui/material/ToggleButton'; import ToggleButtonGroup from '@mui/material/ToggleButtonGroup'; import { ButtonGroupView } from './ButtonGroupView'; +import { useState } from 'react'; export default function ButtonGroup() { - const [timeCourse, setTimeCourse] = React.useState('Mensal'); + const [timeCourse, setTimeCourse] = useState('Mensal'); const handleAlignment = ( event: React.MouseEvent, diff --git a/src/components/buttons/basicButton/BasicButton.tsx b/src/components/buttons/basicButton/BasicButton.tsx index a7280f8..9a49b50 100644 --- a/src/components/buttons/basicButton/BasicButton.tsx +++ b/src/components/buttons/basicButton/BasicButton.tsx @@ -1,5 +1,3 @@ -import React from 'react' - import { BasicButtonView } from './BasicButtonView' interface BasicButtonInterface { diff --git a/src/components/buttons/faqButton/FaqButton1.tsx b/src/components/buttons/faqButton/FaqButton1.tsx index 2547ab8..549629b 100644 --- a/src/components/buttons/faqButton/FaqButton1.tsx +++ b/src/components/buttons/faqButton/FaqButton1.tsx @@ -1,5 +1,3 @@ -import React from 'react' - import { FaqButtonView1 } from './FaqButtonView1' interface FaqButtonInterface { diff --git a/src/components/buttons/faqButton/FaqButton2.tsx b/src/components/buttons/faqButton/FaqButton2.tsx index a160bd8..3f5495a 100644 --- a/src/components/buttons/faqButton/FaqButton2.tsx +++ b/src/components/buttons/faqButton/FaqButton2.tsx @@ -1,5 +1,3 @@ -import React from 'react' - import { FaqButtonView2 } from './FaqButtonView2' interface FaqButtonInterface { diff --git a/src/components/buttons/gradientButton/GradientButton.tsx b/src/components/buttons/gradientButton/GradientButton.tsx index 6f61eda..7da053a 100644 --- a/src/components/buttons/gradientButton/GradientButton.tsx +++ b/src/components/buttons/gradientButton/GradientButton.tsx @@ -1,5 +1,4 @@ import { Router } from 'next/router' -import React from 'react' import { GradientButtonView } from './GradientButtonView' import { useRouter } from 'next/router' diff --git a/src/components/buttons/loginButton/LoginButton.tsx b/src/components/buttons/loginButton/LoginButton.tsx index ff4c08f..8e2c505 100644 --- a/src/components/buttons/loginButton/LoginButton.tsx +++ b/src/components/buttons/loginButton/LoginButton.tsx @@ -1,5 +1,4 @@ import Link from 'next/link' -import React from 'react' import RenderIf from '../../../utils/renderIf' import { LoginButtonView } from './LoginButtonView' diff --git a/src/components/faqQuestionsCard/FaqQuestionsCard.tsx b/src/components/faqQuestionsCard/FaqQuestionsCard.tsx index 3bdd341..33d8b51 100644 --- a/src/components/faqQuestionsCard/FaqQuestionsCard.tsx +++ b/src/components/faqQuestionsCard/FaqQuestionsCard.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react' +import { useState } from 'react' import Image from 'next/image' import getAPIClient from '../../services/ssrApi'; import { FaqQuestionsCardBody, FaqQuestionsCardHeader, CommonQuestionsCardView } from './FaqQuestionsCardView' diff --git a/src/components/graph/ChartTitle.tsx b/src/components/graph/ChartTitle.tsx index 5a7cb5b..35a19be 100644 --- a/src/components/graph/ChartTitle.tsx +++ b/src/components/graph/ChartTitle.tsx @@ -1,4 +1,3 @@ -import React from 'react' import { ChartTitleView } from './ChartView' interface ChartTitleInterface{ diff --git a/src/components/graph/DemRegXDemConChart.tsx b/src/components/graph/DemRegXDemConChart.tsx index 889d421..ac51539 100644 --- a/src/components/graph/DemRegXDemConChart.tsx +++ b/src/components/graph/DemRegXDemConChart.tsx @@ -1,4 +1,4 @@ -import React, { useRef, useEffect } from 'react'; +import { useRef, useEffect } from 'react'; import { Chart as ChartJS, LinearScale, diff --git a/src/components/graph/DiscretizedConsumptionChart.tsx b/src/components/graph/DiscretizedConsumptionChart.tsx index d765acc..2970cbc 100644 --- a/src/components/graph/DiscretizedConsumptionChart.tsx +++ b/src/components/graph/DiscretizedConsumptionChart.tsx @@ -1,7 +1,6 @@ import { BarElement, CategoryScale, Chart as ChartJS, Legend, LinearScale, Title, Tooltip } from 'chart.js'; import ChartDataLabels from 'chartjs-plugin-datalabels'; import { draw, generate } from 'patternomaly' -import React from 'react'; import { Bar, Chart } from 'react-chartjs-2'; // import Chart from './Chart'; diff --git a/src/components/graph/DiscretizedConsumptionChartLine.tsx b/src/components/graph/DiscretizedConsumptionChartLine.tsx index 5b11b01..30c06ea 100644 --- a/src/components/graph/DiscretizedConsumptionChartLine.tsx +++ b/src/components/graph/DiscretizedConsumptionChartLine.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react' +import { useState, useEffect } from 'react' import { Bar, Line } from 'react-chartjs-2'; diff --git a/src/components/graph/LineBarChart.tsx b/src/components/graph/LineBarChart.tsx index 95b7ba6..5824565 100644 --- a/src/components/graph/LineBarChart.tsx +++ b/src/components/graph/LineBarChart.tsx @@ -1,4 +1,4 @@ -import React, { useRef, useEffect } from 'react'; +import { useRef, useEffect } from 'react'; import { Chart as ChartJS, LinearScale, diff --git a/src/components/graph/LineBarChart2.tsx b/src/components/graph/LineBarChart2.tsx index 53df601..647d8f3 100644 --- a/src/components/graph/LineBarChart2.tsx +++ b/src/components/graph/LineBarChart2.tsx @@ -1,4 +1,4 @@ -import React, { useRef, useEffect } from 'react'; +import { useRef, useEffect } from 'react'; import { Chart as ChartJS, LinearScale, diff --git a/src/components/graph/LineChart.tsx b/src/components/graph/LineChart.tsx index f25259f..ef256df 100644 --- a/src/components/graph/LineChart.tsx +++ b/src/components/graph/LineChart.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react' +import { useState, useEffect } from 'react' import { Bar, Line } from 'react-chartjs-2'; diff --git a/src/components/graph/cativoXLivreChart/index.tsx b/src/components/graph/cativoXLivreChart/index.tsx index f98dabb..21dbc62 100644 --- a/src/components/graph/cativoXLivreChart/index.tsx +++ b/src/components/graph/cativoXLivreChart/index.tsx @@ -1,4 +1,4 @@ -import React, { useRef, useEffect } from 'react'; +import { useRef, useEffect } from 'react'; import { Chart as ChartJS, LinearScale, diff --git a/src/components/graph/costIndicatorChart/index.tsx b/src/components/graph/costIndicatorChart/index.tsx index b850fe5..768410a 100644 --- a/src/components/graph/costIndicatorChart/index.tsx +++ b/src/components/graph/costIndicatorChart/index.tsx @@ -42,8 +42,6 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl const options: any = config(miniature) - console.log(new Date().getFullYear()) - const data = { labels, datasets: [ diff --git a/src/components/graph/fatorPotenciaChart.tsx b/src/components/graph/fatorPotenciaChart.tsx index 8a742ec..6b3b471 100644 --- a/src/components/graph/fatorPotenciaChart.tsx +++ b/src/components/graph/fatorPotenciaChart.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react' +import { useState, useEffect } from 'react' import { Bar, Line } from 'react-chartjs-2'; diff --git a/src/components/graph/graphCard/ChartCard.tsx b/src/components/graph/graphCard/ChartCard.tsx index b6d57d0..0b07ab8 100644 --- a/src/components/graph/graphCard/ChartCard.tsx +++ b/src/components/graph/graphCard/ChartCard.tsx @@ -1,4 +1,3 @@ -import React from 'react' import Link from 'next/link'; import { ChartCardView } from './ChartCardView'; diff --git a/src/components/graph/grossMensalChart/GrossMensalChart.tsx b/src/components/graph/grossMensalChart/GrossMensalChart.tsx index cd348de..0bb130b 100644 --- a/src/components/graph/grossMensalChart/GrossMensalChart.tsx +++ b/src/components/graph/grossMensalChart/GrossMensalChart.tsx @@ -89,7 +89,6 @@ export default function GrossMensalChart({ const percentage = (data1[ctx?.dataIndex]?.econ_percentual * 100).toFixed(0) + '%' - console.log(percentage) dataArr.map((data) => { sum += data }) diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx index b18d9be..408c814 100644 --- a/src/components/header/Header.tsx +++ b/src/components/header/Header.tsx @@ -1,4 +1,4 @@ -import React, { useContext, useEffect, useState } from 'react' +import { useContext, useEffect, useState } from 'react' import Image from 'next/image'; import { HeaderView } from './HeaderView' @@ -50,8 +50,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/user').then(res => { userData = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/components/inputUploadImg/inputUpload.tsx b/src/components/inputUploadImg/inputUpload.tsx index a007992..5675707 100644 --- a/src/components/inputUploadImg/inputUpload.tsx +++ b/src/components/inputUploadImg/inputUpload.tsx @@ -1,4 +1,4 @@ -import React,{ useState, useEffect } from 'react' +import { useState, useEffect } from 'react' import { InputUploadView } from './inputUploadView' @@ -16,7 +16,6 @@ export default function InputUploadPdf() { function onImageChange(e: any) { setImages([...e.target.files]); - // console.log(e); } return ( diff --git a/src/components/inputUploadPdf/inputUpload.tsx b/src/components/inputUploadPdf/inputUpload.tsx index 96866c0..ef7bd66 100644 --- a/src/components/inputUploadPdf/inputUpload.tsx +++ b/src/components/inputUploadPdf/inputUpload.tsx @@ -1,4 +1,4 @@ -import React,{ useState, useEffect } from 'react' +import { useState, useEffect } from 'react' import Image from 'next/image'; @@ -18,7 +18,6 @@ export default function InputUploadPdf() { function onImageChange(e: any) { setImages([...e.target.files]); - // console.log(e); } return ( diff --git a/src/components/mapCard/MapCard.tsx b/src/components/mapCard/MapCard.tsx index b1c5c06..281a843 100644 --- a/src/components/mapCard/MapCard.tsx +++ b/src/components/mapCard/MapCard.tsx @@ -1,4 +1,4 @@ -import React from 'react' + import Image from 'next/image' import { MapCardView } from './MapCardView' diff --git a/src/components/modal/ConfirmModal.tsx b/src/components/modal/ConfirmModal.tsx index 7164eac..a2491b7 100644 --- a/src/components/modal/ConfirmModal.tsx +++ b/src/components/modal/ConfirmModal.tsx @@ -3,8 +3,7 @@ import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; import Modal from '@mui/material/Modal'; import Typography from '@mui/material/Typography'; -import * as React from 'react'; -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; const style = { // eslint-disable-next-line @typescript-eslint/prefer-as-const @@ -27,7 +26,7 @@ interface ConfirmModalInterface{ } export default function ConfirmModal({open, handleIsClose, children}: ConfirmModalInterface) { - const [openState, setOpenState] = React.useState(false); + const [openState, setOpenState] = useState(false); const handleOpen = () => setOpenState(true); const handleClose = () => {setOpenState(false); handleIsClose(false)} diff --git a/src/components/modal/Modal.tsx b/src/components/modal/Modal.tsx index 545f5b1..35d9303 100644 --- a/src/components/modal/Modal.tsx +++ b/src/components/modal/Modal.tsx @@ -1,8 +1,7 @@ import Box from '@mui/material/Box'; import Modal from '@mui/material/Modal'; import Typography from '@mui/material/Typography'; -import * as React from 'react'; -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; const style = { // eslint-disable-next-line @typescript-eslint/prefer-as-const @@ -25,7 +24,7 @@ interface BasicModalInterface{ } export default function BasicModal({open, handleIsClose, children}: BasicModalInterface) { - const [openState, setOpenState] = React.useState(false); + const [openState, setOpenState] = useState(false); const handleOpen = () => setOpenState(true); const handleClose = () => {setOpenState(false); handleIsClose(false)} diff --git a/src/components/pageTitle/PageTitle.tsx b/src/components/pageTitle/PageTitle.tsx index 5a861ab..c2548b6 100644 --- a/src/components/pageTitle/PageTitle.tsx +++ b/src/components/pageTitle/PageTitle.tsx @@ -1,4 +1,4 @@ -import React from 'react' + import { PageTitleView } from './PageTitleView' interface PageTitleInterface { diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index cef77f3..f230a94 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -8,7 +8,7 @@ import Link from 'next/link' import { useRouter } from 'next/router' import { parseCookies } from 'nookies'; -import React, { useContext, useEffect, useState } from 'react' +import { useContext, useEffect, useState } from 'react' import { AuthContext } from '../../contexts/AuthContext'; import { MenuContext } from '../../contexts/menu/MenuContext'; @@ -60,8 +60,6 @@ export default function Sidebar() { useEffect(() => { api.post('/notify').then(res => { setNotificationsCount(res.data) - }).catch(res => { - // console.log(res) }) }, []) diff --git a/src/contexts/AuthContext.tsx b/src/contexts/AuthContext.tsx index 1c3c5fb..1525eae 100644 --- a/src/contexts/AuthContext.tsx +++ b/src/contexts/AuthContext.tsx @@ -1,4 +1,4 @@ -import React, { createContext, useState } from "react"; +import { createContext, useState } from "react"; import Router from 'next/router' import { destroyCookie, parseCookies, setCookie } from "nookies"; diff --git a/src/contexts/menu/MenuContext.tsx b/src/contexts/menu/MenuContext.tsx index de78ae5..2f531c7 100644 --- a/src/contexts/menu/MenuContext.tsx +++ b/src/contexts/menu/MenuContext.tsx @@ -1,4 +1,4 @@ -import React, { createContext, useState } from "react"; +import { createContext, useState } from "react"; type AuthContextType = { pldMenu: number, diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index cd87381..431cef8 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -2,7 +2,7 @@ import { AppProps } from 'next/app' import Head from 'next/head' import { useRouter } from 'next/router' import NProgress from 'nprogress' -import React, { useContext, useEffect, useState } from 'react' +import { useContext, useEffect, useState } from 'react' import Home from '.' // import Footer from '../components/footer/Footer' @@ -79,11 +79,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { let notificationsCount - await apiClient.post('/download').then(res => { - // console.log(res) - }).catch(res => { - // console.log(res) - }) + await apiClient.post('/download').then(console.log) if (!token) { return { diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx index f70d3dd..9a2ae5b 100644 --- a/src/pages/_document.tsx +++ b/src/pages/_document.tsx @@ -1,4 +1,4 @@ -import React from 'react' + import { ServerStyleSheet } from 'styled-components'; diff --git a/src/pages/aboutUs/index.tsx b/src/pages/aboutUs/index.tsx index 2d1fdb9..505d223 100644 --- a/src/pages/aboutUs/index.tsx +++ b/src/pages/aboutUs/index.tsx @@ -2,7 +2,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import Image from 'next/image' import { parseCookies } from 'nookies' -import React from 'react' + import Header from '../../components/header/Header' import PageTitle from '../../components/pageTitle/PageTitle' import getAPIClient from '../../services/ssrApi' @@ -62,8 +62,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/aboutUs').then(res => { text = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/accumulatedSavings/index.tsx b/src/pages/accumulatedSavings/index.tsx index c830adb..567e261 100644 --- a/src/pages/accumulatedSavings/index.tsx +++ b/src/pages/accumulatedSavings/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React from 'react' + // import Chart2 from '../../components/graph/Chart2' import GrossMensalChart from '../../components/graph/grossMensalChart/GrossMensalChart' @@ -58,11 +58,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/economy/grossMonthly').then(res => { graphData = res.data.data - // console.log(graphData[0].mes) - }).catch(res => { - // console.log(res) }) - const years = graphData.map((value) => value.mes) if (!token) { diff --git a/src/pages/administrative/clients/index.tsx b/src/pages/administrative/clients/index.tsx index aaeb309..8baece7 100644 --- a/src/pages/administrative/clients/index.tsx +++ b/src/pages/administrative/clients/index.tsx @@ -5,7 +5,7 @@ import Snackbar from '@mui/material/Snackbar' import TextField from '@mui/material/TextField' import Typography from '@mui/material/Typography' import Image from 'next/image' -import React, { useEffect, useState } from 'react' +import { forwardRef, useEffect, useState } from 'react' import ClientsTable from '../../../components/administrativeTables/ClientsTable' import BasicButton from '../../../components/buttons/basicButton/BasicButton' import FaqButton1 from '../../../components/buttons/faqButton/FaqButton1' @@ -39,7 +39,7 @@ const style = { overflowY: 'scroll' } -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref ) { @@ -418,12 +418,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient .get('/user') .then((res) => { - // console.log(res) clients = res.data.data - // console.log(clients) - }) - .catch((res) => { - // console.log(res) }) if (!token) { diff --git a/src/pages/administrative/faq/index.tsx b/src/pages/administrative/faq/index.tsx index ecb3093..3306315 100644 --- a/src/pages/administrative/faq/index.tsx +++ b/src/pages/administrative/faq/index.tsx @@ -8,7 +8,7 @@ import Head from 'next/head' import Image from 'next/image' import Link from 'next/link' import { useRouter } from 'next/router' -import React, { useEffect, useState } from 'react' +import { forwardRef, useEffect, useState } from 'react' import { api } from '../../../services/api'; import ConfirmModal from '../../../components/modal/ConfirmModal'; import { ConfirmModalView } from '../../../styles/layouts/modals/confirmModalView'; @@ -40,7 +40,7 @@ const style = { p: 4, }; -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref, ) { @@ -106,7 +106,7 @@ export default function Sidebar({faqData, userName} : any ) { }).catch(res => setOpenSnackError(true)) } - const [open, setOpen] = React.useState(false); + const [open, setOpen] = useState(false); const handleOpen = () => setOpen(true); const handleClose = () => setOpen(false); @@ -190,8 +190,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/faq').then(res => { faqData = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/administrative/general.tsx b/src/pages/administrative/general.tsx index f3149d5..0f032c1 100644 --- a/src/pages/administrative/general.tsx +++ b/src/pages/administrative/general.tsx @@ -2,7 +2,7 @@ import { SelectChangeEvent } from '@mui/material/Select'; import { Editor } from '@tinymce/tinymce-react' import { GetServerSideProps } from 'next'; import { parseCookies } from 'nookies'; -import React, { useRef, useState } from 'react' +import { forwardRef, useRef, useState } from 'react' import BasicButton from '../../components/buttons/basicButton/BasicButton'; import Header from '../../components/header/Header'; import PageTitle from '../../components/pageTitle/PageTitle'; @@ -12,7 +12,7 @@ import MuiAlert, { AlertProps } from '@mui/material/Alert' import Snackbar from '@mui/material/Snackbar'; import getAPIClient from '../../services/ssrApi'; -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref ) { @@ -119,9 +119,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/aboutUs').then(res => { initialText = res.data.data - // console.log(res.data.data) - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/administrative/index.tsx b/src/pages/administrative/index.tsx index d270917..03516cf 100644 --- a/src/pages/administrative/index.tsx +++ b/src/pages/administrative/index.tsx @@ -1,7 +1,7 @@ import Button from '@mui/material/Button'; import TextField from '@mui/material/TextField'; import { DataGrid, GridColDef, GridValueGetterParams } from '@mui/x-data-grid'; -import React, { useState } from 'react' +import { useState } from 'react' import AdministrativeHeader from '../../components/administrativeHeader/AdministrativeHeader'; import ClientsTable from '../../components/administrativeTables/ClientsTable'; diff --git a/src/pages/administrative/industryInfo/index.tsx b/src/pages/administrative/industryInfo/index.tsx index 1d0c39b..bad0adc 100644 --- a/src/pages/administrative/industryInfo/index.tsx +++ b/src/pages/administrative/industryInfo/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React, { useEffect, useState } from 'react' +import { forwardRef, useEffect, useState } from 'react' import BasicButton from '../../../components/buttons/basicButton/BasicButton' import Header from '../../../components/header/Header' import PageTitle from '../../../components/pageTitle/PageTitle' @@ -13,7 +13,7 @@ import Snackbar from '@mui/material/Snackbar'; import MuiAlert, { AlertProps } from '@mui/material/Alert'; import getAPIClient from '../../../services/ssrApi' -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref, ) { @@ -45,16 +45,12 @@ export default function industryInfo({userName, pdfUrl}: any) { api.post('/updateFile', formData).then(res => { setOpenSnackSuccess(true) - }).catch(res => { - setOpenSnackError(true) - }) + }).catch(() => setOpenSnackError(true)) } function handleDownloadPdf() { api.get('/download').then(res => { window.open(res.data.path); - }).catch(res => { - // console.log(res) }) } @@ -86,12 +82,6 @@ export default function industryInfo({userName, pdfUrl}: any) { handleDownloadPdf()} title='Visualizar arquivo mais recente'/> console.log('')} title='Excluir último arquivo enviado'/> - {/* */} - ) } @@ -105,8 +95,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { apiClient.get('/download').then(res => { pdfUrl = res.data.path - }).catch(res => { - // console.log('exception', res) }) if (!token) { diff --git a/src/pages/administrative/notification/index.tsx b/src/pages/administrative/notification/index.tsx index 92a57aa..8b319df 100644 --- a/src/pages/administrative/notification/index.tsx +++ b/src/pages/administrative/notification/index.tsx @@ -8,7 +8,7 @@ import Modal from '@mui/material/Modal'; import TextField from '@mui/material/TextField'; import Typography from '@mui/material/Typography'; import Head from 'next/head' -import React, { useEffect, useState } from 'react' +import { forwardRef, useEffect, useState } from 'react' import NotificationsTable from '../../../components/administrativeTables/NotificationsTable' import FaqButton1 from '../../../components/buttons/faqButton/FaqButton1'; @@ -44,7 +44,7 @@ const style = { overflowY: 'scroll', }; -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref, ) { @@ -257,14 +257,9 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/user').then(res => { clients = res.data.data - }).catch(res => { - // console.log(res) }) - await apiClient.get('/notification').then(res => { notifications = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/chartTelemetry/index.tsx b/src/pages/chartTelemetry/index.tsx index c918907..2a165d6 100644 --- a/src/pages/chartTelemetry/index.tsx +++ b/src/pages/chartTelemetry/index.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react' +import { useEffect, useState } from 'react' import { ChatTelemetryView } from '../../styles/layouts/ChatTelemetry/ChatTelemetryView' import Header from '../../components/header/Header' diff --git a/src/pages/costIndicator/index.tsx b/src/pages/costIndicator/index.tsx index 4f5a67c..9ef7251 100644 --- a/src/pages/costIndicator/index.tsx +++ b/src/pages/costIndicator/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React, { useEffect, useState } from 'react' +import { useEffect, useState } from 'react' // material ui imports import MenuItem from '@mui/material/MenuItem'; @@ -43,8 +43,6 @@ export default function CostIndicator({graphData, userName, clients}: any) { ] }:{}).then(res => { setGraphDataState(res.data.data) - }).catch(res => { - // console.log(res) }) }, [unity]) @@ -112,15 +110,11 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "codigo_scde"], "distinct": true }).then(res => { - clients = res.data.data - }).catch(res => { - // console.log(res) - }) + clients = res.data.data +}) await apiClient.post('/economy/MWh').then(res => { graphData = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index 6ab2850..2efeab5 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -242,26 +242,18 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/economy/grossMonthly').then(res => { grossMensalGraph = res.data.data - }).catch(res => { - // console.log(res) }) await apiClient.post('/economy/estimates').then(res => { acumulatedGraph = res.data.data - }).catch(res => { - // console.log(res) }) await apiClient.post('/economy/MWh').then(res => { costIndicator = res.data.data - }).catch(res => { - // console.log(res) }) await apiClient.post('/pld/overview').then(res => { mapsInfo = res.data.data - }).catch(res => { - // console.log(res) }) const grossMensalYears = grossMensalGraph.map((value) => value.mes) diff --git a/src/pages/estimatedCost/index.tsx b/src/pages/estimatedCost/index.tsx index 876547b..4f30642 100644 --- a/src/pages/estimatedCost/index.tsx +++ b/src/pages/estimatedCost/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React, { useEffect, useState } from 'react' +import { useEffect, useState } from 'react' import { CativoXLivreChart } from '../../components/graph/cativoXLivreChart' // material ui imports @@ -29,8 +29,6 @@ export default function EstimatedCost({graphData, userName, clients}: any) { ] }:{}).then(res => { setGraphDataState(res.data.data) - }).catch(res => { - // console.log(res) }) }, [unity]) @@ -90,15 +88,10 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "codigo_scde"], "distinct": true }).then(res => { - clients = res.data.data - }).catch(res => { - // console.log(res) - }) - + clients = res.data.data +}) await apiClient.post('/economy/estimates').then(res => { graphData = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/faq/index.tsx b/src/pages/faq/index.tsx index e327e35..6eadc5c 100644 --- a/src/pages/faq/index.tsx +++ b/src/pages/faq/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React from 'react' + import Banner from '../../components/banner/Banner' import CommonQuestionsCard from '../../components/faqQuestionsCard/FaqQuestionsCard' import Header from '../../components/header/Header' @@ -48,8 +48,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/faq').then(res => { faqData = res.data.data - }).catch(res => { - console.log(res) }) if (!token) { diff --git a/src/pages/forgotPassword/index.tsx b/src/pages/forgotPassword/index.tsx index 3e9ce14..8d731dd 100644 --- a/src/pages/forgotPassword/index.tsx +++ b/src/pages/forgotPassword/index.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react' +import { useState, useEffect } from 'react' import Image from 'next/image'; import { useRouter } from 'next/router' import FormData from 'form-data'; @@ -54,9 +54,7 @@ export default function ForgotPassword() { formData.append('email', email) api.post('/auth/forgot-password', formData).then(res => { setOpenSnackSuccess(true) - }).catch(res => { - setOpenSnackError(true) - }) + }).catch(() => setOpenSnackError(true)) } return ( diff --git a/src/pages/grossSavings/index.tsx b/src/pages/grossSavings/index.tsx index c3e1697..6d38a5e 100644 --- a/src/pages/grossSavings/index.tsx +++ b/src/pages/grossSavings/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React from 'react' + import { GrossAnualChart } from '../../components/graph/grossAnualChart/GrossAnualChart' import Header from '../../components/header/Header' @@ -41,8 +41,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/economy/grossAnnual').then(res => { graphData = res.data.data // console.log(graphData[0]) - }).catch(res => { - // console.log(res) }) const years = graphData.map((value) => value.ano) diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 3380fcc..65021be 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -8,7 +8,7 @@ import Head from 'next/head'; import Image from 'next/image'; import Link from 'next/link'; import { useRouter } from 'next/router' -import React, { useContext, useState, useEffect,useCallback, useRef } from 'react' +import { useContext, useState, useEffect, useCallback, useRef, forwardRef } from 'react' import { AiOutlineEye, AiOutlineEyeInvisible } from 'react-icons/ai'; import RenderIf from '../utils/renderIf'; import Snackbar from '@mui/material/Snackbar'; @@ -22,7 +22,7 @@ import MuiAlert, { AlertProps } from '@mui/material/Alert'; import { GetServerSideProps } from 'next'; import { parseCookies } from 'nookies'; -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref, ) { @@ -77,8 +77,8 @@ export default function Home() { setOpenSnackError(true) } }) - } catch (exception){ - // console.log(exception) + } catch (exception) { + console.log(exception) } } } diff --git a/src/pages/industryInfo/index.tsx b/src/pages/industryInfo/index.tsx index 18e5ce9..e27d911 100644 --- a/src/pages/industryInfo/index.tsx +++ b/src/pages/industryInfo/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React, { useState } from 'react' +import { forwardRef, useState } from 'react' import BasicButton from '../../components/buttons/basicButton/BasicButton' import Header from '../../components/header/Header' import PageTitle from '../../components/pageTitle/PageTitle' @@ -14,7 +14,7 @@ import { useRouter } from 'next/router' import Banner from '../../components/banner/Banner' import Image from 'next/image' -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref, ) { @@ -39,9 +39,7 @@ export default function industryInfo({userName}: any) { api.get('/download').then(res => { window.open(res.data.path); setOpenSnackSuccess(true) - }).catch(res => { - setOpenSnackError(true) - }) + }).catch(() => setOpenSnackError(true)) } return ( diff --git a/src/pages/news/index.tsx b/src/pages/news/index.tsx index 09ee7be..ea44552 100644 --- a/src/pages/news/index.tsx +++ b/src/pages/news/index.tsx @@ -3,7 +3,7 @@ import Head from 'next/head'; import Link from 'next/link' import { Router } from 'next/router'; import { parseCookies } from 'nookies'; -import React from 'react' + import Banner from '../../components/banner/Banner' import BasicButton from '../../components/buttons/basicButton/BasicButton'; @@ -63,8 +63,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/news').then(res => { news = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/notifications/index.tsx b/src/pages/notifications/index.tsx index 5694a14..0c1d3f7 100644 --- a/src/pages/notifications/index.tsx +++ b/src/pages/notifications/index.tsx @@ -1,7 +1,7 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' import { parseCookies } from 'nookies' -import React from 'react' + import NotificationQuestionsCard from '../../components/NotificationQuestionsCard/NotificationQuestionsCard' import Header from '../../components/header/Header' import PageTitle from '../../components/pageTitle/PageTitle' @@ -48,8 +48,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.get('/notification').then(res => { notificationData = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index 5b23015..0c2d7e2 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -6,7 +6,7 @@ import Select, { SelectChangeEvent } from '@mui/material/Select'; import { GetServerSideProps } from 'next'; import Head from 'next/head'; import { parseCookies } from 'nookies'; -import React, { useContext, useEffect, useState } from 'react' +import { useContext, useEffect, useState } from 'react' import BasicButton from '../../components/buttons/basicButton/BasicButton'; import { LineBarChart } from '../../components/graph/LineBarChart'; @@ -460,8 +460,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/pld/list').then(res => { tableData = res.data - }).catch(res => { - // console.log(res) }) await apiClient.post('/pld', { @@ -470,8 +468,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "distinct": true }).then(res => { clientMonth = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index d1a9ebd..03d54dc 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -6,7 +6,7 @@ import Select, { SelectChangeEvent } from '@mui/material/Select'; import { GetServerSideProps } from 'next'; import Head from 'next/head'; import { parseCookies } from 'nookies'; -import React, { useEffect, useState } from 'react'; +import { useEffect, useState } from 'react'; import BasicButton from '../../components/buttons/basicButton/BasicButton'; import Header from '../../components/header/Header'; @@ -243,8 +243,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "distinct": true }).then(res => { clients = res.data.data - }).catch(res => { - // console.log(res) }) if (!token) { diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index 7a8e242..7917ac6 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -1,59 +1,77 @@ -import React, { useEffect, useState } from 'react'; +import { forwardRef, useEffect, useState } from 'react' -import FormControl from '@mui/material/FormControl'; -import InputLabel from '@mui/material/InputLabel'; -import MenuItem from '@mui/material/MenuItem'; -import Select from '@mui/material/Select'; -import Head from 'next/head'; -import GradientButton from '../../components/buttons/gradientButton/GradientButton'; -import Header from '../../components/header/Header'; -import { Buttons, ChartFilters, TableHeader, TelemetriaView } from '../../styles/layouts/Telemetria/TelemetriaView'; +import FormControl from '@mui/material/FormControl' +import InputLabel from '@mui/material/InputLabel' +import MenuItem from '@mui/material/MenuItem' +import Select from '@mui/material/Select' +import Head from 'next/head' +import GradientButton from '../../components/buttons/gradientButton/GradientButton' +import Header from '../../components/header/Header' +import { + Buttons, + ChartFilters, + TableHeader, + TelemetriaView +} from '../../styles/layouts/Telemetria/TelemetriaView' -import MuiAlert, { AlertProps } from '@mui/material/Alert'; -import Snackbar from '@mui/material/Snackbar'; -import { GetServerSideProps } from 'next'; -import { parseCookies } from 'nookies'; -import { DemRegXDemConChart } from '../../components/graph/DemRegXDemConChart'; -import getAPIClient from '../../services/ssrApi'; -import RenderIf from '../../utils/renderIf'; +import MuiAlert, { AlertProps } from '@mui/material/Alert' +import Snackbar from '@mui/material/Snackbar' +import { GetServerSideProps } from 'next' +import { parseCookies } from 'nookies' +import { DemRegXDemConChart } from '../../components/graph/DemRegXDemConChart' +import getAPIClient from '../../services/ssrApi' +import RenderIf from '../../utils/renderIf' -import Tab from '@mui/material/Tab'; -import Tabs from '@mui/material/Tabs'; +import Tab from '@mui/material/Tab' +import Tabs from '@mui/material/Tabs' -import TextField from '@mui/material/TextField'; -import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns'; -import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker'; -import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; -import { format } from 'date-fns'; -import BasicButton from '../../components/buttons/basicButton/BasicButton'; -import { DiscretizedConsumptionChart } from '../../components/graph/DiscretizedConsumptionChart'; -import FatorPotenciaChart from '../../components/graph/fatorPotenciaChart'; -import PageTitle from '../../components/pageTitle/PageTitle'; -import { getDemand } from '../../services/charts/telemetry/getDemand'; -import { getDiscretization } from '../../services/charts/telemetry/getDiscretization'; -import { getPowerFactorData } from '../../services/charts/telemetry/getPowerFactor'; +import TextField from '@mui/material/TextField' +import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns' +import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker' +import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider' +import { format } from 'date-fns' +import BasicButton from '../../components/buttons/basicButton/BasicButton' +import { DiscretizedConsumptionChart } from '../../components/graph/DiscretizedConsumptionChart' +import FatorPotenciaChart from '../../components/graph/fatorPotenciaChart' +import PageTitle from '../../components/pageTitle/PageTitle' +import { getDemand } from '../../services/charts/telemetry/getDemand' +import { getDiscretization } from '../../services/charts/telemetry/getDiscretization' +import { getPowerFactorData } from '../../services/charts/telemetry/getPowerFactor' -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref ) { return }) +const months = [ + 'Jan', + 'Fev', + 'Mar', + 'Abr', + 'Mai', + 'Jun', + 'Jul', + 'Ago', + 'Set', + 'Out', + 'Nov', + 'Dez' +] + export default function Telemetria({ userName, clients }: any) { - const [unity, setUnity] = useState(clients[0]?.codigo_scde); - const [startDate, setStartDate] = useState(new Date()); - const [endDate, setEndDate] = useState(new Date()); - const [month, setMonth] = useState(new Date().getMonth()); - const [endMonth, setEndMonth] = useState(new Date().getMonth() + 1); - const [discretization, setDiscretization] = useState('1_hora'); + const [unity, setUnity] = useState(clients[0]?.codigo_scde) + const [startDate, setStartDate] = useState(new Date()) + const [endDate, setEndDate] = useState(new Date()) + const [month, setMonth] = useState(new Date().getMonth()) + const [endMonth, setEndMonth] = useState(new Date().getMonth() + 1) + const [discretization, setDiscretization] = useState('1_hora') const [openSnackSuccess, setOpenSnackSuccess] = useState(false) const [openSnackError, setOpenSnackError] = useState(false) const [openSnackFields, setOpenSnackFields] = useState(false) - const months = ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'] - const handleCloseSnack = ( event?: React.SyntheticEvent | Event, reason?: string @@ -68,67 +86,61 @@ export default function Telemetria({ userName, clients }: any) { } function downloadCSVFile(csv, filename) { - /*exemplo caso mudar o type do blob não resolva + const csv_file = new Blob([csv], { type: 'text/csv;charset=utf-8' }) - var csvContent = 'éà; ça; 12\nà@€; çï; 13', - textEncoder = new TextEncoder('windows-1252'); - */ + const download_link = document.createElement('a') - const csv_file = new Blob([csv], { type: "text/csv;charset=utf-8" }); + download_link.download = filename - const download_link = document.createElement("a"); + download_link.href = window.URL.createObjectURL(csv_file) - download_link.download = filename; + download_link.style.display = 'none' - download_link.href = window.URL.createObjectURL(csv_file); + document.body.appendChild(download_link) - download_link.style.display = "none"; - - document.body.appendChild(download_link); - - download_link.click(); + download_link.click() } - function htmlToCSV(html, filename) { - const data = []; - const rows = document.querySelectorAll("table tr"); + function htmlToCSV(filename) { + const data = [] + const rows = document.querySelectorAll('table tr') for (let i = 0; i < rows.length; i++) { - const row = [], cols: any = rows[i].querySelectorAll("td, th"); + const row = [], + cols: any = rows[i].querySelectorAll('td, th') for (let j = 0; j < cols.length; j++) { - row.push(cols[j].innerText); + row.push(cols[j].innerText) } - data.push(row.join(";")); + data.push(row.join(';')) } - downloadCSVFile(data.join("\n"), filename); + downloadCSVFile(data.join('\n'), filename) } const [tableData, setTableData] = useState(null) const [loader, setLoader] = useState(false) - const [menu, setMenu] = useState(0); + const [menu, setMenu] = useState(0) - const [showChart, setShowChart] = useState(false); + const [showChart, setShowChart] = useState(false) - const [send, setSend] = useState(false); - - const [open, setOpen] = useState(false); + const [send, setSend] = useState(false) const handleChangeStartDate = (newValue: Date | null) => { setStartDate(newValue) - }; + } const handleChangeEndDate = (newValue: Date | null) => { setEndDate(newValue) - }; + } - - const [fatorPotenciaData, setFatorPotenciaData] = useState([]); - const [demRegXDemCon, setDemRegXDemCon] = useState([]); - const [discretizedConsumptionData, setDiscretizedConsumptionData] = useState([]); + const [fatorPotenciaData, setFatorPotenciaData] = useState([]) + const [demRegXDemCon, setDemRegXDemCon] = useState([]) + const [discretizedConsumptionData, setDiscretizedConsumptionData] = useState( + [] + ) useEffect(() => { setSend(false) @@ -136,26 +148,53 @@ export default function Telemetria({ userName, clients }: any) { useEffect(() => { const firstOfTheMonth = format(new Date(startDate).setDate(2), 'yyyy-MM-dd') - const lastOfTheMonth = format(new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0), 'yyyy-MM-dd') + const lastOfTheMonth = format( + new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0), + 'yyyy-MM-dd' + ) setStartDate(new Date(firstOfTheMonth)) setLoader(true) - getDiscretization(unity, new Date(firstOfTheMonth), new Date(lastOfTheMonth), discretization) - .then(result => { setDiscretizedConsumptionData(result); setSend(false); setLoader(false) }) - .catch(() => { setSend(false); setOpenSnackFields(true) }) + getDiscretization( + unity, + new Date(firstOfTheMonth), + new Date(lastOfTheMonth), + discretization + ) + .then((result) => { + setDiscretizedConsumptionData(result) + setSend(false) + setLoader(false) + }) + .catch(() => { + setSend(false) + setOpenSnackFields(true) + }) getDemand(unity, startDate, endDate, discretization) - .then(result => { - setDemRegXDemCon(result); - setSend(false); + .then((result) => { + setDemRegXDemCon(result) + setSend(false) setTableData(result) }) - .catch(() => { setSend(false); setOpenSnackFields(true); setLoader(false) }) + .catch(() => { + setSend(false) + setOpenSnackFields(true) + setLoader(false) + }) getPowerFactorData(unity, startDate, endDate, discretization) - .then(result => { setFatorPotenciaData(result); setSend(false); setLoader(false) }) - .catch(() => { setSend(false); setOpenSnackFields(true); setLoader(false) }) + .then((result) => { + setFatorPotenciaData(result) + setSend(false) + setLoader(false) + }) + .catch(() => { + setSend(false) + setOpenSnackFields(true) + setLoader(false) + }) }, []) return ( @@ -163,6 +202,7 @@ export default function Telemetria({ userName, clients }: any) { Smart Energia - Telemetria + + - Não foi possivel pegar os dados! + Não foi possível pegar os dados! @@ -205,450 +246,648 @@ export default function Telemetria({ userName, clients }: any) {
- +
- { - typeof window === 'undefined' || typeof window === undefined ? null : - - {/* + {/* */} - - - - setMenu(nv)} aria-label=""> - - - - - - - {/* discretization chart */} - - -
- - Unidade - - -
-
- - Discretização - - -
- { - discretization === '1_mes' ? - <> - - Discretização - - - {discretization === '1_mes' && - Discretização - - } - - : - -
- } - /> -
-
- handleChangeEndDate(newValue)} - renderInput={(params) => } - /> -
- - } -
- { - setLoader(true) - getDiscretization(unity, startDate, endDate, discretization) - .then(result => { setDiscretizedConsumptionData(result); setSend(false); setLoader(false); setTableData(result) }) - .catch(exception => { setSend(false); setOpenSnackFields(true); setLoader(false) }) - }} /> -
- - value.minut)} dataset={'Consumo'} dataset1='Estimado' month /> - - - {/* demand chart */} - - -
- - Unidade - - -
-
- - Discretização - - -
- -
- } - /> -
-
- handleChangeEndDate(newValue)} - renderInput={(params) => } - /> -
- -
- { - setLoader(true) - getDemand(unity, startDate, endDate, discretization) - .then(result => { setDemRegXDemCon(result); setSend(false); setLoader(false); setTableData(result) }) - .catch(exception => { setSend(false); setOpenSnackFields(true); setLoader(false) }) - }} /> -
- - value.hora)} title='Demanda Contratada X Registrada' subtitle='' red /> - - - {/* power factor chart */} - - -
- - Unidade - - -
-
- - Discretização - - -
- -
- } - /> -
-
- handleChangeEndDate(newValue)} - renderInput={(params) => } - /> -
- -
- { - setLoader(true) - getPowerFactorData(unity, startDate, endDate, discretization) - .then(result => { setFatorPotenciaData(result); setSend(false); setLoader(false); setTableData(result) }) - .catch(exception => { setSend(false); setOpenSnackFields(true); setLoader(false) }) - }} /> -
- - (value.day_formatted))} /> - - - - -
-
- - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - { - fatorPotenciaData !== null ? - fatorPotenciaData?.map((value, index) => { - return <> - - - - - - - - - - - - - - - - - }) - : - null + + setMenu(nv)} aria-label=""> + -
UnidadePontoNumero do diaDia formatadoHoraMinutof_refConsumoReativafpdem contratadadem registradadem tolerancia
{unity}{value?.ponto}{parseFloat(value?.dia_num)}{value?.day_formatted}{value?.hora}{value.minut}{value?.f_ref}{parseFloat(value?.consumo).toLocaleString('pt-br', { style: 'currency', currency: 'BRL', minimumFractionDigits: 2 })}{parseFloat(value?.reativa).toLocaleString('pt-br', { style: 'currency', currency: 'BRL', minimumFractionDigits: 2 })}{parseFloat(value?.fp)}{value?.dem_cont}{value?.dem_reg}{value?.dem_tolerancia}
+ /> + - - value.hora)} title='Demanda Contratada X Registrada' subtitle='' red /> - + + + - - {/* setShowChart(!showChart)} purple /> */} - {/* handleVerifyFields()} orange /> */} - { - const html = document.querySelector("table")?.outerHTML; - htmlToCSV(html, `${menu === 2 ? 'fator_potencia' : menu === 1 ? 'demanda' : 'consumo_discretizado'}.csv`); - }} /> - -

- - Fonte: Dados coletados do Sistema de Coleta de Dados - de Energia - SCDE da Câmara de Comercialização
- Energia Elétrica – CCEE, sendo que as quantidades aqui - informadas são de responsabilidade
do agente de - medição - Distribuidora. - -

- - } + {/* discretization chart */} + + +
+ + Unidade + + +
+
+ + Discretização + + +
+ + {discretization === '1_mes' ? ( + <> + + Discretização + + + {discretization === '1_mes' && ( + + Discretização + + + )} + + ) : ( + +
+ ( + + )} + /> +
+
+ + handleChangeEndDate(newValue) + } + renderInput={(params) => ( + + )} + /> +
+ + )} +
+ { + setLoader(true) + getDiscretization(unity, startDate, endDate, discretization) + .then((result) => { + setDiscretizedConsumptionData(result) + setSend(false) + setLoader(false) + setTableData(result) + }) + .catch((exception) => { + setSend(false) + setOpenSnackFields(true) + setLoader(false) + }) + }} + /> +
+ + + value.minut)} + dataset={'Consumo'} + dataset1="Estimado" + month + /> + + + {/* demand chart */} + + +
+ + Unidade + + +
+
+ + Discretização + + +
+ +
+ ( + + )} + /> +
+
+ handleChangeEndDate(newValue)} + renderInput={(params) => ( + + )} + /> +
+ +
+ { + setLoader(true) + getDemand(unity, startDate, endDate, discretization) + .then((result) => { + setDemRegXDemCon(result) + setSend(false) + setLoader(false) + setTableData(result) + }) + .catch((exception) => { + setSend(false) + setOpenSnackFields(true) + setLoader(false) + }) + }} + /> +
+ + value.hora)} + title="Demanda Contratada X Registrada" + subtitle="" + red + /> + + + {/* power factor chart */} + + +
+ + Unidade + + +
+
+ + Discretização + + +
+ +
+ ( + + )} + /> +
+
+ handleChangeEndDate(newValue)} + renderInput={(params) => ( + + )} + /> +
+ +
+ { + setLoader(true) + getPowerFactorData( + unity, + startDate, + endDate, + discretization + ) + .then((result) => { + setFatorPotenciaData(result) + setSend(false) + setLoader(false) + setTableData(result) + }) + .catch((exception) => { + setSend(false) + setOpenSnackFields(true) + setLoader(false) + }) + }} + /> +
+ + value.day_formatted)} + /> + + + +
+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + {fatorPotenciaData !== null + ? fatorPotenciaData?.map((value, index) => { + return ( + + + + + + + + + + + + + + + + ) + }) + : null} + +
UnidadePontoNumero do diaDia formatadoHoraMinutof_refConsumoReativafpdem contratadadem registradadem tolerancia
{unity}{value?.ponto} + {parseFloat(value?.dia_num)} + {value?.day_formatted}{value?.hora}{value.minut}{value?.f_ref} + {parseFloat(value?.consumo).toLocaleString('pt-br', { + style: 'currency', + currency: 'BRL', + minimumFractionDigits: 2 + })} + + {parseFloat(value?.reativa).toLocaleString('pt-br', { + style: 'currency', + currency: 'BRL', + minimumFractionDigits: 2 + })} + {parseFloat(value?.fp)}{value?.dem_cont}{value?.dem_reg}{value?.dem_tolerancia}
+ + + value.hora)} + title="Demanda Contratada X Registrada" + subtitle="" + red + /> + + + + {/* setShowChart(!showChart)} purple /> */} + {/* handleVerifyFields()} orange /> */} + { + htmlToCSV( + `${menu === 2 + ? 'fator_potencia' + : menu === 1 + ? 'demanda' + : 'consumo_discretizado' + }.csv` + ) + }} + /> + + +

+ + Fonte: Dados coletados do Sistema de Coleta de Dados de Energia - + SCDE da Câmara de Comercialização
+ Energia Elétrica – CCEE, sendo que as quantidades aqui informadas + são de responsabilidade
+ do agente de medição - Distribuidora. + +

+ + )} ) } @@ -662,22 +901,23 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { let clients = [] - await apiClient.post('/units', { - "filters": [ - { "type": "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id }, - { "type": "not_in", "field": "dados_cadastrais.codigo_scde", "value": ["0P"] } - ], - "fields": [ - "unidade", - "cod_smart_unidade", - "codigo_scde"], - "distinct": true - }).then(res => { - console.log(res.data) - clients = res.data.data - }).catch(res => { - // console.log(res) - }) + await apiClient + .post('/units', { + filters: [ + { + type: '=', + field: 'dados_cadastrais.cod_smart_cliente', + value: client_id + }, + { type: 'not_in', field: 'dados_cadastrais.codigo_scde', value: ['0P'] } + ], + fields: ['unidade', 'cod_smart_unidade', 'codigo_scde'], + distinct: true + }) + .then((res) => { + console.log(res.data) + clients = res.data.data + }) if (!token) { return { @@ -695,4 +935,3 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { } } } - diff --git a/src/pages/verifyEmail/index.tsx b/src/pages/verifyEmail/index.tsx index bce5199..852ba0a 100644 --- a/src/pages/verifyEmail/index.tsx +++ b/src/pages/verifyEmail/index.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react' +import { forwardRef, useEffect, useState } from 'react' import Image from 'next/image'; import { useRouter } from 'next/router' import FormData from 'form-data'; @@ -15,7 +15,7 @@ import { api } from '../../services/api'; import { GetServerSideProps } from 'next'; import { parseCookies } from 'nookies'; -const Alert = React.forwardRef(function Alert( +const Alert = forwardRef(function Alert( props, ref ) { @@ -61,9 +61,7 @@ export default function VerifyEmail() { }).then(res => { setSent(true) setOpenSnackSuccess(true) - }).catch(res => { - setOpenSnackError(true) - }) + }).catch(() => setOpenSnackError(true)) } function verifyConfirmationCode() { @@ -78,9 +76,7 @@ export default function VerifyEmail() { setTimeout(() => { router.push('/') }, 2000); - }).catch(res => { - setOpenSnackErrorPassword(true) - }) + }).catch(() => setOpenSnackErrorPassword(true)) } useEffect(() => { diff --git a/src/services/auth.ts b/src/services/auth.ts index e979188..eebc6c2 100644 --- a/src/services/auth.ts +++ b/src/services/auth.ts @@ -19,23 +19,26 @@ type UserObjectType = { export async function signInRequest(data: SignInRequestData) { let user: UserObjectType, token: string, exception: any = null - await api.post('/auth/login', { - "email": data.email, - "password": data.password, - "device_name": "test" - }).then(res => { - token = res.data.token - user = { - name: res.data.user.name, - email: res.data.user.email, - client_id: res.data.user.client_id, - id: res.data.user.id, - role: res.data.user.roles[0].pivot.role_id, - profile_picture: res.data.user.profile_picture - } - }).catch(res => { - exception = res - }) + await api + .post('/auth/login', { + email: data.email, + password: data.password, + device_name: 'test' + }) + .then((res) => { + token = res.data.token + user = { + name: res.data.user.name, + email: res.data.user.email, + client_id: res.data.user.client_id, + id: res.data.user.id, + role: res.data.user.roles[0].pivot.role_id, + profile_picture: res.data.user.profile_picture + } + }) + .catch((res) => { + exception = res + }) return { token, @@ -63,8 +66,6 @@ export default async function recoverUserInformation(id) { role: res.data.user.roles[0].pivot.role_id, profile_picture: res.data.user.profile_picture } - }).catch(res => { - // console.log(res) }) return { diff --git a/src/services/ssrApi.ts b/src/services/ssrApi.ts index c70ba4b..2196241 100644 --- a/src/services/ssrApi.ts +++ b/src/services/ssrApi.ts @@ -12,9 +12,9 @@ export default function getAPIClient(ctx?: Pick | { const { '@smartAuth-token': token } = parseCookies(ctx) const api = axios.create({ - // baseURL: "https://api.energiasmart.com.br/api", - baseURL: "https://api.energiasmart.klupp.com.br/api", - }); + baseURL: 'https://api.energiasmart.com.br/api' + // baseURL: 'https://api.energiasmart.klupp.com.br/api' + }) api.interceptors.request.use(config => { return config; diff --git a/yarn.lock b/yarn.lock index 59c3734..f229df3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4417,7 +4417,8 @@ react-transition-group@^4.0.0, react-transition-group@^4.4.0, react-transition-g react@18.1.0: version "18.1.0" - resolved "https://registry.npmjs.org/react/-/react-18.1.0.tgz" + resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" + integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== dependencies: loose-envify "^1.1.0"