From 28bc9f23a8f21798661b3c76d851894ca8064dfe Mon Sep 17 00:00:00 2001 From: soupette Date: Fri, 22 Feb 2019 11:16:42 +0100 Subject: [PATCH] Change paths in users-permissions --- .../admin/src/components/Controller/index.js | 2 +- .../src/components/InputSearchContainer/index.js | 2 +- .../admin/src/components/List/index.js | 2 +- .../admin/src/components/Plugin/index.js | 2 +- .../admin/src/components/Plugins/index.js | 3 ++- .../admin/src/components/Policies/index.js | 2 +- .../admin/src/containers/App/index.js | 10 +++++----- .../admin/src/containers/AuthPage/index.js | 9 +++++---- .../admin/src/containers/AuthPage/selectors.js | 2 +- .../admin/src/containers/EditPage/index.js | 9 +++++---- .../admin/src/containers/EditPage/selectors.js | 2 +- .../admin/src/containers/HomePage/index.js | 14 ++++++++------ .../admin/src/containers/HomePage/selectors.js | 2 +- 13 files changed, 33 insertions(+), 28 deletions(-) diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js index 8d8dc7cb64..e8e118b8f3 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js @@ -10,7 +10,7 @@ import { get, map, some } from 'lodash'; import cn from 'classnames'; import { FormattedMessage } from 'react-intl'; -import InputCheckbox from 'components/InputCheckboxPlugin'; +import InputCheckbox from '../InputCheckboxPlugin'; import styles from './styles.scss'; class Controller extends React.Component { diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/index.js index 32ead2d40e..147e01f76f 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/index.js @@ -11,7 +11,7 @@ import cn from 'classnames'; import PropTypes from 'prop-types'; import Label from 'components/Label'; -import InputSearchLi from 'components/InputSearchLi'; +import InputSearchLi from '../InputSearchLi'; import styles from './styles.scss'; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/List/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/List/index.js index a404d56e7f..88e40084df 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/List/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/List/index.js @@ -16,7 +16,7 @@ import LoadingIndicator from 'components/LoadingIndicator'; // Design import Button from 'components/Button'; -import ListRow from 'components/ListRow'; +import ListRow from '../ListRow'; import styles from './styles.scss'; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js index 5d2f8fc8f0..f6940a339a 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js @@ -10,7 +10,7 @@ import { Collapse } from 'reactstrap'; import { capitalize, get, isEmpty, map } from 'lodash'; import { FormattedMessage } from 'react-intl'; -import Controller from 'components/Controller'; +import Controller from '../Controller'; import styles from './styles.scss'; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js index 1fd809986b..b7a524923f 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js @@ -9,7 +9,8 @@ import { FormattedMessage } from 'react-intl'; import { has, map } from 'lodash'; import PropTypes from 'prop-types'; import cn from 'classnames'; -import Plugin from 'components/Plugin'; + +import Plugin from '../Plugin'; import styles from './styles.scss'; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js index bb60ed2953..357140ab31 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js @@ -10,8 +10,8 @@ import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { get, isEmpty, map, takeRight, toLower, without } from 'lodash'; -import BoundRoute from 'components/BoundRoute'; import Input from 'components/InputsIndex'; +import BoundRoute from '../BoundRoute'; import styles from './styles.scss'; diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/App/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/App/index.js index c60f43ab6b..766f36fd31 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/App/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/App/index.js @@ -8,13 +8,13 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Switch, Route } from 'react-router-dom'; -import pluginId from 'pluginId'; +import pluginId from '../../pluginId'; // Containers -import AuthPage from 'containers/AuthPage'; -import EditPage from 'containers/EditPage'; -import HomePage from 'containers/HomePage'; -import NotFoundPage from 'containers/NotFoundPage'; +import AuthPage from '../AuthPage'; +import EditPage from '../EditPage'; +import HomePage from '../HomePage'; +import NotFoundPage from '../NotFoundPage'; class App extends React.Component { componentDidMount() { diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js index b88aea1ddf..4eef86c52a 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js @@ -12,10 +12,6 @@ import { Link } from 'react-router-dom'; import { FormattedMessage } from 'react-intl'; import { findIndex, get, isBoolean, isEmpty, map, replace } from 'lodash'; import cn from 'classnames'; -import pluginId from 'pluginId'; - -// Logo -import LogoStrapi from 'assets/images/logo_strapi.png'; // Design import Button from 'components/Button'; @@ -24,6 +20,11 @@ import Input from 'components/InputsIndex'; // Utils import auth from 'utils/auth'; +import pluginId from '../../pluginId'; + +// Logo +import LogoStrapi from '../../assets/images/logo_strapi.png'; + import { hideLoginErrorsInput, onChangeInput, diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/selectors.js b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/selectors.js index 6af2bbce2a..570ceefc3d 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/selectors.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/selectors.js @@ -1,5 +1,5 @@ import { createSelector } from 'reselect'; -import pluginId from 'pluginId'; +import pluginId from '../../pluginId'; /** * Direct selector to the authPage state domain diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js index 44a257a764..024a44ec0b 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js @@ -12,17 +12,18 @@ import { bindActionCreators, compose } from 'redux'; import { FormattedMessage } from 'react-intl'; import { findIndex, get, isEmpty, isEqual, size } from 'lodash'; import cn from 'classnames'; -import pluginId from 'pluginId'; // Design import BackHeader from 'components/BackHeader'; import Input from 'components/InputsIndex'; -import InputSearch from 'components/InputSearchContainer'; import LoadingIndicator from 'components/LoadingIndicator'; import LoadingIndicatorPage from 'components/LoadingIndicatorPage'; import PluginHeader from 'components/PluginHeader'; -import Plugins from 'components/Plugins'; -import Policies from 'components/Policies'; + +import InputSearch from '../../components/InputSearchContainer'; +import Plugins from '../../components/Plugins'; +import Policies from '../../components/Policies'; +import pluginId from '../../pluginId'; // Actions import { diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/selectors.js b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/selectors.js index 91b81600a3..5a6b175669 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/selectors.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/selectors.js @@ -1,5 +1,5 @@ import { createSelector } from 'reselect'; -import pluginId from 'pluginId'; +import pluginId from '../../pluginId'; /** * Direct selector to the editPage state domain diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js index 37097316d8..b965c52062 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js @@ -11,14 +11,16 @@ import { injectIntl } from 'react-intl'; import { bindActionCreators, compose } from 'redux'; import cn from 'classnames'; import { clone, get, includes, isEqual, isEmpty } from 'lodash'; -import pluginId from 'pluginId'; + +import HeaderNav from 'components/HeaderNav'; +import PluginHeader from 'components/PluginHeader'; + +import pluginId from '../../pluginId'; // Design -import EditForm from 'components/EditForm'; -import HeaderNav from 'components/HeaderNav'; -import List from 'components/List'; -import PluginHeader from 'components/PluginHeader'; -import PopUpForm from 'components/PopUpForm'; +import EditForm from '../../components/EditForm'; +import List from '../../components/List'; +import PopUpForm from '../../components/PopUpForm'; // Selectors import selectHomePage from './selectors'; diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/selectors.js b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/selectors.js index e4194b7588..69379663a6 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/selectors.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/selectors.js @@ -1,5 +1,5 @@ import { createSelector } from 'reselect'; -import pluginId from 'pluginId'; +import pluginId from '../../pluginId'; /** * Direct selector to the homePage state domain