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

feat: next 15 upgrade #270

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: next 15 upgrade #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions gurubu-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"private": true,
"scripts": {
"dev": "next dev",
"dev": "next dev --turbopack",
"build": "next build",
"start": "next start",
"lint": "next lint"
Expand All @@ -20,23 +20,27 @@
"intro.js": "^7.2.0",
"lodash.debounce": "^4.0.8",
"marked": "^15.0.4",
"next": "14.0.0",
"react": "^18",
"react-dom": "^18",
"next": "15.1.4",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-hot-toast": "^2.4.1",
"sharp": "0.33.1",
"socket.io-client": "^4.7.2"
},
"devDependencies": {
"@types/lodash.debounce": "^4.0.9",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react": "19.0.7",
"@types/react-dom": "19.0.3",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"classnames": "^2.3.2",
"eslint": "^8",
"eslint-config-next": "14.0.0",
"eslint-config-next": "15.1.4",
"sass": "^1.69.5",
"typescript": "^5"
},
"resolutions": {
"@types/react": "19.0.7",
"@types/react-dom": "19.0.3"
}
}
2 changes: 1 addition & 1 deletion gurubu-client/src/app/components/room/grooming-navbar/snow-animation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface SnowAnimationProps {

const SnowAnimation = memo(({ isActive }: SnowAnimationProps) => {
const canvasRef = useRef<HTMLCanvasElement>(null);
const rafRef = useRef<number>();
const rafRef = useRef<number>(0);
const [isReverse, setIsReverse] = useState(false);

useEffect(() => {
Expand Down
5 changes: 3 additions & 2 deletions gurubu-client/src/app/room/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import classnames from "classnames";
import { useEffect, useState } from "react";
import { useEffect, useState, use } from "react";

import ConnectingInfo from "@/components/room/grooming-board/connecting-info";
import GroomingBoard from "@/components/room/grooming-board/grooming-board";
Expand All @@ -25,7 +25,8 @@ import { ToastProvider, useToast } from "@/contexts/ToastContext";
import { AvatarProvider } from "@/contexts/AvatarContext";
import "@/styles/room/style.scss";

const GroomingRoom = ({ params }: { params: { id: string } }) => {
const GroomingRoom = (props: { params: Promise<{ id: string }> }) => {
const params = use(props.params);
return (
<GroomingRoomProvider roomId={params.id}>
<SocketProvider>
Expand Down
30 changes: 16 additions & 14 deletions gurubu-client/src/app/styles/common/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
@use "../variables";

.cta {
border-radius: $radius-large;
padding: $space-large 1.75rem;
border-radius: variables.$radius-large;
padding: variables.$space-large 1.75rem;
display: flex;
align-items: center;
justify-content: center;
width: fit-content;
font-weight: $semibold;
font-size: $font-size-paragraph-2;
font-weight: variables.$semibold;
font-size: variables.$font-size-paragraph-2;
line-height: 1.75rem;
gap: $space-small;
gap: variables.$space-small;

&.primary {
background-color: $white;
color: $gray-700;
border: 1px solid $gray-300;
background-color: variables.$white;
color: variables.$gray-700;
border: 1px solid variables.$gray-300;
}

&.secondary {
background-color: $purple-700;
color: $white;
font-size: $font-size-paragraph-3;
font-weight: $semibold;
line-height: $line-height-paragraph-4;
border: 1px solid $purple-700;
background-color: variables.$purple-700;
color: variables.$white;
font-size: variables.$font-size-paragraph-3;
font-weight: variables.$semibold;
line-height: variables.$line-height-paragraph-4;
border: 1px solid variables.$purple-700;
}
}
25 changes: 14 additions & 11 deletions gurubu-client/src/app/styles/common/footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../mixins";
@use "../variables";

.footer {
margin: auto auto 0;
width: 100%;
Expand All @@ -6,7 +9,7 @@
flex-direction: column-reverse;
gap: 24px;
padding: 8px 32px 18px;
@include media(md) {
@include mixins.media(md) {
padding: 16px 32px 18px;
flex-direction: column;
}
Expand All @@ -19,7 +22,7 @@
flex-direction: column;
align-items: center;
gap: 21px;
@include media(md) {
@include mixins.media(md) {
flex-direction: row;
justify-content: space-between;
align-items: center;
Expand All @@ -29,19 +32,19 @@
flex-direction: column;
gap: 2px;
text-align: center;
@include media(md) {
@include mixins.media(md) {
flex-direction: row;
gap: 32px;
}
& > a {
line-height: $line-height-paragraph-4;
color: $gray-600;
font-weight: $semibold;
line-height: variables.$line-height-paragraph-4;
color: variables.$gray-600;
font-weight: variables.$semibold;
}
}
&__copyright {
line-height: $line-height-paragraph-4;
color: $gray-500;
line-height: variables.$line-height-paragraph-4;
color: variables.$gray-500;
}
}
&__logo {
Expand All @@ -50,9 +53,9 @@
justify-content: center;
gap: 6px;
font-family: var(--font-family-grotest);
font-weight: $bold;
font-size: $font-size-paragraph-2;
line-height: $line-height-paragraph-4;
font-weight: variables.$bold;
font-size: variables.$font-size-paragraph-2;
line-height: variables.$line-height-paragraph-4;
padding-top: 21px;
}
}
8 changes: 5 additions & 3 deletions gurubu-client/src/app/styles/common/logo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
@use "../variables";

.logo {
display: flex;
align-items: center;
gap: 0.375rem;
margin-right: 4rem;
font-weight: $bold;
font-size: $font-size-paragraph-2;
line-height: $line-height-paragraph-4;
font-weight: variables.$bold;
font-size: variables.$font-size-paragraph-2;
line-height: variables.$line-height-paragraph-4;

& span {
user-select: none;
Expand Down
4 changes: 3 additions & 1 deletion gurubu-client/src/app/styles/common/modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../variables";

.modal {
display: none;
position: fixed;
Expand Down Expand Up @@ -26,7 +28,7 @@
.modal-content {
background: #fff;
padding: 24px;
border-radius: $radius-xlarge;
border-radius: variables.$radius-xlarge;
position: relative;
z-index: 1;
width: 400px;
Expand Down
60 changes: 31 additions & 29 deletions gurubu-client/src/app/styles/common/navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
@use "../variables";

.nav {
padding: $space-xlarge 0;
padding: variables.$space-xlarge 0;
display: flex;
align-items: center;
justify-content: center;
border-bottom: 1px solid $v2-gray-100;
border-bottom: 1px solid variables.$v2-gray-100;
position: sticky;
top: 0;
background-color: $white;
background-color: variables.$white;

&__content {
max-width: $max-width;
max-width: variables.$max-width;
width: 100%;
margin: 0 auto;
display: flex;
Expand All @@ -20,25 +22,25 @@
display: flex;
align-items: center;
justify-content: center;
gap: $space-xxlarge;
padding: $space-xsmall 0;
font-size: $font-size-paragraph-3;
line-height: $line-height-paragraph-4;
font-weight: $semibold;
color: $v2-gray-600;
gap: variables.$space-xxlarge;
padding: variables.$space-xsmall 0;
font-size: variables.$font-size-paragraph-3;
line-height: variables.$line-height-paragraph-4;
font-weight: variables.$semibold;
color: variables.$v2-gray-600;

&.--mobile {
display: flex !important;
flex-direction: column;
align-items: center;
justify-content: center;
gap: $space-xxlarge;
padding: $space-xsmall 0;
font-size: $font-size-paragraph-3;
line-height: $line-height-paragraph-4;
font-weight: $semibold;
color: $v2-gray-600;
margin-top: $space-xxlarge;
gap: variables.$space-xxlarge;
padding: variables.$space-xsmall 0;
font-size: variables.$font-size-paragraph-3;
line-height: variables.$line-height-paragraph-4;
font-weight: variables.$semibold;
color: variables.$v2-gray-600;
margin-top: variables.$space-xxlarge;
}
}

Expand All @@ -57,7 +59,7 @@
left: 0;
width: 100%;
height: 100vh;
background-color: $white;
background-color: variables.$white;
z-index: 1000;
display: flex;
flex-direction: column;
Expand All @@ -66,26 +68,26 @@

&__close {
position: absolute;
top: $space-xxlarge;
right: $space-xxlarge;
top: variables.$space-xxlarge;
right: variables.$space-xxlarge;
border: none;
background-color: transparent;
outline: none;
top: $space-xxlarge;
right: $space-xxlarge;
top: variables.$space-xxlarge;
right: variables.$space-xxlarge;
}

&--links {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: $space-xxlarge;
padding: $space-xsmall 0;
font-size: $font-size-paragraph-3;
line-height: $line-height-paragraph-4;
font-weight: $semibold;
color: $v2-gray-600;
gap: variables.$space-xxlarge;
padding: variables.$space-xsmall 0;
font-size: variables.$font-size-paragraph-3;
line-height: variables.$line-height-paragraph-4;
font-weight: variables.$semibold;
color: variables.$v2-gray-600;
}

&__content {
Expand All @@ -97,7 +99,7 @@

@media (max-width: 768px) {
.nav {
padding: $space-large $space-xxlarge;
padding: variables.$space-large variables.$space-xxlarge;
&__content {
justify-content: space-between;
&--links {
Expand Down
14 changes: 7 additions & 7 deletions gurubu-client/src/app/styles/common/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "./navbar.scss";
@import "./footer.scss";
@import "./logo.scss";
@import "./button.scss";
@import "./modal.scss";
@import "./sidebar.scss";
@import "./avatar.scss";
@use "navbar.scss";
@use "footer.scss";
@use "logo.scss";
@use "button.scss";
@use "modal.scss";
@use "sidebar.scss";
@use "avatar.scss";
Loading