diff --git a/frontend/package.json b/frontend/package.json index 82b0d1f7..6e5a576e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -44,6 +44,7 @@ }, "devDependencies": { "@babel/preset-env": "^7.26.0", + "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@tanstack/eslint-plugin-query": "^5.60.1", "@testing-library/jest-dom": "^6.6.2", "@types/jest": "^29.5.14", diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 6aca0e2f..96f2330a 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -1,30 +1,29 @@ import React, { useState, useEffect } from 'react'; -import { Routes, Route, Navigate, useNavigate } from 'react-router-dom'; +import { Routes, Route, useNavigate } from 'react-router-dom'; import './globals.css'; -import Header from './components/header/Header'; -import Dashboard from 'pages/spotnet/dashboard/Dashboard'; -import Footer from './components/Footer/Footer'; -import SpotnetApp from 'pages/spotnet/spotnet_app/SpotnetApp'; -import Login from 'pages/Login'; -import Form from 'pages/forms/Form'; +import Header from './components/layout/header/Header'; +import Dashboard from './pages/dashboard/Dashboard'; +import Footer from './components/layout/footer/Footer'; +import SpotnetApp from './pages/spotnet-app/SpotnetApp'; +import Form from './pages/form/Form'; import { createPortal } from 'react-dom'; -import { logout } from 'services/wallet'; -import { getTelegramUserWalletId } from 'services/telegram'; -import Documentation from 'pages/spotnet/documentation/Documentation'; -import Withdraw from 'pages/vault/withdraw/Withdraw'; -import { useWalletStore } from 'stores/useWalletStore'; -import { Notifier, notify } from 'components/Notifier/Notifier'; -import { useConnectWallet } from 'hooks/useConnectWallet'; -import OverviewPage from 'pages/spotnet/overview/Overview'; -import { ActionModal } from 'components/ui/ActionModal'; -import Stake from 'pages/vault/stake/Stake'; -import { TELEGRAM_BOT_LINK } from 'utils/constants'; -import { useCheckMobile } from 'hooks/useCheckMobile'; -import PositionHistory from 'pages/spotnet/position_history/PositionHistory'; - +import { logout } from './services/wallet'; +import { getTelegramUserWalletId } from './services/telegram'; +import Documentation from './pages/documentation/Documentation'; +import Withdraw from './pages/withdraw/Withdraw'; +import { useWalletStore } from './stores/useWalletStore'; +import { Notifier, notify } from './components/layout/notifier/Notifier'; +import { useConnectWallet } from './hooks/useConnectWallet'; +import OverviewPage from './pages/overview/Overview'; +import { ActionModal } from './components/ui/action-modal'; +import Stake from './pages/stake/Stake'; +import { TELEGRAM_BOT_LINK } from './utils/constants'; +import { useCheckMobile } from './hooks/useCheckMobile'; +import PositionHistory from './pages/position-history/PositionHistory'; +import WithdrawAll from 'pages/spotnet/dashboard/withdraw-all/WithdrawAll'; function App() { - const { walletId, setWalletId, removeWalletId } = useWalletStore(); + const { setWalletId, removeWalletId } = useWalletStore(); const [showModal, setShowModal] = useState(false); const navigate = useNavigate(); const [isMobileRestrictionModalOpen, setisMobileRestrictionModalOpen] = useState(true); @@ -98,10 +97,6 @@ function App() {
} /> - : } - /> } /> } /> } /> @@ -109,6 +104,7 @@ function App() { } /> } /> } /> + } />