From e7004ac3ad246a3bfa90c917f2ccc95a97bc2339 Mon Sep 17 00:00:00 2001 From: Hunter Trujillo Date: Wed, 1 Mar 2017 12:05:38 -0700 Subject: [PATCH] Move /users to /admin --- ui/src/{users => admin}/actions/index.js | 2 +- ui/src/{users => admin}/apis/index.js | 0 ui/src/{users => admin}/components/UsersTable.js | 0 ui/src/{users => admin}/containers/UsersPage.js | 4 ++-- ui/src/{users => admin}/index.js | 0 ui/src/{users => admin}/reducers/admin.js | 0 ui/src/index.js | 2 +- ui/src/store/configureStore.js | 2 +- 8 files changed, 5 insertions(+), 5 deletions(-) rename ui/src/{users => admin}/actions/index.js (84%) rename ui/src/{users => admin}/apis/index.js (100%) rename ui/src/{users => admin}/components/UsersTable.js (100%) rename ui/src/{users => admin}/containers/UsersPage.js (89%) rename ui/src/{users => admin}/index.js (100%) rename ui/src/{users => admin}/reducers/admin.js (100%) diff --git a/ui/src/users/actions/index.js b/ui/src/admin/actions/index.js similarity index 84% rename from ui/src/users/actions/index.js rename to ui/src/admin/actions/index.js index fbc391c8f..7d2782cbe 100644 --- a/ui/src/users/actions/index.js +++ b/ui/src/admin/actions/index.js @@ -1,4 +1,4 @@ -import {getUsers} from 'src/users/apis' +import {getUsers} from 'src/admin/apis' export const loadUsers = ({users}) => ({ type: 'LOAD_USERS', diff --git a/ui/src/users/apis/index.js b/ui/src/admin/apis/index.js similarity index 100% rename from ui/src/users/apis/index.js rename to ui/src/admin/apis/index.js diff --git a/ui/src/users/components/UsersTable.js b/ui/src/admin/components/UsersTable.js similarity index 100% rename from ui/src/users/components/UsersTable.js rename to ui/src/admin/components/UsersTable.js diff --git a/ui/src/users/containers/UsersPage.js b/ui/src/admin/containers/UsersPage.js similarity index 89% rename from ui/src/users/containers/UsersPage.js rename to ui/src/admin/containers/UsersPage.js index 81f3264d5..b7cbe331c 100644 --- a/ui/src/users/containers/UsersPage.js +++ b/ui/src/admin/containers/UsersPage.js @@ -1,8 +1,8 @@ import React, {Component, PropTypes} from 'react' import {connect} from 'react-redux'; import {bindActionCreators} from 'redux'; -import {loadUsersAsync} from 'src/users/actions' -import UsersTable from 'src/users/components/UsersTable' +import {loadUsersAsync} from 'src/admin/actions' +import UsersTable from 'src/admin/components/UsersTable' class UsersPage extends Component { constructor(props) { diff --git a/ui/src/users/index.js b/ui/src/admin/index.js similarity index 100% rename from ui/src/users/index.js rename to ui/src/admin/index.js diff --git a/ui/src/users/reducers/admin.js b/ui/src/admin/reducers/admin.js similarity index 100% rename from ui/src/users/reducers/admin.js rename to ui/src/admin/reducers/admin.js diff --git a/ui/src/index.js b/ui/src/index.js index fb0e7cdf3..76711febc 100644 --- a/ui/src/index.js +++ b/ui/src/index.js @@ -14,7 +14,7 @@ import {KapacitorPage, KapacitorRulePage, KapacitorRulesPage, KapacitorTasksPage import DataExplorer from 'src/data_explorer'; import {DashboardsPage, DashboardPage} from 'src/dashboards'; import {CreateSource, SourcePage, ManageSources} from 'src/sources'; -import {UsersPage} from 'src/users'; +import {UsersPage} from 'src/admin'; import NotFound from 'src/shared/components/NotFound'; import configureStore from 'src/store/configureStore'; import {getMe, getSources} from 'shared/apis'; diff --git a/ui/src/store/configureStore.js b/ui/src/store/configureStore.js index bf7f72abe..de2c75cbb 100644 --- a/ui/src/store/configureStore.js +++ b/ui/src/store/configureStore.js @@ -5,7 +5,7 @@ import makeQueryExecuter from 'src/shared/middleware/queryExecuter'; import resizeLayout from 'src/shared/middleware/resizeLayout'; import * as dataExplorerReducers from 'src/data_explorer/reducers'; import * as sharedReducers from 'src/shared/reducers'; -import adminReducer from 'src/users/reducers/admin'; +import adminReducer from 'src/admin/reducers/admin'; import rulesReducer from 'src/kapacitor/reducers/rules'; import dashboardUI from 'src/dashboards/reducers/ui'; import persistStateEnhancer from './persistStateEnhancer';