From 906162182ce2d0c0a3a0f369e8dbf9240630714c Mon Sep 17 00:00:00 2001 From: Alex Santos Date: Thu, 19 May 2022 17:08:11 -0300 Subject: [PATCH] update --- src/components/footer/Footer.tsx | 20 +++++++++ src/components/footer/FooterView.ts | 28 ++++++++++++ src/components/sidebar/SidebarView.ts | 5 +-- src/pages/_app.tsx | 45 ++++++++++--------- src/pages/areaTest.tsx | 26 +---------- src/pages/dashboard.tsx | 7 +++ src/pages/index.tsx | 3 +- src/pages/telemetria.tsx | 4 +- src/styles/app/AppView.ts | 4 +- src/styles/layouts/dashboard/DashboardView.ts | 2 + 10 files changed, 92 insertions(+), 52 deletions(-) create mode 100644 src/components/footer/Footer.tsx create mode 100644 src/components/footer/FooterView.ts diff --git a/src/components/footer/Footer.tsx b/src/components/footer/Footer.tsx new file mode 100644 index 0000000..b010fec --- /dev/null +++ b/src/components/footer/Footer.tsx @@ -0,0 +1,20 @@ +/* eslint-disable no-mixed-spaces-and-tabs */ +import * as React from 'react'; +import CssBaseline from '@mui/material/CssBaseline'; +import Box from '@mui/material/Box'; +import Typography from '@mui/material/Typography'; +import Container from '@mui/material/Container'; +import Link from '@mui/material/Link'; + +import { FooterView } from './footerView' + +export default function Footer() { + return ( + + +

© 2022 - Smart Energia

+ + + + ); +} diff --git a/src/components/footer/FooterView.ts b/src/components/footer/FooterView.ts new file mode 100644 index 0000000..2d094fb --- /dev/null +++ b/src/components/footer/FooterView.ts @@ -0,0 +1,28 @@ + +import styled from "styled-components"; + +export const FooterView = styled.footer` +position: relative; +display: flex; +align-items: center; +justify-content: flex-start; +background-color: #254F7F; +width: 100%; +height:65px; +bottom: 0; + + +p{ + color: #fff; + margin: 1px 5px 5px 20px; + font-size: 13px; +} + + +/*responsive*/ + + + +`; + + diff --git a/src/components/sidebar/SidebarView.ts b/src/components/sidebar/SidebarView.ts index 94df76f..374604a 100644 --- a/src/components/sidebar/SidebarView.ts +++ b/src/components/sidebar/SidebarView.ts @@ -15,8 +15,7 @@ export const SidebarView = styled.nav` flex-direction: column; width: 20%; - min-width: 15rem; - + min-width: 20rem; margin: 0; padding: 0; @@ -191,7 +190,7 @@ export const SidebarView = styled.nav` font-size: 14px; ul { li { - height: 3.5rem; + height: 2rem; } } } diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 270101d..8a80a65 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -3,7 +3,7 @@ import { useRouter } from 'next/router' import { AppProps } from 'next/app' import NProgress from 'nprogress' - +import Footer from '../components/footer/Footer' import Sidebar from '../components/sidebar/Sidebar' import { GlobalStyle } from '../styles/globals' import { AppView } from '../styles/app/AppView' @@ -40,25 +40,30 @@ function MyApp({ Component, pageProps }: AppProps) { }, [router]) return ( - - - - - - - - - - { - rota != '/' && rota != '/forgotPassword' && rota != '/verifyEmail'? - <> - - - - : - null - } - + <> + + + + + + + + + + { + rota != '/' && rota != '/forgotPassword' && rota != '/verifyEmail'? + <> + + + + + : + null + } + +