diff --git a/src/App.test.tsx b/src/App.test.tsx index d4a4013..fe1faab 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -3,8 +3,8 @@ import userEvent from "@testing-library/user-event"; import { describe, expect, it } from "vitest"; import { App } from "./App"; import { BudgetMother } from "./guitos/domain/budget.mother"; -import { budgetContextSpy, testEmptyBudgetContext } from "./setupTests"; import { localForageBudgetRepository } from "./guitos/infrastructure/localForageBudgetRepository"; +import { budgetContextSpy, testEmptyBudgetContext } from "./setupTests"; const budgetRepository = new localForageBudgetRepository(); diff --git a/src/App.tsx b/src/App.tsx index cb7e12d..6d6ef86 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,10 +2,10 @@ import "bootstrap/dist/css/bootstrap.min.css"; import { Route, BrowserRouter as Router, Routes } from "react-router-dom"; import "./App.css"; import "./colors.css"; -import { BudgetPage } from "./guitos/sections/Budget/BudgetPage"; import { BudgetProvider } from "./guitos/context/BudgetContext"; import { ConfigProvider } from "./guitos/context/ConfigContext"; import { GeneralProvider } from "./guitos/context/GeneralContext"; +import { BudgetPage } from "./guitos/sections/Budget/BudgetPage"; export function App() { return ( diff --git a/src/guitos/context/BudgetContext.tsx b/src/guitos/context/BudgetContext.tsx index 6d239ae..01ac3ad 100644 --- a/src/guitos/context/BudgetContext.tsx +++ b/src/guitos/context/BudgetContext.tsx @@ -5,8 +5,8 @@ import { useState, } from "react"; import useUndo from "use-undo"; -import type { SearchOption } from "../sections/NavBar/NavBar"; import { Budget } from "../domain/budget"; +import type { SearchOption } from "../sections/NavBar/NavBar"; import { useGeneralContext } from "./GeneralContext"; interface BudgetContextInterface { diff --git a/src/guitos/hooks/useDB.ts b/src/guitos/hooks/useDB.ts index fcb0a57..e54347a 100644 --- a/src/guitos/hooks/useDB.ts +++ b/src/guitos/hooks/useDB.ts @@ -4,8 +4,7 @@ import type React from "react"; import { useCallback, useEffect, useRef, useState } from "react"; import type { Option } from "react-bootstrap-typeahead/types/types"; import { useNavigate, useParams } from "react-router-dom"; -import type { Filter, FilteredItem } from "../sections/ChartsPage/ChartsPage"; -import type { SearchOption } from "../sections/NavBar/NavBar"; +import { createBudgetNameList, saveLastOpenedBudget } from "../../utils"; import { useBudget } from "../context/BudgetContext"; import { useConfig } from "../context/ConfigContext"; import { useGeneralContext } from "../context/GeneralContext"; @@ -16,7 +15,8 @@ import { Uuid } from "../domain/uuid"; import { localForageBudgetRepository } from "../infrastructure/localForageBudgetRepository"; import { localForageCalcHistRepository } from "../infrastructure/localForageCalcHistRepository"; import { localForageOptionsRepository } from "../infrastructure/localForageOptionsRepository"; -import { createBudgetNameList, saveLastOpenedBudget } from "../../utils"; +import type { Filter, FilteredItem } from "../sections/ChartsPage/ChartsPage"; +import type { SearchOption } from "../sections/NavBar/NavBar"; const budgetRepository = new localForageBudgetRepository(); const optionsRepository = new localForageOptionsRepository(); diff --git a/src/guitos/hooks/useMove.ts b/src/guitos/hooks/useMove.ts index 80277f5..27208d0 100644 --- a/src/guitos/hooks/useMove.ts +++ b/src/guitos/hooks/useMove.ts @@ -1,8 +1,8 @@ import { useNavigate } from "react-router-dom"; -import type { SearchOption } from "../sections/NavBar/NavBar"; +import { saveLastOpenedBudget } from "../../utils"; import { useBudget } from "../context/BudgetContext"; import type { Budget } from "../domain/budget"; -import { saveLastOpenedBudget } from "../../utils"; +import type { SearchOption } from "../sections/NavBar/NavBar"; export function useMove() { const { budget, setBudget, budgetList } = useBudget(); diff --git a/src/guitos/infrastructure/localForageOptionsRepository.ts b/src/guitos/infrastructure/localForageOptionsRepository.ts index 8c40ecc..b5c88a2 100644 --- a/src/guitos/infrastructure/localForageOptionsRepository.ts +++ b/src/guitos/infrastructure/localForageOptionsRepository.ts @@ -1,7 +1,7 @@ import localforage from "localforage"; +import { currenciesMap } from "../../lists/currenciesMap"; import { CURRENCY_CODE, LOCALE } from "../domain/options"; import type { OptionsRepository } from "../domain/optionsRepository"; -import { currenciesMap } from "../../lists/currenciesMap"; export class localForageOptionsRepository implements OptionsRepository { private readonly optionsDB; diff --git a/src/guitos/sections/Budget/BudgetPage.test.tsx b/src/guitos/sections/Budget/BudgetPage.test.tsx index 980a22e..e87f606 100644 --- a/src/guitos/sections/Budget/BudgetPage.test.tsx +++ b/src/guitos/sections/Budget/BudgetPage.test.tsx @@ -3,7 +3,6 @@ import userEvent from "@testing-library/user-event"; import { act } from "react-dom/test-utils"; import { BrowserRouter } from "react-router-dom"; import { describe, expect, it } from "vitest"; -import { BudgetMother } from "../../domain/budget.mother"; import { budgetContextSpy, redoMock, @@ -12,8 +11,9 @@ import { testBudgetContext, undoMock, } from "../../../setupTests"; -import { BudgetPage } from "./BudgetPage"; +import { BudgetMother } from "../../domain/budget.mother"; import { localForageBudgetRepository } from "../../infrastructure/localForageBudgetRepository"; +import { BudgetPage } from "./BudgetPage"; const budgetRepository = new localForageBudgetRepository(); diff --git a/src/guitos/sections/Budget/BudgetPage.tsx b/src/guitos/sections/Budget/BudgetPage.tsx index f3fc69a..6e4204d 100644 --- a/src/guitos/sections/Budget/BudgetPage.tsx +++ b/src/guitos/sections/Budget/BudgetPage.tsx @@ -2,11 +2,11 @@ import { Suspense, lazy, useEffect, useState } from "react"; import { Col, Container, Row, ToastContainer } from "react-bootstrap"; import { useHotkeys } from "react-hotkeys-hook"; import { useParams } from "react-router-dom"; +import { createBudgetNameList } from "../../../utils"; import { useBudget } from "../../context/BudgetContext"; import { useGeneralContext } from "../../context/GeneralContext"; import type { Budget } from "../../domain/budget"; import { useDB } from "../../hooks/useDB"; -import { createBudgetNameList } from "../../../utils"; import { ErrorModal } from "../ErrorModal/ErrorModal"; import { LandingPage } from "../LandingPage/LandingPage"; import { Loading } from "../Loading/Loading"; diff --git a/src/guitos/sections/Chart/Chart.tsx b/src/guitos/sections/Chart/Chart.tsx index 8943e38..bbbc7ee 100644 --- a/src/guitos/sections/Chart/Chart.tsx +++ b/src/guitos/sections/Chart/Chart.tsx @@ -9,9 +9,9 @@ import { XAxis, YAxis, } from "recharts"; +import { intlFormat, median } from "../../../utils"; import { useBudget } from "../../context/BudgetContext"; import { useConfig } from "../../context/ConfigContext"; -import { intlFormat, median } from "../../../utils"; import type { FilteredItem } from "../ChartsPage/ChartsPage"; import "./Chart.css"; import { ChartTooltip } from "./ChartTooltip"; diff --git a/src/guitos/sections/Chart/ChartTooltip.tsx b/src/guitos/sections/Chart/ChartTooltip.tsx index e0b22c3..eaaab4e 100644 --- a/src/guitos/sections/Chart/ChartTooltip.tsx +++ b/src/guitos/sections/Chart/ChartTooltip.tsx @@ -1,7 +1,7 @@ import Big from "big.js"; import { Col, Container, Row } from "react-bootstrap"; -import { useConfig } from "../../context/ConfigContext"; import { intlFormat, roundBig } from "../../../utils"; +import { useConfig } from "../../context/ConfigContext"; interface ChartTooltipProps { active?: boolean; diff --git a/src/guitos/sections/ChartsPage/ChartsPage.tsx b/src/guitos/sections/ChartsPage/ChartsPage.tsx index f64c2f4..a0b4176 100644 --- a/src/guitos/sections/ChartsPage/ChartsPage.tsx +++ b/src/guitos/sections/ChartsPage/ChartsPage.tsx @@ -17,13 +17,13 @@ import "react-bootstrap-typeahead/css/Typeahead.css"; import type { Option } from "react-bootstrap-typeahead/types/types"; import { useHotkeys } from "react-hotkeys-hook"; import { BsArrowLeft } from "react-icons/bs"; -import { useBudget } from "../../context/BudgetContext"; -import { useDB } from "../../hooks/useDB"; import { focusRef, getLabelKeyFilteredItem, getNestedValues, } from "../../../utils"; +import { useBudget } from "../../context/BudgetContext"; +import { useDB } from "../../hooks/useDB"; import { Chart } from "../Chart/Chart"; import "./ChartsPage.css"; import type { Uuid } from "../../domain/uuid"; diff --git a/src/guitos/sections/ItemForm/ItemFormGroup.test.tsx b/src/guitos/sections/ItemForm/ItemFormGroup.test.tsx index c796cce..bc558f6 100644 --- a/src/guitos/sections/ItemForm/ItemFormGroup.test.tsx +++ b/src/guitos/sections/ItemForm/ItemFormGroup.test.tsx @@ -3,13 +3,13 @@ import userEvent from "@testing-library/user-event"; import { createRef } from "react"; import { BrowserRouter } from "react-router-dom"; import { describe, expect, it } from "vitest"; -import { BudgetMother } from "../../domain/budget.mother"; -import { BudgetItemsMother } from "../../domain/budgetItem.mother"; import { configContextSpy, setBudgetMock, testSpanishConfigContext, } from "../../../setupTests"; +import { BudgetMother } from "../../domain/budget.mother"; +import { BudgetItemsMother } from "../../domain/budgetItem.mother"; import { ItemFormGroup } from "./ItemFormGroup"; describe("ItemFormGroup", () => { diff --git a/src/guitos/sections/ItemForm/ItemFormGroup.tsx b/src/guitos/sections/ItemForm/ItemFormGroup.tsx index 2068a7c..6cabe09 100644 --- a/src/guitos/sections/ItemForm/ItemFormGroup.tsx +++ b/src/guitos/sections/ItemForm/ItemFormGroup.tsx @@ -11,12 +11,12 @@ import { } from "react-bootstrap"; import CurrencyInput from "react-currency-input-field"; import { BsXLg } from "react-icons/bs"; +import { calc, parseLocaleNumber, roundBig } from "../../../utils"; import { useBudget } from "../../context/BudgetContext"; import { useConfig } from "../../context/ConfigContext"; import type { Expenses } from "../../domain/expenses"; import type { Incomes } from "../../domain/incomes"; import { useDB } from "../../hooks/useDB"; -import { calc, parseLocaleNumber, roundBig } from "../../../utils"; import { CalculateButton } from "../CalculateButton/CalculateButton"; import "./ItemFormGroup.css"; import { Budget } from "../../domain/budget"; diff --git a/src/guitos/sections/LandingPage/LandingPage.test.tsx b/src/guitos/sections/LandingPage/LandingPage.test.tsx index f8b5d37..75f0a69 100644 --- a/src/guitos/sections/LandingPage/LandingPage.test.tsx +++ b/src/guitos/sections/LandingPage/LandingPage.test.tsx @@ -2,7 +2,6 @@ import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { BrowserRouter } from "react-router-dom"; import { beforeEach, describe, expect, it } from "vitest"; -import { BudgetMother } from "../../domain/budget.mother"; import { budgetContextSpy, generalContextSpy, @@ -10,6 +9,7 @@ import { testEmptyBudgetContext, testGeneralContext, } from "../../../setupTests"; +import { BudgetMother } from "../../domain/budget.mother"; import { LandingPage } from "./LandingPage"; describe("LandingPage", () => { diff --git a/src/guitos/sections/NavBar/NavBar.test.tsx b/src/guitos/sections/NavBar/NavBar.test.tsx index 9fa036d..5cea74f 100644 --- a/src/guitos/sections/NavBar/NavBar.test.tsx +++ b/src/guitos/sections/NavBar/NavBar.test.tsx @@ -2,12 +2,12 @@ import { render, screen, waitFor } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { BrowserRouter } from "react-router-dom"; import { beforeEach, describe, expect, it, vi } from "vitest"; -import { BudgetMother } from "../../domain/budget.mother"; import { budgetContextSpy, setBudgetMock, testEmptyBudgetContext, } from "../../../setupTests"; +import { BudgetMother } from "../../domain/budget.mother"; import { NavBar } from "./NavBar"; describe("NavBar", () => { diff --git a/src/guitos/sections/NavBar/NavBar.tsx b/src/guitos/sections/NavBar/NavBar.tsx index 784a9d4..5d4f53a 100644 --- a/src/guitos/sections/NavBar/NavBar.tsx +++ b/src/guitos/sections/NavBar/NavBar.tsx @@ -22,10 +22,10 @@ import { BsXLg, } from "react-icons/bs"; import { FaRegClone } from "react-icons/fa"; +import { focusRef, getLabelKey } from "../../../utils"; import { useBudget } from "../../context/BudgetContext"; import { useDB } from "../../hooks/useDB"; import { useMove } from "../../hooks/useMove"; -import { focusRef, getLabelKey } from "../../../utils"; import "./NavBar.css"; import type { Uuid } from "../../domain/uuid"; import { NavBarDelete } from "./NavBarDelete"; diff --git a/src/guitos/sections/NavBar/NavBarSettings.tsx b/src/guitos/sections/NavBar/NavBarSettings.tsx index ab3953e..4ae5cc1 100644 --- a/src/guitos/sections/NavBar/NavBarSettings.tsx +++ b/src/guitos/sections/NavBar/NavBarSettings.tsx @@ -12,8 +12,8 @@ import { Typeahead } from "react-bootstrap-typeahead"; import type { Option } from "react-bootstrap-typeahead/types/types"; import { useHotkeys } from "react-hotkeys-hook"; import { BsGear } from "react-icons/bs"; -import { useConfig } from "../../context/ConfigContext"; import { currenciesList } from "../../../lists/currenciesList"; +import { useConfig } from "../../context/ConfigContext"; import { useDB } from "../../hooks/useDB"; interface NavBarSettingsProps { diff --git a/src/guitos/sections/StatCard/StatCard.test.tsx b/src/guitos/sections/StatCard/StatCard.test.tsx index 30bed92..1767ad9 100644 --- a/src/guitos/sections/StatCard/StatCard.test.tsx +++ b/src/guitos/sections/StatCard/StatCard.test.tsx @@ -2,8 +2,8 @@ import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { vi } from "vitest"; import { describe, expect, it } from "vitest"; -import { BudgetMother } from "../../domain/budget.mother"; import { setBudgetMock } from "../../../setupTests"; +import { BudgetMother } from "../../domain/budget.mother"; import { StatCard } from "./StatCard"; describe("StatCard", () => { diff --git a/src/guitos/sections/StatCard/StatCard.tsx b/src/guitos/sections/StatCard/StatCard.tsx index c59a652..40220c6 100644 --- a/src/guitos/sections/StatCard/StatCard.tsx +++ b/src/guitos/sections/StatCard/StatCard.tsx @@ -21,9 +21,9 @@ import { BsGraphUp, BsPercent, } from "react-icons/bs"; +import { focusRef, parseLocaleNumber, roundBig } from "../../../utils"; import { useBudget } from "../../context/BudgetContext"; import { useConfig } from "../../context/ConfigContext"; -import { focusRef, parseLocaleNumber, roundBig } from "../../../utils"; import "./StatCard.css"; import { Budget } from "../../domain/budget"; diff --git a/src/guitos/sections/TableCard/TableCard.test.tsx b/src/guitos/sections/TableCard/TableCard.test.tsx index 844524e..8c1cbec 100644 --- a/src/guitos/sections/TableCard/TableCard.test.tsx +++ b/src/guitos/sections/TableCard/TableCard.test.tsx @@ -2,8 +2,8 @@ import { cleanup, render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { BrowserRouter } from "react-router-dom"; import { describe, expect, it } from "vitest"; -import { BudgetMother } from "../../domain/budget.mother"; import { setBudgetMock } from "../../../setupTests"; +import { BudgetMother } from "../../domain/budget.mother"; import TableCard from "./TableCard"; describe("TableCard", () => { diff --git a/src/guitos/sections/TableCard/TableCard.tsx b/src/guitos/sections/TableCard/TableCard.tsx index 69c7655..acb6530 100644 --- a/src/guitos/sections/TableCard/TableCard.tsx +++ b/src/guitos/sections/TableCard/TableCard.tsx @@ -12,9 +12,9 @@ import { Tooltip, } from "react-bootstrap"; import { BsArrowsVertical, BsPlusLg } from "react-icons/bs"; +import { intlFormat, roundBig } from "../../../utils"; import { useBudget } from "../../context/BudgetContext"; import { useConfig } from "../../context/ConfigContext"; -import { intlFormat, roundBig } from "../../../utils"; import { ItemFormGroup } from "../ItemForm/ItemFormGroup"; import "./TableCard.css"; import { Budget } from "../../domain/budget"; diff --git a/src/utils.test.ts b/src/utils.test.ts index e895bb4..eee8f15 100644 --- a/src/utils.test.ts +++ b/src/utils.test.ts @@ -1,10 +1,11 @@ import Big from "big.js"; import { expect, test } from "vitest"; -import type { FilteredItem } from "./guitos/sections/ChartsPage/ChartsPage"; import type { Budget } from "./guitos/domain/budget"; import { BudgetMother } from "./guitos/domain/budget.mother"; import type { ItemOperation } from "./guitos/domain/calculationHistoryItem"; import { Uuid } from "./guitos/domain/uuid"; +import { localForageOptionsRepository } from "./guitos/infrastructure/localForageOptionsRepository"; +import type { FilteredItem } from "./guitos/sections/ChartsPage/ChartsPage"; import { chromeLocalesList } from "./lists/chromeLocalesList"; import { currenciesMap } from "./lists/currenciesMap"; import { firefoxLocalesList } from "./lists/firefoxLocalesList"; @@ -20,7 +21,6 @@ import { parseLocaleNumber, roundBig, } from "./utils"; -import { localForageOptionsRepository } from "./guitos/infrastructure/localForageOptionsRepository"; const optionsRepository = new localForageOptionsRepository(); diff --git a/src/utils.ts b/src/utils.ts index 2e82684..22ad340 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,11 +1,11 @@ import Big from "big.js"; import type { MutableRefObject } from "react"; +import type { IntlConfig } from "react-currency-input-field/dist/components/CurrencyInputProps"; import type { NavigateFunction } from "react-router-dom"; -import type { FilteredItem } from "./guitos/sections/ChartsPage/ChartsPage"; -import type { SearchOption } from "./guitos/sections/NavBar/NavBar"; import type { Budget } from "./guitos/domain/budget"; import type { ItemOperation } from "./guitos/domain/calculationHistoryItem"; -import type { IntlConfig } from "react-currency-input-field/dist/components/CurrencyInputProps"; +import type { FilteredItem } from "./guitos/sections/ChartsPage/ChartsPage"; +import type { SearchOption } from "./guitos/sections/NavBar/NavBar"; export function roundBig(number: Big, precision: number): number { return Big(number).round(precision, 1).toNumber();