28 files changed, 30 insertions, 105 deletions

diff --git a/package-lock.json b/package-lock.json
index 3b71bdba0..f6742cca4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5276,23 +5276,6 @@
       "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.5.0.tgz",
       "integrity": "sha512-NztRgUxSYD+ImaKN94Tg66VVVqXj4SmlDGzZoz48H9riJ+Awha56sfXH2fegw819NWo7KI3oeS1Es0lNQqwr0w=="
     },
-    "@meetfranz/forms": {
-      "version": "file:packages/forms",
-      "requires": {
-        "@mdi/js": "3.3.92",
-        "@mdi/react": "1.5.0",
-        "@meetfranz/theme": "file:packages/theme",
-        "csstype": "3.0.8",
-        "react-loader": "2.4.7"
-      },
-      "dependencies": {
-        "@mdi/js": {
-          "version": "3.3.92",
-          "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.3.92.tgz",
-          "integrity": "sha512-l+12IwTycHlijWMiRWBAssm0RSgkQiwMthIy/EcBAdSqtnsHnFjHq+aI2MBZ8/AYX0QBxNUv4+EN0SXZgNkWDg=="
-        }
-      }
-    },
     "@meetfranz/theme": {
       "version": "file:packages/theme",
       "requires": {
diff --git a/package.json b/package.json
index e7388eec9..248a96ef9 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@electron/remote": "1.2.1",
     "@mdi/font": "6.2.95",
     "@mdi/js": "6.2.95",
-    "@meetfranz/forms": "file:packages/forms",
+    "@mdi/react": "1.5.0",
     "@meetfranz/theme": "file:packages/theme",
     "@sentry/electron": "2.5.3",
     "auto-launch": "5.0.5",
diff --git a/packages/forms/.gitignore b/packages/forms/.gitignore
deleted file mode 100644
index d01826a6b..000000000
--- a/packages/forms/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-lib
diff --git a/packages/forms/package.json b/packages/forms/package.json
deleted file mode 100644
index f073221bc..000000000
--- a/packages/forms/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "@meetfranz/forms",
-  "version": "1.2.1",
-  "description": "React form components for Franz",
-  "main": "lib/index.js",
-  "scripts": {
-    "dev": "tsc -w",
-    "build": "tsc"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/meetfranz/franz.git"
-  },
-  "keywords": [
-    "Franz",
-    "Forms",
-    "React",
-    "UI"
-  ],
-  "author": "Amine Mouafik <amine@mouafik.fr>",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "@mdi/js": "3.3.92",
-    "@mdi/react": "1.5.0",
-    "@meetfranz/theme": "file:../theme",
-    "csstype": "3.0.8",
-    "react-loader": "2.4.7"
-  },
-  "gitHead": "00db2bddccb8bb8ad7d29b8d032876c798b8bbf3"
-}
diff --git a/packages/forms/src/index.ts b/packages/forms/src/index.ts
deleted file mode 100644
index 45a9ed8e3..000000000
--- a/packages/forms/src/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { Input } from './input';
-export { Textarea } from './textarea';
-export { Toggle } from './toggle';
-export { Button } from './button';
-export { Select } from './select';
diff --git a/packages/forms/src/typings/generic.ts b/packages/forms/src/typings/generic.ts
deleted file mode 100644
index 0fd0cdbf3..000000000
--- a/packages/forms/src/typings/generic.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Classes } from 'jss';
-
-import { Theme } from '../../../theme';
-
-export interface IFormField {
-  showLabel?: boolean;
-  label?: string;
-  error?: string;
-  required?: boolean;
-  noMargin?: boolean;
-}
-
-export interface IWithStyle {
-  classes: Classes;
-  theme: Theme;
-}
-
-export type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N;
-export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json
deleted file mode 100644
index 015581136..000000000
--- a/packages/forms/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "lib",
-    "rootDir": "src"
-  },
-  "references": [
-    {
-      "path": "../theme"
-    }
-  ]
-}
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index d009a2878..1665bf837 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -5,7 +5,8 @@ import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
-import { Input, Button } from '@meetfranz/forms';
+import { Input } from '../ui/input/index';
+import { Button } from '../ui/button/index';
 import { Badge } from '../ui/badge';
 import Modal from '../ui/Modal';
 import Infobox from '../ui/Infobox';
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 8ab726eb3..bdb6f3ca0 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -4,9 +4,10 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 
-import { Button, Input } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
 
