Skip to content

Commit cce8b68

Browse files
clement4444clement4444
committed
Merge branch 'dev' into US18-dette_technique-autorisation-codegen
2 parents 7fa4270 + 8b112b0 commit cce8b68

22 files changed

+405
-303
lines changed

‎frontend/public/images/bg-cover-vertical.png‎

18.1 KB
Loading

‎frontend/public/images/home-background.svg‎

Lines changed: 119 additions & 0 deletions
Loading

‎frontend/src/components/InfoHome.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import { Link } from "react-router";
22

33
const InfoHome = () => {
44
return (
5-
<div className="infohome-background">
6-
<Link to={"/"}>
7-
<img className="infohome-logo" src="/images/logo-clair.png" alt="Logo" />
5+
<div className="relative h-full w-full overflow-hidden z-0 bg-blue infohome-background">
6+
<Link to={"/"} className="relative z-10 ">
7+
<p className="font-poppins-extra-bold text-white text-4xl pt-2 pl-2">GiftChat.</p>
88
</Link>
99
<img className="infohome-serpentin" src="/images/serpentin-jaune.png" alt="Serpentin Jaune" />
1010
<img className="infohome-carre" src="/images/carre-vert.png" alt="Carré vert" />
1111
<img className="infohome-etoile" src="/images/etoile-rose.png" alt="Etoile rose" />
1212
<img className="infohome-cotillon" src="/images/cotillon-rouge.png" alt="Cotillon rouge" />
13-
<div className="infohome-content">
14-
<h1 className="infohome-content-text">
13+
<div className="relative z-10 flex flex-col items-center h-full justify-center ">
14+
<h1 className="flex items-center justify-center lg:text-6xl lg:leading-14 md:text-5xl t md:leading-12 font-medium text-white px-16">
1515
Faites plaisir à vos proches en leur offrant le cadeau de leurs rêves.
1616
</h1>
1717
</div>

‎frontend/src/components/Sidebar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const Sidebar = () => {
22
return (
3-
<aside className="w-40 h-full bg-[#200904] p-4 text-white rounded-2xl">
3+
<aside className="w-40 h-full bg-dark p-4 text-white rounded-2xl">
44
<h2 className="text-lg font-semibold">Sidebar</h2>
55
</aside>
66
);

‎frontend/src/components/Wishlist.tsx‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ export default function Wishlist() {
106106
};
107107

108108
return (
109-
<div className="h-full p-10 flex flex-col bg-[#EA4B09] rounded-[18px] ml-10 overflow-hidden max-md:p-6 max-md:ml-0 max-md:rounded-none max-md:pb-20 max-md:relative">
109+
<div className="h-full p-10 flex flex-col bg-orange rounded-[18px] ml-10 overflow-hidden max-md:p-6 max-md:ml-0 max-md:rounded-none max-md:pb-20 max-md:relative">
110110
<div className="flex flex-col h-full min-h-0">
111111
{/* Header */}
112-
<div className="flex justify-between items-start text-[#FDFBF6] mb-8 flex-shrink-0 max-md:flex-col max-md:gap-4 max-md:mt-4">
112+
<div className="flex justify-between items-start text-white mb-8 flex-shrink-0 max-md:flex-col max-md:gap-4 max-md:mt-4">
113113
<div className="flex items-center gap-4 max-md:justify-start max-md:w-full">
114114
<Icon icon="heart" className="text-[40px] max-md:hidden" />
115115
<h2 className="text-[32px] font-bold max-md:text-[24px]">Ma wishlist</h2>
@@ -126,16 +126,16 @@ export default function Wishlist() {
126126
{/* Content */}
127127
<div className="flex-1 min-h-0 overflow-y-auto wishlist-content-mobile">
128128
{error ? (
129-
<div className="text-[#FDFBF6] bg-black/20 rounded-xl p-4">Erreur: {error.message}</div>
129+
<div className="text-white bg-black/20 rounded-xl p-4">Erreur: {error.message}</div>
130130
) : !loading && items.length === 0 ? (
131131
<div className="h-full flex items-center justify-center">
132-
<div className="flex flex-col items-center justify-center text-[#FDFBF6]">
132+
<div className="flex flex-col items-center justify-center text-white">
133133
<Icon icon="gift" className="text-7xl opacity-80 mb-3" />
134134
<p className="text-lg mb-8">Aucune idée pour l'instant.</p>
135135
<button
136136
type="button"
137137
onClick={() => setIsModalOpen(true)}
138-
className="flex items-center gap-2 bg-[#019645] text-[#FDFBF6] font-semibold px-4 py-2 rounded-xl hover:bg-[#01803b] transition"
138+
className="flex items-center gap-2 bg-green text-white font-semibold px-4 py-2 rounded-xl hover:bg-[#01803b] transition"
139139
>
140140
<Icon icon="plus" />
141141
Ajouter une idée
@@ -200,10 +200,10 @@ export default function Wishlist() {
200200
{/* Modal when adding */}
201201
<Modal isOpen={isModalOpen} onClose={() => setIsModalOpen(false)}>
202202
<div className="modal-mobile-content">
203-
<h2 className="text-xl font-bold text-[#200904] mb-4">Ajouter une nouvelle idée</h2>
203+
<h2 className="text-xl font-bold text-dark mb-4">Ajouter une nouvelle idée</h2>
204204
<form onSubmit={handleSubmit} className="space-y-3">
205205
<div>
206-
<label htmlFor="name" className="block text-[#200904] mb-1">
206+
<label htmlFor="name" className="block text-dark mb-1">
207207
Nom
208208
</label>
209209
<input
@@ -212,11 +212,11 @@ export default function Wishlist() {
212212
value={formData.name}
213213
onChange={handleChange}
214214
required
215-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
215+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
216216
/>
217217
</div>
218218
<div>
219-
<label htmlFor="description" className="block text-[#200904] mb-1">
219+
<label htmlFor="description" className="block text-dark mb-1">
220220
Description
221221
</label>
222222
<textarea
@@ -225,12 +225,12 @@ export default function Wishlist() {
225225
onChange={handleChange}
226226
rows={2}
227227
maxLength={150}
228-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
228+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
229229
/>
230230
<div className="text-xs text-gray-600 text-right">{formData.description.length}/150</div>
231231
</div>
232232
<div>
233-
<label htmlFor="imageUrl" className="block text-[#200904] mb-1">
233+
<label htmlFor="imageUrl" className="block text-dark mb-1">
234234
Image URL
235235
</label>
236236
<input
@@ -239,11 +239,11 @@ export default function Wishlist() {
239239
value={formData.imageUrl}
240240
onChange={handleChange}
241241
placeholder="https://example.com/image.jpg"
242-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
242+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
243243
/>
244244
</div>
245245
<div>
246-
<label htmlFor="url" className="block text-[#200904] mb-1">
246+
<label htmlFor="url" className="block text-dark mb-1">
247247
Lien d'achat
248248
</label>
249249
<input
@@ -252,21 +252,21 @@ export default function Wishlist() {
252252
value={formData.url}
253253
onChange={handleChange}
254254
placeholder="https://exemple.com"
255-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
255+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
256256
/>
257257
</div>
258258
<div className="flex justify-end gap-3 pt-3 modal-buttons">
259259
<button
260260
type="submit"
261261
disabled={creating}
262-
className="px-4 py-2 rounded-[10px] bg-[#019645] text-[#FDFBF6] font-semibold hover:bg-[#01803b]"
262+
className="px-4 py-2 rounded-[10px] bg-green text-white font-semibold hover:bg-[#01803b]"
263263
>
264264
{creating ? "Ajout…" : "Ajouter"}
265265
</button>
266266
<button
267267
type="button"
268268
onClick={() => setIsModalOpen(false)}
269-
className="px-4 py-2 rounded-[10px] bg-[#200904] text-[#FDFBF6] font-semibold hover:bg-[#463835]"
269+
className="px-4 py-2 rounded-[10px] bg-dark text-white font-semibold hover:bg-[#463835]"
270270
>
271271
Annuler
272272
</button>
@@ -278,10 +278,10 @@ export default function Wishlist() {
278278
{/* edit modal */}
279279
<Modal isOpen={isEditModalOpen} onClose={() => setEditModalOpen(false)}>
280280
<div className="modal-mobile-content">
281-
<h2 className="text-xl font-bold text-[#200904] mb-4">Modifier le cadeau</h2>
281+
<h2 className="text-xl font-bold text-dark mb-4">Modifier le cadeau</h2>
282282
<form onSubmit={handleEditSubmit} className="space-y-3">
283283
<div>
284-
<label htmlFor="name" className="block text-[#200904] mb-1">
284+
<label htmlFor="name" className="block text-dark mb-1">
285285
Nom
286286
</label>
287287
<input
@@ -290,11 +290,11 @@ export default function Wishlist() {
290290
value={editFormData.name}
291291
onChange={handleEditChange}
292292
required
293-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
293+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
294294
/>
295295
</div>
296296
<div>
297-
<label htmlFor="description" className="block text-[#200904] mb-1">
297+
<label htmlFor="description" className="block text-dark mb-1">
298298
Description
299299
</label>
300300
<textarea
@@ -303,12 +303,12 @@ export default function Wishlist() {
303303
onChange={handleEditChange}
304304
rows={2}
305305
maxLength={150}
306-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
306+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
307307
/>
308308
<div className="text-xs text-gray-600 text-right">{editFormData.description.length}/150</div>
309309
</div>
310310
<div>
311-
<label htmlFor="imageUrl" className="block text-[#200904] mb-1">
311+
<label htmlFor="imageUrl" className="block text-dark mb-1">
312312
Image URL
313313
</label>
314314
<input
@@ -317,11 +317,11 @@ export default function Wishlist() {
317317
value={editFormData.imageUrl}
318318
onChange={handleEditChange}
319319
placeholder="https://example.com/image.jpg"
320-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
320+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
321321
/>
322322
</div>
323323
<div>
324-
<label htmlFor="url" className="block text-[#200904] mb-1">
324+
<label htmlFor="url" className="block text-dark mb-1">
325325
Lien d'achat
326326
</label>
327327
<input
@@ -330,21 +330,21 @@ export default function Wishlist() {
330330
value={editFormData.url}
331331
onChange={handleEditChange}
332332
placeholder="https://exemple.com"
333-
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-[#EA4B09]"
333+
className="w-full border border-gray-300 rounded-lg p-2 focus:outline-none focus:ring-2 focus:ring-orange"
334334
/>
335335
</div>
336336
<div className="flex justify-end gap-3 pt-3 modal-buttons">
337337
<button
338338
type="submit"
339339
disabled={updating}
340-
className="px-4 py-2 rounded-[10px] bg-[#019645] text-[#FDFBF6] font-semibold hover:bg-[#01803b]"
340+
className="px-4 py-2 rounded-[10px] bg-green text-white font-semibold hover:bg-[#01803b]"
341341
>
342342
{updating ? "Mis à jour…" : "Mettre à jour"}
343343
</button>
344344
<button
345345
type="button"
346346
onClick={() => setEditModalOpen(false)}
347-
className="px-4 py-2 rounded-[10px] bg-[#200904] text-[#FDFBF6] font-semibold hover:bg-[#463835]"
347+
className="px-4 py-2 rounded-[10px] bg-dark text-white font-semibold hover:bg-[#463835]"
348348
>
349349
Annuler
350350
</button>

0 commit comments

Comments
 (0)