From aad561736ccc15f0543aecdb05a2997a4d889d59 Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 25 Aug 2024 01:17:26 +0300 Subject: [PATCH 01/14] feat(css): migrate catalogue for css modules --- client/src/domain/model/material.ts | 2 - .../src/pages/catalogue/ui/CataloguePage.tsx | 18 +++++---- .../src/pages/catalogue/ui/SearchBarForm.tsx | 27 -------------- .../catalogue/ui/SearchBarInputField.tsx | 27 ++++++++++++++ .../catalogue/ui/styles/CataloguePage.css | 37 ------------------- .../ui/styles/CataloguePage.module.css | 23 ++++++++++++ .../ui/styles/SearchBarInputField.module.css | 11 ++++++ .../navbar/NavigationBarWidget.tsx} | 2 +- 8 files changed, 72 insertions(+), 75 deletions(-) delete mode 100644 client/src/domain/model/material.ts delete mode 100644 client/src/pages/catalogue/ui/SearchBarForm.tsx create mode 100644 client/src/pages/catalogue/ui/SearchBarInputField.tsx delete mode 100644 client/src/pages/catalogue/ui/styles/CataloguePage.css create mode 100644 client/src/pages/catalogue/ui/styles/CataloguePage.module.css create mode 100644 client/src/pages/catalogue/ui/styles/SearchBarInputField.module.css rename client/src/{pages/catalogue/ui/NavigationBar.tsx => widgets/navbar/NavigationBarWidget.tsx} (90%) diff --git a/client/src/domain/model/material.ts b/client/src/domain/model/material.ts deleted file mode 100644 index 6fb06b47..00000000 --- a/client/src/domain/model/material.ts +++ /dev/null @@ -1,2 +0,0 @@ -export type Material = string; // NOSONAR -export type Materials = Material[]; diff --git a/client/src/pages/catalogue/ui/CataloguePage.tsx b/client/src/pages/catalogue/ui/CataloguePage.tsx index 650bde42..684bf56c 100644 --- a/client/src/pages/catalogue/ui/CataloguePage.tsx +++ b/client/src/pages/catalogue/ui/CataloguePage.tsx @@ -1,12 +1,12 @@ import React, { useEffect, useRef, useState } from "react"; -import "./styles/CataloguePage.css"; +import styles from "./styles/CataloguePage.module.css"; import { HeaderWidget } from "widgets/header"; import { FooterWidget } from "widgets/footer"; import { useLoaderData } from "react-router-dom"; import { CatalogueFilterWidget, Filters } from "widgets/catalogue-filter"; import { CatalogueSerpWidget } from "widgets/catalogue-serp"; import { CATALOGUE_DEFAULT_PAGE_SIZE } from "shared/config/frontend"; -import { SearchBarForm } from "./SearchBarForm"; +import { SearchBarInputField } from "./SearchBarInputField"; import { NavigationBar } from "./NavigationBar"; import { ListFavoriteApi } from "generated/api/list-favorite-api"; import { InstrumentDetail, InstrumentId } from "generated/model"; @@ -71,15 +71,17 @@ export function CataloguePage() { }, [filters, pageNumber]); return ( -
+ <> - + -
- +
+
+ +
-
+
-
+ ); } diff --git a/client/src/pages/catalogue/ui/SearchBarForm.tsx b/client/src/pages/catalogue/ui/SearchBarForm.tsx deleted file mode 100644 index 470f807b..00000000 --- a/client/src/pages/catalogue/ui/SearchBarForm.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import React from "react"; -import { InstrumentName } from "generated/model"; -import { Filters } from "widgets/catalogue-filter"; - -interface Props { - filters: Filters; - setFilters: (filter: Filters) => void; -} - -export const SearchBarForm = (props: Props) => { - return ( -
- { - props.setFilters({ - ...props.filters, - instrumentName: { - instrument_name: e.target.value, - } as InstrumentName, - }); - }} - /> -
- ); -}; diff --git a/client/src/pages/catalogue/ui/SearchBarInputField.tsx b/client/src/pages/catalogue/ui/SearchBarInputField.tsx new file mode 100644 index 00000000..dfea7006 --- /dev/null +++ b/client/src/pages/catalogue/ui/SearchBarInputField.tsx @@ -0,0 +1,27 @@ +import React from "react"; +import styles from "./styles/SearchBarInputField.module.css"; +import { InstrumentName } from "generated/model"; +import { Filters } from "widgets/catalogue-filter"; + +interface Props { + filters: Filters; + setFilters: (filter: Filters) => void; +} + +export const SearchBarInputField = (props: Props) => { + return ( + { + props.setFilters({ + ...props.filters, + instrumentName: { + instrument_name: e.target.value + } as InstrumentName + }); + }} + className={styles.search_bar__input} + /> + ); +}; diff --git a/client/src/pages/catalogue/ui/styles/CataloguePage.css b/client/src/pages/catalogue/ui/styles/CataloguePage.css deleted file mode 100644 index 02ab4d79..00000000 --- a/client/src/pages/catalogue/ui/styles/CataloguePage.css +++ /dev/null @@ -1,37 +0,0 @@ -#catalogue { - #catalogue-search-bar-form { - width: 100%; - background-color: darkslateblue; - - input[type="text"] { - background-color: white; - font-size: 24px; - text-align: center; - width: 100%; - } - } - - #catalogue-wrapper { - display: flex; - flex-direction: row; - background-color: darkorchid; - - #catalogue-filters { - background-color: darkslateblue; - flex: 1; - } - - #catalogue-serp-navbar-wrapper { - background-color: aqua; - flex: 3; - - #pages-navigation-bar { - background-color: midnightblue; - - span { - margin: 0 10px; - } - } - } - } -} diff --git a/client/src/pages/catalogue/ui/styles/CataloguePage.module.css b/client/src/pages/catalogue/ui/styles/CataloguePage.module.css new file mode 100644 index 00000000..aab08474 --- /dev/null +++ b/client/src/pages/catalogue/ui/styles/CataloguePage.module.css @@ -0,0 +1,23 @@ +.catalogue__wrapper { + display: flex; + flex-direction: row; + background-color: darkorchid; +} + +.catalogue__filters__wrapper { + background-color: darkslateblue; + flex: 1; +} + +.catalogue__serp__navbar__wrapper { + background-color: aqua; + flex: 3; +} + +.pages_navbar { + background-color: midnightblue; + + span { + margin: 0 10px; + } +} \ No newline at end of file diff --git a/client/src/pages/catalogue/ui/styles/SearchBarInputField.module.css b/client/src/pages/catalogue/ui/styles/SearchBarInputField.module.css new file mode 100644 index 00000000..913eaedf --- /dev/null +++ b/client/src/pages/catalogue/ui/styles/SearchBarInputField.module.css @@ -0,0 +1,11 @@ +.search_bar__input { + width: 100%; + background-color: darkslateblue; + + input[type="text"] { + background-color: white; + font-size: 24px; + text-align: center; + width: 100%; + } +} \ No newline at end of file diff --git a/client/src/pages/catalogue/ui/NavigationBar.tsx b/client/src/widgets/navbar/NavigationBarWidget.tsx similarity index 90% rename from client/src/pages/catalogue/ui/NavigationBar.tsx rename to client/src/widgets/navbar/NavigationBarWidget.tsx index e2940dbf..67407b7b 100644 --- a/client/src/pages/catalogue/ui/NavigationBar.tsx +++ b/client/src/widgets/navbar/NavigationBarWidget.tsx @@ -6,7 +6,7 @@ interface Props { setPageNumber: (pageNumber: number) => void; } -export const NavigationBar = (props: Props) => { +export const NavigationBarWidget = (props: Props) => { return (
{props.pageNumber > 1 && ( From 1df12ac48db228ca040023d961bb3dae52e9051b Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 25 Aug 2024 01:19:48 +0300 Subject: [PATCH 02/14] refactor(navbar): move to widget folder --- client/src/pages/catalogue/ui/CataloguePage.tsx | 6 +++--- .../pages/catalogue/ui/styles/CataloguePage.module.css | 8 -------- client/src/widgets/navbar/index.ts | 8 ++++++++ .../src/widgets/navbar/{ => ui}/NavigationBarWidget.tsx | 3 ++- .../navbar/ui/styles/NavigationBarWidget.module.css | 3 +++ 5 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 client/src/widgets/navbar/index.ts rename client/src/widgets/navbar/{ => ui}/NavigationBarWidget.tsx (81%) create mode 100644 client/src/widgets/navbar/ui/styles/NavigationBarWidget.module.css diff --git a/client/src/pages/catalogue/ui/CataloguePage.tsx b/client/src/pages/catalogue/ui/CataloguePage.tsx index 684bf56c..3e75d964 100644 --- a/client/src/pages/catalogue/ui/CataloguePage.tsx +++ b/client/src/pages/catalogue/ui/CataloguePage.tsx @@ -7,11 +7,11 @@ import { CatalogueFilterWidget, Filters } from "widgets/catalogue-filter"; import { CatalogueSerpWidget } from "widgets/catalogue-serp"; import { CATALOGUE_DEFAULT_PAGE_SIZE } from "shared/config/frontend"; import { SearchBarInputField } from "./SearchBarInputField"; -import { NavigationBar } from "./NavigationBar"; import { ListFavoriteApi } from "generated/api/list-favorite-api"; import { InstrumentDetail, InstrumentId } from "generated/model"; -import { GetInstrumentsByCriteriaPaginatedApi } from "generated/api/get-instruments-by-criteria-paginated-api"; +import { GetInstrumentsByCriteriaPaginatedApi } from "generated/api"; import { CatalogueLoader } from "pages/catalogue"; +import { NavigationBarWidget } from "widgets/navbar"; const getInstrumentsByCriteriaPaginated = new GetInstrumentsByCriteriaPaginatedApi(); @@ -86,7 +86,7 @@ export function CataloguePage() { instruments={instruments} favoriteInstrumentIds={favoriteInstrumentIds} /> - { return ( -
+
{props.pageNumber > 1 && ( - - - - setDeleteSuccessModal(false)} - > -

✅Instrument deleted

-
- - setDeleteErrorModal(false)} - > -

❌Fail to delete instrument

-
- - )} -
- ); -}; diff --git a/client/src/pages/instrument/ui/InstrumentPage.tsx b/client/src/pages/instrument/ui/InstrumentPage.tsx index e5ccb6a8..0d072390 100644 --- a/client/src/pages/instrument/ui/InstrumentPage.tsx +++ b/client/src/pages/instrument/ui/InstrumentPage.tsx @@ -3,9 +3,8 @@ import "./styles/InstrumentPage.css"; import { FooterWidget } from "widgets/footer"; import { HeaderWidget } from "widgets/header"; import { useLoaderData } from "react-router-dom"; -import { InstrumentActions } from "./InstrumentActions"; -import { InstrumentDescription } from "./InstrumentDescription"; import { InstrumentDetail } from "generated/model"; +import { InstrumentCard } from "shared/instrument-card"; export function InstrumentPage() { const instrument = useLoaderData() as InstrumentDetail; @@ -13,10 +12,7 @@ export function InstrumentPage() { return ( <> -
- - -
+ ); diff --git a/client/src/pages/instrument/ui/styles/InstrumentActions.css b/client/src/pages/instrument/ui/styles/InstrumentActions.css deleted file mode 100644 index a44d1573..00000000 --- a/client/src/pages/instrument/ui/styles/InstrumentActions.css +++ /dev/null @@ -1,16 +0,0 @@ -#instrument-profile-instrument-actions { - display: flex; - - #instrument-profile-delete-instrument { - flex-basis: 50%; - background-color: red; - padding: 30px; - } - - #instrument-profile-edit-instrument { - flex-basis: 50%; - background-color: blue; - text-align: center; - padding: 30px; - } -} diff --git a/client/src/shared/index.ts b/client/src/shared/index.ts index 0d3cb39e..25f0d966 100644 --- a/client/src/shared/index.ts +++ b/client/src/shared/index.ts @@ -1,7 +1,6 @@ -import { InstrumentCard } from "./ui/instrument-card/InstrumentCard"; +import { InstrumentCard} from "shared/instrument-card"; import { getCookie } from "shared/cookie/get-cookie"; import { useJwt } from "./jwt/use-jwt"; -import { parseInstrumentDetails } from "shared/model/parse-instrument-details"; import { CATALOGUE_DEFAULT_PAGE_SIZE, @@ -14,5 +13,4 @@ export { CATALOGUE_DEFAULT_PAGE_NUMBER, getCookie, useJwt, - parseInstrumentDetails, }; diff --git a/client/src/shared/instrument-card-actions/index.ts b/client/src/shared/instrument-card-actions/index.ts new file mode 100644 index 00000000..b242082a --- /dev/null +++ b/client/src/shared/instrument-card-actions/index.ts @@ -0,0 +1,11 @@ +import { AddOrRemoveFavoriteButton } from "./ui/AddOrRemoveFavoriteButton"; +import { EditInstrumentButton } from "./ui/EditInstrumentButton"; +import { RemoveInstrumentButton } from "./ui/RemoveInstrumentButton"; +import { GoToInstrumentButton } from "./ui/GoToInstrumentButton"; + +export { + AddOrRemoveFavoriteButton, + EditInstrumentButton, + RemoveInstrumentButton, + GoToInstrumentButton +}; diff --git a/client/src/shared/ui/instrument-card/actions/AddOrRemoveFavoriteButton.tsx b/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavoriteButton.tsx similarity index 69% rename from client/src/shared/ui/instrument-card/actions/AddOrRemoveFavoriteButton.tsx rename to client/src/shared/instrument-card-actions/ui/AddOrRemoveFavoriteButton.tsx index 6bed1dad..9e50676b 100644 --- a/client/src/shared/ui/instrument-card/actions/AddOrRemoveFavoriteButton.tsx +++ b/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavoriteButton.tsx @@ -1,6 +1,10 @@ +import React from "react"; +import styles from "./styles/AddOrRemoveFavoriteButton.module.css"; import { useState } from "react"; -import { RemoveFavoriteApi } from "generated/api/remove-favorite-api"; -import { AddFavoriteApi } from "generated/api/add-favorite-api"; +import { + AddFavoriteApi, + RemoveFavoriteApi +} from "generated/api"; import { InstrumentId } from "generated/model"; interface Props { @@ -17,18 +21,18 @@ export const AddOrRemoveFavoriteButton = (props: Props) => { const toggleFavorite = async () => { if (favorite) { removeFavorite.removeFavorite(props.instrumentId, { - withCredentials: true, + withCredentials: true }); } else { addFavorite.addFavorite(props.instrumentId, { - withCredentials: true, + withCredentials: true }); } setFavorite(!favorite); }; return ( - ); diff --git a/client/src/shared/ui/instrument-card/actions/EditInstrumentButton.tsx b/client/src/shared/instrument-card-actions/ui/EditInstrumentButton.tsx similarity index 78% rename from client/src/shared/ui/instrument-card/actions/EditInstrumentButton.tsx rename to client/src/shared/instrument-card-actions/ui/EditInstrumentButton.tsx index c459c560..a7455455 100644 --- a/client/src/shared/ui/instrument-card/actions/EditInstrumentButton.tsx +++ b/client/src/shared/instrument-card-actions/ui/EditInstrumentButton.tsx @@ -1,4 +1,5 @@ import React from "react"; +import styles from "./styles/EditInstrumentButton.module.css"; import { Link } from "react-router-dom"; import { InstrumentDetail } from "generated/model"; @@ -8,7 +9,7 @@ interface Props { export const EditInstrumentButton = (props: Props) => { return ( - ); diff --git a/client/src/widgets/catalogue-filter/ui/filters/CountryFilter.tsx b/client/src/widgets/catalogue-filter/ui/filters/Country.filter.tsx similarity index 97% rename from client/src/widgets/catalogue-filter/ui/filters/CountryFilter.tsx rename to client/src/widgets/catalogue-filter/ui/filters/Country.filter.tsx index 2165c105..23db5378 100644 --- a/client/src/widgets/catalogue-filter/ui/filters/CountryFilter.tsx +++ b/client/src/widgets/catalogue-filter/ui/filters/Country.filter.tsx @@ -37,7 +37,7 @@ export const CountryFilter = ({ onValueChange }: Props) => { } return ( -
+
Country: {countries.map((country) => (
diff --git a/client/src/widgets/catalogue-filter/ui/filters/InstrumentTypeFilter.tsx b/client/src/widgets/catalogue-filter/ui/filters/InstrumentType.filter.tsx similarity index 97% rename from client/src/widgets/catalogue-filter/ui/filters/InstrumentTypeFilter.tsx rename to client/src/widgets/catalogue-filter/ui/filters/InstrumentType.filter.tsx index 2b7b082e..2d42acf1 100644 --- a/client/src/widgets/catalogue-filter/ui/filters/InstrumentTypeFilter.tsx +++ b/client/src/widgets/catalogue-filter/ui/filters/InstrumentType.filter.tsx @@ -40,7 +40,7 @@ export const InstrumentTypeFilter = (props: Props) => { } return ( -
+
Type: {instrumentTypes.map((instrumentType) => (
diff --git a/client/src/widgets/catalogue-filter/ui/filters/ManufactureDateFilter.tsx b/client/src/widgets/catalogue-filter/ui/filters/ManufactureDate.filter.tsx similarity index 100% rename from client/src/widgets/catalogue-filter/ui/filters/ManufactureDateFilter.tsx rename to client/src/widgets/catalogue-filter/ui/filters/ManufactureDate.filter.tsx diff --git a/client/src/widgets/catalogue-filter/ui/filters/ManufacturerNameFilter.tsx b/client/src/widgets/catalogue-filter/ui/filters/ManufacturerName.filter.tsx similarity index 97% rename from client/src/widgets/catalogue-filter/ui/filters/ManufacturerNameFilter.tsx rename to client/src/widgets/catalogue-filter/ui/filters/ManufacturerName.filter.tsx index f1b95018..c4bc8818 100644 --- a/client/src/widgets/catalogue-filter/ui/filters/ManufacturerNameFilter.tsx +++ b/client/src/widgets/catalogue-filter/ui/filters/ManufacturerName.filter.tsx @@ -38,7 +38,7 @@ export const ManufacturerNameFilter = ({ onValueChange }: Props) => { } return ( -
+
Manufacturer: {manufacturers.map((manufacturer) => (
diff --git a/client/src/widgets/catalogue-filter/ui/filters/MaterialFilter.tsx b/client/src/widgets/catalogue-filter/ui/filters/Material.filter.tsx similarity index 92% rename from client/src/widgets/catalogue-filter/ui/filters/MaterialFilter.tsx rename to client/src/widgets/catalogue-filter/ui/filters/Material.filter.tsx index b8f3b281..0c0f7a55 100644 --- a/client/src/widgets/catalogue-filter/ui/filters/MaterialFilter.tsx +++ b/client/src/widgets/catalogue-filter/ui/filters/Material.filter.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { GetInstrumentBasicMaterialsApi } from "generated/api/get-instrument-basic-materials-api"; +import { GetInstrumentBasicMaterialsApi } from "generated/api"; import { BasicMaterial } from "generated/model"; interface Props { @@ -43,7 +43,7 @@ export const MaterialFilter = ({ onValueChange }: Props) => { } return ( -
+
Basic Materials: {materials.map((material) => (
diff --git a/client/src/widgets/catalogue-filter/ui/filters/ReleaseDateFilter.tsx b/client/src/widgets/catalogue-filter/ui/filters/ReleaseDate.filter.tsx similarity index 100% rename from client/src/widgets/catalogue-filter/ui/filters/ReleaseDateFilter.tsx rename to client/src/widgets/catalogue-filter/ui/filters/ReleaseDate.filter.tsx diff --git a/client/src/widgets/catalogue-filter/ui/styles/CreateInstrumentCardButton.css b/client/src/widgets/catalogue-filter/ui/styles/CreateInstrumentCard.button.module.css similarity index 75% rename from client/src/widgets/catalogue-filter/ui/styles/CreateInstrumentCardButton.css rename to client/src/widgets/catalogue-filter/ui/styles/CreateInstrumentCard.button.module.css index c44eb7ad..59331591 100644 --- a/client/src/widgets/catalogue-filter/ui/styles/CreateInstrumentCardButton.css +++ b/client/src/widgets/catalogue-filter/ui/styles/CreateInstrumentCard.button.module.css @@ -1,4 +1,4 @@ -#add-instrument-card { +.instrument__add__button { background-color: green; width: 100%; padding: 20px 0; diff --git a/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.tsx b/client/src/widgets/catalogue-serp/ui/CatalogueSerp.widget.tsx similarity index 92% rename from client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.tsx rename to client/src/widgets/catalogue-serp/ui/CatalogueSerp.widget.tsx index 8e01460d..b7f48e9c 100644 --- a/client/src/widgets/catalogue-serp/ui/CatalogueSerpWidget.tsx +++ b/client/src/widgets/catalogue-serp/ui/CatalogueSerp.widget.tsx @@ -1,7 +1,7 @@ import React from "react"; import styles from "./styles/CatalogueSerpWidget.module.css"; -import { InstrumentCard } from "shared/ui/instrument-card/InstrumentCard"; import { InstrumentDetail, InstrumentId } from "generated/model"; +import { InstrumentCard } from "shared/instrument-card"; interface Props { instruments: InstrumentDetail[]; diff --git a/client/src/widgets/footer/ui/FooterWidget.tsx b/client/src/widgets/footer/ui/Footer.widget.tsx similarity index 100% rename from client/src/widgets/footer/ui/FooterWidget.tsx rename to client/src/widgets/footer/ui/Footer.widget.tsx diff --git a/client/src/widgets/header/ui/HeaderWidget.tsx b/client/src/widgets/header/ui/Header.widget.tsx similarity index 100% rename from client/src/widgets/header/ui/HeaderWidget.tsx rename to client/src/widgets/header/ui/Header.widget.tsx diff --git a/client/src/widgets/modal/ui/ModalWidget.tsx b/client/src/widgets/modal/ui/Modal.widget.tsx similarity index 100% rename from client/src/widgets/modal/ui/ModalWidget.tsx rename to client/src/widgets/modal/ui/Modal.widget.tsx diff --git a/client/src/widgets/navbar/ui/NavigationBarWidget.tsx b/client/src/widgets/navbar/ui/NavigationBar.widget.tsx similarity index 100% rename from client/src/widgets/navbar/ui/NavigationBarWidget.tsx rename to client/src/widgets/navbar/ui/NavigationBar.widget.tsx From eb76fca59f6db41b1a8e64fbea3d53920d6fae5d Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 25 Aug 2024 02:10:24 +0300 Subject: [PATCH 11/14] refactor(card-actions): add `.widget.` to all widget files --- client/src/pages/catalogue/ui/CataloguePage.tsx | 2 +- ...rRemoveFavoriteButton.tsx => AddOrRemoveFavorite.button.tsx} | 2 +- .../ui/{EditInstrumentButton.tsx => EditInstrument.button.tsx} | 2 +- .../ui/{GoToInstrumentButton.tsx => GoToInstrument.button.tsx} | 2 +- .../{RemoveInstrumentButton.tsx => RemoveInstrument.button.tsx} | 2 +- ...eButton.module.css => AddOrRemoveFavorite.button.module.css} | 0 ...rumentButton.module.css => EditInstrument.button.module.css} | 0 ...rumentButton.module.css => GoToInstrument.button.module.css} | 0 ...mentButton.module.css => RemoveInstrument.button.module.css} | 0 client/src/widgets/{navbar => catalogue-navbar}/index.ts | 0 .../{navbar => catalogue-navbar}/ui/NavigationBar.widget.tsx | 0 .../ui/styles/NavigationBarWidget.module.css | 0 12 files changed, 5 insertions(+), 5 deletions(-) rename client/src/shared/instrument-card-actions/ui/{AddOrRemoveFavoriteButton.tsx => AddOrRemoveFavorite.button.tsx} (93%) rename client/src/shared/instrument-card-actions/ui/{EditInstrumentButton.tsx => EditInstrument.button.tsx} (88%) rename client/src/shared/instrument-card-actions/ui/{GoToInstrumentButton.tsx => GoToInstrument.button.tsx} (86%) rename client/src/shared/instrument-card-actions/ui/{RemoveInstrumentButton.tsx => RemoveInstrument.button.tsx} (93%) rename client/src/shared/instrument-card-actions/ui/styles/{AddOrRemoveFavoriteButton.module.css => AddOrRemoveFavorite.button.module.css} (100%) rename client/src/shared/instrument-card-actions/ui/styles/{EditInstrumentButton.module.css => EditInstrument.button.module.css} (100%) rename client/src/shared/instrument-card-actions/ui/styles/{GoToInstrumentButton.module.css => GoToInstrument.button.module.css} (100%) rename client/src/shared/instrument-card-actions/ui/styles/{RemoveInstrumentButton.module.css => RemoveInstrument.button.module.css} (100%) rename client/src/widgets/{navbar => catalogue-navbar}/index.ts (100%) rename client/src/widgets/{navbar => catalogue-navbar}/ui/NavigationBar.widget.tsx (100%) rename client/src/widgets/{navbar => catalogue-navbar}/ui/styles/NavigationBarWidget.module.css (100%) diff --git a/client/src/pages/catalogue/ui/CataloguePage.tsx b/client/src/pages/catalogue/ui/CataloguePage.tsx index 3e75d964..8810db58 100644 --- a/client/src/pages/catalogue/ui/CataloguePage.tsx +++ b/client/src/pages/catalogue/ui/CataloguePage.tsx @@ -11,7 +11,7 @@ import { ListFavoriteApi } from "generated/api/list-favorite-api"; import { InstrumentDetail, InstrumentId } from "generated/model"; import { GetInstrumentsByCriteriaPaginatedApi } from "generated/api"; import { CatalogueLoader } from "pages/catalogue"; -import { NavigationBarWidget } from "widgets/navbar"; +import { NavigationBarWidget } from "widgets/catalogue-navbar"; const getInstrumentsByCriteriaPaginated = new GetInstrumentsByCriteriaPaginatedApi(); diff --git a/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavoriteButton.tsx b/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavorite.button.tsx similarity index 93% rename from client/src/shared/instrument-card-actions/ui/AddOrRemoveFavoriteButton.tsx rename to client/src/shared/instrument-card-actions/ui/AddOrRemoveFavorite.button.tsx index 9e50676b..f083e15c 100644 --- a/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavoriteButton.tsx +++ b/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavorite.button.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/AddOrRemoveFavoriteButton.module.css"; +import styles from "./styles/AddOrRemoveFavorite.button.module.css"; import { useState } from "react"; import { AddFavoriteApi, diff --git a/client/src/shared/instrument-card-actions/ui/EditInstrumentButton.tsx b/client/src/shared/instrument-card-actions/ui/EditInstrument.button.tsx similarity index 88% rename from client/src/shared/instrument-card-actions/ui/EditInstrumentButton.tsx rename to client/src/shared/instrument-card-actions/ui/EditInstrument.button.tsx index a7455455..9ef31a26 100644 --- a/client/src/shared/instrument-card-actions/ui/EditInstrumentButton.tsx +++ b/client/src/shared/instrument-card-actions/ui/EditInstrument.button.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/EditInstrumentButton.module.css"; +import styles from "./styles/EditInstrument.button.module.css"; import { Link } from "react-router-dom"; import { InstrumentDetail } from "generated/model"; diff --git a/client/src/shared/instrument-card-actions/ui/GoToInstrumentButton.tsx b/client/src/shared/instrument-card-actions/ui/GoToInstrument.button.tsx similarity index 86% rename from client/src/shared/instrument-card-actions/ui/GoToInstrumentButton.tsx rename to client/src/shared/instrument-card-actions/ui/GoToInstrument.button.tsx index 710f6bcf..90da0210 100644 --- a/client/src/shared/instrument-card-actions/ui/GoToInstrumentButton.tsx +++ b/client/src/shared/instrument-card-actions/ui/GoToInstrument.button.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/GoToInstrumentButton.module.css"; +import styles from "./styles/GoToInstrument.button.module.css"; import { Link } from "react-router-dom"; import { InstrumentDetail } from "generated/model"; diff --git a/client/src/shared/instrument-card-actions/ui/RemoveInstrumentButton.tsx b/client/src/shared/instrument-card-actions/ui/RemoveInstrument.button.tsx similarity index 93% rename from client/src/shared/instrument-card-actions/ui/RemoveInstrumentButton.tsx rename to client/src/shared/instrument-card-actions/ui/RemoveInstrument.button.tsx index 2cdb7be2..6b024d27 100644 --- a/client/src/shared/instrument-card-actions/ui/RemoveInstrumentButton.tsx +++ b/client/src/shared/instrument-card-actions/ui/RemoveInstrument.button.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/RemoveInstrumentButton.module.css"; +import styles from "./styles/RemoveInstrument.button.module.css"; import { InstrumentDetail } from "generated/model"; import { RemoveFavoriteApi } from "generated/api/remove-favorite-api"; diff --git a/client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavoriteButton.module.css b/client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavorite.button.module.css similarity index 100% rename from client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavoriteButton.module.css rename to client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavorite.button.module.css diff --git a/client/src/shared/instrument-card-actions/ui/styles/EditInstrumentButton.module.css b/client/src/shared/instrument-card-actions/ui/styles/EditInstrument.button.module.css similarity index 100% rename from client/src/shared/instrument-card-actions/ui/styles/EditInstrumentButton.module.css rename to client/src/shared/instrument-card-actions/ui/styles/EditInstrument.button.module.css diff --git a/client/src/shared/instrument-card-actions/ui/styles/GoToInstrumentButton.module.css b/client/src/shared/instrument-card-actions/ui/styles/GoToInstrument.button.module.css similarity index 100% rename from client/src/shared/instrument-card-actions/ui/styles/GoToInstrumentButton.module.css rename to client/src/shared/instrument-card-actions/ui/styles/GoToInstrument.button.module.css diff --git a/client/src/shared/instrument-card-actions/ui/styles/RemoveInstrumentButton.module.css b/client/src/shared/instrument-card-actions/ui/styles/RemoveInstrument.button.module.css similarity index 100% rename from client/src/shared/instrument-card-actions/ui/styles/RemoveInstrumentButton.module.css rename to client/src/shared/instrument-card-actions/ui/styles/RemoveInstrument.button.module.css diff --git a/client/src/widgets/navbar/index.ts b/client/src/widgets/catalogue-navbar/index.ts similarity index 100% rename from client/src/widgets/navbar/index.ts rename to client/src/widgets/catalogue-navbar/index.ts diff --git a/client/src/widgets/navbar/ui/NavigationBar.widget.tsx b/client/src/widgets/catalogue-navbar/ui/NavigationBar.widget.tsx similarity index 100% rename from client/src/widgets/navbar/ui/NavigationBar.widget.tsx rename to client/src/widgets/catalogue-navbar/ui/NavigationBar.widget.tsx diff --git a/client/src/widgets/navbar/ui/styles/NavigationBarWidget.module.css b/client/src/widgets/catalogue-navbar/ui/styles/NavigationBarWidget.module.css similarity index 100% rename from client/src/widgets/navbar/ui/styles/NavigationBarWidget.module.css rename to client/src/widgets/catalogue-navbar/ui/styles/NavigationBarWidget.module.css From c7325998d4141132e0badf0a73adca09c6f46946 Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 25 Aug 2024 02:11:52 +0300 Subject: [PATCH 12/14] refactor(config): remove redundant `index.ts` --- client/src/pages/catalogue/api/loader.ts | 5 +---- client/src/shared/config/index.ts | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 client/src/shared/config/index.ts diff --git a/client/src/pages/catalogue/api/loader.ts b/client/src/pages/catalogue/api/loader.ts index 50172e73..7255bbc3 100644 --- a/client/src/pages/catalogue/api/loader.ts +++ b/client/src/pages/catalogue/api/loader.ts @@ -1,7 +1,3 @@ -import { - CATALOGUE_DEFAULT_PAGE_NUMBER, - CATALOGUE_DEFAULT_PAGE_SIZE, -} from "shared/config"; import { GetInstrumentsByCriteriaPaginatedApi, ListFavoriteApi, @@ -11,6 +7,7 @@ import { InstrumentId, } from "generated/model"; import { Filters } from "widgets/catalogue-filter"; +import { CATALOGUE_DEFAULT_PAGE_NUMBER, CATALOGUE_DEFAULT_PAGE_SIZE } from "shared/config/frontend"; const getInstrumentsByCriteriaPaginated = new GetInstrumentsByCriteriaPaginatedApi(); diff --git a/client/src/shared/config/index.ts b/client/src/shared/config/index.ts deleted file mode 100644 index 8906b410..00000000 --- a/client/src/shared/config/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { - CATALOGUE_DEFAULT_PAGE_SIZE, - CATALOGUE_DEFAULT_PAGE_NUMBER, -} from "./frontend"; From b786d8d9a9bbf88f233ab570981804ca4b58e585 Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 25 Aug 2024 02:13:48 +0300 Subject: [PATCH 13/14] refactor(catalogue): rename files --- client/src/pages/catalogue/ui/CataloguePage.tsx | 2 +- .../ui/{SearchBarInputField.tsx => SearchBarInput.field.tsx} | 2 +- ...BarInputField.module.css => SearchBarInput.field.module.css} | 0 .../pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx | 2 +- ...rial.module.css => InstrumentBasicMaterial.field.module.css} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename client/src/pages/catalogue/ui/{SearchBarInputField.tsx => SearchBarInput.field.tsx} (90%) rename client/src/pages/catalogue/ui/styles/{SearchBarInputField.module.css => SearchBarInput.field.module.css} (100%) rename client/src/pages/edit-instrument/ui/styles/{InstrumentBasicMaterial.module.css => InstrumentBasicMaterial.field.module.css} (100%) diff --git a/client/src/pages/catalogue/ui/CataloguePage.tsx b/client/src/pages/catalogue/ui/CataloguePage.tsx index 8810db58..f2d5fee7 100644 --- a/client/src/pages/catalogue/ui/CataloguePage.tsx +++ b/client/src/pages/catalogue/ui/CataloguePage.tsx @@ -6,12 +6,12 @@ import { useLoaderData } from "react-router-dom"; import { CatalogueFilterWidget, Filters } from "widgets/catalogue-filter"; import { CatalogueSerpWidget } from "widgets/catalogue-serp"; import { CATALOGUE_DEFAULT_PAGE_SIZE } from "shared/config/frontend"; -import { SearchBarInputField } from "./SearchBarInputField"; import { ListFavoriteApi } from "generated/api/list-favorite-api"; import { InstrumentDetail, InstrumentId } from "generated/model"; import { GetInstrumentsByCriteriaPaginatedApi } from "generated/api"; import { CatalogueLoader } from "pages/catalogue"; import { NavigationBarWidget } from "widgets/catalogue-navbar"; +import { SearchBarInputField } from "pages/catalogue/ui/SearchBarInput.field"; const getInstrumentsByCriteriaPaginated = new GetInstrumentsByCriteriaPaginatedApi(); diff --git a/client/src/pages/catalogue/ui/SearchBarInputField.tsx b/client/src/pages/catalogue/ui/SearchBarInput.field.tsx similarity index 90% rename from client/src/pages/catalogue/ui/SearchBarInputField.tsx rename to client/src/pages/catalogue/ui/SearchBarInput.field.tsx index dfea7006..ac18402b 100644 --- a/client/src/pages/catalogue/ui/SearchBarInputField.tsx +++ b/client/src/pages/catalogue/ui/SearchBarInput.field.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/SearchBarInputField.module.css"; +import styles from "./styles/SearchBarInput.field.module.css"; import { InstrumentName } from "generated/model"; import { Filters } from "widgets/catalogue-filter"; diff --git a/client/src/pages/catalogue/ui/styles/SearchBarInputField.module.css b/client/src/pages/catalogue/ui/styles/SearchBarInput.field.module.css similarity index 100% rename from client/src/pages/catalogue/ui/styles/SearchBarInputField.module.css rename to client/src/pages/catalogue/ui/styles/SearchBarInput.field.module.css diff --git a/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx b/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx index 326b3f0a..2a13891b 100644 --- a/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx +++ b/client/src/pages/edit-instrument/ui/InstrumentBasicMaterial.field.tsx @@ -1,6 +1,6 @@ import React, { useRef, useState } from "react"; import formStyles from "./styles/EditInstrumentPage.module.css"; -import styles from "./styles/InstrumentBasicMaterial.module.css"; +import styles from "./styles/InstrumentBasicMaterial.field.module.css"; import { BasicMaterial } from "generated/model"; interface Props { diff --git a/client/src/pages/edit-instrument/ui/styles/InstrumentBasicMaterial.module.css b/client/src/pages/edit-instrument/ui/styles/InstrumentBasicMaterial.field.module.css similarity index 100% rename from client/src/pages/edit-instrument/ui/styles/InstrumentBasicMaterial.module.css rename to client/src/pages/edit-instrument/ui/styles/InstrumentBasicMaterial.field.module.css From 4e348020c4e2a1969ca1a49453b9610fa3cd2273 Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 25 Aug 2024 02:22:45 +0300 Subject: [PATCH 14/14] refactor(pages): use `.page.` at page file names --- client/src/pages/catalogue/api/loader.ts | 5 ++++- .../{CataloguePage.tsx => Catalogue.page.tsx} | 0 .../catalogue/ui/SearchBarInput.field.tsx | 4 ++-- ...e.module.css => Catalogue.page.module.css} | 0 .../ui/styles/SearchBarInput.field.module.css | 2 +- ...mentPage.tsx => CreateInstrument.page.tsx} | 0 ...e.css => CreateInstrument.page.module.css} | 0 ...rumentPage.tsx => EditInstrument.page.tsx} | 2 +- ...ule.css => EditInstrument.page.module.css} | 0 .../{FavoritePage.tsx => Favorite.page.tsx} | 0 .../home/ui/{HomePage.tsx => Home.page.tsx} | 2 +- ...mePage.module.css => Home.page.module.css} | 0 ...Page.queries.css => Home.page.queries.css} | 0 ...InstrumentPage.tsx => Instrument.page.tsx} | 2 +- ...InstrumentPage.css => Instrument.page.css} | 0 .../ui/{LoginPage.tsx => Login.page.tsx} | 2 +- ...nPage.module.css => Login.page.module.css} | 2 +- .../{NotFoundPage.tsx => NotFound.page.tsx} | 0 ...ge.module.css => NotFound.page.module.css} | 0 ...erProfilePage.tsx => UserProfile.page.tsx} | 2 +- ...erProfilePage.css => UserProfile.page.css} | 0 ...strationPage.tsx => Registration.page.tsx} | 6 ++---- ...odule.css => Registration.page.module.css} | 2 +- client/src/shared/index.ts | 2 +- .../shared/instrument-card-actions/index.ts | 2 +- .../ui/AddOrRemoveFavorite.button.tsx | 14 +++++++------- .../ui/RemoveInstrument.button.tsx | 4 ++-- .../AddOrRemoveFavorite.button.module.css | 1 - client/src/shared/instrument-card/index.ts | 6 +----- .../instrument-card/ui/InstrumentActions.tsx | 4 ++-- .../ui/styles/InstrumentActions.module.css | 1 - client/src/shared/model/index.ts | 4 ++-- .../ui/CreateInstrumentCard.button.tsx | 5 ++++- client/src/widgets/catalogue-navbar/index.ts | 9 ++------- .../ui/CatalogueSerp.widget.tsx | 19 ++++++++++--------- 35 files changed, 48 insertions(+), 54 deletions(-) rename client/src/pages/catalogue/ui/{CataloguePage.tsx => Catalogue.page.tsx} (100%) rename client/src/pages/catalogue/ui/styles/{CataloguePage.module.css => Catalogue.page.module.css} (100%) rename client/src/pages/create-instrument/ui/{CreateInstrumentPage.tsx => CreateInstrument.page.tsx} (100%) rename client/src/pages/create-instrument/ui/styles/{CreateInstrumentPage.module.css => CreateInstrument.page.module.css} (100%) rename client/src/pages/edit-instrument/ui/{EditInstrumentPage.tsx => EditInstrument.page.tsx} (99%) rename client/src/pages/edit-instrument/ui/styles/{EditInstrumentPage.module.css => EditInstrument.page.module.css} (100%) rename client/src/pages/favorite/ui/{FavoritePage.tsx => Favorite.page.tsx} (100%) rename client/src/pages/home/ui/{HomePage.tsx => Home.page.tsx} (97%) rename client/src/pages/home/ui/styles/{HomePage.module.css => Home.page.module.css} (100%) rename client/src/pages/home/ui/styles/{HomePage.queries.css => Home.page.queries.css} (100%) rename client/src/pages/instrument/ui/{InstrumentPage.tsx => Instrument.page.tsx} (93%) rename client/src/pages/instrument/ui/styles/{InstrumentPage.css => Instrument.page.css} (100%) rename client/src/pages/login/ui/{LoginPage.tsx => Login.page.tsx} (96%) rename client/src/pages/login/ui/styles/{LoginPage.module.css => Login.page.module.css} (99%) rename client/src/pages/not-found/ui/{NotFoundPage.tsx => NotFound.page.tsx} (100%) rename client/src/pages/not-found/ui/styles/{NotFoundPage.module.css => NotFound.page.module.css} (100%) rename client/src/pages/profile/ui/{UserProfilePage.tsx => UserProfile.page.tsx} (94%) rename client/src/pages/profile/ui/styles/{UserProfilePage.css => UserProfile.page.css} (100%) rename client/src/pages/registration/ui/{RegistrationPage.tsx => Registration.page.tsx} (86%) rename client/src/pages/registration/ui/styles/{RegistrationPage.module.css => Registration.page.module.css} (99%) diff --git a/client/src/pages/catalogue/api/loader.ts b/client/src/pages/catalogue/api/loader.ts index 7255bbc3..49101fac 100644 --- a/client/src/pages/catalogue/api/loader.ts +++ b/client/src/pages/catalogue/api/loader.ts @@ -7,7 +7,10 @@ import { InstrumentId, } from "generated/model"; import { Filters } from "widgets/catalogue-filter"; -import { CATALOGUE_DEFAULT_PAGE_NUMBER, CATALOGUE_DEFAULT_PAGE_SIZE } from "shared/config/frontend"; +import { + CATALOGUE_DEFAULT_PAGE_NUMBER, + CATALOGUE_DEFAULT_PAGE_SIZE, +} from "shared/config/frontend"; const getInstrumentsByCriteriaPaginated = new GetInstrumentsByCriteriaPaginatedApi(); diff --git a/client/src/pages/catalogue/ui/CataloguePage.tsx b/client/src/pages/catalogue/ui/Catalogue.page.tsx similarity index 100% rename from client/src/pages/catalogue/ui/CataloguePage.tsx rename to client/src/pages/catalogue/ui/Catalogue.page.tsx diff --git a/client/src/pages/catalogue/ui/SearchBarInput.field.tsx b/client/src/pages/catalogue/ui/SearchBarInput.field.tsx index ac18402b..15905e1b 100644 --- a/client/src/pages/catalogue/ui/SearchBarInput.field.tsx +++ b/client/src/pages/catalogue/ui/SearchBarInput.field.tsx @@ -17,8 +17,8 @@ export const SearchBarInputField = (props: Props) => { props.setFilters({ ...props.filters, instrumentName: { - instrument_name: e.target.value - } as InstrumentName + instrument_name: e.target.value, + } as InstrumentName, }); }} className={styles.search_bar__input} diff --git a/client/src/pages/catalogue/ui/styles/CataloguePage.module.css b/client/src/pages/catalogue/ui/styles/Catalogue.page.module.css similarity index 100% rename from client/src/pages/catalogue/ui/styles/CataloguePage.module.css rename to client/src/pages/catalogue/ui/styles/Catalogue.page.module.css diff --git a/client/src/pages/catalogue/ui/styles/SearchBarInput.field.module.css b/client/src/pages/catalogue/ui/styles/SearchBarInput.field.module.css index 913eaedf..135122f0 100644 --- a/client/src/pages/catalogue/ui/styles/SearchBarInput.field.module.css +++ b/client/src/pages/catalogue/ui/styles/SearchBarInput.field.module.css @@ -8,4 +8,4 @@ text-align: center; width: 100%; } -} \ No newline at end of file +} diff --git a/client/src/pages/create-instrument/ui/CreateInstrumentPage.tsx b/client/src/pages/create-instrument/ui/CreateInstrument.page.tsx similarity index 100% rename from client/src/pages/create-instrument/ui/CreateInstrumentPage.tsx rename to client/src/pages/create-instrument/ui/CreateInstrument.page.tsx diff --git a/client/src/pages/create-instrument/ui/styles/CreateInstrumentPage.module.css b/client/src/pages/create-instrument/ui/styles/CreateInstrument.page.module.css similarity index 100% rename from client/src/pages/create-instrument/ui/styles/CreateInstrumentPage.module.css rename to client/src/pages/create-instrument/ui/styles/CreateInstrument.page.module.css diff --git a/client/src/pages/edit-instrument/ui/EditInstrumentPage.tsx b/client/src/pages/edit-instrument/ui/EditInstrument.page.tsx similarity index 99% rename from client/src/pages/edit-instrument/ui/EditInstrumentPage.tsx rename to client/src/pages/edit-instrument/ui/EditInstrument.page.tsx index faf8dd59..e6cc0d49 100644 --- a/client/src/pages/edit-instrument/ui/EditInstrumentPage.tsx +++ b/client/src/pages/edit-instrument/ui/EditInstrument.page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/EditInstrumentPage.module.css"; +import styles from "./styles/EditInstrument.page.module.css"; import { HeaderWidget } from "widgets/header"; import { FooterWidget } from "widgets/footer"; import { Form, useActionData, useLoaderData } from "react-router-dom"; diff --git a/client/src/pages/edit-instrument/ui/styles/EditInstrumentPage.module.css b/client/src/pages/edit-instrument/ui/styles/EditInstrument.page.module.css similarity index 100% rename from client/src/pages/edit-instrument/ui/styles/EditInstrumentPage.module.css rename to client/src/pages/edit-instrument/ui/styles/EditInstrument.page.module.css diff --git a/client/src/pages/favorite/ui/FavoritePage.tsx b/client/src/pages/favorite/ui/Favorite.page.tsx similarity index 100% rename from client/src/pages/favorite/ui/FavoritePage.tsx rename to client/src/pages/favorite/ui/Favorite.page.tsx diff --git a/client/src/pages/home/ui/HomePage.tsx b/client/src/pages/home/ui/Home.page.tsx similarity index 97% rename from client/src/pages/home/ui/HomePage.tsx rename to client/src/pages/home/ui/Home.page.tsx index 483fcd33..82118f8d 100644 --- a/client/src/pages/home/ui/HomePage.tsx +++ b/client/src/pages/home/ui/Home.page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/HomePage.module.css"; +import styles from "./styles/Home.page.module.css"; import { HeaderWidget } from "widgets/header"; import { FooterWidget } from "widgets/footer"; import { Slide } from "react-slideshow-image"; diff --git a/client/src/pages/home/ui/styles/HomePage.module.css b/client/src/pages/home/ui/styles/Home.page.module.css similarity index 100% rename from client/src/pages/home/ui/styles/HomePage.module.css rename to client/src/pages/home/ui/styles/Home.page.module.css diff --git a/client/src/pages/home/ui/styles/HomePage.queries.css b/client/src/pages/home/ui/styles/Home.page.queries.css similarity index 100% rename from client/src/pages/home/ui/styles/HomePage.queries.css rename to client/src/pages/home/ui/styles/Home.page.queries.css diff --git a/client/src/pages/instrument/ui/InstrumentPage.tsx b/client/src/pages/instrument/ui/Instrument.page.tsx similarity index 93% rename from client/src/pages/instrument/ui/InstrumentPage.tsx rename to client/src/pages/instrument/ui/Instrument.page.tsx index 0d072390..d29cfeda 100644 --- a/client/src/pages/instrument/ui/InstrumentPage.tsx +++ b/client/src/pages/instrument/ui/Instrument.page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import "./styles/InstrumentPage.css"; +import "./styles/Instrument.page.css"; import { FooterWidget } from "widgets/footer"; import { HeaderWidget } from "widgets/header"; import { useLoaderData } from "react-router-dom"; diff --git a/client/src/pages/instrument/ui/styles/InstrumentPage.css b/client/src/pages/instrument/ui/styles/Instrument.page.css similarity index 100% rename from client/src/pages/instrument/ui/styles/InstrumentPage.css rename to client/src/pages/instrument/ui/styles/Instrument.page.css diff --git a/client/src/pages/login/ui/LoginPage.tsx b/client/src/pages/login/ui/Login.page.tsx similarity index 96% rename from client/src/pages/login/ui/LoginPage.tsx rename to client/src/pages/login/ui/Login.page.tsx index d9663a4d..80bd1374 100644 --- a/client/src/pages/login/ui/LoginPage.tsx +++ b/client/src/pages/login/ui/Login.page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/LoginPage.module.css"; +import styles from "./styles/Login.page.module.css"; import { HeaderWidget } from "widgets/header"; import { FooterWidget } from "widgets/footer"; import { Form, useActionData, useNavigate } from "react-router-dom"; diff --git a/client/src/pages/login/ui/styles/LoginPage.module.css b/client/src/pages/login/ui/styles/Login.page.module.css similarity index 99% rename from client/src/pages/login/ui/styles/LoginPage.module.css rename to client/src/pages/login/ui/styles/Login.page.module.css index f57c8f5d..68f3766a 100644 --- a/client/src/pages/login/ui/styles/LoginPage.module.css +++ b/client/src/pages/login/ui/styles/Login.page.module.css @@ -21,4 +21,4 @@ .login__error { background-color: red; padding: 20px 10px; -} \ No newline at end of file +} diff --git a/client/src/pages/not-found/ui/NotFoundPage.tsx b/client/src/pages/not-found/ui/NotFound.page.tsx similarity index 100% rename from client/src/pages/not-found/ui/NotFoundPage.tsx rename to client/src/pages/not-found/ui/NotFound.page.tsx diff --git a/client/src/pages/not-found/ui/styles/NotFoundPage.module.css b/client/src/pages/not-found/ui/styles/NotFound.page.module.css similarity index 100% rename from client/src/pages/not-found/ui/styles/NotFoundPage.module.css rename to client/src/pages/not-found/ui/styles/NotFound.page.module.css diff --git a/client/src/pages/profile/ui/UserProfilePage.tsx b/client/src/pages/profile/ui/UserProfile.page.tsx similarity index 94% rename from client/src/pages/profile/ui/UserProfilePage.tsx rename to client/src/pages/profile/ui/UserProfile.page.tsx index e9476e88..e7c29989 100644 --- a/client/src/pages/profile/ui/UserProfilePage.tsx +++ b/client/src/pages/profile/ui/UserProfile.page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import "./styles/UserProfilePage.css"; +import "./styles/UserProfile.page.css"; import { HeaderWidget } from "widgets/header"; import { FooterWidget } from "widgets/footer"; import { useLoaderData } from "react-router-dom"; diff --git a/client/src/pages/profile/ui/styles/UserProfilePage.css b/client/src/pages/profile/ui/styles/UserProfile.page.css similarity index 100% rename from client/src/pages/profile/ui/styles/UserProfilePage.css rename to client/src/pages/profile/ui/styles/UserProfile.page.css diff --git a/client/src/pages/registration/ui/RegistrationPage.tsx b/client/src/pages/registration/ui/Registration.page.tsx similarity index 86% rename from client/src/pages/registration/ui/RegistrationPage.tsx rename to client/src/pages/registration/ui/Registration.page.tsx index 844c8ab0..a40e1109 100644 --- a/client/src/pages/registration/ui/RegistrationPage.tsx +++ b/client/src/pages/registration/ui/Registration.page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import styles from "./styles/RegistrationPage.module.css"; +import styles from "./styles/Registration.page.module.css"; import { HeaderWidget } from "widgets/header"; import { Form, useActionData } from "react-router-dom"; import { FooterWidget } from "widgets/footer"; @@ -13,9 +13,7 @@ export const RegistrationPage = () => { {actionData?.errors.length === 0 && ( -
- ✅ Registration Completed -
+
✅ Registration Completed
)}
diff --git a/client/src/pages/registration/ui/styles/RegistrationPage.module.css b/client/src/pages/registration/ui/styles/Registration.page.module.css similarity index 99% rename from client/src/pages/registration/ui/styles/RegistrationPage.module.css rename to client/src/pages/registration/ui/styles/Registration.page.module.css index 3e991703..1c22521e 100644 --- a/client/src/pages/registration/ui/styles/RegistrationPage.module.css +++ b/client/src/pages/registration/ui/styles/Registration.page.module.css @@ -21,4 +21,4 @@ .registration__error { background-color: red; padding: 20px 10px; -} \ No newline at end of file +} diff --git a/client/src/shared/index.ts b/client/src/shared/index.ts index 25f0d966..76eefd34 100644 --- a/client/src/shared/index.ts +++ b/client/src/shared/index.ts @@ -1,4 +1,4 @@ -import { InstrumentCard} from "shared/instrument-card"; +import { InstrumentCard } from "shared/instrument-card"; import { getCookie } from "shared/cookie/get-cookie"; import { useJwt } from "./jwt/use-jwt"; diff --git a/client/src/shared/instrument-card-actions/index.ts b/client/src/shared/instrument-card-actions/index.ts index b242082a..acdd24c1 100644 --- a/client/src/shared/instrument-card-actions/index.ts +++ b/client/src/shared/instrument-card-actions/index.ts @@ -7,5 +7,5 @@ export { AddOrRemoveFavoriteButton, EditInstrumentButton, RemoveInstrumentButton, - GoToInstrumentButton + GoToInstrumentButton, }; diff --git a/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavorite.button.tsx b/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavorite.button.tsx index f083e15c..1dea3c52 100644 --- a/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavorite.button.tsx +++ b/client/src/shared/instrument-card-actions/ui/AddOrRemoveFavorite.button.tsx @@ -1,10 +1,7 @@ import React from "react"; import styles from "./styles/AddOrRemoveFavorite.button.module.css"; import { useState } from "react"; -import { - AddFavoriteApi, - RemoveFavoriteApi -} from "generated/api"; +import { AddFavoriteApi, RemoveFavoriteApi } from "generated/api"; import { InstrumentId } from "generated/model"; interface Props { @@ -21,18 +18,21 @@ export const AddOrRemoveFavoriteButton = (props: Props) => { const toggleFavorite = async () => { if (favorite) { removeFavorite.removeFavorite(props.instrumentId, { - withCredentials: true + withCredentials: true, }); } else { addFavorite.addFavorite(props.instrumentId, { - withCredentials: true + withCredentials: true, }); } setFavorite(!favorite); }; return ( - ); diff --git a/client/src/shared/instrument-card-actions/ui/RemoveInstrument.button.tsx b/client/src/shared/instrument-card-actions/ui/RemoveInstrument.button.tsx index 6b024d27..24728b9f 100644 --- a/client/src/shared/instrument-card-actions/ui/RemoveInstrument.button.tsx +++ b/client/src/shared/instrument-card-actions/ui/RemoveInstrument.button.tsx @@ -17,8 +17,8 @@ export const RemoveInstrumentButton = (props: Props) => { const response = await removeFavoriteApi.removeFavorite( props.instrument.instrument_id, { - withCredentials: true - } + withCredentials: true, + }, ); if (response.status === 200) { diff --git a/client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavorite.button.module.css b/client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavorite.button.module.css index e4908056..90657aed 100644 --- a/client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavorite.button.module.css +++ b/client/src/shared/instrument-card-actions/ui/styles/AddOrRemoveFavorite.button.module.css @@ -2,4 +2,3 @@ background-color: red; flex-basis: 25%; } - diff --git a/client/src/shared/instrument-card/index.ts b/client/src/shared/instrument-card/index.ts index 75296fd7..45ef40ef 100644 --- a/client/src/shared/instrument-card/index.ts +++ b/client/src/shared/instrument-card/index.ts @@ -2,8 +2,4 @@ import { InstrumentCard } from "./ui/InstrumentCard"; import { InstrumentDescription } from "./ui/InstrumentDescription"; import { InstrumentActions } from "./ui/InstrumentActions"; -export { - InstrumentCard, - InstrumentDescription, - InstrumentActions, -} +export { InstrumentCard, InstrumentDescription, InstrumentActions }; diff --git a/client/src/shared/instrument-card/ui/InstrumentActions.tsx b/client/src/shared/instrument-card/ui/InstrumentActions.tsx index f024daf7..8da2ff89 100644 --- a/client/src/shared/instrument-card/ui/InstrumentActions.tsx +++ b/client/src/shared/instrument-card/ui/InstrumentActions.tsx @@ -9,7 +9,7 @@ import { AddOrRemoveFavoriteButton, EditInstrumentButton, GoToInstrumentButton, - RemoveInstrumentButton + RemoveInstrumentButton, } from "shared/instrument-card-actions"; interface Props { @@ -21,7 +21,7 @@ export const InstrumentActions = (props: Props) => { const [errorModal, setErrorModal] = useState(false); const [successModal, setSuccessModal] = useState(false); const jwt = useRef( - Cookies.get("jwt") as string | undefined + Cookies.get("jwt") as string | undefined, ); return ( diff --git a/client/src/shared/instrument-card/ui/styles/InstrumentActions.module.css b/client/src/shared/instrument-card/ui/styles/InstrumentActions.module.css index 8f771e9d..56630492 100644 --- a/client/src/shared/instrument-card/ui/styles/InstrumentActions.module.css +++ b/client/src/shared/instrument-card/ui/styles/InstrumentActions.module.css @@ -1,4 +1,3 @@ .instrument_actions__wrapper { display: flex; } - diff --git a/client/src/shared/model/index.ts b/client/src/shared/model/index.ts index 074b974c..74544470 100644 --- a/client/src/shared/model/index.ts +++ b/client/src/shared/model/index.ts @@ -1,3 +1,3 @@ -import { parseInstrumentDetails} from "./parse-instrument-details"; +import { parseInstrumentDetails } from "./parse-instrument-details"; -export { parseInstrumentDetails }; \ No newline at end of file +export { parseInstrumentDetails }; diff --git a/client/src/widgets/catalogue-filter/ui/CreateInstrumentCard.button.tsx b/client/src/widgets/catalogue-filter/ui/CreateInstrumentCard.button.tsx index 431924cf..6d02afac 100644 --- a/client/src/widgets/catalogue-filter/ui/CreateInstrumentCard.button.tsx +++ b/client/src/widgets/catalogue-filter/ui/CreateInstrumentCard.button.tsx @@ -11,7 +11,10 @@ export const CreateInstrumentCardButton = () => { }; return ( - ); diff --git a/client/src/widgets/catalogue-navbar/index.ts b/client/src/widgets/catalogue-navbar/index.ts index 4a6216da..0ac20423 100644 --- a/client/src/widgets/catalogue-navbar/index.ts +++ b/client/src/widgets/catalogue-navbar/index.ts @@ -1,8 +1,3 @@ -import { - NavigationBarWidget -} from "./ui/NavigationBarWidget"; +import { NavigationBarWidget } from "./ui/NavigationBarWidget"; - -export { - NavigationBarWidget -}; +export { NavigationBarWidget }; diff --git a/client/src/widgets/catalogue-serp/ui/CatalogueSerp.widget.tsx b/client/src/widgets/catalogue-serp/ui/CatalogueSerp.widget.tsx index b7f48e9c..1c814417 100644 --- a/client/src/widgets/catalogue-serp/ui/CatalogueSerp.widget.tsx +++ b/client/src/widgets/catalogue-serp/ui/CatalogueSerp.widget.tsx @@ -15,15 +15,16 @@ export const CatalogueSerpWidget = (props: Props) => {
Instruments not found :(
)} - {props.instruments.length > 0 && props.instruments.map((instrument) => ( - id.instrument_id) - .includes(instrument.instrument_id.instrument_id)} - /> - ))} + {props.instruments.length > 0 && + props.instruments.map((instrument) => ( + id.instrument_id) + .includes(instrument.instrument_id.instrument_id)} + /> + ))}
); };