merges modernize client

src/client/components/forms/Form/index.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import FormContext from './Context';
 import { useLocale } from '../../utilities/Locale';
 import { useStatusList } from '../../modules/Status';
-import HiddenInput from '../../field-types/HiddenInput';
+import HiddenInput from '../field-types/HiddenInput';
 import api from '../../../api';
 
 import './index.scss';

src/client/components/forms/field-types/fieldType/index.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import FormContext from '../../forms/Form/Context'
+import FormContext from '../../Form/Context'
 
 import './index.scss';
 

src/client/components/views/CreateUser/index.js

@@ -1,28 +1,42 @@
 import React from 'react';
 import ContentBlock from '../../layout/ContentBlock';
 import Form from '../../forms/Form';
-import Email from '../../field-types/Email';
-import Password from '../../field-types/Password';
+import Email from '../../forms/field-types/Email';
+import Password from '../../forms/field-types/Password';
 import FormSubmit from '../../forms/Submit';
 import SetStepNav from '../../utilities/SetStepNav';
 
 import './index.scss';
 
 const CreateUser = () => {
-
   return (
-    <ContentBlock className="create-user" align="left" width="narrow">
+    <ContentBlock
+      className="create-user"
+      align="left"
+      width="narrow"
+    >
       <SetStepNav nav={[
         {
-          label: 'Create User'
-        }
-      ]} />
+          label: 'Create User',
+        },
+      ]}
+      />
       <h1>Create New User</h1>
       <Form
         method="POST"
-        action="http://localhost:3000/users">
-        <Email label="Email Address" name="email" required />
-        <Password error="password" label="Password" name="password" required />
+        action="http://localhost:3000/users"
+      >
+        <Email
+          label="Email Address"
+          name="email"
+          required
+        />
+        <Password
+          error="password"
+          label="Password"
+          name="password"
+          required
+        />
         <FormSubmit>Create</FormSubmit>
       </Form>
     </ContentBlock>

src/client/components/views/Login/index.js

@@ -3,8 +3,8 @@ import Cookies from 'universal-cookie';
 import { Link } from 'react-router-dom';
 import ContentBlock from '../../layout/ContentBlock';
 import Form from '../../forms/Form';
-import Email from '../../field-types/Email';
-import Password from '../../field-types/Password';
+import Email from '../../forms/field-types/Email';
+import Password from '../../forms/field-types/Password';
 import FormSubmit from '../../forms/Submit';
 
 import './index.scss';