diff --git a/FrontEnd/public/apple-touch-icon.png b/FrontEnd/public/apple-touch-icon.png
new file mode 100644
index 000000000..2991a0c06
Binary files /dev/null and b/FrontEnd/public/apple-touch-icon.png differ
diff --git a/FrontEnd/public/favicon-16x16.png b/FrontEnd/public/favicon-16x16.png
new file mode 100644
index 000000000..9839240bb
Binary files /dev/null and b/FrontEnd/public/favicon-16x16.png differ
diff --git a/FrontEnd/public/favicon-32x32.png b/FrontEnd/public/favicon-32x32.png
new file mode 100644
index 000000000..71ddb1293
Binary files /dev/null and b/FrontEnd/public/favicon-32x32.png differ
diff --git a/FrontEnd/public/favicon.ico b/FrontEnd/public/favicon.ico
index cbcc662c5..63eabdcfd 100644
Binary files a/FrontEnd/public/favicon.ico and b/FrontEnd/public/favicon.ico differ
diff --git a/FrontEnd/public/forum-logo.ico b/FrontEnd/public/forum-logo.ico
new file mode 100644
index 000000000..62bea69b4
Binary files /dev/null and b/FrontEnd/public/forum-logo.ico differ
diff --git a/FrontEnd/public/index.html b/FrontEnd/public/index.html
index 3ff9afec2..ccf88e2f9 100644
--- a/FrontEnd/public/index.html
+++ b/FrontEnd/public/index.html
@@ -8,10 +8,13 @@
-
-
-
-
React App
+
+
+
+ Forum
diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx
index 6ba1d4513..0c6505509 100644
--- a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx
+++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx
@@ -3,18 +3,30 @@ import Menu from './Menu';
import SearchBox from './SearchBox';
import Profile from './Profile';
import Buttons from './Buttons';
+import { Link } from 'react-router-dom';
function Navbar(props) {
- return (
-
-
forum
-
- {props.page === 'login' || props.page === 'registration' ? (null):
- (<>
>)}
- {props.isAuthorized === true ? (
) : (
)}
-
-
- );
+ return (
+
+
+
+
+
+
+
+ {props.page === 'login' || props.page === 'registration' ? null : (
+ <>
+
+
+ >
+ )}
+ {props.isAuthorized === true ?
:
}
+
+
+ );
}
export default Navbar;
diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css
index b478d1149..ad020351f 100644
--- a/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css
+++ b/FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css
@@ -1,12 +1,12 @@
.navbar-content {
- display: flex;
- width: 1305px;
- padding: 8px 104px;
- align-items: center;
- justify-content: space-between;
+ display: flex;
+ width: 1305px;
+ padding: 8px 104px;
+ align-items: center;
+ justify-content: space-between;
}
-.navbar-logo__text {
+/* .navbar-logo__text {
color: #292E32;
font-feature-settings: 'calt' off;
font-family: Geologica;
@@ -15,9 +15,14 @@
font-weight: 500;
line-height: 24px;
letter-spacing: -0.24px;
+} */
+
+.navbar-logo__img {
+ width: 600px;
+ height: 400px;
}
.navbar-utility-bar {
- display: flex;
- gap: 24px;
+ display: flex;
+ gap: 24px;
}
diff --git a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css b/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css
index e289630f6..9ac233909 100644
--- a/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css
+++ b/FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css
@@ -15,6 +15,16 @@
align-items: flex-start;
gap: 10px;
flex: 1 0 0;
+ position: relative;
+}
+
+.header-search-form::after {
+ content: "";
+ position: absolute;
+ border-right: 1px solid #d9d9d9;
+ height: 32px;
+ top: -3.5px;
+ right: 0;
}
.header-search-form__input {
@@ -27,9 +37,15 @@
}
.header-search-form__addon {
+ display: flex;
+ padding: 6px;
+ justify-content: center;
+ align-items: center;
+ gap: 8px;
+ align-self: stretch;
background-color: transparent;
cursor: pointer;
- border: 1px solid rgba(0, 0, 0, 0.25);
+ border: none;
}
.header-search-form__addon img {
@@ -52,4 +68,4 @@ textarea:focus,
.header-search-form__input:focus {
border: none;
outline: none;
-}
+}
\ No newline at end of file
diff --git a/FrontEnd/src/components/SearchPage/Search.jsx b/FrontEnd/src/components/SearchPage/Search.jsx
index 620ed747d..ecf38d660 100644
--- a/FrontEnd/src/components/SearchPage/Search.jsx
+++ b/FrontEnd/src/components/SearchPage/Search.jsx
@@ -77,13 +77,15 @@ export function Search({ isAuthorized, userData }) {
{searchResults && (
-
+
РЕЗУЛЬТАТІВ ЗА ПОШУКОМ{' '}
{searchTerm}
{' '}
: {searchResults.length > 0 ? searchResults.length : 0}
+
+
)}
@@ -99,7 +101,8 @@ export function Search({ isAuthorized, userData }) {
/>
>
- ) : (
+ ) : (
+
Пошук не дав результатів: компанії з іменем{' '}
@@ -107,6 +110,8 @@ export function Search({ isAuthorized, userData }) {
{' '}
не було виявлено на даний момент
+
+
)}
diff --git a/FrontEnd/src/components/SearchPage/search_page.module.css b/FrontEnd/src/components/SearchPage/search_page.module.css
index a7f55246c..28286ca51 100644
--- a/FrontEnd/src/components/SearchPage/search_page.module.css
+++ b/FrontEnd/src/components/SearchPage/search_page.module.css
@@ -20,8 +20,8 @@
}
.search_field_entered_value {
- color: var(----main-style-signs-color);
- font: Inter;
+ color: #0b6c61;
+ font: normal normal normal 20px/2 Inter;
font-weight: 600;
font-style: italic;
}
@@ -34,7 +34,8 @@
.search_result_error {
font-weight: 600;
color: var(--text-color);
- font: Inter;
+ font: normal normal bold 20px/2 Inter;
+ margin: 145px;
}
.frame-img-right {
diff --git a/FrontEnd/src/components/cookieacception/CookieMod.module.css b/FrontEnd/src/components/cookieacception/CookieMod.module.css
index 947c89ebf..5ef5b42e4 100644
--- a/FrontEnd/src/components/cookieacception/CookieMod.module.css
+++ b/FrontEnd/src/components/cookieacception/CookieMod.module.css
@@ -19,7 +19,6 @@
padding: 20px;
border-radius: 12px;
background-color: white;
- height: 230px;
width: 300px;
}
@@ -30,8 +29,8 @@
border-style: solid;
font-size: 15px;
border-radius: 4px;
- margin: 10px;
- margin-right: 40px;
+ margin: 14px;
+ margin-right: 50px;
padding: 4px;
}
@@ -48,7 +47,7 @@
}
.cookie-image {
- margin-left: 55px;
+ margin-left: 95px;
margin-right: 50px;
width: 100px;
height: 70px;