fixed: update routtes

Outblock · Dec 20, 2024 · 31313aa · 31313aa
1 parent bb3c85d
commit 31313aa
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 1,660 deletions.
diff --git a/src/ui/FRWComponent/LLNotFound.tsx b/src/ui/FRWComponent/LLNotFound.tsx
@@ -51,7 +51,7 @@ export const LLNotFound = ({ setShowDialog }) => {
           <Button
             variant="contained"
             color="primary"
-            onClick={() => history.push('/recover')}
+            onClick={() => history.push('/welcome')}
             disableElevation
             fullWidth
             sx={{

diff --git a/src/ui/views/InnerRoute.tsx b/src/ui/views/InnerRoute.tsx
@@ -42,7 +42,7 @@ import Resetpwd from './Setting/Resetpwd';
 import Security from './Setting/Security';
 import Settingone from './Setting/Settingone';
 import Switchaccount from './Setting/Switchaccount';
-import './MainRoute.css';
+import './Landing.css';
 import WalletList from './Setting/Wallet';
 import RemoveWallet from './Setting/Wallet/RemoveWallet';
 import WalletDetail from './Setting/Wallet/WalletDetail';

diff --git a/src/ui/views/MainRoute.css → src/ui/views/Landing.css b/src/ui/views/MainRoute.css → src/ui/views/Landing.css
diff --git a/src/ui/views/MainRoute.tsx → src/ui/views/Landing.tsx b/src/ui/views/MainRoute.tsx → src/ui/views/Landing.tsx
@@ -4,20 +4,19 @@ import { Switch, Route } from 'react-router-dom';
 import Forgot from './LandingPages/Forgot';
 import Recover from './LandingPages/Forgot/Recover';
 import Reset from './LandingPages/Forgot/Reset';
-import RecoverRegister from './LandingPages/RecoverRegister';
 import Welcome from './LandingPages/Welcome';
 import AccountImport from './LandingPages/Welcome/AccountImport';
 import Google from './LandingPages/Welcome/AccountImport/Google';
 import Register from './LandingPages/Welcome/Register';
 import Sync from './LandingPages/Welcome/Sync';
 
-import './MainRoute.css';
+import './Landing.css';
 
 const LogPageView = () => {
   return null;
 };
 
-export const MainRoute: React.FC = () => {
+export const Landing: React.FC = () => {
   return (
     <div style={{ display: 'contents' }}>
       <Route path="/" component={LogPageView} />
@@ -27,10 +26,9 @@ export const MainRoute: React.FC = () => {
         <Route exact path="/welcome/accountimport" component={AccountImport} />
         <Route exact path="/welcome/sync" component={Sync} />
         <Route exact path="/forgot" component={Forgot} />
-        <Route exact path="/recoverpage" component={Recover} />
-        <Route exact path="/resetpage" component={Reset} />
+        <Route exact path="/forgot/recover" component={Recover} />
+        <Route exact path="/forgot/reset" component={Reset} />
         <Route exact path="/welcome/accountimport/google" component={Google} />
-        <Route exact path="/recover" component={RecoverRegister} />
       </Switch>
     </div>
   );

diff --git a/src/ui/views/LandingPages/Forgot/index.tsx b/src/ui/views/LandingPages/Forgot/index.tsx
@@ -63,7 +63,7 @@ const Forgot = () => {
             <Button
               variant="contained"
               component={Link}
-              to="/resetpage"
+              to="/forgot/reset"
               size="large"
               sx={{
                 display: 'flex',
@@ -118,7 +118,7 @@ const Forgot = () => {
             <Button
               variant="contained"
               component={Link}
-              to="/recoverpage"
+              to="/forgot/recover"
               size="large"
               sx={{
                 display: 'flex',

diff --git a/src/ui/views/LandingPages/RecoverRegister/RecoveryPhrase.tsx b/src/ui/views/LandingPages/RecoverRegister/RecoveryPhrase.tsx