(web) rename folders

web/src/app/__tests__/common/sessionPlayerTest.js

@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 var { expect, $, spyOn, api, Dfd } = require('./..');
-var {EventProvider, TtyPlayer, Buffer} = require('app/common/term/ttyPlayer');
+var {EventProvider, TtyPlayer, Buffer} = require('app/lib/term/ttyPlayer');
 var sample = require('./streamData')
 
-describe('common/lib/term/ttyPlayer/eventProvider', function(){
+describe('lib/lib/term/ttyPlayer/eventProvider', function(){
 
   afterEach(function () {
     expect.restoreSpies();
@@ -126,7 +126,7 @@ describe('common/lib/term/ttyPlayer/eventProvider', function(){
   });
 });
 
-describe('common/lib/ttyPlayer', function () {
+describe('lib/lib/ttyPlayer', function () {
 
   afterEach(function () {
     expect.restoreSpies();

web/src/app/__tests__/modules/nodesTest.js

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 var { sampleData, reactor, expect, Dfd, spyOn, api } = require('./../');
-var { getters, actions } = require('app/modules/nodes');
-var { setSiteId } = require('app/modules/app/actions');
+var { getters, actions } = require('app/flux/nodes');
+var { setSiteId } = require('app/flux/app/actions');
 
 describe('modules/nodes', function () {
   let siteid = 'siteid123';

web/src/app/__tests__/modules/sessionsTest.js

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 var { sampleData, reactor, expect, Dfd, cfg, spyOn, api } = require('./../');
-var {actions, getters} = require('app/modules/sessions');
-var { setSiteId } = require('app/modules/app/actions');
+var {actions, getters} = require('app/flux/sessions');
+var { setSiteId } = require('app/flux/app/actions');
 
 describe('modules/sessions', function () {
   let siteid = 'siteid123';

web/src/app/__tests__/modules/userTest.js

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 var { reactor, sampleData, expect, api, Dfd, spyOn } = require('./../');
-var {actions, getters} = require('app/modules/user');
-var {TLPT_RECEIVE_USER} =  require('app/modules/user/actionTypes');
+var {actions, getters} = require('app/flux/user');
+var {TLPT_RECEIVE_USER} =  require('app/flux/user/actionTypes');
 
 describe('modules/user', function () {
 

web/src/app/components/app.jsx

@@ -17,8 +17,8 @@ limitations under the License.
 import React, { Component } from 'react';
 import { connect } from 'nuclear-js-react-addons';
 import cfg from 'app/config'
-import { getters } from 'app/modules/app';
-import { refresh } from 'app/modules/app/actions';
+import { getters } from 'app/flux/app';
+import { refresh } from 'app/flux/app/actions';
 import NavLeftBar from './navLeftBar';
 import NotificationHost from './notificationHost.jsx';
 import Timer from './timer.jsx';

web/src/app/components/clusterSelector.jsx

@@ -16,11 +16,11 @@ limitations under the License.
 
 import React from 'react';
 import reactor from 'app/reactor';
-import siteGetters from 'app/modules/sites/getters';
-import appGetters from 'app/modules/app/getters';
+import siteGetters from 'app/flux/sites/getters';
+import appGetters from 'app/flux/app/getters';
 import DropDown from './dropdown.jsx';
-import { setSiteId, refresh } from 'app/modules/app/actions';
-import { isUUID } from 'app/common/objectUtils';
+import { setSiteId, refresh } from 'app/flux/app/actions';
+import { isUUID } from 'app/lib/objectUtils';
 
 const ClusterSelector = React.createClass({
 

web/src/app/components/navLeftBar.jsx

@@ -16,9 +16,9 @@ limitations under the License.
 import React from 'react';
 import reactor from 'app/reactor';
 import cfg from 'app/config';
-import userGetters from 'app/modules/user/getters';
+import userGetters from 'app/flux/user/getters';
 import { IndexLink } from 'react-router';
-import { logoutUser } from 'app/modules/app/actions';
+import { logoutUser } from 'app/flux/app/actions';
 import { UserIcon } from './icons.jsx';
 
 const NavLeftBar = React.createClass({

web/src/app/components/nodes/main.jsx

@@ -16,8 +16,8 @@ limitations under the License.
 
 import React from 'react';
 import reactor from 'app/reactor';
-import userGetters from 'app/modules/user/getters';
-import nodeGetters from 'app/modules/nodes/getters';
+import userGetters from 'app/flux/user/getters';
+import nodeGetters from 'app/flux/nodes/getters';
 import NodeList from './nodeList.jsx';
 
 const Nodes = React.createClass({

web/src/app/components/nodes/nodeList.jsx

@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import { Link } from  'react-router';
 import _ from '_';
-import { isMatch } from 'app/common/objectUtils';
+import { isMatch } from 'app/lib/objectUtils';
 import InputSearch from './../inputSearch.jsx';
 import { Table, Column, Cell, SortHeaderCell, SortTypes, EmptyIndicator } from 'app/components/table.jsx';
 import ClusterSelector from './../clusterSelector.jsx';

web/src/app/components/notificationHost.jsx

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import reactor from 'app/reactor';
-import { lastMessage } from 'app/modules/notifications/getters';
+import { lastMessage } from 'app/flux/notifications/getters';
 import { ToastContainer, ToastMessage } from "react-toastr";
 
 const ToastMessageFactory = React.createFactory(ToastMessage.animation);

web/src/app/components/player/playerHost.jsx

@@ -18,10 +18,10 @@ import initScroll from 'perfect-scrollbar/jquery';
 import React from 'react';
 import { connect } from 'nuclear-js-react-addons';
 import ReactSlider from 'react-slider';
-import getters from 'app/modules/player/getters';
-import Terminal from 'app/common/term/terminal';
-import { TtyPlayer } from 'app/common/term/ttyPlayer';
-import { initPlayer, close } from 'app/modules/player/actions';
+import getters from 'app/flux/player/getters';
+import Terminal from 'app/lib/term/terminal';
+import { TtyPlayer } from 'app/lib/term/ttyPlayer';
+import { initPlayer, close } from 'app/flux/player/actions';
 import Indicator from './../indicator.jsx';
 import PartyListPanel from './../partyListPanel';
 

web/src/app/components/sessions/main.jsx

@@ -16,9 +16,9 @@ limitations under the License.
 
 import React from 'react';
 import reactor from 'app/reactor';
-import { fetchSiteEventsWithinTimeRange } from 'app/modules/storedSessionsFilter/actions';
-import { storedSessionList, activeSessionList } from 'app/modules/sessions/getters';
-import { filter } from 'app/modules/storedSessionsFilter/getters';
+import { fetchSiteEventsWithinTimeRange } from 'app/flux/storedSessionsFilter/actions';
+import { storedSessionList, activeSessionList } from 'app/flux/sessions/getters';
+import { filter } from 'app/flux/storedSessionsFilter/getters';
 import Timer from './../timer.jsx';
 import SessionList from './sessionList.jsx';
 

web/src/app/components/sessions/sessionList.jsx

@@ -18,8 +18,8 @@ import _ from '_';
 import React from 'react';
 import moment from 'moment';
 import InputSearch from './../inputSearch.jsx';
-import { isMatch } from 'app/common/objectUtils';
-import { actions } from 'app/modules/storedSessionsFilter';
+import { isMatch } from 'app/lib/objectUtils';
+import { actions } from 'app/flux/storedSessionsFilter';
 import { Table, Column, Cell, SortHeaderCell, SortTypes, EmptyIndicator } from 'app/components/table.jsx';
 import { SessionIdCell, NodeCell, UsersCell, DateCreatedCell, DurationCell } from './listItems';
 import { DateRangePicker } from './../datePicker.jsx';

web/src/app/components/terminal/terminalHost.jsx

@@ -19,12 +19,12 @@ import reactor from 'app/reactor';
 import cfg from 'app/config';
 import PartyListPanel from './../partyListPanel';
 import session from 'app/services/session';
-import Terminal from 'app/common/term/terminal';
-import termGetters from 'app/modules/terminal/getters';
-import sessionGetters from 'app/modules/sessions/getters';
+import Terminal from 'app/lib/term/terminal';
+import termGetters from 'app/flux/terminal/getters';
+import sessionGetters from 'app/flux/sessions/getters';
 import Indicator from './../indicator.jsx';
-import { initTerminal, startNew, close, updateSessionFromEventStream } from 'app/modules/terminal/actions';
-import { openPlayer } from 'app/modules/player/actions';
+import { initTerminal, startNew, close, updateSessionFromEventStream } from 'app/flux/terminal/actions';
+import { openPlayer } from 'app/flux/player/actions';
 
 const TerminalHost = React.createClass({
 

web/src/app/components/user/invite.jsx

@@ -19,7 +19,7 @@ import $ from 'jQuery';
 import classnames from 'classnames';
 import reactor from 'app/reactor';
 import cfg from 'app/config';
-import {actions, getters} from 'app/modules/user';
+import {actions, getters} from 'app/flux/user';
 import LinkedStateMixin from 'react-addons-linked-state-mixin';
 import { Auth2faTypeEnum, AuthTypeEnum } from 'app/services/enums';
 import { ErrorPage, ErrorTypes } from './../msgPage';

web/src/app/components/user/login.jsx

@@ -18,7 +18,7 @@ import React from 'react';
 import $ from 'jQuery';
 import 'app/../assets/js/jquery-validate';
 import reactor from 'app/reactor';
-import {actions, getters} from 'app/modules/user';
+import {actions, getters} from 'app/flux/user';
 import GoogleAuthInfo from './googleAuthLogo';
 import cfg from 'app/config';
 import { TeleportLogo } from './../icons.jsx';

web/src/app/config.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { formatPattern } from 'app/common/patternUtils';
+import { formatPattern } from 'app/lib/patternUtils';
 import $ from 'jQuery';
 
 let cfg = {

web/src/app/flux/app/actions.js

@@ -16,18 +16,18 @@ limitations under the License.
 
 import reactor from 'app/reactor';
 import auth from 'app/services/auth';
-import { showError } from 'app/modules/notifications/actions';
+import { showError } from 'app/flux/notifications/actions';
 import { TLPT_APP_SET_SITE_ID } from './actionTypes';
-import { TRYING_TO_INIT_APP } from 'app/modules/restApi/constants';
+import { TRYING_TO_INIT_APP } from 'app/flux/restApi/constants';
 import { TLPT_SITES_RECEIVE } from './../sites/actionTypes';
 import api from 'app/services/api';
 import cfg from 'app/config';
-import restApiActions from 'app/modules/restApi/actions';
+import restApiActions from 'app/flux/restApi/actions';
 import { fetchNodes } from './../nodes/actions';
-import { fetchActiveSessions } from 'app/modules/sessions/actions';
+import { fetchActiveSessions } from 'app/flux/sessions/actions';
 import $ from 'jQuery';
 
-const logger = require('app/common/logger').create('flux/app');
+const logger = require('app/lib/logger').create('flux/app');
 
 const actions = {
 

web/src/app/flux/app/getters.js

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { TRYING_TO_INIT_APP } from 'app/modules/restApi/constants';
-import { requestStatus } from 'app/modules/restApi/getters';
+import { TRYING_TO_INIT_APP } from 'app/flux/restApi/constants';
+import { requestStatus } from 'app/flux/restApi/getters';
 
 export default {
   initAttemp: requestStatus(TRYING_TO_INIT_APP),

web/src/app/flux/nodes/actions.js

@@ -2,9 +2,9 @@ import reactor from 'app/reactor';
 import { TLPT_NODES_RECEIVE } from './actionTypes';
 import api from 'app/services/api';
 import cfg from 'app/config';
-import { showError } from 'app/modules/notifications/actions';
-import appGetters from 'app/modules/app/getters';
-import Logger from 'app/common/logger';
+import { showError } from 'app/flux/notifications/actions';
+import appGetters from 'app/flux/app/getters';
+import Logger from 'app/lib/logger';
 
 const logger = Logger.create('Modules/Nodes');
 

web/src/app/flux/player/actions.js

@@ -20,7 +20,7 @@ import cfg from 'app/config';
 import { fetchStoredSession } from './../sessions/actions';
 import sessionGetters from './../sessions/getters';
 
-const logger = require('app/common/logger').create('app/flux/player');
+const logger = require('app/lib/logger').create('app/flux/player');
 
 import {  
   TLPT_PLAYER_INIT,

web/src/app/flux/sessions/actions.js

@@ -17,11 +17,11 @@ limitations under the License.
 var reactor = require('app/reactor');
 var api = require('app/services/api');
 var cfg = require('app/config');
-var {showError} = require('app/modules/notifications/actions');
+var {showError} = require('app/flux/notifications/actions');
 var moment = require('moment');
-var appGetters = require('app/modules/app/getters')
+var appGetters = require('app/flux/app/getters')
 
-const logger = require('app/common/logger').create('Modules/Sessions');
+const logger = require('app/lib/logger').create('Modules/Sessions');
 const {
   TLPT_SESSIONS_ACTIVE_RECEIVE,
   TLPT_SESSIONS_EVENTS_RECEIVE,

web/src/app/flux/sessions/getters.js

@@ -18,8 +18,8 @@ import moment from 'moment';
 import cfg from 'app/config';
 import { EventTypeEnum } from 'app/services/enums';
 import reactor from 'app/reactor';
-import { nodeHostNameByServerId } from 'app/modules/nodes/getters';
-import { parseIp } from 'app/common/objectUtils';
+import { nodeHostNameByServerId } from 'app/flux/nodes/getters';
+import { parseIp } from 'app/lib/objectUtils';
 
 const activeSessionList = [['tlpt_sessions_active'], ['tlpt', 'siteId'], (sessionList, siteId) => {  
   sessionList = sessionList.filter(n => n.get('siteId') === siteId);    

web/src/app/flux/storedSessionsFilter/actions.js

@@ -17,9 +17,9 @@ limitations under the License.
 var reactor = require('app/reactor');
 var {filter} = require('./getters');
 var {fetchSiteEvents} = require('./../sessions/actions');
-var {showError} = require('app/modules/notifications/actions');
+var {showError} = require('app/flux/notifications/actions');
 
-const logger = require('app/common/logger').create('Modules/Sessions');
+const logger = require('app/lib/logger').create('Modules/Sessions');
 
 const { TLPT_STORED_SESSINS_FILTER_SET_RANGE }  = require('./actionTypes');
 

web/src/app/flux/terminal/actions.js

@@ -20,9 +20,9 @@ import cfg from 'app/config';
 //import getters from './getters';
 import { updateSession } from './../sessions/actions';
 import sessionGetters from './../sessions/getters';
-//import {showError} from 'app/modules/notifications/actions';
+//import {showError} from 'app/flux/notifications/actions';
 
-const logger = require('app/common/logger').create('Current Session');
+const logger = require('app/lib/logger').create('Current Session');
 
 const { TLPT_TERMINAL_OPEN, TLPT_TERMINAL_CLOSE, TLPT_TERMINAL_SET_STATUS } = require('./actionTypes');
 

web/src/app/flux/terminal/store.js

@@ -16,7 +16,7 @@ limitations under the License.
 import { Store } from 'nuclear-js';
 import { Record } from 'immutable';
 import reactor from 'app/reactor';
-import { nodeHostNameByServerId } from 'app/modules/nodes/getters';
+import { nodeHostNameByServerId } from 'app/flux/nodes/getters';
 import {
   TLPT_TERMINAL_OPEN,
   TLPT_TERMINAL_CLOSE,

web/src/app/flux/user/actions.js

@@ -16,8 +16,8 @@ limitations under the License.
 
 import reactor from 'app/reactor';
 import { TLPT_RECEIVE_USER, TLPT_RECEIVE_USER_INVITE } from './actionTypes';
-import { TRYING_TO_SIGN_UP, TRYING_TO_LOGIN, FETCHING_INVITE} from 'app/modules/restApi/constants';
-import restApiActions from 'app/modules/restApi/actions';
+import { TRYING_TO_SIGN_UP, TRYING_TO_LOGIN, FETCHING_INVITE} from 'app/flux/restApi/constants';
+import restApiActions from 'app/flux/restApi/actions';
 import auth from 'app/services/auth';
 import cfg from 'app/config';
 import api from 'app/services/api';

web/src/app/flux/user/getters.js

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var {TRYING_TO_LOGIN, TRYING_TO_SIGN_UP, FETCHING_INVITE} = require('app/modules/restApi/constants');
-var {requestStatus} = require('app/modules/restApi/getters');
+var {TRYING_TO_LOGIN, TRYING_TO_SIGN_UP, FETCHING_INVITE} = require('app/flux/restApi/constants');
+var {requestStatus} = require('app/flux/restApi/getters');
 
 const invite = [ ['tlpt_user_invite'], invite => invite ];
 

web/src/app/index.jsx

@@ -27,12 +27,12 @@ import Sessions from './components/sessions/main.jsx';
 import TerminalHost from './components/terminal/terminalHost.jsx';
 import PlayerHost from './components/player/playerHost.jsx';
 import { MessagePage, NotFound } from './components/msgPage.jsx';
-import { ensureUser } from './modules/user/actions';
-import { initApp } from './modules/app/actions';
+import { ensureUser } from './flux/user/actions';
+import { initApp } from './flux/app/actions';
 import cfg from './config';
 import reactor from './reactor';
 import DocumentTitle from './components/documentTitle';
-import './modules';
+import './flux';
 
 // init session
 session.init();

web/src/app/lib/dateUtils.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports.weekRange = function(value = new Date()){
   let startDate = moment(value).startOf('week').toDate();

web/src/app/lib/term/terminal.js

@@ -20,7 +20,7 @@ var TtyEvents = require('./ttyEvents');
 var {debounce, isNumber} = require('_');
 
 var api = require('app/services/api');
-var logger = require('app/common/logger').create('terminal');
+var logger = require('app/lib/logger').create('terminal');
 var $ = require('jQuery');
 
 Term.colors[256] = '#252323';

web/src/app/lib/term/ttyPlayer.js

@@ -16,11 +16,11 @@ limitations under the License.
 
 var Tty = require('./tty');
 var api = require('app/services/api');
-var {showError} = require('app/modules/notifications/actions');
+var {showError} = require('app/flux/notifications/actions');
 var $ = require('jQuery');
 var Buffer = require('buffer/').Buffer;
 
-const logger = require('app/common/logger').create('TtyPlayer');
+const logger = require('app/lib/logger').create('TtyPlayer');
 const STREAM_START_INDEX = 0;
 const PRE_FETCH_BUF_SIZE = 150;
 const URL_PREFIX_EVENTS = '/events';

web/src/app/services/auth.js

@@ -18,7 +18,7 @@ import api from './api';
 import session from './session';
 import cfg from 'app/config';
 import $ from 'jQuery';
-import Logger from 'app/common/logger';
+import Logger from 'app/lib/logger';
 
 // This puts it in window.u2f
 import 'u2f-api-polyfill'; 

web/src/app/services/session.js

@@ -17,7 +17,7 @@ limitations under the License.
 var { browserHistory, createMemoryHistory } = require('react-router');
 var $ = require('jQuery');
 
-const logger = require('app/common/logger').create('services/sessions');
+const logger = require('app/lib/logger').create('services/sessions');
 const AUTH_KEY_DATA = 'authData';
 
 var _history = createMemoryHistory();

web/src/app/vendor.js

@@ -14,26 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-require('jQuery');
-require('perfect-scrollbar/jquery');
-require('Terminal');
-require('_');
-require('bootstrap-sass/assets/javascripts/bootstrap');
-require('./../assets/js/jquery-validate');
-require('./../assets/js/datepicker');
-
-require('buffer');
-require('classnames');
-require('keymirror');
-require('moment');
-require('nuclear-js');
-require('react');
-require('react-addons-linked-state-mixin');
-require('react-addons-pure-render-mixin');
-require('react-addons-transition-group');
-require('react-addons-css-transition-group');
-require('react-dom');
-require('react-router');
-require('react-slider');
-require('react-toastr');
-require('react-overlays');
+import 'jQuery';
+import 'perfect-scrollbar/jquery';
+import 'Terminal';
+import '_';
+import 'bootstrap-sass/assets/javascripts/bootstrap';
+import './../assets/js/jquery-validate';
+import './../assets/js/datepicker';
+import 'buffer';
+import 'classnames';
+import 'keymirror';
+import 'moment';
+import 'nuclear-js';
+import 'react';
+import 'react-addons-linked-state-mixin';
+import 'react-addons-pure-render-mixin';
+import 'react-addons-transition-group';
+import 'react-addons-css-transition-group';
+import 'react-dom';
+import 'react-router';
+import 'react-slider';
+import 'react-toastr';
+import 'react-overlays';