SavioCarvalhoMoraes/desafio-react-e-typescript-savio-carvalho-moraes
1
0
Fork 0
forked from M3-Academy/desafio-react-e-typescript
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/footer #16

Merged
SavioCarvalhoMoraes merged 5 commits from feature/footer into development 2023-01-19 15:02:48 +00:00
Conversation 0 Commits 5 Files Changed 21 +7520 -7324
9 changed files with 7520 additions and 7324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit de23dd51d9 - Show all commits

50
package-lock.json generated
View File

@ -22,7 +22,7 @@
"react": "^18.2.0",
"react-bootstrap": "^2.7.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.6.2",
"react-router-dom": "^6.7.0",
"react-scripts": "5.0.1",
"react-text-mask": "^5.5.0",
"typescript": "^4.9.4",
@ -3142,9 +3142,9 @@
}
},
"node_modules/@remix-run/router": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.2.1.tgz",
"integrity": "sha512-XiY0IsyHR+DXYS5vBxpoBe/8veTeoRpMHP+vDosLZxL5bnpetzI0igkxkLZS235ldLzyfkxF+2divEwWHP3vMQ==",
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.0.tgz",
"integrity": "sha512-nwQoYb3m4DDpHTeOwpJEuDt8lWVcujhYYSFGLluC+9es2PyLjm+jjq3IeRBQbwBtPLJE/lkuHuGHr8uQLgmJRA==",
"engines": {
"node": ">=14"
}
@ -15337,11 +15337,11 @@
}
},
"node_modules/react-router": {
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.6.2.tgz",
"integrity": "sha512-uJPG55Pek3orClbURDvfljhqFvMgJRo59Pktywkk8hUUkTY2aRfza8Yhl/vZQXs+TNQyr6tu+uqz/fLxPICOGQ==",
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.7.0.tgz",
"integrity": "sha512-KNWlG622ddq29MAM159uUsNMdbX8USruoKnwMMQcs/QWZgFUayICSn2oB7reHce1zPj6CG18kfkZIunSSRyGHg==",
"dependencies": {
"@remix-run/router": "1.2.1"
"@remix-run/router": "1.3.0"
},
"engines": {
"node": ">=14"
@ -15351,12 +15351,12 @@
}
},
"node_modules/react-router-dom": {
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.6.2.tgz",
"integrity": "sha512-6SCDXxRQqW5af8ImOqKza7icmQ47/EMbz572uFjzvcArg3lZ+04PxSPp8qGs+p2Y+q+b+S/AjXv8m8dyLndIIA==",
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.7.0.tgz",
"integrity": "sha512-jQtXUJyhso3kFw430+0SPCbmCmY1/kJv8iRffGHwHy3CkoomGxeYzMkmeSPYo6Egzh3FKJZRAL22yg5p2tXtfg==",
"dependencies": {
"@remix-run/router": "1.2.1",
"react-router": "6.6.2"
"@remix-run/router": "1.3.0",
"react-router": "6.7.0"
},
"engines": {
"node": ">=14"
@ -20910,9 +20910,9 @@
}
},
"@remix-run/router": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.2.1.tgz",
"integrity": "sha512-XiY0IsyHR+DXYS5vBxpoBe/8veTeoRpMHP+vDosLZxL5bnpetzI0igkxkLZS235ldLzyfkxF+2divEwWHP3vMQ=="
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.0.tgz",
"integrity": "sha512-nwQoYb3m4DDpHTeOwpJEuDt8lWVcujhYYSFGLluC+9es2PyLjm+jjq3IeRBQbwBtPLJE/lkuHuGHr8uQLgmJRA=="
},
"@restart/hooks": {
"version": "0.4.7",
@ -29688,20 +29688,20 @@
"integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
},
"react-router": {
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.6.2.tgz",
"integrity": "sha512-uJPG55Pek3orClbURDvfljhqFvMgJRo59Pktywkk8hUUkTY2aRfza8Yhl/vZQXs+TNQyr6tu+uqz/fLxPICOGQ==",
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.7.0.tgz",
"integrity": "sha512-KNWlG622ddq29MAM159uUsNMdbX8USruoKnwMMQcs/QWZgFUayICSn2oB7reHce1zPj6CG18kfkZIunSSRyGHg==",
"requires": {
"@remix-run/router": "1.2.1"
"@remix-run/router": "1.3.0"
}
},
"react-router-dom": {
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.6.2.tgz",
"integrity": "sha512-6SCDXxRQqW5af8ImOqKza7icmQ47/EMbz572uFjzvcArg3lZ+04PxSPp8qGs+p2Y+q+b+S/AjXv8m8dyLndIIA==",
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.7.0.tgz",
"integrity": "sha512-jQtXUJyhso3kFw430+0SPCbmCmY1/kJv8iRffGHwHy3CkoomGxeYzMkmeSPYo6Egzh3FKJZRAL22yg5p2tXtfg==",
"requires": {
"@remix-run/router": "1.2.1",
"react-router": "6.6.2"
"@remix-run/router": "1.3.0",
"react-router": "6.7.0"
}
},
"react-scripts": {

2
package.json
View File

@ -16,7 +16,7 @@
"react": "^18.2.0",
"react-bootstrap": "^2.7.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.6.2",
"react-router-dom": "^6.7.0",
"react-scripts": "5.0.1",
"react-text-mask": "^5.5.0",
"typescript": "^4.9.4",

12
src/components/Router/Router.tsx
View File

@ -1,5 +1,6 @@
import React from "react";
import { Routes, Route, BrowserRouter } from "react-router-dom";
import { Home } from "../../pages/Home";
import { Teste } from "../../pages/Teste";
import { Cursos } from "../../pages/Cursos";
@ -14,13 +15,10 @@ import Usuario from "./Usuario";
const RoutesUrl = () => {
return (
<BrowserRouter>
<Routes>
<Route path="/" element={<Teste titulo={"home"} />}>
<Route path="cursos" element={<Cursos titulo={"Cursos"} />} />
</Route>
</Routes>
</BrowserRouter>
<Routes>
<Route path="/" element={<Home titulo="Home" />}></Route>
<Route path="/cursos" element={<Cursos titulo="Cursos" />} />
</Routes>
);
};

2
src/components/SearchBox/searchBox.module.scss
View File

@ -33,7 +33,7 @@
border-radius: 5px;
background-color: white;
right: 30px;
top: 5px;
top: 0px;
&::placeholder {
color: #c4c4c4;
font-weight: 400;

12
src/index.tsx
View File

@ -1,18 +1,22 @@
import React from "react";
import ReactDOM from "react-dom/client";
import "./styles/main.scss";
import { BrowserRouter, Route } from "react-router-dom";
import { Home } from "./pages/Home";
import { Teste } from "./pages/Teste";
import { BrowserRouter } from "react-router-dom";
import { Cursos } from "./pages/Cursos";
import { RoutesUrl } from "./components/Router/Router";
import { Header } from "./sectors/Header/Header";
import { Footer } from "./sectors/Footer/Footer";
const root = ReactDOM.createRoot(
document.getElementById("root") as HTMLElement
);
root.render(
<React.StrictMode>
<BrowserRouter>
<Home titulo={"home"}></Home>
<Header></Header>
<RoutesUrl></RoutesUrl>
<Footer></Footer>
</BrowserRouter>
</React.StrictMode>
);

1
src/pages/Cursos.tsx
View File

@ -5,7 +5,6 @@ import { Header } from "../sectors/Header/Header";
const Cursos = (prop: { titulo: string }) => {
return (
<div>
<Header></Header>
<Caminhos titulo={prop.titulo}></Caminhos>
<CursosBody></CursosBody>
</div>

6
src/pages/Home.tsx
View File

@ -2,11 +2,7 @@ import React from "react";
import { Header } from "../sectors/Header/Header";
import { Footer } from "../sectors/Footer/Footer";
const Home = (prop: { titulo: string }) => {
return (
<div>
<Footer></Footer>
</div>
);
return <div></div>;
};
export { Home };

4
src/styles/partials/navigation.scss
View File

@ -49,10 +49,10 @@
background-color: black;
}
.btn-close {
color: white;
background-color: #c4c4c4;
}
.offcanvas {
width: 100%;
width: 100% !important;
height: 585px;
}
}

14755
yarn.lock
View File

File diff suppressed because it is too large Load Diff