Skip to content

Commit

Permalink
update(user): 14로 올리고 에러 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
junghongseop committed Sep 24, 2024
1 parent aa186b0 commit 399fdf3
Show file tree
Hide file tree
Showing 4 changed files with 1,032 additions and 709 deletions.
10 changes: 6 additions & 4 deletions apps/user/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
"eslint-plugin-storybook": "^0.6.13",
"msw": "^1.2.2",
"storybook": "^7.3.1",
"typescript": "5.1.3"
"styled-components": "^6.0.3",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "5.1.6"
},
"dependencies": {
"@maru/design-token": "workspace:*",
Expand All @@ -46,13 +48,13 @@
"@toss/use-overlay": "^1.3.6",
"axios": "^1.7.4",
"dayjs": "^1.11.8",
"next": "13.5.2",
"next": "14.2.3",
"react": "18.2.0",
"react-cookie": "^7.2.0",
"react-daum-postcode": "^3.1.3",
"react-dom": "18.2.0",
"react-easy-crop": "^5.0.7",
"recoil": "^0.7.7",
"styled-components": "^6.0.3"
"react-toastify": "^9.1.3",
"recoil": "^0.7.7"
}
}
4 changes: 2 additions & 2 deletions apps/user/src/app/change-password/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import { AppLayout } from '@/layouts';
import { color } from '@maru/design-token';
import { styled } from 'styled-components';
import { flex } from '@maru/utils';
import {
Button,
ButtonInput,
Expand All @@ -20,6 +18,8 @@ import {
useVerificationCodeAction,
} from './change-password.hooks';
import { Validate } from '@/components/signup';
import { flex } from '@maru/utils';
import styled from 'styled-components';

const ChangePasswordPage = () => {
const [timerTime, setTimerTime] = useState(0);
Expand Down
10 changes: 10 additions & 0 deletions apps/user/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,18 @@ import { useEffect, useState } from 'react';
import { useRouter, useSearchParams } from 'next/navigation';
import { ROUTES } from '@/constants/common/constant';
import NoticeModal from '@/components/main/NoticeModal/NoticeModal';
import React from 'react';
import { Suspense } from '@suspensive/react';

const MainPage = () => {
return (
<Suspense.CSROnly>
<MainContent />
</Suspense.CSROnly>
);
};

const MainContent = () => {
const [isModalOpen, setIsModalOpen] = useState(false);
const searchParams = useSearchParams();
const router = useRouter();
Expand Down
Loading

0 comments on commit 399fdf3

Please sign in to comment.