diff --git a/public/images/site.webmanifest b/public/images/site.webmanifest index 45dc8a2..78bc851 100644 --- a/public/images/site.webmanifest +++ b/public/images/site.webmanifest @@ -1 +1 @@ -{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file +{"name":"","short_name":"","icons":[{"src":"/images/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/images/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file diff --git a/src/App.jsx b/src/App.jsx index 4bbf977..7d477ea 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,24 +1,29 @@ import { GlobalStyles } from './styles.global'; -import { BrowserRouter, Routes, Route } from 'react-router-dom'; +import { BrowserRouter, Routes, Route, Outlet } from 'react-router-dom'; +import Home from './pages/Home/Home'; +import Header from './components/layouts/Header/Header' -function App() { +const App = () => { return ( <> -

teste

+
+ - } /> - } /> - } /> - } /> - } /> + + + + + + + ); -} +}; export default App; diff --git a/src/components/layouts/Footer/Footer.jsx b/src/components/layouts/Footer/Footer.jsx index e69de29..10dec52 100644 --- a/src/components/layouts/Footer/Footer.jsx +++ b/src/components/layouts/Footer/Footer.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Footer = () => { + return ( + <> +

footer

+ + ); +}; + +export default Footer; diff --git a/src/components/layouts/Header/Header.jsx b/src/components/layouts/Header/Header.jsx index ba600d3..4a50f81 100644 --- a/src/components/layouts/Header/Header.jsx +++ b/src/components/layouts/Header/Header.jsx @@ -1,26 +1,41 @@ import React from 'react'; -import { Link } from 'react-router-dom'; +import Logo from '../../../assets/img/LogoLagoaSerena.svg'; +import { Link, Outlet } from 'react-router-dom'; const Header = () => { return ( -
- -
+ <> +
+ +
+ ); }; diff --git a/src/components/layouts/Header/Header.styles.js b/src/components/layouts/Header/Header.styles.js index e69de29..15bd018 100644 --- a/src/components/layouts/Header/Header.styles.js +++ b/src/components/layouts/Header/Header.styles.js @@ -0,0 +1,3 @@ +import styled from "styled-components"; + +export const Header = styled.div \ No newline at end of file diff --git a/src/components/layouts/MainLayout/MainLayout.jsx b/src/components/layouts/MainLayout/MainLayout.jsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/layouts/MainLayout/Mainlayout.styles.js b/src/components/layouts/MainLayout/Mainlayout.styles.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/Associar/Associar.jsx b/src/pages/Associar/Associar.jsx index e69de29..e4d8c22 100644 --- a/src/pages/Associar/Associar.jsx +++ b/src/pages/Associar/Associar.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Associar = () => { + return ( + <> +

Associar

+ + ); +}; + +export default Associar; diff --git a/src/pages/Contato/Contato.jsx b/src/pages/Contato/Contato.jsx index e69de29..d0cd140 100644 --- a/src/pages/Contato/Contato.jsx +++ b/src/pages/Contato/Contato.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Contato = () => { + return ( + <> +

Contato

+ + ); +}; + +export default Contato; diff --git a/src/pages/Diretoria/Diretoria.jsx b/src/pages/Diretoria/Diretoria.jsx index e69de29..f0f5667 100644 --- a/src/pages/Diretoria/Diretoria.jsx +++ b/src/pages/Diretoria/Diretoria.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Diretoria = () => { + return ( + <> +

Diretoria

+ + ); +}; + +export default Diretoria; diff --git a/src/pages/Historia/Historia.jsx b/src/pages/Historia/Historia.jsx index e69de29..01bc751 100644 --- a/src/pages/Historia/Historia.jsx +++ b/src/pages/Historia/Historia.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Historia = () => { + return ( + <> +

Historia

+ + ); +}; + +export default Historia; diff --git a/src/pages/Home/Home.jsx b/src/pages/Home/Home.jsx index e69de29..9c23718 100644 --- a/src/pages/Home/Home.jsx +++ b/src/pages/Home/Home.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Home = () => { + return ( + <> +

Home

+ + ); +}; + +export default Home; diff --git a/src/pages/Parceiros/Parceiros.jsx b/src/pages/Parceiros/Parceiros.jsx index e69de29..fd09ff2 100644 --- a/src/pages/Parceiros/Parceiros.jsx +++ b/src/pages/Parceiros/Parceiros.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Parceiros = () => { + return ( + <> +

Parceiros

+ + ); +}; + +export default Parceiros; diff --git a/src/pages/Projetos/Projetos.jsx b/src/pages/Projetos/Projetos.jsx index e69de29..93f9906 100644 --- a/src/pages/Projetos/Projetos.jsx +++ b/src/pages/Projetos/Projetos.jsx @@ -0,0 +1,11 @@ +import React from 'react'; + +const Projetos = () => { + return ( + <> +

Projetos

+ + ); +}; + +export default Projetos;