25 files changed, 40 insertions, 84 deletions

diff --git a/package-lock.json b/package-lock.json
index 6dc24c638..3b71bdba0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5299,14 +5299,6 @@
         "color": "4.0.1"
       }
     },
-    "@meetfranz/ui": {
-      "version": "file:packages/ui",
-      "requires": {
-        "@mdi/react": "1.5.0",
-        "@meetfranz/theme": "file:packages/theme",
-        "react-loader": "2.4.7"
-      }
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -16485,7 +16477,17 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "cli-truncate": "^1.1.0"
+        "cli-truncate": "^1.1.0",
+        "node-addon-api": "^1.6.3"
+      },
+      "dependencies": {
+        "node-addon-api": {
+          "version": "1.7.2",
+          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
+          "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "iconv-lite": {
diff --git a/package.json b/package.json
index 1733c0e24..e7388eec9 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,6 @@
     "@mdi/js": "6.2.95",
     "@meetfranz/forms": "file:packages/forms",
     "@meetfranz/theme": "file:packages/theme",
-    "@meetfranz/ui": "file:packages/ui",
     "@sentry/electron": "2.5.3",
     "auto-launch": "5.0.5",
     "btoa": "1.2.1",
diff --git a/packages/ui/.gitignore b/packages/ui/.gitignore
deleted file mode 100644
index d01826a6b..000000000
--- a/packages/ui/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-lib
diff --git a/packages/ui/package.json b/packages/ui/package.json
deleted file mode 100644
index 0de76a98b..000000000
--- a/packages/ui/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "@meetfranz/ui",
-  "version": "1.1.0",
-  "description": "React UI 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": "Stefan Malzner <stefan@adlk.io>",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "@mdi/react": "1.5.0",
-    "@meetfranz/theme": "file:../theme",
-    "react-loader": "2.4.7"
-  },
-  "gitHead": "254da30f801169fac376bda1439b46cabbb491ad"
-}
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
deleted file mode 100644
index bab3fc27b..000000000
--- a/packages/ui/src/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { Icon } from './icon';
-export { Infobox } from './infobox';
-export { H1, H2, H3, H4 } from './headline';
-export { Loader } from './loader';
-export { Badge } from './badge';
-export { ProBadge } from './badge/ProBadge';
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
deleted file mode 100644
index 015581136..000000000
--- a/packages/ui/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 d0efd6361..d009a2878 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -6,7 +6,7 @@ import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
 import { Input, Button } from '@meetfranz/forms';
