Smart/smartEnergyView-frontend
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/0.1.0' into 'main'

Browse Source 
🏷️ fix code types

See merge request kluppsoftware/smart-energia-web!36
This commit is contained in:
José Corte 2022-05-12 14:42:35 +00:00
commit 4931eb9be4
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/_app.tsx
View File

@ -42,7 +42,7 @@ function MyApp({ Component, pageProps }: AppProps) {
<Head> <Head>
<meta name="viewport" content="viewport-fit=cover" /> <meta name="viewport" content="viewport-fit=cover" />
</Head> </Head>
<Home auth={rota} /> <Home />
<GlobalStyle /> <GlobalStyle />
{ {
rota != '/'? rota != '/'?

12
pages/areaTest.tsx
View File

@ -1,10 +1,7 @@
import React from 'react' import React from 'react'
import Image from 'next/image'
import BasicButton from '../src/components/buttons/basicButton/BasicButton' import BasicButton from '../src/components/buttons/basicButton/BasicButton'
<<<<<<< HEAD
import Image from 'next/image';
=======
import GradientButton from '../src/components/buttons/gradientButton/GradientButton' import GradientButton from '../src/components/buttons/gradientButton/GradientButton'
>>>>>>> d76992f98de0130492c71a92530d12b04793ecac
import Graph from '../src/components/graph/Chart' import Graph from '../src/components/graph/Chart'
import Box from '@mui/material/Box'; import Box from '@mui/material/Box';
import IconButton from '@mui/material/IconButton'; import IconButton from '@mui/material/IconButton';
@ -45,7 +42,6 @@ export default function areaTest() {
}; };
return ( return (
<<<<<<< HEAD
// <Graph title='Indicador de custo' /> // <Graph title='Indicador de custo' />
<FormControl sx={{ m: 1, width: '25ch' }} variant="outlined"> <FormControl sx={{ m: 1, width: '25ch' }} variant="outlined">
<InputLabel htmlFor="outlined-ad <InputLabel htmlFor="outlined-ad
@ -71,11 +67,5 @@ export default function areaTest() {
/> />
</FormControl> </FormControl>
=======
<>
<Graph title='Indicador de custo' />
<GradientButton title='GRÁFICO' description='Gerar gráficos com os dados selecionados' orange />
</>
>>>>>>> d76992f98de0130492c71a92530d12b04793ecac
) )
} }