Organize pages and update their names to what we call them now (#812)

aloelabs · Feb 18, 2024 · d49b37b · d49b37b
1 parent 7164846
commit d49b37b
Show file tree

Hide file tree

Showing 49 changed files with 54 additions and 720 deletions.
diff --git a/earn/src/App.tsx b/earn/src/App.tsx
@@ -23,11 +23,10 @@ import AppBody from './components/common/AppBody';
 import Header from './components/header/Header';
 import { LendingPairsContext } from './data/hooks/UseLendingPairs';
 import { getAvailableLendingPairs, LendingPair } from './data/LendingPair';
+import AdvancedPage from './pages/AdvancedPage';
 import ImportBoostPage from './pages/boost/ImportBoostPage';
 import ManageBoostPage from './pages/boost/ManageBoostPage';
 import BoostPage from './pages/BoostPage';
-import BorrowPage from './pages/BorrowPage';
-import ClaimPage from './pages/ClaimPage';
 import LeaderboardPage from './pages/LeaderboardPage';
 import LendPage from './pages/LendPage';
 import MarketsPage from './pages/MarketsPage';
@@ -130,10 +129,9 @@ function AppBodyWrapper() {
               <Route path='/boost' element={<BoostPage />} />
               <Route path='/boost/import/:tokenId' element={<ImportBoostPage />} />
               <Route path='/boost/manage/:nftTokenId' element={<ManageBoostPage />} />
-              <Route path='/borrow' element={<BorrowPage />} />
+              <Route path='/borrow' element={<AdvancedPage />} />
             </>
           )}
-          <Route path='/claim' element={<ClaimPage />} />
           <Route path='/' element={<Navigate replace to='/markets' />} />
           <Route path='*' element={<Navigate to='/' />} />
         </Routes>

diff --git a/earn/src/components/borrow/BorrowGraph.tsx → earn/src/components/advanced/BorrowGraph.tsx b/earn/src/components/borrow/BorrowGraph.tsx → earn/src/components/advanced/BorrowGraph.tsx
diff --git a/...ponents/borrow/BorrowGraphPlaceholder.tsx → ...nents/advanced/BorrowGraphPlaceholder.tsx b/...ponents/borrow/BorrowGraphPlaceholder.tsx → ...nents/advanced/BorrowGraphPlaceholder.tsx
diff --git a/.../components/borrow/BorrowGraphTooltip.tsx → ...omponents/advanced/BorrowGraphTooltip.tsx b/.../components/borrow/BorrowGraphTooltip.tsx → ...omponents/advanced/BorrowGraphTooltip.tsx
diff --git a/earn/src/components/borrow/BorrowMetrics.tsx → ...src/components/advanced/BorrowMetrics.tsx b/earn/src/components/borrow/BorrowMetrics.tsx → ...src/components/advanced/BorrowMetrics.tsx
diff --git a/...rc/components/borrow/GlobalStatsTable.tsx → .../components/advanced/GlobalStatsTable.tsx b/...rc/components/borrow/GlobalStatsTable.tsx → .../components/advanced/GlobalStatsTable.tsx
diff --git a/...omponents/borrow/ManageAccountButtons.tsx → ...ponents/advanced/ManageAccountButtons.tsx b/...omponents/borrow/ManageAccountButtons.tsx → ...ponents/advanced/ManageAccountButtons.tsx
diff --git a/...c/components/borrow/SmartWalletButton.tsx → ...components/advanced/SmartWalletButton.tsx b/...c/components/borrow/SmartWalletButton.tsx → ...components/advanced/SmartWalletButton.tsx
diff --git a/...components/borrow/UniswapPositionList.tsx → ...mponents/advanced/UniswapPositionList.tsx b/...components/borrow/UniswapPositionList.tsx → ...mponents/advanced/UniswapPositionList.tsx
diff --git a/...nents/borrow/modal/AddCollateralModal.tsx → ...nts/advanced/modal/AddCollateralModal.tsx b/...nents/borrow/modal/AddCollateralModal.tsx → ...nts/advanced/modal/AddCollateralModal.tsx
diff --git a/...c/components/borrow/modal/BorrowModal.tsx → ...components/advanced/modal/BorrowModal.tsx b/...c/components/borrow/modal/BorrowModal.tsx → ...components/advanced/modal/BorrowModal.tsx
@@ -27,8 +27,8 @@ import { Liabilities } from '../../../data/MarginAccount';
 import { MarketInfo } from '../../../data/MarketInfo';
 import { RateModel, yieldPerSecondToAPR } from '../../../data/RateModel';
 import { UniswapPosition } from '../../../data/Uniswap';
+import HealthBar from '../../common/HealthBar';
 import TokenAmountSelectInput from '../../portfolio/TokenAmountSelectInput';
-import HealthBar from '../HealthBar';
 
 const GAS_ESTIMATE_WIGGLE_ROOM = 110; // 10% wiggle room
 const SECONDARY_COLOR = '#CCDFED';

