`
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
+ }
+
+
+
+ >
)
}
diff --git a/src/pages/areaTest.tsx b/src/pages/areaTest.tsx
index 520490d..3d3bd54 100644
--- a/src/pages/areaTest.tsx
+++ b/src/pages/areaTest.tsx
@@ -14,6 +14,7 @@ import FormHelperText from '@mui/material/FormHelperText';
import FormControl from '@mui/material/FormControl';
import TextField from '@mui/material/TextField';
import LineChart from '../components/graph/LineChart'
+import Footer from '../components/footer/footer'
@@ -44,30 +45,7 @@ export default function areaTest() {
return (
<>
- {/*
- Password
-
-
- {values.showPassword ? : }
-
-
- }
- label="Password"
- />
- */}
- {/* */}
+
>
)
}
diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx
index 3ecc926..61d0192 100644
--- a/src/pages/dashboard.tsx
+++ b/src/pages/dashboard.tsx
@@ -6,6 +6,7 @@ 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 Footer from '../components/footer/footer';
import Link from 'next/link'
import LineChart from '../components/graph/LineChart'
import { SingleBar } from '../components/graph/SingleBar'
@@ -26,6 +27,7 @@ export default function Dashboard() {
Smart Energia - Dashboard
+
@@ -50,7 +52,12 @@ export default function Dashboard() {
+
+
+
+
+
)
}
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 3139d2e..9984e6f 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react'
import Image from 'next/image';
import Link from 'next/link';
import { useRouter } from 'next/router'
-
+import Footer from '../components/footer/footer'
import OutlinedInput from '@mui/material/OutlinedInput';
import InputLabel from '@mui/material/InputLabel';
import InputAdornment from '@mui/material/InputAdornment';
@@ -86,6 +86,7 @@ export default function Home() {
+55(41) 3012-5900
www.energiasmart.com.br
+
)
}
diff --git a/src/pages/telemetria.tsx b/src/pages/telemetria.tsx
index 79e30e8..b1898ae 100644
--- a/src/pages/telemetria.tsx
+++ b/src/pages/telemetria.tsx
@@ -106,8 +106,8 @@ export default function Telemetria() {
-
-
+
+
diff --git a/src/styles/app/AppView.ts b/src/styles/app/AppView.ts
index fec14cc..ea12755 100644
--- a/src/styles/app/AppView.ts
+++ b/src/styles/app/AppView.ts
@@ -3,9 +3,9 @@ import styled from 'styled-components'
export const AppView = styled.main`
display: flex;
- height: 100%;
+ height: calc(20rem[] - 65px);
- margin: 0 0 10rem 0;
+ margin: 0 0 0 0;
padding: 0;
@media (max-width: 1008px) {
diff --git a/src/styles/layouts/dashboard/DashboardView.ts b/src/styles/layouts/dashboard/DashboardView.ts
index 43f2b61..809900d 100644
--- a/src/styles/layouts/dashboard/DashboardView.ts
+++ b/src/styles/layouts/dashboard/DashboardView.ts
@@ -74,6 +74,8 @@ export const DashboardView = styled.main`
width: 100%;
}
+
+
}
`