diff --git a/src/components/graph/graphCard/ChartCard.tsx b/src/components/graph/graphCard/ChartCard.tsx index a339b99..578397c 100644 --- a/src/components/graph/graphCard/ChartCard.tsx +++ b/src/components/graph/graphCard/ChartCard.tsx @@ -1,50 +1,17 @@ import React from 'react' import Link from 'next/link'; -import ToggleButton from '@mui/material/ToggleButton'; -import ToggleButtonGroup from '@mui/material/ToggleButtonGroup'; - import { ChartCardView } from './ChartCardView'; -import Chart from '../Chart'; -import ButtonGroup from '../../buttonGroup/ButtonGroup'; -import RenderIf from '../../../utils/renderIf'; -import LineChart from '../LineChart'; -import { SingleBar } from '../SingleBar'; interface ChartCardInterface { title: string, subtitle: string, consumption?: number, className?: string, - line?: boolean | undefined, - singleBar?: any, - children?: any + children?: React.ReactNode } -export default function ChartCard({ title, subtitle, consumption, className, line, singleBar, children }: ChartCardInterface) { - const [timeCourse, setTimeCourse] = React.useState('left'); - - const handleAlignment = ( - event: React.MouseEvent, - newAlignment: string | null, - ) => { - setTimeCourse(newAlignment); - }; - - const labels = ['0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8',]; - - const data = { - labels, - datasets: [ - { - label: 'Dataset 1', - data: [1, 2, 3, 5, 7, 8, 9, 8, 9, 7, 8, 6, 4, 3, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 9, 10, 11, 12, 12, 14, 15, 17, 20, 21, 18, 15, 14, 12, 11, 10, 8, 6, 7, 8, 7, 9], - borderColor: 'rgb(53, 162, 235)', - backgroundColor: 'rgba(53, 162, 235, 0.5)', - }, - ], - }; - +export default function ChartCard({ title, subtitle, consumption, className, children }: ChartCardInterface) { return (
@@ -53,7 +20,6 @@ export default function ChartCard({ title, subtitle, consumption, className, lin

{title}

{subtitle}
- {/* */} { consumption? diff --git a/src/components/graph/graphCard/ChartCardView.ts b/src/components/graph/graphCard/ChartCardView.ts index ebff2d3..8a78f83 100644 --- a/src/components/graph/graphCard/ChartCardView.ts +++ b/src/components/graph/graphCard/ChartCardView.ts @@ -3,7 +3,7 @@ import styled from 'styled-components'; export const ChartCardView = styled.article` display: flex; align-items: center; - justify-content: space-between; + justify-content: space-around; flex-direction: column; diff --git a/src/pages/aboutUs/index.tsx b/src/pages/aboutUs/index.tsx index 87a895d..48800a8 100644 --- a/src/pages/aboutUs/index.tsx +++ b/src/pages/aboutUs/index.tsx @@ -11,7 +11,7 @@ import { AboutUsView } from '../../styles/layouts/aboutUs/AboutUsView' export default function aboutUs({userName, text}) { return ( - +
Smart Energia - Sobre nós @@ -19,19 +19,21 @@ export default function aboutUs({userName, text}) {
- {/* */} + + {/* */} -
-
- -
- +
+
+ +
+ +
) } diff --git a/src/pages/industryInfo/index.tsx b/src/pages/industryInfo/index.tsx index 5b6b989..89f922a 100644 --- a/src/pages/industryInfo/index.tsx +++ b/src/pages/industryInfo/index.tsx @@ -44,7 +44,7 @@ export default function industryInfo({userName}: any) { } return ( - +
Pdf baixado Sucesso! @@ -61,11 +61,13 @@ export default function industryInfo({userName}: any) {
- {/* */} -

Um resumo das atualizações gerais do Setor Elétrico, com dados sobre geração consumo, demanda, meteorologia baseadas em informações do ONS, CCEE, ANEEL, 10 Maiores Jornais e Revistas e CPTEC

- + + {/* */} +

Um resumo das atualizações gerais do Setor Elétrico, com dados sobre geração consumo, demanda, meteorologia baseadas em informações do ONS, CCEE, ANEEL, 10 Maiores Jornais e Revistas e CPTEC

+ - + +
) } diff --git a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts index eb4eaf5..63890d3 100644 --- a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts +++ b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts @@ -12,6 +12,7 @@ export const TableView = styled.div` width: 100%; height: 100%; + img{ margin-left:30rem; } diff --git a/src/styles/layouts/Telemetria/TelemetriaView.ts b/src/styles/layouts/Telemetria/TelemetriaView.ts index bc40e8b..09bbad3 100644 --- a/src/styles/layouts/Telemetria/TelemetriaView.ts +++ b/src/styles/layouts/Telemetria/TelemetriaView.ts @@ -7,9 +7,19 @@ export const TelemetriaView = styled.main` flex-direction: column; - padding: 0; + padding: 15px 0 0 0; width: 100%; + background: #F8F8F8; + box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + border-radius: 20px; + + background-color: #FFFFFF; + + /* margin-top: 10px; */ + .modal { position: absolute; diff --git a/src/styles/layouts/aboutUs/AboutUsView.ts b/src/styles/layouts/aboutUs/AboutUsView.ts index b0520e9..be1aa68 100644 --- a/src/styles/layouts/aboutUs/AboutUsView.ts +++ b/src/styles/layouts/aboutUs/AboutUsView.ts @@ -5,6 +5,14 @@ export const AboutUsView = styled.main` font-weight: 300; + background: #F8F8F8; + box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + border-radius: 20px; + + background-color: #FFFFFF; + article { display: flex; justify-content: flex-end; diff --git a/src/styles/layouts/commonQuestions/FaqView.ts b/src/styles/layouts/commonQuestions/FaqView.ts index 96652d0..273497a 100644 --- a/src/styles/layouts/commonQuestions/FaqView.ts +++ b/src/styles/layouts/commonQuestions/FaqView.ts @@ -8,6 +8,14 @@ export const FaqView = styled.main` width: 100%; + background: #F8F8F8; + box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + border-radius: 20px; + + background-color: #FFFFFF; + h1 { font-weight: 700; font-size: calc(90% + 2rem); diff --git a/src/styles/layouts/industryInfo/IndustryInfoView.ts b/src/styles/layouts/industryInfo/IndustryInfoView.ts index 3a9483e..36ddef8 100644 --- a/src/styles/layouts/industryInfo/IndustryInfoView.ts +++ b/src/styles/layouts/industryInfo/IndustryInfoView.ts @@ -5,6 +5,14 @@ export const IndustryInfoView = styled.main` flex-direction: column; width: 100%; + background: #F8F8F8; + box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + border-radius: 20px; + + background-color: #FFFFFF; + .title { margin-bottom: 50px; } diff --git a/src/styles/layouts/news/NewsView.ts b/src/styles/layouts/news/NewsView.ts index 3a550b5..861d19c 100644 --- a/src/styles/layouts/news/NewsView.ts +++ b/src/styles/layouts/news/NewsView.ts @@ -11,6 +11,14 @@ export const NewsView = styled.main` margin-bottom: 100px; + background: #F8F8F8; + box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + border-radius: 20px; + + background-color: #FFFFFF; + .description { a { display: none; diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index 8d18787..a3fec56 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -428,6 +428,16 @@ export const PldGraphView = styled.main` width: 100%; + background: #F8F8F8; + box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + border-radius: 20px; + + background-color: #FFFFFF; + + margin-top: 38px; + .MuiOutlinedInput-input { height: 30px;