diff --git a/frontend/package-lock.json b/frontend/package-lock.json index bc19e0e7..4989388e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,6 +14,7 @@ "@sentry/react": "^8.24.0", "@sentry/webpack-plugin": "^2.22.0", "firebase": "^10.12.5", + "heic2any": "^0.0.4", "react": "^18.3.1", "react-dom": "^18.3.1", "react-ga4": "^2.1.0", @@ -13585,6 +13586,11 @@ "integrity": "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==", "dev": true }, + "node_modules/heic2any": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/heic2any/-/heic2any-0.0.4.tgz", + "integrity": "sha512-3lLnZiDELfabVH87htnRolZ2iehX9zwpRyGNz22GKXIu0fznlblf0/ftppXKNqS26dqFSeqfIBhAmAj/uSp0cA==" + }, "node_modules/hoist-non-react-statics": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", diff --git a/frontend/package.json b/frontend/package.json index 6f400ecc..f4e13a84 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -94,6 +94,7 @@ "@sentry/react": "^8.24.0", "@sentry/webpack-plugin": "^2.22.0", "firebase": "^10.12.5", + "heic2any": "^0.0.4", "react": "^18.3.1", "react-dom": "^18.3.1", "react-ga4": "^2.1.0", diff --git a/frontend/src/common/assets/loading.gif b/frontend/src/common/assets/loading.gif new file mode 100644 index 00000000..c5126ed9 Binary files /dev/null and b/frontend/src/common/assets/loading.gif differ diff --git a/frontend/src/components/Fallback/HappyFallback/HappyFallback.style.ts b/frontend/src/components/Fallback/HappyFallback/HappyFallback.style.ts index c7ee1ab1..9ff1a123 100644 --- a/frontend/src/components/Fallback/HappyFallback/HappyFallback.style.ts +++ b/frontend/src/components/Fallback/HappyFallback/HappyFallback.style.ts @@ -22,8 +22,6 @@ export const container = ({ `; export const image = css` - width: 100%; max-width: 40rem; - height: 100%; max-height: 40rem; `; diff --git a/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx b/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx index 2f858b06..5fc6a51e 100644 --- a/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx +++ b/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx @@ -14,7 +14,7 @@ export default function OAuthLoginPage() { const params = useParams<'provider'>(); const provider = params.provider as Provider | undefined; const { mutate: kakaoMigration } = useMigrationOAuth( - () => navigate(`${GET_ROUTES.default.resultMigration}/sucess`), + () => navigate(`${GET_ROUTES.default.resultMigration}/success`), () => navigate(`${GET_ROUTES.default.resultMigration}/fail`), ); diff --git a/frontend/src/pages/Moim/MainPage/MainPage.tsx b/frontend/src/pages/Moim/MainPage/MainPage.tsx index b8665018..52be0849 100644 --- a/frontend/src/pages/Moim/MainPage/MainPage.tsx +++ b/frontend/src/pages/Moim/MainPage/MainPage.tsx @@ -38,6 +38,7 @@ import { useTheme } from '@emotion/react'; export default function MainPage() { const navigate = useNavigate(); const { mutate } = useServeToken(); + const theme = useTheme(); const [currentTab, setCurrentTab] = useState('모임목록'); const [isDarakbangMenuOpened, setIsDarakbangMenuOpened] = useState(false); @@ -53,6 +54,7 @@ export default function MainPage() { if (window.Notification && window.Notification.permission === 'default') { setIsModalOpen(true); } + requestPermission(mutate); }, []); const handleModalClose = () => { diff --git a/frontend/src/pages/Mypage/MyPage.tsx b/frontend/src/pages/Mypage/MyPage.tsx index 2c13a86d..b67ffaa7 100644 --- a/frontend/src/pages/Mypage/MyPage.tsx +++ b/frontend/src/pages/Mypage/MyPage.tsx @@ -26,6 +26,7 @@ export default function MyPage() { isEditing, isShownRest, isValidMyInfo, + isImageLoading, setNickname, setDescription, handleEditClick, @@ -74,9 +75,14 @@ export default function MyPage() { {isValidMyInfo && ( )}