diff --git a/...ents/borrow/modal/NewSmartWalletModal.tsx → ...ts/advanced/modal/NewSmartWalletModal.tsx b/...ents/borrow/modal/NewSmartWalletModal.tsx → ...ts/advanced/modal/NewSmartWalletModal.tsx
diff --git a/...ts/borrow/modal/RemoveCollateralModal.tsx → .../advanced/modal/RemoveCollateralModal.tsx b/...ts/borrow/modal/RemoveCollateralModal.tsx → .../advanced/modal/RemoveCollateralModal.tsx
@@ -25,8 +25,8 @@ import { BorrowerNftBorrower } from '../../../data/BorrowerNft';
 import { Assets } from '../../../data/MarginAccount';
 import { MarketInfo } from '../../../data/MarketInfo';
 import { UniswapPosition } from '../../../data/Uniswap';
+import HealthBar from '../../common/HealthBar';
 import TokenAmountSelectInput from '../../portfolio/TokenAmountSelectInput';
-import HealthBar from '../HealthBar';
 
 const GAS_ESTIMATE_WIGGLE_ROOM = 110; // 10% wiggle room
 const SECONDARY_COLOR = '#CCDFED';

diff --git a/...rc/components/borrow/modal/RepayModal.tsx → .../components/advanced/modal/RepayModal.tsx b/...rc/components/borrow/modal/RepayModal.tsx → .../components/advanced/modal/RepayModal.tsx
@@ -19,8 +19,8 @@ import { ChainContext } from '../../../App';
 import { isHealthy } from '../../../data/BalanceSheet';
 import { Liabilities, MarginAccount } from '../../../data/MarginAccount';
 import { UniswapPosition } from '../../../data/Uniswap';
+import HealthBar from '../../common/HealthBar';
 import TokenAmountSelectInput from '../../portfolio/TokenAmountSelectInput';
-import HealthBar from '../HealthBar';
 
 const GAS_ESTIMATE_WIGGLE_ROOM = 110; // 10% wiggle room
 const SECONDARY_COLOR = '#CCDFED';

diff --git a/...onents/borrow/modal/WithdrawAnteModal.tsx → ...ents/advanced/modal/WithdrawAnteModal.tsx b/...onents/borrow/modal/WithdrawAnteModal.tsx → ...ents/advanced/modal/WithdrawAnteModal.tsx
diff --git a/.../borrow/modal/WithdrawUniswapNFTModal.tsx → ...dvanced/modal/WithdrawUniswapNFTModal.tsx b/.../borrow/modal/WithdrawUniswapNFTModal.tsx → ...dvanced/modal/WithdrawUniswapNFTModal.tsx
diff --git a/...nts/borrow/modal/tab/AddCollateralTab.tsx → ...s/advanced/modal/tab/AddCollateralTab.tsx b/...nts/borrow/modal/tab/AddCollateralTab.tsx → ...s/advanced/modal/tab/AddCollateralTab.tsx
@@ -15,8 +15,8 @@ import { ChainContext } from '../../../../App';
 import { isHealthy } from '../../../../data/BalanceSheet';
 import { Assets, MarginAccount } from '../../../../data/MarginAccount';
 import { UniswapPosition } from '../../../../data/Uniswap';
+import HealthBar from '../../../common/HealthBar';
 import TokenAmountSelectInput from '../../../portfolio/TokenAmountSelectInput';
-import HealthBar from '../../HealthBar';
 
 const SECONDARY_COLOR = '#CCDFED';
 const TERTIARY_COLOR = '#4b6980';

diff --git a/...odal/tab/AddUniswapNFTAsCollateralTab.tsx → ...odal/tab/AddUniswapNFTAsCollateralTab.tsx b/...odal/tab/AddUniswapNFTAsCollateralTab.tsx → ...odal/tab/AddUniswapNFTAsCollateralTab.tsx
diff --git a/.../src/components/borrow/HealthBar.spec.tsx → .../src/components/common/HealthBar.spec.tsx b/.../src/components/borrow/HealthBar.spec.tsx → .../src/components/common/HealthBar.spec.tsx
diff --git a/earn/src/components/borrow/HealthBar.tsx → earn/src/components/common/HealthBar.tsx b/earn/src/components/borrow/HealthBar.tsx → earn/src/components/common/HealthBar.tsx
diff --git a/earn/src/components/common/HealthGauge.tsx b/earn/src/components/common/HealthGauge.tsx
@@ -4,7 +4,7 @@ import { GREY_600 } from 'shared/lib/data/constants/Colors';
 import { getHealthColor } from 'shared/lib/util/Health';
 import styled from 'styled-components';
 
-import HealthBar from '../borrow/HealthBar';
+import HealthBar from './HealthBar';
 
 const TooltipParent = styled.div`
   display: inline-block;

diff --git a/earn/src/components/info/LenderCard.tsx b/earn/src/components/info/LenderCard.tsx