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

Feature/cra 15 #20

Merged
merged 2 commits into from
Feb 9, 2022
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
Binary file added src/assets/image/encourages/dog2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/Navbar/navbar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
backdrop-filter: blur(8px);
display: flex;
height: 120px;
z-index: 1;

&__logo {
margin: 10px 20px;
Expand Down
10 changes: 10 additions & 0 deletions src/components/Section/Section.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import PropTypes from "prop-types";
import styles from "./section.module.scss";

export const Section = ({ children }) => {
return <div className={styles.wrapper}>{children}</div>;
};

Section.propTypes = {
children: PropTypes.node.isRequired,
};
11 changes: 11 additions & 0 deletions src/components/Section/section.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.wrapper {
display: flex;
flex-direction: row;
}

@media (max-width: 768px) {
.wrapper {
align-items: center;
justify-content: center;
}
}
1 change: 1 addition & 0 deletions src/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ export { Logo } from "./Logo/Logo";
export { Navbar } from "./Navbar/Navbar";
export { SearchForm } from "./SearchForm/SearchForm";
export { Select } from "./Select/Select";
export { Section } from "./Section/Section";
21 changes: 21 additions & 0 deletions src/modules/main/components/EncourageSection/EncourageSection.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import styles from "./encourage_section.module.scss";
import dog from "../../../../assets/image/encourages/dog.png";
import { Section } from "../../../../components";

export const EncourageSection = () => {
return (
<Section>
<div className={styles.section__description}>
<h3 className={styles.description__title}>
W trosce o potrzeby Twojego zwierzaka
</h3>
<p className={styles.description__text}>
Kompleksowa wyszukiwarka usług dla zwierząt, która powstała z myślą o
czworonogach i ich właścicielach, ułatwiając im dostęp do szerokiego
grona specjalistów.
</p>
</div>
<img className={styles.section__image} src={dog} alt="" />
</Section>
);
};
20 changes: 0 additions & 20 deletions src/modules/main/components/EncourageSection/Section.jsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
.section__description {
display: flex;
height: 600px;
flex-direction: column;
margin-left: 90px;
}

.description__title {
margin-top: 150px;
font-size: 36px;
color: #243b70;
}

.description__text {
margin-top: 0;
font-size: 25px;
color: #385cb0;
width: 650px;
}

.section__image {
width: 55%;
height: 650px;
position: absolute;
top: 0;
right: 0;
z-index: -1;
}

@media (max-width: 786px) {
.section__description {
display: flex;
justify-content: flex-start;
width: 100%;
margin: 0;
padding: 0 10px;
height: 500px;
}

.description__text {
width: 100%;
text-align: end;
text-shadow: 1px 3px 1px #000;
color: #fff;
margin-top: 20px;
}

.description__title {
text-shadow: 1px 2px 1px #000;
text-align: center;
margin: 25px 0;
color: #fff;
font-size: 30px;
}

.section__image {
width: 195%;
height: 75%;
}
}
27 changes: 0 additions & 27 deletions src/modules/main/components/EncourageSection/section.module.scss

This file was deleted.

13 changes: 3 additions & 10 deletions src/modules/main/pages/Main.jsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
import { Section } from "../components/EncourageSection/Section";
import dog from "../../../assets/image/encourages/dog.png";
import { SearchForm } from "../../../components/SearchForm/SearchForm";
import { EncourageSection } from "../components/EncourageSection/EncourageSection";
import { DividerSection } from "../../../components/DividerSection/DividerSection";
import { OpinionsSection } from "../../../components/OpinionsSection/OpinionsSection";
import { ServicesList } from "../../../components/ServicesList/ServicesList";
import { OpinionsSection, SearchForm } from "../../../components";

export const Main = () => {
return (
<div>
<EncourageSection />
<SearchForm />
<Section
imageSrc={dog}
title="W trosce o potrzeby Twojego zwierzaka"
description="Kompleksowa wyszukiwarka usług dla zwięrząt, która powstała z myślą
o czworonogach i ich właścicielach ułatwiając im dostęp do szerokiego pasma specjalistów."
/>
<ServicesList />
<OpinionsSection />
<DividerSection />
Expand Down