Commit Graph

153 Commits

Author SHA1 Message Date
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
Vincent Ramiere
cf102b766c card resto 2022-02-18 10:53:08 +01:00
Romain Verger
3bb6ed9780 Modif aEmporter 2022-02-18 10:25:56 +01:00
Romain Verger
8ebcfc32ad Modif aEmporter 2022-02-18 10:25:37 +01:00
Vincent Ramiere
a0df10e724 Merge branch 'dev' into Vincent
OK
2022-02-18 10:25:20 +01:00
Thomas Cardon
dc03c1b25f mis en place admin-page 2022-02-18 10:16:55 +01:00
Romain Verger
9e03cf2750 Merge branch 'Romain' into dev 2022-02-18 10:12:33 +01:00
Romain Verger
e96f370497 Filtres test ok 2022-02-18 10:11:52 +01:00
Vincent Ramiere
e3abfaae06 modif fond d'ecran sigin 2022-02-18 10:10:09 +01:00
Your Name
9b6c646c14 migration home page vers list category 2022-02-18 10:05:28 +01:00
Vincent Ramiere
543bbcd2e0 test modif footer NOK 2022-02-17 11:48:25 +01:00
Your Name
1b51cb5787 photos 2022-02-16 17:38:37 +01:00
Vincent Ramiere
63906bf345 Suppression des components sur la page signin 2022-02-16 17:37:58 +01:00
Vincent Ramiere
b774a93da7 Merge branch 'dev' into Vincent
ok
2022-02-16 15:09:49 +01:00
Romain Verger
a97d444fe1 Merge branch 'dev' into Romain 2022-02-16 14:19:22 +01:00
Romain Verger
f7e123b159 Modif filtres 2022-02-16 14:17:44 +01:00
Your Name
0bb889bc40 modif card resto 2022-02-16 14:14:07 +01:00
Romain Verger
0d9546fff0 merge dev vers Romain 2022-02-16 14:07:27 +01:00
Your Name
db957edd2d modif card resto 2022-02-16 14:05:49 +01:00
Your Name
ce1fe995b8 modif card resto 2022-02-16 12:35:13 +01:00
Thomas Cardon
2170ef0f65 filtres prix = ok 2022-02-16 12:03:15 +01:00
Vincent Ramiere
35d7393eaf fusion apres trompage 2022-02-15 15:30:33 +01:00
Thomas Cardon
a6d96e2280 template-page in appModule 2022-02-15 15:18:16 +01:00
Romain Verger
4ed189dc0f modif 2022-02-15 15:12:53 +01:00
Romain Verger
a30efc0cf7 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-15 15:06:01 +01:00
Thomas Cardon
e945b46aba merge thomas into dev 2022-02-15 15:03:21 +01:00
Thomas Cardon
c633f4dc3d Merge branch 'thomas' into dev 2022-02-15 15:02:55 +01:00
Romain Verger
a4b719ba94 Merge branch 'Romain' into dev 2022-02-15 15:00:40 +01:00
Thomas Cardon
1726ec44b2 petite modif let 2022-02-15 15:00:40 +01:00
Romain Verger
8c1cee7e24 Modif filtres page 2022-02-15 14:58:50 +01:00
Thomas Cardon
993be2e1b0 distance+Site Web in cardResto 2022-02-15 14:54:17 +01:00
Your Name
59ca38b89b card resto 2022-02-15 14:06:23 +01:00
Your Name
bdeb6fd265 modifs carte restau accordeon 2022-02-14 17:27:44 +01:00
Romain Verger
637e8f75cd avancement filtres 2022-02-14 16:51:32 +01:00
Vincent Ramiere
edf93ab0f8 Merge branch 'Vincent' into dev 2022-02-14 16:32:30 +01:00
Vincent Ramiere
34777f7a5e Modif sigin 2022-02-14 15:56:05 +01:00
Thomas Cardon
5d3549b0b6 composant icon into card-resto 2022-02-11 14:16:59 +01:00
Thomas Cardon
1b520593cd Service restoByCat + icone 2022-02-04 14:13:52 +01:00
Romain
48d4b68b9b Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-04 11:35:23 +01:00
Your Name
781d097cad Merge branch 'paul' into dev 2022-02-04 11:23:09 +01:00
Your Name
56d663bb7f modif card resto search bar 2022-01-21 16:21:44 +01:00
Romain
16b5f51e26 Mise en plave range TypeScript 2022-01-21 15:07:18 +01:00
Romain
05f04db32b Modifs mineures Page Filter 2022-01-21 12:33:21 +01:00
Romain
c749473762 Page filters améliorations + Composant Avis-bar 2022-01-21 12:14:52 +01:00
Your Name
77131ede13 Merge branch 'dev' into paul 2022-01-21 09:14:56 +01:00
Your Name
e7566908a7 modif card resto 2022-01-21 09:13:47 +01:00
Vincent Ramiere
e3b80c3049 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev
parceque
2022-01-20 17:41:09 +01:00
Vincent Ramiere
f54cdf8365 Ajout sigin 2022-01-20 17:29:42 +01:00
Your Name
bb6a6f07ce Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-01-20 17:27:18 +01:00
Your Name
1c9acc3193 card resto + modifs 2022-01-20 17:23:07 +01:00
Romain
ac3c69e0f6 Merge branch 'dev' into Romain 2022-01-20 17:18:26 +01:00
Romain
49a839d930 Mise a jour filters-page 2022-01-20 17:15:42 +01:00
Romain
d495bcc342 -avancement page filters 2022-01-20 15:20:37 +01:00
Vincent Ramiere
9f6399cc95 Ajout background signin 2022-01-20 15:14:21 +01:00
Vincent Ramiere
2e8dda0010 Ajout page signin 2022-01-20 15:10:10 +01:00
Your Name
70264d5496 Merge branch 'dev' into paul 2022-01-20 12:45:19 +01:00
Your Name
7fb4585684 footer changement 2022-01-20 12:43:28 +01:00
Vincent Ramiere
ce9bd72672 Modif footer et app.component 2022-01-20 12:39:56 +01:00
Vincent Ramiere
43fdce7f42 Merge branch 'Vincent' into dev 2022-01-20 12:31:08 +01:00
Vincent Ramiere
ed24ee16ea Création footer 2022-01-20 12:24:49 +01:00
Your Name
e45c940f30 Merge branch 'paul' into dev 2022-01-20 12:18:00 +01:00
Your Name
31865dc4da Modifs n°2 paul card + page resto + rooter 2022-01-20 12:01:59 +01:00
Romain
c23c3a4d72 suppression filtres composants 2022-01-20 11:28:05 +01:00
Romain
659637348d Maj header 2022-01-20 11:27:07 +01:00
Romain
a4a1d177a6 Supp filtres composants + maj header 2022-01-20 11:26:47 +01:00
Your Name
e067433e48 Modifs Paul Catégories 2022-01-19 15:44:24 +01:00
Romain
686febd534 maj nav-bar 2022-01-19 15:09:18 +01:00
Romain
5aa21b77fe Maj nav-bar 2022-01-19 15:09:05 +01:00
Romain
1bcd85fc5c Ajout pages fav, list-cat + header 2022-01-19 13:01:19 +01:00