diff --git a/.husky/pre-commit b/.husky/pre-commit
index d0a7784..bc3ab45 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1,4 @@
-npx lint-staged
\ No newline at end of file
+npx lint-staged
+
+echo "Running test build..."
+npm run build
\ No newline at end of file
diff --git a/package.json b/package.json
index 5e15dfb..7b1b1da 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,8 @@
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
- "eslint --fix",
- "prettier --write"
+ "prettier --write",
+ "eslint --fix"
]
}
}
diff --git a/public/images/bg-form.jpg b/public/images/bg-form.jpg
new file mode 100644
index 0000000..e9e9b6b
Binary files /dev/null and b/public/images/bg-form.jpg differ
diff --git a/public/images/bogatyr.png b/public/images/bogatyr.png
new file mode 100644
index 0000000..498db38
Binary files /dev/null and b/public/images/bogatyr.png differ
diff --git a/public/images/chateau-de-talu.png b/public/images/chateau-de-talu.png
new file mode 100644
index 0000000..58d0e50
Binary files /dev/null and b/public/images/chateau-de-talu.png differ
diff --git a/public/images/school-20.png b/public/images/school-20.png
new file mode 100644
index 0000000..3f837ed
Binary files /dev/null and b/public/images/school-20.png differ
diff --git a/src/core/styles/variables.scss b/src/core/styles/variables.scss
index f4e84b3..309f036 100644
--- a/src/core/styles/variables.scss
+++ b/src/core/styles/variables.scss
@@ -8,8 +8,9 @@ $desktop: 1440px;
//fonts
$font-open-sans: var(--open-sans), sans-serif;
+$font-light: 300;
$font-regular: 400;
-$font-medium: 400;
+$font-medium: 500;
$font-semi-bold: 600;
// colors
diff --git a/src/views/home/ui/home.tsx b/src/views/home/ui/home.tsx
index 8b0497d..63ade2b 100644
--- a/src/views/home/ui/home.tsx
+++ b/src/views/home/ui/home.tsx
@@ -1,6 +1,6 @@
import Main from './main/main';
import Offer from './offer/offer';
-// import Result from './result/result';
+import Result from './result/result';
// import License from './license/license';
// import Contacts from './contacts/contacts';
// import Footer from './footer/footer';
@@ -10,7 +10,7 @@ export default function HomePage() {
<>
- {/**/}
+
{/**/}
{/**/}
{/**/}
diff --git a/src/views/home/ui/offer/offer.module.scss b/src/views/home/ui/offer/offer.module.scss
index 9b10f9d..2be70b5 100644
--- a/src/views/home/ui/offer/offer.module.scss
+++ b/src/views/home/ui/offer/offer.module.scss
@@ -150,10 +150,58 @@
}
.Form {
- .Title {
+ position: relative;
+ padding: 40px 60px;
+ background: #292E3D;
+ border-radius: 28px;
+ overflow: hidden;
+ &:after {
+ content: '';
+ display: block;
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ z-index: 1;
+ left: 0;
+ top: 0;
+ background-color: rgba(#163055, .6);
+ transition: 250ms background-color;
+ }
+
+ .Background {
+ position: absolute;
+ object-fit: cover;
+ z-index: 1;
}
.SubTitle {
+ position: relative;
+ z-index: 2;
+ font-family: $font-open-sans;
+ font-weight: $font-light;
+ font-size: 30px;
+ line-height: 100%;
+ color: $color-white;
+ margin-bottom: 16px;
+ }
+
+ .Title {
+ position: relative;
+ z-index: 2;
+ font-family: $font-open-sans;
+ font-weight: $font-regular;
+ font-size: 48px;
+ line-height: 130%;
+ color: $color-white;
+ max-width: 660px;
+ margin: 0;
+ }
+
+ .Input{
+ position: absolute;
+ z-index: 2;
+ right: 60px;
+ bottom: 40px;
}
}
}
\ No newline at end of file
diff --git a/src/views/home/ui/offer/offer.tsx b/src/views/home/ui/offer/offer.tsx
index 745b08c..f2f8c40 100644
--- a/src/views/home/ui/offer/offer.tsx
+++ b/src/views/home/ui/offer/offer.tsx
@@ -10,6 +10,7 @@ import gridThree from '@public/images/grid-3.png';
import gridFour from '@public/images/grid-4.png';
import gridFive from '@public/images/grid-5.png';
import gridSix from '@public/images/grid-6.png';
+import bgForm from '@public/images/bg-form.jpg';
export default function Offer() {
return (
@@ -64,9 +65,18 @@ export default function Offer() {
);
diff --git a/src/views/home/ui/result/result.module.scss b/src/views/home/ui/result/result.module.scss
index a8e9b80..afb42db 100644
--- a/src/views/home/ui/result/result.module.scss
+++ b/src/views/home/ui/result/result.module.scss
@@ -1,2 +1,68 @@
.Result {
+ padding: 160px;
+
+ .Header {
+ font-family: $font-open-sans;
+ font-weight: $font-semi-bold;
+ font-size: 60px;
+ line-height: 100%;
+ color: $color-text;
+ margin-bottom: 96px;
+ }
+
+ .Row {
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ gap: 10vw;
+ margin-bottom: 80px;
+
+ &:nth-child(odd) {
+ flex-direction: row-reverse;
+ }
+
+ .Review {
+ flex: 1;
+
+ .Title {
+ font-family: $font-open-sans;
+ font-weight: $font-regular;
+ font-size: 48px;
+ line-height: 100%;
+ color: $color-text;
+ margin-bottom: 40px;
+ }
+
+ .Description {
+ font-family: $font-open-sans;
+ font-weight: $font-regular;
+ font-size: 24px;
+ line-height: 100%;
+ color: $color-text;
+ }
+ }
+
+ .Picture {
+ flex: 1;
+ position: relative;
+ overflow: hidden;
+ border-radius: 28px;
+ object-fit: contain;
+ max-width: 720px;
+ height: 540px;
+ &:after {
+ content: '';
+ display: block;
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ z-index: 1;
+ left: 0;
+ top: 0;
+ background-color: rgba(#292E3D, .4);
+ transition: 250ms background-color;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/home/ui/result/result.tsx b/src/views/home/ui/result/result.tsx
index 6079a0a..0dfc441 100644
--- a/src/views/home/ui/result/result.tsx
+++ b/src/views/home/ui/result/result.tsx
@@ -1,5 +1,63 @@
import s from './result.module.scss';
+import { Mark } from '@shared/ui';
+
+import Image from 'next/image';
+
+import bogatyrImg from '@public/images/bogatyr.png';
+import chateauImg from '@public/images/chateau-de-talu.png';
+import schoolImg from '@public/images/school-20.png';
export default function Result() {
- return ;
+ return (
+
+
+ Наш опыт –
ваш результат!
+
+
+ {resultData.map(({ title, location, description, image }, idx) => (
+
+
+
+ {title},
{location}
+
+
{description}
+
+
+
+
+
+ ))}
+
+ );
}
+
+const resultData = [
+ {
+ title: 'Отель Богатырь',
+ location: 'г.Сочи',
+ description:
+ 'Написать что требовалось,что сделали,что получилось и какие преимущества получил заказчик в итоге',
+ image: bogatyrImg,
+ },
+ {
+ title: 'Château de Talu',
+ location: 'г. Геленджик',
+ description:
+ 'Написать что требовалось,что сделали,что получилось и какие преимущества получил заказчик в итоге',
+ image: chateauImg,
+ },
+ {
+ title: 'МОБУ Школа №20',
+ location: 'г.Сочи',
+ description:
+ 'Написать что требовалось,что сделали,что получилось и какие преимущества получил заказчик в итоге',
+ image: schoolImg,
+ },
+];