diff --git a/pages/_app.tsx b/pages/_app.tsx index 98112a9..a675f3a 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -11,14 +11,7 @@ import '../styles/nprogress/nprogress.css' import '../styles/globals.ts' import Home from '.' - -<<<<<<< HEAD - -function MyApp({ Component, pageProps }: AppProps) { - const [ auth, setAuth ] = useState(false) -======= import Head from 'next/head' ->>>>>>> d76992f98de0130492c71a92530d12b04793ecac function MyApp({ Component, pageProps }: AppProps) { const router = useRouter() @@ -64,4 +57,4 @@ function MyApp({ Component, pageProps }: AppProps) { ) } -export default MyApp +export default MyApp; diff --git a/pages/_document.tsx b/pages/_document.tsx index 47c06fd..5c0e6cb 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -41,16 +41,7 @@ export default class MyDocument extends Document { -<<<<<<< HEAD - -======= - - - - - ->>>>>>> d76992f98de0130492c71a92530d12b04793ecac
diff --git a/pages/index.tsx b/pages/index.tsx index 71ee5f1..82342e5 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -13,18 +13,16 @@ import TextField from '@mui/material/TextField'; import {AiOutlineEyeInvisible, AiOutlineEye} from 'react-icons/ai'; -import { LoginView, LoginContainer} from '../styles/layouts/Login/LoginView'; +import { LoginView, LoginContainer } from '../styles/layouts/login/LoginView'; export default function Home() { const [state, setstate]=useState(false); + const toggleBtn = ()=> { setstate(prevState => !prevState); } const [values, setValues] = React.useState({ - amount: '', password: '', - weight: '', - weightRange: '', showPassword: false, }); @@ -78,9 +76,7 @@ export default function Home() { Esqueceu a senha ? - -
Ou diff --git a/pages/news.tsx b/pages/news.tsx new file mode 100644 index 0000000..b214322 --- /dev/null +++ b/pages/news.tsx @@ -0,0 +1,44 @@ +import React from 'react' +import Banner from '../src/components/banner/Banner' +import Header from '../src/components/header/Header' +import BasicButton from '../src/components/buttons/basicButton/BasicButton'; +import { NewsView, Button } from '../styles/layouts/news/NewsView' + +export default function aboutUs() { + return ( + +
+ + +
+

19 Abril 2022

+ ANEEL APROVA REAJUSTE TARIFÁRIO ANUAL DA ENERGISA SERGIPE DE 16,46 % PARA O CONSUMIDOR RESIDENCIAL +
+
+

A Agência Nacional de Energia Elétrica (ANEEL) aprovou, nesta terça-feira (19/04) o reajuste tarifário anual da Energisa Sergipe – Distribuidora de Energia S.A (ESE). + As novas tarifas da empresa, que atende cerca de e 825 mil unidades consumidoras no Sergipe, entram em vigor nesta sexta, 22/04, com reajuste de 16,46 % para + o consumidor residencial.
+ Os itens que mais impactaram a correção foram os encargos setoriais, os custos de distribuição, a retirada dos componentes financeiros..

+ + +

19 Abril 2022

+ NEEL APROVA REAJUSTE MÉDIO DE 20,36% NA TARIFA DE ENERGIA NO RN +
+
+

A Agência Nacional de Energia Elétrica (ANEEL) aprovou, nesta terça-feira (19/04) o reajuste tarifário anual da Energisa Sergipe – Distribuidora de Energia S.A (ESE). + As novas tarifas da empresa, que atende cerca de e 825 mil unidades consumidoras no Sergipe, entram em vigor nesta sexta, 22/04, com reajuste de 16,46 % para + o consumidor residencial.
+ Os itens que mais impactaram a correção foram os encargos setoriais, os custos de distribuição, a retirada dos componentes financeiros..

+ +
+ + ) +} diff --git a/pages/resumoOperacao.tsx b/pages/resumoOperacao.tsx index f050d67..68eed00 100644 --- a/pages/resumoOperacao.tsx +++ b/pages/resumoOperacao.tsx @@ -1,13 +1,10 @@ import React from 'react'; -<<<<<<< HEAD -import BasicButton from '../src/components/buttons/basicButton/BasicButton'; -======= import Header from '../src/components/header/Header'; import PageTitle from '../src/components/pageTitle/PageTitle'; ->>>>>>> d76992f98de0130492c71a92530d12b04793ecac +import BasicButton from '../src/components/buttons/basicButton/BasicButton'; import Sidebar from '../src/components/sidebar/Sidebar'; -import { TableView } from '../styles/layouts/ResumoOperacao/ResumoOperacaoView'; +import { Pagination, TableView } from '../styles/layouts/ResumoOperacao/ResumoOperacaoView'; export default function ResumoOperacao() { return( @@ -17,76 +14,6 @@ export default function ResumoOperacao() {

Seletor Mês

-<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Unidade OperaçãoMontante (MWh)ContrapartePreço(R$/MWh)ValorNF/Crédito(R$)
Unidade - 9500130Compra122,269COPEL COM I5234,6738.257,15
Unidade - 9500130Compra110,348EMEWE I5190,1627.978,37
Unidade - 9500130Compra13,074PACTO COMERCIALIZADORA I5300,365.235,88
Unidade - 9500130Compra133,117COPEL COM I5300,3641.651,42
Unidade - 9500130Compra120,138EMEWE I5234,6730.460,59
Unidade - 9500130Compra14,897PACTO COMERCIALIZADORA I5300,365.965,95
- - -

Mostando de 1 a 10 de 30 Entradas

- - - - -======= Unidade @@ -148,7 +75,15 @@ export default function ResumoOperacao() { + + + +

Mostrando 1 a 10 de 30 Entradas

+

Anterior 01 02 .. 05 Proxima

+ + ->>>>>>> d76992f98de0130492c71a92530d12b04793ecac + + ) } diff --git a/pages/telemetria.tsx b/pages/telemetria.tsx index e1c3a20..7c3e3e4 100644 --- a/pages/telemetria.tsx +++ b/pages/telemetria.tsx @@ -23,7 +23,7 @@ export default function Telemetria() { return( -
+
('Mensal'); + + const handleAlignment = ( + event: React.MouseEvent, + newTimeCourse: string | null, + ) => { + setTimeCourse(newTimeCourse); + }; + return ( + + +
+ + Mensal + + + Semanal + + + Hoje + + + + ) +} diff --git a/src/components/buttonGroup/ButtonGroupView.ts b/src/components/buttonGroup/ButtonGroupView.ts new file mode 100644 index 0000000..676cfda --- /dev/null +++ b/src/components/buttonGroup/ButtonGroupView.ts @@ -0,0 +1,26 @@ +import { ButtonBaseClassKey } from "@mui/material"; +import styled from "styled-components"; + +interface ButtonGroupViewInterface { + timeCourse: string | any; +} + +export const ButtonGroupView = styled.div` + background-color: #F4F5F9; + border-radius: 10px; + .switch { + position: absolute; + + width: 85px; + height: 40px; + + margin-top: 3.5px; + transform: translateX(${props => props.timeCourse=='Mensal'? '4px' : props.timeCourse=='Semanal'? '94px' : '181px'}); + transition-duration: 0.5s; + transition-delay: 0s; + + border-radius: 8px; + + background: #fff; + } +` diff --git a/src/components/buttons/basicButton/BasicButtonView.ts b/src/components/buttons/basicButton/BasicButtonView.ts index 38e44c1..dba8475 100644 --- a/src/components/buttons/basicButton/BasicButtonView.ts +++ b/src/components/buttons/basicButton/BasicButtonView.ts @@ -4,8 +4,9 @@ export const BasicButtonView = styled.button` display: flex; justify-content: center; align-items: center; + margin-top: 10px; - width: 120px; + width: 140px; height: 45px; cursor: pointer; background: #254F7F; diff --git a/src/components/buttons/loginButton/LoginButton.tsx b/src/components/buttons/loginButton/LoginButton.tsx index 37d374a..54214a8 100644 --- a/src/components/buttons/loginButton/LoginButton.tsx +++ b/src/components/buttons/loginButton/LoginButton.tsx @@ -1,3 +1,4 @@ +import Link from 'next/link' import React from 'react' import { LoginButtonView } from './LoginButtonView' @@ -7,8 +8,10 @@ interface LoginButtonInterface { export default function LoginButton({ title }: LoginButtonInterface) { return ( - - {title} - + + + {title} + + ) } diff --git a/src/components/graph/graphCard/ChartCard.tsx b/src/components/graph/graphCard/ChartCard.tsx index b71de03..922b35c 100644 --- a/src/components/graph/graphCard/ChartCard.tsx +++ b/src/components/graph/graphCard/ChartCard.tsx @@ -6,6 +6,7 @@ import ToggleButtonGroup from '@mui/material/ToggleButtonGroup'; import { ChartCardView } from './ChartCardView'; import Chart from '../Chart'; +import ButtonGroup from '../../buttonGroup/ButtonGroup'; interface ChartCardInterface { title: string, @@ -32,23 +33,7 @@ export default function ChartCard({ title, subtitle, consumption, className }: C

{title}

{subtitle}
- - - Mensal - - - Semanal - - - Hoje - - + { consumption? diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index 282ce6f..a867c68 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -35,7 +35,7 @@ export default function Sidebar() {
  • Custo Estimado
  • Custo R/MWh
    • -
  • {'Notícias >'}
    • +
  • {'Notícias >'}
  • {'Info Setorial >'}
  • {'FAQ >'}
  • {'Sobre Nós >'}
    • diff --git a/src/txt.txt b/src/txt.txt new file mode 100644 index 0000000..e69de29 diff --git a/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts b/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts index 6df7888..f85beb0 100644 --- a/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts +++ b/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts @@ -139,9 +139,24 @@ export const TableView = styled.div` color: #254F7F; } - p{ - margin-top: 4rem; + + .pagination{ + + } +`; + +export const Pagination = styled.div` + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + + .number{ + color: #2E5581; + } + .numberColor{ + color: #ABAFB3; } - `; + diff --git a/styles/layouts/news/NewsView.ts b/styles/layouts/news/NewsView.ts new file mode 100644 index 0000000..db4a311 --- /dev/null +++ b/styles/layouts/news/NewsView.ts @@ -0,0 +1,66 @@ +import styled from "styled-components"; + +export const NewsView = styled.main` + width: 100%; + + p { + font-family: 'Poppins'; + font-style: normal; + font-weight: 300; + font-size: 17px; + line-height: 26px; + } + h2{ + color: #254F7F; + } + + ul { + list-style: none; + + li { + display: flex; + margin-bottom: 8px; + } + } + + section { + article { + display: flex; + justify-content: flex-end; + align-items: center; + + aside { + display: flex; + justify-content: center; + align-items: center; + + width: fit-content; + + flex-direction: column; + } + } + + +}`; + +export const Button = styled.div` + display: flex; + justify-content: center; + + + fieldset { + border-top: 0.7px solid #E1E1E1; + border-bottom: none; + border-left: none; + border-right: none; + display: block; + text-align: center; + width: 100%; + } + + fieldset legend { + padding: 25px 4px; + color: #ABB3BB; + font-size: 14px; + } +`;