Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
9628fc8
adicionado dependencias (axios, styled components, material ui e rout…
DAVIGSOUZA Jan 20, 2021
eff73a1
Merge pull request #1 from future4code/garcia
DAVIGSOUZA Jan 20, 2021
8cdcd69
tela inicial
adriellyfelix Jan 20, 2021
b5929f2
Merge pull request #2 from future4code/tela-inicial
DAVIGSOUZA Jan 20, 2021
d7f6227
Criando estado global e tema
DavBio Jan 20, 2021
f3a3e4c
Merge pull request #3 from future4code/mello
DavBio Jan 20, 2021
1528236
criado CardRestaurante
DavBio Jan 20, 2021
27bcea6
paginas de add e editar endereço
Asoaresdev Jan 20, 2021
94344e7
adicionado componente header
DAVIGSOUZA Jan 20, 2021
9b7a9a8
Merge pull request #5 from future4code/header
DAVIGSOUZA Jan 20, 2021
eb91ffd
Merge pull request #4 from future4code/andrea-4fooda1
rjuliuz Jan 20, 2021
748df0d
Finalização do Layout da Page Perfil
rjuliuz Jan 21, 2021
b3ba9bb
Merge pull request #6 from future4code/4food-profile
Asoaresdev Jan 21, 2021
296610f
inputs controlados e validação dos campos das paginas com endereço
Asoaresdev Jan 21, 2021
997e534
Merge pull request #7 from future4code/andrea-4fooda2
rjuliuz Jan 21, 2021
c801c1a
Estilização da barra de pesquisa feita
DavBio Jan 21, 2021
c13c0e7
Merge pull request #8 from future4code/mello
DavBio Jan 21, 2021
4920fe8
aplicando estado global de input da pesquisa
DavBio Jan 21, 2021
2ae24d0
Merge pull request #9 from future4code/mello
DavBio Jan 21, 2021
4f477bc
adicionando página de busca
DavBio Jan 21, 2021
54974ed
Merge pull request #10 from future4code/mello
DavBio Jan 21, 2021
29b39bd
adicionando search placeholder
DavBio Jan 21, 2021
1015b0d
rederizando o botão do header por props
DavBio Jan 21, 2021
a0d6dfd
Merge pull request #11 from future4code/mello
DavBio Jan 21, 2021
7ccdec3
iniciado mock da pagina carrinho
DAVIGSOUZA Jan 21, 2021
94ce92f
Merge pull request #12 from future4code/carrinho
DAVIGSOUZA Jan 21, 2021
1617653
finalizado mock do carrinho
DAVIGSOUZA Jan 21, 2021
d0d42a0
Merge pull request #13 from future4code/carrinho
DAVIGSOUZA Jan 21, 2021
b7c55d6
layout da pagina de signUp, falta controlar os inputs
Asoaresdev Jan 21, 2021
8e3f313
resolvendo conflito
Asoaresdev Jan 21, 2021
0fca3bb
tela-login
adriellyfelix Jan 21, 2021
cde5c5b
resolvendo conflitos
adriellyfelix Jan 21, 2021
87d2e2e
Merge pull request #14 from future4code/andrea-4fooda3
adriellyfelix Jan 21, 2021
a12d7d3
Merge branch 'master' of https://github.com/future4code/tang-4foodA i…
adriellyfelix Jan 21, 2021
9a66995
Merge pull request #15 from future4code/tela-login
DavBio Jan 21, 2021
20a8d52
Adicionando filtros nas páginas da Home
DavBio Jan 21, 2021
ac93013
Merge pull request #16 from future4code/mello
rjuliuz Jan 22, 2021
81100e7
resolvido conflito no componente Buttons
DAVIGSOUZA Jan 22, 2021
ccc0f3f
Merge pull request #17 from future4code/footer
DAVIGSOUZA Jan 22, 2021
9fc9093
resolvido conflitos de endereçado do component Buttons
DAVIGSOUZA Jan 22, 2021
14963c5
Merge pull request #18 from future4code/footer
DAVIGSOUZA Jan 22, 2021
8a73232
finalizado componente FooterMenu
DAVIGSOUZA Jan 22, 2021
262277f
Merge pull request #19 from future4code/footer
DAVIGSOUZA Jan 22, 2021
c491917
layout e inputs controlados pagina de sugnUp
Asoaresdev Jan 22, 2021
e586d02
criado mock do card de pratos do restaurante
DAVIGSOUZA Jan 22, 2021
92499c6
Merge pull request #21 from future4code/carrinho
DAVIGSOUZA Jan 22, 2021
9e0a3c5
Merge pull request #20 from future4code/andrea-4fooda4
DavBio Jan 22, 2021
f95eb55
adicionando footer à home
DavBio Jan 22, 2021
92793ef
Criado componente Pedido em Andamento e ajustes de css
DavBio Jan 22, 2021
15b720b
validando login
adriellyfelix Jan 22, 2021
c943919
layout pagina de editar perfil, com os inputs controlados
Asoaresdev Jan 23, 2021
69ec4ba
adicionado componente popUp quantidade
DAVIGSOUZA Jan 23, 2021
33c6a85
Merge pull request #24 from future4code/carrinho
DAVIGSOUZA Jan 23, 2021
6dae36c
Merge pull request #22 from future4code/mello
DAVIGSOUZA Jan 23, 2021
0d14859
Merge pull request #23 from future4code/andrea-4fooda5
DAVIGSOUZA Jan 23, 2021
aebe0d6
finalizado componente pop up, select não funciona
DAVIGSOUZA Jan 23, 2021
b4f88fd
Merge pull request #25 from future4code/carrinho
DAVIGSOUZA Jan 23, 2021
2d46bbf
Merge branch 'master' of https://github.com/future4code/tang-4foodA i…
adriellyfelix Jan 23, 2021
8e126a2
consumindo api de login
adriellyfelix Jan 23, 2021
068cf31
corrigindo validacao de email e senha
adriellyfelix Jan 23, 2021
d092ee3
corrigindo validacao de senha incorreta
adriellyfelix Jan 23, 2021
f22ef67
Merge pull request #26 from future4code/consumindo-api-login
rjuliuz Jan 24, 2021
c6e3ce9
estilização da pagina de restaurantes
DAVIGSOUZA Jan 25, 2021
46e1945
Merge pull request #27 from future4code/restaurante
DAVIGSOUZA Jan 25, 2021
78d1437
início da lógica de validação na API
Asoaresdev Jan 25, 2021
7ad218a
adicionado hook useProtectedPage
DAVIGSOUZA Jan 25, 2021
bbd25b4
Merge pull request #28 from future4code/andrea-4fooda6
DAVIGSOUZA Jan 25, 2021
f90b99a
Merge pull request #29 from future4code/garcia
DAVIGSOUZA Jan 25, 2021
6c591e1
revisão e pequenos acertos de layout
DAVIGSOUZA Jan 25, 2021
6a64934
Merge pull request #30 from future4code/garcia
DAVIGSOUZA Jan 25, 2021
d9a9fa0
signup e endereço funcionando sem validações
Asoaresdev Jan 26, 2021
27ef41c
Merge pull request #31 from future4code/andrea-4fooda7
DAVIGSOUZA Jan 26, 2021
b1c085d
arrumando o search placeholder
DavBio Jan 26, 2021
fb8cc5c
importando roboto pelo google fonts no index.html
DavBio Jan 26, 2021
6894068
resolvendo cor dos botões do footer menu
DavBio Jan 26, 2021
76c81bd
corrigido select do popUpQuantidade e centralização do Header
DAVIGSOUZA Jan 26, 2021
2fe7080
Merge pull request #32 from future4code/mello
DAVIGSOUZA Jan 26, 2021
9a7e71a
Merge pull request #33 from future4code/garcia
DAVIGSOUZA Jan 26, 2021
1cce196
useRequestData criado, request de restaurantes funcionando com token …
DavBio Jan 26, 2021
043f418
criação da função onClick levando para a página do restaurante, path …
DavBio Jan 26, 2021
1a739e2
removendo código não utilizado na Home
DavBio Jan 26, 2021
95cabf7
adicionando lista de restaurantes à página de busca
DavBio Jan 26, 2021
0596c11
colocando o token da aplicação no Request dos restaurantes
DavBio Jan 26, 2021
25c83ab
adicionando margin no final da home para dar espaço para o footer menu
DavBio Jan 26, 2021
27b2903
trocando pathParams de Nome para ID do restaurante
DavBio Jan 26, 2021
7ef1b93
Merge pull request #34 from future4code/mello
DavBio Jan 26, 2021
ad556c9
minor changes
DAVIGSOUZA Jan 26, 2021
6353eb1
resolução de conflito
DAVIGSOUZA Jan 26, 2021
c987ecc
Merge pull request #35 from future4code/garcia
DAVIGSOUZA Jan 26, 2021
64b94ed
adicionada requisição, categoria dos pratos e info do restaurante na …
DAVIGSOUZA Jan 26, 2021
64b2ad2
Merge pull request #36 from future4code/garcia
DAVIGSOUZA Jan 26, 2021
7b4a4f5
validação de dados da pagina signup
Asoaresdev Jan 27, 2021
c74050b
Merge pull request #37 from future4code/andrea-4fooda8
Asoaresdev Jan 27, 2021
ac3838d
Resolvendo loop infinito
DavBio Jan 27, 2021
ae74eab
Merge pull request #38 from future4code/mello
DavBio Jan 27, 2021
70a16a3
validações de signUp
Asoaresdev Jan 27, 2021
79fe41d
Merge pull request #39 from future4code/andrea-4fooda9
Asoaresdev Jan 27, 2021
dba0cc2
resolvendo CSS dos forms
Asoaresdev Jan 27, 2021
f8422d9
Merge pull request #40 from future4code/andrea-4fooda10
DavBio Jan 27, 2021
796cc3e
criando lógica de adicionar ao carrinho
DAVIGSOUZA Jan 28, 2021
54c13f4
Merge pull request #41 from future4code/garcia
DAVIGSOUZA Jan 28, 2021
5433636
pagina de erro
Asoaresdev Jan 28, 2021
0e4c467
Merge pull request #42 from future4code/andrea-4fooda11
Asoaresdev Jan 28, 2021
5d9451b
Corrigindo responsividade
adriellyfelix Jan 29, 2021
b42b4a2
Merge pull request #43 from future4code/correcao-responsividade-login
adriellyfelix Jan 29, 2021
aa3a483
Arrumando função de adicionar ao carrinho, Adicionando função de Remo…
DavBio Jan 29, 2021
79653da
removendo código não utilizado
DavBio Jan 30, 2021
11d1122
Merge pull request #44 from future4code/mello
Asoaresdev Jan 30, 2021
7380731
endereço do usuario no carrinho e pedido em andamento
Asoaresdev Jan 30, 2021
577fe40
Merge pull request #45 from future4code/andrea-4fooda13
Asoaresdev Jan 30, 2021
fbe717e
submeter pedido status 200
Asoaresdev Jan 30, 2021
6ea48f1
Finalização da Página Perfil
rjuliuz Jan 30, 2021
9f4883e
Finalização da Página Perfil com ternário funcionando
rjuliuz Jan 30, 2021
1be7f6d
Merge pull request #46 from future4code/andrea-4fooda14
Asoaresdev Jan 30, 2021
37d6a53
Merge pull request #47 from future4code/rafa-food
Asoaresdev Jan 30, 2021
7458aad
finalizando o pedido em andamento
Asoaresdev Jan 30, 2021
04ed34f
Update README.md
Asoaresdev Jan 31, 2021
3f7e529
Merge pull request #48 from future4code/andrea-4fooda16
Asoaresdev Jan 31, 2021
6897024
limpando consoles e usando usePortectedPage
Asoaresdev Jan 31, 2021
e6bd6c9
Merge pull request #49 from future4code/andrea-4fooda17
DavBio Jan 31, 2021
39e133a
arrumando detalhes antes da entrega
DavBio Jan 31, 2021
ed7b974
Merge pull request #50 from future4code/mello
rjuliuz Jan 31, 2021
6882072
tirando verificação de token que não deu certo
DavBio Jan 31, 2021
10fda70
Merge pull request #51 from future4code/mello
Asoaresdev Feb 1, 2021
9a008f3
Update README.md
Asoaresdev Feb 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# IFUTURE

Nome dos integrantes:
- Adrielly Costa
- Andréa Soares
- Davi Souza
- David Biolchini
- Rafael Julio


Link do Surge: http://fat-leather.surge.sh/


### 🛠 Tecnologias
- React
- Styled-components
- Material-UI



This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts
Expand Down
1 change: 1 addition & 0 deletions debug.log
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[0121/095442.888:ERROR:directory_reader_win.cc(43)] FindFirstFile: O sistema n�o pode encontrar o caminho especificado. (0x3)
538 changes: 535 additions & 3 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,21 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.2",
"@material-ui/icons": "^4.11.2",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"@unform/core": "^2.1.3",
"@unform/web": "^2.1.3",
"axios": "^0.21.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.1"
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"react-toastify": "^6.2.0",
"styled-components": "^5.2.1",
"yup": "^0.32.8"
},
"scripts": {
"start": "react-scripts start",
Expand Down
8 changes: 6 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="pt-br">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
Expand All @@ -24,7 +24,11 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
<title>I Future</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
38 changes: 0 additions & 38 deletions src/App.css

This file was deleted.

31 changes: 13 additions & 18 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
import React from 'react';
import logo from './logo.svg';
import './App.css';
import React from "react";
import Routes from "./Routes/Routes";
import GlobalState from "./Global/GlobalState";
import Tema from "./Tema/Tema";
import { ToastContainer } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";

function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<div>
<GlobalState>
<Tema>
<Routes />
<ToastContainer autoClose={3000} />
</Tema>
</GlobalState>
</div>
);
}
Expand Down
17 changes: 17 additions & 0 deletions src/Components/Buttons/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from "react";
import { ContainerButton, CampoButton } from "./styles";