-import { Badge } from '@meetfranz/ui';
+import { Badge } from '../ui/badge';
 import Modal from '../ui/Modal';
 import Infobox from '../ui/Infobox';
 import Appear from '../ui/effects/Appear';
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index 236d2739b..5111a081a 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -2,12 +2,11 @@ import { createRef, Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { Icon } from '@meetfranz/ui';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import { mdiAlert } from '@mdi/js';
 import { LIVE_API_FERDI_WEBSITE } from '../../../config';
-// import { Button } from '@meetfranz/forms';
+import { Icon } from '../../ui/icon';
 
 const messages = defineMessages({
   text: {
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 686501267..6c489e64b 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
-import { H1, H2 } from '@meetfranz/ui';
+import { H1, H2 } from '../../ui/headline';
 
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 0c521319a..8ab726eb3 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -6,7 +6,8 @@ import { Link } from 'react-router';
 
 import { Button, Input } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
-import { H3, H2 } from '@meetfranz/ui';
+
+import { H3, H2 } from '../../ui/headline';
 import SearchInput from '../../ui/SearchInput';
 import Infobox from '../../ui/Infobox';
 import RecipeItem from './RecipeItem';
diff --git a/src/components/ui/Modal/index.tsx b/src/components/ui/Modal/index.tsx
index 0bb0aaa61..f2f4461b8 100644
--- a/src/components/ui/Modal/index.tsx
+++ b/src/components/ui/Modal/index.tsx
@@ -2,9 +2,9 @@ import { Component, ReactChildren } from 'react';
 import ReactModal from 'react-modal';
 import classnames from 'classnames';
 import injectCSS from 'react-jss';
-import { Icon } from '@meetfranz/ui';
-
 import { mdiClose } from '@mdi/js';
+
+import { Icon } from '../icon';
 import styles from './styles';
 
 type Props = {
diff --git a/packages/ui/src/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx
index be7ed8e58..cb6bc4c98 100644
--- a/packages/ui/src/badge/ProBadge.tsx
+++ b/src/components/ui/badge/ProBadge.tsx
@@ -3,8 +3,9 @@ import classnames from 'classnames';
 import { Component } from 'react';
 import injectStyle from 'react-jss';
 
-import { Badge, Icon } from '..';
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
+import { Icon } from '../icon';
+import { Badge } from './index';
 import { IWithStyle } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/packages/ui/src/badge/index.tsx b/src/components/ui/badge/index.tsx
index a8f3ebcbf..6495036ff 100644
--- a/packages/ui/src/badge/index.tsx
+++ b/src/components/ui/badge/index.tsx
@@ -2,7 +2,7 @@ import classnames from 'classnames';
 import { Component, ReactNode } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 import { IWithStyle } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/packages/ui/src/headline/index.tsx b/src/components/ui/headline/index.tsx
index b534a6298..3a3654f02 100644
--- a/packages/ui/src/headline/index.tsx
+++ b/src/components/ui/headline/index.tsx
@@ -2,7 +2,7 @@ import classnames from 'classnames';
 import { Component, createElement, ReactNode } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 import { IWithStyle, Omit } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/packages/ui/src/icon/index.tsx b/src/components/ui/icon/index.tsx
index 9753b399c..fdc48d14a 100644
--- a/packages/ui/src/icon/index.tsx
+++ b/src/components/ui/icon/index.tsx
@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import { Component } from 'react';
 import injectStyle from 'react-jss';
 
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 import { IWithStyle } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/packages/ui/src/infobox/index.tsx b/src/components/ui/infobox/index.tsx
index 7bad4a1f2..e6be83556 100644
--- a/packages/ui/src/infobox/index.tsx
+++ b/src/components/ui/infobox/index.tsx
@@ -3,8 +3,8 @@ import classnames from 'classnames';
 import { Component, ReactNode } from 'react';
 import injectStyle from 'react-jss';
 
-import { Icon } from '..';
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
+import { Icon } from '../icon';
 import { IWithStyle } from '../typings/generic';
 
 interface IProps extends IWithStyle {
diff --git a/packages/ui/src/loader/index.tsx b/src/components/ui/loader/index.tsx
index 0607bd48b..0607bd48b 100644
--- a/packages/ui/src/loader/index.tsx
+++ b/src/components/ui/loader/index.tsx
diff --git a/packages/ui/src/typings/generic.ts b/src/components/ui/typings/generic.ts
index a2b9c041c..ddce3f7c7 100644
--- a/packages/ui/src/typings/generic.ts
+++ b/src/components/ui/typings/generic.ts
@@ -1,6 +1,6 @@
 import { Classes } from 'jss';
 
-import { Theme } from '../../../theme';
+import { Theme } from '@meetfranz/theme';
 
 export interface IWithStyle {
   classes: Classes;
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index 98a7cb5a2..64f782c8f 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import injectSheet from 'react-jss';
 import { defineMessages, injectIntl } from 'react-intl';
-import { H1 } from '@meetfranz/ui';
+import { H1 } from '../../components/ui/headline';
 
 import Modal from '../../components/ui/Modal';
 import Button from '../../components/ui/Button';
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index d3751b63d..30bdc13b6 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -1,10 +1,11 @@
-import { H1 } from '@meetfranz/ui';
 import { inject, observer } from 'mobx-react';
 import PropTypes from 'prop-types';
 import { Component } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import { state as ModalState } from './store';
+
+import { H1 } from '../../components/ui/headline';
 import { sendAuthRequest } from '../../api/utils/auth';
 import Button from '../../components/ui/Button';
 import Input from '../../components/ui/Input';
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 76b3c9b4b..ced047a93 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -6,9 +6,9 @@ import { reaction } from 'mobx';
 import injectSheet from 'react-jss';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Input } from '@meetfranz/forms';
-import { H1 } from '@meetfranz/ui';
-
 import { compact, invoke } from 'lodash';
+
+import { H1 } from '../../components/ui/headline';
 import Modal from '../../components/ui/Modal';
 import { state as ModalState } from './store';
 import ServicesStore from '../../stores/ServicesStore';
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index 8261ede2b..5650d4cd1 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -2,7 +2,6 @@ import { createRef, Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
-import { Icon } from '@meetfranz/ui';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import {
@@ -13,6 +12,8 @@ import {
   mdiEarth,
 } from '@mdi/js';
 
+import { Icon } from '../../../components/ui/icon';
+
 const messages = defineMessages({
   goHome: {
     id: 'webControls.goHome',
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 54e74fdf5..590efacd0 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -3,10 +3,12 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import { defineMessages, injectIntl } from 'react-intl';
-import { H1, Icon } from '@meetfranz/ui';
 import ReactTooltip from 'react-tooltip';
 
 import { mdiPlusBox, mdiCog } from '@mdi/js';
+
+import { H1 } from '../../../components/ui/headline';
+import { Icon } from '../../../components/ui/icon';
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
 import { workspaceStore } from '../index';
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
index 187b6a516..ff4e9475a 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
-import { Loader } from '@meetfranz/ui';
 import { defineMessages, injectIntl } from 'react-intl';
 
+import { Loader } from '../../../components/ui/loader/index';
 import { workspaceStore } from '../index';
 
 const messages = defineMessages({
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index 8ab9174d3..6e0d98ffb 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -3,9 +3,10 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
-import { Infobox } from '@meetfranz/ui';
 
 import { mdiCheckboxMarkedCircleOutline } from '@mdi/js';
+
+import { Infobox } from '../../../components/ui/infobox/index';
 import Loader from '../../../components/ui/Loader';
 import WorkspaceItem from './WorkspaceItem';
 import CreateWorkspaceForm from './CreateWorkspaceForm';