From 7b44ac2ab144499fd7709e7c618a3116a515de0d Mon Sep 17 00:00:00 2001 From: FelixBlaisThon Date: Fri, 14 Feb 2020 14:15:11 -0500 Subject: [PATCH 1/3] refactor(form layout): clean form layout section in react-vapor -childElement, -group, -splitLayout --- packages/react-vapor/docs/src/styles/Menu.tsx | 3 - .../src/styles/form-layouts/FormChild.tsx | 132 ------------------ .../src/styles/form-layouts/FormGroups.tsx | 25 ---- .../src/styles/form-layouts/SplitLayout.tsx | 62 -------- .../docs/src/styles/form-layouts/index.tsx | 6 - 5 files changed, 228 deletions(-) delete mode 100644 packages/react-vapor/docs/src/styles/form-layouts/FormChild.tsx delete mode 100644 packages/react-vapor/docs/src/styles/form-layouts/FormGroups.tsx delete mode 100644 packages/react-vapor/docs/src/styles/form-layouts/SplitLayout.tsx diff --git a/packages/react-vapor/docs/src/styles/Menu.tsx b/packages/react-vapor/docs/src/styles/Menu.tsx index 174f3d59e0..747ff8f0eb 100644 --- a/packages/react-vapor/docs/src/styles/Menu.tsx +++ b/packages/react-vapor/docs/src/styles/Menu.tsx @@ -71,9 +71,6 @@ const Navigation: React.FunctionComponent = () => ( - - - diff --git a/packages/react-vapor/docs/src/styles/form-layouts/FormChild.tsx b/packages/react-vapor/docs/src/styles/form-layouts/FormChild.tsx deleted file mode 100644 index 840a848d3b..0000000000 --- a/packages/react-vapor/docs/src/styles/form-layouts/FormChild.tsx +++ /dev/null @@ -1,132 +0,0 @@ -import * as React from 'react'; - -import {Svg} from '../../../../src/components/svg/Svg'; -import VaporComponent from '../../demo-building-blocs/VaporComponent'; - -export const FormChild = () => ( - -
-
- - -
-
- - -
-
-
-
-
-
-
- A radio-select -
-
- - -
-
- - -
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-); - -export default FormChild; diff --git a/packages/react-vapor/docs/src/styles/form-layouts/FormGroups.tsx b/packages/react-vapor/docs/src/styles/form-layouts/FormGroups.tsx deleted file mode 100644 index 90afe31899..0000000000 --- a/packages/react-vapor/docs/src/styles/form-layouts/FormGroups.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import * as React from 'react'; - -import VaporComponent from '../../demo-building-blocs/VaporComponent'; - -export const FormGroups = () => ( - -
-
- {/* fieldset tag is optional, you can use a simple div */} - - -
-
- - -
-
- - -
-
-
-); - -export default FormGroups; diff --git a/packages/react-vapor/docs/src/styles/form-layouts/SplitLayout.tsx b/packages/react-vapor/docs/src/styles/form-layouts/SplitLayout.tsx deleted file mode 100644 index d5b1deea31..0000000000 --- a/packages/react-vapor/docs/src/styles/form-layouts/SplitLayout.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import * as React from 'react'; - -import VaporComponent from '../../demo-building-blocs/VaporComponent'; - -export const SplitLayout = () => ( - -
-
-
-

- Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque - laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto - beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut - odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. - Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, - sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat - voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit - laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui - in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat - quo voluptas nulla pariatur? -

-
-
-
    -
  • - -
    -

    Lorem ipsum dolor sit amet.

    -
    -
  • -
  • - -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
  • -
-
-
-
-
-); - -export default SplitLayout; diff --git a/packages/react-vapor/docs/src/styles/form-layouts/index.tsx b/packages/react-vapor/docs/src/styles/form-layouts/index.tsx index 9a0ba50fde..d851812535 100644 --- a/packages/react-vapor/docs/src/styles/form-layouts/index.tsx +++ b/packages/react-vapor/docs/src/styles/form-layouts/index.tsx @@ -1,17 +1,11 @@ import * as React from 'react'; import {Redirect, Route, RouteComponentProps} from 'react-router-dom'; -import FormChild from './FormChild'; import FormChildSection from './FormChildSection'; -import FormGroups from './FormGroups'; -import SplitLayout from './SplitLayout'; const FormLayout: React.FunctionComponent = ({match}) => { return ( <> - - - } /> From 2c4aeec4e22ddc85ddfce2d735c6a513b2e8a643 Mon Sep 17 00:00:00 2001 From: FelixBlaisThon Date: Fri, 21 Feb 2020 14:06:25 -0500 Subject: [PATCH 2/3] refactor(form layout): remove this section from react-vapor/style child section element has been remove since the class child-section is used in only one file in the entire admin (we can change this component with something ele) --- .../src/styles/form-layouts/FormChild.tsx | 132 ------------------ .../styles/form-layouts/FormChildSection.tsx | 56 -------- .../src/styles/form-layouts/FormGroups.tsx | 25 ---- .../src/styles/form-layouts/SplitLayout.tsx | 62 -------- .../demo/src/styles/form-layouts/index.tsx | 15 -- 5 files changed, 290 deletions(-) delete mode 100644 packages/demo/src/styles/form-layouts/FormChild.tsx delete mode 100644 packages/demo/src/styles/form-layouts/FormChildSection.tsx delete mode 100644 packages/demo/src/styles/form-layouts/FormGroups.tsx delete mode 100644 packages/demo/src/styles/form-layouts/SplitLayout.tsx delete mode 100644 packages/demo/src/styles/form-layouts/index.tsx diff --git a/packages/demo/src/styles/form-layouts/FormChild.tsx b/packages/demo/src/styles/form-layouts/FormChild.tsx deleted file mode 100644 index a8058d33a3..0000000000 --- a/packages/demo/src/styles/form-layouts/FormChild.tsx +++ /dev/null @@ -1,132 +0,0 @@ -import * as React from 'react'; - -import {Svg} from 'react-vapor'; -import VaporComponent from '../../demo-building-blocs/VaporComponent'; - -export const FormChild = () => ( - -
-
- - -
-
- - -
-
-
-
-
-
-
- A radio-select -
-
- - -
-
- - -
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-); - -export default FormChild; diff --git a/packages/demo/src/styles/form-layouts/FormChildSection.tsx b/packages/demo/src/styles/form-layouts/FormChildSection.tsx deleted file mode 100644 index 3ce759aaf1..0000000000 --- a/packages/demo/src/styles/form-layouts/FormChildSection.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import * as React from 'react'; - -import VaporComponent from '../../demo-building-blocs/VaporComponent'; - -export const FormChildSection = () => ( - -
-
-
-
- Default Option - -
-
-
-
-
- Default Option - -
-
-
- - -
-
-
- -
-
-
- Default Option - -
-
-
-
- - -
-
- - -
-
-
-
-
-); - -export default FormChildSection; diff --git a/packages/demo/src/styles/form-layouts/FormGroups.tsx b/packages/demo/src/styles/form-layouts/FormGroups.tsx deleted file mode 100644 index 90afe31899..0000000000 --- a/packages/demo/src/styles/form-layouts/FormGroups.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import * as React from 'react'; - -import VaporComponent from '../../demo-building-blocs/VaporComponent'; - -export const FormGroups = () => ( - -
-
- {/* fieldset tag is optional, you can use a simple div */} - - -
-
- - -
-
- - -
-
-
-); - -export default FormGroups; diff --git a/packages/demo/src/styles/form-layouts/SplitLayout.tsx b/packages/demo/src/styles/form-layouts/SplitLayout.tsx deleted file mode 100644 index d5b1deea31..0000000000 --- a/packages/demo/src/styles/form-layouts/SplitLayout.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import * as React from 'react'; - -import VaporComponent from '../../demo-building-blocs/VaporComponent'; - -export const SplitLayout = () => ( - -
-
-
-

- Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque - laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto - beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut - odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. - Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, - sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat - voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit - laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui - in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat - quo voluptas nulla pariatur? -

-
-
-
    -
  • - -
    -

    Lorem ipsum dolor sit amet.

    -
    -
  • -
  • - -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
  • -
-
-
-
-
-); - -export default SplitLayout; diff --git a/packages/demo/src/styles/form-layouts/index.tsx b/packages/demo/src/styles/form-layouts/index.tsx deleted file mode 100644 index d851812535..0000000000 --- a/packages/demo/src/styles/form-layouts/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import * as React from 'react'; -import {Redirect, Route, RouteComponentProps} from 'react-router-dom'; - -import FormChildSection from './FormChildSection'; - -const FormLayout: React.FunctionComponent = ({match}) => { - return ( - <> - - } /> - - ); -}; - -export default FormLayout; From 7859cee0faa6f085d21d8973cfa9edf0163a7fb4 Mon Sep 17 00:00:00 2001 From: FelixBlaisThon Date: Fri, 21 Feb 2020 14:08:02 -0500 Subject: [PATCH 3/3] refactor(form layout): removed form layout from menu.tsx and index.tsx --- packages/demo/src/styles/Menu.tsx | 3 --- packages/demo/src/styles/index.tsx | 2 -- 2 files changed, 5 deletions(-) diff --git a/packages/demo/src/styles/Menu.tsx b/packages/demo/src/styles/Menu.tsx index b51632644e..bfac47b1bc 100644 --- a/packages/demo/src/styles/Menu.tsx +++ b/packages/demo/src/styles/Menu.tsx @@ -56,9 +56,6 @@ const Navigation: React.FunctionComponent = () => (
- - - diff --git a/packages/demo/src/styles/index.tsx b/packages/demo/src/styles/index.tsx index 21800bf670..396f389a08 100644 --- a/packages/demo/src/styles/index.tsx +++ b/packages/demo/src/styles/index.tsx @@ -6,7 +6,6 @@ import Colors from './colors'; import Components from './components'; import Filtering from './filtering'; import FormControls from './form'; -import FormLayout from './form-layouts'; import GeneralGuidelines from './general-guidelines'; import Headers from './headers'; import Icons from './icons'; @@ -30,7 +29,6 @@ const Styles: React.FunctionComponent = ({match}) => { -