Commit Graph

58 Commits

Author SHA1 Message Date
Clément Brossaud
34952a1a1b Merge branch 'main' of https://github.com/groupe1cir1n/groupe1CIR1Njs 2023-05-24 15:34:47 +02:00
Clément Brossaud
fe8064e4e4 push pour push 2023-05-24 15:34:29 +02:00
Clément Brossaud
cda794968e push avec rien de particulier 2023-05-24 15:34:03 +02:00
Félix MARQUET
26b23d12d2 Merge pull request #10 from groupe1cir1n/Felix
Finish of the ticket
2023-05-24 15:33:12 +02:00
d4e7540822 Finish of the ticket 2023-05-24 15:32:24 +02:00
d246c2123a Fix the index.js br issue 2023-05-24 15:00:07 +02:00
Clément Brossaud
3586d0289b Merge branch 'main' of https://github.com/groupe1cir1n/groupe1CIR1Njs 2023-05-24 14:42:57 +02:00
Clément Brossaud
1487f24d8d displayWord fonctionne mais les saut de lignes sont incorrect 2023-05-24 14:42:00 +02:00
Clément Brossaud
bf9df2c749 displayWord fonctionne mais ne met pas de saut de ligne entre chaque br 2023-05-24 14:41:00 +02:00
Félix MARQUET
0d3a3ef874 Merge pull request #9 from groupe1cir1n/Felix
Add of a favicon and edit of the readme + Rework of the entier weather part, add the distance between your position and the school
2023-05-24 14:40:45 +02:00
02521c6390 Rework of the entier weather part, add the distance between your position and the school 2023-05-24 14:39:00 +02:00
0f3d74491d Add of a favicon and edit of the readme 2023-05-24 13:47:19 +02:00
Clément Brossaud
baa2177290 Merge branch 'main' of https://github.com/groupe1cir1n/groupe1CIR1Njs 2023-05-17 15:30:30 +02:00
Clément Brossaud
d75561e591 push of function displayword 2023-05-17 15:29:27 +02:00
ef487c5908 Merge remote-tracking branch 'origin/main' 2023-05-17 15:28:05 +02:00
08db01b238 Start of the API Bonus 2023-05-17 15:27:58 +02:00
Clément Brossaud
599289fd57 Merge branch 'main' of https://github.com/groupe1cir1n/groupe1CIR1Njs 2023-05-17 14:30:01 +02:00
Clément Brossaud
27e452a05a finish of zoom function 2023-05-17 14:29:39 +02:00
Clément Brossaud
09b280f181 finish of zoom function 2023-05-17 14:29:17 +02:00
Félix MARQUET
0fab1d3c81 Merge pull request #8 from groupe1cir1n/Felix
End of the footer js part and little cleanup from the code
2023-05-17 14:26:18 +02:00
0cd4cf3a2d End of the footer js part and little cleanup from the code 2023-05-17 14:24:28 +02:00
Félix MARQUET
7c339a2df2 Merge pull request #7 from groupe1cir1n/Felix
Cleanup of the code and Fix the footer and the telephone event
2023-05-17 14:05:51 +02:00
fa55546a83 Cleanup of the code 2023-05-17 14:05:03 +02:00
0b2b4fdfe4 Fix the footer and the telephone sound and copy 2023-05-17 14:01:53 +02:00
Clément Brossaud
e0449e524c new function of zoom and displayWord 2023-05-17 14:00:44 +02:00
Félix MARQUET
82782d1925 Merge pull request #6 from groupe1cir1n/Felix
Set all of the member card to be modal (+ the new member)  and  Cleanup the code, add a lot of comment and change the sonnerie + tweaks a little bit the look from some page
2023-05-16 16:42:35 +02:00
fdb5c09636 Cleanup the code, add a lot of comment and change the sonnerie + tweaks a little bit the look from some page 2023-05-16 16:38:13 +02:00
351c5c9301 Set all of the member card to be modal (+ the new member) 2023-05-16 16:04:05 +02:00
Félix MARQUET
6f2413f49a Create CNAME 2023-05-16 14:52:17 +02:00
Félix MARQUET
cc57888bad Merge pull request #5 from groupe1cir1n/Felix
Change the design of the loader (RGB my boy)
2023-05-15 22:37:46 +02:00
36701d3074 Merge remote-tracking branch 'origin/main' 2023-05-15 22:37:37 +02:00
47f8742f92 Change the design of the loader (RGB my boy) 2023-05-15 21:59:23 +02:00
Félix MARQUET
f1d2b18fea Merge pull request #4 from groupe1cir1n/Felix
fix a lot of little things and start the implementation of the footer JS

Add the loader to all pages
2023-05-15 19:44:38 +02:00
95d023fc9a Add the loader to all pages 2023-05-15 19:44:00 +02:00
c610493b5d fix a lot of little things and start the implementation of the footer JS 2023-05-15 19:15:13 +02:00
cac28c26c4 Change font from Arial to Roboto 2023-05-15 18:39:25 +02:00
72f18246d5 Fix missing redirection 2023-05-15 18:22:55 +02:00
75b6a96800 Merge remote-tracking branch 'origin/main' 2023-05-15 18:12:46 +02:00
fd0091edc0 Fix a button in the Accueil page 2023-05-15 18:12:32 +02:00
23726b64da Add an alert when member is click on and reimplement the hover color on the navbar 2023-05-13 19:19:42 +02:00
Félix MARQUET
099100b431 Merge pull request #3 from groupe1cir1n/Felix
Rework of the navbar with a burger menu and try to add a scratch effe…
2023-05-13 18:44:54 +02:00
a28dcfd4ab Rework of the navbar with a burger menu and try to add a scratch effect to the member page 2023-05-13 18:44:26 +02:00
Félix MARQUET
2218e94e51 Merge pull request #2 from groupe1cir1n/Felix
Felix
2023-05-13 17:17:37 +02:00
d3345ef719 Partial membres JS implemetation, mission the scratch effect 2023-05-13 17:16:40 +02:00
Clément Brossaud
c3c81d2a8d Merge branch 'main' of https://github.com/groupe1cir1n/groupe1CIR1Njs 2023-05-13 15:14:42 +02:00
Clément Brossaud
4fdf61e62d rework of zoom functionality 2023-05-13 15:14:10 +02:00
9244233b86 End of the contact JS implementation 2023-05-13 15:04:28 +02:00
Félix MARQUET
17dd9db494 Merge pull request #1 from groupe1cir1n/Felix
Felix project file
2023-05-10 15:08:20 +02:00
0143b3ece8 End of the project file JS and start of the contact 2023-05-10 15:06:58 +02:00
e1815e4084 Start the project file JS (Return to top) 2023-05-10 14:49:30 +02:00