From 00d73f716e334ab49239d443dad93d7589d938c3 Mon Sep 17 00:00:00 2001 From: Juan Allo Date: Tue, 23 Feb 2021 07:02:15 +0000 Subject: [PATCH] Merged in feat/prettier (pull request #3) adding back semicolons * adding back semicolons --- .prettierrc.json | 2 +- .../editor/src/components/canvas/index.tsx | 8 +- .../editor/src/components/canvas/styled.ts | 4 +- .../editor/src/components/footer/index.tsx | 8 +- .../editor/src/components/footer/styled.ts | 6 +- .../editor/src/components/frame/index.tsx | 14 +- .../editor/src/components/frame/styled.ts | 4 +- .../editor/src/components/top-bar/index.tsx | 8 +- .../editor/src/components/top-bar/styled.ts | 6 +- packages/editor/src/index.tsx | 4 +- packages/editor/src/size.ts | 14 +- .../webapp/cypress/integration/maps.test.ts | 18 +- .../webapp/cypress/pageObject/MapsPage.ts | 6 +- packages/webapp/cypress/plugins/index.ts | 2 +- packages/webapp/cypress/support/commands.ts | 2 +- packages/webapp/cypress/support/index.ts | 2 +- packages/webapp/src/@types/index.d.ts | 4 +- packages/webapp/src/@types/typings.d.ts | 24 +- packages/webapp/src/app.tsx | 44 +-- packages/webapp/src/classes/app-i18n/index.ts | 50 +-- .../client/client-health-sentinel/index.tsx | 34 +- packages/webapp/src/classes/client/index.ts | 152 ++++---- .../src/classes/client/mock-client/index.ts | 160 ++++---- .../src/classes/client/rest-client/index.ts | 366 +++++++++--------- .../components/forgot-password-page/index.tsx | 62 +-- .../forgot-password-success-page/index.tsx | 26 +- .../components/form/global-error/index.tsx | 22 +- .../components/form/global-error/styled.ts | 8 +- .../src/components/form/input/index.tsx | 36 +- .../components/form/submit-button/index.tsx | 28 +- .../src/components/layout/footer/index.tsx | 14 +- .../src/components/layout/footer/styled.ts | 4 +- .../layout/form-container/index.tsx | 8 +- .../src/components/layout/header/index.tsx | 52 +-- .../src/components/layout/header/styled.ts | 8 +- .../src/components/login-page/index.tsx | 64 +-- .../account-info-dialog/index.tsx | 114 +++--- .../change-password-dialog/index.tsx | 80 ++-- .../maps-page/account-menu/index.tsx | 58 +-- .../maps-page/action-chooser/index.tsx | 60 +-- .../maps-page/action-chooser/styled.ts | 6 +- .../action-dispatcher/base-dialog/index.tsx | 54 +-- .../action-dispatcher/base-dialog/style.ts | 18 +- .../action-dispatcher/create-dialog/index.tsx | 76 ++-- .../action-dispatcher/delete-dialog/index.tsx | 50 +-- .../delete-multiselect-dialog/index.tsx | 50 +-- .../duplicate-dialog/index.tsx | 84 ++-- .../action-dispatcher/export-dialog/index.tsx | 102 ++--- .../action-dispatcher/export-dialog/style.ts | 6 +- .../history-dialog/index.tsx | 64 +-- .../action-dispatcher/import-dialog/index.tsx | 108 +++--- .../maps-page/action-dispatcher/index.tsx | 72 ++-- .../action-dispatcher/info-dialog/index.tsx | 46 +-- .../action-dispatcher/info-dialog/style.ts | 6 +- .../publish-dialog/index.tsx | 92 ++--- .../action-dispatcher/publish-dialog/style.ts | 6 +- .../action-dispatcher/rename-dialog/index.tsx | 90 ++--- .../action-dispatcher/share-dialog/index.tsx | 144 +++---- .../action-dispatcher/share-dialog/style.ts | 6 +- .../components/maps-page/help-menu/index.tsx | 46 +-- .../webapp/src/components/maps-page/index.tsx | 188 ++++----- .../maps-page/language-menu/index.tsx | 90 ++--- .../components/maps-page/maps-list/index.tsx | 314 +++++++-------- .../components/maps-page/maps-list/styled.ts | 10 +- .../components/maps-page/role-icon/index.tsx | 24 +- .../webapp/src/components/maps-page/style.ts | 10 +- .../components/registration-page/index.tsx | 94 ++--- .../registration-success-page/index.tsx | 26 +- packages/webapp/src/index.tsx | 10 +- packages/webapp/src/redux/clientSlice.ts | 92 ++--- packages/webapp/src/redux/store.ts | 8 +- packages/webapp/src/theme/index.ts | 6 +- 72 files changed, 1792 insertions(+), 1792 deletions(-) diff --git a/.prettierrc.json b/.prettierrc.json index 932ed3ef..0c45137e 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,7 +1,7 @@ { "trailingComma": "es5", "tabWidth": 4, - "semi": false, + "semi": true, "singleQuote": true, "printWidth": 100 } diff --git a/packages/editor/src/components/canvas/index.tsx b/packages/editor/src/components/canvas/index.tsx index dbc87f1f..eeb2d746 100644 --- a/packages/editor/src/components/canvas/index.tsx +++ b/packages/editor/src/components/canvas/index.tsx @@ -1,6 +1,6 @@ -import React from 'react' -import { StyledCanvas } from './styled' +import React from 'react'; +import { StyledCanvas } from './styled'; -const Canvas = (): React.ReactElement => canvas +const Canvas = (): React.ReactElement => canvas; -export default Canvas +export default Canvas; diff --git a/packages/editor/src/components/canvas/styled.ts b/packages/editor/src/components/canvas/styled.ts index 8f35d710..7cc7eb85 100644 --- a/packages/editor/src/components/canvas/styled.ts +++ b/packages/editor/src/components/canvas/styled.ts @@ -1,8 +1,8 @@ -import styled from 'styled-components' +import styled from 'styled-components'; export const StyledCanvas = styled.div` height: 100% width: 100%; flex: 1; -` +`; diff --git a/packages/editor/src/components/footer/index.tsx b/packages/editor/src/components/footer/index.tsx index b42ffdca..d654d237 100644 --- a/packages/editor/src/components/footer/index.tsx +++ b/packages/editor/src/components/footer/index.tsx @@ -1,6 +1,6 @@ -import React from 'react' -import { StyledFooter } from './styled' +import React from 'react'; +import { StyledFooter } from './styled'; -const Footer = (): React.ReactElement => footer +const Footer = (): React.ReactElement => footer; -export default Footer +export default Footer; diff --git a/packages/editor/src/components/footer/styled.ts b/packages/editor/src/components/footer/styled.ts index e9d95535..b731d333 100644 --- a/packages/editor/src/components/footer/styled.ts +++ b/packages/editor/src/components/footer/styled.ts @@ -1,8 +1,8 @@ -import styled from 'styled-components' -import { times } from '../../size' +import styled from 'styled-components'; +import { times } from '../../size'; export const StyledFooter = styled.div` height: ${times(10)}; width: 100%; border: 1px solid black; -` +`; diff --git a/packages/editor/src/components/frame/index.tsx b/packages/editor/src/components/frame/index.tsx index 31f88de4..b809c9db 100644 --- a/packages/editor/src/components/frame/index.tsx +++ b/packages/editor/src/components/frame/index.tsx @@ -1,8 +1,8 @@ -import React from 'react' -import Footer from '../footer' -import TopBar from '../top-bar' -import Canvas from '../canvas' -import { StyledFrame } from './styled' +import React from 'react'; +import Footer from '../footer'; +import TopBar from '../top-bar'; +import Canvas from '../canvas'; +import { StyledFrame } from './styled'; const Frame = (): React.ReactElement => ( @@ -10,6 +10,6 @@ const Frame = (): React.ReactElement => (