 Rayhân HASSOU
|
0728523c62
|
finish page recipe details, some details to change like images and button on other pages but they are finished
|
2 years ago |
 Louison PARANT
|
10473811cd
|
Merge branch 'master' into WORK-LPA
|
2 years ago |
|
Rayhân HASSOU
|
c78229b370
|
Merge pull request 'master' (#10) from master into WORK-RHA
Reviewed-on: #10
|
2 years ago |
|
Rayhân HASSOU
|
40781dd815
|
Merge branch 'master' of https://codefirst.iut.uca.fr/git/Sae_LeftOvers/LeftOvers
|
2 years ago |
|
Rayhân HASSOU
|
57d46bbe36
|
add modification
|
2 years ago |
|
Louison PARANT
|
da3777c337
|
Pull master
|
2 years ago |
|
Rayhân HASSOU
|
f5c2806562
|
add recipe selection and change tobBar
|
2 years ago |
|
Louison PARANT
|
61c8ede6c8
|
Merge branch 'WORK-LPA'
# Conflicts:
# LeftOvers/App.js
# LeftOvers/package-lock.json
# LeftOvers/package.json
|
2 years ago |
|
Louison PARANT
|
1141d4576a
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Louison PARANT
|
8f79508a11
|
Profile Component
|
2 years ago |
|
Rayhân HASSOU
|
5dbe2d635d
|
Merge pull request 'WORK-RHA' (#8) from WORK-RHA into master
Reviewed-on: #8
|
2 years ago |
|
Rayhân HASSOU
|
11b7df605c
|
upgrade parameters for selected ingredient, the modal is functionnal, to do : filters selection
|
2 years ago |
|
Louison PARANT
|
cffe1126bb
|
Profile Component
|
2 years ago |
|
Rayhân HASSOU
|
a3b27eaaab
|
modify modal
|
2 years ago |
|
Louison PARANT
|
db13c03fae
|
Profile Component
|
2 years ago |
|
Rayhân HASSOU
|
da6c25d296
|
add modal
|
2 years ago |
|
Louison PARANT
|
7f048e4efb
|
Profile Component
|
2 years ago |
|
Rayhân HASSOU
|
45ab6bd7d3
|
add a few component like tabbar and selected ingredient, changes the recipe display and create a new page
|
2 years ago |
|
Rayhân HASSOU
|
438350efeb
|
add a new component SelectedIngredients
|
2 years ago |
|
Louison PARANT
|
b8b5e1469f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Rayhân HASSOU
|
47e632bb88
|
Merge pull request 'WORK-RHA' (#7) from WORK-RHA into master
Reviewed-on: #7
|
2 years ago |
|
Rayhân HASSOU
|
087d9cd7f9
|
add a new component
|
2 years ago |
|
Louison PARANT
|
638278ec99
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# package-lock.json
# package.json
|
2 years ago |
|
Louison PARANT
|
4890744690
|
Package.json
|
2 years ago |
|
Rayhân HASSOU
|
81c8f99256
|
add a new component, a reduce version of the recipeElement
|
2 years ago |
|
Rayhân HASSOU
|
863cc541a1
|
Merge pull request 'WORK-RHA' (#6) from WORK-RHA into master
Reviewed-on: #6
|
2 years ago |
|
Rayhân HASSOU
|
659382d99b
|
improve the design and the composant
|
2 years ago |
|
Rayhân HASSOU
|
5ee03b380b
|
improve the design and the composant
|
2 years ago |
|
Rayhân HASSOU
|
fa8d926686
|
add component for display selected recipes with images
|
2 years ago |
|
Rayhân HASSOU
|
b6d223f13d
|
Merge pull request 'add component for ingredient, the back end is not complete' (#5) from WORK-RHA into master
Reviewed-on: #5
|
2 years ago |
|
Rayhân HASSOU
|
baf18e5f80
|
add component for ingredient, the back end is not complete
|
2 years ago |
|
Rayhân HASSOU
|
0902b66882
|
Merge pull request 'the desing for the button is finished' (#4) from WORK-RHA into master
Reviewed-on: #4
|
2 years ago |
|
Rayhân HASSOU
|
f8ed5401b5
|
the desing for the button is finished
|
2 years ago |
|
Rayhân HASSOU
|
84b80607ea
|
Merge pull request 'WORK-RHA' (#3) from WORK-RHA into master
Reviewed-on: #3
|
2 years ago |
|
Rayhân HASSOU
|
c4baa57882
|
button component working, the design is not perfect
|
2 years ago |
|
Rayhân HASSOU
|
836f4f2f13
|
add custom button
|
2 years ago |
|
Rayhân HASSOU
|
40b4a15661
|
Mise à jour de 'README.md'
|
2 years ago |
|
Rayhân HASSOU
|
7b3e20bf31
|
add splash screen and icons
|
2 years ago |
|
Rayhân HASSOU
|
dce8fa2af7
|
add file for images ios and android
|
2 years ago |
|
Rayhân HASSOU
|
98eff64c49
|
Merge pull request 'master' (#2) from master into WORK-RHA
Reviewed-on: #2
|
2 years ago |
 Rémi REGNAULT
|
9d7f043cae
|
Merge pull request 'master' (#1) from master into WORK-RRE
Reviewed-on: #1
|
2 years ago |
|
Rémi REGNAULT
|
22ff41accc
|
set up directory
|
2 years ago |
|
Louison PARANT
|
ec8bf5eb62
|
Mise à jour de 'README.md'
|
2 years ago |
|
Rayhân HASSOU
|
b00cd4fa21
|
Mise à jour de 'README.md'
|
2 years ago |
|
Rayhân HASSOU
|
5b7c8f374a
|
add images folder for the repository
|
2 years ago |
|
Rayhân HASSOU
|
a62c0db14c
|
add project
|
2 years ago |
|
Rayhân HASSOU
|
d52edd8140
|
Mise à jour de '.gitignore'
|
2 years ago |
|
Rayhân HASSOU
|
e2bec77fbb
|
Initial commit
|
2 years ago |
