Flaviana

package.json

@@ -3,6 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@phosphor-icons/react": "^2.0.13",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",

src/components/Header.jsx

@@ -1,3 +1,31 @@
+<<<<<<< HEAD
+import styles from '../styles/components/Header.module.css'
+import * as Icon from '@phosphor-icons/react';
+
+const Header = () =>{
+    return(
+         <div className={styles.headerContainer}>
+            <div className={styles.headerRight}>
+                <img className={styles.logo} src='' alt='logo-hamburgueria' />
+                <nav className={styles.headerNav}>
+                    <h2>Início</h2>
+                    <h2>Cadastro</h2>
+                    <h2>Equipe</h2>
+                </nav>
+            </div>
+
+            <div className={styles.headerSocialMedia}>
+                <Icon.FacebookLogo size={32} style={{color: '#ffffff'}} alt='facebook-logo' />
+                <Icon.InstagramLogo size={32} style={{color:'#ffffff'}} alt='intagram-logo' />
+                <Icon.TwitterLogo size={32}  style={{color:'#ffffff'}} alt='twitter-logo' />
+                <Icon.LinkedinLogo size={32} style={{color:'#ffffff'}} alt='linkedin-logo' />
+            </div>
+        </div>
+    )
+}
+
+export default Header;
+=======
 import styles from "../styles/components/Header.module.css";
 import { FaFacebookF } from "react-icons/fa6";
 import { FaInstagram } from "react-icons/fa6";
@@ -50,3 +78,4 @@ const Header = () => {
 };
 
 export default Header;
+>>>>>>> 73d7d096a0a031d356f436ccb3be6a3d70b787a1

src/context/Books.jsx

@@ -1,11 +1,15 @@
+<<<<<<< HEAD
+const { createContext, useContext } = require("react");
+=======
 import { getbooks, createBook } from "../service/books.service";
 
 const { createContext, useState, useContext, useEffect } = require("react");
+>>>>>>> 73d7d096a0a031d356f436ccb3be6a3d70b787a1
 
 const BooksContext = createContext();
 
 export const BooksProvider = ({ children }) => {
-  const [books, setBooks] = useState([]);
+  // const [books, setBooks] = useState([]);
 
   //TODO: implementar funções de manipulação de objetos
 
@@ -26,9 +30,13 @@ export const BooksProvider = ({ children }) => {
   }, []);
 
   return (
+<<<<<<< HEAD
+    <BooksContext.Provider value=""> {children}</BooksContext.Provider>
+=======
     <BooksContext.Provider value={{ books, addBook }}>
       {children}
     </BooksContext.Provider>
+>>>>>>> 73d7d096a0a031d356f436ccb3be6a3d70b787a1
   );
 };
 

src/routes/app.routes.jsx

@@ -1,14 +1,16 @@
 import { BrowserRouter, Route, Routes } from "react-router-dom";
+import Header from "../components/Header";
 import ROUTES from "./routes";
 
 export const Router = () => {
   return (
     <BrowserRouter>
       <Routes>
         {ROUTES.map((route, index) => (
-          <Route key={index} path={route.path} element={<route.element />} />
+          <Route key={index} path={route.path} element={<route.element />}/>
         ))}
       </Routes>
+      <Header />
     </BrowserRouter>
   );
 };

src/styles/components/Header.module.css

@@ -1,3 +1,35 @@
+<<<<<<< HEAD
+.headerContainer{
+    display: flex;
+    background-color: #000000;
+    justify-content: space-between;
+}
+
+.headerRight{
+    display: flex;
+}
+
+.logo{
+    padding: 10px;
+}
+
+.headerNav{
+    display: flex;
+
+}
+
+h2{
+    color: #ffffff;
+    padding: 10px;
+    font-size: 24px;
+    justify-content: space-around;
+}
+
+.headerSocialMedia{
+    display: flex;
+    padding: 35px;
+}
+=======
 .container {
 }
 
@@ -6,3 +38,4 @@
 
 .lista-icones {
 }
+>>>>>>> 73d7d096a0a031d356f436ccb3be6a3d70b787a1