Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR de correção. Não precisa mergeear. #46

Open
wants to merge 125 commits into
base: correcao-projeto
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
0bc8fc1
separei as pastas que trabalharemos
RafaelOliveira215 Dec 7, 2020
f2281a5
Merge pull request #1 from future4code/separacao-pastas
joyceroberta Dec 7, 2020
31fb231
fiz o global state, rotas e autenticacao
RafaelOliveira215 Dec 7, 2020
dece919
Merge pull request #2 from future4code/state-route-protected
RafaelOliveira215 Dec 7, 2020
8e936c7
Criada a pagina de Login, useForm, a pasta contants com a baseURL e o…
joyceroberta Dec 7, 2020
decc2d6
Redirecionamento temporizado
rafagf77 Dec 7, 2020
a7fe618
Merge pull request #3 from future4code/inicio-paginalogin
rafagf77 Dec 7, 2020
7e36f4f
Merge branch 'master' into tela-inicial
joyceroberta Dec 7, 2020
b996813
Merge pull request #4 from future4code/tela-inicial
joyceroberta Dec 7, 2020
26f2df6
Estilização da Tela Inicial e criação de componente Header
rafagf77 Dec 7, 2020
f19e13e
Estilização da tela inicial e criação de Header
rafagf77 Dec 7, 2020
f0001bf
Merge branch 'tela-inicial' of https://github.com/future4code/dumont-…
rafagf77 Dec 7, 2020
9b46019
Estilização de tela inicial e criação de Header
rafagf77 Dec 7, 2020
bc5952d
Criação de Header
rafagf77 Dec 7, 2020
2bf970d
logotipo
rafagf77 Dec 7, 2020
f2a79b7
ajustes na pagina de login e router, aguardando a pagina de signup pa…
joyceroberta Dec 7, 2020
f0e35c6
Merge pull request #7 from future4code/andamento-paginalogin-rotas
FabioJordao97 Dec 8, 2020
3060249
Merge pull request #5 from future4code/header
FabioJordao97 Dec 8, 2020
a4e891f
Merge branch 'master' into tela-inicial
FabioJordao97 Dec 8, 2020
1056826
Merge pull request #6 from future4code/tela-inicial
FabioJordao97 Dec 8, 2020
97b9c17
Logo animado
rafagf77 Dec 8, 2020
cf8abd1
Página de cadastro funcionando. Página de endereço dando erro 401.
FabioJordao97 Dec 8, 2020
1299915
Inicio da implementação do styled na pagina de login
joyceroberta Dec 8, 2020
09ff8fb
Criação de FeedPage e CardFeed
rafagf77 Dec 8, 2020
367140b
Merge pull request #9 from future4code/feed
RafaelOliveira215 Dec 8, 2020
865cca7
Merge pull request #8 from future4code/loading
RafaelOliveira215 Dec 8, 2020
230bc2c
Styled login
joyceroberta Dec 8, 2020
4fec8a9
Merge pull request #10 from future4code/projeto-dia2
RafaelOliveira215 Dec 8, 2020
834519e
Pequenas mudanças de estilização
rafagf77 Dec 8, 2020
2787e2f
Mudança para auth
rafagf77 Dec 8, 2020
0ab199c
Merge pull request #11 from future4code/feed2
RafaelOliveira215 Dec 8, 2020
68edb67
Página de signup funcional e endereço com erro.
FabioJordao97 Dec 8, 2020
0703986
Merge branch 'master' into signup
RafaelOliveira215 Dec 8, 2020
c69d59e
Merge pull request #12 from future4code/signup
RafaelOliveira215 Dec 8, 2020
98544b0
adicionei useRequestData
RafaelOliveira215 Dec 8, 2020
bd0688d
Merge pull request #13 from future4code/requestdata
FabioJordao97 Dec 8, 2020
977806b
Commit para debugar
FabioJordao97 Dec 8, 2020
e2487fe
Integração com a API, e pagina de cadastro de endereços funcionando q…
joyceroberta Dec 8, 2020
d38a552
Merge pull request #14 from future4code/projeto-dia2
RafaelOliveira215 Dec 8, 2020
cefc497
Requisição mapeada
rafagf77 Dec 8, 2020
3b61cd7
Merge branch 'master' into feed4
rafagf77 Dec 8, 2020
2d476f6
Merge pull request #15 from future4code/feed4
joyceroberta Dec 8, 2020
1914e9a
Página de endereço finalizada e estilizada.
FabioJordao97 Dec 8, 2020
b5ff367
Mudanças no Feed, GoBack no Header, Criação de Tela Restaurante
rafagf77 Dec 9, 2020
3d6c22f
Merge branch 'master' into address
joyceroberta Dec 9, 2020
37f7dff
Merge pull request #16 from future4code/address
joyceroberta Dec 9, 2020
6fd314f
Página de perfil funcional
FabioJordao97 Dec 9, 2020
c380326
Merge pull request #17 from future4code/profile
joyceroberta Dec 9, 2020
b968c0d
Lista de produtos mapeados
rafagf77 Dec 9, 2020
6afd7d5
Merge branch 'master' into feed5
rafagf77 Dec 9, 2020
9c1072a
Criado card de pedidos, precisa dos pedidos para poder testar
joyceroberta Dec 9, 2020
1869253
Faltou a data do card de historico de pedidos
joyceroberta Dec 9, 2020
38f38a0
Merge pull request #18 from future4code/feed5
joyceroberta Dec 9, 2020
f3aad0e
Merge pull request #19 from future4code/projeto-dia3
rafagf77 Dec 9, 2020
4fc0044
pequena alteração no layout da pagina login
joyceroberta Dec 9, 2020
9395f13
Merge pull request #20 from future4code/projeto-dia3
joyceroberta Dec 9, 2020
231cfc8
Página de editar perfil funcional e opção para editar endereço linkad…
FabioJordao97 Dec 9, 2020
e332d01
Pequenas mudanças
rafagf77 Dec 9, 2020
5cf58d4
Merge branch 'master' into profile
joyceroberta Dec 9, 2020
248ef6f
Filtros funcionais de categorias
rafagf77 Dec 10, 2020
65b23fb
Merge pull request #22 from future4code/restaurant
joyceroberta Dec 10, 2020
9ed6e71
Merge pull request #21 from future4code/profile
joyceroberta Dec 10, 2020
251a319
Footer
rafagf77 Dec 10, 2020
a7907e5
Ajustes estilização
rafagf77 Dec 10, 2020
b323acc
Ajustes e ErrorPage
rafagf77 Dec 10, 2020
1f68810
Pequenos ajustes
rafagf77 Dec 10, 2020
6c2298e
Update README.md
rafagf77 Dec 10, 2020
4eab218
Merge pull request #23 from future4code/ajustes
joyceroberta Dec 10, 2020
a6c4d90
teste
RafaelOliveira215 Dec 10, 2020
c92f987
cartPage
RafaelOliveira215 Dec 10, 2020
f3973ce
Merge pull request #24 from future4code/cartPage
rafagf77 Dec 10, 2020
dabf8f9
cartpagefix
RafaelOliveira215 Dec 10, 2020
b142fd0
Merge pull request #25 from future4code/carpagefix
rafagf77 Dec 10, 2020
dfde9df
correções
rafagf77 Dec 10, 2020
b7e895d
Merge branch 'master' into order4
rafagf77 Dec 10, 2020
540d3b0
Merge pull request #26 from future4code/order4
RafaelOliveira215 Dec 10, 2020
cf0316c
Estilização da página de perfil iniciada. Faltam as informações do hi…
FabioJordao97 Dec 10, 2020
a731eb1
ajustes CSS do CardProduct
rafagf77 Dec 10, 2020
b4be82d
Merge pull request #27 from future4code/profile-styled
rafagf77 Dec 10, 2020
f28038b
Merge pull request #28 from future4code/rafael-fontes
FabioJordao97 Dec 10, 2020
7dde5b4
Component histórico de pedidos funcionando OK, depois de muita luta e…
joyceroberta Dec 10, 2020
323a4c1
Página de editar endereço e perfil estilizadas. Página de perfil falt…
FabioJordao97 Dec 10, 2020
aba67bf
Merge pull request #29 from future4code/profile-styled
rafagf77 Dec 10, 2020
166db3e
ajustes
rafagf77 Dec 10, 2020
759a802
Merge branch 'master' into modal
joyceroberta Dec 10, 2020
e05c5e5
Merge pull request #30 from future4code/modal
joyceroberta Dec 10, 2020
d3a5a99
corrigindo conflito
joyceroberta Dec 11, 2020
c4f56bc
Merge pull request #31 from future4code/projeto-dia4
FabioJordao97 Dec 11, 2020
4c32fc6
Estilização do histórico de pedidos concluída.
FabioJordao97 Dec 11, 2020
711015b
Corrigido bug no ternário do histórico de pedidos
joyceroberta Dec 11, 2020
2cad063
Merge pull request #32 from future4code/orderhistory-styled
joyceroberta Dec 11, 2020
b51a7a6
Merge branch 'master' into projeto-dia5
joyceroberta Dec 11, 2020
6d7f18d
Merge pull request #33 from future4code/projeto-dia5
joyceroberta Dec 11, 2020
78e00d9
resolvido conflito da pagina de perfil
joyceroberta Dec 11, 2020
daa19c4
resolvendo outro conflito do git amorzinho que tá me tirando do sério
joyceroberta Dec 11, 2020
857ea78
Merge pull request #34 from future4code/projeto-dia5
joyceroberta Dec 11, 2020
b4b8e48
Modal
rafagf77 Dec 11, 2020
febe7fe
Merge pull request #35 from future4code/modal2
FabioJordao97 Dec 11, 2020
b9042d4
Estilização do order history finalizada após o ternário do length.
FabioJordao97 Dec 11, 2020
14a9eb8
Merge pull request #36 from future4code/fix-order-history-styled
joyceroberta Dec 11, 2020
00a9507
Acrescentei as duas tags que faltavam na tela de perfil.
FabioJordao97 Dec 11, 2020
d1baab7
Merge pull request #37 from future4code/naoaguentomais
FabioJordao97 Dec 11, 2020
868e0b3
cartPage e fixes
RafaelOliveira215 Dec 11, 2020
2c3fc96
Form
rafagf77 Dec 11, 2020
c9217aa
Merge branch 'master' into cartFixes
joyceroberta Dec 11, 2020
d233f10
Merge pull request #38 from future4code/cartFixes
joyceroberta Dec 11, 2020
fd0e5d4
Merge branch 'master' into teste
RafaelOliveira215 Dec 11, 2020
931619e
Merge pull request #39 from future4code/teste
RafaelOliveira215 Dec 11, 2020
3000cec
Correções de layout do header.
FabioJordao97 Dec 11, 2020
b985675
Merge pull request #40 from future4code/fix-header
FabioJordao97 Dec 11, 2020
c3b429d
Correção footer
rafagf77 Dec 11, 2020
a1e0fa5
Merge pull request #41 from future4code/correcao-footer
RafaelOliveira215 Dec 11, 2020
a95d71f
useFormModal
rafagf77 Dec 11, 2020
eb4455b
Merge pull request #42 from future4code/add-remove
RafaelOliveira215 Dec 11, 2020
ca08835
Update README.md
rafagf77 Dec 11, 2020
7a9f133
Barrinha de pedido em andamento funcionando e renderizando na tela, p…
joyceroberta Dec 11, 2020
6da2cef
Tentativa de correção da barrinha verde, porém, não sumiu
joyceroberta Dec 11, 2020
f1153fc
Agora vai, a barrinha está funcionando ok, ela some quando não tem pe…
joyceroberta Dec 11, 2020
5c1387c
Ficou faltando um R$, arrumado
joyceroberta Dec 11, 2020
7861421
Merge branch 'master' into projeto-dia5
joyceroberta Dec 11, 2020
2a5eca0
Merge pull request #43 from future4code/projeto-dia5
FabioJordao97 Dec 11, 2020
3720aa9
placeorder
RafaelOliveira215 Dec 12, 2020
1861f0c
Merge pull request #44 from future4code/placeorder
joyceroberta Dec 12, 2020
321d483
Update README.md
rafagf77 Dec 13, 2020
a547c7f
Update README.md
rafagf77 Dec 13, 2020
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
4 changes: 2 additions & 2 deletions src/components/CardProduct/CardProduct.js
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ const CardProduct = (props) => {
</DescriptionContainer>
<InfoContainer>
<PriceText>{props.price.toLocaleString('pt-BR', { style: 'currency', currency: 'BRL' })} </PriceText>
<AddButton onClick={()=>saveOrder(props)}>adicionar</AddButton>
{/* <RemoveButton>remover</RemoveButton> */}
<AddButton id="addButton" onClick={()=>saveOrder(props)}>adicionar</AddButton>
{/* <RemoveButton id="removeButton">remover</RemoveButton> */}
</InfoContainer>
</TextContainer>
</CardStyled>
1 change: 0 additions & 1 deletion src/screens/FeedPage/FeedPage.js
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@ const FeedPage = () => {
}
})
.then((res)=>{
console.log(res.data.restaurants)
setRestaurants(res.data.restaurants)
})
.catch((err)=>{
23 changes: 16 additions & 7 deletions src/screens/RestaurantPage/RestaurantPage.js
Original file line number Diff line number Diff line change
@@ -4,14 +4,21 @@ import { useHistory, useParams } from 'react-router-dom'
import CardProduct from '../../components/CardProduct/CardProduct'
import Header from '../../components/Header/Header'
import { baseUrl } from '../../constants/constants'
import { RestaurantPageContainer, ImageRestaurant, RestaurantContainer, InfoContainer, InfoName, InfoText, ImageContainer, LoadingContainer, CardsContainer, ModalContainer, ModalButton, ModalButtonContainer, SelectStyled, ModalBackground } from './styles'
import { RestaurantPageContainer, ImageRestaurant, RestaurantContainer, InfoContainer, InfoName, InfoText, ImageContainer, LoadingContainer, CardsContainer, ModalContainer, ModalButton, ModalButtonContainer, SelectStyled, ModalBackground, FormStyled } from './styles'
import LoadingInvert from '../../components/LoadingInvert/LoadingInvert'
import { useForm } from '../../hooks/useForm'

const RestaurantPage = () => {
const history = useHistory()
const params = useParams()
const {form, onChange, resetState} = useForm({ quantity: "" , id: "" })
const [restaurantDetails, setRestaurantDetails] = useState([])

const handleInputChange = (event) => {
const { value, name } = event.target
onChange(value, name)
}

useEffect(()=> {
axios.get(`${baseUrl}/restaurants/${params.id}`,
{
@@ -39,7 +46,8 @@ const RestaurantPage = () => {
modalContent.style.display = "flex";
}

function hideModal() {
function hideModal(event) {
event.preventDefault()
modalBack.style.display = "none";
modalContent.style.display = "none";
}
@@ -48,6 +56,7 @@ const RestaurantPage = () => {
history.push(`/carrinho/${params.id}`)
}


return (
<RestaurantPageContainer>
<Header goBack={goBack}/>
@@ -79,6 +88,7 @@ const RestaurantPage = () => {
description={product.description}
price={product.price}
showModal={showModal}
restaurant={restaurantDetails.id}
/>
)
})
@@ -89,8 +99,8 @@ const RestaurantPage = () => {
</ModalBackground>
<ModalContainer id="modalContent">
<p>Selecione a quantidade desejada</p>
<SelectStyled name="quantity" id="quantity">
<option value="0" selected="selected">0</option>
<FormStyled onSubmit={hideModal}>
<SelectStyled name="quantity" id="quantity" onChange={handleInputChange}>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
@@ -102,9 +112,8 @@ const RestaurantPage = () => {
<option value="9">9</option>
<option value="10">10</option>
</SelectStyled>
<ModalButtonContainer>
<ModalButton onClick={hideModal}>ADICIONAR AO CARRINHO</ModalButton>
</ModalButtonContainer>
<ModalButton>ADICIONAR AO CARRINHO</ModalButton>
</FormStyled>
</ModalContainer>
</RestaurantPageContainer>
)
7 changes: 7 additions & 0 deletions src/screens/RestaurantPage/styles.js
Original file line number Diff line number Diff line change
@@ -75,6 +75,9 @@ export const ModalButton = styled.button `
background-color: transparent;
border: none;
align-self: right;
margin-top: 20px;
margin-left: auto;
margin-bottom: 20px;
&:hover {
cursor: pointer;
}
@@ -88,3 +91,7 @@ export const SelectStyled = styled.select `
width: 296px;
padding: 16px;
`
export const FormStyled = styled.form `
display: flex;
flex-direction: column;
`