diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx index 4c4e2bc..0cc1958 100644 --- a/src/components/graph/Chart.tsx +++ b/src/components/graph/Chart.tsx @@ -41,7 +41,6 @@ interface ChartInterface { export default function Chart({ title, data1, data2, label, subtitle, dataset1, dataset2, barLabel }: ChartInterface) { const labels = label; - const empty = [] const options: any = { responsive: true, diff --git a/src/components/header/HeaderView.ts b/src/components/header/HeaderView.ts index cff6ebb..c612183 100644 --- a/src/components/header/HeaderView.ts +++ b/src/components/header/HeaderView.ts @@ -13,18 +13,20 @@ export const HeaderView = styled.header` align-items: center; justify-content: flex-start; - min-width: 120px; height: 40px; border-radius: 8px; background-color: #254F7F; + padding: 14px; + margin-right: 20px; p{ color: white; - margin-left: 15%; + + white-space: nowrap; } } ` diff --git a/src/pages/administrative/general.tsx b/src/pages/administrative/general.tsx index 9b349e8..d4fc47d 100644 --- a/src/pages/administrative/general.tsx +++ b/src/pages/administrative/general.tsx @@ -10,6 +10,7 @@ import { api } from '../../services/api'; import { GeneralView } from '../../styles/layouts/general/GeneralView' import MuiAlert, { AlertProps } from '@mui/material/Alert' import Snackbar from '@mui/material/Snackbar'; +import getAPIClient from '../../services/ssrApi'; const Alert = React.forwardRef(function Alert( props, @@ -18,13 +19,15 @@ const Alert = React.forwardRef(function Alert( return }) -export default function index({userName}: any) { +export default function index({userName, initialText}: any) { const editorRef = useRef(null); const [text, setText] = useState(''); const [openSnackSuccess, setOpenSnackSuccess] = useState(false) const [openSnackError, setOpenSnackError] = useState(false) + console.log(initialText) + const log = () => { if (editorRef.current) { console.log(editorRef.current.getContent()); @@ -94,27 +97,7 @@ export default function index({userName}: any) { onInit={(evt, editor) => editorRef.current = editor} onChange={value => console.log(value)} onEditorChange={(newText) => setText(newText)} - initialValue='

A SMART ENERGIA é uma consultoria independente especializada em Gestão de Energia Elétrica, consolidada como uma das três maiores consultorias do Brasil. - Devido à grande experiência em operações na CCEE – Câmara de Comercialização de Energia Elétrica e ANEEL, entrega resultados que superam as expectativas.

- -

Nasceu para gerenciar a compra de energia com inovação, transparência e imparcialidade sendo o elo forte e necessário entre os Consumidores e os - Vendedores de energia.

- -

Baseada em sua experiência no setor elétrico adquirida desde 2001 e em mais de 900 unidades migradas, atua na negociação de contratos de compra e venda de - energia, na Gestão de Energia no Mercado Livre e criação de produtos diferenciados para atender as necessidades específicas dos consumidores.

- -

Apoiada pela sólida experiência de seus gestores, conhecendo as premissas dos agentes de Comercialização e Geração para a compra e venda de energia, - aplicamos as mesmas premissas a favor dos Consumidores, disponibilizando assim um diferencial único para a tomada de decisão e elaboração das estratégias de - contratação de energia.

-
    -
  • Informação
    • -
  • Economia
    • -
  • Gestão de Energia
    • -
  • Imparcialidade
    • -
  • Previsão de Custos
    • -
  • Experiência
    • -
  • Relacionamento
    • -
' + initialValue={initialText[0].about} init={{ height: 500, width: '100%', @@ -138,9 +121,19 @@ export default function index({userName}: any) { } export const getServerSideProps: GetServerSideProps = async (ctx) => { + const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['user-name']: userName } = parseCookies(ctx) + let initialText = [] + + await apiClient.get('/aboutUs').then(res => { + initialText = res.data.data + console.log(res.data.data) + }).catch(res => { + console.log(res) + }) + if (!token) { return { redirect: { @@ -152,7 +145,10 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { - userName + userName, + initialText } } } + + diff --git a/src/pages/chartTelemetry/index.tsx b/src/pages/chartTelemetry/index.tsx index 616b647..2f50d66 100644 --- a/src/pages/chartTelemetry/index.tsx +++ b/src/pages/chartTelemetry/index.tsx @@ -78,7 +78,7 @@ export default function chartTelemetry({userName}) { }) await api.post('/telemetry/discretization', { - "type": discretization, + "type": discretization? discretization : "5_min", "filters": [ {"type" : "=", "field": "med_5min.ponto", "value": unity}, {"type" : "between", "field": "dia_num", "value": [startDate, endDate]} @@ -90,7 +90,7 @@ export default function chartTelemetry({userName}) { }) await api.post('/telemetry/discretization', { - "type": discretization, + "type": discretization? discretization : "5_min", "filters": [ {"type" : "=", "field": "med_5min.ponto", "value": unity}, {"type" : "between", "field": "dia_num", "value": [startDate, endDate]} @@ -103,7 +103,7 @@ export default function chartTelemetry({userName}) { await api.post('/telemetry/demand', { "filters": [ - {"type" : "=", "field": 'med_5min.ponto', "value": unity}, + {"type" : "=", "field": "med_5min.ponto", "value": unity}, {"type" : "between", "field": "dia_num", "value": [startDate, endDate]} ] }).then(res => { diff --git a/src/pages/costIndicator/index.tsx b/src/pages/costIndicator/index.tsx index 295c1eb..5df5848 100644 --- a/src/pages/costIndicator/index.tsx +++ b/src/pages/costIndicator/index.tsx @@ -10,6 +10,21 @@ import getAPIClient from '../../services/ssrApi' import { CostIndicatorView } from '../../styles/layouts/economy/costIndicator/CostIndicatorView' export default function CostIndicator({graphData, userName}: any) { + const months = [ + 'Jan', + 'Fev', + 'Mar', + 'Abr', + 'Mai', + 'Jun', + 'Jul', + 'Ago', + 'Set', + 'Out', + 'Nov', + 'Dez' + ] + return ( diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index 66219bb..1632fb0 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -267,7 +267,7 @@ export default function pld({tableData, graphByHourData, graphByMonthData, userN setPage('table')}>{'< Voltar para tabela PLD'} - +
@@ -321,7 +321,7 @@ export default function pld({tableData, graphByHourData, graphByMonthData, userN data1={dataByDay} data3={dataByDay} dataset1={'Economia'} dataset2={'barra1'} dataset3={'2021'} label={EvolucaoPld.label} - title='Evolução PLD (R$/MWh)' subtitle='' /> + title='' subtitle='' /> @@ -335,8 +335,7 @@ export default function pld({tableData, graphByHourData, graphByMonthData, userN
diff --git a/src/styles/app/AppView.ts b/src/styles/app/AppView.ts index ea12755..ce3f86e 100644 --- a/src/styles/app/AppView.ts +++ b/src/styles/app/AppView.ts @@ -3,8 +3,6 @@ import styled from 'styled-components' export const AppView = styled.main` display: flex; - height: calc(20rem[] - 65px); - margin: 0 0 0 0; padding: 0; diff --git a/src/styles/globals.ts b/src/styles/globals.ts index 3330e31..b70c240 100644 --- a/src/styles/globals.ts +++ b/src/styles/globals.ts @@ -1,9 +1,6 @@ import { createGlobalStyle } from 'styled-components' export const GlobalStyle = createGlobalStyle` - @import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); - @import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap'); - body::-webkit-scrollbar { width: 15px; }