export default function Buttons(props) {
return (
<CampoButton>
<ContainerButton
type="submit"
color="primary"
variant="contained"
onClick={props.submeter}
>
{props.texto}
</ContainerButton>
</CampoButton>
);
}
17 changes: 17 additions & 0 deletions src/Components/Buttons/styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import styled from "styled-components";
import Button from "@material-ui/core/Button";

export const ContainerButton = styled(Button)`
width: 100%;
display: flex;
align-items: center;
color: #000;
font-weight: bold;
font-size: 1rem;
letter-spacing: -0.39px;
text-transform: normal;
`;

export const CampoButton = styled.div`
text-align: center;
`;
44 changes: 44 additions & 0 deletions src/Components/CardRestaurante/CardRestaurante.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React from 'react'
import CardMedia from '@material-ui/core/CardMedia';
import useStyles from './styles.js'
import { useHistory } from "react-router-dom";

export default function CardRestaurante(props) {

const classes = useStyles();
const history = useHistory();

const onClickCardRestaurante = (id) => {
history.push(`/restaurants/${id}`)
}

return (
<div onClick={() => onClickCardRestaurante(props.id)} className={classes.cardContainer}>
<div className={classes.card}>
<div className={classes.cardContent}>
<CardMedia
className={classes.imagem}
component="img"
alt={props.title}
height="120"
image={props.img? props.img :'https://picsum.photos/200'}
title={props.title}
/>

<h2 className={classes.nomeRestaurante}>
{props.nome? props.nome : "Restaurante"}
</h2>
<div className={classes.cardTextoDiv}>
<p className={classes.tempoDeEntrega}>
{props.tempoDeEntrega} min
</p>
<p className={classes.taxaDeEntrega}>
{props.frete? `Frete R$ ${props.frete},00` : "Frete Grátis"}
</p>
</div>

</div>
</div>
</div>
);
}
62 changes: 62 additions & 0 deletions src/Components/CardRestaurante/styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { makeStyles } from '@material-ui/core/styles';

