Removed the cyclical dependency (#1519) (#1539)

5 files changed, 16 insertions, 18 deletions

diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index 03bb5efe8..dccb818a6 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -5,7 +5,7 @@ import injectSheet from 'react-jss';
 import Webview from 'react-electron-web-view';
 import classnames from 'classnames';
 
-import { TODOS_PARTITION_ID } from '..';
+import { TODOS_PARTITION_ID } from '../../../config';
 
 const styles = theme => ({
   root: {
diff --git a/src/features/todos/constants.js b/src/features/todos/constants.js
index 2e8a431cc..303a7a16e 100644
--- a/src/features/todos/constants.js
+++ b/src/features/todos/constants.js
@@ -2,3 +2,7 @@ export const IPC = {
   TODOS_HOST_CHANNEL: 'TODOS_HOST_CHANNEL',
   TODOS_CLIENT_CHANNEL: 'TODOS_CLIENT_CHANNEL',
 };
+
+export const TODOS_ROUTES = {
+  TARGET: '/todos',
+};
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index 96147d5ab..6425746e6 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -5,7 +5,8 @@ import PropTypes from 'prop-types';
 import FeaturesStore from '../../../stores/FeaturesStore';
 import TodosWebview from '../components/TodosWebview';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
-import { TODOS_MIN_WIDTH, todosStore } from '..';
+import { todosStore } from '..';
+import { TODOS_MIN_WIDTH } from '../../../config';
 import { todoActions } from '../actions';
 import ServicesStore from '../../../stores/ServicesStore';
 
diff --git a/src/features/todos/index.js b/src/features/todos/index.js
index b6d13e5e1..1c6c9179a 100644
--- a/src/features/todos/index.js
+++ b/src/features/todos/index.js
@@ -5,16 +5,6 @@ const debug = require('debug')('Ferdi:feature:todos');
 
 export const GA_CATEGORY_TODOS = 'Todos';
 
-export const DEFAULT_TODOS_WIDTH = 300;
-export const TODOS_MIN_WIDTH = 200;
-export const DEFAULT_TODOS_VISIBLE = true;
-export const DEFAULT_IS_FEATURE_ENABLED_BY_USER = true;
-export const TODOS_PARTITION_ID = 'persist:todos';
-
-export const TODOS_ROUTES = {
-  TARGET: '/todos',
-};
-
 export const todosStore = new TodoStore();
 
 export default function initTodos(stores, actions) {
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 4febd7bb1..429507927 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -7,17 +7,20 @@ import {
 import localStorage from 'mobx-localstorage';
 
 import { todoActions } from './actions';
-import { CUSTOM_TODO_SERVICE, TODO_SERVICE_RECIPE_IDS } from '../../config';
+import {
+  CUSTOM_TODO_SERVICE,
+  TODO_SERVICE_RECIPE_IDS,
+  DEFAULT_TODOS_WIDTH,
+  TODOS_MIN_WIDTH,
+  DEFAULT_TODOS_VISIBLE,
+  DEFAULT_IS_FEATURE_ENABLED_BY_USER,
+} from '../../config';
 import { isValidExternalURL } from '../../helpers/url-helpers';
 import { FeatureStore } from '../utils/FeatureStore';
 import { createReactions } from '../../stores/lib/Reaction';
 import { createActionBindings } from '../utils/ActionBinding';
-import {
-  DEFAULT_TODOS_WIDTH, TODOS_MIN_WIDTH, DEFAULT_TODOS_VISIBLE, TODOS_ROUTES, DEFAULT_IS_FEATURE_ENABLED_BY_USER,
-} from '.';
-import { IPC } from './constants';
+import { IPC, TODOS_ROUTES } from './constants';
 import { state as delayAppState } from '../delayApp';
-
 import UserAgent from '../../models/UserAgent';
 
 const debug = require('debug')('Ferdi:feature:todos:store');