diff --git a/public/assets/logout.svg b/public/assets/logout.svg index ff3156a..ac136c2 100644 --- a/public/assets/logout.svg +++ b/public/assets/logout.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/mapCard/MapCard.tsx b/src/components/mapCard/MapCard.tsx index 743612b..367178f 100644 --- a/src/components/mapCard/MapCard.tsx +++ b/src/components/mapCard/MapCard.tsx @@ -14,7 +14,6 @@ export default function MapCard({ title, subtitle, statistic, imgSource }: MapCa const route = title==='R$/MWh'? '/consumption': `pld/${title.slice(0,2).toLocaleLowerCase()}-${title.slice(3,5).toLocaleLowerCase()}` return ( -
@@ -33,6 +32,5 @@ export default function MapCard({ title, subtitle, statistic, imgSource }: MapCa
- ) } diff --git a/src/components/mapCard/MapCardView.ts b/src/components/mapCard/MapCardView.ts index 22aea15..36e3f69 100644 --- a/src/components/mapCard/MapCardView.ts +++ b/src/components/mapCard/MapCardView.ts @@ -9,8 +9,6 @@ export const MapCardView = styled.figure` margin-right: 25px; - cursor: pointer; - * { margin: 0; padding: 0; diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index d9c3d64..6a62ebb 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -38,7 +38,7 @@ export default function Sidebar() {
  • {'Notícias >'}
  • {'Info Setorial >'}
  • {'Consumo'}
    • -
  • {'Notificação >'}
    • +
  • {'Notificação >'}
  • {'Sobre Nós >'}
  • {'FAQ >'}
    • diff --git a/src/components/sidebar/SidebarView.ts b/src/components/sidebar/SidebarView.ts index d14d64d..324b93d 100644 --- a/src/components/sidebar/SidebarView.ts +++ b/src/components/sidebar/SidebarView.ts @@ -130,7 +130,6 @@ export const SidebarView = styled.nav` width: 10rem; height: 3rem; - background-color: red; border-style: none; border-radius: 6px; @@ -138,7 +137,7 @@ export const SidebarView = styled.nav` font-family: 'Poppins'; font-weight: 600; font-size: 99.98%; - color: #fff; + color: #f00; cursor: pointer; } diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx index 483be0d..d9f2128 100644 --- a/src/pages/dashboard.tsx +++ b/src/pages/dashboard.tsx @@ -6,19 +6,22 @@ import MapCard from '../components/mapCard/MapCard' import GraphCard from '../components/graph/graphCard/ChartCard' import Header from '../components/header/Header' import PageTitle from '../components/pageTitle/PageTitle' +import Link from 'next/link' export default function Dashboard() { return (
    -
    - - - - - -
    + +
    + + + + + +
    +
    diff --git a/src/pages/forgotPassword.tsx b/src/pages/forgotPassword.tsx index d77e3f8..8267f08 100644 --- a/src/pages/forgotPassword.tsx +++ b/src/pages/forgotPassword.tsx @@ -25,8 +25,8 @@ export default function ForgotPassword() {

    Bem-Vindo

    Estratégias Inteligentes em
    Gestão de Energia

    - setPassword(value.target.value)} variant="outlined"/> - setConfirmPassword(value.target.value)} variant="outlined"/> + setPassword(value.target.value)} variant="outlined"/> + setConfirmPassword(value.target.value)} variant="outlined"/> router.push('/')} /> diff --git a/src/pages/notifications.tsx b/src/pages/notifications.tsx new file mode 100644 index 0000000..e712169 --- /dev/null +++ b/src/pages/notifications.tsx @@ -0,0 +1,27 @@ +import React from 'react' +import CommonQuestionsCard from '../components/faqQuestionsCard/FaqQuestionsCard' +import Header from '../components/header/Header' +import PageTitle from '../components/pageTitle/PageTitle' +import { FaqView } from '../styles/layouts/commonQuestions/FaqView' + +export default function Notifications() { + return ( + +
    + +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit.

    +
    + +
    + +
    + +
    + +
    + +
    +
    + + ) +} diff --git a/src/pages/pld/[region].tsx b/src/pages/pld/[region].tsx deleted file mode 100644 index a518f71..0000000 --- a/src/pages/pld/[region].tsx +++ /dev/null @@ -1,229 +0,0 @@ -import React, { useEffect, useState } from 'react' -import Image from 'next/Image' -import { useRouter } from 'next/router' - -import Header from '../../components/header/Header' -import MenuItem from '@mui/material/MenuItem'; -import Select, { SelectChangeEvent } from '@mui/material/Select'; - -import { PldGraphView, PldTableView } from '../../styles/layouts/pld/PldView' - -import RenderIf from '../../utils/renderIf' -import BasicButton from '../../components/buttons/basicButton/BasicButton'; -import Chart from '../../components/graph/Chart'; - -export default function region() { - const router = useRouter() - const { region } = router.query - - const [page, setPage] = useState(1) - const [age, setAge] = React.useState(''); - - const handleChange = (event: SelectChangeEvent) => { - setAge(event.target.value); - }; - - useEffect(() => { - console.log(page) - }, [page]) - - return ( -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    MêsNordesteNorteSudesteSul
    Unidade - 9500130Compra122,269COPEL COM I5234,67
    Unidade - 9500130Compra110,348EMEWE I5190,16
    Unidade - 9500130Compra13,074PACTO COMERCIALIZADORA I5300,36
    Unidade - 9500130Compra133,117COPEL COM I5300,36
    Unidade - 9500130Compra120,138EMEWE I5234,67
    Unidade - 9500130Compra14,897PACTO COMERCIALIZADORA I5300,36
    Unidade - 9500130Compra120,138EMEWE I5234,67
    Unidade - 9500130Compra14,897PACTO COMERCIALIZADORA I5300,36
    Unidade - 9500130Compra120,138EMEWE I5234,67
    Unidade - 9500130Compra14,897PACTO COMERCIALIZADORA I5300,36
    Unidade - 9500130Compra120,138EMEWE I5234,67
    Unidade - 9500130Compra14,897PACTO COMERCIALIZADORA I5300,36
    Unidade - 9500130Compra120,138EMEWE I5234,67
    Unidade - 9500130Compra14,897PACTO COMERCIALIZADORA I5300,36
    Unidade - 9500130Compra120,138EMEWE I5234,67
    Unidade - 9500130Compra14,897PACTO COMERCIALIZADORA I5300,36
    - -
    -
    -

    Valores Diarios:

    -

    R$100,00

    -
    -
    -

    Valores Horários:

    -

    R$100,00

    -
    -
    -     -     - - - -
    - - -
    -
    -
    - -
    - - -
    - -     -     - - - -
    - - -
    -
    - - -
    - -     -     - -
    - - -
    -
    - ) -} diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx new file mode 100644 index 0000000..603dd14 --- /dev/null +++ b/src/pages/pld/index.tsx @@ -0,0 +1,217 @@ +import React, { useEffect, useState } from 'react' +import Image from 'next/Image' +import { useRouter } from 'next/router' + +import Header from '../../components/header/Header' +import MenuItem from '@mui/material/MenuItem'; +import Select, { SelectChangeEvent } from '@mui/material/Select'; + +import { GoBack, PldGraphView, PldTableView } from '../../styles/layouts/pld/PldView' + +import RenderIf from '../../utils/renderIf' +import BasicButton from '../../components/buttons/basicButton/BasicButton'; +import Chart from '../../components/graph/Chart'; +import PageTitle from '../../components/pageTitle/PageTitle'; +import Link from 'next/link'; + +export default function region() { + const router = useRouter() + const { region } = router.query + + const [page, setPage] = useState('table') + const [age, setAge] = React.useState(''); + + const handleChange = (event: SelectChangeEvent) => { + setAge(event.target.value); + }; + + useEffect(() => { + console.log(page) + }, [page]) + + return ( +
    +
    + + {'< voltar para visão geral'} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MêsNordesteNorteSudesteSul
    2101xxxxxxxxxxxxxxxx
    2102xxxxxxxxxxxxxxxx
    2103xxxxxxxxxxxxxxxx
    2104xxxxxxxxxxxxxxxx
    2105xxxxxxxxxxxxxxxx
    2106xxxxxxxxxxxxxxxx
    2107xxxxxxxxxxxxxxxx
    2108xxxxxxxxxxxxxxxx
    2109xxxxxxxxxxxxxxxx
    2110xxxxxxxxxxxxxxxx
    2111xxxxxxxxxxxxxxxx
    2112xxxxxxxxxxxxxxxx
    2021xxxxxxxxxxxxxxxx
    Mínxxxxxxxxxxxxxxxx
    Maxxxxxxxxxxxxxxxxx
    Desv Padxxxxxxxxxxxxxxxx
    +
    +
    setPage('perMouth')}> +

    Valores Diarios: R$100,00

    +
    +
    setPage('perDate')}> +

    Valores Horários: R$100,00

    +
    +
    +     +     + + + setPage('table')}>{'< voltar para tabela pld'} + + +
    +
    + +
    + + +
    + +     +     + + + setPage('table')}>{'< voltar para tabela pld'} + + +
    + + +
    + +     +     +
    + ) +} diff --git a/src/pages/verifyEmail.tsx b/src/pages/verifyEmail.tsx index b42a5ed..d15b1d2 100644 --- a/src/pages/verifyEmail.tsx +++ b/src/pages/verifyEmail.tsx @@ -5,14 +5,15 @@ import { useRouter } from 'next/router' import LoginButton from '../components/buttons/loginButton/LoginButton'; import TextField from '@mui/material/TextField'; -import {AiOutlineEyeInvisible, AiOutlineEye} from 'react-icons/ai'; +import Alert from '@mui/material/Alert'; -import { ForgotPasswordContainer, ForgotPasswordView } from '../styles/layouts/forgotPassword/ForgotPasswordView'; import { VerifyEmailContainer, VerifyEmailView } from '../styles/layouts/forgotPassword/verifyEmail'; +import RenderIf from '../utils/renderIf'; export default function VerifyEmail() { const [sent, setSent]=useState(false); - const [code, setCode]=useState(''); + const [code, setCode]=useState('') + const [codeStatus, setCodeStatus]=useState(null) const [values, setValues] = React.useState({ password: '', @@ -22,17 +23,23 @@ export default function VerifyEmail() { const router = useRouter() const rota = router.pathname - useEffect(() => { - if (code === '0000') { - router.push('/forgotPassword') - } - }, [code]) - useEffect(() => { setCode('') setSent(false) + setCodeStatus(null) }, [rota]) + function verifyConfirmationCode() { + if (code === '0000') { + setTimeout(() => { + router.push('/') + }, 2500); + setCodeStatus(true) + } else { + setCodeStatus(false) + } + } + return ( @@ -41,14 +48,20 @@ export default function VerifyEmail() {

    Estratégias Inteligentes em
    Gestão de Energia

    - { - sent? - setCode(value.target.value)} /> - : - null - } - + setSent(true)} /> + + + + setCode(value.target.value)} /> + {verifyConfirmationCode()}} /> + + Codigo de veerificação aceito — aguarde um instante! + + + Codigo de verificação invalido — tente outro! + +
    Ou diff --git a/src/styles/app/AppView.ts b/src/styles/app/AppView.ts index f52d117..fec14cc 100644 --- a/src/styles/app/AppView.ts +++ b/src/styles/app/AppView.ts @@ -3,6 +3,8 @@ import styled from 'styled-components' export const AppView = styled.main` display: flex; + height: 100%; + margin: 0 0 10rem 0; padding: 0; diff --git a/src/styles/layouts/dashboard/DashboardView.ts b/src/styles/layouts/dashboard/DashboardView.ts index ad86bcb..7287a9a 100644 --- a/src/styles/layouts/dashboard/DashboardView.ts +++ b/src/styles/layouts/dashboard/DashboardView.ts @@ -27,6 +27,8 @@ export const DashboardView = styled.main` box-shadow: 0px 0px 15px -3px rgba(0,0,0,0.1); border-radius: 10px; + + cursor: pointer; } .dashboard { diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index d8fda62..41975ed 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -118,6 +118,8 @@ export const PldTableView = styled.main` -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; background: #F8F8F8; + + cursor: pointer; } } @@ -182,3 +184,7 @@ export const PldGraphView = styled.main` } } ` + +export const GoBack = styled.label` + cursor: pointer +`