From f4f66ebca42246a1fcd3bee3f2ce5b310dccf0e4 Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 23 Jun 2022 15:51:12 +0300 Subject: [PATCH] project: move Calculation layout to page --- Components/Calculation/index.js | 40 +++------------------------------ pages/index.tsx | 36 ++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/Components/Calculation/index.js b/Components/Calculation/index.js index 58a8731..7d8a103 100644 --- a/Components/Calculation/index.js +++ b/Components/Calculation/index.js @@ -1,37 +1,3 @@ -import styled from 'styled-components'; -import { Box } from 'UIKit/grid'; -import { min } from 'UIKit/mq'; -import Form from './Form'; -import Results from './Results'; -import Settings from './Settings'; - -const Grid = styled(Box)` - display: flex; - flex-direction: column; - gap: 10px; - - ${min('laptop')} { - display: grid; - align-items: flex-start; - grid-template-columns: 2fr 1fr; - } - - ${min('desktop')} { - grid-template-columns: 2fr 1fr 1.5fr; - margin: 8px 5%; - } - - ${min('desktop-xl')} { - margin: 8px 10%; - } -`; - -export default function Calculation() { - return ( - -
- - - - ); -} +export { default as Form } from './Form'; +export { default as Results } from './Results'; +export { default as Settings } from './Settings'; diff --git a/pages/index.tsx b/pages/index.tsx index 81ec930..3b8c906 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,24 +1,50 @@ import initializeApollo from 'apollo/client'; -import Calculation from 'Components/Calculation'; +import * as Calculation from 'Components/Calculation'; import * as insuranceTableConfig from 'config/tables/insurance-table'; import type { GetServerSideProps } from 'next'; import Head from 'next/head'; import { fetchUser } from 'services/user'; +import styled from 'styled-components'; import type { BasePageProps } from 'types/page'; +import { Box } from 'UIKit/grid'; +import { min } from 'UIKit/mq'; -type PageProps = BasePageProps; +const Grid = styled(Box)` + display: flex; + flex-direction: column; + gap: 10px; + + ${min('laptop')} { + display: grid; + align-items: flex-start; + grid-template-columns: 2fr 1fr; + } + + ${min('desktop')} { + grid-template-columns: 2fr 1fr 1.5fr; + margin: 8px 5%; + } + + ${min('desktop-xl')} { + margin: 8px 10%; + } +`; function Home() { return ( - <> + Лизинговый калькулятор - Эволюция - - + + + + ); } +type PageProps = BasePageProps; + export const getServerSideProps: GetServerSideProps = async (ctx) => { const user = await fetchUser({ headers: ctx?.req?.headers?.cookie