Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#137navigation via logo #337

Merged
merged 6 commits into from
Nov 30, 2023
Merged

#137navigation via logo #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2e385e
logo-title, logo on main page, styles
BelousSofiya Nov 30, 2023
a49a9e1
cookies on center
BelousSofiya Nov 30, 2023
1db097c
styles for search button
BelousSofiya Nov 30, 2023
e48ac0f
modal styles
BelousSofiya Nov 30, 2023
e16895c
delete comments
BelousSofiya Nov 30, 2023
488e64f
font
BelousSofiya Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added FrontEnd/public/apple-touch-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FrontEnd/public/favicon-16x16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FrontEnd/public/favicon-32x32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified FrontEnd/public/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added FrontEnd/public/forum-logo.ico
View file
Open in desktop
Binary file not shown.
11 changes: 7 additions & 4 deletions FrontEnd/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/site.webmanifest" />

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap" rel="stylesheet">
<title>React App</title>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap"
rel="stylesheet"
/>
<title>Forum</title>
</head>
<body>
<div id="root"></div>
Expand Down
32 changes: 22 additions & 10 deletions FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div className={css['navbar-content']}>
<div className={css['navbar-logo__text']}>forum</div>
<div className={css['navbar-utility-bar']}>
{props.page === 'login' || props.page === 'registration' ? (null):
(<><Menu/><SearchBox></SearchBox></>)}
{props.isAuthorized === true ? (<Profile/>) : (<Buttons/>)}
</div>
</div>
);
return (
<div className={css['navbar-content']}>
<div className={css['navbar-logo__text']}>
<Link to="/">
<img
src={`${process.env.REACT_APP_PUBLIC_URL}/forum-logo.ico`}
alt="forum-logo"
></img>
</Link>
</div>
<div className={css['navbar-utility-bar']}>
{props.page === 'login' || props.page === 'registration' ? null : (
<>
<Menu />
<SearchBox></SearchBox>
</>
)}
{props.isAuthorized === true ? <Profile /> : <Buttons />}
</div>
</div>
);
}

export default Navbar;
21 changes: 13 additions & 8 deletions FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
}
20 changes: 18 additions & 2 deletions FrontEnd/src/components/HeaderFooter/header/navbar/SearchBox.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -52,4 +68,4 @@ textarea:focus,
.header-search-form__input:focus {
border: none;
outline: none;
}
}
9 changes: 7 additions & 2 deletions FrontEnd/src/components/SearchPage/Search.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,15 @@ export function Search({ isAuthorized, userData }) {
<img className={styles['frame-img-right']} src={frame42} alt="frame" />
<div className={styles['new-companies-search_count']}>
{searchResults && (
<h3 className={styles['search_results_text']}>
<div><h3 className={styles['search_results_text']}>
РЕЗУЛЬТАТІВ ЗА ПОШУКОМ{' '}
<span className={styles['search_field_entered_value']}>
{searchTerm}
</span>{' '}
: {searchResults.length > 0 ? searchResults.length : 0}
</h3>
<br/>
</div>
)}
<br />
</div>
Expand All @@ -99,14 +101,17 @@ export function Search({ isAuthorized, userData }) {
/>
<br />
</>
) : (
) : ( <div>
<br />
<p className={styles['search_result_error']}>
Пошук не дав результатів: компанії з іменем{' '}
<span className={styles['.search_result_error']}>
{searchTerm}
</span>{' '}
не було виявлено на даний момент
</p>
<br />
</div>
)}
</div>
<div className={styles['new-companies-result_pages']}>
Expand Down
7 changes: 4 additions & 3 deletions FrontEnd/src/components/SearchPage/search_page.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions FrontEnd/src/components/cookieacception/CookieMod.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
padding: 20px;
border-radius: 12px;
background-color: white;
height: 230px;
width: 300px;
}

Expand All @@ -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;
}

Expand All @@ -48,7 +47,7 @@
}

.cookie-image {
margin-left: 55px;
margin-left: 95px;
margin-right: 50px;
width: 100px;
height: 70px;
Expand Down
Loading