diff --git a/src/components/administrativeTables/FaqTable.tsx b/src/components/administrativeTables/FaqTable.tsx index cc0b09e..a7014bb 100644 --- a/src/components/administrativeTables/FaqTable.tsx +++ b/src/components/administrativeTables/FaqTable.tsx @@ -45,15 +45,6 @@ function createData( }; } -const rows = [ - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'inativo'), -]; - function descendingComparator(a: T, b: T, orderBy: keyof T) { if (b[orderBy] < a[orderBy]) { return -1; @@ -183,8 +174,6 @@ export default function FaqTable({questionData, onChange}: FaqTableInterface) { const [dense, setDense] = useState(false); const [rowsPerPage, setRowsPerPage] = useState(5); - console.table(questionData) - console.table(rows) const handleRequestSort = ( event: React.MouseEvent, property: keyof Data, @@ -240,7 +229,7 @@ export default function FaqTable({questionData, onChange}: FaqTableInterface) { // Avoid a layout jump when reaching the last page with empty rows. const emptyRows = - page > 0 ? Math.max(0, (1 + page) * rowsPerPage - rows.length) : 0; + page > 0 ? Math.max(0, (1 + page) * rowsPerPage - questionData.length) : 0; return ( @@ -313,7 +302,7 @@ export default function FaqTable({questionData, onChange}: FaqTableInterface) {

- olá, {'josé'} + olá, {name}

- + ) diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index 271bf62..48df240 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -55,7 +55,7 @@ export default function Sidebar() {
  • {'Clientes >'}
    • -
  • {'Visão Geral'}
    • +
  • {'Sobre Nós'}
  • {'FAQ >'}
  • {'Notificações >'}

    25

    • diff --git a/src/contexts/AuthContext.tsx b/src/contexts/AuthContext.tsx index 7b1a415..f335f00 100644 --- a/src/contexts/AuthContext.tsx +++ b/src/contexts/AuthContext.tsx @@ -47,7 +47,10 @@ export function AuthProvider({children}: {children: React.ReactNode}) { if (user.id) setCookie(undefined, 'user-id', user.id) - console.log(user) + if (user.name) + setCookie(undefined, 'user-name', user.name) + + api.defaults.headers['Authorization'] = `Bearer ${token}` if (!exception) { if (user.role == 2) { @@ -59,10 +62,6 @@ export function AuthProvider({children}: {children: React.ReactNode}) { } else { return } - - api.defaults.headers['Authorization'] = `Bearer ${token}` - - setUser(user) } return ( diff --git a/src/pages/aboutUs.tsx b/src/pages/aboutUs.tsx index c4697fb..d0eb0a0 100644 --- a/src/pages/aboutUs.tsx +++ b/src/pages/aboutUs.tsx @@ -1,17 +1,19 @@ +import { GetServerSideProps } from 'next' import Head from 'next/head' import Image from 'next/image' +import { parseCookies } from 'nookies' import React from 'react' import Banner from '../components/banner/Banner' import Header from '../components/header/Header' import { AboutUsView } from '../styles/layouts/aboutUs/AboutUsView' -export default function aboutUs() { +export default function aboutUs({userName}) { return ( Smart Energia - About Us -
    +
    @@ -50,3 +52,24 @@ export default function aboutUs() { ) } + +export const getServerSideProps: GetServerSideProps = async (ctx) => { + const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) + + if (!token) { + return { + redirect: { + destination: '/', + permanent: false + } + } + } + + return { + props: { + userName + } + } +} + diff --git a/src/pages/accumulatedSavings.tsx b/src/pages/accumulatedSavings.tsx index 6be7e0e..bce6a4c 100644 --- a/src/pages/accumulatedSavings.tsx +++ b/src/pages/accumulatedSavings.tsx @@ -12,13 +12,13 @@ import { dataEconomiaBruta } from '../services/economiaBruta' import getAPIClient from '../services/ssrApi' import { AccumulatedSavingsView } from '../styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView' -export default function AccumulatedSavings({graphData, years}: any) { +export default function AccumulatedSavings({graphData, years, userName}: any) { return ( Smart Energia - Economia Acumulada -
    +
    { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) + let graphData = []; @@ -57,6 +59,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { props: { graphData, years, + userName } } } diff --git a/src/pages/administrative/clients/index.tsx b/src/pages/administrative/clients/index.tsx index 11386de..de11418 100644 --- a/src/pages/administrative/clients/index.tsx +++ b/src/pages/administrative/clients/index.tsx @@ -114,6 +114,7 @@ export default function clients({clients}) { return (
    + notificação cadastrada com sucesso! diff --git a/src/pages/administrative/faq/index.tsx b/src/pages/administrative/faq/index.tsx index 592ac3a..0b057d2 100644 --- a/src/pages/administrative/faq/index.tsx +++ b/src/pages/administrative/faq/index.tsx @@ -51,11 +51,9 @@ const Alert = React.forwardRef(function Alert( type FaqInterface = { question: string; answer: string; - } -export default function Sidebar({faqData} : any ) { - +export default function Sidebar({faqData, userName} : any ) { const [openModalInativar, setOpenModalInativar] = useState(false) const [openSnackSuccess, setOpenSnackSuccess] = useState(false); const [openSnackError, setOpenSnackError] = useState(false); @@ -85,7 +83,7 @@ export default function Sidebar({faqData} : any ) { async function handleDeleteNotification(id: any) { await id.map((value) => { - api.delete(`/faq/${value}`).then(res => { + api.delete(`/faq/${value.id}`).then(res => { setOpenSnackSuccessDelete(true) setOpenModalInativar(false) window.location.reload() @@ -93,12 +91,9 @@ export default function Sidebar({faqData} : any ) { }) } - - const [faq, setFaq] = useState({ question: '', answer : '', - }) const [selectedfaq, setSelectedfaq] = useState([]) @@ -107,13 +102,12 @@ export default function Sidebar({faqData} : any ) { await api.post('/faq', { "question": question, "answer": answer, - - }).then(res => console.log(res.data)) + }).then(res => { + setOpenSnackSuccess(true) + window.location.reload() + }).catch(res => setOpenSnackError(true)) } - - - const [open, setOpen] = React.useState(false); const handleOpen = () => setOpen(true); const handleClose = () => setOpen(false); @@ -121,29 +115,29 @@ export default function Sidebar({faqData} : any ) { return ( <> -
    +
    - Notificação cadastrada com sucesso! + Pergunta cadastrada com sucesso! - Notificação não cadastrada! + Pergunta não cadastrada! - notificação excluida com sucesso! + Pergunta excluida com sucesso! - Notificação não excluida! + Pergunta não excluida! @@ -197,6 +191,7 @@ export default function Sidebar({faqData} : any ) { export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) let faqData = []; @@ -217,7 +212,8 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { - faqData + faqData, + userName } } } diff --git a/src/pages/administrative/general.tsx b/src/pages/administrative/general.tsx index b45eead..ec52d81 100644 --- a/src/pages/administrative/general.tsx +++ b/src/pages/administrative/general.tsx @@ -4,12 +4,15 @@ import MenuItem from '@mui/material/MenuItem'; import Select, { SelectChangeEvent } from '@mui/material/Select'; import TextField from '@mui/material/TextField'; import { Editor } from '@tinymce/tinymce-react' +import { GetServerSideProps } from 'next'; +import { parseCookies } from 'nookies'; import React, { useRef, useState } from 'react' import Header from '../../components/header/Header'; +import PageTitle from '../../components/pageTitle/PageTitle'; import { GeneralView } from '../../styles/layouts/general/GeneralView' -export default function index() { +export default function index({userName}: any) { const editorRef = useRef(null); const [text, setText] = useState(''); @@ -25,7 +28,8 @@ export default function index() { return ( -
    +
    +
    - Norte - Nordeste - Sul - Sudeste - + + Região + +
    - + + Dia + +
    - setPage('table')}>{'< voltar para tabela PLD'} + setPage('table')}>{'< Voltar para tabela PLD'}
    setDate(value.target.value)}/> - console.log()}/> + {/* console.log()}/> */}
    { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) + let tableData = []; @@ -315,6 +329,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { tableData, + userName } } } diff --git a/src/pages/resumoOperacao.tsx b/src/pages/resumoOperacao.tsx index 3a1a6cb..03a4e57 100644 --- a/src/pages/resumoOperacao.tsx +++ b/src/pages/resumoOperacao.tsx @@ -20,19 +20,12 @@ import data from '../services/dados.json' import getAPIClient from '../services/ssrApi'; import { Pagination, TableView } from '../styles/layouts/ResumoOperacao/ResumoOperacaoView'; -export default function ResumoOperacao() { - const csvData = [ - [ "value", "unidade1", "name", "Unidade-1", "operacao", "Compra", "montante", "130,00", "contraparte", "cOPEL COM I5", "preco", "234,67", "valorNF", "38.257,15" ], - [ "value", "unidade2", "name", "Unidade-2", "operacao", "Compra", "montante", "20,00", "contraparte", "EMEWE I5", "preco", "234,67", "valorNF", "38.257,15"], - [ "value", "unidade3", "name", "Unidade-3", "operacao", "Compra", "montante", "30,00", "contraparte", "EMEWE I5", "preco", "234,67", "valorNF", "38.257,15" ], - [ "value", "unidade4", "name", "Unidade-4", "operacao", "Compra", "montante", "40,00", "contraparte", "COPEL COM I5", "preco", "234,67", "valorNF", "38.257,15" ], - [ "value", "unidade5", "name", "Unidade-5", "operacao", "Compra", "montante", "500,00","contraparte", "COPEL COM I5", "preco", "234,67", "valorNF", "38.257,15" ], - [ "value", "unidade6", "name", "Unidade-6", "operacao", "Compra", "montante", "300,00", "contraparte", "COPEL COM I5", "preco","234,67", "valorNF", "965,95" ] - ]; +export default function ResumoOperacao({tableData, userName}: any) { + const csvData = tableData; const [month, setMonth] = useState(''); const [unidade, setUnidade] = useState(''); - const [tableData, setTableData] = useState([]); + const [tableDataState, setTableDataState] = useState([]); const handleChangeMonth = (event: SelectChangeEvent) => { setMonth(event.target.value); @@ -42,26 +35,29 @@ export default function ResumoOperacao() { }; useEffect(() => { - api.post('/operation', { - "filters": [ - {"type" : "=", "field": "mes", "value": `${month}/2022`}, - {"type" : "=", "field": "dados_te.cod_smart_unidade", "value": 180103211002} - ] - }).then(res => { - setTableData(res.data.data) - console.log(tableData) - }).catch(res => { - console.log(res) - }) - console.log(tableData) + if (unidade!=='' || month!==''){ + api.post('/operation', { + "filters": [ + {"type" : "=", "field": "mes", "value": `${month}/2022`}, + {"type" : "=", "field": "dados_te.cod_smart_unidade", "value": unidade} + ] + }).then(res => { + setTableDataState(res.data.data) + }).catch(res => { + console.log(res) + }) + } else { + setTableDataState(tableData) + } + }, [month, unidade]) - return( + return ( Smart Energia - Resumo de Operação -
    +

    Seletor Mês

    @@ -75,10 +71,10 @@ export default function ResumoOperacao() { label="Unidade" onChange={handleChangeUnidade} > - + Nenhum { - data.unidades.map((value) => { - return {value.name} + tableData.map((value) => { + return {value.cod_smart_unidade} }) } @@ -93,6 +89,7 @@ export default function ResumoOperacao() { label="Month" onChange={handleChangeMonth} > + Nenhum Janeiro Fevereiro Março @@ -121,7 +118,7 @@ export default function ResumoOperacao() { { - tableData.map((value, index) => { + tableDataState.map((value, index) => { return <> {value.cod_smart_unidade} @@ -150,16 +147,21 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['user-id']: id } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) let tableData = []; - await apiClient.post(`/user/${id}`).then(res => { + await apiClient.post('/operation', { + "filters": [] + }).then(res => { + console.log(res.data.data) tableData = res.data.data - console.log(tableData) }).catch(res => { console.log(res) }) + console.log(tableData) + if (!token) { return { redirect: { @@ -172,6 +174,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { tableData, + userName } } } diff --git a/src/pages/telemetria.tsx b/src/pages/telemetria.tsx index c20530f..9a9adc8 100644 --- a/src/pages/telemetria.tsx +++ b/src/pages/telemetria.tsx @@ -15,11 +15,13 @@ import { start } from 'nprogress'; import LineChart from '../components/graph/LineChart'; import { FatorPotencia } from '../services/fatorPotencia'; import RenderIf from '../utils/renderIf'; +import { GetServerSideProps } from 'next'; +import { parseCookies } from 'nookies'; -export default function Telemetria() { +export default function Telemetria({userName}: any) { const [unity, setUnity] = React.useState(''); const [startDate, setStartDate] = React.useState(''); const [endDate, setEndDate] = React.useState(''); @@ -36,7 +38,7 @@ export default function Telemetria() { Smart Energia - Telemetria -
    +