diff --git a/FrontEnd/src/components/HeaderFooter/header/Header.jsx b/FrontEnd/src/components/HeaderFooter/header/Header.jsx index 2d9368071..c8c62dd67 100644 --- a/FrontEnd/src/components/HeaderFooter/header/Header.jsx +++ b/FrontEnd/src/components/HeaderFooter/header/Header.jsx @@ -2,17 +2,19 @@ import css from './Header.module.css'; import HeaderMenu from './menu/HeaderMenu'; import Navbar from './navbar/Navbar'; -function Header (props) { - return ( -
-
- -
- {props.page === 'login' || props.page === 'registration' ? (null): ()} -
-
-
- ); +function Header(props) { + return ( +
+
+ +
+ {props.page === 'login' || props.page === 'registration' ? null : ( + + )} +
+
+
+ ); } export default Header; diff --git a/FrontEnd/src/components/SearchPage/Search.js b/FrontEnd/src/components/SearchPage/Search.js index df8238920..c6c00ce33 100644 --- a/FrontEnd/src/components/SearchPage/Search.js +++ b/FrontEnd/src/components/SearchPage/Search.js @@ -6,7 +6,7 @@ import SearchResults from './search_field/SearchResults'; import frame42 from './img/frame42.png'; import link_to_left from './img/link_to_left.svg'; import link_to_right from './img/link_to_right.svg'; -import './search_page.css'; +import './search_page.module.css'; const ITEMS_PER_PAGE = 6; diff --git a/FrontEnd/src/components/SearchPage/search_field/SearchResults.js b/FrontEnd/src/components/SearchPage/search_field/SearchResults.js index 3623fd432..a812d07e7 100644 --- a/FrontEnd/src/components/SearchPage/search_field/SearchResults.js +++ b/FrontEnd/src/components/SearchPage/search_field/SearchResults.js @@ -1,5 +1,5 @@ import MainCompanies from './companies/Companies'; -import './Text.css'; +import styles from './Text.module.css'; const SearchResults = ({ results, displayedResults, isAuthorized }) => { let error = null; @@ -11,10 +11,10 @@ const SearchResults = ({ results, displayedResults, isAuthorized }) => { return (
{!error && ( -
-
+
+
{displayedResults.map((result, resultIndex) => ( -
+
{ const currentDate = new Date(); @@ -10,26 +10,28 @@ const MainCompanies = ({ companyData, isAuthorized }) => { const usersSavedList = []; return ( -
-
-
+
+
+
{companyData.name}
-
-
-
+
+
+
{companyData.categories && companyData.categories .map((category) => category.name) .join(' ')}
-
+
{companyData.name} @@ -37,13 +39,15 @@ const MainCompanies = ({ companyData, isAuthorized }) => {
-
+
{companyData.address}
-
-
-
-
+
+
+
+
{currentYear - companyData.founded} років досвіду
@@ -58,7 +62,7 @@ const MainCompanies = ({ companyData, isAuthorized }) => {
{/* if company added - del from saved list */}
-
-
+
+
{`${companyData.name}
diff --git a/FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.css b/FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.module.css similarity index 100% rename from FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.css rename to FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.module.css diff --git a/FrontEnd/src/components/SearchPage/search_page.css b/FrontEnd/src/components/SearchPage/search_page.module.css similarity index 100% rename from FrontEnd/src/components/SearchPage/search_page.css rename to FrontEnd/src/components/SearchPage/search_page.module.css