+import { Button } from '../../ui/button/index';
+import { Input } from '../../ui/input/index';
 import { H3, H2 } from '../../ui/headline';
 import SearchInput from '../../ui/SearchInput';
 import Infobox from '../../ui/Infobox';
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 55883e65f..1b8a4f25a 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -3,10 +3,9 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
-import { Input } from '@meetfranz/forms';
 
+import { Input } from '../../ui/input/index';
 import Form from '../../../lib/Form';
-// import Input from '../../ui/Input';
 import Button from '../../ui/Button';
 import Radio from '../../ui/Radio';
 import Infobox from '../../ui/Infobox';
diff --git a/packages/forms/src/button/index.tsx b/src/components/ui/button/index.tsx
index d9f372c4b..5b8927b51 100644
--- a/packages/forms/src/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -4,9 +4,9 @@ import { Property } from 'csstype';
 import { Component, MouseEvent } from 'react';
 import injectStyle, { withTheme } from 'react-jss';
 import Loader from 'react-loader';
+import { Theme } from '@meetfranz/theme';
 
 import { IFormField, IWithStyle } from '../typings/generic';
-import { Theme } from '../../../theme';
 
 type ButtonType =
   | 'primary'
diff --git a/packages/forms/src/error/index.tsx b/src/components/ui/error/index.tsx
index 8439bfc8b..8439bfc8b 100644
--- a/packages/forms/src/error/index.tsx
+++ b/src/components/ui/error/index.tsx
diff --git a/packages/forms/src/error/styles.ts b/src/components/ui/error/styles.ts
index 4c0c7e2c0..ed993ddd5 100644
--- a/packages/forms/src/error/styles.ts
+++ b/src/components/ui/error/styles.ts
@@ -1,4 +1,4 @@
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 
 export default (theme: Theme) => ({
   message: {
diff --git a/packages/forms/src/input/index.tsx b/src/components/ui/input/index.tsx
index 0b16fe688..0b16fe688 100644
--- a/packages/forms/src/input/index.tsx
+++ b/src/components/ui/input/index.tsx
diff --git a/packages/forms/src/input/scorePassword.ts b/src/components/ui/input/scorePassword.ts
index 59502e2b0..59502e2b0 100644
--- a/packages/forms/src/input/scorePassword.ts
+++ b/src/components/ui/input/scorePassword.ts
diff --git a/packages/forms/src/input/styles.ts b/src/components/ui/input/styles.ts
index 6d56e93b3..27426152e 100644
--- a/packages/forms/src/input/styles.ts
+++ b/src/components/ui/input/styles.ts
@@ -1,6 +1,6 @@
 import { Property } from 'csstype';
 
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 
 const prefixStyles = (theme: Theme) => ({
   background: theme.inputPrefixBackground,
diff --git a/packages/forms/src/label/index.tsx b/src/components/ui/label/index.tsx
index 4d86f23f7..4d86f23f7 100644
--- a/packages/forms/src/label/index.tsx
+++ b/src/components/ui/label/index.tsx
diff --git a/packages/forms/src/label/styles.ts b/src/components/ui/label/styles.ts
index 7c62b6b4c..0c9cef8bf 100644
--- a/packages/forms/src/label/styles.ts
+++ b/src/components/ui/label/styles.ts
@@ -1,4 +1,4 @@
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 
 export default (theme: Theme) => ({
   content: {},
diff --git a/packages/forms/src/select/index.tsx b/src/components/ui/select/index.tsx
index d965d3c93..41cab7818 100644
--- a/packages/forms/src/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -8,8 +8,9 @@ import classnames from 'classnames';
 import { ChangeEvent, Component, createRef } from 'react';
 import injectStyle from 'react-jss';
 
+import { Theme } from '@meetfranz/theme';
+
 import { IFormField, IWithStyle } from '../typings/generic';
-import { Theme } from '../../../theme';
 
 import { Error } from '../error';
 import { Label } from '../label';
diff --git a/packages/forms/src/textarea/index.tsx b/src/components/ui/textarea/index.tsx
index 1b16698eb..1b16698eb 100644
--- a/packages/forms/src/textarea/index.tsx
+++ b/src/components/ui/textarea/index.tsx
diff --git a/packages/forms/src/textarea/styles.ts b/src/components/ui/textarea/styles.ts
index ff3a3202b..f2267e000 100644
--- a/packages/forms/src/textarea/styles.ts
+++ b/src/components/ui/textarea/styles.ts
@@ -1,6 +1,6 @@
 import { Property } from 'csstype';
 
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 
 export default (theme: Theme) => ({
   label: {
diff --git a/packages/forms/src/toggle/index.tsx b/src/components/ui/toggle/index.tsx
index f9ef5775a..67b6c3835 100644
--- a/packages/forms/src/toggle/index.tsx
+++ b/src/components/ui/toggle/index.tsx
@@ -2,9 +2,9 @@ import classnames from 'classnames';
 import { Property } from 'csstype';
 import { Component, InputHTMLAttributes } from 'react';
 import injectStyle from 'react-jss';
+import { Theme } from '@meetfranz/theme';
 
 import { IFormField, IWithStyle } from '../typings/generic';
-import { Theme } from '../../../theme';
 
 import { Error } from '../error';
 import { Label } from '../label';
diff --git a/src/components/ui/typings/generic.ts b/src/components/ui/typings/generic.ts
index ddce3f7c7..084e0e0a5 100644
--- a/src/components/ui/typings/generic.ts
+++ b/src/components/ui/typings/generic.ts
@@ -2,6 +2,14 @@ import { Classes } from 'jss';
 
 import { Theme } from '@meetfranz/theme';
 
+export interface IFormField {
+  showLabel?: boolean;
+  label?: string;
+  error?: string;
+  required?: boolean;
+  noMargin?: boolean;
+}
+
 export interface IWithStyle {
   classes: Classes;
   theme: Theme;
diff --git a/packages/forms/src/wrapper/index.tsx b/src/components/ui/wrapper/index.tsx
index ffcd6fe0b..ffcd6fe0b 100644
--- a/packages/forms/src/wrapper/index.tsx
+++ b/src/components/ui/wrapper/index.tsx
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index ced047a93..d5cb9179f 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -5,9 +5,9 @@ import { observer, inject } from 'mobx-react';
 import { reaction } from 'mobx';
 import injectSheet from 'react-jss';
 import { defineMessages, injectIntl } from 'react-intl';
-import { Input } from '@meetfranz/forms';
 import { compact, invoke } from 'lodash';
 
+import { Input } from '../../components/ui/input/index';
 import { H1 } from '../../components/ui/headline';
 import Modal from '../../components/ui/Modal';
 import { state as ModalState } from './store';
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index c93f8f6f7..75f6d9f4a 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -2,8 +2,10 @@ import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
-import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
+
+import { Input } from '../../../components/ui/input/index';
+import { Button } from '../../../components/ui/button/index';
 import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
 import { workspaceStore } from '../index';
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index 1bd06c4b2..fa3ea4289 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -1,11 +1,12 @@
-import { Component, Fragment } from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
-import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
 
+import { Input } from '../../../components/ui/input/index';
+import { Button } from '../../../components/ui/button/index';
 import Workspace from '../models/Workspace';
 import Service from '../../../models/Service';
 import Form from '../../../lib/Form';
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
index b6faaf4ce..6e012eb1e 100644
--- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
@@ -2,8 +2,8 @@ import { Component } from 'react';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
-import { Toggle } from '@meetfranz/forms';
 
+import { Toggle } from '../../../components/ui/toggle/index';
 import ServiceIcon from '../../../components/ui/ServiceIcon';
 
 const styles = theme => ({