Skip to content

Merge after bumping to a patched Next.js #526

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

Merged
JosAhl merged 7 commits into from
Jan 1, 2026
Merged

Merge after bumping to a patched Next.js #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4a2993
Changed from log out to sign out
Jennie-Westerlund Nov 18, 2025
ec5bf3a
Fix justify content center accidentally removed
Jennie-Westerlund Nov 18, 2025
94d6d40
Merge pull request #522 from Andreawingardh/Fix/late-night-fixes
Andreawingardh Nov 19, 2025
2f55681
Changed placeholder text and color on palceholder for TextInput
Jennie-Westerlund Nov 23, 2025
833c8e5
Merge pull request #523 from Andreawingardh/Fix/input-color
JosAhl Nov 24, 2025
2a8759a
fix: upgrade next.js to 15.5.9 to resolve security vulnerabilities
Jennie-Westerlund Jan 1, 2026
94b82fc
Merge pull request #525 from Andreawingardh/fix/upgrade-next-security
JosAhl Jan 1, 2026
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
80 changes: 40 additions & 40 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"@react-three/drei": "^10.7.6",
"@react-three/fiber": "^9.4.0",
"next": "15.5.5",
"next": "^15.5.9",
"react": "19.1.0",
"react-dom": "19.1.0",
"three": "^0.180.0"
Expand Down
1 change: 1 addition & 0 deletions frontend/src/elements/Button/Button.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
gap: 0.5rem;
font-size: 1rem;
font-weight: 400;
Expand Down
18 changes: 4 additions & 14 deletions frontend/src/elements/TextInput/TextInput.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
border-radius: 30px;
}

.textInput::placeholder {
color: var(--charcoal);
}


/* Prevent invalid styling until user has interaced but then left the field empty */
.textInput:user-invalid {
Expand All @@ -23,26 +19,20 @@

/* variant styles */

.vanillaTextInput {
background: var(--vanilla);
color: var(--charcoal);
}

.snowdropTextInput {
background: var(--snowdrop);
color: var(--charcoal);
}

.textInput::placeholder {
color: var(--charcoal);
.snowdropTextInput::placeholder {
color: var(--light-sunflower-seed);
}

.vanillaTextInput {
background: var(--vanilla);
color: var(--charcoal);
}

.snowdropTextInput {
background: var(--snowdrop);
color: var(--charcoal);
.vanillaTextInput::placeholder {
color: var(--light-sunflower-seed);
}
2 changes: 1 addition & 1 deletion frontend/src/features/auth/LogOutButton/LogOutButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default function LogOutButton() {
logout();
}

return <Button onClick={handleOnClick} variant="snowdrop" buttonText="Log out"></Button>;
return <Button onClick={handleOnClick} variant="snowdrop" buttonText="Sign out"></Button>;
}
3 changes: 2 additions & 1 deletion frontend/src/features/modals/SaveDesignModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ export default function SaveDesignModal() {
return (
<form className={styles.saveDesignForm}>
<TextInput
variant="vanilla"
value={designName}
onChange={handleOnChange}
placeholder={designName || "Give your design a name"}
placeholder={designName || "Name your design..."}
/>
{errorMessage && <p>{errorMessage}</p>}
<Button
Expand Down
Loading