Smart/smartEnergyView-frontend
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

add fixed issues

Browse Source
This commit is contained in:
joseCorte-exe 2022-07-22 15:28:52 -03:00
parent b97b7ed8dd
commit c8e9a5305e
11 changed files with 79 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/components/graph/graphCard/ChartCard.tsx
View File

@ -1,50 +1,17 @@
import React from 'react' import React from 'react'
import Link from 'next/link'; import Link from 'next/link';
import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import { ChartCardView } from './ChartCardView'; 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 { interface ChartCardInterface {
title: string, title: string,
subtitle: string, subtitle: string,
consumption?: number, consumption?: number,
className?: string, className?: string,
line?: boolean | undefined, children?: React.ReactNode
singleBar?: any,
children?: any
} }
export default function ChartCard({ title, subtitle, consumption, className, line, singleBar, children }: ChartCardInterface) { export default function ChartCard({ title, subtitle, consumption, className, children }: ChartCardInterface) {
const [timeCourse, setTimeCourse] = React.useState<string | null>('left');
const handleAlignment = (
event: React.MouseEvent<HTMLElement>,
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)',
},
],
};
return ( return (
<ChartCardView className={className} > <ChartCardView className={className} >
<div className='content' > <div className='content' >
@ -53,7 +20,6 @@ export default function ChartCard({ title, subtitle, consumption, className, lin
<h2>{title}</h2> <h2>{title}</h2>
<span style={{display:'block'}}>{subtitle}</span> <span style={{display:'block'}}>{subtitle}</span>
</div> </div>
{/* <ButtonGroup /> */}
</div> </div>
{ {
consumption? consumption?

2
src/components/graph/graphCard/ChartCardView.ts
View File

@ -3,7 +3,7 @@ import styled from 'styled-components';
export const ChartCardView = styled.article` export const ChartCardView = styled.article`
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-around;
flex-direction: column; flex-direction: column;

28
src/pages/aboutUs/index.tsx
View File

@ -11,7 +11,7 @@ import { AboutUsView } from '../../styles/layouts/aboutUs/AboutUsView'
export default function aboutUs({userName, text}) { export default function aboutUs({userName, text}) {
return ( return (
<AboutUsView> <main style={{width: '100%'}}>
<Head> <Head>
<title>Smart Energia - Sobre nós</title> <title>Smart Energia - Sobre nós</title>
</Head> </Head>
@ -19,19 +19,21 @@ export default function aboutUs({userName, text}) {
<Header name={userName}> <Header name={userName}>
<PageTitle title='Quem Somos' subtitle='Soluções inteligentes em Gestão de Energia'/> <PageTitle title='Quem Somos' subtitle='Soluções inteligentes em Gestão de Energia'/>
</Header> </Header>
{/* <Banner title='Quem Somos' subtitle='Soluções inteligentes em Gestão de Energia' imgSource='/assets/banners/aboutUsBanner.png' /> */} <AboutUsView>
{/* <Banner title='Quem Somos' subtitle='Soluções inteligentes em Gestão de Energia' imgSource='/assets/banners/aboutUsBanner.png' /> */}
<section dangerouslySetInnerHTML={{__html: text[0]?.about}}/> <section dangerouslySetInnerHTML={{__html: text[0]?.about}}/>
<article> <article>
<aside> <aside>
<h2>Apoio a projetos sociais</h2> <h2>Apoio a projetos sociais</h2>
<div> <div>
<Image src='/assets/stamps/whiteStamp.png' width={200} height={200} /> <Image src='/assets/stamps/whiteStamp.png' width={200} height={200} />
<Image src='/assets/stamps/blueStamp.png' width={200} height={200} /> <Image src='/assets/stamps/blueStamp.png' width={200} height={200} />
</div> </div>
</aside> </aside>
</article> </article>
</AboutUsView> </AboutUsView>
</main>
) )
} }

12
src/pages/industryInfo/index.tsx
View File

@ -44,7 +44,7 @@ export default function industryInfo({userName}: any) {
} }
return ( return (
<IndustryInfoView> <main style={{width: '100%'}}>
<Snackbar open={openSnackSuccess} autoHideDuration={4000} onClose={handleCloseSnack}> <Snackbar open={openSnackSuccess} autoHideDuration={4000} onClose={handleCloseSnack}>
<Alert onClose={handleCloseSnack} severity="success" sx={{ width: '100%' }}> <Alert onClose={handleCloseSnack} severity="success" sx={{ width: '100%' }}>
Pdf baixado Sucesso! Pdf baixado Sucesso!
@ -61,11 +61,13 @@ export default function industryInfo({userName}: any) {
<Header name={userName}> <Header name={userName}>
<PageTitle title='Info setorial' subtitle='Baixe o pdf para ver o info setorial'/> <PageTitle title='Info setorial' subtitle='Baixe o pdf para ver o info setorial'/>
</Header> </Header>
{/* <Banner title='Info setorial' subtitle='Baixe o pdf para ver o info setorial' imgSource='/assets/banners/infoSetorial.jpg'/> */} <IndustryInfoView>
<p>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</p> {/* <Banner title='Info setorial' subtitle='Baixe o pdf para ver o info setorial' imgSource='/assets/banners/infoSetorial.jpg'/> */}
<button onClick={() => handleDownloadPdf()}>Clique aqui para baixar o arquivo em PDF</button> <p>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</p>
<button onClick={() => handleDownloadPdf()}>Clique aqui para baixar o arquivo em PDF</button>
</IndustryInfoView> </IndustryInfoView>
</main>
) )
} }

1
src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts
View File

@ -12,6 +12,7 @@ export const TableView = styled.div`
width: 100%; width: 100%;
height: 100%; height: 100%;
img{ img{
margin-left:30rem; margin-left:30rem;
} }

12
src/styles/layouts/Telemetria/TelemetriaView.ts
View File

@ -7,9 +7,19 @@ export const TelemetriaView = styled.main`
flex-direction: column; flex-direction: column;
padding: 0; padding: 15px 0 0 0;
width: 100%; 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 { .modal {
position: absolute; position: absolute;

8
src/styles/layouts/aboutUs/AboutUsView.ts
View File

@ -5,6 +5,14 @@ export const AboutUsView = styled.main`
font-weight: 300; 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 { article {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;

8
src/styles/layouts/commonQuestions/FaqView.ts
View File

@ -8,6 +8,14 @@ export const FaqView = styled.main`
width: 100%; 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 { h1 {
font-weight: 700; font-weight: 700;
font-size: calc(90% + 2rem); font-size: calc(90% + 2rem);

8
src/styles/layouts/industryInfo/IndustryInfoView.ts
View File

@ -5,6 +5,14 @@ export const IndustryInfoView = styled.main`
flex-direction: column; flex-direction: column;
width: 100%; 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 { .title {
margin-bottom: 50px; margin-bottom: 50px;
} }

8
src/styles/layouts/news/NewsView.ts
View File

@ -11,6 +11,14 @@ export const NewsView = styled.main`
margin-bottom: 100px; 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 { .description {
a { a {
display: none; display: none;

10
src/styles/layouts/pld/PldView.ts
View File

@ -428,6 +428,16 @@ export const PldGraphView = styled.main`
width: 100%; 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 { .MuiOutlinedInput-input {
height: 30px; height: 30px;