Skip to content

Commit e9c4b10

Browse files
tgmarinhotgmarinho
committed
dia 3 - A escolha da stack
1 parent dcd2d08 commit e9c4b10

30 files changed

+12099
-350
lines changed

‎server/src/database/database.sqlite

0 Bytes
Binary file not shown.

‎server/src/database/database.sqlite-journal

8.52 KB
Binary file not shown.

‎web/README.md

-44
This file was deleted.

‎web/package.json

+10
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
"@types/node": "^12.0.0",
1111
"@types/react": "^16.9.0",
1212
"@types/react-dom": "^16.9.0",
13+
"axios": "^0.19.2",
14+
"leaflet": "^1.6.0",
1315
"react": "^16.13.1",
1416
"react-dom": "^16.13.1",
17+
"react-icons": "^3.10.0",
18+
"react-leaflet": "^2.7.0",
19+
"react-router-dom": "^5.2.0",
1520
"react-scripts": "3.4.1",
1621
"typescript": "~3.7.2"
1722
},
@@ -35,5 +40,10 @@
3540
"last 1 firefox version",
3641
"last 1 safari version"
3742
]
43+
},
44+
"devDependencies": {
45+
"@types/axios": "^0.14.0",
46+
"@types/react-leaflet": "^2.5.1",
47+
"@types/react-router-dom": "^5.1.5"
3848
}
3949
}

‎web/public/favicon.ico

-3.08 KB
Binary file not shown.

‎web/public/index.html

+8-31
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,19 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
5+
<link href="https://fonts.googleapis.com/css2?family=Roboto&family=Ubuntu:wght@700&display=swap" rel="stylesheet">
6+
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
7+
integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
8+
crossorigin=""/>
9+
610
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<meta name="theme-color" content="#000000" />
8-
<meta
9-
name="description"
10-
content="Web site created using create-react-app"
11-
/>
12-
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13-
<!--
14-
manifest.json provides metadata used when your web app is installed on a
15-
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
16-
-->
17-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18-
<!--
19-
Notice the use of %PUBLIC_URL% in the tags above.
20-
It will be replaced with the URL of the `public` folder during the build.
21-
Only files inside the `public` folder can be referenced from the HTML.
11+
<meta name="theme-color" content="#34cb79" />
12+
2213

23-
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
24-
work correctly both with client-side routing and a non-root public URL.
25-
Learn how to configure a non-root public URL by running `npm run build`.
26-
-->
27-
<title>React App</title>
14+
<title>Ecoleta</title>
2815
</head>
2916
<body>
3017
<noscript>You need to enable JavaScript to run this app.</noscript>
3118
<div id="root"></div>
32-
<!--
33-
This HTML file is a template.
34-
If you open it directly in the browser, you will see an empty page.
35-
36-
You can add webfonts, meta tags, or analytics to this file.
37-
The build step will place the bundled scripts into the <body> tag.
38-
39-
To begin the development, run `npm start` or `yarn start`.
40-
To create a production bundle, use `npm run build` or `yarn build`.
41-
-->
4219
</body>
4320
</html>

‎web/public/logo192.png

-5.22 KB
Binary file not shown.

‎web/public/logo512.png

-9.44 KB
Binary file not shown.

‎web/public/manifest.json

-25
This file was deleted.

‎web/public/robots.txt

-3
This file was deleted.

‎web/src/App.css

+24-29
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,33 @@
1-
.App {
2-
text-align: center;
1+
:root {
2+
--primary-color: #34cb79;
3+
--title-color: #322153;
4+
--text-color: #6c6c80;
35
}
46

5-
.App-logo {
6-
height: 40vmin;
7-
pointer-events: none;
7+
* {
8+
margin: 0;
9+
padding: 0;
10+
box-sizing: border-box;
811
}
912

10-
@media (prefers-reduced-motion: no-preference) {
11-
.App-logo {
12-
animation: App-logo-spin infinite 20s linear;
13-
}
13+
body {
14+
background: #f0f0f5;
15+
-webkit-font-smoothing: antialiased;
16+
color: var(--text-color);
1417
}
1518

16-
.App-header {
17-
background-color: #282c34;
18-
min-height: 100vh;
19-
display: flex;
20-
flex-direction: column;
21-
align-items: center;
22-
justify-content: center;
23-
font-size: calc(10px + 2vmin);
24-
color: white;
19+
body,
20+
input,
21+
button {
22+
font-family: Roboto, Arial, Helvetica, sans-serif;
2523
}
2624

27-
.App-link {
28-
color: #61dafb;
29-
}
30-
31-
@keyframes App-logo-spin {
32-
from {
33-
transform: rotate(0deg);
34-
}
35-
to {
36-
transform: rotate(360deg);
37-
}
25+
h1,
26+
h2,
27+
h3,
28+
h4,
29+
h5,
30+
h6 {
31+
color: var(--title-color);
32+
font-family: Ubuntu;
3833
}

‎web/src/App.test.tsx

-9
This file was deleted.

‎web/src/App.tsx

+5-21
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
1-
import React from 'react';
2-
import logo from './logo.svg';
3-
import './App.css';
1+
import React from "react";
2+
import "./App.css";
3+
4+
import Routes from "./routes";
45

56
function App() {
6-
return (
7-
<div className="App">
8-
<header className="App-header">
9-
<img src={logo} className="App-logo" alt="logo" />
10-
<p>
11-
Edit <code>src/App.tsx</code> and save to reload.
12-
</p>
13-
<a
14-
className="App-link"
15-
href="https://reactjs.org"
16-
target="_blank"
17-
rel="noopener noreferrer"
18-
>
19-
Learn React
20-
</a>
21-
</header>
22-
</div>
23-
);
7+
return <Routes />;
248
}
259

2610
export default App;

‎web/src/Header.tsx

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from "react";
2+
3+
interface HeaderProps {
4+
title: string;
5+
}
6+
7+
const Header: React.FC<HeaderProps> = ({ title }) => {
8+
return (
9+
<header>
10+
<h1>{title}</h1>
11+
</header>
12+
);
13+
};
14+
15+
export default Header;

0 commit comments

Comments
 (0)