13 files changed, 43 insertions, 18 deletions

diff --git a/src/actions/index.js b/src/actions/index.js
index a406af50a..45e6da515 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -11,7 +11,7 @@ import payment from './payment';
 import news from './news';
 import settings from './settings';
 import requests from './requests';
-import workspace from './workspace';
+import workspace from '../features/workspaces/actions';
 
 const actions = Object.assign({}, {
   service,
diff --git a/src/app.js b/src/app.js
index 320ba679f..d3b540f62 100644
--- a/src/app.js
+++ b/src/app.js
@@ -39,8 +39,8 @@ import PricingScreen from './containers/auth/PricingScreen';
 import InviteScreen from './containers/auth/InviteScreen';
 import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
 import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
-import WorkspacesScreen from './containers/settings/WorkspacesScreen';
-import EditWorkspaceScreen from './containers/settings/EditWorkspaceScreen';
+import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
+import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
 
 // Add Polyfills
 smoothScroll.polyfill();
diff --git a/src/actions/workspace.js b/src/features/workspaces/actions.js
index ab07a96c0..30866af96 100644
--- a/src/actions/workspace.js
+++ b/src/features/workspaces/actions.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import Workspace from '../models/Workspace';
+import Workspace from './models/Workspace';
 
 export default {
   edit: {
diff --git a/src/components/settings/workspaces/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js
index 088d61433..b2c2a4830 100644
--- a/src/components/settings/workspaces/WorkspaceItem.js
+++ b/src/features/workspaces/components/WorkspaceItem.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import Workspace from '../../../models/Workspace';
+import Workspace from '../models/Workspace';
 
 // const messages = defineMessages({});
 
diff --git a/src/components/settings/workspaces/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index a5bb18cb7..2a8b3a5ee 100644
--- a/src/components/settings/workspaces/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
-import Loader from '../../ui/Loader';
+import Loader from '../../../components/ui/Loader';
 import WorkspaceItem from './WorkspaceItem';
 
 const messages = defineMessages({
diff --git a/src/containers/settings/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index 665b405bd..d8c52f586 100644
--- a/src/containers/settings/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -1,16 +1,21 @@
 import React, { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
-import Form from '../../lib/Form';
-import ErrorBoundary from '../../components/util/ErrorBoundary';
-import { gaPage } from '../../lib/analytics';
-import { state } from '../../features/workspaces/state';
+import { Link } from 'react-router';
+import Form from '../../../lib/Form';
+import ErrorBoundary from '../../../components/util/ErrorBoundary';
+import { gaPage } from '../../../lib/analytics';
+import { state } from '../state';
 
 const messages = defineMessages({
   name: {
     id: 'settings.workspace.form.name',
     defaultMessage: '!!!Name',
   },
+  yourWorkspaces: {
+    id: 'settings.workspace.form.yourWorkspaces',
+    defaultMessage: '!!!Your workspaces',
+  },
 });
 
 @inject('stores', 'actions') @observer
@@ -38,6 +43,7 @@ class EditWorkspaceScreen extends Component {
   }
 
   render() {
+    const { intl } = this.context;
     const { workspaceBeingEdited } = state;
     if (!workspaceBeingEdited) return null;
 
@@ -45,7 +51,22 @@ class EditWorkspaceScreen extends Component {
 
     return (
       <ErrorBoundary>
-        <div>{workspaceBeingEdited.name}</div>
+        <div className="settings__main">
+          <div className="settings__header">
+            <span className="settings__header-item">
+              <Link to="/settings/workspaces">
+                {intl.formatMessage(messages.yourWorkspaces)}
+              </Link>
+            </span>
+            <span className="separator" />
+            <span className="settings__header-item">
+              {workspaceBeingEdited.name}
+            </span>
+          </div>
+          <div className="settings__body">
+            test
+          </div>
+        </div>
       </ErrorBoundary>
     );
   }
diff --git a/src/containers/settings/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
index 5e91f7673..f129edec5 100644
--- a/src/containers/settings/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import PropTypes from 'prop-types';
-import { gaPage } from '../../lib/analytics';
-import { state } from '../../features/workspaces/state';
-import WorkspacesDashboard from '../../components/settings/workspaces/WorkspacesDashboard';
-import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { gaPage } from '../../../lib/analytics';
+import { state } from '../state';
+import WorkspacesDashboard from '../components/WorkspacesDashboard';
+import ErrorBoundary from '../../../components/util/ErrorBoundary';
 
 @inject('actions') @observer
 class WorkspacesScreen extends Component {
diff --git a/src/models/Workspace.js b/src/features/workspaces/models/Workspace.js
index ede2710dc..ede2710dc 100644
--- a/src/models/Workspace.js
+++ b/src/features/workspaces/models/Workspace.js
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index aab66708b..ea61cec31 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -1,7 +1,7 @@
 import { observable, reaction } from 'mobx';
 import Store from '../../stores/lib/Store';
 import CachedRequest from '../../stores/lib/CachedRequest';
-import Workspace from '../../models/Workspace';
+import Workspace from './models/Workspace';
 import { matchRoute } from '../../helpers/routing-helpers';
 
 const debug = require('debug')('Franz:feature:workspaces');
diff --git a/src/styles/workspace-table.scss b/src/features/workspaces/styles/workspaces-table.scss
index 05ebfa629..6d0e7b4f5 100644
--- a/src/styles/workspace-table.scss
+++ b/src/features/workspaces/styles/workspaces-table.scss
@@ -1,4 +1,4 @@
-@import './config.scss';
+@import '../../../styles/config';
 
 .theme__dark .workspace-table {
   .workspace-table__column-info .mdi { color: $dark-theme-gray-lightest; }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index b5abb56d4..5cb8c6bd3 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -158,6 +158,7 @@
    "settings.navigation.logout" : "Abmelden",
    "settings.navigation.settings" : "Einstellungen",
    "settings.navigation.yourServices" : "Deine Dienste",
+   "settings.navigation.yourWorkspaces": "Deine Workspaces",
    "settings.recipes.all" : "Alle Dienste",
    "settings.recipes.dev" : "Entwicklung",
    "settings.recipes.headline" : "Verfügbare Dienste",
@@ -216,6 +217,8 @@
    "settings.services.tooltip.isMuted" : "Alle Töne sind deaktiviert",
    "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
    "settings.services.updatedInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.workspaces.headline": "Deine Workspaces",
+   "settings.workspace.form.yourWorkspaces": "Deine Workspaces",
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Einzelperson",
    "settings.user.form.accountType.label" : "Konto-Typ",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 1652b5585..9b323e323 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -197,6 +197,7 @@
   "settings.user.form.accountType.non-profit": "Non-Profit",
   "settings.user.form.accountType.company": "Company",
   "settings.workspaces.headline": "Your workspaces",
+  "settings.workspace.form.yourWorkspaces": "Your workspaces",
   "subscription.type.free": "free",
   "subscription.type.month": "month",
   "subscription.type.year": "year",
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 30f43532f..a941d89d0 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -30,7 +30,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './content-tabs.scss';
 @import './invite.scss';
 @import './title-bar.scss';
-@import './workspace-table.scss';
+@import '../features/workspaces/styles/workspaces-table';
 
 // form
 @import './input.scss';