diff --git a/client/src/app/App.tsx b/client/src/app/App.tsx index 772c31fd..86940355 100644 --- a/client/src/app/App.tsx +++ b/client/src/app/App.tsx @@ -21,13 +21,14 @@ import { import { CATALOGUE, CREATE_INSTRUMENT, - EDIT_INSTRUMENT_BY_ID, FAVORITE, + EDIT_INSTRUMENT_BY_ID, + FAVORITE, HOME, INSTRUMENT_BY_ID, LOGIN, NOT_FOUND, PROFILE, - REGISTRATION_URL + REGISTRATION_URL, } from "shared/config/paths"; import { CreateInstrument, // todo(refactor): add suffix `Page` @@ -43,10 +44,7 @@ import { RegistrationPage, action as registrationAction, } from "pages/registration"; -import { - FavoritePage, - loader as favoriteLoader, -} from "pages/favorite"; +import { FavoritePage, loader as favoriteLoader } from "pages/favorite"; const routes = createRoutesFromElements( @@ -76,11 +74,7 @@ const routes = createRoutesFromElements( element={} action={registrationAction} /> - } - loader={favoriteLoader} - /> + } loader={favoriteLoader} /> } /> , ); diff --git a/client/src/domain/model/page.ts b/client/src/domain/model/page.ts index 0f6adc65..8acb5486 100644 --- a/client/src/domain/model/page.ts +++ b/client/src/domain/model/page.ts @@ -12,4 +12,4 @@ export interface Page { export interface PageRequest { pageSize: number; pageNumber: number; -} \ No newline at end of file +} diff --git a/client/src/pages/catalogue/ui/Catalogue.tsx b/client/src/pages/catalogue/ui/Catalogue.tsx index 32bc5deb..8dbfb5ac 100644 --- a/client/src/pages/catalogue/ui/Catalogue.tsx +++ b/client/src/pages/catalogue/ui/Catalogue.tsx @@ -40,7 +40,9 @@ export function Catalogue() { ); useEffect(() => { - fetchFavoriteInstrumentIdsList().then((ids) => setFavoriteInstrumentIds(ids)); + fetchFavoriteInstrumentIdsList().then((ids) => + setFavoriteInstrumentIds(ids), + ); if (instrumentName === "") { filters.instrumentName = null; diff --git a/client/src/pages/favorite/api/loader.ts b/client/src/pages/favorite/api/loader.ts index 0484c169..a0443ea1 100644 --- a/client/src/pages/favorite/api/loader.ts +++ b/client/src/pages/favorite/api/loader.ts @@ -9,13 +9,13 @@ export interface FavoriteLoader { } export const loader: LoaderFunction = async (): Promise => { - const favoriteInstrumentIds = await fetchFavoriteInstrumentIdsList() + const favoriteInstrumentIds = await fetchFavoriteInstrumentIdsList(); const filter = { instrumentId: favoriteInstrumentIds, } as unknown as Filters; - const instruments = await getInstrumentsByCriteria(filter) + const instruments = await getInstrumentsByCriteria(filter); return { instruments: instruments, - } -}; \ No newline at end of file + }; +}; diff --git a/client/src/pages/favorite/index.ts b/client/src/pages/favorite/index.ts index 42ee57a4..ea0991e8 100644 --- a/client/src/pages/favorite/index.ts +++ b/client/src/pages/favorite/index.ts @@ -1,8 +1,5 @@ -import {FavoritePage} from "./ui/FavoritePage"; -import {loader, FavoriteLoader} from "./api/loader"; +import { FavoritePage } from "./ui/FavoritePage"; +import { loader, FavoriteLoader } from "./api/loader"; -export { - FavoritePage, - loader -}; +export { FavoritePage, loader }; export type { FavoriteLoader }; diff --git a/client/src/pages/favorite/ui/FavoritePage.tsx b/client/src/pages/favorite/ui/FavoritePage.tsx index c16a7ea3..a135b21c 100644 --- a/client/src/pages/favorite/ui/FavoritePage.tsx +++ b/client/src/pages/favorite/ui/FavoritePage.tsx @@ -12,22 +12,24 @@ export const FavoritePage = () => { useEffect(() => { const fetchFavoriteInstruments = async () => { - const favoriteInstrumentIds = await fetchFavoriteInstrumentIdsList() + const favoriteInstrumentIds = await fetchFavoriteInstrumentIdsList(); const filter = { instrumentIds: favoriteInstrumentIds, } as unknown as Filters; return await getInstrumentsByCriteria(filter); - } + }; - fetchFavoriteInstruments().then(instruments => setInstruments(instruments)); + fetchFavoriteInstruments().then((instruments) => + setInstruments(instruments), + ); }, []); return ( <> -
+

Favorite

- {instruments.map(instrument => ( + {instruments.map((instrument) => ( { /> ))} - ) -} \ No newline at end of file + ); +}; diff --git a/client/src/shared/api/instruments-by-criteria.list.ts b/client/src/shared/api/instruments-by-criteria.list.ts index 1bcb3cbe..55996f40 100644 --- a/client/src/shared/api/instruments-by-criteria.list.ts +++ b/client/src/shared/api/instruments-by-criteria.list.ts @@ -3,9 +3,7 @@ import { API_INSTRUMENTS, SERVER_URL } from "shared/config"; import { Filters } from "widgets/catalogue-filter"; import { Instruments } from "domain/model/instrument"; -export const getInstrumentsByCriteria = async ( - filters: Filters, -) => { +export const getInstrumentsByCriteria = async (filters: Filters) => { const getInstrumentsByCriteriaRequestBody = JSON.stringify(filters, null, 2); const { data, status } = await axios.post( @@ -16,7 +14,7 @@ export const getInstrumentsByCriteria = async ( "Content-Type": "application/json", }, }, - ) + ); if (status !== 200) { throw new Error("Failed to fetch instruments"); diff --git a/client/src/shared/index.ts b/client/src/shared/index.ts index 885f81aa..6e273903 100644 --- a/client/src/shared/index.ts +++ b/client/src/shared/index.ts @@ -1,6 +1,6 @@ import { deleteInstrument } from "./api/delete-instrument"; import { getInstrumentsByCriteria } from "./api/instruments-by-criteria.list"; -import { fetchFavoriteInstrumentIdsList} from "./api/fetch-favorite-instrument-ids.list" +import { fetchFavoriteInstrumentIdsList } from "./api/fetch-favorite-instrument-ids.list"; import { InstrumentCard } from "./ui/instrument-card/InstrumentCard"; import { @@ -19,7 +19,6 @@ export { getInstrumentsByCriteria, fetchFavoriteInstrumentIdsList, InstrumentCard, - SERVER_URL, API_INSTRUMENTS, API_AUTH_BASIC_LOGIN, diff --git a/client/src/shared/ui/instrument-card/InstrumentCard.css b/client/src/shared/ui/instrument-card/InstrumentCard.css index 9fb6c162..c64bd494 100644 --- a/client/src/shared/ui/instrument-card/InstrumentCard.css +++ b/client/src/shared/ui/instrument-card/InstrumentCard.css @@ -1,5 +1,5 @@ .instrument-card { - display: flex; - flex-direction: column; - background-color: darkslateblue; + display: flex; + flex-direction: column; + background-color: darkslateblue; } diff --git a/client/src/shared/ui/instrument-card/InstrumentCard.tsx b/client/src/shared/ui/instrument-card/InstrumentCard.tsx index 8ec3cd28..015f246f 100644 --- a/client/src/shared/ui/instrument-card/InstrumentCard.tsx +++ b/client/src/shared/ui/instrument-card/InstrumentCard.tsx @@ -18,5 +18,5 @@ export const InstrumentCard = (props: Props) => { favorite={props.favorite} /> - ) -} \ No newline at end of file + ); +}; diff --git a/client/src/widgets/catalogue-filter/model/filter.ts b/client/src/widgets/catalogue-filter/model/filter.ts index 4c7a4074..1b03dedb 100644 --- a/client/src/widgets/catalogue-filter/model/filter.ts +++ b/client/src/widgets/catalogue-filter/model/filter.ts @@ -14,7 +14,7 @@ export type Filters = { countries: string[] | null; materials: string[] | null; instrumentIds: number[] | null; -} +}; export const DEFAULT_FILTER = { instrumentName: null, diff --git a/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.css b/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.css index a4f7bf99..31a0b9a3 100644 --- a/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.css +++ b/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.css @@ -1,8 +1,6 @@ #catalogue-serp { background-color: darkkhaki; - - .instrument-card:last-child { margin-bottom: 30px; } diff --git a/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.tsx b/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.tsx index bfd4680e..74b82e0a 100644 --- a/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.tsx +++ b/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.tsx @@ -15,7 +15,8 @@ export const CatalogueSerpWidget = ({ return (
{instruments.map((instrument) => ( -