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

Can i get some BURGEEERRR 🍔🍔🍔🍔 #37

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Can i get some BURGEEERRR 🍔🍔🍔🍔 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
251f020
update: fixed scss account
Halicksse Jan 19, 2024
ba4f6a5
Merge pull request #36 from Batsave/alix
Batsave Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frontend/src/components/Account/UserInformation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ export default function UserInformation() {

return (
<div className="information_container">
<h1 className="categoryTitle">Informations</h1>
<h1 className="categoryTitle-info">INFORMATIONS</h1>
{salon && (
<div>
<h2 className="categoryTitle">Salon Information</h2>
<h2 className="categoryTitle-salon">Salon Information</h2>
<p>Name : {salon.salonName}</p>
<p>City : {salon.city}</p>
<p>Country : {salon.country}</p>
</div>
)}
{stylist && (
<div>
<h2 className="categoryTitle">Stylist Information</h2>
<h2 className="categoryTitle-salon-info">Stylist Information</h2>
<p>Last Name : {stylist.lastName}</p>
<p>First Name : {stylist.firstName}</p>
<p>Role : {stylist.stylistRole}</p>
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/Account/UserModification.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export default function UserModification() {

return (
<div className="modification_container">
<h2 className="categoryTitle">Modification :</h2>
<h2 className="categoryTitle-modi">Modification :</h2>
{stylist && (
<form onSubmit={handleSubmit}>
<label>
Expand Down Expand Up @@ -233,6 +233,7 @@ export default function UserModification() {
<label>
Newsletter:
<input
className="checkbox"
type="checkbox"
name="optinValue"
checked={formData.optinValue || ""}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/Account.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export default function Account() {
<ScrollToTop />
<Navigation />
<NavigationPhone />
<h1 className="accountTitle">My Account</h1>
<UserInformation />
<UserModification />
</main>
Expand Down
137 changes: 96 additions & 41 deletions frontend/src/scss/account.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,125 @@
@import "./color-config.scss";

.information_container {
padding: 2rem;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
max-width: 500px;
gap: 2rem;
margin: 3rem auto 0;
background-color: white;
filter: drop-shadow(0px 0px 12px rgba(0, 0, 0, 0.25));
.categoryTitle {
display: flex;
width: max-content;
background-color: rgba($color-black, 1);
color: $color-light;
padding: 0.5rem 1rem;
font-size: 1.4rem;
font-weight: 600;
}
.accountTitle {
text-align: center;
margin-top: 50px;
font-size: 50px;
}

.information_container,
.modification_container {
padding: 2rem;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
max-width: 500px;
gap: 1rem;
margin: 3rem auto 0;
background-color: white;
max-width: 89%;
margin: 30px auto 50px;
padding: 20px;
background-color: #f5f5f5;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
border-radius: 8px;
overflow-y: auto;
max-height: 600px;
filter: drop-shadow(0px 0px 12px rgba(0, 0, 0, 0.25));
.categoryTitle {

.checkbox {
width: 20px;
}

.categoryTitle,
.categoryTitle-salon,
.categoryTitle-info,
.categoryTitle-salon-info,
.categoryTitle-modi {
display: flex;
width: max-content;
justify-content: center;
align-items: center;
width: 100%;
max-width: 245px;
height: 43px;
background-color: rgba($color-black, 1);
color: $color-light;
padding: 0.5rem 1rem;
border-radius: 8px;
font-size: 1.4rem;
font-weight: 600;
font-weight: 400;
margin: 0 auto;
margin-bottom: 1rem;
text-align: center;
}

@media (max-width: 768px) {
max-width: 90%;
.categoryTitle,
.categoryTitle-salon,
.categoryTitle-info,
.categoryTitle-salon-info,
.categoryTitle-modi {
max-width: 100%;
}
}

@media (max-width: 480px) {
padding: 1rem;
gap: 1rem;
}

div {
width: 100%;
padding: 1rem;
border-top: 1px solid #ddd;

h2 {
font-size: 1.2rem;
}

p {
text-align: left;
font-size: 20px;
font-weight: 600;
color: #000000;
margin: 1rem 0;
}
}

label {
display: flex;
flex-direction: column;
align-items: flex-start;
width: 100%;
max-width: 300px;

input {
width: 100%;
padding: 1rem;
margin-top: 0.5rem;
border: 1px solid #ccc;
border-radius: 4px;
}
}

form {
display: flex;
flex-direction: column;
justify-content: center;
font-size: 20px;
align-items: center;
width: 100%;
max-width: 1920px;
gap: 1rem;
margin: 0rem auto 0;
margin: 0 auto;
text-align: center;

button {
width: max-content;
height: fit-content;
padding: 0.8rem 1rem;
background-color: rgba($color-black, 0);
border-radius: 2rem;
width: 80%;
padding: 0.7rem 1.5rem;
font-size: 25px;
background-color: rgba($color-black, 1);
border-radius: 8px;
cursor: pointer;
font-size: 1rem;
font-weight: 700;
color: $color-black;
color: $color-light;
margin: 0 auto;

&:hover {
cursor: pointer;
background-color: rgba($color-black, 0.1);
}
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/scss/components/LatestOrders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
&_head {
display: grid;
grid-template-columns: repeat(4, 1fr);
background-color: #e7e7e7;
color: #f5f5f5;
background-color: #000000;
padding: 10px;
font-weight: bold;
text-align: center;
Expand Down