Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Premier Squelette #9

Merged
merged 32 commits into from
Dec 13, 2023
Merged

Premier Squelette #9

merged 32 commits into from
Dec 13, 2023

Conversation

BarisRz
Copy link
Contributor

@BarisRz BarisRz commented Dec 13, 2023 •
edited
Loading

Création de :
-première routes
-page login
-page Home
-page Boutique

Midunighto and others added 30 commits December 13, 2023 10:36
@Midunighto
packages
f33767f
@Midunighto
tailwind package
b298069
@Midunighto
packages & variables init
d29070a
@ghispell
création de la navbar
a2c2644
@ghispell
resolution conflits
7e22ac1
@ghispell
navbar + footer
73bc4ec
@ghispell
Merge pull request #7 from WildCodeSchool-2023-09/Navbar
270a1e0 
Navbar + footer
@BarisRz
creation des routes et des futurs composants pour moins de conflits
c4ecb32
@BarisRz
fix merge
d61152f
@BarisRz
ajout lien sur navbar
fd21904
@Midunighto
Parallax 2 pages OK
07bc6d6
@Midunighto
merging
c07cb55
@ghispell
update login
756b84a
@ghispell
update login
fd2141e
@BarisRz
boutique avancement filtre
5bed67c
@BarisRz
Merge branch 'base' of https://github.com/WildCodeSchool-2023-09/wild…
0accec2 
…y-game into Boutique
@ghispell
update login
12c0444
@ghispell
Merge pull request #8 from WildCodeSchool-2023-09/login
1080eaf 
Login
@Midunighto
background ok
32ba967
@Midunighto
fixed conflicts
e2ac16b
@BarisRz
Merge branch 'base' of https://github.com/WildCodeSchool-2023-09/wild…
07c7286 
…y-game into Boutique
@ghispell
recup base
920d3b5
@ghispell
Merge branch 'base' of github.com:WildCodeSchool-2023-09/wildy-game i…
8181d88 
…nto base
@Midunighto
Parallax + composant ok
98f7276
@ghispell
Conflit fixed
2fb735b
@ghispell
Update parallax issues
aa62eec
@BarisRz
css fait aucune logique présente
1354bfb
@ghispell
home update
fde7749
@BarisRz
css fait
8a39d1b
@BarisRz
Merge branch 'base' of https://github.com/WildCodeSchool-2023-09/wild…
9399e18 
…y-game into Boutique
Midunighto
Midunighto approved these changes Dec 13, 2023
View reviewed changes
Copy link
Contributor

@Midunighto Midunighto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tout fonctionne, pas de code mort, pas de conflits ☑️

Ijuaa
Ijuaa approved these changes Dec 13, 2023
View reviewed changes
Copy link
Contributor

@Ijuaa Ijuaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent

@BarisRz BarisRz merged commit 16cd29a into dev Dec 13, 2023
1 check passed
@BarisRz BarisRz deleted the base branch December 13, 2023 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ijuaa Ijuaa Ijuaa approved these changes

@Midunighto Midunighto Midunighto approved these changes

@ghispell ghispell Awaiting requested review from ghispell

@JordanMieger JordanMieger Awaiting requested review from JordanMieger

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BarisRz @Ijuaa @Midunighto @ghispell