diff --git a/public/images/grid-1.png b/public/images/grid-1.png new file mode 100644 index 0000000..02fcaff Binary files /dev/null and b/public/images/grid-1.png differ diff --git a/public/images/grid-2.png b/public/images/grid-2.png new file mode 100644 index 0000000..ff221ec Binary files /dev/null and b/public/images/grid-2.png differ diff --git a/public/images/grid-3.png b/public/images/grid-3.png new file mode 100644 index 0000000..6205231 Binary files /dev/null and b/public/images/grid-3.png differ diff --git a/public/images/grid-4.png b/public/images/grid-4.png new file mode 100644 index 0000000..bb22290 Binary files /dev/null and b/public/images/grid-4.png differ diff --git a/public/images/grid-5.png b/public/images/grid-5.png new file mode 100644 index 0000000..83ce38a Binary files /dev/null and b/public/images/grid-5.png differ diff --git a/public/images/grid-6.png b/public/images/grid-6.png new file mode 100644 index 0000000..5eebbb7 Binary files /dev/null and b/public/images/grid-6.png differ diff --git a/public/svg/arrow-tile.svg b/public/svg/arrow-tile.svg new file mode 100644 index 0000000..13f2645 --- /dev/null +++ b/public/svg/arrow-tile.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/layout.tsx b/src/app/layout.tsx index def1610..97409e4 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -4,7 +4,7 @@ import '@core/styles/reset.scss'; import '@core/styles/globals.scss'; const openSans = Open_Sans({ - subsets: ['latin', 'cyrillic'], + subsets: ['cyrillic'], weight: ['300', '400', '500', '600', '700'], variable: '--open-sans', }); diff --git a/src/app/page.tsx b/src/app/page.tsx index f42f313..de0ec89 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,4 +1,4 @@ -import { default as HomePage } from '@pages/home'; +import { HomePage } from '@views/home'; export default function Home() { return ( diff --git a/src/core/styles/variables.scss b/src/core/styles/variables.scss index c583629..f4e84b3 100644 --- a/src/core/styles/variables.scss +++ b/src/core/styles/variables.scss @@ -8,7 +8,8 @@ $desktop: 1440px; //fonts $font-open-sans: var(--open-sans), sans-serif; -$font-regular: 500; +$font-regular: 400; +$font-medium: 400; $font-semi-bold: 600; // colors diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx deleted file mode 100644 index 577ea93..0000000 --- a/src/pages/home/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default } from './ui/home'; diff --git a/src/shared/ui/index.ts b/src/shared/ui/index.ts index a039b75..96fd6ed 100644 --- a/src/shared/ui/index.ts +++ b/src/shared/ui/index.ts @@ -1 +1,2 @@ export { Button } from './button'; +export { Mark } from './mark'; diff --git a/src/shared/ui/mark/index.ts b/src/shared/ui/mark/index.ts new file mode 100644 index 0000000..77b6600 --- /dev/null +++ b/src/shared/ui/mark/index.ts @@ -0,0 +1 @@ +export { default as Mark } from './mark'; diff --git a/src/shared/ui/mark/mark.module.scss b/src/shared/ui/mark/mark.module.scss new file mode 100644 index 0000000..9c580cd --- /dev/null +++ b/src/shared/ui/mark/mark.module.scss @@ -0,0 +1,3 @@ +.Mark { + color: $color-orange; +} \ No newline at end of file diff --git a/src/shared/ui/mark/mark.tsx b/src/shared/ui/mark/mark.tsx new file mode 100644 index 0000000..8db0e22 --- /dev/null +++ b/src/shared/ui/mark/mark.tsx @@ -0,0 +1,14 @@ +import s from './mark.module.scss'; +import { ReactNode } from 'react'; + +type MarkProps = { + children: ReactNode; +}; + +export default function Mark({ children }: MarkProps) { + return ( + <> + {children} + + ); +} diff --git a/src/views/home/index.ts b/src/views/home/index.ts new file mode 100644 index 0000000..370eca4 --- /dev/null +++ b/src/views/home/index.ts @@ -0,0 +1 @@ +export { default as HomePage } from './ui/home'; diff --git a/src/views/home/ui/contacts/contacts.module.scss b/src/views/home/ui/contacts/contacts.module.scss new file mode 100644 index 0000000..170e846 --- /dev/null +++ b/src/views/home/ui/contacts/contacts.module.scss @@ -0,0 +1,3 @@ +.Contacts { + +} \ No newline at end of file diff --git a/src/views/home/ui/contacts/contacts.tsx b/src/views/home/ui/contacts/contacts.tsx new file mode 100644 index 0000000..f5d2d4d --- /dev/null +++ b/src/views/home/ui/contacts/contacts.tsx @@ -0,0 +1,5 @@ +import s from './contacts.module.scss'; + +export default function Contacts() { + return
Contacts
; +} diff --git a/src/views/home/ui/footer/footer.module.scss b/src/views/home/ui/footer/footer.module.scss new file mode 100644 index 0000000..30558fb --- /dev/null +++ b/src/views/home/ui/footer/footer.module.scss @@ -0,0 +1,2 @@ +.Footer { +} \ No newline at end of file diff --git a/src/views/home/ui/footer/footer.tsx b/src/views/home/ui/footer/footer.tsx new file mode 100644 index 0000000..d5c1ce4 --- /dev/null +++ b/src/views/home/ui/footer/footer.tsx @@ -0,0 +1,5 @@ +import s from './footer.module.scss'; + +export default function Footer() { + return
Footer
; +} diff --git a/src/views/home/ui/home.module.scss b/src/views/home/ui/home.module.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/views/home/ui/home.tsx b/src/views/home/ui/home.tsx new file mode 100644 index 0000000..8b0497d --- /dev/null +++ b/src/views/home/ui/home.tsx @@ -0,0 +1,19 @@ +import Main from './main/main'; +import Offer from './offer/offer'; +// import Result from './result/result'; +// import License from './license/license'; +// import Contacts from './contacts/contacts'; +// import Footer from './footer/footer'; + +export default function HomePage() { + return ( + <> +
+ + {/**/} + {/**/} + {/**/} + {/*