const useStyles = makeStyles({
cardContainer: {
height: '12.25rem',
padding: '0.5rem 1rem 0',
},
card: {
padding: '0 0 1rem',
borderRadius: '8px',
border: 'solid 1px #b8b8b8'
},
imagem : {
borderTopLeftRadius: 8,
borderTopRightRadius: 8,
},
cardTextoDiv: {
display: "flex",
justifyContent: 'space-between',
},
nomeRestaurante: {
height: '1.125rem',
margin: '0.75rem 1rem 0.25rem',
fontFamily: 'Roboto',
fontSize: '1rem',
fontWeight: 'normal',
fontStretch: 'normal',
fontStyle: 'normal',
lineHeight: 'normal',
letterSpacing: '-0.39px',
color:'#e8222e',
},
tempoDeEntrega: {
width: '9.25rem',
height: '1.125rem',
margin: '0.25rem 0.5rem 0 1rem',
fontFamily: 'Roboto',
fontSize: '1rem',
fontWeight: 'normal',
fontStretch: 'normal',
fontStyle: 'normal',
lineHeight: 'normal',
letterSpacing: '-0.39px',
color: '#b8b8b8',
},
taxaDeEntrega: {
width: '8.75rem',
height: '1.125rem',
margin: '0.25rem 1rem 0 0.5rem',
fontFamily: 'Roboto',
fontSize: '1rem',
fontWeight:' normal',
fontStretch:' normal',
fontStyle: 'normal',
lineHeight: 'normal',
letterSpacing: '-0.39px',
textAlign: 'right',
color: '#b8b8b8',
}
});

export default useStyles
Loading