diff --git a/src/app.tsx b/src/app.tsx index a3a23c2..7356485 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -7,7 +7,7 @@ import { i18nManager } from './i18n/manager'; // Page components import Home from './pages/home'; import History from './pages/history'; -import FriendsPhoto from './pages/friends-photo'; +import Create from './pages/create'; import Result from './pages/result'; // Bottom navigation component @@ -20,7 +20,7 @@ function App() { const location = useLocation(); // Pages that don't need to show bottom navigation - const hideBottomNavPages = ['/friends-photo', '/result']; + const hideBottomNavPages = ['/create', '/result']; useEffect(() => { const initApp = async () => { @@ -58,11 +58,11 @@ function App() { } /> } /> } /> - } /> + } /> } /> - {!hideBottomNavPages.includes(location.pathname) && } + {!hideBottomNavPages.some(path => location.pathname.startsWith(path)) && } ); } diff --git a/src/pages/friends-photo/components/UploadCard/index.css b/src/pages/create/components/UploadCard/index.css similarity index 100% rename from src/pages/friends-photo/components/UploadCard/index.css rename to src/pages/create/components/UploadCard/index.css diff --git a/src/pages/friends-photo/components/UploadCard/index.tsx b/src/pages/create/components/UploadCard/index.tsx similarity index 100% rename from src/pages/friends-photo/components/UploadCard/index.tsx rename to src/pages/create/components/UploadCard/index.tsx diff --git a/src/pages/friends-photo/index.css b/src/pages/create/index.css similarity index 100% rename from src/pages/friends-photo/index.css rename to src/pages/create/index.css diff --git a/src/pages/friends-photo/index.tsx b/src/pages/create/index.tsx similarity index 92% rename from src/pages/friends-photo/index.tsx rename to src/pages/create/index.tsx index ba2e904..57ec775 100644 --- a/src/pages/friends-photo/index.tsx +++ b/src/pages/create/index.tsx @@ -1,6 +1,6 @@ import { Template } from '@/sdk/sdk-server'; import { useEffect, useState } from 'react'; -import { useSearchParams } from 'react-router-dom'; +import { useParams } from 'react-router-dom'; import { useServerSdk } from '../../hooks/index'; import { useI18n } from '../../hooks/useI18n'; import { i18nManager } from '../../i18n/manager'; @@ -11,10 +11,9 @@ import UploadCard from './components/UploadCard'; import './index.css'; import { authService } from '@/services'; -export default function FriendsPhoto() { - const [searchParams] = useSearchParams(); +export default function Create() { + const { templateCode } = useParams(); const [isLoggedIn, setIsLoggedIn] = useState(false); - const templateCode = searchParams.get('templateCode'); const [template, setTemplate] = useState