From 1540a1a63a1e3443f048088f185b7328dbd5df4e Mon Sep 17 00:00:00 2001 From: Alex Santos Date: Wed, 22 Jun 2022 15:28:08 -0300 Subject: [PATCH 1/2] udpate --- src/pages/verifyEmail.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/verifyEmail.tsx b/src/pages/verifyEmail.tsx index e26c3d0..99591f9 100644 --- a/src/pages/verifyEmail.tsx +++ b/src/pages/verifyEmail.tsx @@ -56,7 +56,9 @@ export default function VerifyEmail() { setSent(true)} /> + + setCode(value.target.value)} /> {verifyConfirmationCode()}} /> From 0192b2bb281ddf325faa25dcda824944fd1ad9c0 Mon Sep 17 00:00:00 2001 From: Alex Santos Date: Thu, 23 Jun 2022 10:05:47 -0300 Subject: [PATCH 2/2] update --- public/assets/iconePDF.png | Bin 0 -> 6414 bytes src/components/header/Header.tsx | 4 +- .../inputUpload.tsx | 3 +- .../inputUploadView.ts | 0 src/components/inputUploadPdf/inputUpload.tsx | 49 +++++++++++++++++ .../inputUploadPdf/inputUploadView.ts | 51 ++++++++++++++++++ src/components/sidebar/Sidebar.tsx | 1 + src/pages/administrative/clients/index.tsx | 17 +++--- .../administrative/industryInfo/index.tsx | 49 +++++++++++++++++ src/pages/index.tsx | 4 +- 10 files changed, 165 insertions(+), 13 deletions(-) create mode 100644 public/assets/iconePDF.png rename src/components/{inputUplaod => inputUploadImg}/inputUpload.tsx (96%) rename src/components/{inputUplaod => inputUploadImg}/inputUploadView.ts (100%) create mode 100644 src/components/inputUploadPdf/inputUpload.tsx create mode 100644 src/components/inputUploadPdf/inputUploadView.ts create mode 100644 src/pages/administrative/industryInfo/index.tsx diff --git a/public/assets/iconePDF.png b/public/assets/iconePDF.png new file mode 100644 index 0000000000000000000000000000000000000000..38e28b25d6f3c786a86faf89100a9643448bac04 GIT binary patch literal 6414 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 literal 0 HcmV?d00001 diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx index db21a84..1fba829 100644 --- a/src/components/header/Header.tsx +++ b/src/components/header/Header.tsx @@ -45,12 +45,12 @@ export default function Header({ name, admin }: headerInterface) {
- { + {/* { !admin? : null - } + } */}

olá, {name} diff --git a/src/components/inputUplaod/inputUpload.tsx b/src/components/inputUploadImg/inputUpload.tsx similarity index 96% rename from src/components/inputUplaod/inputUpload.tsx rename to src/components/inputUploadImg/inputUpload.tsx index dad71d1..34daa86 100644 --- a/src/components/inputUplaod/inputUpload.tsx +++ b/src/components/inputUploadImg/inputUpload.tsx @@ -3,7 +3,7 @@ import React,{ useState, useEffect } from 'react' import { InputUploadView } from './inputUploadView' -export default function InputUpload() { +export default function InputUploadPdf() { const [images, setImages] = useState([] as any); const [imageURLS, setImageURLs] = useState([]); @@ -34,6 +34,7 @@ export default function InputUpload() {

+
diff --git a/src/components/inputUplaod/inputUploadView.ts b/src/components/inputUploadImg/inputUploadView.ts similarity index 100% rename from src/components/inputUplaod/inputUploadView.ts rename to src/components/inputUploadImg/inputUploadView.ts diff --git a/src/components/inputUploadPdf/inputUpload.tsx b/src/components/inputUploadPdf/inputUpload.tsx new file mode 100644 index 0000000..96866c0 --- /dev/null +++ b/src/components/inputUploadPdf/inputUpload.tsx @@ -0,0 +1,49 @@ +import React,{ useState, useEffect } from 'react' +import Image from 'next/image'; + + +import { InputUploadView } from './inputUploadView' + + +export default function InputUploadPdf() { + const [images, setImages] = useState([] as any); + const [imageURLS, setImageURLs] = useState([]); + + useEffect(() => { + if (images.length < 1) return; + const newImageUrls: any = []; + images.forEach((image:any) => newImageUrls.push(URL.createObjectURL(image))); + setImageURLs(newImageUrls); + }, [images]); + + function onImageChange(e: any) { + setImages([...e.target.files]); + // console.log(e); + } + + return ( + + +
+ + {imageURLS.map((imageSrc, index) => ( + + ))} + + + + +
+ +
+ + +
+ + +
+ +
+ + ) +} diff --git a/src/components/inputUploadPdf/inputUploadView.ts b/src/components/inputUploadPdf/inputUploadView.ts new file mode 100644 index 0000000..fed659c --- /dev/null +++ b/src/components/inputUploadPdf/inputUploadView.ts @@ -0,0 +1,51 @@ +import styled from 'styled-components' + +export const InputUploadView = styled.div` + +border-radius: 4px; +border:1px solid gray ; +background-color: white; +width: 300px; +height: 50px; + +input[type="file"] { + display: none; + + } + +label { + width: 140px; + height: 30px; + margin-top: -30px; + border-radius: 4px; + margin-left: 69px; + background-color: #254F7F; + color: white; + font-size: 13px; + font-weight: 600; + text-transform: uppercase; + display: flex; + text-align: center; + cursor: pointer; + } + .TitleButton{ + margin-top: 4px; + margin-left: 30px; + } + + .testess{ + margin-left: 80px; + position: absolute; + + } + + .imgContainer{ + max-width: 40px; + margin-top: 9px; + margin-left: 4px; + height: 30px; +} + + + +` diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index 186c956..3e777ff 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -59,6 +59,7 @@ export default function Sidebar() {
  • {'Sobre Nós'}
  • {'FAQ >'}
  • {'Notificações >'}
    • +
  • {'Info Setorial'}
    • (function Alert( return ; }); -export default function clients({clients}) { +export default function clients({clients, userName}) { const [client, setClient] = useState({ name: String, email: String, @@ -121,23 +121,23 @@ export default function clients({clients}) { - notificação cadastrada com sucesso! + Cliente cadastrada com Sucesso! - Notificação não cadastrada! + Cliente não cadastrado! - notificação excluida com sucesso! + Cliente excluido com sucesso! - Notificação não excluida! + Cliente não excluido! @@ -196,7 +196,7 @@ export default function clients({clients}) { client_id: value.target.value }) }} variant="outlined" /> - +

    setOpen(false)} /> handleCreateClient(client)}/> @@ -218,7 +218,7 @@ export default function clients({clients}) { export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) - + const { ['user-name']: userName } = parseCookies(ctx) let clients = []; await apiClient.get('/user').then(res => { @@ -241,6 +241,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { clients, + userName } } } diff --git a/src/pages/administrative/industryInfo/index.tsx b/src/pages/administrative/industryInfo/index.tsx new file mode 100644 index 0000000..17d3d4d --- /dev/null +++ b/src/pages/administrative/industryInfo/index.tsx @@ -0,0 +1,49 @@ +import { GetServerSideProps } from 'next' +import Head from 'next/head' +import { parseCookies } from 'nookies' +import React from 'react' +import BasicButton from '../../../components/buttons/basicButton/BasicButton' +import Header from '../../../components/header/Header' +import PageTitle from '../../../components/pageTitle/PageTitle' +import { IndustryInfoView } from '../../../styles/layouts/industryInfo/IndustryInfoView' +import InputUploadPdf from '../../../components/inputUploadPdf/inputUpload'; + +export default function industryInfo({userName}: any) { + return ( + + + Smart Energia - Info de Setor + +
    +
    + + +
    + + + + + + ) +} + +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/index.tsx b/src/pages/index.tsx index 614c0e7..e77dc36 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -74,7 +74,7 @@ export default function Home() { if (email === "" || password === ""){ setOpenSnackError(true) }else{ - await signIn({email, password}).then(res => {console.log('')}).catch(res => setOpenSnackError(true)) + await signIn({email, password}) } } @@ -89,7 +89,7 @@ export default function Home() { useEffect(() => { setValues({ - password: "", + password: null, showPassword: false, }); setEmail("")