diff --git a/react/actions/channel.js b/client/actions/channel.js
similarity index 100%
rename from react/actions/channel.js
rename to client/actions/channel.js
diff --git a/react/actions/publish.js b/client/actions/publish.js
similarity index 100%
rename from react/actions/publish.js
rename to client/actions/publish.js
diff --git a/react/actions/show.js b/client/actions/show.js
similarity index 100%
rename from react/actions/show.js
rename to client/actions/show.js
diff --git a/react/api/assetApi.js b/client/api/assetApi.js
similarity index 100%
rename from react/api/assetApi.js
rename to client/api/assetApi.js
diff --git a/react/api/channelApi.js b/client/api/channelApi.js
similarity index 100%
rename from react/api/channelApi.js
rename to client/api/channelApi.js
diff --git a/react/api/fileApi.js b/client/api/fileApi.js
similarity index 100%
rename from react/api/fileApi.js
rename to client/api/fileApi.js
diff --git a/react/app.js b/client/app.js
similarity index 93%
rename from react/app.js
rename to client/app.js
index 641688a0..8d78b17a 100644
--- a/react/app.js
+++ b/client/app.js
@@ -2,7 +2,7 @@ import React from 'react';
import { Route, Switch } from 'react-router-dom';
import HomePage from 'pages/HomePage'; // or use the provided local homepage
import AboutPage from 'pages/AboutPage';
-import LoginPage from 'containers/LoginPage';
+import LoginPage from 'pages/LoginPage';
import ShowPage from 'pages/ShowPage';
import FourOhFourPage from 'containers/FourOhFourPage';
diff --git a/react/channels/publish.js b/client/channels/publish.js
similarity index 100%
rename from react/channels/publish.js
rename to client/channels/publish.js
diff --git a/react/client.js b/client/client.js
similarity index 62%
rename from react/client.js
rename to client/client.js
index bcd817fc..c51bd66d 100644
--- a/react/client.js
+++ b/client/client.js
@@ -21,25 +21,29 @@ const sagaMiddleware = createSagaMiddleware();
const middleware = applyMiddleware(sagaMiddleware);
const reduxMiddleware = window.__REDUX_DEVTOOLS_EXTENSION__ ? compose(middleware, window.__REDUX_DEVTOOLS_EXTENSION__()) : middleware;
-// create teh store
-let store;
-if (preloadedState) {
- store = createStore(Reducer, preloadedState, reduxMiddleware);
-} else {
- store = createStore(Reducer, reduxMiddleware);
-}
+const SpeechClient = () => {
+ // create teh store
+ let store;
+ if (preloadedState) {
+ store = createStore(Reducer, preloadedState, reduxMiddleware);
+ } else {
+ store = createStore(Reducer, reduxMiddleware);
+ }
-// run the saga middlweare
-sagaMiddleware.run(rootSaga);
+ // run the saga middlweare
+ sagaMiddleware.run(rootSaga);
-// render the app
-hydrate(
-
-
-
-
-
-
- ,
- document.getElementById('react-app')
-);
+ // render the app
+ hydrate(
+
+
+
+
+
+
+ ,
+ document.getElementById('react-app')
+ );
+};
+
+module.exports = SpeechClient;
diff --git a/react/components/ActiveStatusBar/index.jsx b/client/components/ActiveStatusBar/index.jsx
similarity index 100%
rename from react/components/ActiveStatusBar/index.jsx
rename to client/components/ActiveStatusBar/index.jsx
diff --git a/react/components/AssetPreview/index.js b/client/components/AssetPreview/index.js
similarity index 100%
rename from react/components/AssetPreview/index.js
rename to client/components/AssetPreview/index.js
diff --git a/react/components/AssetPreview/view.jsx b/client/components/AssetPreview/view.jsx
similarity index 100%
rename from react/components/AssetPreview/view.jsx
rename to client/components/AssetPreview/view.jsx
diff --git a/react/components/ExpandingTextArea/index.jsx b/client/components/ExpandingTextArea/index.jsx
similarity index 100%
rename from react/components/ExpandingTextArea/index.jsx
rename to client/components/ExpandingTextArea/index.jsx
diff --git a/react/components/GAListener/index.jsx b/client/components/GAListener/index.jsx
similarity index 100%
rename from react/components/GAListener/index.jsx
rename to client/components/GAListener/index.jsx
diff --git a/react/components/InactiveStatusBar/index.jsx b/client/components/InactiveStatusBar/index.jsx
similarity index 100%
rename from react/components/InactiveStatusBar/index.jsx
rename to client/components/InactiveStatusBar/index.jsx
diff --git a/react/components/Logo/index.jsx b/client/components/Logo/index.jsx
similarity index 100%
rename from react/components/Logo/index.jsx
rename to client/components/Logo/index.jsx
diff --git a/react/components/NavBarChannelOptionsDropdown/index.jsx b/client/components/NavBarChannelOptionsDropdown/index.jsx
similarity index 100%
rename from react/components/NavBarChannelOptionsDropdown/index.jsx
rename to client/components/NavBarChannelOptionsDropdown/index.jsx
diff --git a/react/components/ProgressBar/index.jsx b/client/components/ProgressBar/index.jsx
similarity index 100%
rename from react/components/ProgressBar/index.jsx
rename to client/components/ProgressBar/index.jsx
diff --git a/react/components/PublishPreview/index.jsx b/client/components/PublishPreview/index.jsx
similarity index 100%
rename from react/components/PublishPreview/index.jsx
rename to client/components/PublishPreview/index.jsx
diff --git a/react/components/PublishUrlMiddleDisplay/index.jsx b/client/components/PublishUrlMiddleDisplay/index.jsx
similarity index 100%
rename from react/components/PublishUrlMiddleDisplay/index.jsx
rename to client/components/PublishUrlMiddleDisplay/index.jsx
diff --git a/react/components/SEO/index.js b/client/components/SEO/index.js
similarity index 100%
rename from react/components/SEO/index.js
rename to client/components/SEO/index.js
diff --git a/react/components/SEO/view.jsx b/client/components/SEO/view.jsx
similarity index 100%
rename from react/components/SEO/view.jsx
rename to client/components/SEO/view.jsx
diff --git a/react/constants/asset_display_states.js b/client/constants/asset_display_states.js
similarity index 100%
rename from react/constants/asset_display_states.js
rename to client/constants/asset_display_states.js
diff --git a/react/constants/channel_action_types.js b/client/constants/channel_action_types.js
similarity index 100%
rename from react/constants/channel_action_types.js
rename to client/constants/channel_action_types.js
diff --git a/react/constants/publish_action_types.js b/client/constants/publish_action_types.js
similarity index 100%
rename from react/constants/publish_action_types.js
rename to client/constants/publish_action_types.js
diff --git a/react/constants/publish_channel_select_states.js b/client/constants/publish_channel_select_states.js
similarity index 100%
rename from react/constants/publish_channel_select_states.js
rename to client/constants/publish_channel_select_states.js
diff --git a/react/constants/publish_claim_states.js b/client/constants/publish_claim_states.js
similarity index 100%
rename from react/constants/publish_claim_states.js
rename to client/constants/publish_claim_states.js
diff --git a/react/constants/show_action_types.js b/client/constants/show_action_types.js
similarity index 100%
rename from react/constants/show_action_types.js
rename to client/constants/show_action_types.js
diff --git a/react/constants/show_request_types.js b/client/constants/show_request_types.js
similarity index 100%
rename from react/constants/show_request_types.js
rename to client/constants/show_request_types.js
diff --git a/react/containers/AssetDisplay/index.js b/client/containers/AssetDisplay/index.js
similarity index 100%
rename from react/containers/AssetDisplay/index.js
rename to client/containers/AssetDisplay/index.js
diff --git a/react/containers/AssetDisplay/view.jsx b/client/containers/AssetDisplay/view.jsx
similarity index 100%
rename from react/containers/AssetDisplay/view.jsx
rename to client/containers/AssetDisplay/view.jsx
diff --git a/react/containers/AssetInfo/index.js b/client/containers/AssetInfo/index.js
similarity index 100%
rename from react/containers/AssetInfo/index.js
rename to client/containers/AssetInfo/index.js
diff --git a/react/containers/AssetInfo/view.jsx b/client/containers/AssetInfo/view.jsx
similarity index 100%
rename from react/containers/AssetInfo/view.jsx
rename to client/containers/AssetInfo/view.jsx
diff --git a/react/containers/AssetTitle/index.js b/client/containers/AssetTitle/index.js
similarity index 100%
rename from react/containers/AssetTitle/index.js
rename to client/containers/AssetTitle/index.js
diff --git a/react/containers/AssetTitle/view.jsx b/client/containers/AssetTitle/view.jsx
similarity index 100%
rename from react/containers/AssetTitle/view.jsx
rename to client/containers/AssetTitle/view.jsx
diff --git a/react/containers/ChannelClaimsDisplay/index.js b/client/containers/ChannelClaimsDisplay/index.js
similarity index 100%
rename from react/containers/ChannelClaimsDisplay/index.js
rename to client/containers/ChannelClaimsDisplay/index.js
diff --git a/react/containers/ChannelClaimsDisplay/view.jsx b/client/containers/ChannelClaimsDisplay/view.jsx
similarity index 100%
rename from react/containers/ChannelClaimsDisplay/view.jsx
rename to client/containers/ChannelClaimsDisplay/view.jsx
diff --git a/react/containers/ChannelCreateForm/index.js b/client/containers/ChannelCreateForm/index.js
similarity index 100%
rename from react/containers/ChannelCreateForm/index.js
rename to client/containers/ChannelCreateForm/index.js
diff --git a/react/containers/ChannelCreateForm/view.jsx b/client/containers/ChannelCreateForm/view.jsx
similarity index 100%
rename from react/containers/ChannelCreateForm/view.jsx
rename to client/containers/ChannelCreateForm/view.jsx
diff --git a/react/containers/ChannelLoginForm/index.js b/client/containers/ChannelLoginForm/index.js
similarity index 100%
rename from react/containers/ChannelLoginForm/index.js
rename to client/containers/ChannelLoginForm/index.js
diff --git a/react/containers/ChannelLoginForm/view.jsx b/client/containers/ChannelLoginForm/view.jsx
similarity index 100%
rename from react/containers/ChannelLoginForm/view.jsx
rename to client/containers/ChannelLoginForm/view.jsx
diff --git a/react/containers/ChannelSelect/index.js b/client/containers/ChannelSelect/index.js
similarity index 100%
rename from react/containers/ChannelSelect/index.js
rename to client/containers/ChannelSelect/index.js
diff --git a/react/containers/ChannelSelect/view.jsx b/client/containers/ChannelSelect/view.jsx
similarity index 100%
rename from react/containers/ChannelSelect/view.jsx
rename to client/containers/ChannelSelect/view.jsx
diff --git a/react/containers/Dropzone/index.js b/client/containers/Dropzone/index.js
similarity index 100%
rename from react/containers/Dropzone/index.js
rename to client/containers/Dropzone/index.js
diff --git a/react/containers/Dropzone/view.jsx b/client/containers/Dropzone/view.jsx
similarity index 100%
rename from react/containers/Dropzone/view.jsx
rename to client/containers/Dropzone/view.jsx
diff --git a/react/containers/FourOhFourPage/index.jsx b/client/containers/FourOhFourPage/index.jsx
similarity index 100%
rename from react/containers/FourOhFourPage/index.jsx
rename to client/containers/FourOhFourPage/index.jsx
diff --git a/react/containers/FourOhFourPage/view.jsx b/client/containers/FourOhFourPage/view.jsx
similarity index 100%
rename from react/containers/FourOhFourPage/view.jsx
rename to client/containers/FourOhFourPage/view.jsx
diff --git a/react/containers/NavBar/index.js b/client/containers/NavBar/index.js
similarity index 100%
rename from react/containers/NavBar/index.js
rename to client/containers/NavBar/index.js
diff --git a/react/containers/NavBar/view.jsx b/client/containers/NavBar/view.jsx
similarity index 100%
rename from react/containers/NavBar/view.jsx
rename to client/containers/NavBar/view.jsx
diff --git a/react/containers/PublishDetails/index.js b/client/containers/PublishDetails/index.js
similarity index 100%
rename from react/containers/PublishDetails/index.js
rename to client/containers/PublishDetails/index.js
diff --git a/react/containers/PublishDetails/view.jsx b/client/containers/PublishDetails/view.jsx
similarity index 100%
rename from react/containers/PublishDetails/view.jsx
rename to client/containers/PublishDetails/view.jsx
diff --git a/react/containers/PublishDisabledMessage/index.js b/client/containers/PublishDisabledMessage/index.js
similarity index 100%
rename from react/containers/PublishDisabledMessage/index.js
rename to client/containers/PublishDisabledMessage/index.js
diff --git a/react/containers/PublishDisabledMessage/view.jsx b/client/containers/PublishDisabledMessage/view.jsx
similarity index 100%
rename from react/containers/PublishDisabledMessage/view.jsx
rename to client/containers/PublishDisabledMessage/view.jsx
diff --git a/react/containers/PublishMetadataInputs/index.js b/client/containers/PublishMetadataInputs/index.js
similarity index 100%
rename from react/containers/PublishMetadataInputs/index.js
rename to client/containers/PublishMetadataInputs/index.js
diff --git a/react/containers/PublishMetadataInputs/view.jsx b/client/containers/PublishMetadataInputs/view.jsx
similarity index 100%
rename from react/containers/PublishMetadataInputs/view.jsx
rename to client/containers/PublishMetadataInputs/view.jsx
diff --git a/react/containers/PublishStatus/index.js b/client/containers/PublishStatus/index.js
similarity index 100%
rename from react/containers/PublishStatus/index.js
rename to client/containers/PublishStatus/index.js
diff --git a/react/containers/PublishStatus/view.jsx b/client/containers/PublishStatus/view.jsx
similarity index 100%
rename from react/containers/PublishStatus/view.jsx
rename to client/containers/PublishStatus/view.jsx
diff --git a/react/containers/PublishThumbnailInput/index.js b/client/containers/PublishThumbnailInput/index.js
similarity index 100%
rename from react/containers/PublishThumbnailInput/index.js
rename to client/containers/PublishThumbnailInput/index.js
diff --git a/react/containers/PublishThumbnailInput/view.jsx b/client/containers/PublishThumbnailInput/view.jsx
similarity index 100%
rename from react/containers/PublishThumbnailInput/view.jsx
rename to client/containers/PublishThumbnailInput/view.jsx
diff --git a/react/containers/PublishTitleInput/index.js b/client/containers/PublishTitleInput/index.js
similarity index 100%
rename from react/containers/PublishTitleInput/index.js
rename to client/containers/PublishTitleInput/index.js
diff --git a/react/containers/PublishTitleInput/view.jsx b/client/containers/PublishTitleInput/view.jsx
similarity index 100%
rename from react/containers/PublishTitleInput/view.jsx
rename to client/containers/PublishTitleInput/view.jsx
diff --git a/react/containers/PublishTool/index.js b/client/containers/PublishTool/index.js
similarity index 100%
rename from react/containers/PublishTool/index.js
rename to client/containers/PublishTool/index.js
diff --git a/react/containers/PublishTool/view.jsx b/client/containers/PublishTool/view.jsx
similarity index 100%
rename from react/containers/PublishTool/view.jsx
rename to client/containers/PublishTool/view.jsx
diff --git a/react/containers/PublishUrlInput/index.js b/client/containers/PublishUrlInput/index.js
similarity index 100%
rename from react/containers/PublishUrlInput/index.js
rename to client/containers/PublishUrlInput/index.js
diff --git a/react/containers/PublishUrlInput/view.jsx b/client/containers/PublishUrlInput/view.jsx
similarity index 100%
rename from react/containers/PublishUrlInput/view.jsx
rename to client/containers/PublishUrlInput/view.jsx
diff --git a/react/containers/ShowAssetDetails/index.js b/client/containers/ShowAssetDetails/index.js
similarity index 100%
rename from react/containers/ShowAssetDetails/index.js
rename to client/containers/ShowAssetDetails/index.js
diff --git a/react/containers/ShowAssetDetails/view.jsx b/client/containers/ShowAssetDetails/view.jsx
similarity index 100%
rename from react/containers/ShowAssetDetails/view.jsx
rename to client/containers/ShowAssetDetails/view.jsx
diff --git a/react/containers/ShowAssetLite/index.js b/client/containers/ShowAssetLite/index.js
similarity index 100%
rename from react/containers/ShowAssetLite/index.js
rename to client/containers/ShowAssetLite/index.js
diff --git a/react/containers/ShowAssetLite/view.jsx b/client/containers/ShowAssetLite/view.jsx
similarity index 100%
rename from react/containers/ShowAssetLite/view.jsx
rename to client/containers/ShowAssetLite/view.jsx
diff --git a/react/containers/ShowChannel/index.js b/client/containers/ShowChannel/index.js
similarity index 100%
rename from react/containers/ShowChannel/index.js
rename to client/containers/ShowChannel/index.js
diff --git a/react/containers/ShowChannel/view.jsx b/client/containers/ShowChannel/view.jsx
similarity index 100%
rename from react/containers/ShowChannel/view.jsx
rename to client/containers/ShowChannel/view.jsx
diff --git a/react/pages/AboutPage/index.jsx b/client/pages/AboutPage/index.jsx
similarity index 100%
rename from react/pages/AboutPage/index.jsx
rename to client/pages/AboutPage/index.jsx
diff --git a/react/pages/ErrorPage/index.jsx b/client/pages/ErrorPage/index.jsx
similarity index 100%
rename from react/pages/ErrorPage/index.jsx
rename to client/pages/ErrorPage/index.jsx
diff --git a/react/pages/HomePage/index.jsx b/client/pages/HomePage/index.jsx
similarity index 100%
rename from react/pages/HomePage/index.jsx
rename to client/pages/HomePage/index.jsx
diff --git a/react/containers/LoginPage/index.js b/client/pages/LoginPage/index.js
similarity index 100%
rename from react/containers/LoginPage/index.js
rename to client/pages/LoginPage/index.js
diff --git a/react/containers/LoginPage/view.jsx b/client/pages/LoginPage/view.jsx
similarity index 100%
rename from react/containers/LoginPage/view.jsx
rename to client/pages/LoginPage/view.jsx
diff --git a/react/pages/ShowPage/index.js b/client/pages/ShowPage/index.js
similarity index 100%
rename from react/pages/ShowPage/index.js
rename to client/pages/ShowPage/index.js
diff --git a/react/pages/ShowPage/view.jsx b/client/pages/ShowPage/view.jsx
similarity index 100%
rename from react/pages/ShowPage/view.jsx
rename to client/pages/ShowPage/view.jsx
diff --git a/react/reducers/channel.js b/client/reducers/channel.js
similarity index 100%
rename from react/reducers/channel.js
rename to client/reducers/channel.js
diff --git a/react/reducers/index.js b/client/reducers/index.js
similarity index 100%
rename from react/reducers/index.js
rename to client/reducers/index.js
diff --git a/react/reducers/publish.js b/client/reducers/publish.js
similarity index 100%
rename from react/reducers/publish.js
rename to client/reducers/publish.js
diff --git a/react/reducers/show.js b/client/reducers/show.js
similarity index 100%
rename from react/reducers/show.js
rename to client/reducers/show.js
diff --git a/react/reducers/site.js b/client/reducers/site.js
similarity index 100%
rename from react/reducers/site.js
rename to client/reducers/site.js
diff --git a/react/sagas/file.js b/client/sagas/file.js
similarity index 100%
rename from react/sagas/file.js
rename to client/sagas/file.js
diff --git a/react/sagas/index.js b/client/sagas/index.js
similarity index 100%
rename from react/sagas/index.js
rename to client/sagas/index.js
diff --git a/react/sagas/publish.js b/client/sagas/publish.js
similarity index 100%
rename from react/sagas/publish.js
rename to client/sagas/publish.js
diff --git a/react/sagas/show_asset.js b/client/sagas/show_asset.js
similarity index 100%
rename from react/sagas/show_asset.js
rename to client/sagas/show_asset.js
diff --git a/react/sagas/show_channel.js b/client/sagas/show_channel.js
similarity index 100%
rename from react/sagas/show_channel.js
rename to client/sagas/show_channel.js
diff --git a/react/sagas/show_uri.js b/client/sagas/show_uri.js
similarity index 100%
rename from react/sagas/show_uri.js
rename to client/sagas/show_uri.js
diff --git a/react/selectors/channel.js b/client/selectors/channel.js
similarity index 100%
rename from react/selectors/channel.js
rename to client/selectors/channel.js
diff --git a/react/selectors/publish.js b/client/selectors/publish.js
similarity index 100%
rename from react/selectors/publish.js
rename to client/selectors/publish.js
diff --git a/react/selectors/show.js b/client/selectors/show.js
similarity index 100%
rename from react/selectors/show.js
rename to client/selectors/show.js
diff --git a/react/selectors/site.js b/client/selectors/site.js
similarity index 100%
rename from react/selectors/site.js
rename to client/selectors/site.js
diff --git a/react/utils/canonicalLink.js b/client/utils/canonicalLink.js
similarity index 100%
rename from react/utils/canonicalLink.js
rename to client/utils/canonicalLink.js
diff --git a/react/utils/file.js b/client/utils/file.js
similarity index 100%
rename from react/utils/file.js
rename to client/utils/file.js
diff --git a/react/utils/lbryUri.js b/client/utils/lbryUri.js
similarity index 100%
rename from react/utils/lbryUri.js
rename to client/utils/lbryUri.js
diff --git a/react/utils/metaTags.js b/client/utils/metaTags.js
similarity index 100%
rename from react/utils/metaTags.js
rename to client/utils/metaTags.js
diff --git a/react/utils/pageTitle.js b/client/utils/pageTitle.js
similarity index 100%
rename from react/utils/pageTitle.js
rename to client/utils/pageTitle.js
diff --git a/react/utils/publish.js b/client/utils/publish.js
similarity index 100%
rename from react/utils/publish.js
rename to client/utils/publish.js
diff --git a/react/utils/request.js b/client/utils/request.js
similarity index 100%
rename from react/utils/request.js
rename to client/utils/request.js
diff --git a/react/utils/validate.js b/client/utils/validate.js
similarity index 100%
rename from react/utils/validate.js
rename to client/utils/validate.js
diff --git a/constants/index.js b/constants/index.js
deleted file mode 100644
index ee36baf0..00000000
--- a/constants/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
- PUBLISH_ANONYMOUS_CLAIM : 'PUBLISH_ANONYMOUS_CLAIM',
- PUBLISH_IN_CHANNEL_CLAIM: 'PUBLISH_IN_CHANNEL_CLAIM',
-};
diff --git a/index.js b/index.js
index 9c88cbab..121b630d 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
-const server = require('./server.js');
-const client = require('./client.js');
+const server = require('./server/server.js');
+const client = require('./client/client.js');
const exports = {
server,
diff --git a/auth/authentication.js b/server/auth/authentication.js
similarity index 98%
rename from auth/authentication.js
rename to server/auth/authentication.js
index 290aeac5..2148485f 100644
--- a/auth/authentication.js
+++ b/server/auth/authentication.js
@@ -1,4 +1,4 @@
-const db = require('../models');
+const db = require('../models/index');
const logger = require('winston');
module.exports = {
diff --git a/controllers/publishController.js b/server/controllers/publishController.js
similarity index 98%
rename from controllers/publishController.js
rename to server/controllers/publishController.js
index 0bdc4d01..149293ca 100644
--- a/controllers/publishController.js
+++ b/server/controllers/publishController.js
@@ -1,8 +1,8 @@
const logger = require('winston');
-const db = require('../models');
+const db = require('../models/index');
const lbryApi = require('../helpers/lbryApi.js');
const publishHelpers = require('../helpers/publishHelpers.js');
-const { publishing: { primaryClaimAddress, additionalClaimAddresses } } = require('../config/siteConfig.js');
+const { publishing: { primaryClaimAddress, additionalClaimAddresses } } = require('../../config/siteConfig.js');
const Sequelize = require('sequelize');
const Op = Sequelize.Op;
diff --git a/controllers/serveController.js b/server/controllers/serveController.js
similarity index 99%
rename from controllers/serveController.js
rename to server/controllers/serveController.js
index a1a8fbc8..845c465f 100644
--- a/controllers/serveController.js
+++ b/server/controllers/serveController.js
@@ -1,4 +1,4 @@
-const db = require('../models');
+const db = require('../models/index');
const logger = require('winston');
const { returnPaginatedChannelClaims } = require('../helpers/channelPagination.js');
diff --git a/controllers/statsController.js b/server/controllers/statsController.js
similarity index 91%
rename from controllers/statsController.js
rename to server/controllers/statsController.js
index 8292ddc9..e4fd5f30 100644
--- a/controllers/statsController.js
+++ b/server/controllers/statsController.js
@@ -1,5 +1,5 @@
const logger = require('winston');
-const db = require('../models');
+const db = require('../models/index');
module.exports = {
getRecentClaims () {
diff --git a/helpers/authHelpers.js b/server/helpers/authHelpers.js
similarity index 100%
rename from helpers/authHelpers.js
rename to server/helpers/authHelpers.js
diff --git a/helpers/channelPagination.js b/server/helpers/channelPagination.js
similarity index 100%
rename from helpers/channelPagination.js
rename to server/helpers/channelPagination.js
diff --git a/helpers/configVarCheck.js b/server/helpers/configVarCheck.js
similarity index 100%
rename from helpers/configVarCheck.js
rename to server/helpers/configVarCheck.js
diff --git a/helpers/configureLogger.js b/server/helpers/configureLogger.js
similarity index 91%
rename from helpers/configureLogger.js
rename to server/helpers/configureLogger.js
index 391b3b65..8b8776fa 100644
--- a/helpers/configureLogger.js
+++ b/server/helpers/configureLogger.js
@@ -1,4 +1,4 @@
-const { logLevel } = require('../config/loggerConfig');
+const { logLevel } = require('../../config/loggerConfig');
module.exports = (winston) => {
// configure
diff --git a/helpers/configureSlack.js b/server/helpers/configureSlack.js
similarity index 94%
rename from helpers/configureSlack.js
rename to server/helpers/configureSlack.js
index b4601d95..c7353f41 100644
--- a/helpers/configureSlack.js
+++ b/server/helpers/configureSlack.js
@@ -1,5 +1,5 @@
const winstonSlackWebHook = require('winston-slack-webhook').SlackWebHook;
-const slackConfig = require('../config/slackConfig.js');
+const slackConfig = require('../../config/slackConfig.js');
module.exports = (winston) => {
const {slackWebHook, slackErrorChannel, slackInfoChannel} = slackConfig;
diff --git a/helpers/errorHandlers.js b/server/helpers/errorHandlers.js
similarity index 100%
rename from helpers/errorHandlers.js
rename to server/helpers/errorHandlers.js
diff --git a/helpers/googleAnalytics.js b/server/helpers/googleAnalytics.js
similarity index 98%
rename from helpers/googleAnalytics.js
rename to server/helpers/googleAnalytics.js
index ed7b876c..0f5da915 100644
--- a/helpers/googleAnalytics.js
+++ b/server/helpers/googleAnalytics.js
@@ -1,6 +1,6 @@
const logger = require('winston');
const ua = require('universal-analytics');
-const { analytics : { googleId }, details: { title } } = require('../config/siteConfig.js');
+const { analytics : { googleId }, details: { title } } = require('../../config/siteConfig.js');
function createServeEventParams (headers, ip, originalUrl) {
return {
diff --git a/helpers/handlePageRender.jsx b/server/helpers/handlePageRender.jsx
similarity index 88%
rename from helpers/handlePageRender.jsx
rename to server/helpers/handlePageRender.jsx
index 206303c4..bcf62b43 100644
--- a/helpers/handlePageRender.jsx
+++ b/server/helpers/handlePageRender.jsx
@@ -1,11 +1,11 @@
import React from 'react';
import { renderToString } from 'react-dom/server';
import { createStore } from 'redux';
-import Reducer from '../react/reducers';
+import Reducer from '../../client/reducers/index';
import { Provider } from 'react-redux';
import { StaticRouter } from 'react-router-dom';
-import GAListener from '../react/components/GAListener';
-import App from '../react/app';
+import GAListener from '../../client/components/GAListener/index';
+import App from '../../client/app';
import renderFullPage from './renderFullPage.js';
import Helmet from 'react-helmet';
diff --git a/helpers/handleShowRender.jsx b/server/helpers/handleShowRender.jsx
similarity index 85%
rename from helpers/handleShowRender.jsx
rename to server/helpers/handleShowRender.jsx
index ac9e2d32..bb5c4bf1 100644
--- a/helpers/handleShowRender.jsx
+++ b/server/helpers/handleShowRender.jsx
@@ -1,16 +1,16 @@
import React from 'react';
import { renderToString } from 'react-dom/server';
import { createStore, applyMiddleware } from 'redux';
-import Reducer from '../react/reducers';
+import Reducer from '../../client/reducers/index';
import { Provider } from 'react-redux';
import { StaticRouter } from 'react-router-dom';
-import GAListener from '../react/components/GAListener';
-import App from '../react/app';
+import GAListener from '../../client/components/GAListener/index';
+import App from '../../client/app';
import renderFullPage from './renderFullPage';
import createSagaMiddleware from 'redux-saga';
import { call } from 'redux-saga/effects';
-import { handleShowPageUri } from '../react/sagas/show_uri';
-import { onHandleShowPageUri } from '../react/actions/show';
+import { handleShowPageUri } from '../../client/sagas/show_uri';
+import { onHandleShowPageUri } from '../../client/actions/show';
import Helmet from 'react-helmet';
diff --git a/helpers/lbryApi.js b/server/helpers/lbryApi.js
similarity index 98%
rename from helpers/lbryApi.js
rename to server/helpers/lbryApi.js
index 6abf6a21..4d54ad2b 100644
--- a/helpers/lbryApi.js
+++ b/server/helpers/lbryApi.js
@@ -1,6 +1,6 @@
const axios = require('axios');
const logger = require('winston');
-const { api: { apiHost, apiPort } } = require('../config/lbryConfig.js');
+const { api: { apiHost, apiPort } } = require('../../config/lbryConfig.js');
const lbryApiUri = 'http://' + apiHost + ':' + apiPort;
const { chooseGaLbrynetPublishLabel, sendGATimingEvent } = require('./googleAnalytics.js');
diff --git a/helpers/lbryUri.js b/server/helpers/lbryUri.js
similarity index 100%
rename from helpers/lbryUri.js
rename to server/helpers/lbryUri.js
diff --git a/helpers/publishHelpers.js b/server/helpers/publishHelpers.js
similarity index 98%
rename from helpers/publishHelpers.js
rename to server/helpers/publishHelpers.js
index fc80a40b..03625d9e 100644
--- a/helpers/publishHelpers.js
+++ b/server/helpers/publishHelpers.js
@@ -1,7 +1,7 @@
const logger = require('winston');
const fs = require('fs');
-const { details, publishing } = require('../config/siteConfig.js');
+const { details, publishing } = require('../../config/siteConfig.js');
module.exports = {
parsePublishApiRequestBody ({name, nsfw, license, title, description, thumbnail}) {
diff --git a/helpers/renderFullPage.js b/server/helpers/renderFullPage.js
similarity index 100%
rename from helpers/renderFullPage.js
rename to server/helpers/renderFullPage.js
diff --git a/helpers/sequelizeHelpers.js b/server/helpers/sequelizeHelpers.js
similarity index 100%
rename from helpers/sequelizeHelpers.js
rename to server/helpers/sequelizeHelpers.js
diff --git a/helpers/serveHelpers.js b/server/helpers/serveHelpers.js
similarity index 98%
rename from helpers/serveHelpers.js
rename to server/helpers/serveHelpers.js
index 78447d6d..4a425327 100644
--- a/helpers/serveHelpers.js
+++ b/server/helpers/serveHelpers.js
@@ -1,6 +1,6 @@
const logger = require('winston');
const { getClaimId, getLocalFileRecord } = require('../controllers/serveController.js');
-const { handleErrorResponse } = require('../helpers/errorHandlers.js');
+const { handleErrorResponse } = require('./errorHandlers.js');
const SERVE = 'SERVE';
const SHOW = 'SHOW';
diff --git a/helpers/statsHelpers.js b/server/helpers/statsHelpers.js
similarity index 96%
rename from helpers/statsHelpers.js
rename to server/helpers/statsHelpers.js
index 9e471172..8ec90f22 100644
--- a/helpers/statsHelpers.js
+++ b/server/helpers/statsHelpers.js
@@ -1,5 +1,5 @@
const logger = require('winston');
-const db = require('../models');
+const db = require('../models/index');
module.exports = {
postToStats (action, url, ipAddress, name, claimId, result) {
diff --git a/migrations/ChangeCertificateColumnTypes2.js b/server/migrations/ChangeCertificateColumnTypes2.js
similarity index 100%
rename from migrations/ChangeCertificateColumnTypes2.js
rename to server/migrations/ChangeCertificateColumnTypes2.js
diff --git a/migrations/ChangeClaimColumnTypes.js b/server/migrations/ChangeClaimColumnTypes.js
similarity index 100%
rename from migrations/ChangeClaimColumnTypes.js
rename to server/migrations/ChangeClaimColumnTypes.js
diff --git a/models/certificate.js b/server/models/certificate.js
similarity index 100%
rename from models/certificate.js
rename to server/models/certificate.js
diff --git a/models/channel.js b/server/models/channel.js
similarity index 100%
rename from models/channel.js
rename to server/models/channel.js
diff --git a/models/claim.js b/server/models/claim.js
similarity index 99%
rename from models/claim.js
rename to server/models/claim.js
index 6bcbfba9..b7803cb6 100644
--- a/models/claim.js
+++ b/server/models/claim.js
@@ -1,6 +1,6 @@
const logger = require('winston');
const { returnShortId } = require('../helpers/sequelizeHelpers.js');
-const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('../config/siteConfig.js');
+const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('../../config/siteConfig.js');
function determineFileExtensionFromContentType (contentType) {
switch (contentType) {
diff --git a/models/file.js b/server/models/file.js
similarity index 100%
rename from models/file.js
rename to server/models/file.js
diff --git a/models/index.js b/server/models/index.js
similarity index 96%
rename from models/index.js
rename to server/models/index.js
index 419f86ec..c3ea52fa 100644
--- a/models/index.js
+++ b/server/models/index.js
@@ -2,7 +2,7 @@ const Sequelize = require('sequelize');
const logger = require('winston');
console.log('exporting sequelize models');
-const { database, username, password } = require('../config/mysqlConfig');
+const { database, username, password } = require('../../config/mysqlConfig');
const db = {};
// set sequelize options
const sequelize = new Sequelize(database, username, password, {
diff --git a/models/request.js b/server/models/request.js
similarity index 100%
rename from models/request.js
rename to server/models/request.js
diff --git a/models/user.js b/server/models/user.js
similarity index 100%
rename from models/user.js
rename to server/models/user.js
diff --git a/passport/local-login.js b/server/passport/local-login.js
similarity index 97%
rename from passport/local-login.js
rename to server/passport/local-login.js
index b4e70f4b..88dbc28d 100644
--- a/passport/local-login.js
+++ b/server/passport/local-login.js
@@ -1,6 +1,6 @@
const PassportLocalStrategy = require('passport-local').Strategy;
const logger = require('winston');
-const db = require('../models');
+const db = require('../models/index');
const returnUserAndChannelInfo = (userInstance) => {
return new Promise((resolve, reject) => {
diff --git a/passport/local-signup.js b/server/passport/local-signup.js
similarity index 98%
rename from passport/local-signup.js
rename to server/passport/local-signup.js
index 07971a9e..02d9fa69 100644
--- a/passport/local-signup.js
+++ b/server/passport/local-signup.js
@@ -1,7 +1,7 @@
const PassportLocalStrategy = require('passport-local').Strategy;
const lbryApi = require('../helpers/lbryApi.js');
const logger = require('winston');
-const db = require('../models');
+const db = require('../models/index');
module.exports = new PassportLocalStrategy(
{
diff --git a/routes/api-routes.js b/server/routes/api-routes.js
similarity index 99%
rename from routes/api-routes.js
rename to server/routes/api-routes.js
index 86b86fb6..d2ec536c 100644
--- a/routes/api-routes.js
+++ b/server/routes/api-routes.js
@@ -1,8 +1,8 @@
const logger = require('winston');
const multipart = require('connect-multiparty');
-const { publishing: { uploadDirectory }, details: { host } } = require('../config/siteConfig.js');
+const { publishing: { uploadDirectory }, details: { host } } = require('../../config/siteConfig.js');
const multipartMiddleware = multipart({uploadDir: uploadDirectory});
-const db = require('../models');
+const db = require('../models/index');
const { claimNameIsAvailable, checkChannelAvailability, publish } = require('../controllers/publishController.js');
const { getClaimList, resolveUri, getClaim } = require('../helpers/lbryApi.js');
const { addGetResultsToFileData, createBasicPublishParams, createThumbnailPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles, createFileData } = require('../helpers/publishHelpers.js');
diff --git a/routes/asset-routes.js b/server/routes/asset-routes.js
similarity index 100%
rename from routes/asset-routes.js
rename to server/routes/asset-routes.js
diff --git a/routes/auth-routes.js b/server/routes/auth-routes.js
similarity index 100%
rename from routes/auth-routes.js
rename to server/routes/auth-routes.js
diff --git a/routes/fallback-routes.js b/server/routes/fallback-routes.js
similarity index 100%
rename from routes/fallback-routes.js
rename to server/routes/fallback-routes.js
diff --git a/routes/page-routes.js b/server/routes/page-routes.js
similarity index 94%
rename from routes/page-routes.js
rename to server/routes/page-routes.js
index ce558a82..44c19be1 100644
--- a/routes/page-routes.js
+++ b/server/routes/page-routes.js
@@ -1,4 +1,4 @@
-const { details: host } = require('../config/siteConfig.js');
+const { details: host } = require('../../config/siteConfig.js');
const handlePageRender = require('../helpers/handlePageRender.jsx');
module.exports = (app) => {
diff --git a/server.js b/server/server.js
similarity index 93%
rename from server.js
rename to server/server.js
index 4f77c8c8..21294704 100644
--- a/server.js
+++ b/server/server.js
@@ -13,15 +13,15 @@ const logger = require('winston');
function SpeechServer () {
this.configureMysql = (mysqlConfig) => {
- require('./config/mysqlConfig.js').configure(mysqlConfig);
+ require('../config/mysqlConfig.js').configure(mysqlConfig);
};
this.configureSite = (siteConfig) => {
- require('./config/siteConfig.js').configure(siteConfig);
+ require('../config/siteConfig.js').configure(siteConfig);
this.sessionKey = siteConfig.auth.sessionKey;
this.PORT = siteConfig.details.port;
};
this.configureSlack = (slackConfig) => {
- require('./config/slackConfig.js').configure(slackConfig);
+ require('../config/slackConfig.js').configure(slackConfig);
};
this.createApp = () => {
// create an Express application
@@ -80,7 +80,7 @@ function SpeechServer () {
this.server = http.Server(this.app);
};
this.start = () => {
- const db = require('./models');
+ const db = require('./models/index');
// sync sequelize
db.sequelize.sync()
// start the server
diff --git a/task-scripts/update-channel-names.js b/server/task-scripts/update-channel-names.js
similarity index 95%
rename from task-scripts/update-channel-names.js
rename to server/task-scripts/update-channel-names.js
index b04afdb8..fae22cc1 100644
--- a/task-scripts/update-channel-names.js
+++ b/server/task-scripts/update-channel-names.js
@@ -1,6 +1,6 @@
// load dependencies
const logger = require('winston');
-const db = require('../models'); // require our models for syncing
+const db = require('../models/index'); // require our models for syncing
// configure logging
require('../helpers/configureLogger.js')(logger);
diff --git a/task-scripts/update-password.js b/server/task-scripts/update-password.js
similarity index 96%
rename from task-scripts/update-password.js
rename to server/task-scripts/update-password.js
index f740d543..dee96d8f 100644
--- a/task-scripts/update-password.js
+++ b/server/task-scripts/update-password.js
@@ -1,6 +1,6 @@
// load dependencies
const logger = require('winston');
-const db = require('../models');
+const db = require('../models/index');
// configure logging
require('../helpers/configureLogger.js')(logger);
diff --git a/views/embed.handlebars b/server/views/embed.handlebars
similarity index 100%
rename from views/embed.handlebars
rename to server/views/embed.handlebars
diff --git a/views/layouts/embed.handlebars b/server/views/layouts/embed.handlebars
similarity index 100%
rename from views/layouts/embed.handlebars
rename to server/views/layouts/embed.handlebars
diff --git a/views/partials/maintenanceBanner.handlebars b/server/views/partials/maintenanceBanner.handlebars
similarity index 100%
rename from views/partials/maintenanceBanner.handlebars
rename to server/views/partials/maintenanceBanner.handlebars
diff --git a/views/partials/progressBar.handlebars b/server/views/partials/progressBar.handlebars
similarity index 100%
rename from views/partials/progressBar.handlebars
rename to server/views/partials/progressBar.handlebars
diff --git a/test/unit/publishHelpers.test.js b/test/unit/publishHelpers.test.js
index 358e989a..c522b487 100644
--- a/test/unit/publishHelpers.test.js
+++ b/test/unit/publishHelpers.test.js
@@ -2,7 +2,7 @@ const chai = require('chai');
const expect = chai.expect;
describe('publishHelpers.js', function () {
- const publishHelpers = require('../../helpers/publishHelpers.js');
+ const publishHelpers = require('../../server/helpers/publishHelpers.js');
describe('#parsePublishApiRequestBody()', function () {
it('should throw an error if no body', function () {