summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
authorAnike Arni <aarni@thoughtworks.com>2017-02-23 17:50:56 -0300
committerAnike Arni <aarni@thoughtworks.com>2017-02-23 17:50:56 -0300
commitfb4630207d86d39ea05dd679b2724be87597c518 (patch)
tree0573b4e7c18c88742a6cbecfceba009c3dbb4c34 /web-ui
parentde14bb0376d5b0ed511e52251a7c0e6cc38c39eb (diff)
[#907] Moves i18n and util files to common directory
with @thaissiqueira
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/src/common/app.js2
-rw-r--r--web-ui/src/common/i18n.js (renamed from web-ui/src/i18n.js)0
-rw-r--r--web-ui/src/common/util.js (renamed from web-ui/src/util.js)0
-rw-r--r--web-ui/src/login/login.js2
-rw-r--r--web-ui/test/unit/common/util.spec.js (renamed from web-ui/test/unit/util.spec.js)2
5 files changed, 3 insertions, 3 deletions
diff --git a/web-ui/src/common/app.js b/web-ui/src/common/app.js
index f6594557..03a69fc9 100644
--- a/web-ui/src/common/app.js
+++ b/web-ui/src/common/app.js
@@ -18,7 +18,7 @@
import React from 'react';
import { I18nextProvider } from 'react-i18next';
-import internationalization from '../i18n';
+import internationalization from 'src/common/i18n';
const App = ({ i18n = internationalization, child }) => (
<I18nextProvider i18n={i18n}>
diff --git a/web-ui/src/i18n.js b/web-ui/src/common/i18n.js
index db107dc7..db107dc7 100644
--- a/web-ui/src/i18n.js
+++ b/web-ui/src/common/i18n.js
diff --git a/web-ui/src/util.js b/web-ui/src/common/util.js
index effb3d9c..effb3d9c 100644
--- a/web-ui/src/util.js
+++ b/web-ui/src/common/util.js
diff --git a/web-ui/src/login/login.js b/web-ui/src/login/login.js
index c8e08762..39500b9d 100644
--- a/web-ui/src/login/login.js
+++ b/web-ui/src/login/login.js
@@ -19,9 +19,9 @@ import React from 'react';
import { render } from 'react-dom';
import a11y from 'react-a11y';
+import { hasQueryParameter } from 'src/common/util';
import App from 'src/common/app';
import PageWrapper from './page';
-import { hasQueryParameter } from '../util';
if (process.env.NODE_ENV === 'development') a11y(React);
diff --git a/web-ui/test/unit/util.spec.js b/web-ui/test/unit/common/util.spec.js
index 968b2d83..805d9dd5 100644
--- a/web-ui/test/unit/util.spec.js
+++ b/web-ui/test/unit/common/util.spec.js
@@ -1,5 +1,5 @@
import expect from 'expect';
-import Util from 'src/util';
+import Util from 'src/common/util';
describe('Utils', () => {
describe('.hasQueryParameter', () => {