From b2fe3c9825ef77b48243bc474316442faf4dc53c Mon Sep 17 00:00:00 2001 From: Valiantsin Date: Sat, 31 Aug 2019 11:33:19 +0300 Subject: [PATCH 1/5] feat: add machine font --- .../src/components/navBar/images/logo.png | Bin 1000 -> 0 bytes .../src/components/navBar/navBar.tsx | 58 +++++-- .../src/components/navBar/styles/route.css | 62 ++++---- .../components/navBar/styles/routeMedia.css | 4 + js_machine_front/src/fonts/machine.ttf | Bin 0 -> 52972 bytes js_machine_front/src/index.css | 7 + .../components/authorizationSignIn.tsx | 48 +++--- .../digestView/components/dateAndView.tsx | 26 ++-- .../digestView/components/leftArrowButton.tsx | 26 ++-- .../scenes/digestView/components/option.tsx | 30 ++-- .../src/scenes/digestView/digestView.tsx | 146 +++++++++--------- .../scenes/digestView/models/dateAndView.ts | 6 +- .../scenes/digestView/models/digestView.ts | 6 +- .../digestView/models/leftArrowButton.ts | 8 +- .../scenes/digestView/services/digestView.ts | 38 ++--- js_machine_front/src/scenes/news/news.tsx | 76 ++++----- 16 files changed, 298 insertions(+), 243 deletions(-) delete mode 100644 js_machine_front/src/components/navBar/images/logo.png create mode 100644 js_machine_front/src/fonts/machine.ttf diff --git a/js_machine_front/src/components/navBar/images/logo.png b/js_machine_front/src/components/navBar/images/logo.png deleted file mode 100644 index 8af9f4d03d3b8b19117bc823378cebc938ec2797..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1000 zcmeAS@N?(olHy`uVBq!ia0vp^yMS1MgAGV7{hV|KNU@|l`Z_W&Z0zU$lgJ9>a~60+ z7BevL9ROj*tZSW|KtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`ILp`&d> zbf3P~sxy182K4gx_xER3Rj1BaRvz4zS!Ir3+<1A~_3Am3zq+SBOfcB){A=?LuJS&Q zd7@X(tk`xu@bA==FMmIjrhklWS$|Pm@@((a>W3?GT8rhy-92^V8?D`Y*2sOUxN*hD zw>04DoFefo`S|7GMzgFpe?Js>lk2&iUf-msybaY{qFL*XPifY-I-~Ki4edcz)x)5S-lwEVZ#g1YZA$jRSyQtkO`O>E@xf*{rWzny|@}S$d zCm%oea;KP9^us&Hj|LW9J)6XC_wMb)6>Gi$Q6zfZqTYoG4F=sz)kc4z$Te>DBk&i?MjE?+kbUEQv-^-ez z-+9pPU)-MXukr_XY!6>lwYhCpscf3H-G_-$`>Jk$-CA>mV|Vz`|K0N4-&im2>$xR< zPWM@q2uXl`mv3tw oHrYGd$mjBIP5g}M{rvkG{$=b5vuHZP4$PGdp00i_>zopr0JyN_cK`qY diff --git a/js_machine_front/src/components/navBar/navBar.tsx b/js_machine_front/src/components/navBar/navBar.tsx index 9e26734..cd9e265 100644 --- a/js_machine_front/src/components/navBar/navBar.tsx +++ b/js_machine_front/src/components/navBar/navBar.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import LogoSrc from './images/logo.png'; import './styles/route.css'; import './styles/routeMedia.css'; import { NavLink } from 'react-router-dom'; @@ -16,32 +15,71 @@ export class NavBar extends React.PureComponent { return (
- - logo + + JS MACHINE
- +
- + - + - + - + - + - +
diff --git a/js_machine_front/src/components/navBar/styles/route.css b/js_machine_front/src/components/navBar/styles/route.css index 61e52ed..04caeb3 100644 --- a/js_machine_front/src/components/navBar/styles/route.css +++ b/js_machine_front/src/components/navBar/styles/route.css @@ -1,44 +1,50 @@ .logo-box { - position: absolute; - top: 60px; - left: 60px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - margin: 0; + position: absolute; + top: 60px; + left: 60px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin: 0; } .logo-box__link { - height: 28px; - position: absolute; - background-repeat: no-repeat; - background-size: cover; - background-position: center; + height: 28px; + position: absolute; + background-repeat: no-repeat; + background-size: cover; + background-position: center; } .menu { - position: absolute; - right: 60px; - top: 60px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - width: fit-content; + position: absolute; + right: 60px; + top: 60px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + width: fit-content; } .menu__nav-link { - margin-left: 60px; - font-family: 'Exo', sans-serif; - font-size: 16px; - color: white; - text-decoration: none; - font-weight: bold; + margin-left: 60px; + font-family: 'Exo', sans-serif; + font-size: 16px; + color: white; + text-decoration: none; + font-weight: bold; +} + +.menu__nav-link--logo { + font-family: 'Machine', sans-serif; + font-size: 20px; + letter-spacing: 1px; } .active-link { - color: #F2E14C; + color: #f2e14c; } #menu__toggle { - display: none; -} \ No newline at end of file + display: none; +} diff --git a/js_machine_front/src/components/navBar/styles/routeMedia.css b/js_machine_front/src/components/navBar/styles/routeMedia.css index f91c76f..083af25 100644 --- a/js_machine_front/src/components/navBar/styles/routeMedia.css +++ b/js_machine_front/src/components/navBar/styles/routeMedia.css @@ -83,4 +83,8 @@ text-decoration: none; transition-duration: .25s; } + .menu__nav-link--logo { + color: white; + font-family: 'Machine', sans-serif; + } } \ No newline at end of file diff --git a/js_machine_front/src/fonts/machine.ttf b/js_machine_front/src/fonts/machine.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f94c02aa14528e87bff4af8d2462fae83eed26f3 GIT binary patch literal 52972 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 S)AN^Per@mFBf7q)FZ>^>m1UCv literal 0 HcmV?d00001 diff --git a/js_machine_front/src/index.css b/js_machine_front/src/index.css index 03fd976..8c3e802 100644 --- a/js_machine_front/src/index.css +++ b/js_machine_front/src/index.css @@ -69,4 +69,11 @@ code { src: url('fonts/Exo2-LightItalic.ttf') format('truetype'); font-weight: lighter; font-style: italic; +} + +@font-face{ + font-family: 'Machine'; + src: url('fonts/machine.ttf') format('truetype'); + font-weight: normal; + font-style: normal; } \ No newline at end of file diff --git a/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx b/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx index 6aeda8a..c3febe1 100644 --- a/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx +++ b/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx @@ -1,24 +1,24 @@ -import React from 'react'; -import { SocialAuth } from './socialAuth'; -import { SignInFrom } from './signInFrom'; -import { FormattedMessage } from 'react-intl'; - -import '../styles/authorizationSignIn.css'; -import '../styles/authorizationSignInMedia.css'; - -import { SignInProps } from 'scenes/authorization/models/authorizationSignIn'; - -export const AuthorizationSignIn: React.FC = (props: SignInProps) => { - const resetSignInWidth = props.isAuthorizitationVisible ? '' : 'reset_sign-in-width'; - return ( -
-
-
- -
- - -
-
- ); -}; +import React from 'react'; +import { SocialAuth } from './socialAuth'; +import { SignInFrom } from './signInFrom'; +import { FormattedMessage } from 'react-intl'; + +import '../styles/authorizationSignIn.css'; +import '../styles/authorizationSignInMedia.css'; + +import { SignInProps } from 'scenes/authorization/models/authorizationSignIn'; + +export const AuthorizationSignIn: React.FC = (props: SignInProps) => { + const resetSignInWidth = props.isAuthorizitationVisible ? '' : 'reset_sign-in-width'; + return ( +
+
+
+ +
+ + +
+
+ ); +}; diff --git a/js_machine_front/src/scenes/digestView/components/dateAndView.tsx b/js_machine_front/src/scenes/digestView/components/dateAndView.tsx index a40ca3e..e5343d5 100644 --- a/js_machine_front/src/scenes/digestView/components/dateAndView.tsx +++ b/js_machine_front/src/scenes/digestView/components/dateAndView.tsx @@ -1,13 +1,13 @@ -import React, { memo } from 'react'; -import Eye from '../images/eye.svg'; -import '../styles/dateAndView.css'; -import { DateAndViewProps } from '../models/dateAndView'; - -export const DateAndView: React.FC = memo((props: DateAndViewProps) => { - return ( -
- 5 АВГ - Eye {props.views} -
- ); -}); +import React, { memo } from 'react'; +import Eye from '../images/eye.svg'; +import '../styles/dateAndView.css'; +import { DateAndViewProps } from '../models/dateAndView'; + +export const DateAndView: React.FC = memo((props: DateAndViewProps) => { + return ( +
+ 5 АВГ + Eye {props.views} +
+ ); +}); diff --git a/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx b/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx index c67ea59..16b4e89 100644 --- a/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx +++ b/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx @@ -1,13 +1,13 @@ -import React, { memo } from 'react'; -import '../styles/leftArrowButton.css'; -import arrow from '../images/left.svg'; -import { LeftArrowButtonProps } from '../models/leftArrowButton'; - -export const LeftArrowButton: React.FC = memo((props: LeftArrowButtonProps) => { - return ( - - left-arrow - {props.text} - - ); -}); +import React, { memo } from 'react'; +import '../styles/leftArrowButton.css'; +import arrow from '../images/left.svg'; +import { LeftArrowButtonProps } from '../models/leftArrowButton'; + +export const LeftArrowButton: React.FC = memo((props: LeftArrowButtonProps) => { + return ( + + left-arrow + {props.text} + + ); +}); diff --git a/js_machine_front/src/scenes/digestView/components/option.tsx b/js_machine_front/src/scenes/digestView/components/option.tsx index 05687fe..8df02d6 100644 --- a/js_machine_front/src/scenes/digestView/components/option.tsx +++ b/js_machine_front/src/scenes/digestView/components/option.tsx @@ -1,15 +1,15 @@ -import React, { memo } from 'react'; -import '../styles/option.css'; -import star from '../images/star.svg'; -import share from '../images/share-option.svg'; -import warning from '../images/warning.svg'; - -export const Option: React.FC = memo(() => { - return ( -
- share - start - warning -
- ); -}); +import React, { memo } from 'react'; +import '../styles/option.css'; +import star from '../images/star.svg'; +import share from '../images/share-option.svg'; +import warning from '../images/warning.svg'; + +export const Option: React.FC = memo(() => { + return ( +
+ share + start + warning +
+ ); +}); diff --git a/js_machine_front/src/scenes/digestView/digestView.tsx b/js_machine_front/src/scenes/digestView/digestView.tsx index 98879f6..e012b5a 100644 --- a/js_machine_front/src/scenes/digestView/digestView.tsx +++ b/js_machine_front/src/scenes/digestView/digestView.tsx @@ -1,73 +1,73 @@ -import React, { memo } from 'react'; -import CSSTransition from 'react-transition-group/CSSTransition'; -import './styles/digestView.css'; - -import { LeftArrowButton } from './components/leftArrowButton'; -import { DateAndView } from './components/dateAndView'; -import { Option } from './components/option'; -import { data } from './services/digestView'; -import { DigestViewProps } from './models/digestView'; - -export const DigestView: React.FC = memo((props: DigestViewProps) => { - - const benefits = data.benefits.map((el, idx) => { - return
  • {el}
    • ; - }); - - const news = ( - -

    #Новости

    -

    {data.news.title}

    -

    {data.news.body} тут.

    -     - ); - - const event = ( - -

    #События

    -

    {data.event.title}

    -

    {data.event.body}

    -     - ); - - const greating = ( - -

    Всем доброе утро!

    -

    Прошлое неделя подарила нам интересные статьи, обновления библиотек (куда - без них), браузеров в всяких платформ.

    -

    Ну что же, берем в руку кружку, да-да, берем. Вязли? Отлично, потому что - начинаем!

    -     - ); - - return ( - -
    -
    - -
    -
    -     - ); -}); +import React, { memo } from 'react'; +import CSSTransition from 'react-transition-group/CSSTransition'; +import './styles/digestView.css'; + +import { LeftArrowButton } from './components/leftArrowButton'; +import { DateAndView } from './components/dateAndView'; +import { Option } from './components/option'; +import { data } from './services/digestView'; +import { DigestViewProps } from './models/digestView'; + +export const DigestView: React.FC = memo((props: DigestViewProps) => { + + const benefits = data.benefits.map((el, idx) => { + return
  • {el}
    • ; + }); + + const news = ( + +

    #Новости

    +

    {data.news.title}

    +

    {data.news.body} тут.

    +     + ); + + const event = ( + +

    #События

    +

    {data.event.title}

    +

    {data.event.body}

    +     + ); + + const greating = ( + +

    Всем доброе утро!

    +

    Прошлое неделя подарила нам интересные статьи, обновления библиотек (куда + без них), браузеров в всяких платформ.

    +

    Ну что же, берем в руку кружку, да-да, берем. Вязли? Отлично, потому что + начинаем!

    +     + ); + + return ( + +
    +
    + +
    +
    +     + ); +}); diff --git a/js_machine_front/src/scenes/digestView/models/dateAndView.ts b/js_machine_front/src/scenes/digestView/models/dateAndView.ts index 7bba0de..511600b 100644 --- a/js_machine_front/src/scenes/digestView/models/dateAndView.ts +++ b/js_machine_front/src/scenes/digestView/models/dateAndView.ts @@ -1,3 +1,3 @@ -export interface DateAndViewProps { - views: number; -} +export interface DateAndViewProps { + views: number; +} diff --git a/js_machine_front/src/scenes/digestView/models/digestView.ts b/js_machine_front/src/scenes/digestView/models/digestView.ts index 76b378e..4c3470f 100644 --- a/js_machine_front/src/scenes/digestView/models/digestView.ts +++ b/js_machine_front/src/scenes/digestView/models/digestView.ts @@ -1,3 +1,3 @@ -export interface DigestViewProps { - history: any; -} +export interface DigestViewProps { + history: any; +} diff --git a/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts b/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts index 0296bfe..d5ed544 100644 --- a/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts +++ b/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts @@ -1,4 +1,4 @@ -export interface LeftArrowButtonProps { - closeDigest: (event: React.MouseEvent) => void; - text: string; - } +export interface LeftArrowButtonProps { + closeDigest: (event: React.MouseEvent) => void; + text: string; + } diff --git a/js_machine_front/src/scenes/digestView/services/digestView.ts b/js_machine_front/src/scenes/digestView/services/digestView.ts index 24952b0..7f2bb6c 100644 --- a/js_machine_front/src/scenes/digestView/services/digestView.ts +++ b/js_machine_front/src/scenes/digestView/services/digestView.ts @@ -1,19 +1,19 @@ -export const data = { - view: 25, - news: { - title: 'В Firebox будет проведен эксперимент, связанный с DNS-over-HTTP', - body: 'Безопасность и удобство в перспективе. Что же из этого получится - не известно. Апока что читаем', - link: 'localhost:3000', - }, - event : { - title: 'The Rolling Scopes Conference (9-11 августа)', - body: 'Одна из крупнейших конференций, котарая пройдет в Минске уже в 5 раз и ужетак скоро на этих выходных!', - }, - benefits: [ - '3 дня по 3 потока', - 'Более 1000 участников', - '50+ спикеров из 13 стран 1000 участников', - 'Воркшопы и панельныные экскурсии', - ], - back: 'назад', -}; +export const data = { + view: 25, + news: { + title: 'В Firebox будет проведен эксперимент, связанный с DNS-over-HTTP', + body: 'Безопасность и удобство в перспективе. Что же из этого получится - не известно. Апока что читаем', + link: 'localhost:3000', + }, + event : { + title: 'The Rolling Scopes Conference (9-11 августа)', + body: 'Одна из крупнейших конференций, котарая пройдет в Минске уже в 5 раз и ужетак скоро на этих выходных!', + }, + benefits: [ + '3 дня по 3 потока', + 'Более 1000 участников', + '50+ спикеров из 13 стран 1000 участников', + 'Воркшопы и панельныные экскурсии', + ], + back: 'назад', +}; diff --git a/js_machine_front/src/scenes/news/news.tsx b/js_machine_front/src/scenes/news/news.tsx index 6975703..bdc50a7 100644 --- a/js_machine_front/src/scenes/news/news.tsx +++ b/js_machine_front/src/scenes/news/news.tsx @@ -1,38 +1,38 @@ -import React from 'react'; -import Background from './images/news.jpg'; -import { FormattedMessage } from 'react-intl'; -import './styles/news.css'; - -import { EventsContainer } from './components/newsContainer'; -import { NewsModel } from './models/news'; -import { getNewsData } from './services/mocksNewsData'; - -const sectionStyle = { - height: '100vh', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -export class News extends React.PureComponent<{}, NewsModel> { - public state: NewsModel = { newsData: [] }; - - public componentDidMount = async () => { - const response = await getNewsData(); - this.setState(() => ({ newsData: response })); - } - - public render(): JSX.Element { - return ( -
    -
    -
    - -
    - -
    -
    - ); - } -} +import React from 'react'; +import Background from './images/news.jpg'; +import { FormattedMessage } from 'react-intl'; +import './styles/news.css'; + +import { EventsContainer } from './components/newsContainer'; +import { NewsModel } from './models/news'; +import { getNewsData } from './services/mocksNewsData'; + +const sectionStyle = { + height: '100vh', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +export class News extends React.PureComponent<{}, NewsModel> { + public state: NewsModel = { newsData: [] }; + + public componentDidMount = async () => { + const response = await getNewsData(); + this.setState(() => ({ newsData: response })); + } + + public render(): JSX.Element { + return ( +
    +
    +
    + +
    + +
    +
    + ); + } +} From 27c70c8ede2b14e7bea81df8e137268f03ed64a2 Mon Sep 17 00:00:00 2001 From: Valiantsin Date: Sat, 31 Aug 2019 12:00:03 +0300 Subject: [PATCH 2/5] build: check commit verification --- .../src/components/navBar/tests/navBar.test.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js_machine_front/src/components/navBar/tests/navBar.test.tsx b/js_machine_front/src/components/navBar/tests/navBar.test.tsx index b39cce2..8615f03 100644 --- a/js_machine_front/src/components/navBar/tests/navBar.test.tsx +++ b/js_machine_front/src/components/navBar/tests/navBar.test.tsx @@ -4,11 +4,11 @@ import { shallow } from 'enzyme'; import { NavLink } from 'react-router-dom'; describe('NavBar component is ready', () => { - it('navLink components is ready', () => { - const component = shallow(); + it('navLink components is ready', () => { + const component = shallow(); - const tileContent = component.find(NavLink); + const tileContent = component.find(NavLink); - expect(tileContent).toHaveLength(7); - }); + expect(tileContent).toHaveLength(7); + }); }); From 26467a9130b7d08c9a1d65e36565fbcb684c5703 Mon Sep 17 00:00:00 2001 From: Valiantsin Date: Sun, 1 Sep 2019 10:22:30 +0300 Subject: [PATCH 3/5] style: update end of line --- js_machine_front/src/components/app/app.tsx | 98 +++--- .../navBar/error-boundary/error-boundary.tsx | 48 +-- .../components/navBar/error-boundary/index.ts | 2 +- .../error-indicator/error-indicator.tsx | 68 ++--- .../navBar/error-indicator/index.ts | 2 +- .../components/navBar/models/errorBoundary.ts | 6 +- .../src/components/navBar/models/navBar.ts | 6 +- .../src/components/navBar/navBar.tsx | 178 +++++------ .../components/navBar/tests/navBar.test.tsx | 28 +- js_machine_front/src/i18n/messages.ts | 14 +- .../translations/en-US/error-indicator.ts | 10 +- .../src/i18n/translations/en-US/index.ts | 16 +- .../src/i18n/translations/en-US/pages.ts | 16 +- .../src/i18n/translations/en-US/sign-in.ts | 16 +- .../src/i18n/translations/en-US/sign-up.ts | 16 +- .../translations/ru-RU/error-indicator.ts | 10 +- .../src/i18n/translations/ru-RU/index.ts | 16 +- .../src/i18n/translations/ru-RU/pages.ts | 16 +- .../src/i18n/translations/ru-RU/sign-in.ts | 16 +- .../src/i18n/translations/ru-RU/sign-up.ts | 16 +- js_machine_front/src/index.tsx | 36 +-- js_machine_front/src/scenes/about/about.tsx | 96 +++--- .../scenes/about/components/tileContent.tsx | 48 +-- .../scenes/about/components/tileElement.tsx | 28 +- .../src/scenes/about/models/tile.ts | 10 +- .../src/scenes/about/models/tileContent.ts | 10 +- .../src/scenes/about/models/tileElement.ts | 8 +- .../src/scenes/about/tests/about.test.tsx | 28 +- .../scenes/about/tests/tileContent.test.tsx | 60 ++-- .../scenes/authorization/authorization.tsx | 66 ++-- .../components/authorizationBar.tsx | 46 +-- .../components/authorizationHOC.tsx | 80 ++--- .../components/authorizationSignIn.tsx | 48 +-- .../components/authorizationSignUp.tsx | 48 +-- .../authorization/components/signInFrom.tsx | 46 +-- .../authorization/components/signUpForm.tsx | 54 ++-- .../authorization/components/socialAuth.tsx | 26 +- .../src/scenes/authorization/index.ts | 8 +- .../authorization/models/authorization.ts | 12 +- .../authorization/models/authorizationBar.ts | 12 +- .../authorization/models/authorizationHOC.ts | 24 +- .../models/authorizationSignIn.ts | 6 +- .../models/authorizationSignUp.ts | 6 +- .../tests/authorization.test.tsx | 98 +++--- .../tests/authorizationSignIn.test.tsx | 54 ++-- .../tests/authorizationSignUp.test.tsx | 54 ++-- .../communityEvents/communityEvents.tsx | 82 ++--- .../components/eventsContent.tsx | 58 ++-- .../scenes/communityEvents/models/events.ts | 20 +- .../digestView/components/dateAndView.tsx | 26 +- .../digestView/components/leftArrowButton.tsx | 26 +- .../scenes/digestView/components/option.tsx | 30 +- .../src/scenes/digestView/digestView.tsx | 146 ++++----- .../scenes/digestView/models/dateAndView.ts | 6 +- .../scenes/digestView/models/digestView.ts | 6 +- .../digestView/models/leftArrowButton.ts | 8 +- .../scenes/digestView/services/digestView.ts | 38 +-- .../scenes/main/components/RecentEvents.tsx | 56 ++-- .../scenes/main/components/SocialLinks.tsx | 48 +-- js_machine_front/src/scenes/main/index.ts | 4 +- js_machine_front/src/scenes/main/main.tsx | 104 +++---- .../src/scenes/main/models/recentEvents.ts | 20 +- .../src/scenes/main/tests/main.test.tsx | 46 +-- .../scenes/news/components/newsContainer.tsx | 30 +- .../news/components/newsPresentation.tsx | 52 ++-- .../src/scenes/news/models/news.ts | 20 +- js_machine_front/src/scenes/news/news.tsx | 76 ++--- .../partnersLogo/components/partnersLogo.tsx | 26 +- .../src/scenes/partnersLogo/partners.tsx | 56 ++-- .../partnersLogo/tests/partners.test.tsx | 32 +- .../partnersLogo/tests/partnersLogo.test.tsx | 26 +- js_machine_front/src/serviceWorker.ts | 22 +- js_machine_front/tslint.json | 284 +++++++++--------- 73 files changed, 1479 insertions(+), 1479 deletions(-) diff --git a/js_machine_front/src/components/app/app.tsx b/js_machine_front/src/components/app/app.tsx index 4135588..4d0a43b 100644 --- a/js_machine_front/src/components/app/app.tsx +++ b/js_machine_front/src/components/app/app.tsx @@ -1,49 +1,49 @@ -import React from 'react'; -import './styles/app.css'; -import { NavBar } from 'components/navBar/navBar'; -import { Partners } from 'scenes/partnersLogo/partners'; -import { Events } from 'scenes/communityEvents/communityEvents'; -import { News } from 'scenes/news/news'; -import { About } from 'scenes/about/about'; -import { Main } from 'scenes/main/main'; -import { DigestView } from 'scenes/digestView/digestView'; -import { ErrorBoundary } from 'components/navBar/error-boundary/error-boundary'; -import { Authorization } from 'scenes/authorization/authorization'; -import { Route, Redirect, Switch } from 'react-router'; - -// Internationalization -import { messages } from 'i18n/messages'; -import en from 'react-intl/locale-data/en'; -import ru from 'react-intl/locale-data/ru'; -import { addLocaleData, IntlProvider } from 'react-intl'; - -addLocaleData([...en, ...ru]); - -const locale = - (navigator.languages && navigator.languages[0]) || - navigator.language || - 'en-US'; - -const App: React.FC = () => { - return ( - -
    - - - - - - - - - - - - - -
    -     - ); -}; - -export default App; +import React from 'react'; +import './styles/app.css'; +import { NavBar } from 'components/navBar/navBar'; +import { Partners } from 'scenes/partnersLogo/partners'; +import { Events } from 'scenes/communityEvents/communityEvents'; +import { News } from 'scenes/news/news'; +import { About } from 'scenes/about/about'; +import { Main } from 'scenes/main/main'; +import { DigestView } from 'scenes/digestView/digestView'; +import { ErrorBoundary } from 'components/navBar/error-boundary/error-boundary'; +import { Authorization } from 'scenes/authorization/authorization'; +import { Route, Redirect, Switch } from 'react-router'; + +// Internationalization +import { messages } from 'i18n/messages'; +import en from 'react-intl/locale-data/en'; +import ru from 'react-intl/locale-data/ru'; +import { addLocaleData, IntlProvider } from 'react-intl'; + +addLocaleData([...en, ...ru]); + +const locale = + (navigator.languages && navigator.languages[0]) || + navigator.language || + 'en-US'; + +const App: React.FC = () => { + return ( + +
    + + + + + + + + + + + + + +
    +     + ); +}; + +export default App; diff --git a/js_machine_front/src/components/navBar/error-boundary/error-boundary.tsx b/js_machine_front/src/components/navBar/error-boundary/error-boundary.tsx index 31d06dd..28e00ec 100644 --- a/js_machine_front/src/components/navBar/error-boundary/error-boundary.tsx +++ b/js_machine_front/src/components/navBar/error-boundary/error-boundary.tsx @@ -1,24 +1,24 @@ -import * as React from 'react'; - -import { ErrorIndicator } from '../error-indicator'; - -import { ErrorBoundaryState } from 'components/navBar/models/errorBoundary'; - -export class ErrorBoundary extends React.Component<{}, ErrorBoundaryState> { - state: ErrorBoundaryState = { - hasError: false, - }; - - componentDidCatch(): void { - this.setState({ - hasError: true, - }); - } - - render(): React.ReactNode | React.FC { - if (this.state.hasError) { - return ; - } - return this.props.children; - } -} +import * as React from 'react'; + +import { ErrorIndicator } from '../error-indicator'; + +import { ErrorBoundaryState } from 'components/navBar/models/errorBoundary'; + +export class ErrorBoundary extends React.Component<{}, ErrorBoundaryState> { + state: ErrorBoundaryState = { + hasError: false, + }; + + componentDidCatch(): void { + this.setState({ + hasError: true, + }); + } + + render(): React.ReactNode | React.FC { + if (this.state.hasError) { + return ; + } + return this.props.children; + } +} diff --git a/js_machine_front/src/components/navBar/error-boundary/index.ts b/js_machine_front/src/components/navBar/error-boundary/index.ts index 44d179a..39d945d 100644 --- a/js_machine_front/src/components/navBar/error-boundary/index.ts +++ b/js_machine_front/src/components/navBar/error-boundary/index.ts @@ -1 +1 @@ -export * from './error-boundary'; +export * from './error-boundary'; diff --git a/js_machine_front/src/components/navBar/error-indicator/error-indicator.tsx b/js_machine_front/src/components/navBar/error-indicator/error-indicator.tsx index 26e3d2c..9c18ff6 100644 --- a/js_machine_front/src/components/navBar/error-indicator/error-indicator.tsx +++ b/js_machine_front/src/components/navBar/error-indicator/error-indicator.tsx @@ -1,34 +1,34 @@ -import React, { memo } from 'react'; - -import './error-indicator.css'; -import icon from './error-indicator.svg'; - -import { FormattedMessage } from 'react-intl'; - -const sectionStyle = { - height: '100%', - backgroundImage: `url(${icon})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -const ErrorIndicator: React.FC = memo(() => { - return ( -
    -
    - - - - - - - - () - -
    -
    - ); -}); - -export { ErrorIndicator }; +import React, { memo } from 'react'; + +import './error-indicator.css'; +import icon from './error-indicator.svg'; + +import { FormattedMessage } from 'react-intl'; + +const sectionStyle = { + height: '100%', + backgroundImage: `url(${icon})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +const ErrorIndicator: React.FC = memo(() => { + return ( +
    +
    + + + + + + + + () + +
    +
    + ); +}); + +export { ErrorIndicator }; diff --git a/js_machine_front/src/components/navBar/error-indicator/index.ts b/js_machine_front/src/components/navBar/error-indicator/index.ts index bc0fba6..5203184 100644 --- a/js_machine_front/src/components/navBar/error-indicator/index.ts +++ b/js_machine_front/src/components/navBar/error-indicator/index.ts @@ -1 +1 @@ -export * from './error-indicator'; +export * from './error-indicator'; diff --git a/js_machine_front/src/components/navBar/models/errorBoundary.ts b/js_machine_front/src/components/navBar/models/errorBoundary.ts index 12d01a6..c448862 100644 --- a/js_machine_front/src/components/navBar/models/errorBoundary.ts +++ b/js_machine_front/src/components/navBar/models/errorBoundary.ts @@ -1,3 +1,3 @@ -export interface ErrorBoundaryState { - hasError: boolean; - } +export interface ErrorBoundaryState { + hasError: boolean; + } diff --git a/js_machine_front/src/components/navBar/models/navBar.ts b/js_machine_front/src/components/navBar/models/navBar.ts index b32f753..d26dd7a 100644 --- a/js_machine_front/src/components/navBar/models/navBar.ts +++ b/js_machine_front/src/components/navBar/models/navBar.ts @@ -1,3 +1,3 @@ -export interface NavBarState { - isMenuOpened: boolean; -} +export interface NavBarState { + isMenuOpened: boolean; +} diff --git a/js_machine_front/src/components/navBar/navBar.tsx b/js_machine_front/src/components/navBar/navBar.tsx index cd9e265..2464c1b 100644 --- a/js_machine_front/src/components/navBar/navBar.tsx +++ b/js_machine_front/src/components/navBar/navBar.tsx @@ -1,89 +1,89 @@ -import React from 'react'; -import './styles/route.css'; -import './styles/routeMedia.css'; -import { NavLink } from 'react-router-dom'; -import { FormattedMessage } from 'react-intl'; -import { NavBarState } from './models/navBar'; - -export class NavBar extends React.PureComponent { - public state: NavBarState = { isMenuOpened: false }; - - handleMenu = () => { - this.setState({ isMenuOpened: !this.state.isMenuOpened }); - } - render(): JSX.Element { - return ( -
    -
    - - JS MACHINE - -
    - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    - ); - } -} +import React from 'react'; +import './styles/route.css'; +import './styles/routeMedia.css'; +import { NavLink } from 'react-router-dom'; +import { FormattedMessage } from 'react-intl'; +import { NavBarState } from './models/navBar'; + +export class NavBar extends React.PureComponent { + public state: NavBarState = { isMenuOpened: false }; + + handleMenu = () => { + this.setState({ isMenuOpened: !this.state.isMenuOpened }); + } + render(): JSX.Element { + return ( +
    +
    + + JS MACHINE + +
    + + + +
    + + + + + + + + + + + + + + + + + + +
    +
    + ); + } +} diff --git a/js_machine_front/src/components/navBar/tests/navBar.test.tsx b/js_machine_front/src/components/navBar/tests/navBar.test.tsx index 8615f03..cd7b159 100644 --- a/js_machine_front/src/components/navBar/tests/navBar.test.tsx +++ b/js_machine_front/src/components/navBar/tests/navBar.test.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import { NavBar } from '../navBar'; -import { shallow } from 'enzyme'; -import { NavLink } from 'react-router-dom'; - -describe('NavBar component is ready', () => { - it('navLink components is ready', () => { - const component = shallow(); - - const tileContent = component.find(NavLink); - - expect(tileContent).toHaveLength(7); - }); -}); +import React from 'react'; +import { NavBar } from '../navBar'; +import { shallow } from 'enzyme'; +import { NavLink } from 'react-router-dom'; + +describe('NavBar component is ready', () => { + it('navLink components is ready', () => { + const component = shallow(); + + const tileContent = component.find(NavLink); + + expect(tileContent).toHaveLength(7); + }); +}); diff --git a/js_machine_front/src/i18n/messages.ts b/js_machine_front/src/i18n/messages.ts index 70c81b7..462f369 100644 --- a/js_machine_front/src/i18n/messages.ts +++ b/js_machine_front/src/i18n/messages.ts @@ -1,7 +1,7 @@ -import { en_US } from './translations/en-US'; -import { ru_RU } from './translations/ru-RU'; - -export const messages: {[index: string]: object} = { - 'en-US': en_US , - 'ru-RU': ru_RU, -}; +import { en_US } from './translations/en-US'; +import { ru_RU } from './translations/ru-RU'; + +export const messages: {[index: string]: object} = { + 'en-US': en_US , + 'ru-RU': ru_RU, +}; diff --git a/js_machine_front/src/i18n/translations/en-US/error-indicator.ts b/js_machine_front/src/i18n/translations/en-US/error-indicator.ts index 16a4efb..fc7486c 100644 --- a/js_machine_front/src/i18n/translations/en-US/error-indicator.ts +++ b/js_machine_front/src/i18n/translations/en-US/error-indicator.ts @@ -1,5 +1,5 @@ -export const errorIndicator = { -'errorIndicator.title': 'OOPS!', -'errorIndicator.subTitle': 'Something went wrong', -'errorIndicator.subTitle1': 'but we have already sent a guy from support to fix it', -}; +export const errorIndicator = { +'errorIndicator.title': 'OOPS!', +'errorIndicator.subTitle': 'Something went wrong', +'errorIndicator.subTitle1': 'but we have already sent a guy from support to fix it', +}; diff --git a/js_machine_front/src/i18n/translations/en-US/index.ts b/js_machine_front/src/i18n/translations/en-US/index.ts index 773fef5..d70ca1f 100644 --- a/js_machine_front/src/i18n/translations/en-US/index.ts +++ b/js_machine_front/src/i18n/translations/en-US/index.ts @@ -1,8 +1,8 @@ -import { errorIndicator } from './error-indicator'; -import { pages } from './pages'; -import { signIn } from './sign-in'; -import { signUp } from './sign-up'; - -export const en_US = { - ...errorIndicator, ...pages, ...signIn, ...signUp, -}; +import { errorIndicator } from './error-indicator'; +import { pages } from './pages'; +import { signIn } from './sign-in'; +import { signUp } from './sign-up'; + +export const en_US = { + ...errorIndicator, ...pages, ...signIn, ...signUp, +}; diff --git a/js_machine_front/src/i18n/translations/en-US/pages.ts b/js_machine_front/src/i18n/translations/en-US/pages.ts index 6fce2d8..726ffc9 100644 --- a/js_machine_front/src/i18n/translations/en-US/pages.ts +++ b/js_machine_front/src/i18n/translations/en-US/pages.ts @@ -1,8 +1,8 @@ -export const pages = { - 'page.about': 'ABOUT US', - 'page.news': 'NEWS', - 'page.events': 'EVENTS', - 'page.partners': 'PARTNERS', - 'page.signIn': 'SIGN IN', - 'page.digestview': 'DIGEST VIEW', -}; +export const pages = { + 'page.about': 'ABOUT US', + 'page.news': 'NEWS', + 'page.events': 'EVENTS', + 'page.partners': 'PARTNERS', + 'page.signIn': 'SIGN IN', + 'page.digestview': 'DIGEST VIEW', +}; diff --git a/js_machine_front/src/i18n/translations/en-US/sign-in.ts b/js_machine_front/src/i18n/translations/en-US/sign-in.ts index ef266b9..9b76702 100644 --- a/js_machine_front/src/i18n/translations/en-US/sign-in.ts +++ b/js_machine_front/src/i18n/translations/en-US/sign-in.ts @@ -1,8 +1,8 @@ -export const signIn = { - 'authorization.signIn': 'SIGN IN', - 'authorization.signUp': 'SIGN UP', - 'authorization.signInFormTitle': 'or use your E-mail for registration:', - 'authorization.signInFormEmail': 'E-mail', - 'authorization.signInFormPassword': 'Password', - 'authorization.signInFormSubmit': 'SUBMIT', -}; +export const signIn = { + 'authorization.signIn': 'SIGN IN', + 'authorization.signUp': 'SIGN UP', + 'authorization.signInFormTitle': 'or use your E-mail for registration:', + 'authorization.signInFormEmail': 'E-mail', + 'authorization.signInFormPassword': 'Password', + 'authorization.signInFormSubmit': 'SUBMIT', +}; diff --git a/js_machine_front/src/i18n/translations/en-US/sign-up.ts b/js_machine_front/src/i18n/translations/en-US/sign-up.ts index 9d9809a..ea0a239 100644 --- a/js_machine_front/src/i18n/translations/en-US/sign-up.ts +++ b/js_machine_front/src/i18n/translations/en-US/sign-up.ts @@ -1,8 +1,8 @@ -export const signUp = { - 'authorization.signUpFormTitle': 'or use your E-mail for registration:', - 'authorization.signUpFormLastName': 'Lastname', - 'authorization.signUpFormEmail': 'E-mail', - 'authorization.signUpFormFirstName': 'Name', - 'authorization.signUpFormPassword': 'Password', - 'authorization.signUpFormSubmit': 'SIGN UP', -}; +export const signUp = { + 'authorization.signUpFormTitle': 'or use your E-mail for registration:', + 'authorization.signUpFormLastName': 'Lastname', + 'authorization.signUpFormEmail': 'E-mail', + 'authorization.signUpFormFirstName': 'Name', + 'authorization.signUpFormPassword': 'Password', + 'authorization.signUpFormSubmit': 'SIGN UP', +}; diff --git a/js_machine_front/src/i18n/translations/ru-RU/error-indicator.ts b/js_machine_front/src/i18n/translations/ru-RU/error-indicator.ts index 992e09a..62f898b 100644 --- a/js_machine_front/src/i18n/translations/ru-RU/error-indicator.ts +++ b/js_machine_front/src/i18n/translations/ru-RU/error-indicator.ts @@ -1,5 +1,5 @@ -export const errorIndicator = { - 'errorIndicator.title': 'УПС!', - 'errorIndicator.subTitle': 'что-то пошло не так', - 'errorIndicator.subTitle1': 'но мы уже отправили парня из поддержки починить это', -}; +export const errorIndicator = { + 'errorIndicator.title': 'УПС!', + 'errorIndicator.subTitle': 'что-то пошло не так', + 'errorIndicator.subTitle1': 'но мы уже отправили парня из поддержки починить это', +}; diff --git a/js_machine_front/src/i18n/translations/ru-RU/index.ts b/js_machine_front/src/i18n/translations/ru-RU/index.ts index 530f228..19fdfb8 100644 --- a/js_machine_front/src/i18n/translations/ru-RU/index.ts +++ b/js_machine_front/src/i18n/translations/ru-RU/index.ts @@ -1,8 +1,8 @@ -import { errorIndicator } from './error-indicator'; -import { pages } from './pages'; -import { signIn } from './sign-in'; -import { signUp } from './sign-up'; - -export const ru_RU = { - ...errorIndicator, ...pages, ...signIn, ...signUp, -}; +import { errorIndicator } from './error-indicator'; +import { pages } from './pages'; +import { signIn } from './sign-in'; +import { signUp } from './sign-up'; + +export const ru_RU = { + ...errorIndicator, ...pages, ...signIn, ...signUp, +}; diff --git a/js_machine_front/src/i18n/translations/ru-RU/pages.ts b/js_machine_front/src/i18n/translations/ru-RU/pages.ts index c8867b3..d145ec7 100644 --- a/js_machine_front/src/i18n/translations/ru-RU/pages.ts +++ b/js_machine_front/src/i18n/translations/ru-RU/pages.ts @@ -1,8 +1,8 @@ -export const pages = { - 'page.about': 'О НАС', - 'page.news': 'НОВОСТИ', - 'page.events': 'СОБЫТИЯ', - 'page.partners': 'ПАРТНЕРЫ', - 'page.signIn': 'ВХОД', - 'page.digestview': 'DIGEST VIEW', -}; +export const pages = { + 'page.about': 'О НАС', + 'page.news': 'НОВОСТИ', + 'page.events': 'СОБЫТИЯ', + 'page.partners': 'ПАРТНЕРЫ', + 'page.signIn': 'ВХОД', + 'page.digestview': 'DIGEST VIEW', +}; diff --git a/js_machine_front/src/i18n/translations/ru-RU/sign-in.ts b/js_machine_front/src/i18n/translations/ru-RU/sign-in.ts index f17449b..9e283e3 100644 --- a/js_machine_front/src/i18n/translations/ru-RU/sign-in.ts +++ b/js_machine_front/src/i18n/translations/ru-RU/sign-in.ts @@ -1,8 +1,8 @@ -export const signIn = { - 'authorization.signIn': 'ЗАРЕГИСТРИРОВАТЬСЯ', - 'authorization.signUp': 'ВОЙТИ', - 'authorization.signInFormTitle': 'или используйте E-mail для регистрации:', - 'authorization.signInFormEmail': 'E-mail', - 'authorization.signInFormPassword': 'Пароль', - 'authorization.signInFormSubmit': 'ВОЙТИ', -}; +export const signIn = { + 'authorization.signIn': 'ЗАРЕГИСТРИРОВАТЬСЯ', + 'authorization.signUp': 'ВОЙТИ', + 'authorization.signInFormTitle': 'или используйте E-mail для регистрации:', + 'authorization.signInFormEmail': 'E-mail', + 'authorization.signInFormPassword': 'Пароль', + 'authorization.signInFormSubmit': 'ВОЙТИ', +}; diff --git a/js_machine_front/src/i18n/translations/ru-RU/sign-up.ts b/js_machine_front/src/i18n/translations/ru-RU/sign-up.ts index 01bb57d..f9485c6 100644 --- a/js_machine_front/src/i18n/translations/ru-RU/sign-up.ts +++ b/js_machine_front/src/i18n/translations/ru-RU/sign-up.ts @@ -1,8 +1,8 @@ -export const signUp = { - 'authorization.signUpFormTitle': 'или используйте E-mail для регистрации:', - 'authorization.signUpFormLastName': 'Фамилия', - 'authorization.signUpFormEmail': 'E-mail', - 'authorization.signUpFormFirstName': 'Имя', - 'authorization.signUpFormPassword': 'Пароль', - 'authorization.signUpFormSubmit': 'ЗАРЕГИСТРИРОВАТЬСЯ', -}; +export const signUp = { + 'authorization.signUpFormTitle': 'или используйте E-mail для регистрации:', + 'authorization.signUpFormLastName': 'Фамилия', + 'authorization.signUpFormEmail': 'E-mail', + 'authorization.signUpFormFirstName': 'Имя', + 'authorization.signUpFormPassword': 'Пароль', + 'authorization.signUpFormSubmit': 'ЗАРЕГИСТРИРОВАТЬСЯ', +}; diff --git a/js_machine_front/src/index.tsx b/js_machine_front/src/index.tsx index 997c6ac..94dbb28 100644 --- a/js_machine_front/src/index.tsx +++ b/js_machine_front/src/index.tsx @@ -1,18 +1,18 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import * as serviceWorker from './serviceWorker'; -import { BrowserRouter as Router } from 'react-router-dom'; -import App from './components/app/app'; - -ReactDOM.render( - - - , - document.getElementById('root'), -); - -// If you want your app to work offline and load faster, you can change -// unregister() to register() below. Note this comes with some pitfalls. -// Learn more about service workers: https://bit.ly/CRA-PWA -serviceWorker.register(); +import React from 'react'; +import ReactDOM from 'react-dom'; +import './index.css'; +import * as serviceWorker from './serviceWorker'; +import { BrowserRouter as Router } from 'react-router-dom'; +import App from './components/app/app'; + +ReactDOM.render( + + + , + document.getElementById('root'), +); + +// If you want your app to work offline and load faster, you can change +// unregister() to register() below. Note this comes with some pitfalls. +// Learn more about service workers: https://bit.ly/CRA-PWA +serviceWorker.register(); diff --git a/js_machine_front/src/scenes/about/about.tsx b/js_machine_front/src/scenes/about/about.tsx index f45c7fe..fd0b82d 100644 --- a/js_machine_front/src/scenes/about/about.tsx +++ b/js_machine_front/src/scenes/about/about.tsx @@ -1,48 +1,48 @@ -import React, { memo } from 'react'; -import Background from './images/about.jpg'; -import './styles/about.css'; -import './styles/aboutMedia.css'; -import { Tile } from './models/tile'; -import { TileContent } from './components/tileContent'; -import { FormattedMessage } from 'react-intl'; - -const sectionStyle = { - height: '100vh', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -export const About: React.FC = memo(() => { - const arrTiles: Tile[] = [ - { - id: 0, - title: 'История', - description: - 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', - }, - { - id: 1, - title: 'Достижения', - description: - 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', - }, - { - id: 2, - title: 'Команда', - description: - 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', - }, - ]; - return ( -
    -
    -
    - -
    - -
    -
    - ); -}); +import React, { memo } from 'react'; +import Background from './images/about.jpg'; +import './styles/about.css'; +import './styles/aboutMedia.css'; +import { Tile } from './models/tile'; +import { TileContent } from './components/tileContent'; +import { FormattedMessage } from 'react-intl'; + +const sectionStyle = { + height: '100vh', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +export const About: React.FC = memo(() => { + const arrTiles: Tile[] = [ + { + id: 0, + title: 'История', + description: + 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', + }, + { + id: 1, + title: 'Достижения', + description: + 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', + }, + { + id: 2, + title: 'Команда', + description: + 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', + }, + ]; + return ( +
    +
    +
    + +
    + +
    +
    + ); +}); diff --git a/js_machine_front/src/scenes/about/components/tileContent.tsx b/js_machine_front/src/scenes/about/components/tileContent.tsx index dac5b22..d2c6d40 100644 --- a/js_machine_front/src/scenes/about/components/tileContent.tsx +++ b/js_machine_front/src/scenes/about/components/tileContent.tsx @@ -1,24 +1,24 @@ -import React from 'react'; -import { TileElement } from './tileElement'; -import { Tile } from 'scenes/about/models/tile'; -import { PropsTileContent } from 'scenes/about/models/tileContent'; -import '../styles/tileContent.css'; -import '../styles/tileContentMedia.css'; - -export const TileContent: React.FC = (props: PropsTileContent) => { - return ( -
    -
    -
    - {props.arrTiles.map((item: Tile) => ( - - ))} -
    -
    -
    - ); -}; +import React from 'react'; +import { TileElement } from './tileElement'; +import { Tile } from 'scenes/about/models/tile'; +import { PropsTileContent } from 'scenes/about/models/tileContent'; +import '../styles/tileContent.css'; +import '../styles/tileContentMedia.css'; + +export const TileContent: React.FC = (props: PropsTileContent) => { + return ( +
    +
    +
    + {props.arrTiles.map((item: Tile) => ( + + ))} +
    +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/about/components/tileElement.tsx b/js_machine_front/src/scenes/about/components/tileElement.tsx index fd232b0..f19d528 100644 --- a/js_machine_front/src/scenes/about/components/tileElement.tsx +++ b/js_machine_front/src/scenes/about/components/tileElement.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import '../styles/tileElement.css'; -import '../styles/tileElementMedia.css'; - -import { PropsTileElement } from 'scenes/about/models/tileElement'; - -export const TileElement: React.FC = (props: PropsTileElement) => { - return ( -
    -
    {props.title}
    -

    {props.description}

    -
    - ); -}; +import React from 'react'; +import '../styles/tileElement.css'; +import '../styles/tileElementMedia.css'; + +import { PropsTileElement } from 'scenes/about/models/tileElement'; + +export const TileElement: React.FC = (props: PropsTileElement) => { + return ( +
    +
    {props.title}
    +

    {props.description}

    +
    + ); +}; diff --git a/js_machine_front/src/scenes/about/models/tile.ts b/js_machine_front/src/scenes/about/models/tile.ts index 6ebe780..1445c49 100644 --- a/js_machine_front/src/scenes/about/models/tile.ts +++ b/js_machine_front/src/scenes/about/models/tile.ts @@ -1,5 +1,5 @@ -export interface Tile { - id: number; - title: string; - description: string; -} +export interface Tile { + id: number; + title: string; + description: string; +} diff --git a/js_machine_front/src/scenes/about/models/tileContent.ts b/js_machine_front/src/scenes/about/models/tileContent.ts index 508701f..4b3f6fe 100644 --- a/js_machine_front/src/scenes/about/models/tileContent.ts +++ b/js_machine_front/src/scenes/about/models/tileContent.ts @@ -1,5 +1,5 @@ -import { Tile } from './tile'; - -export interface PropsTileContent { - arrTiles: Tile[]; -} +import { Tile } from './tile'; + +export interface PropsTileContent { + arrTiles: Tile[]; +} diff --git a/js_machine_front/src/scenes/about/models/tileElement.ts b/js_machine_front/src/scenes/about/models/tileElement.ts index 50fea17..037abc6 100644 --- a/js_machine_front/src/scenes/about/models/tileElement.ts +++ b/js_machine_front/src/scenes/about/models/tileElement.ts @@ -1,4 +1,4 @@ -export interface PropsTileElement { - title: string; - description: string; - } +export interface PropsTileElement { + title: string; + description: string; + } diff --git a/js_machine_front/src/scenes/about/tests/about.test.tsx b/js_machine_front/src/scenes/about/tests/about.test.tsx index 1c560b0..d860910 100644 --- a/js_machine_front/src/scenes/about/tests/about.test.tsx +++ b/js_machine_front/src/scenes/about/tests/about.test.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import { About } from '../about'; -import { shallow } from 'enzyme'; -import { TileContent } from '../components/tileContent'; - -describe('About component is ready', () => { - it('tileContent component is ready', () => { - const component = shallow(); - - const tileContent = component.find(TileContent); - - expect(tileContent).toHaveLength(1); - }); -}); +import React from 'react'; +import { About } from '../about'; +import { shallow } from 'enzyme'; +import { TileContent } from '../components/tileContent'; + +describe('About component is ready', () => { + it('tileContent component is ready', () => { + const component = shallow(); + + const tileContent = component.find(TileContent); + + expect(tileContent).toHaveLength(1); + }); +}); diff --git a/js_machine_front/src/scenes/about/tests/tileContent.test.tsx b/js_machine_front/src/scenes/about/tests/tileContent.test.tsx index d981c8a..00526df 100644 --- a/js_machine_front/src/scenes/about/tests/tileContent.test.tsx +++ b/js_machine_front/src/scenes/about/tests/tileContent.test.tsx @@ -1,30 +1,30 @@ -import React from 'react'; -import { TileContent } from '../components/tileContent'; -import { Tile } from '../models/tile'; -import { shallow } from 'enzyme'; -import { TileElement } from '../components/tileElement'; - -describe('TileContent component is ready', () => { - const props: Tile[] = [ - { - id: 0, - title: 'История', - description: - 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', - }, - { - id: 1, - title: 'Достижения', - description: - 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', - }, - ]; - - it('tileElement component is ready', () => { - const component = shallow(); - - const tileElement = component.find(TileElement); - - expect(tileElement).toHaveLength(2); - }); -}); +import React from 'react'; +import { TileContent } from '../components/tileContent'; +import { Tile } from '../models/tile'; +import { shallow } from 'enzyme'; +import { TileElement } from '../components/tileElement'; + +describe('TileContent component is ready', () => { + const props: Tile[] = [ + { + id: 0, + title: 'История', + description: + 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', + }, + { + id: 1, + title: 'Достижения', + description: + 'Давно выяснено, что при оценке дизайна и композиции читаемый текст мешает сосредоточиться. Lorem Ipsum используют потому, что тот обеспечивает более или менее стандартное заполнение шаблона, а также реальное распределение букв и пробелов в абзацах.', + }, + ]; + + it('tileElement component is ready', () => { + const component = shallow(); + + const tileElement = component.find(TileElement); + + expect(tileElement).toHaveLength(2); + }); +}); diff --git a/js_machine_front/src/scenes/authorization/authorization.tsx b/js_machine_front/src/scenes/authorization/authorization.tsx index 9d98808..5d8318f 100644 --- a/js_machine_front/src/scenes/authorization/authorization.tsx +++ b/js_machine_front/src/scenes/authorization/authorization.tsx @@ -1,33 +1,33 @@ -import React from 'react'; -import Background from './images/authorization.jpg'; -import './styles/authorization.css'; -import './styles/authorizationMedia.css'; - -import { AuthorizationHOC, AuthorizationSignIn, AuthorizationSignUp, AuthorizationBar} from './'; -import { AuthorizationProps } from 'scenes/authorization/models/authorization'; - -const sectionStyle = { - height: '100vh', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -export const AuthorizationComponent: React.FC = (props: AuthorizationProps) => { - const { isAuthorizitationVisible } = props; - - return ( -
    -
    -
    - - - -
    -
    -
    - ); -}; - -export const Authorization = AuthorizationHOC(AuthorizationComponent); +import React from 'react'; +import Background from './images/authorization.jpg'; +import './styles/authorization.css'; +import './styles/authorizationMedia.css'; + +import { AuthorizationHOC, AuthorizationSignIn, AuthorizationSignUp, AuthorizationBar} from './'; +import { AuthorizationProps } from 'scenes/authorization/models/authorization'; + +const sectionStyle = { + height: '100vh', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +export const AuthorizationComponent: React.FC = (props: AuthorizationProps) => { + const { isAuthorizitationVisible } = props; + + return ( +
    +
    +
    + + + +
    +
    +
    + ); +}; + +export const Authorization = AuthorizationHOC(AuthorizationComponent); diff --git a/js_machine_front/src/scenes/authorization/components/authorizationBar.tsx b/js_machine_front/src/scenes/authorization/components/authorizationBar.tsx index f50b4d9..890d5f7 100644 --- a/js_machine_front/src/scenes/authorization/components/authorizationBar.tsx +++ b/js_machine_front/src/scenes/authorization/components/authorizationBar.tsx @@ -1,23 +1,23 @@ -import React from 'react'; -import '../styles/authorizationBar.css'; -import '../styles/authorizationBarMedia.css'; - -import { AuthorizationBarProps } from 'scenes/authorization/models/authorizationBar'; - -export const AuthorizationBar: React.FC = (props: AuthorizationBarProps) => { - const barStyle = props.isAuthorizitationVisible ? 'authorization-bar_sign-in' : 'authorization-bar_sign-up'; - return ( - <> -
    -
    -
    - {props.barTitle} -
    -
    - -
    -
    -
    - - ); -}; +import React from 'react'; +import '../styles/authorizationBar.css'; +import '../styles/authorizationBarMedia.css'; + +import { AuthorizationBarProps } from 'scenes/authorization/models/authorizationBar'; + +export const AuthorizationBar: React.FC = (props: AuthorizationBarProps) => { + const barStyle = props.isAuthorizitationVisible ? 'authorization-bar_sign-in' : 'authorization-bar_sign-up'; + return ( + <> +
    +
    +
    + {props.barTitle} +
    +
    + +
    +
    +
    + + ); +}; diff --git a/js_machine_front/src/scenes/authorization/components/authorizationHOC.tsx b/js_machine_front/src/scenes/authorization/components/authorizationHOC.tsx index 34186d8..98fbeb0 100644 --- a/js_machine_front/src/scenes/authorization/components/authorizationHOC.tsx +++ b/js_machine_front/src/scenes/authorization/components/authorizationHOC.tsx @@ -1,40 +1,40 @@ -import React from 'react'; - -import { getStateForSignIn, getStateForSignUp } from 'scenes/authorization/services/authrizationService'; - -import { AuthorizationHOCProps, AuthorizationHOCState } from 'scenes/authorization/models/authorizationHOC'; - -export const AuthorizationHOC = (AuthComponent: React.FC) => { - return class AuthHOC extends React.PureComponent { - constructor(props: AuthorizationHOCProps) { - super(props); - this.state = { - isAuthorizitationVisible: true, - barTitle: '', - barBtn: '', - }; - } - - private changeLoginOptions = () => { - if (this.state.isAuthorizitationVisible) { - this.setState(() => { - const signUpMocks = getStateForSignUp(); - return {...signUpMocks, isAuthorizitationVisible: false}; - }); - } else { - this.setState(() => { - const signInMocks = getStateForSignIn(); - return {...signInMocks, isAuthorizitationVisible: true}; - }); - } - } - - public componentDidMount = () => { - this.setState(() => getStateForSignIn()); - } - - public render(): JSX.Element { - return ; - } - }; -}; +import React from 'react'; + +import { getStateForSignIn, getStateForSignUp } from 'scenes/authorization/services/authrizationService'; + +import { AuthorizationHOCProps, AuthorizationHOCState } from 'scenes/authorization/models/authorizationHOC'; + +export const AuthorizationHOC = (AuthComponent: React.FC) => { + return class AuthHOC extends React.PureComponent { + constructor(props: AuthorizationHOCProps) { + super(props); + this.state = { + isAuthorizitationVisible: true, + barTitle: '', + barBtn: '', + }; + } + + private changeLoginOptions = () => { + if (this.state.isAuthorizitationVisible) { + this.setState(() => { + const signUpMocks = getStateForSignUp(); + return {...signUpMocks, isAuthorizitationVisible: false}; + }); + } else { + this.setState(() => { + const signInMocks = getStateForSignIn(); + return {...signInMocks, isAuthorizitationVisible: true}; + }); + } + } + + public componentDidMount = () => { + this.setState(() => getStateForSignIn()); + } + + public render(): JSX.Element { + return ; + } + }; +}; diff --git a/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx b/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx index c3febe1..6aeda8a 100644 --- a/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx +++ b/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx @@ -1,24 +1,24 @@ -import React from 'react'; -import { SocialAuth } from './socialAuth'; -import { SignInFrom } from './signInFrom'; -import { FormattedMessage } from 'react-intl'; - -import '../styles/authorizationSignIn.css'; -import '../styles/authorizationSignInMedia.css'; - -import { SignInProps } from 'scenes/authorization/models/authorizationSignIn'; - -export const AuthorizationSignIn: React.FC = (props: SignInProps) => { - const resetSignInWidth = props.isAuthorizitationVisible ? '' : 'reset_sign-in-width'; - return ( -
    -
    -
    - -
    - - -
    -
    - ); -}; +import React from 'react'; +import { SocialAuth } from './socialAuth'; +import { SignInFrom } from './signInFrom'; +import { FormattedMessage } from 'react-intl'; + +import '../styles/authorizationSignIn.css'; +import '../styles/authorizationSignInMedia.css'; + +import { SignInProps } from 'scenes/authorization/models/authorizationSignIn'; + +export const AuthorizationSignIn: React.FC = (props: SignInProps) => { + const resetSignInWidth = props.isAuthorizitationVisible ? '' : 'reset_sign-in-width'; + return ( +
    +
    +
    + +
    + + +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/authorization/components/authorizationSignUp.tsx b/js_machine_front/src/scenes/authorization/components/authorizationSignUp.tsx index 349bf2a..1d24578 100644 --- a/js_machine_front/src/scenes/authorization/components/authorizationSignUp.tsx +++ b/js_machine_front/src/scenes/authorization/components/authorizationSignUp.tsx @@ -1,24 +1,24 @@ -import React from 'react'; -import { SocialAuth } from './socialAuth'; -import { SignUpForm } from './signUpForm'; -import { FormattedMessage } from 'react-intl'; - -import '../styles/authorizationSignUp.css'; -import '../styles/authorizationSignUpMedia.css'; - -import { SignUpProps } from 'scenes/authorization/models/authorizationSignUp'; - -export const AuthorizationSignUp: React.FC = (props: SignUpProps) => { - const resetSignUpWidth = props.isAuthorizitationVisible ? 'reset_sign-up-width' : ''; - return ( -
    -
    -
    - -
    - - -
    -
    - ); -}; +import React from 'react'; +import { SocialAuth } from './socialAuth'; +import { SignUpForm } from './signUpForm'; +import { FormattedMessage } from 'react-intl'; + +import '../styles/authorizationSignUp.css'; +import '../styles/authorizationSignUpMedia.css'; + +import { SignUpProps } from 'scenes/authorization/models/authorizationSignUp'; + +export const AuthorizationSignUp: React.FC = (props: SignUpProps) => { + const resetSignUpWidth = props.isAuthorizitationVisible ? 'reset_sign-up-width' : ''; + return ( +
    +
    +
    + +
    + + +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/authorization/components/signInFrom.tsx b/js_machine_front/src/scenes/authorization/components/signInFrom.tsx index 9bfe075..86d7ece 100644 --- a/js_machine_front/src/scenes/authorization/components/signInFrom.tsx +++ b/js_machine_front/src/scenes/authorization/components/signInFrom.tsx @@ -1,23 +1,23 @@ -import React from 'react'; -import { FormattedMessage } from 'react-intl'; -import '../styles/authForm.css'; -import '../styles/authFormMedia.css'; - -export const SignInFrom: React.FC = () => { - return ( -
    -
    - -
    - - { placeholder => } - - - { placeholder => } - - -
    - ); -}; +import React from 'react'; +import { FormattedMessage } from 'react-intl'; +import '../styles/authForm.css'; +import '../styles/authFormMedia.css'; + +export const SignInFrom: React.FC = () => { + return ( +
    +
    + +
    + + { placeholder => } + + + { placeholder => } + + +
    + ); +}; diff --git a/js_machine_front/src/scenes/authorization/components/signUpForm.tsx b/js_machine_front/src/scenes/authorization/components/signUpForm.tsx index 892f951..ff5bc26 100644 --- a/js_machine_front/src/scenes/authorization/components/signUpForm.tsx +++ b/js_machine_front/src/scenes/authorization/components/signUpForm.tsx @@ -1,27 +1,27 @@ -import React from 'react'; -import { FormattedMessage } from 'react-intl'; -import '../styles/authForm.css'; -import '../styles/authFormMedia.css'; - -export const SignUpForm: React.FC = () => { - return ( -
    -
    - - {placeholder => } - - - {placeholder => } - - - {placeholder => } - - - {placeholder => } - - -
    - ); -}; +import React from 'react'; +import { FormattedMessage } from 'react-intl'; +import '../styles/authForm.css'; +import '../styles/authFormMedia.css'; + +export const SignUpForm: React.FC = () => { + return ( +
    +
    + + {placeholder => } + + + {placeholder => } + + + {placeholder => } + + + {placeholder => } + + +
    + ); +}; diff --git a/js_machine_front/src/scenes/authorization/components/socialAuth.tsx b/js_machine_front/src/scenes/authorization/components/socialAuth.tsx index 3f3d012..ddcde21 100644 --- a/js_machine_front/src/scenes/authorization/components/socialAuth.tsx +++ b/js_machine_front/src/scenes/authorization/components/socialAuth.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import '../styles/authSocial.css'; -import '../styles/authSocialMedia.css'; - -export const SocialAuth: React.FC = () => { - return ( -
    -
    -
    -
    -
    - ); -}; +import React from 'react'; +import '../styles/authSocial.css'; +import '../styles/authSocialMedia.css'; + +export const SocialAuth: React.FC = () => { + return ( +
    +
    +
    +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/authorization/index.ts b/js_machine_front/src/scenes/authorization/index.ts index 09554b1..9af0bf8 100644 --- a/js_machine_front/src/scenes/authorization/index.ts +++ b/js_machine_front/src/scenes/authorization/index.ts @@ -1,4 +1,4 @@ -export * from './components/authorizationBar'; -export * from './components/authorizationHOC'; -export * from './components/authorizationSignIn'; -export * from './components/authorizationSignUp'; +export * from './components/authorizationBar'; +export * from './components/authorizationHOC'; +export * from './components/authorizationSignIn'; +export * from './components/authorizationSignUp'; diff --git a/js_machine_front/src/scenes/authorization/models/authorization.ts b/js_machine_front/src/scenes/authorization/models/authorization.ts index 7f196dc..195b57e 100644 --- a/js_machine_front/src/scenes/authorization/models/authorization.ts +++ b/js_machine_front/src/scenes/authorization/models/authorization.ts @@ -1,6 +1,6 @@ -export interface AuthorizationProps { - changeLoginOptions: () => void; - isAuthorizitationVisible: boolean; - barTitle: string; - barBtn: string; -} +export interface AuthorizationProps { + changeLoginOptions: () => void; + isAuthorizitationVisible: boolean; + barTitle: string; + barBtn: string; +} diff --git a/js_machine_front/src/scenes/authorization/models/authorizationBar.ts b/js_machine_front/src/scenes/authorization/models/authorizationBar.ts index c535075..4ba7188 100644 --- a/js_machine_front/src/scenes/authorization/models/authorizationBar.ts +++ b/js_machine_front/src/scenes/authorization/models/authorizationBar.ts @@ -1,6 +1,6 @@ -export interface AuthorizationBarProps { - changeLoginOptions: () => void; - isAuthorizitationVisible: boolean; - barTitle: string; - barBtn: string; -} +export interface AuthorizationBarProps { + changeLoginOptions: () => void; + isAuthorizitationVisible: boolean; + barTitle: string; + barBtn: string; +} diff --git a/js_machine_front/src/scenes/authorization/models/authorizationHOC.ts b/js_machine_front/src/scenes/authorization/models/authorizationHOC.ts index 056f40e..4538585 100644 --- a/js_machine_front/src/scenes/authorization/models/authorizationHOC.ts +++ b/js_machine_front/src/scenes/authorization/models/authorizationHOC.ts @@ -1,12 +1,12 @@ -export interface AuthorizationHOCProps { - changeLoginOptions: () => void; - isAuthorizitationVisible: boolean; - barTitle: string; - barBtn: string; -} - -export interface AuthorizationHOCState { - isAuthorizitationVisible: boolean; - barTitle: string; - barBtn: string; -} +export interface AuthorizationHOCProps { + changeLoginOptions: () => void; + isAuthorizitationVisible: boolean; + barTitle: string; + barBtn: string; +} + +export interface AuthorizationHOCState { + isAuthorizitationVisible: boolean; + barTitle: string; + barBtn: string; +} diff --git a/js_machine_front/src/scenes/authorization/models/authorizationSignIn.ts b/js_machine_front/src/scenes/authorization/models/authorizationSignIn.ts index 7fe01fa..dc3b675 100644 --- a/js_machine_front/src/scenes/authorization/models/authorizationSignIn.ts +++ b/js_machine_front/src/scenes/authorization/models/authorizationSignIn.ts @@ -1,3 +1,3 @@ -export interface SignInProps { - isAuthorizitationVisible: boolean; -} +export interface SignInProps { + isAuthorizitationVisible: boolean; +} diff --git a/js_machine_front/src/scenes/authorization/models/authorizationSignUp.ts b/js_machine_front/src/scenes/authorization/models/authorizationSignUp.ts index 11992fe..1869b56 100644 --- a/js_machine_front/src/scenes/authorization/models/authorizationSignUp.ts +++ b/js_machine_front/src/scenes/authorization/models/authorizationSignUp.ts @@ -1,3 +1,3 @@ -export interface SignUpProps { - isAuthorizitationVisible: boolean; -} +export interface SignUpProps { + isAuthorizitationVisible: boolean; +} diff --git a/js_machine_front/src/scenes/authorization/tests/authorization.test.tsx b/js_machine_front/src/scenes/authorization/tests/authorization.test.tsx index a1150d2..9f59440 100644 --- a/js_machine_front/src/scenes/authorization/tests/authorization.test.tsx +++ b/js_machine_front/src/scenes/authorization/tests/authorization.test.tsx @@ -1,49 +1,49 @@ -import React from 'react'; -import { Authorization, AuthorizationComponent } from '../authorization'; -import { shallow } from 'enzyme'; -import { AuthorizationBar } from '../components/authorizationBar'; -import { AuthorizationSignUp } from '../components/authorizationSignUp'; -import { AuthorizationSignIn } from '../components/authorizationSignIn'; - -describe('Authorization component is ready', () => { - const props = { - signInStyle: 'sign-in__wrapper', - signUpStyle: 'reset_width', - barStyle: 'authorization-bar__wrapper_sign-in', - barTitle: '', - barBtn: '', - changeLoginOptions: () => { }, - }; - - it('authorization component is ready', () => { - const component = shallow(); - - const authorizationComponent = component.find(AuthorizationComponent); - - expect(authorizationComponent).toHaveLength(1); - }); - - it('signIn component is ready', () => { - const component = shallow(); - - const signInComponent = component.find(AuthorizationSignIn); - - expect(signInComponent).toHaveLength(1); - }); - - it('signUp component is ready', () => { - const component = shallow(); - - const signUpComponent = component.find(AuthorizationSignUp); - - expect(signUpComponent).toHaveLength(1); - }); - - it('authorizationBar component is ready', () => { - const component = shallow(); - - const authorizationBar = component.find(AuthorizationBar); - - expect(authorizationBar).toHaveLength(1); - }); -}); +import React from 'react'; +import { Authorization, AuthorizationComponent } from '../authorization'; +import { shallow } from 'enzyme'; +import { AuthorizationBar } from '../components/authorizationBar'; +import { AuthorizationSignUp } from '../components/authorizationSignUp'; +import { AuthorizationSignIn } from '../components/authorizationSignIn'; + +describe('Authorization component is ready', () => { + const props = { + signInStyle: 'sign-in__wrapper', + signUpStyle: 'reset_width', + barStyle: 'authorization-bar__wrapper_sign-in', + barTitle: '', + barBtn: '', + changeLoginOptions: () => { }, + }; + + it('authorization component is ready', () => { + const component = shallow(); + + const authorizationComponent = component.find(AuthorizationComponent); + + expect(authorizationComponent).toHaveLength(1); + }); + + it('signIn component is ready', () => { + const component = shallow(); + + const signInComponent = component.find(AuthorizationSignIn); + + expect(signInComponent).toHaveLength(1); + }); + + it('signUp component is ready', () => { + const component = shallow(); + + const signUpComponent = component.find(AuthorizationSignUp); + + expect(signUpComponent).toHaveLength(1); + }); + + it('authorizationBar component is ready', () => { + const component = shallow(); + + const authorizationBar = component.find(AuthorizationBar); + + expect(authorizationBar).toHaveLength(1); + }); +}); diff --git a/js_machine_front/src/scenes/authorization/tests/authorizationSignIn.test.tsx b/js_machine_front/src/scenes/authorization/tests/authorizationSignIn.test.tsx index 32038b3..1391d37 100644 --- a/js_machine_front/src/scenes/authorization/tests/authorizationSignIn.test.tsx +++ b/js_machine_front/src/scenes/authorization/tests/authorizationSignIn.test.tsx @@ -1,27 +1,27 @@ -import React from 'react'; -import { AuthorizationSignIn } from '../components/authorizationSignIn'; -import { shallow } from 'enzyme'; -import { SocialAuth } from '../components/socialAuth'; -import { SignInFrom } from '../components/signInFrom'; - -describe('AuthorizationSignIn component is ready', () => { - const props = { - signInStyle: 'sign-in__wrapper', - }; - - it('socialAuth component is ready', () => { - const component = shallow(); - - const socialAuth = component.find(SocialAuth); - - expect(socialAuth).toHaveLength(1); - }); - - it('signInFrom component is ready', () => { - const component = shallow(); - - const signInFrom = component.find(SignInFrom); - - expect(signInFrom).toHaveLength(1); - }); -}); +import React from 'react'; +import { AuthorizationSignIn } from '../components/authorizationSignIn'; +import { shallow } from 'enzyme'; +import { SocialAuth } from '../components/socialAuth'; +import { SignInFrom } from '../components/signInFrom'; + +describe('AuthorizationSignIn component is ready', () => { + const props = { + signInStyle: 'sign-in__wrapper', + }; + + it('socialAuth component is ready', () => { + const component = shallow(); + + const socialAuth = component.find(SocialAuth); + + expect(socialAuth).toHaveLength(1); + }); + + it('signInFrom component is ready', () => { + const component = shallow(); + + const signInFrom = component.find(SignInFrom); + + expect(signInFrom).toHaveLength(1); + }); +}); diff --git a/js_machine_front/src/scenes/authorization/tests/authorizationSignUp.test.tsx b/js_machine_front/src/scenes/authorization/tests/authorizationSignUp.test.tsx index 53e044c..2b328a6 100644 --- a/js_machine_front/src/scenes/authorization/tests/authorizationSignUp.test.tsx +++ b/js_machine_front/src/scenes/authorization/tests/authorizationSignUp.test.tsx @@ -1,27 +1,27 @@ -import React from 'react'; -import { AuthorizationSignUp } from '../components/authorizationSignUp'; -import { shallow } from 'enzyme'; -import { SignUpForm } from '../components/signUpForm'; -import { SocialAuth } from '../components/socialAuth'; - -describe('AuthorizationSignUp', () => { - const props = { - signUpStyle: 'reset_width', - }; - - it('socialAuth component is ready', () => { - const component = shallow(); - - const socialAuth = component.find(SocialAuth); - - expect(socialAuth).toHaveLength(1); - }); - - it('signUpForm component is ready', () => { - const component = shallow(); - - const signUpForm = component.find(SignUpForm); - - expect(signUpForm).toHaveLength(1); - }); -}); +import React from 'react'; +import { AuthorizationSignUp } from '../components/authorizationSignUp'; +import { shallow } from 'enzyme'; +import { SignUpForm } from '../components/signUpForm'; +import { SocialAuth } from '../components/socialAuth'; + +describe('AuthorizationSignUp', () => { + const props = { + signUpStyle: 'reset_width', + }; + + it('socialAuth component is ready', () => { + const component = shallow(); + + const socialAuth = component.find(SocialAuth); + + expect(socialAuth).toHaveLength(1); + }); + + it('signUpForm component is ready', () => { + const component = shallow(); + + const signUpForm = component.find(SignUpForm); + + expect(signUpForm).toHaveLength(1); + }); +}); diff --git a/js_machine_front/src/scenes/communityEvents/communityEvents.tsx b/js_machine_front/src/scenes/communityEvents/communityEvents.tsx index 92fb830..d4568c6 100644 --- a/js_machine_front/src/scenes/communityEvents/communityEvents.tsx +++ b/js_machine_front/src/scenes/communityEvents/communityEvents.tsx @@ -1,41 +1,41 @@ -import React from 'react'; -import Background from './images/events.jpg'; -import './styles/events.css'; - -import { EventsContent } from './components/eventsContent'; -import { getEventData } from './services/moksEvetnData'; -import { EventModel } from './models/events'; - -import { FormattedMessage } from 'react-intl'; - -const sectionStyle = { - height: '100vh', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -export class Events extends React.PureComponent<{}, EventModel> { - public state: EventModel = { eventsData: [] }; - - public componentDidMount = async () => { - const response = await getEventData(); - this.setState(() => { - return { eventsData: response }; - }); - } - - public render(): JSX.Element { - return ( -
    -
    -
    - -
    - -
    -
    - ); - } -} +import React from 'react'; +import Background from './images/events.jpg'; +import './styles/events.css'; + +import { EventsContent } from './components/eventsContent'; +import { getEventData } from './services/moksEvetnData'; +import { EventModel } from './models/events'; + +import { FormattedMessage } from 'react-intl'; + +const sectionStyle = { + height: '100vh', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +export class Events extends React.PureComponent<{}, EventModel> { + public state: EventModel = { eventsData: [] }; + + public componentDidMount = async () => { + const response = await getEventData(); + this.setState(() => { + return { eventsData: response }; + }); + } + + public render(): JSX.Element { + return ( +
    +
    +
    + +
    + +
    +
    + ); + } +} diff --git a/js_machine_front/src/scenes/communityEvents/components/eventsContent.tsx b/js_machine_front/src/scenes/communityEvents/components/eventsContent.tsx index c347a90..67a57f8 100644 --- a/js_machine_front/src/scenes/communityEvents/components/eventsContent.tsx +++ b/js_machine_front/src/scenes/communityEvents/components/eventsContent.tsx @@ -1,29 +1,29 @@ -import React, { memo } from 'react'; -import { Event, EventModel } from '../models/events'; -import '../styles/eventsContent.css'; - -export const EventsContent: React.FC = memo((props: EventModel) => { - return ( -
    -
    - { - props.eventsData.map((event: Event) => { - const eventDate: number = new Date(event.date).getDate(); - const eventMonth: string = new Date(event.date).toLocaleString('ru', { month: 'short' }).toUpperCase(); - - return
    -
    -

    {eventDate}

    - {eventMonth} -
    -
    -

    {event.title}

    - {event.description} -
    -
    ; - }) - } -
    -
    - ); -}); +import React, { memo } from 'react'; +import { Event, EventModel } from '../models/events'; +import '../styles/eventsContent.css'; + +export const EventsContent: React.FC = memo((props: EventModel) => { + return ( +
    +
    + { + props.eventsData.map((event: Event) => { + const eventDate: number = new Date(event.date).getDate(); + const eventMonth: string = new Date(event.date).toLocaleString('ru', { month: 'short' }).toUpperCase(); + + return
    +
    +

    {eventDate}

    + {eventMonth} +
    +
    +

    {event.title}

    + {event.description} +
    +
    ; + }) + } +
    +
    + ); +}); diff --git a/js_machine_front/src/scenes/communityEvents/models/events.ts b/js_machine_front/src/scenes/communityEvents/models/events.ts index 8eb6c2e..6a74012 100644 --- a/js_machine_front/src/scenes/communityEvents/models/events.ts +++ b/js_machine_front/src/scenes/communityEvents/models/events.ts @@ -1,10 +1,10 @@ -export interface Event { - id: number; - date: string; - title: string; - description: string; -} - -export interface EventModel { - eventsData: Event[]; -} +export interface Event { + id: number; + date: string; + title: string; + description: string; +} + +export interface EventModel { + eventsData: Event[]; +} diff --git a/js_machine_front/src/scenes/digestView/components/dateAndView.tsx b/js_machine_front/src/scenes/digestView/components/dateAndView.tsx index e5343d5..a40ca3e 100644 --- a/js_machine_front/src/scenes/digestView/components/dateAndView.tsx +++ b/js_machine_front/src/scenes/digestView/components/dateAndView.tsx @@ -1,13 +1,13 @@ -import React, { memo } from 'react'; -import Eye from '../images/eye.svg'; -import '../styles/dateAndView.css'; -import { DateAndViewProps } from '../models/dateAndView'; - -export const DateAndView: React.FC = memo((props: DateAndViewProps) => { - return ( -
    - 5 АВГ - Eye {props.views} -
    - ); -}); +import React, { memo } from 'react'; +import Eye from '../images/eye.svg'; +import '../styles/dateAndView.css'; +import { DateAndViewProps } from '../models/dateAndView'; + +export const DateAndView: React.FC = memo((props: DateAndViewProps) => { + return ( +
    + 5 АВГ + Eye {props.views} +
    + ); +}); diff --git a/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx b/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx index 16b4e89..c67ea59 100644 --- a/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx +++ b/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx @@ -1,13 +1,13 @@ -import React, { memo } from 'react'; -import '../styles/leftArrowButton.css'; -import arrow from '../images/left.svg'; -import { LeftArrowButtonProps } from '../models/leftArrowButton'; - -export const LeftArrowButton: React.FC = memo((props: LeftArrowButtonProps) => { - return ( - - left-arrow - {props.text} - - ); -}); +import React, { memo } from 'react'; +import '../styles/leftArrowButton.css'; +import arrow from '../images/left.svg'; +import { LeftArrowButtonProps } from '../models/leftArrowButton'; + +export const LeftArrowButton: React.FC = memo((props: LeftArrowButtonProps) => { + return ( + + left-arrow + {props.text} + + ); +}); diff --git a/js_machine_front/src/scenes/digestView/components/option.tsx b/js_machine_front/src/scenes/digestView/components/option.tsx index 8df02d6..05687fe 100644 --- a/js_machine_front/src/scenes/digestView/components/option.tsx +++ b/js_machine_front/src/scenes/digestView/components/option.tsx @@ -1,15 +1,15 @@ -import React, { memo } from 'react'; -import '../styles/option.css'; -import star from '../images/star.svg'; -import share from '../images/share-option.svg'; -import warning from '../images/warning.svg'; - -export const Option: React.FC = memo(() => { - return ( -
    - share - start - warning -
    - ); -}); +import React, { memo } from 'react'; +import '../styles/option.css'; +import star from '../images/star.svg'; +import share from '../images/share-option.svg'; +import warning from '../images/warning.svg'; + +export const Option: React.FC = memo(() => { + return ( +
    + share + start + warning +
    + ); +}); diff --git a/js_machine_front/src/scenes/digestView/digestView.tsx b/js_machine_front/src/scenes/digestView/digestView.tsx index e012b5a..98879f6 100644 --- a/js_machine_front/src/scenes/digestView/digestView.tsx +++ b/js_machine_front/src/scenes/digestView/digestView.tsx @@ -1,73 +1,73 @@ -import React, { memo } from 'react'; -import CSSTransition from 'react-transition-group/CSSTransition'; -import './styles/digestView.css'; - -import { LeftArrowButton } from './components/leftArrowButton'; -import { DateAndView } from './components/dateAndView'; -import { Option } from './components/option'; -import { data } from './services/digestView'; -import { DigestViewProps } from './models/digestView'; - -export const DigestView: React.FC = memo((props: DigestViewProps) => { - - const benefits = data.benefits.map((el, idx) => { - return
  • {el}
    • ; - }); - - const news = ( - -

    #Новости

    -

    {data.news.title}

    -

    {data.news.body} тут.

    -     - ); - - const event = ( - -

    #События

    -

    {data.event.title}

    -

    {data.event.body}

    -     - ); - - const greating = ( - -

    Всем доброе утро!

    -

    Прошлое неделя подарила нам интересные статьи, обновления библиотек (куда - без них), браузеров в всяких платформ.

    -

    Ну что же, берем в руку кружку, да-да, берем. Вязли? Отлично, потому что - начинаем!

    -     - ); - - return ( - -
    -
    - -
    -
    -     - ); -}); +import React, { memo } from 'react'; +import CSSTransition from 'react-transition-group/CSSTransition'; +import './styles/digestView.css'; + +import { LeftArrowButton } from './components/leftArrowButton'; +import { DateAndView } from './components/dateAndView'; +import { Option } from './components/option'; +import { data } from './services/digestView'; +import { DigestViewProps } from './models/digestView'; + +export const DigestView: React.FC = memo((props: DigestViewProps) => { + + const benefits = data.benefits.map((el, idx) => { + return
  • {el}
    • ; + }); + + const news = ( + +

    #Новости

    +

    {data.news.title}

    +

    {data.news.body} тут.

    +     + ); + + const event = ( + +

    #События

    +

    {data.event.title}

    +

    {data.event.body}

    +     + ); + + const greating = ( + +

    Всем доброе утро!

    +

    Прошлое неделя подарила нам интересные статьи, обновления библиотек (куда + без них), браузеров в всяких платформ.

    +

    Ну что же, берем в руку кружку, да-да, берем. Вязли? Отлично, потому что + начинаем!

    +     + ); + + return ( + +
    +
    + +
    +
    +     + ); +}); diff --git a/js_machine_front/src/scenes/digestView/models/dateAndView.ts b/js_machine_front/src/scenes/digestView/models/dateAndView.ts index 511600b..7bba0de 100644 --- a/js_machine_front/src/scenes/digestView/models/dateAndView.ts +++ b/js_machine_front/src/scenes/digestView/models/dateAndView.ts @@ -1,3 +1,3 @@ -export interface DateAndViewProps { - views: number; -} +export interface DateAndViewProps { + views: number; +} diff --git a/js_machine_front/src/scenes/digestView/models/digestView.ts b/js_machine_front/src/scenes/digestView/models/digestView.ts index 4c3470f..76b378e 100644 --- a/js_machine_front/src/scenes/digestView/models/digestView.ts +++ b/js_machine_front/src/scenes/digestView/models/digestView.ts @@ -1,3 +1,3 @@ -export interface DigestViewProps { - history: any; -} +export interface DigestViewProps { + history: any; +} diff --git a/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts b/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts index d5ed544..0296bfe 100644 --- a/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts +++ b/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts @@ -1,4 +1,4 @@ -export interface LeftArrowButtonProps { - closeDigest: (event: React.MouseEvent) => void; - text: string; - } +export interface LeftArrowButtonProps { + closeDigest: (event: React.MouseEvent) => void; + text: string; + } diff --git a/js_machine_front/src/scenes/digestView/services/digestView.ts b/js_machine_front/src/scenes/digestView/services/digestView.ts index 7f2bb6c..24952b0 100644 --- a/js_machine_front/src/scenes/digestView/services/digestView.ts +++ b/js_machine_front/src/scenes/digestView/services/digestView.ts @@ -1,19 +1,19 @@ -export const data = { - view: 25, - news: { - title: 'В Firebox будет проведен эксперимент, связанный с DNS-over-HTTP', - body: 'Безопасность и удобство в перспективе. Что же из этого получится - не известно. Апока что читаем', - link: 'localhost:3000', - }, - event : { - title: 'The Rolling Scopes Conference (9-11 августа)', - body: 'Одна из крупнейших конференций, котарая пройдет в Минске уже в 5 раз и ужетак скоро на этих выходных!', - }, - benefits: [ - '3 дня по 3 потока', - 'Более 1000 участников', - '50+ спикеров из 13 стран 1000 участников', - 'Воркшопы и панельныные экскурсии', - ], - back: 'назад', -}; +export const data = { + view: 25, + news: { + title: 'В Firebox будет проведен эксперимент, связанный с DNS-over-HTTP', + body: 'Безопасность и удобство в перспективе. Что же из этого получится - не известно. Апока что читаем', + link: 'localhost:3000', + }, + event : { + title: 'The Rolling Scopes Conference (9-11 августа)', + body: 'Одна из крупнейших конференций, котарая пройдет в Минске уже в 5 раз и ужетак скоро на этих выходных!', + }, + benefits: [ + '3 дня по 3 потока', + 'Более 1000 участников', + '50+ спикеров из 13 стран 1000 участников', + 'Воркшопы и панельныные экскурсии', + ], + back: 'назад', +}; diff --git a/js_machine_front/src/scenes/main/components/RecentEvents.tsx b/js_machine_front/src/scenes/main/components/RecentEvents.tsx index e4b1107..1f35111 100644 --- a/js_machine_front/src/scenes/main/components/RecentEvents.tsx +++ b/js_machine_front/src/scenes/main/components/RecentEvents.tsx @@ -1,28 +1,28 @@ -import React from 'react'; - -import '../styles/recentEvents.css'; -import '../styles/recentEventsMedia.css'; - -import { EventProps, Event } from 'scenes/main/models/recentEvents'; - -export const RecentEvents: React.FC = (props: EventProps) => { - return
    - { - props.events.map((event: Event) => { - const eventDate: number = new Date(event.date).getDate(); - const eventMonth: string = new Date(event.date).toLocaleString('ru', { month: 'short' }).toUpperCase(); - - return
    -
    -

    {eventDate}

    - {eventMonth} -
    -
    -

    {event.title}

    - {event.description} -
    -
    ; - }) - } -
    ; -}; +import React from 'react'; + +import '../styles/recentEvents.css'; +import '../styles/recentEventsMedia.css'; + +import { EventProps, Event } from 'scenes/main/models/recentEvents'; + +export const RecentEvents: React.FC = (props: EventProps) => { + return
    + { + props.events.map((event: Event) => { + const eventDate: number = new Date(event.date).getDate(); + const eventMonth: string = new Date(event.date).toLocaleString('ru', { month: 'short' }).toUpperCase(); + + return
    +
    +

    {eventDate}

    + {eventMonth} +
    +
    +

    {event.title}

    + {event.description} +
    +
    ; + }) + } +
    ; +}; diff --git a/js_machine_front/src/scenes/main/components/SocialLinks.tsx b/js_machine_front/src/scenes/main/components/SocialLinks.tsx index d46c6ea..3dfdfcf 100644 --- a/js_machine_front/src/scenes/main/components/SocialLinks.tsx +++ b/js_machine_front/src/scenes/main/components/SocialLinks.tsx @@ -1,24 +1,24 @@ -import React from 'react'; -import VkIcon from '../images/vk-icon.png'; -import TelegramIcon from '../images/telegram-icon.png'; -import InstaIcon from '../images/instagram-icon.png'; -import '../styles/socialLinks.css'; -import '../styles/socialLinksMedia.css'; - -const sectionStyle = { - height: '100%', - alignItems: 'center', - display: 'flex', -}; - -export const SocialLinks: React.FC = () => { - return ( -
    -
    - telegram-icon - vk-icon - inst-icon -
    -
    - ); -}; +import React from 'react'; +import VkIcon from '../images/vk-icon.png'; +import TelegramIcon from '../images/telegram-icon.png'; +import InstaIcon from '../images/instagram-icon.png'; +import '../styles/socialLinks.css'; +import '../styles/socialLinksMedia.css'; + +const sectionStyle = { + height: '100%', + alignItems: 'center', + display: 'flex', +}; + +export const SocialLinks: React.FC = () => { + return ( +
    +
    + telegram-icon + vk-icon + inst-icon +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/main/index.ts b/js_machine_front/src/scenes/main/index.ts index a5cb66d..ae4026e 100644 --- a/js_machine_front/src/scenes/main/index.ts +++ b/js_machine_front/src/scenes/main/index.ts @@ -1,2 +1,2 @@ -export * from './components/RecentEvents'; -export * from './components/SocialLinks'; +export * from './components/RecentEvents'; +export * from './components/SocialLinks'; diff --git a/js_machine_front/src/scenes/main/main.tsx b/js_machine_front/src/scenes/main/main.tsx index 5b836cf..4e83cc5 100644 --- a/js_machine_front/src/scenes/main/main.tsx +++ b/js_machine_front/src/scenes/main/main.tsx @@ -1,52 +1,52 @@ -import React, { memo } from 'react'; -import Background from './images/main.jpg'; -import './styles/main.css'; -import './styles/mainMedia.css'; - -import { SocialLinks, RecentEvents } from './'; - -const sectionStyle = { - height: '100%', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -const events = [ - { - id: '0', - date: '04/20/2019', - title: 'MITCone 2019', - description: 'Одна из самых масштабных конференций Могилева, спикеры из Минска, Гомеля, и других городов', - }, - { - id: '1', - date: '05/30/2019', - title: 'JS JUNGLE', - description: 'Отпразнуем День JS разработчика вместе. Вопросы по JS/Front-End и It в целом. Победителям подарки!', - }, - { - id: '2', - date: '06/29/2019', - title: 'Городской пикник', - description: 'Встреча могилевских IT-компаний на открытом воздухе в парке Подниколье', - }, - { - id: '3', - date: '08/09/2019', - title: 'The Rolling Scopes Conference', - description: 'Интересные доклады, живое общение и конечно же призы!', - }, -]; - -export const Main: React.FC = memo(() => { - return ( -
    - -
    - -
    -
    - ); -}); +import React, { memo } from 'react'; +import Background from './images/main.jpg'; +import './styles/main.css'; +import './styles/mainMedia.css'; + +import { SocialLinks, RecentEvents } from './'; + +const sectionStyle = { + height: '100%', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +const events = [ + { + id: '0', + date: '04/20/2019', + title: 'MITCone 2019', + description: 'Одна из самых масштабных конференций Могилева, спикеры из Минска, Гомеля, и других городов', + }, + { + id: '1', + date: '05/30/2019', + title: 'JS JUNGLE', + description: 'Отпразнуем День JS разработчика вместе. Вопросы по JS/Front-End и It в целом. Победителям подарки!', + }, + { + id: '2', + date: '06/29/2019', + title: 'Городской пикник', + description: 'Встреча могилевских IT-компаний на открытом воздухе в парке Подниколье', + }, + { + id: '3', + date: '08/09/2019', + title: 'The Rolling Scopes Conference', + description: 'Интересные доклады, живое общение и конечно же призы!', + }, +]; + +export const Main: React.FC = memo(() => { + return ( +
    + +
    + +
    +
    + ); +}); diff --git a/js_machine_front/src/scenes/main/models/recentEvents.ts b/js_machine_front/src/scenes/main/models/recentEvents.ts index 32fc0de..95d8b94 100644 --- a/js_machine_front/src/scenes/main/models/recentEvents.ts +++ b/js_machine_front/src/scenes/main/models/recentEvents.ts @@ -1,10 +1,10 @@ -export interface Event { - id: string; - date: string; - title: string; - description: string; -} - -export interface EventProps { - events: Event[]; -} +export interface Event { + id: string; + date: string; + title: string; + description: string; +} + +export interface EventProps { + events: Event[]; +} diff --git a/js_machine_front/src/scenes/main/tests/main.test.tsx b/js_machine_front/src/scenes/main/tests/main.test.tsx index 7ac0b84..2707076 100644 --- a/js_machine_front/src/scenes/main/tests/main.test.tsx +++ b/js_machine_front/src/scenes/main/tests/main.test.tsx @@ -1,23 +1,23 @@ -import React from 'react'; -import { Main } from '../main'; -import { shallow } from 'enzyme'; -import { RecentEvents } from '../components/RecentEvents'; -import { SocialLinks } from '../components/SocialLinks'; - -describe('Main component is ready', () => { - it('recentEvents component is ready', () => { - const component = shallow(
    ); - - const recentEvents = component.find(RecentEvents); - - expect(recentEvents).toHaveLength(1); - }); - - it('socialLinks component is ready', () => { - const component = shallow(
    ); - - const socialLinks = component.find(SocialLinks); - - expect(socialLinks).toHaveLength(1); - }); -}); +import React from 'react'; +import { Main } from '../main'; +import { shallow } from 'enzyme'; +import { RecentEvents } from '../components/RecentEvents'; +import { SocialLinks } from '../components/SocialLinks'; + +describe('Main component is ready', () => { + it('recentEvents component is ready', () => { + const component = shallow(
    ); + + const recentEvents = component.find(RecentEvents); + + expect(recentEvents).toHaveLength(1); + }); + + it('socialLinks component is ready', () => { + const component = shallow(
    ); + + const socialLinks = component.find(SocialLinks); + + expect(socialLinks).toHaveLength(1); + }); +}); diff --git a/js_machine_front/src/scenes/news/components/newsContainer.tsx b/js_machine_front/src/scenes/news/components/newsContainer.tsx index 65d19df..2fa1430 100644 --- a/js_machine_front/src/scenes/news/components/newsContainer.tsx +++ b/js_machine_front/src/scenes/news/components/newsContainer.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import { NewsModel, News } from '../models/news'; -import { NewsPresentation } from './newsPresentation'; -import '../styles/newsContainer.css'; -import '../styles/newsContainerMedia.css'; - -export const EventsContainer: React.FC = (props: NewsModel) => { - return ( -
    - { - props.newsData.map((news: News) => ) - } -
    - ); -}; +import React from 'react'; +import { NewsModel, News } from '../models/news'; +import { NewsPresentation } from './newsPresentation'; +import '../styles/newsContainer.css'; +import '../styles/newsContainerMedia.css'; + +export const EventsContainer: React.FC = (props: NewsModel) => { + return ( +
    + { + props.newsData.map((news: News) => ) + } +
    + ); +}; diff --git a/js_machine_front/src/scenes/news/components/newsPresentation.tsx b/js_machine_front/src/scenes/news/components/newsPresentation.tsx index f375127..e636429 100644 --- a/js_machine_front/src/scenes/news/components/newsPresentation.tsx +++ b/js_machine_front/src/scenes/news/components/newsPresentation.tsx @@ -1,26 +1,26 @@ -import React from 'react'; -import { News } from '../models/news'; - -export const NewsPresentation: React.FC = (props) => { - const newsDate: number = new Date(props.date).getDate(); - const newsMonth: string = new Date(props.date).toLocaleString('ru', { month: 'short' }).toUpperCase(); - - return ( -
    -
    -
    ЧИТАТЬ >
    -
    -
    -
    -

    {newsDate} {newsMonth}

    -
    -
    -

    {props.title}

    -
    -
    -

    {props.description}

    -
    -
    -
    - ); -}; +import React from 'react'; +import { News } from '../models/news'; + +export const NewsPresentation: React.FC = (props) => { + const newsDate: number = new Date(props.date).getDate(); + const newsMonth: string = new Date(props.date).toLocaleString('ru', { month: 'short' }).toUpperCase(); + + return ( +
    +
    +
    ЧИТАТЬ >
    +
    +
    +
    +

    {newsDate} {newsMonth}

    +
    +
    +

    {props.title}

    +
    +
    +

    {props.description}

    +
    +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/news/models/news.ts b/js_machine_front/src/scenes/news/models/news.ts index 9d034c9..955f1d9 100644 --- a/js_machine_front/src/scenes/news/models/news.ts +++ b/js_machine_front/src/scenes/news/models/news.ts @@ -1,10 +1,10 @@ -export interface News { - id: number; - date: string; - title: string; - description: string; -} - -export interface NewsModel { - newsData: News[]; -} +export interface News { + id: number; + date: string; + title: string; + description: string; +} + +export interface NewsModel { + newsData: News[]; +} diff --git a/js_machine_front/src/scenes/news/news.tsx b/js_machine_front/src/scenes/news/news.tsx index bdc50a7..6975703 100644 --- a/js_machine_front/src/scenes/news/news.tsx +++ b/js_machine_front/src/scenes/news/news.tsx @@ -1,38 +1,38 @@ -import React from 'react'; -import Background from './images/news.jpg'; -import { FormattedMessage } from 'react-intl'; -import './styles/news.css'; - -import { EventsContainer } from './components/newsContainer'; -import { NewsModel } from './models/news'; -import { getNewsData } from './services/mocksNewsData'; - -const sectionStyle = { - height: '100vh', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -export class News extends React.PureComponent<{}, NewsModel> { - public state: NewsModel = { newsData: [] }; - - public componentDidMount = async () => { - const response = await getNewsData(); - this.setState(() => ({ newsData: response })); - } - - public render(): JSX.Element { - return ( -
    -
    -
    - -
    - -
    -
    - ); - } -} +import React from 'react'; +import Background from './images/news.jpg'; +import { FormattedMessage } from 'react-intl'; +import './styles/news.css'; + +import { EventsContainer } from './components/newsContainer'; +import { NewsModel } from './models/news'; +import { getNewsData } from './services/mocksNewsData'; + +const sectionStyle = { + height: '100vh', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +export class News extends React.PureComponent<{}, NewsModel> { + public state: NewsModel = { newsData: [] }; + + public componentDidMount = async () => { + const response = await getNewsData(); + this.setState(() => ({ newsData: response })); + } + + public render(): JSX.Element { + return ( +
    +
    +
    + +
    + +
    +
    + ); + } +} diff --git a/js_machine_front/src/scenes/partnersLogo/components/partnersLogo.tsx b/js_machine_front/src/scenes/partnersLogo/components/partnersLogo.tsx index 079f8f4..9bd17c2 100644 --- a/js_machine_front/src/scenes/partnersLogo/components/partnersLogo.tsx +++ b/js_machine_front/src/scenes/partnersLogo/components/partnersLogo.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import '../styles/partnersLogo.css'; -import '../styles/partnersLogoMedia.css'; - -export const PartnersLogo: React.FC = () => { - return ( -
    -
    -
    -
    -
    - ); -}; +import React from 'react'; +import '../styles/partnersLogo.css'; +import '../styles/partnersLogoMedia.css'; + +export const PartnersLogo: React.FC = () => { + return ( +
    +
    +
    +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/partnersLogo/partners.tsx b/js_machine_front/src/scenes/partnersLogo/partners.tsx index 426ccf8..5f8d333 100644 --- a/js_machine_front/src/scenes/partnersLogo/partners.tsx +++ b/js_machine_front/src/scenes/partnersLogo/partners.tsx @@ -1,28 +1,28 @@ -import React, { memo } from 'react'; -import Background from './images/partners.jpg'; -import './styles/partners.css'; -import './styles/partnersMedia.css'; -import { PartnersLogo } from './components/partnersLogo'; - -import { FormattedMessage } from 'react-intl'; - -const sectionStyle = { - height: '100vh', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: '50% 20%', -}; - -export const Partners: React.FC = memo(() => { - return ( -
    -
    -
    - -
    - -
    -
    - ); -}); +import React, { memo } from 'react'; +import Background from './images/partners.jpg'; +import './styles/partners.css'; +import './styles/partnersMedia.css'; +import { PartnersLogo } from './components/partnersLogo'; + +import { FormattedMessage } from 'react-intl'; + +const sectionStyle = { + height: '100vh', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: '50% 20%', +}; + +export const Partners: React.FC = memo(() => { + return ( +
    +
    +
    + +
    + +
    +
    + ); +}); diff --git a/js_machine_front/src/scenes/partnersLogo/tests/partners.test.tsx b/js_machine_front/src/scenes/partnersLogo/tests/partners.test.tsx index 5789860..831b4c1 100644 --- a/js_machine_front/src/scenes/partnersLogo/tests/partners.test.tsx +++ b/js_machine_front/src/scenes/partnersLogo/tests/partners.test.tsx @@ -1,16 +1,16 @@ -import React from 'react'; -import { Partners } from '../partners'; -import { shallow } from 'enzyme'; -import { PartnersLogo } from '../components/partnersLogo'; - -describe('Partners component is ready', () => { - it('partnersLogo component is ready', () => { - - const component = shallow(); - - const partnersLogo = component.find(PartnersLogo); - - expect(partnersLogo).toHaveLength(1); - - }); -}); +import React from 'react'; +import { Partners } from '../partners'; +import { shallow } from 'enzyme'; +import { PartnersLogo } from '../components/partnersLogo'; + +describe('Partners component is ready', () => { + it('partnersLogo component is ready', () => { + + const component = shallow(); + + const partnersLogo = component.find(PartnersLogo); + + expect(partnersLogo).toHaveLength(1); + + }); +}); diff --git a/js_machine_front/src/scenes/partnersLogo/tests/partnersLogo.test.tsx b/js_machine_front/src/scenes/partnersLogo/tests/partnersLogo.test.tsx index d6050f2..920f300 100644 --- a/js_machine_front/src/scenes/partnersLogo/tests/partnersLogo.test.tsx +++ b/js_machine_front/src/scenes/partnersLogo/tests/partnersLogo.test.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import { PartnersLogo } from '../components/partnersLogo'; -import { shallow } from 'enzyme'; - -describe('PartnersLogo component is ready', () => { - it('partnersLogo component is ready', () => { - const component = shallow(); - - const partnersLogo = component.find('div'); - - expect(partnersLogo).toHaveLength(4); - }); -}); +import React from 'react'; +import { PartnersLogo } from '../components/partnersLogo'; +import { shallow } from 'enzyme'; + +describe('PartnersLogo component is ready', () => { + it('partnersLogo component is ready', () => { + const component = shallow(); + + const partnersLogo = component.find('div'); + + expect(partnersLogo).toHaveLength(4); + }); +}); diff --git a/js_machine_front/src/serviceWorker.ts b/js_machine_front/src/serviceWorker.ts index 00afbf4..699eb40 100644 --- a/js_machine_front/src/serviceWorker.ts +++ b/js_machine_front/src/serviceWorker.ts @@ -1,14 +1,14 @@ -// This optional code is used to register a service worker. -// register() is not called by default. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on subsequent visits to a page, after all the -// existing tabs open on the page have been closed, since previously cached -// resources are updated in the background. - -// To learn more about the benefits of this model and instructions on how to -// opt-in, read https://bit.ly/CRA-PWA +// This optional code is used to register a service worker. +// register() is not called by default. + +// This lets the app load faster on subsequent visits in production, and gives +// it offline capabilities. However, it also means that developers (and users) +// will only see deployed updates on subsequent visits to a page, after all the +// existing tabs open on the page have been closed, since previously cached +// resources are updated in the background. + +// To learn more about the benefits of this model and instructions on how to +// opt-in, read https://bit.ly/CRA-PWA //tslint:disable const isLocalhost = Boolean( window.location.hostname === 'localhost' || diff --git a/js_machine_front/tslint.json b/js_machine_front/tslint.json index 3b54087..47f9f5e 100644 --- a/js_machine_front/tslint.json +++ b/js_machine_front/tslint.json @@ -1,142 +1,142 @@ -{ - "defaultSeverity": "error", - "extends": [ - "tslint:recommended", - "tslint-react", - "tslint-config-prettier" - ], - "jsRules": {}, - "rules": { - "jsx-no-lambda": false, - "ordered-imports": false, - "arrow-return-shorthand": true, - "callable-types": true, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "curly": true, - "eofline": true, - "forin": true, - "import-spacing": true, - "interface-name": [true, "never-prefix"], - "interface-over-type-literal": true, - "label-position": true, - "max-line-length": [ - true, - 280 - ], - "member-access": false, - "member-ordering": [ - true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } - ], - "no-arg": true, - "no-bitwise": true, - "no-console": true, - "no-construct": true, - "no-debugger": true, - "no-duplicate-super": true, - "no-empty": false, - "no-empty-interface": true, - "no-eval": true, - "no-inferrable-types": [ - true, - "ignore-params" - ], - "no-misused-new": true, - "no-non-null-assertion": true, - "no-shadowed-variable": true, - "no-string-literal": false, - "no-string-throw": true, - "no-switch-case-fall-through": true, - "no-trailing-whitespace": true, - "no-unnecessary-initializer": true, - "no-unused-expression": true, - "no-var-keyword": true, - "object-literal-sort-keys": false, - "one-line": [ - true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" - ], - "prefer-const": true, - "quotemark": [ - true, - "single", - "jsx-double" - ], - "radix": true, - "semicolon": [ - true, - "always" - ], - "triple-equals": [ - true, - "allow-null-check" - ], - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "unified-signatures": true, - "variable-name": false, - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ], - "indent": [ - true, - "spaces", - 2 - ], - "trailing-comma": [ - true, - { - "multiline": "always", - "singleline": "never" - } - ], - "linebreak-style": [ - true, - "CRLF" - ], - "typedef": [ - true, - "call-signature", - "parameter", - "property-declaration", - "member-variable-declaration" - ], - "no-consecutive-blank-lines": true - }, - "rulesDirectory": [], - "linterOptions": { - "typeCheck": true, - "exclude": [ - "config/**/*.js", - "node_modules/**/*.ts", - "coverage/lcov-report/*.js" - ] - } - } \ No newline at end of file +{ + "defaultSeverity": "error", + "extends": [ + "tslint:recommended", + "tslint-react", + "tslint-config-prettier" + ], + "jsRules": {}, + "rules": { + "jsx-no-lambda": false, + "ordered-imports": false, + "arrow-return-shorthand": true, + "callable-types": true, + "class-name": true, + "comment-format": [ + true, + "check-space" + ], + "curly": true, + "eofline": true, + "forin": true, + "import-spacing": true, + "interface-name": [true, "never-prefix"], + "interface-over-type-literal": true, + "label-position": true, + "max-line-length": [ + true, + 280 + ], + "member-access": false, + "member-ordering": [ + true, + { + "order": [ + "static-field", + "instance-field", + "static-method", + "instance-method" + ] + } + ], + "no-arg": true, + "no-bitwise": true, + "no-console": true, + "no-construct": true, + "no-debugger": true, + "no-duplicate-super": true, + "no-empty": false, + "no-empty-interface": true, + "no-eval": true, + "no-inferrable-types": [ + true, + "ignore-params" + ], + "no-misused-new": true, + "no-non-null-assertion": true, + "no-shadowed-variable": true, + "no-string-literal": false, + "no-string-throw": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unnecessary-initializer": true, + "no-unused-expression": true, + "no-var-keyword": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "prefer-const": true, + "quotemark": [ + true, + "single", + "jsx-double" + ], + "radix": true, + "semicolon": [ + true, + "always" + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "unified-signatures": true, + "variable-name": false, + "whitespace": [ + true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type" + ], + "indent": [ + true, + "spaces", + 2 + ], + "trailing-comma": [ + true, + { + "multiline": "always", + "singleline": "never" + } + ], + "linebreak-style": [ + true, + "LF" + ], + "typedef": [ + true, + "call-signature", + "parameter", + "property-declaration", + "member-variable-declaration" + ], + "no-consecutive-blank-lines": true + }, + "rulesDirectory": [], + "linterOptions": { + "typeCheck": true, + "exclude": [ + "config/**/*.js", + "node_modules/**/*.ts", + "coverage/lcov-report/*.js" + ] + } + } From e6a0dc687d61f3350fb15ac4408a1274419f5d91 Mon Sep 17 00:00:00 2001 From: Valiantsin Date: Sat, 31 Aug 2019 11:33:19 +0300 Subject: [PATCH 4/5] feat: add machine font --- .../src/components/navBar/navBar.tsx | 64 ++++++-- .../components/authorizationSignIn.tsx | 48 +++--- .../digestView/components/dateAndView.tsx | 26 ++-- .../digestView/components/leftArrowButton.tsx | 26 ++-- .../scenes/digestView/components/option.tsx | 30 ++-- .../src/scenes/digestView/digestView.tsx | 146 +++++++++--------- .../scenes/digestView/models/dateAndView.ts | 6 +- .../scenes/digestView/models/digestView.ts | 6 +- .../digestView/models/leftArrowButton.ts | 8 +- .../scenes/digestView/services/digestView.ts | 38 ++--- .../news/components/newsPresentation.tsx | 2 +- js_machine_front/src/scenes/news/news.tsx | 76 ++++----- 12 files changed, 258 insertions(+), 218 deletions(-) diff --git a/js_machine_front/src/components/navBar/navBar.tsx b/js_machine_front/src/components/navBar/navBar.tsx index 3e9fe60..2464c1b 100644 --- a/js_machine_front/src/components/navBar/navBar.tsx +++ b/js_machine_front/src/components/navBar/navBar.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import LogoSrc from './images/logo.png'; import './styles/route.css'; import './styles/routeMedia.css'; import { NavLink } from 'react-router-dom'; @@ -7,41 +6,82 @@ import { FormattedMessage } from 'react-intl'; import { NavBarState } from './models/navBar'; export class NavBar extends React.PureComponent { - public state: NavBarState = {isMenuOpened: false}; + public state: NavBarState = { isMenuOpened: false }; handleMenu = () => { - this.setState({isMenuOpened: !this.state.isMenuOpened}); + this.setState({ isMenuOpened: !this.state.isMenuOpened }); } - render(): JSX.Element { return (
    - - logo + + JS MACHINE
    - +
    - + - + - + - + - + + + +
    ); diff --git a/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx b/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx index c3febe1..6aeda8a 100644 --- a/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx +++ b/js_machine_front/src/scenes/authorization/components/authorizationSignIn.tsx @@ -1,24 +1,24 @@ -import React from 'react'; -import { SocialAuth } from './socialAuth'; -import { SignInFrom } from './signInFrom'; -import { FormattedMessage } from 'react-intl'; - -import '../styles/authorizationSignIn.css'; -import '../styles/authorizationSignInMedia.css'; - -import { SignInProps } from 'scenes/authorization/models/authorizationSignIn'; - -export const AuthorizationSignIn: React.FC = (props: SignInProps) => { - const resetSignInWidth = props.isAuthorizitationVisible ? '' : 'reset_sign-in-width'; - return ( -
    -
    -
    - -
    - - -
    -
    - ); -}; +import React from 'react'; +import { SocialAuth } from './socialAuth'; +import { SignInFrom } from './signInFrom'; +import { FormattedMessage } from 'react-intl'; + +import '../styles/authorizationSignIn.css'; +import '../styles/authorizationSignInMedia.css'; + +import { SignInProps } from 'scenes/authorization/models/authorizationSignIn'; + +export const AuthorizationSignIn: React.FC = (props: SignInProps) => { + const resetSignInWidth = props.isAuthorizitationVisible ? '' : 'reset_sign-in-width'; + return ( +
    +
    +
    + +
    + + +
    +
    + ); +}; diff --git a/js_machine_front/src/scenes/digestView/components/dateAndView.tsx b/js_machine_front/src/scenes/digestView/components/dateAndView.tsx index e5343d5..a40ca3e 100644 --- a/js_machine_front/src/scenes/digestView/components/dateAndView.tsx +++ b/js_machine_front/src/scenes/digestView/components/dateAndView.tsx @@ -1,13 +1,13 @@ -import React, { memo } from 'react'; -import Eye from '../images/eye.svg'; -import '../styles/dateAndView.css'; -import { DateAndViewProps } from '../models/dateAndView'; - -export const DateAndView: React.FC = memo((props: DateAndViewProps) => { - return ( -
    - 5 АВГ - Eye {props.views} -
    - ); -}); +import React, { memo } from 'react'; +import Eye from '../images/eye.svg'; +import '../styles/dateAndView.css'; +import { DateAndViewProps } from '../models/dateAndView'; + +export const DateAndView: React.FC = memo((props: DateAndViewProps) => { + return ( +
    + 5 АВГ + Eye {props.views} +
    + ); +}); diff --git a/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx b/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx index 16b4e89..c67ea59 100644 --- a/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx +++ b/js_machine_front/src/scenes/digestView/components/leftArrowButton.tsx @@ -1,13 +1,13 @@ -import React, { memo } from 'react'; -import '../styles/leftArrowButton.css'; -import arrow from '../images/left.svg'; -import { LeftArrowButtonProps } from '../models/leftArrowButton'; - -export const LeftArrowButton: React.FC = memo((props: LeftArrowButtonProps) => { - return ( - - left-arrow - {props.text} - - ); -}); +import React, { memo } from 'react'; +import '../styles/leftArrowButton.css'; +import arrow from '../images/left.svg'; +import { LeftArrowButtonProps } from '../models/leftArrowButton'; + +export const LeftArrowButton: React.FC = memo((props: LeftArrowButtonProps) => { + return ( + + left-arrow + {props.text} + + ); +}); diff --git a/js_machine_front/src/scenes/digestView/components/option.tsx b/js_machine_front/src/scenes/digestView/components/option.tsx index 8df02d6..05687fe 100644 --- a/js_machine_front/src/scenes/digestView/components/option.tsx +++ b/js_machine_front/src/scenes/digestView/components/option.tsx @@ -1,15 +1,15 @@ -import React, { memo } from 'react'; -import '../styles/option.css'; -import star from '../images/star.svg'; -import share from '../images/share-option.svg'; -import warning from '../images/warning.svg'; - -export const Option: React.FC = memo(() => { - return ( -
    - share - start - warning -
    - ); -}); +import React, { memo } from 'react'; +import '../styles/option.css'; +import star from '../images/star.svg'; +import share from '../images/share-option.svg'; +import warning from '../images/warning.svg'; + +export const Option: React.FC = memo(() => { + return ( +
    + share + start + warning +
    + ); +}); diff --git a/js_machine_front/src/scenes/digestView/digestView.tsx b/js_machine_front/src/scenes/digestView/digestView.tsx index e012b5a..98879f6 100644 --- a/js_machine_front/src/scenes/digestView/digestView.tsx +++ b/js_machine_front/src/scenes/digestView/digestView.tsx @@ -1,73 +1,73 @@ -import React, { memo } from 'react'; -import CSSTransition from 'react-transition-group/CSSTransition'; -import './styles/digestView.css'; - -import { LeftArrowButton } from './components/leftArrowButton'; -import { DateAndView } from './components/dateAndView'; -import { Option } from './components/option'; -import { data } from './services/digestView'; -import { DigestViewProps } from './models/digestView'; - -export const DigestView: React.FC = memo((props: DigestViewProps) => { - - const benefits = data.benefits.map((el, idx) => { - return
  • {el}
    • ; - }); - - const news = ( - -

    #Новости

    -

    {data.news.title}

    -

    {data.news.body} тут.

    -     - ); - - const event = ( - -

    #События

    -

    {data.event.title}

    -

    {data.event.body}

    -     - ); - - const greating = ( - -

    Всем доброе утро!

    -

    Прошлое неделя подарила нам интересные статьи, обновления библиотек (куда - без них), браузеров в всяких платформ.

    -

    Ну что же, берем в руку кружку, да-да, берем. Вязли? Отлично, потому что - начинаем!

    -     - ); - - return ( - -
    -
    - -
    -
    -     - ); -}); +import React, { memo } from 'react'; +import CSSTransition from 'react-transition-group/CSSTransition'; +import './styles/digestView.css'; + +import { LeftArrowButton } from './components/leftArrowButton'; +import { DateAndView } from './components/dateAndView'; +import { Option } from './components/option'; +import { data } from './services/digestView'; +import { DigestViewProps } from './models/digestView'; + +export const DigestView: React.FC = memo((props: DigestViewProps) => { + + const benefits = data.benefits.map((el, idx) => { + return
  • {el}
    • ; + }); + + const news = ( + +

    #Новости

    +

    {data.news.title}

    +

    {data.news.body} тут.

    +     + ); + + const event = ( + +

    #События

    +

    {data.event.title}

    +

    {data.event.body}

    +     + ); + + const greating = ( + +

    Всем доброе утро!

    +

    Прошлое неделя подарила нам интересные статьи, обновления библиотек (куда + без них), браузеров в всяких платформ.

    +

    Ну что же, берем в руку кружку, да-да, берем. Вязли? Отлично, потому что + начинаем!

    +     + ); + + return ( + +
    +
    + +
    +
    +     + ); +}); diff --git a/js_machine_front/src/scenes/digestView/models/dateAndView.ts b/js_machine_front/src/scenes/digestView/models/dateAndView.ts index 511600b..7bba0de 100644 --- a/js_machine_front/src/scenes/digestView/models/dateAndView.ts +++ b/js_machine_front/src/scenes/digestView/models/dateAndView.ts @@ -1,3 +1,3 @@ -export interface DateAndViewProps { - views: number; -} +export interface DateAndViewProps { + views: number; +} diff --git a/js_machine_front/src/scenes/digestView/models/digestView.ts b/js_machine_front/src/scenes/digestView/models/digestView.ts index 4c3470f..76b378e 100644 --- a/js_machine_front/src/scenes/digestView/models/digestView.ts +++ b/js_machine_front/src/scenes/digestView/models/digestView.ts @@ -1,3 +1,3 @@ -export interface DigestViewProps { - history: any; -} +export interface DigestViewProps { + history: any; +} diff --git a/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts b/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts index d5ed544..0296bfe 100644 --- a/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts +++ b/js_machine_front/src/scenes/digestView/models/leftArrowButton.ts @@ -1,4 +1,4 @@ -export interface LeftArrowButtonProps { - closeDigest: (event: React.MouseEvent) => void; - text: string; - } +export interface LeftArrowButtonProps { + closeDigest: (event: React.MouseEvent) => void; + text: string; + } diff --git a/js_machine_front/src/scenes/digestView/services/digestView.ts b/js_machine_front/src/scenes/digestView/services/digestView.ts index 7f2bb6c..24952b0 100644 --- a/js_machine_front/src/scenes/digestView/services/digestView.ts +++ b/js_machine_front/src/scenes/digestView/services/digestView.ts @@ -1,19 +1,19 @@ -export const data = { - view: 25, - news: { - title: 'В Firebox будет проведен эксперимент, связанный с DNS-over-HTTP', - body: 'Безопасность и удобство в перспективе. Что же из этого получится - не известно. Апока что читаем', - link: 'localhost:3000', - }, - event : { - title: 'The Rolling Scopes Conference (9-11 августа)', - body: 'Одна из крупнейших конференций, котарая пройдет в Минске уже в 5 раз и ужетак скоро на этих выходных!', - }, - benefits: [ - '3 дня по 3 потока', - 'Более 1000 участников', - '50+ спикеров из 13 стран 1000 участников', - 'Воркшопы и панельныные экскурсии', - ], - back: 'назад', -}; +export const data = { + view: 25, + news: { + title: 'В Firebox будет проведен эксперимент, связанный с DNS-over-HTTP', + body: 'Безопасность и удобство в перспективе. Что же из этого получится - не известно. Апока что читаем', + link: 'localhost:3000', + }, + event : { + title: 'The Rolling Scopes Conference (9-11 августа)', + body: 'Одна из крупнейших конференций, котарая пройдет в Минске уже в 5 раз и ужетак скоро на этих выходных!', + }, + benefits: [ + '3 дня по 3 потока', + 'Более 1000 участников', + '50+ спикеров из 13 стран 1000 участников', + 'Воркшопы и панельныные экскурсии', + ], + back: 'назад', +}; diff --git a/js_machine_front/src/scenes/news/components/newsPresentation.tsx b/js_machine_front/src/scenes/news/components/newsPresentation.tsx index acd1851..be0fd78 100644 --- a/js_machine_front/src/scenes/news/components/newsPresentation.tsx +++ b/js_machine_front/src/scenes/news/components/newsPresentation.tsx @@ -26,5 +26,5 @@ export const NewsPresentation: React.FC = (props) => {
    - ) + ); }; diff --git a/js_machine_front/src/scenes/news/news.tsx b/js_machine_front/src/scenes/news/news.tsx index bdc50a7..6975703 100644 --- a/js_machine_front/src/scenes/news/news.tsx +++ b/js_machine_front/src/scenes/news/news.tsx @@ -1,38 +1,38 @@ -import React from 'react'; -import Background from './images/news.jpg'; -import { FormattedMessage } from 'react-intl'; -import './styles/news.css'; - -import { EventsContainer } from './components/newsContainer'; -import { NewsModel } from './models/news'; -import { getNewsData } from './services/mocksNewsData'; - -const sectionStyle = { - height: '100vh', - backgroundImage: `url(${Background})`, - backgroundRepeat: 'no-repeat', - backgroundSize: 'cover', - backgroundPosition: 'center', -}; - -export class News extends React.PureComponent<{}, NewsModel> { - public state: NewsModel = { newsData: [] }; - - public componentDidMount = async () => { - const response = await getNewsData(); - this.setState(() => ({ newsData: response })); - } - - public render(): JSX.Element { - return ( -
    -
    -
    - -
    - -
    -
    - ); - } -} +import React from 'react'; +import Background from './images/news.jpg'; +import { FormattedMessage } from 'react-intl'; +import './styles/news.css'; + +import { EventsContainer } from './components/newsContainer'; +import { NewsModel } from './models/news'; +import { getNewsData } from './services/mocksNewsData'; + +const sectionStyle = { + height: '100vh', + backgroundImage: `url(${Background})`, + backgroundRepeat: 'no-repeat', + backgroundSize: 'cover', + backgroundPosition: 'center', +}; + +export class News extends React.PureComponent<{}, NewsModel> { + public state: NewsModel = { newsData: [] }; + + public componentDidMount = async () => { + const response = await getNewsData(); + this.setState(() => ({ newsData: response })); + } + + public render(): JSX.Element { + return ( +
    +
    +
    + +
    + +
    +
    + ); + } +} From b740571f11b5b48cdd5d25d1aa2a71f694be3aaa Mon Sep 17 00:00:00 2001 From: Valiantsin Date: Sun, 1 Sep 2019 13:09:53 +0300 Subject: [PATCH 5/5] fix: digest view --- js_machine_front/src/components/navBar/navBar.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/js_machine_front/src/components/navBar/navBar.tsx b/js_machine_front/src/components/navBar/navBar.tsx index 2464c1b..047b9f8 100644 --- a/js_machine_front/src/components/navBar/navBar.tsx +++ b/js_machine_front/src/components/navBar/navBar.tsx @@ -74,14 +74,6 @@ export class NavBar extends React.PureComponent { > - - -
    );