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.

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

#789 alternative text for images format #790

Merged
merged 4 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FrontEnd/src/components/HeaderFooter/footer/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

function Footer(props) {
return (
<footer className={css['footer-content']}>
<footer className={css['footer-content-main']}>
{UNSUITABLE_PAGES.includes(props.page) ? (<ShortFooter/>) :

Check warning on line 11 in FrontEnd/src/components/HeaderFooter/footer/Footer.jsx

View workflow job for this annotation

GitHub Actions / Linting

'page' is missing in props validation
(<>
<FooterTop></FooterTop>
<FooterBottom></FooterBottom>
Expand Down
6 changes: 3 additions & 3 deletions FrontEnd/src/components/HeaderFooter/footer/Footer.module.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.footer-content {
margin-top: auto;
width: var(--main-block-size);
.footer-content-main {
display: flex;
flex-direction: column;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function FooterBottom() {
return (
<div className={css['footer-bottom']}>
<p className={css['footer-bottom__text']}>
Copyright 2023 Forum. All rights reserved.
Copyright 2023 CraftMerge. All rights reserved.
</p>
<img
className={css['footer-bottom-logo__svg']}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.footer-bottom {
display: flex;
width: var(--main-block-size);
height: 33px;
justify-content: flex-start;
background: var(--footer-bottom-backround);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from 'react';
import { useState, useEffect } from 'react';
import { HashLink } from 'react-router-hash-link';
import { Link } from 'react-router-dom';
import axios from 'axios';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function FooterPolicy() {
<img
className={css['policy-content__main-logo']}
src={`${process.env.REACT_APP_PUBLIC_URL}/craftMerge-logo-white.svg`}
alt="craft merge logo"
title="CraftMerge logo">
alt="Footer craft merge logo"
title="CraftMerge">
</img>
<div className={css['policy-content-links']}>
{POLICY_LINKS.map((element) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
white-space: nowrap;
}

.policy-content__main_logo {
.policy-content__main-logo {
width: 199px;
height: 24px;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.footer-top {
display: flex;
width: var(--main-block-size);
flex-direction: column;
justify-content: center;
align-items: flex-start;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
display: flex;
flex-direction: column;
align-items: flex-start;
width: var(--main-block-size);
}

.header-divider {
width: var(--main-block-size);
height: 1px;

background: var(--main-black-20, #E2E5EB);
}
22 changes: 10 additions & 12 deletions FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,18 @@
<div className={css['navbar-content']}>
<div className={css['navbar-logo__text']}>
<Link to="/">
<img
className={css['main-logo']}
src={`${process.env.REACT_APP_PUBLIC_URL}/craftMerge-logo.svg`}
alt="craft merge logo"
width="199"
height="24"
></img>
<img
className={css['navbar-main-logo']}
src={`${process.env.REACT_APP_PUBLIC_URL}/craftMerge-logo.svg`}
alt="CraftMerge logo"
></img>
</Link>
</div>
<div className={css['navbar-utility-bar']}>
{props.page === 'login' || props.page === 'registration' ? null : (
<>
<Menu/>
<SearchBox></SearchBox>
<div className={css['navbar-utility-bar']}>
{props.page === 'login' || props.page === 'registration' ? null : (

Check warning on line 21 in FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx

View workflow job for this annotation

GitHub Actions / Linting

'page' is missing in props validation

Check warning on line 21 in FrontEnd/src/components/HeaderFooter/header/navbar/Navbar.jsx

View workflow job for this annotation

GitHub Actions / Linting

'page' is missing in props validation
<>
<Menu />
<SearchBox></SearchBox>
</>
)}
{props.isAuthorized === true ? <Profile /> : <Buttons />}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
.navbar-content {
display: flex;
width: 1305px;
padding: 8px 104px;
align-items: center;
justify-content: space-between;
}

/* .navbar-logo__text {
color: #292E32;
font-feature-settings: 'calt' off;
font-family: var(--font-logo);
font-size: 24px;
font-style: normal;
font-weight: 500;
line-height: 24px;
letter-spacing: -0.24px;
} */
.navbar-logo__text{
display: flex;
}

.navbar-logo__img {
width: 600px;
height: 400px;
.navbar-main-logo{
display: flex;
width: 199px;
height: 24px;
}

.navbar-utility-bar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function Profile() {
<img
className={css['header-profile__avatar']}
src={`${process.env.REACT_APP_PUBLIC_URL}/img/Avatar.png`}
alt="avatar"
alt="Avatar"
onClick={navigateToProfile}
/>
<DropdownMenu toggleText="Профіль">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
border-radius: 100px;
border: 1px solid var(--main-black-20, #E2E5EB);
background: var(--conditional-pop-over, #FFF)
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useState } from 'react';
import icon_search from './search-icon.svg';
import { useNavigate } from 'react-router-dom';
import css from './SearchBox.module.css';

Expand Down Expand Up @@ -36,7 +35,7 @@ function SearchBox() {
className={css['header-search-form__addon']}
disabled={!searchTerm.trim()}
>
<img src={icon_search} alt="" />
<img src={`${process.env.REACT_APP_PUBLIC_URL}/svg/search-icon.svg`} alt="Search" />
</button>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ textarea:focus,
.header-search-form__input:focus {
border: none;
outline: none;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const WarnUnsavedDataModal = ({ onCancel, onConfirm }) => {
Збереження введених даних
</p>
<button onClick={onCancel} className={classes['modal-header--close-icon']}>
<img src={`${process.env.REACT_APP_PUBLIC_URL}/svg/cross-btn.svg`} />
<img src={`${process.env.REACT_APP_PUBLIC_URL}/svg/cross-btn.svg`} alt="Cancel button" />
</button>
</div>
<div className={classes['modal-content']}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const MainAboutSection = () => {
src={`${process.env.REACT_APP_PUBLIC_URL}/img/about.jpeg`}
alt="about img"
loading="lazy"
title="about img"
title="About CarftMerge"
/>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions FrontEnd/src/components/landing-page/banner/Banner.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,25 @@ const MainBanner = (props) => {
<img
className="main-banner-group__banner-image1"
src={`${process.env.REACT_APP_PUBLIC_URL}/img/banner-img1.jpeg`}
alt="banner img"
alt="Banner img"
/>
<img
className="main-banner-group__banner-image2"
src={`${process.env.REACT_APP_PUBLIC_URL}/img/banner-img2.jpeg`}
alt="banner img"
alt="Banner img"
/>
<img
className="main-banner-group__banner-image3"
src={`${process.env.REACT_APP_PUBLIC_URL}/img/banner-img3.jpeg`}
alt="banner img"
alt="Banner img"
/>
<div className="main-banner-wine">
<div className="main-banner-group__frame">
<div className="main-banner-wine__winemaking">
<div className="winemaking">
<img
src={`${process.env.REACT_APP_PUBLIC_URL}/svg/winemaking.svg`}
alt="winemaking"
alt="Winemaking"
width="16"
height="18"
/>
Expand All @@ -91,7 +91,7 @@ const MainBanner = (props) => {
<div className="cheese">
<img
src={`${process.env.REACT_APP_PUBLIC_URL}/svg/cheese.svg`}
alt="cheese"
alt="Cheese"
width="20"
height="20"
/>
Expand All @@ -103,7 +103,7 @@ const MainBanner = (props) => {
<div className="delivery">
<img
src={`${process.env.REACT_APP_PUBLIC_URL}/svg/delivery.svg`}
alt="delivery"
alt="Delivery"
width="20"
height="20"
/>
Expand Down
4 changes: 2 additions & 2 deletions FrontEnd/src/components/landing-page/partners/Partners.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ const MainPartners = () => {
<div className="partners-section__navi-icons">
<div className="partners-section__navi-icon">
<div className="partners-section__icon">
<img src="/svg/icon-left.svg" alt="" />
<img src="/svg/icon-left.svg" alt="Left navigation" />
</div>
</div>
<div className="partners-section__navi-icon">
<div className="partners-section__icon">
<img src="/svg/icon-right.svg" alt="" />
<img src="/svg/icon-right.svg" alt="Right navigation" />
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import styles from './TermsAndConditionsComponent.module.css';
import TermsAndConditionsText from './text';
import TEXT_CONTENT from './text';
Expand Down
Loading