diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 779975832..e40680689 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -1,30 +1,30 @@ import React, { useState, useEffect } from 'react'; import { Routes, Route, useNavigate, useLocation } from 'react-router-dom'; import './globals.css'; -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 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/documentation/Documentation'; -import TermsAndConditionsPage from './pages/terms-and-conditions/TermsAndConditions'; +import { logout } from '@/services/wallet'; +import { getTelegramUserWalletId } from '@/services/telegram'; +import Documentation from '@/pages/documentation/Documentation'; +import TermsAndConditionsPage from '@/pages/terms-and-conditions/TermsAndConditions'; -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'; -import { DefiSpringPage } from './pages/spotnet/defi-spring/DefiSpring'; -import { AddDeposit } from './pages/add-deposit/AddDeposit'; +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'; +import { DefiSpringPage } from '@/pages/spotnet/defi-spring/DefiSpring'; +import { AddDeposit } from '@/pages/add-deposit/AddDeposit'; function App() { const { setWalletId, removeWalletId } = useWalletStore(); diff --git a/frontend/src/components/dashboard/borrow/Borrow.jsx b/frontend/src/components/dashboard/borrow/Borrow.jsx index 6d45717d9..73e367909 100644 --- a/frontend/src/components/dashboard/borrow/Borrow.jsx +++ b/frontend/src/components/dashboard/borrow/Borrow.jsx @@ -1,6 +1,6 @@ import React from 'react'; import './borrow.css'; -import BorrowIcon from '../../../assets/icons/borrow_dynamic.svg?react'; +import BorrowIcon from '@/assets/icons/borrow_dynamic.svg?react'; function Borrow({ data }) { return ( diff --git a/frontend/src/components/dashboard/collateral/Collateral.jsx b/frontend/src/components/dashboard/collateral/Collateral.jsx index be825c5de..3ff083cd5 100644 --- a/frontend/src/components/dashboard/collateral/Collateral.jsx +++ b/frontend/src/components/dashboard/collateral/Collateral.jsx @@ -1,6 +1,6 @@ import React from 'react'; import './collateral.css'; -import CollateralIcon from '../../../assets/icons/collateral_dynamic.svg?react'; +import CollateralIcon from '@/assets/icons/collateral_dynamic.svg?react'; import { TrendingDown, TrendingUp } from 'lucide-react'; function Collateral({ data, startSum, currentSum, getCurrentSumColor }) { diff --git a/frontend/src/components/dashboard/dashboard-tab/DashboardTabs.jsx b/frontend/src/components/dashboard/dashboard-tab/DashboardTabs.jsx index d885a8bc3..f06eb3435 100644 --- a/frontend/src/components/dashboard/dashboard-tab/DashboardTabs.jsx +++ b/frontend/src/components/dashboard/dashboard-tab/DashboardTabs.jsx @@ -1,8 +1,8 @@ import './dashboardTabs.css'; -import DepositIcon from '../../../assets/icons/deposited_dynamic.svg?react'; -import CollateralIcon from '../../../assets/icons/collateral_dynamic.svg?react'; -import BorrowIcon from '../../../assets/icons/borrow_dynamic.svg?react'; -import { DASHBOARD_TABS } from '../../../utils/constants'; +import DepositIcon from '@/assets/icons/deposited_dynamic.svg?react'; +import CollateralIcon from '@/assets/icons/collateral_dynamic.svg?react'; +import BorrowIcon from '@/assets/icons/borrow_dynamic.svg?react'; +import { DASHBOARD_TABS } from '@/utils/constants'; function DashboardTabs({ activeTab, switchTab }) { const { COLLATERAL, BORROW, DEPOSITED } = DASHBOARD_TABS; diff --git a/frontend/src/components/dashboard/deposited/Deposited.jsx b/frontend/src/components/dashboard/deposited/Deposited.jsx index 91c0c0e13..57852c003 100644 --- a/frontend/src/components/dashboard/deposited/Deposited.jsx +++ b/frontend/src/components/dashboard/deposited/Deposited.jsx @@ -1,7 +1,7 @@ import './deposited.css'; -import EthIcon from '../../../assets/icons/ethereum.svg?react'; -import StrkIcon from '../../../assets/icons/strk.svg?react'; -import UsdIcon from '../../../assets/icons/usdc-icon.svg?react'; +import EthIcon from '@/assets/icons/ethereum.svg?react'; +import StrkIcon from '@/assets/icons/strk.svg?react'; +import UsdIcon from '@/assets/icons/usdc-icon.svg?react'; function Deposited({ data }) { return ( diff --git a/frontend/src/components/home/about/About.jsx b/frontend/src/components/home/about/About.jsx index d8bbc032b..ceb636422 100644 --- a/frontend/src/components/home/about/About.jsx +++ b/frontend/src/components/home/about/About.jsx @@ -1,9 +1,10 @@ import React from 'react'; -import ZkLend from '../../../assets/icons/zklend_eth_collateral.svg?react'; -import BorrowUSDC from '../../../assets/icons/borrow_usdc.svg?react'; -import EkuboSwap from '../../../assets/icons/ekubo_swap.svg?react'; -import Repeat from '../../../assets/icons/repeats.svg?react'; -import StarMaker from '../../layout/star-maker/StarMaker'; +import ZkLend from '@/assets/icons/zklend_eth_collateral.svg?react'; +import BorrowUSDC from '@/assets/icons/borrow_usdc.svg?react'; +import EkuboSwap from '@/assets/icons/ekubo_swap.svg?react'; +import Repeat from '@/assets/icons/repeats.svg?react'; +import StarMaker from '@/components/layout/star-maker/StarMaker'; + import './about.css'; const CardData = [ diff --git a/frontend/src/components/home/dont-miss/DontMiss.jsx b/frontend/src/components/home/dont-miss/DontMiss.jsx index ff5fb8a1e..7e46e6f61 100644 --- a/frontend/src/components/home/dont-miss/DontMiss.jsx +++ b/frontend/src/components/home/dont-miss/DontMiss.jsx @@ -1,11 +1,11 @@ import './dontMiss.css'; import React from 'react'; -import Rocket from '../../../assets/icons/rocket.svg?react'; -import Hand from '../../../assets/images/hand.svg?react'; -import Star from '../../../assets/particles/star.svg?react'; +import Rocket from '@/assets/icons/rocket.svg?react'; +import Hand from '@/assets/images/hand.svg?react'; +import Star from '@/assets/particles/star.svg?react'; import { useNavigate } from 'react-router-dom'; -import { notify } from '../../../components/layout/notifier/Notifier'; -import { useWalletStore } from '../../../stores/useWalletStore'; +import { notify } from '@/components/layout/notifier/Notifier'; +import { useWalletStore } from '@/stores/useWalletStore'; const DontMiss = () => { const { walletId } = useWalletStore(); diff --git a/frontend/src/components/home/home/Home.jsx b/frontend/src/components/home/home/Home.jsx index a00e6b30e..6b136acf8 100644 --- a/frontend/src/components/home/home/Home.jsx +++ b/frontend/src/components/home/home/Home.jsx @@ -1,13 +1,13 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; -import SmallStar from '../../../assets/particles/small_star.svg?react'; -import StarMaker from '../../layout/star-maker/StarMaker'; -import Decoration from '../../../assets/particles/deco.svg?react'; -import Starknet from '../../../assets/particles/starknet.svg?react'; -import Rocket from '../../../assets/icons/rocket.svg?react'; +import SmallStar from '@/assets/particles/small_star.svg?react'; +import StarMaker from '@/components/layout/star-maker/StarMaker'; +import Decoration from '@/assets/particles/deco.svg?react'; +import Starknet from '@/assets/particles/starknet.svg?react'; +import Rocket from '@/assets/icons/rocket.svg?react'; import './home.css'; -import { useWalletStore } from '../../../stores/useWalletStore'; -import { notify } from '../../layout/notifier/Notifier'; +import { useWalletStore } from '@/stores/useWalletStore'; +import { notify } from '@/components/layout/notifier/Notifier'; function Home() { const { walletId } = useWalletStore(); diff --git a/frontend/src/components/home/information/Information.jsx b/frontend/src/components/home/information/Information.jsx index b09710feb..0244d0fb8 100644 --- a/frontend/src/components/home/information/Information.jsx +++ b/frontend/src/components/home/information/Information.jsx @@ -1,7 +1,7 @@ import './information.css'; import React, { useEffect, useState } from 'react'; -import StarMaker from '../../layout/star-maker/StarMaker'; -import { axiosInstance } from '../../../utils/axios'; +import StarMaker from '@/components/layout/star-maker/StarMaker'; +import { axiosInstance } from '@/utils/axios'; const Information = () => { const [data, setData] = useState({ total_opened_amount: 0, unique_users: 0 }); diff --git a/frontend/src/components/home/partnership/Partnership.jsx b/frontend/src/components/home/partnership/Partnership.jsx index 432f279d4..7e88d32a5 100644 --- a/frontend/src/components/home/partnership/Partnership.jsx +++ b/frontend/src/components/home/partnership/Partnership.jsx @@ -1,8 +1,8 @@ import React from 'react'; import './partnership.css'; -import ZklendLogo from '../../../assets/images/zklend_logo.svg?react'; -import EkuboLogo from '../../../assets/images/ekubo_logo.svg?react'; -import Star from '../../../assets/particles/star.svg?react'; +import ZklendLogo from '@/assets/images/zklend_logo.svg?react'; +import EkuboLogo from '@/assets/images/ekubo_logo.svg?react'; +import Star from '@/assets/particles/star.svg?react'; const Partnership = () => { const logos = []; diff --git a/frontend/src/components/layout/footer/Footer.jsx b/frontend/src/components/layout/footer/Footer.jsx index 34b6fb18a..3b06170e4 100644 --- a/frontend/src/components/layout/footer/Footer.jsx +++ b/frontend/src/components/layout/footer/Footer.jsx @@ -1,10 +1,10 @@ import React from 'react'; import { NavLink } from 'react-router-dom'; -import TwitterIcon from '../../../assets/icons/new-twitter.svg?react'; -import TelegramIcon from '../../../assets/icons/telegram.svg?react'; -import GithubIcon from '../../../assets/icons/github.svg?react'; -import DashboardIcon from '../../../assets/icons/dashboard-icon.svg?react'; -import FormIcon from '../../../assets/icons/form-icon.svg?react'; +import TwitterIcon from '@/assets/icons/new-twitter.svg?react'; +import TelegramIcon from '@/assets/icons/telegram.svg?react'; +import GithubIcon from '@/assets/icons/github.svg?react'; +import DashboardIcon from '@/assets/icons/dashboard-icon.svg?react'; +import FormIcon from '@/assets/icons/form-icon.svg?react'; import './footer.css'; diff --git a/frontend/src/components/layout/header/Header.jsx b/frontend/src/components/layout/header/Header.jsx index a50b2532b..ccbecdf79 100644 --- a/frontend/src/components/layout/header/Header.jsx +++ b/frontend/src/components/layout/header/Header.jsx @@ -1,15 +1,15 @@ import React, { useState, useEffect } from 'react'; import { useLocation } from 'react-router-dom'; import { NavLink } from 'react-router-dom'; -import Logo from '../../../assets/icons/spotnet-logo.svg?react'; -import WalletSection from '../wallet-section/WalletSection'; -import NavigationLinks from '../navigation-links/NavigationLinks'; -import useLockBodyScroll from '../../../hooks/useLockBodyScroll'; -import MobDropdownMenu from '../mob-dropdown-menu/MobDropdownMenu'; +import Logo from '@/assets/icons/spotnet-logo.svg?react'; +import WalletSection from '@/components/layout/wallet-section/WalletSection'; +import NavigationLinks from '@/components/layout/navigation-links/NavigationLinks'; +import useLockBodyScroll from '@/hooks/useLockBodyScroll'; +import MobDropdownMenu from '@/components/layout/mob-dropdown-menu/MobDropdownMenu'; import './header.css'; -import '../../../globals.css'; -import { ReportBugButton } from '../../../components/report-button/ReportBugButton'; -import { ReportBugModal } from '../../../components/report-modal/ReportBugModal'; +import '@/globals.css'; +import { ReportBugButton } from '@/components/report-button/ReportBugButton'; +import { ReportBugModal } from '@/components/report-modal/ReportBugModal'; function Header({ onConnectWallet, onLogout }) { const [isModalOpen, setIsModalOpen] = useState(false); diff --git a/frontend/src/components/layout/mob-dropdown-menu/MobDropdownMenu.jsx b/frontend/src/components/layout/mob-dropdown-menu/MobDropdownMenu.jsx index 5ad3e434c..854cb1c99 100644 --- a/frontend/src/components/layout/mob-dropdown-menu/MobDropdownMenu.jsx +++ b/frontend/src/components/layout/mob-dropdown-menu/MobDropdownMenu.jsx @@ -1,8 +1,8 @@ import React from 'react'; -import ArrowDownIcon from '../../../assets/icons/dropdown-arrow.svg?react'; -import ReloadIcon from '../../../assets/icons/reload.svg?react'; -import OpenBotIcon from '../../../assets/icons/bot.svg?react'; -import TermsIcon from '../../../assets/icons/terms.svg?react'; +import ArrowDownIcon from '@/assets/icons/dropdown-arrow.svg?react'; +import ReloadIcon from '@/assets/icons/reload.svg?react'; +import OpenBotIcon from '@/assets/icons/bot.svg?react'; +import TermsIcon from '@/assets/icons/terms.svg?react'; import './mobDropdownMenu.css'; const menuItems = [ diff --git a/frontend/src/components/layout/sidebar/SidebarItem.jsx b/frontend/src/components/layout/sidebar/SidebarItem.jsx index ae5bc8dc4..022aaf644 100644 --- a/frontend/src/components/layout/sidebar/SidebarItem.jsx +++ b/frontend/src/components/layout/sidebar/SidebarItem.jsx @@ -1,4 +1,4 @@ -import addSquare from '../../../assets/icons/add-square.svg?react'; +import addSquare from '@/assets/icons/add-square.svg?react'; import { ChevronDown, ChevronUp } from 'lucide-react'; export const SidebarItem = ({ item: { icon, name }, isExpanded, hasChildren, isNested }) => { diff --git a/frontend/src/components/layout/star-maker/StarMaker.jsx b/frontend/src/components/layout/star-maker/StarMaker.jsx index cf05b05ae..a59852ff6 100644 --- a/frontend/src/components/layout/star-maker/StarMaker.jsx +++ b/frontend/src/components/layout/star-maker/StarMaker.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Star from '../../../assets/particles/star.svg?react'; +import Star from '@/assets/particles/star.svg?react'; const StarMaker = ({ starData }) => starData.map((star, index) => ( diff --git a/frontend/src/components/layout/wallet-section/WalletSection.jsx b/frontend/src/components/layout/wallet-section/WalletSection.jsx index dd63dc62b..8bd5f22cc 100644 --- a/frontend/src/components/layout/wallet-section/WalletSection.jsx +++ b/frontend/src/components/layout/wallet-section/WalletSection.jsx @@ -1,6 +1,6 @@ import React, { useState, useEffect, useRef } from 'react'; -import { Button } from '../../../components/ui/custom-button/Button'; -import { useWalletStore } from '../../../stores/useWalletStore'; +import { Button } from '@/assets/components/ui/custom-button/Button'; +import { useWalletStore } from '@/assetsstores/useWalletStore'; const WalletSection = ({ onConnectWallet, onLogout }) => { const { walletId } = useWalletStore(); diff --git a/frontend/src/components/report-modal/ReportBugModal.jsx b/frontend/src/components/report-modal/ReportBugModal.jsx index 8d05b1050..4d9e9334e 100644 --- a/frontend/src/components/report-modal/ReportBugModal.jsx +++ b/frontend/src/components/report-modal/ReportBugModal.jsx @@ -1,9 +1,9 @@ import React, { useState } from 'react'; import './ReportBugModal.css'; -import telegramIcon from '../../assets/icons/telegram.svg'; -import { Button } from '../../components/ui/custom-button/Button'; -import { useWalletStore } from '../../stores/useWalletStore'; -import { useBugReport } from '../../hooks/useBugReport'; +import telegramIcon from '@/assets/icons/telegram.svg'; +import { Button } from '@/components/ui/custom-button/Button'; +import { useWalletStore } from '@/stores/useWalletStore'; +import { useBugReport } from '@/hooks/useBugReport'; export function ReportBugModal({ onClose }) { const { walletId } = useWalletStore(); diff --git a/frontend/src/components/ui/action-modal/ActionModal.jsx b/frontend/src/components/ui/action-modal/ActionModal.jsx index bdb6c800d..41b0f0907 100644 --- a/frontend/src/components/ui/action-modal/ActionModal.jsx +++ b/frontend/src/components/ui/action-modal/ActionModal.jsx @@ -1,7 +1,7 @@ import React from 'react'; import './actionModal.css'; -import { Button } from '../../../components/ui/custom-button/Button'; -import useLockBodyScroll from '../../../hooks/useLockBodyScroll'; +import { Button } from '@/assets/components/ui/custom-button/Button'; +import useLockBodyScroll from '@/assets/hooks/useLockBodyScroll'; const ActionModal = ({ isOpen, diff --git a/frontend/src/components/ui/balance-cards/BalanceCards.jsx b/frontend/src/components/ui/balance-cards/BalanceCards.jsx index f80683d55..4127ff310 100644 --- a/frontend/src/components/ui/balance-cards/BalanceCards.jsx +++ b/frontend/src/components/ui/balance-cards/BalanceCards.jsx @@ -1,10 +1,11 @@ import React, { useEffect, useState } from 'react'; -import { useMatchMedia } from '../../../hooks/useMatchMedia'; -import { getBalances } from '../../../services/wallet'; -import { useWalletStore } from '../../../stores/useWalletStore'; -import ETH from '../../../assets/icons/ethereum.svg?react'; -import USDC from '../../../assets/icons/borrow_usdc.svg?react'; -import STRK from '../../../assets/icons/strk.svg?react'; +import { useMatchMedia } from '@/hooks/useMatchMedia'; +import { getBalances } from '@/services/wallet'; +import { useWalletStore } from '@/stores/useWalletStore'; + +import ETH from '@/assets/icons/ethereum.svg?react'; +import USDC from '@/assets/icons/borrow_usdc.svg?react'; +import STRK from '@/assets/icons/strk.svg?react'; import './balanceCards.css'; const BalanceCards = ({ className }) => { diff --git a/frontend/src/components/ui/multiplier-selector/MultiplierSelector.jsx b/frontend/src/components/ui/multiplier-selector/MultiplierSelector.jsx index 6f97202d0..2c57eff2f 100644 --- a/frontend/src/components/ui/multiplier-selector/MultiplierSelector.jsx +++ b/frontend/src/components/ui/multiplier-selector/MultiplierSelector.jsx @@ -1,6 +1,6 @@ import React, { useMemo, useCallback, useState, useRef, useEffect } from 'react'; -import { useMaxMultiplier } from '../../../hooks/useMaxMultiplier'; -import sliderThumb from '../../../assets/icons/slider_thumb.svg?react'; +import { useMaxMultiplier } from '@/hooks/useMaxMultiplier'; +import sliderThumb from '@/assets/icons/slider_thumb.svg?react'; import './multiplier.css'; const MultiplierSelector = ({ setSelectedMultiplier, selectedToken }) => { diff --git a/frontend/src/components/ui/token-selector/TokenSelector.jsx b/frontend/src/components/ui/token-selector/TokenSelector.jsx index c7b4010da..2378a11ab 100644 --- a/frontend/src/components/ui/token-selector/TokenSelector.jsx +++ b/frontend/src/components/ui/token-selector/TokenSelector.jsx @@ -1,7 +1,7 @@ import React from 'react'; -import ETH from '../../../assets/icons/ethereum.svg?react'; -import USDC from '../../../assets/icons/borrow_usdc.svg?react'; -import STRK from '../../../assets/icons/strk.svg?react'; +import ETH from '@/assets/icons/ethereum.svg?react'; +import USDC from '@/assets/icons/borrow_usdc.svg?react'; +import STRK from '@/assets/icons/strk.svg?react'; import './tokenSelector.css'; const Tokens = [ diff --git a/frontend/src/components/vault/VaultLayout.jsx b/frontend/src/components/vault/VaultLayout.jsx index 83bf5e77a..891841cac 100644 --- a/frontend/src/components/vault/VaultLayout.jsx +++ b/frontend/src/components/vault/VaultLayout.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { Outlet } from 'react-router-dom'; import './vaultLayout.css'; -import Sidebar from '../../components/layout/sidebar/Sidebar'; +import Sidebar from '@/components/layout/sidebar/Sidebar'; export function VaultLayout({ children }) { const vaultItems = [ diff --git a/frontend/src/components/vault/gas-fee/GasFee.jsx b/frontend/src/components/vault/gas-fee/GasFee.jsx index 4a9de3d9b..99fdb89ea 100644 --- a/frontend/src/components/vault/gas-fee/GasFee.jsx +++ b/frontend/src/components/vault/gas-fee/GasFee.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import SettingIcon from '../../../assets/icons/settings.svg?react'; +import SettingIcon from '@/assets/icons/settings.svg?react'; import './gasFee.css'; export default function GasFee() { diff --git a/frontend/src/pages/DashboardLayout.jsx b/frontend/src/pages/DashboardLayout.jsx index 07b9f3447..56f06f5ed 100644 --- a/frontend/src/pages/DashboardLayout.jsx +++ b/frontend/src/pages/DashboardLayout.jsx @@ -1,10 +1,10 @@ import React from 'react'; -import Sidebar from '../components/layout/sidebar/Sidebar'; +import Sidebar from '@/components/layout/sidebar/Sidebar'; import './DashboardLayout.css'; -import clockIcon from '../assets/icons/clock.svg'; -import computerIcon from '../assets/icons/computer-icon.svg'; -import depositIcon from '../assets/icons/deposit.svg'; -import withdrawIcon from '../assets/icons/withdraw.svg'; +import clockIcon from '@/assets/icons/clock.svg'; +import computerIcon from '@/assets/icons/computer-icon.svg'; +import depositIcon from '@/assets/icons/deposit.svg'; +import withdrawIcon from '@/assets/icons/withdraw.svg'; const dashboardItems = [ { diff --git a/frontend/src/pages/add-deposit/AddDeposit.jsx b/frontend/src/pages/add-deposit/AddDeposit.jsx index 590a3ae93..914549e97 100644 --- a/frontend/src/pages/add-deposit/AddDeposit.jsx +++ b/frontend/src/pages/add-deposit/AddDeposit.jsx @@ -1,19 +1,14 @@ -import React, { useState } from 'react'; -import HealthIcon from '../../assets/icons/health.svg?react'; -import EthIcon from '../../assets/icons/ethereum.svg?react'; -import { useAddDeposit } from '../../hooks/useAddDeposit'; +import EthIcon from '@/assets/icons/ethereum.svg?react'; +import HealthIcon from '@/assets/icons/health.svg?react'; +import Card from '@/components/ui/card/Card'; +import { Button } from '@/components/ui/custom-button/Button'; +import TokenSelector from '@/components/ui/token-selector/TokenSelector'; +import { useAddDeposit } from '@/hooks/useAddDeposit'; +import useDashboardData from '@/hooks/useDashboardData'; +import { NUMBER_REGEX } from '@/utils/regex'; +import { useState } from 'react'; import DashboardLayout from '../DashboardLayout'; import './addDeposit.css'; -import Card from '../../components/ui/card/Card'; -import TokenSelector from '../../components/ui/token-selector/TokenSelector'; -import { NUMBER_REGEX } from '../../utils/regex'; -import { Button } from '../../components/ui/custom-button/Button'; -import Sidebar from '../../components/layout/sidebar/Sidebar'; -import clockIcon from '../../assets/icons/clock.svg'; -import computerIcon from '../../assets/icons/computer-icon.svg'; -import depositIcon from '../../assets/icons/deposit.svg'; -import withdrawIcon from '../../assets/icons/withdraw.svg'; -import useDashboardData from '../../hooks/useDashboardData'; export const AddDeposit = () => { const formatNumber = (value, currency = false) => { diff --git a/frontend/src/pages/dashboard/Dashboard.jsx b/frontend/src/pages/dashboard/Dashboard.jsx index 7030f6a88..a944f71a0 100644 --- a/frontend/src/pages/dashboard/Dashboard.jsx +++ b/frontend/src/pages/dashboard/Dashboard.jsx @@ -1,24 +1,24 @@ import { useEffect, useState } from 'react'; -import BorrowIcon from '../../assets/icons/borrow_dynamic.svg?react'; -import CollateralIcon from '../../assets/icons/collateral_dynamic.svg?react'; -import EthIcon from '../../assets/icons/ethereum.svg?react'; -import HealthIcon from '../../assets/icons/health.svg?react'; -import StrkIcon from '../../assets/icons/strk.svg?react'; -import TelegramIcon from '../../assets/icons/telegram_dashboard.svg?react'; -import UsdIcon from '../../assets/icons/usd_coin.svg?react'; -import Borrow from '../../components/dashboard/borrow/Borrow'; -import Collateral from '../../components/dashboard/collateral/Collateral'; -import DashboardTabs from '../../components/dashboard/dashboard-tab/DashboardTabs'; -import Deposited from '../../components/dashboard/deposited/Deposited'; -import { ActionModal } from '../../components/ui/action-modal'; -import Card from '../../components/ui/card/Card'; -import { Button } from '../../components/ui/custom-button/Button'; -import Spinner from '../../components/ui/spinner/Spinner'; -import { useCheckPosition, useClosePosition } from '../../hooks/useClosePosition'; -import useDashboardData from '../../hooks/useDashboardData'; -import useTelegramNotification from '../../hooks/useTelegramNotification'; -import { useWalletStore } from '../../stores/useWalletStore'; -import { DASHBOARD_TABS } from '../../utils/constants'; +import BorrowIcon from '@/assets/icons/borrow_dynamic.svg?react'; +import CollateralIcon from '@/assets/icons/collateral_dynamic.svg?react'; +import EthIcon from '@/assets/icons/ethereum.svg?react'; +import HealthIcon from '@/assets/icons/health.svg?react'; +import StrkIcon from '@/assets/icons/strk.svg?react'; +import TelegramIcon from '@/assets/icons/telegram_dashboard.svg?react'; +import UsdIcon from '@/assets/icons/usd_coin.svg?react'; +import Borrow from '@/components/dashboard/borrow/Borrow'; +import Collateral from '@/components/dashboard/collateral/Collateral'; +import DashboardTabs from '@/components/dashboard/dashboard-tab/DashboardTabs'; +import Deposited from '@/components/dashboard/deposited/Deposited'; +import { ActionModal } from '@/components/ui/action-modal'; +import Card from '@/components/ui/card/Card'; +import { Button } from '@/components/ui/custom-button/Button'; +import Spinner from '@/components/ui/spinner/Spinner'; +import { useCheckPosition, useClosePosition } from '@/hooks/useClosePosition'; +import useDashboardData from '@/hooks/useDashboardData'; +import useTelegramNotification from '@/hooks/useTelegramNotification'; +import { useWalletStore } from '@/stores/useWalletStore'; +import { DASHBOARD_TABS } from '@/utils/constants'; import DashboardLayout from '../DashboardLayout'; export default function DashboardPage({ telegramId }) { diff --git a/frontend/src/pages/documentation/Documentation.jsx b/frontend/src/pages/documentation/Documentation.jsx index 526217f5d..dc9e3fabd 100644 --- a/frontend/src/pages/documentation/Documentation.jsx +++ b/frontend/src/pages/documentation/Documentation.jsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react'; import './documentation.css'; -import ScrollButton from '../../components/ui/scroll-button/ScrollButton'; -import Sections from '../../components/layout/sections/Sections'; -import Sidebar from '../../components/layout/sidebar/Sidebar'; +import ScrollButton from '@/components/ui/scroll-button/ScrollButton'; +import Sections from '@/components/layout/sections/Sections'; +import Sidebar from '@/components/layout/sidebar/Sidebar'; const Documentation = () => { useEffect(() => { diff --git a/frontend/src/pages/form/Form.jsx b/frontend/src/pages/form/Form.jsx index e90e9758e..6d688f69f 100644 --- a/frontend/src/pages/form/Form.jsx +++ b/frontend/src/pages/form/Form.jsx @@ -1,18 +1,18 @@ import React, { useState } from 'react'; -import TokenSelector from '../../components/ui/token-selector/TokenSelector'; -import BalanceCards from '../../components/ui/balance-cards/BalanceCards'; -import MultiplierSelector from '../../components/ui/multiplier-selector/MultiplierSelector'; -import { handleTransaction } from '../../services/transaction'; -import Spinner from '../../components/ui/spinner/Spinner'; +import TokenSelector from '@/components/ui/token-selector/TokenSelector'; +import BalanceCards from '@/components/ui/balance-cards/BalanceCards'; +import MultiplierSelector from '@/components/ui/multiplier-selector/MultiplierSelector'; +import { handleTransaction } from '@/services/transaction'; +import Spinner from '@/components/ui/spinner/Spinner'; import './form.css'; -import { Button } from '../../components/ui/custom-button/Button'; -import { useWalletStore } from '../../stores/useWalletStore'; -import { useConnectWallet } from '../../hooks/useConnectWallet'; -import { useCheckPosition } from '../../hooks/useClosePosition'; +import { Button } from '@/components/ui/custom-button/Button'; +import { useWalletStore } from '@/stores/useWalletStore'; +import { useConnectWallet } from '@/hooks/useConnectWallet'; +import { useCheckPosition } from '@/hooks/useClosePosition'; import { useNavigate } from 'react-router-dom'; -import { ActionModal } from '../../components/ui/action-modal'; -import { useHealthFactor } from '../../hooks/useHealthRatio'; -import { notify } from '../../components/layout/notifier/Notifier'; +import { ActionModal } from '@/components/ui/action-modal'; +import { useHealthFactor } from '@/hooks/useHealthRatio'; +import { notify } from '@/components/layout/notifier/Notifier'; const Form = () => { const navigate = useNavigate(); @@ -79,7 +79,6 @@ const Form = () => {
- {isClosePositionOpen && ( { useEffect(() => { diff --git a/frontend/src/pages/position-history/PositionHistory.jsx b/frontend/src/pages/position-history/PositionHistory.jsx index 381235b2e..49a3ea5ba 100644 --- a/frontend/src/pages/position-history/PositionHistory.jsx +++ b/frontend/src/pages/position-history/PositionHistory.jsx @@ -1,22 +1,17 @@ -import React, { useEffect, useState } from 'react'; +import EthIcon from '@/assets/icons/ethereum.svg?react'; +import filterIcon from '@/assets/icons/filter-horizontal.svg?react'; +import HealthIcon from '@/assets/icons/health.svg?react'; +import StrkIcon from '@/assets/icons/strk.svg?react'; +import UsdIcon from '@/assets/icons/usd_coin.svg?react'; +import Card from '@/components/ui/card/Card'; +import Spinner from '@/components/ui/spinner/Spinner'; +import useDashboardData from '@/hooks/useDashboardData'; +import { usePositionHistoryTable } from '@/hooks/usePositionHistory'; +import PositionHistoryModal from '@/pages/position-history/PositionHistoryModal'; +import PositionPagination from '@/pages/position-history/PositionPagination'; +import { useEffect, useState } from 'react'; import DashboardLayout from '../DashboardLayout'; import './positionHistory.css'; -import HealthIcon from '../../assets/icons/health.svg?react'; -import EthIcon from '../../assets/icons/ethereum.svg?react'; -import StrkIcon from '../../assets/icons/strk.svg?react'; -import UsdIcon from '../../assets/icons/usd_coin.svg?react'; -import { usePositionHistoryTable } from '../../hooks/usePositionHistory'; -import Spinner from '../../components/ui/spinner/Spinner'; -import filterIcon from '../../assets/icons/filter-horizontal.svg?react'; -import useDashboardData from '../../hooks/useDashboardData'; -import Card from '../../components/ui/card/Card'; -import PositionHistoryModal from '../../pages/position-history/PositionHistoryModal'; -import PositionPagination from '../../pages/position-history/PositionPagination'; -import Sidebar from '../../components/layout/sidebar/Sidebar'; -import clockIcon from '../../assets/icons/clock.svg'; -import computerIcon from '../../assets/icons/computer-icon.svg'; -import depositIcon from '../../assets/icons/deposit.svg'; -import withdrawIcon from '../../assets/icons/withdraw.svg'; function PositionHistory() { const [selectedPosition, setSelectedPosition] = useState(null); diff --git a/frontend/src/pages/position-history/PositionPagination.jsx b/frontend/src/pages/position-history/PositionPagination.jsx index 8c9f0a856..ff1052a49 100644 --- a/frontend/src/pages/position-history/PositionPagination.jsx +++ b/frontend/src/pages/position-history/PositionPagination.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import ArrowLeftIcon from '../../assets/icons/arrow-left.svg?react'; -import ArrowRightIcon from '../../assets/icons/arrow-right.svg?react'; +import ArrowLeftIcon from '@/assets/icons/arrow-left.svg?react'; +import ArrowRightIcon from '@/assets/icons/arrow-right.svg?react'; import './positionPagination.css'; export default function PositionPagination({ currentPage, setCurrentPage, isPending, tableData, positionsOnPage }) { diff --git a/frontend/src/pages/spotnet-app/SpotnetApp.jsx b/frontend/src/pages/spotnet-app/SpotnetApp.jsx index f54b419bb..668e91404 100644 --- a/frontend/src/pages/spotnet-app/SpotnetApp.jsx +++ b/frontend/src/pages/spotnet-app/SpotnetApp.jsx @@ -1,9 +1,9 @@ import React from 'react'; -import About from '../../components/home/about/About'; -import Partnership from '../../components/home/partnership/Partnership'; -import Information from '../../components/home/information/Information'; -import DontMiss from '../../components/home/dont-miss/DontMiss'; -import Home from '../../components/home/home/Home'; +import About from '@/components/home/about/About'; +import Partnership from '@/components/home/partnership/Partnership'; +import Information from '@/components/home/information/Information'; +import DontMiss from '@/components/home/dont-miss/DontMiss'; +import Home from '@/components/home/home/Home'; const SpotnetApp = ({ onConnectWallet, onLogout }) => { return ( diff --git a/frontend/src/pages/spotnet/dashboard/withdraw-all/WithdrawAll.jsx b/frontend/src/pages/spotnet/dashboard/withdraw-all/WithdrawAll.jsx index 54d92d1c9..3e5f29f6d 100644 --- a/frontend/src/pages/spotnet/dashboard/withdraw-all/WithdrawAll.jsx +++ b/frontend/src/pages/spotnet/dashboard/withdraw-all/WithdrawAll.jsx @@ -1,15 +1,11 @@ -import React from 'react'; -import BalanceCards from '../../../../components/ui/balance-cards/BalanceCards'; +import BalanceCards from '@/components/ui/balance-cards/BalanceCards'; +import { Button } from '@/components/ui/custom-button/Button'; +import useWithdrawAll from '@/hooks/useWithdrawAll'; +import { useWalletStore } from '@/stores/useWalletStore'; import './withdraw_all.css'; -import { useWalletStore } from '../../../../stores/useWalletStore'; -import { Button } from '../../../../components/ui/custom-button/Button'; -import useWithdrawAll from '../../../../hooks/useWithdrawAll'; -import Sidebar from '../../../../components/layout/sidebar/Sidebar'; -import clockIcon from '../../../../assets/icons/clock.svg'; -import computerIcon from '../../../../assets/icons/computer-icon.svg'; -import depositIcon from '../../../../assets/icons/deposit.svg'; -import withdrawIcon from '../../../../assets/icons/withdraw.svg'; -import DashboardLayout from '../../../DashboardLayout'; + +import DashboardLayout from '@/pages/DashboardLayout.jsx'; + import './withdraw_all.css'; const WithdrawAll = () => { diff --git a/frontend/src/pages/spotnet/dashboard/withdraw-all/withdraw_all.css b/frontend/src/pages/spotnet/dashboard/withdraw-all/withdraw_all.css index 3420b480b..54fa05be1 100644 --- a/frontend/src/pages/spotnet/dashboard/withdraw-all/withdraw_all.css +++ b/frontend/src/pages/spotnet/dashboard/withdraw-all/withdraw_all.css @@ -47,7 +47,6 @@ } @media (max-width: 768px) { - .withdrawall-info-card { width: 480px; margin-top: 35px; @@ -68,12 +67,12 @@ @media (max-width: 550px) { /* .withdrawall-wrapper { - background: url('../../../../../public/mobile-background.png') no-repeat; + background: url('@/assets../../public/mobile-background.png') no-repeat; background-size: cover; background-position: 50% 40%; height: 100%; } */ - + .withdrawall-info-container { display: grid; gap: 30px; diff --git a/frontend/src/pages/spotnet/defi-spring/DefiSpring.jsx b/frontend/src/pages/spotnet/defi-spring/DefiSpring.jsx index 76a18eda2..01003b7c1 100644 --- a/frontend/src/pages/spotnet/defi-spring/DefiSpring.jsx +++ b/frontend/src/pages/spotnet/defi-spring/DefiSpring.jsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react'; import './defi-spring.css'; -import ScrollButton from '../../../components/ui/scroll-button/ScrollButton'; -import Sections from '../../../components/layout/sections/Sections'; -import Sidebar from '../../../components/layout/sidebar/Sidebar'; +import ScrollButton from '@/components/ui/scroll-button/ScrollButton'; +import Sections from '@/components/layout/sections/Sections'; +import Sidebar from '@/components/layout/sidebar/Sidebar'; export const DefiSpringPage = () => { useEffect(() => { diff --git a/frontend/src/pages/stake/Stake.jsx b/frontend/src/pages/stake/Stake.jsx index fb1b7a246..04b11bbe5 100644 --- a/frontend/src/pages/stake/Stake.jsx +++ b/frontend/src/pages/stake/Stake.jsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; -import MetricCard from '../../components/vault/stake-card/StakeCard'; -import STRK from '../../assets/icons/strk.svg?react'; -import USDCc from '../../assets/icons/apy_icon.svg?react'; +import MetricCard from '@/components/vault/stake-card/StakeCard'; +import STRK from '@/assets/icons/strk.svg?react'; +import USDCc from '@/assets/icons/apy_icon.svg?react'; import './stake.css'; -import { VaultLayout } from '../../components/vault/VaultLayout'; -import { Button } from '../../components/ui/custom-button/Button'; -import GasFee from '../../components/vault/gas-fee/GasFee'; -import BalanceCards from '../../components/ui/balance-cards/BalanceCards'; +import { VaultLayout } from '@/components/vault/VaultLayout'; +import { Button } from '@/components/ui/custom-button/Button'; +import GasFee from '@/components/vault/gas-fee/GasFee'; +import BalanceCards from '@/components/ui/balance-cards/BalanceCards'; function Stake() { const [selectedNetwork, setSelectedNetwork] = useState('Starknet'); diff --git a/frontend/src/pages/terms-and-conditions/TermsAndConditions.jsx b/frontend/src/pages/terms-and-conditions/TermsAndConditions.jsx index 011d00ff4..fd7f7687d 100644 --- a/frontend/src/pages/terms-and-conditions/TermsAndConditions.jsx +++ b/frontend/src/pages/terms-and-conditions/TermsAndConditions.jsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react'; import './terms-and-conditions.css'; -import ScrollButton from '../../components/ui/scroll-button/ScrollButton'; -import Sections from '../../components/layout/sections/Sections'; -import Sidebar from '../../components/layout/sidebar/Sidebar'; +import ScrollButton from '@/components/ui/scroll-button/ScrollButton'; +import Sections from '@/components/layout/sections/Sections'; +import Sidebar from '@/components/layout/sidebar/Sidebar'; const TermsAndConditionsPage = () => { useEffect(() => { diff --git a/frontend/src/pages/withdraw/Withdraw.jsx b/frontend/src/pages/withdraw/Withdraw.jsx index 2394b0bda..ebb49e73e 100644 --- a/frontend/src/pages/withdraw/Withdraw.jsx +++ b/frontend/src/pages/withdraw/Withdraw.jsx @@ -1,10 +1,10 @@ import React from 'react'; import './withdraw.css'; -import DiamondIcon from '../../assets/icons/diamond.svg?react'; -import TimeIcon from '../../assets/icons/time.svg?react'; -import SettingIcon from '../../assets/icons/settings.svg?react'; -import MetricCard from '../../components/vault/metric-card/MetricCard'; -import { VaultLayout } from '../../components/vault/VaultLayout'; +import DiamondIcon from '@/assets/icons/diamond.svg?react'; +import TimeIcon from '@/assets/icons/time.svg?react'; +import SettingIcon from '@/assets/icons/settings.svg?react'; +import MetricCard from '@/components/vault/metric-card/MetricCard'; +import { VaultLayout } from '@/components/vault/VaultLayout'; export default function Withdraw() { return ( diff --git a/frontend/test/services/contract.test.js b/frontend/test/services/contract.test.js index 9bfbab317..16f078ca6 100644 --- a/frontend/test/services/contract.test.js +++ b/frontend/test/services/contract.test.js @@ -25,7 +25,7 @@ describe('Contract Deployment Tests', () => { beforeEach(() => { jest.clearAllMocks(); - + getDeployContractData.mockReturnValue({ contractData: 'mockContractData', }); @@ -169,4 +169,4 @@ describe('Contract Deployment Tests', () => { expect(console.error).toHaveBeenCalledWith('Error checking contract status:', mockUpdateError); }); }); -}); \ No newline at end of file +}); diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 650c226bb..bdf96e496 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -2,8 +2,14 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; import svgr from 'vite-plugin-svgr'; import EnvironmentPlugin from 'vite-plugin-environment'; +import { resolve } from 'path'; // https://vite.dev/config/ export default defineConfig({ plugins: [react(), svgr(), EnvironmentPlugin('all')], + resolve: { + alias: { + '@': resolve(__dirname, 'src'), + }, + }, });