Commit Graph

127 Commits

Author SHA1 Message Date
Thomas Cardon
9fe71c85d9 modif restau manque checkbox 2022-03-07 16:17:44 +01:00
Thomas Cardon
500ba0811a ajout categ dans formulaire creation restau 2022-03-04 15:21:24 +01:00
Thomas Cardon
b7d5ef1043 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-03-04 11:01:44 +01:00
Thomas Cardon
321e0a16be search-bar modifiée+ link admin 2022-03-04 11:01:20 +01:00
Romain Verger
58332161ae Merge branch 'dev' into Romain 2022-03-03 17:16:54 +01:00
Romain Verger
6de3e4dfda Ajout prenom page d'accueil 2022-03-03 17:16:07 +01:00
Thomas Cardon
a04197cceb toggle like coeur=ok 2022-03-03 16:35:44 +01:00
Romain Verger
7aa95ef99a Merge branch 'dev' into Romain 2022-03-03 15:22:17 +01:00
Thomas Cardon
d1a49dae32 ajout favoris sur pages categories 2022-03-03 15:12:19 +01:00
Romain Verger
13c4bea465 Merge branch 'dev' into Romain 2022-03-03 14:58:16 +01:00
Romain Verger
daa51bafb1 delete token expiration 2022-03-03 14:57:55 +01:00
Romain Verger
1607634d17 delete token expiration 2022-03-03 14:57:37 +01:00
Thomas Cardon
a7a53659f2 merge resolution 2022-03-03 14:49:55 +01:00
Thomas Cardon
c70e3bab94 favoris avec coeur rempli 2022-03-03 14:46:09 +01:00
Romain Verger
97e024afb3 Merge branch 'Romain' into dev 2022-03-03 14:29:09 +01:00
Romain Verger
d169ba120f onglet restau + debut Favoris 2022-03-03 14:28:40 +01:00
Romain Verger
4a271c15b7 Merge dev into Romain 2022-03-02 16:56:14 +01:00
Thomas Cardon
ea3e2ad2ae search bar ok 2022-03-02 16:55:50 +01:00
Romain Verger
6c9aa254e8 Merge branch 'dev' into Romain 2022-03-02 16:51:22 +01:00
Thomas Cardon
b3987b0255 init : getPersonne dans favoris 2022-03-02 16:48:32 +01:00
Romain Verger
82ff9da81c Ajout restaurants nav-bar 2022-03-02 16:23:17 +01:00
Romain Verger
36b79bfb66 recuperer id du token 2022-03-02 16:16:10 +01:00
Thomas Cardon
829c8333f6 merge resolution 2022-03-02 14:20:51 +01:00
Romain Verger
0478637dd6 Merge branch 'Romain' into dev 2022-03-02 13:52:59 +01:00
Thomas Cardon
9148c51a1f resolution merge 2022-03-02 13:46:34 +01:00
Thomas Cardon
7ac59372b2 ajout getPersonnById ds service + ds favoris 2022-03-02 13:43:30 +01:00
Thomas Cardon
e72283e305 admin:crea suppr restau, search bar 2022-03-02 12:43:16 +01:00
Romain Verger
55d122eeea modif connexion 2022-03-02 12:40:21 +01:00
Romain Verger
c082030aed modif page connexion (cacher composants) 2022-03-02 12:40:01 +01:00
Romain Verger
547f6aee58 module deconnexion 2022-03-02 10:25:30 +01:00
Romain Verger
30f70296ba modif app-routing-module 2022-03-01 15:31:13 +01:00
Romain Verger
bea5442dea Merge branch 'Romain' into dev 2022-03-01 15:03:32 +01:00
Romain Verger
01b68c0899 ajout sécu signin 2022-03-01 15:02:17 +01:00
Thomas
01778dbfdb
search bar version précédente 2022-02-27 14:45:54 +01:00
Thomas Cardon
4d92ddb960 search-bar = ok 2022-02-25 16:43:31 +01:00
Romain Verger
6c1f0338eb Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-18 17:25:32 +01:00
Romain Verger
4049a0d8b1 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-18 17:24:03 +01:00
Your Name
b8922c9185 Merge branch 'dev' into paul 2022-02-18 17:23:17 +01:00
Romain Verger
e8a1dcc759 avancement searchBar 2022-02-18 17:22:53 +01:00
Your Name
9f058b2d6a modif card + image 2022-02-18 17:21:51 +01:00
Thomas Cardon
5524d3c6d9 ajout composant add-restau 2022-02-18 16:47:23 +01:00
Romain Verger
3dcdbfb405 ajout Fonction searchBar 2022-02-18 16:41:52 +01:00
Romain Verger
2a3390cbae ajout button Recherche (non fonctionnel) 2022-02-18 15:28:10 +01:00
Your Name
0478d8886a modif paul 2022-02-18 15:24:17 +01:00
Thomas Cardon
19feceeb19 admin-page + prix card resto 2022-02-18 15:11:51 +01:00
Romain Verger
b82dc11a35 Merge dev to Romain 2022-02-18 14:52:41 +01:00
Your Name
b6976ed5fc modif paul 2022-02-18 14:37:30 +01:00
Your Name
c2d98cd094 modif card resto 2022-02-18 14:34:50 +01:00
Thomas Cardon
d7f423f93c stash merge + card resto 2022-02-18 14:21:13 +01:00
Thomas Cardon
334f799c60 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-18 14:17:55 +01:00