From 6bed683d9f78776d5b4cb60b3b0fc6c75f563bb4 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Tue, 17 Apr 2018 14:57:45 -0700 Subject: [PATCH] finished first pass at updating relative paths --- server/auth/authentication.js | 2 +- server/routes/api/channelAvailability.js | 6 +++--- server/routes/api/channelData.js | 4 ++-- server/routes/api/claimData.js | 4 ++-- server/routes/api/claimLongId.js | 4 ++-- server/routes/api/claimPublish.js | 12 ++++++------ server/routes/api/claimResolve.js | 4 ++-- server/routes/api/claimShortId.js | 4 ++-- server/routes/assets/serveAssetByClaim.js | 8 ++++---- .../routes/assets/serveAssetByIdentifierAndClaim.js | 8 ++++---- server/routes/fallback/sendReactApp.js | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/server/auth/authentication.js b/server/auth/authentication.js index c45cf598..accff721 100644 --- a/server/auth/authentication.js +++ b/server/auth/authentication.js @@ -1,5 +1,5 @@ -const db = require('models'); const logger = require('winston'); +const db = require('../models'); module.exports = { authenticateUser (channelName, channelId, channelPassword, user) { diff --git a/server/routes/api/channelAvailability.js b/server/routes/api/channelAvailability.js index 128aff44..b9f6230c 100644 --- a/server/routes/api/channelAvailability.js +++ b/server/routes/api/channelAvailability.js @@ -1,6 +1,6 @@ -const { checkChannelAvailability } = require('controllers/publishController.js'); -const { sendGATimingEvent } = require('helpers/googleAnalytics.js'); -const { handleErrorResponse } = require('helpers/errorHandlers.js'); +const { checkChannelAvailability } = require('../../controllers/publishController.js'); +const { sendGATimingEvent } = require('../../helpers/googleAnalytics.js'); +const { handleErrorResponse } = require('../../helpers/errorHandlers.js'); /* diff --git a/server/routes/api/channelData.js b/server/routes/api/channelData.js index d6a3f026..de12b340 100644 --- a/server/routes/api/channelData.js +++ b/server/routes/api/channelData.js @@ -1,5 +1,5 @@ -const { getChannelData } = require('controllers/serveController.js'); -const { handleErrorResponse } = require('helpers/errorHandlers.js'); +const { getChannelData } = require('../../controllers/serveController.js'); +const { handleErrorResponse } = require('../../helpers/errorHandlers.js'); const NO_CHANNEL = 'NO_CHANNEL'; diff --git a/server/routes/api/claimData.js b/server/routes/api/claimData.js index d8b6c448..9a3a5495 100644 --- a/server/routes/api/claimData.js +++ b/server/routes/api/claimData.js @@ -1,5 +1,5 @@ -const { handleErrorResponse } = require('helpers/errorHandlers.js'); -const db = require('models'); +const { handleErrorResponse } = require('../../helpers/errorHandlers.js'); +const db = require('../../models'); /* diff --git a/server/routes/api/claimLongId.js b/server/routes/api/claimLongId.js index 98e80770..a5dd5fa5 100644 --- a/server/routes/api/claimLongId.js +++ b/server/routes/api/claimLongId.js @@ -1,5 +1,5 @@ -const { getClaimId } = require('controllers/serveController.js'); -const { handleErrorResponse } = require('helpers/errorHandlers.js'); +const { getClaimId } = require('../../controllers/serveController.js'); +const { handleErrorResponse } = require('../../helpers/errorHandlers.js'); const NO_CHANNEL = 'NO_CHANNEL'; const NO_CLAIM = 'NO_CLAIM'; diff --git a/server/routes/api/claimPublish.js b/server/routes/api/claimPublish.js index 5d5b1e52..5f8135d7 100644 --- a/server/routes/api/claimPublish.js +++ b/server/routes/api/claimPublish.js @@ -1,9 +1,9 @@ -const { createBasicPublishParams, createThumbnailPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles } = require('helpers/publishHelpers.js'); -const { claimNameIsAvailable, publish } = require('controllers/publishController.js'); -const { authenticateUser } = require('auth/authentication.js'); -const { sendGATimingEvent } = require('helpers/googleAnalytics.js'); -const { handleErrorResponse } = require('helpers/errorHandlers.js'); -const { details: { host } } = require('siteConfig.js'); +const { createBasicPublishParams, createThumbnailPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles } = require('../../helpers/publishHelpers.js'); +const { claimNameIsAvailable, publish } = require('../../controllers/publishController.js'); +const { authenticateUser } = require('../../auth/authentication.js'); +const { sendGATimingEvent } = require('../../helpers/googleAnalytics.js'); +const { handleErrorResponse } = require('../../helpers/errorHandlers.js'); +const { details: { host } } = require('../../../config/siteConfig.js'); /* diff --git a/server/routes/api/claimResolve.js b/server/routes/api/claimResolve.js index 5cf03b3f..3876bde7 100644 --- a/server/routes/api/claimResolve.js +++ b/server/routes/api/claimResolve.js @@ -1,5 +1,5 @@ -const { resolveUri } = require('helpers/lbryApi.js'); -const { handleErrorResponse } = require('helpers/errorHandlers.js'); +const { resolveUri } = require('../../helpers/lbryApi.js'); +const { handleErrorResponse } = require('../../helpers/errorHandlers.js'); /* diff --git a/server/routes/api/claimShortId.js b/server/routes/api/claimShortId.js index a8a310d2..1b28f519 100644 --- a/server/routes/api/claimShortId.js +++ b/server/routes/api/claimShortId.js @@ -1,5 +1,5 @@ -const { handleErrorResponse } = require('helpers/errorHandlers.js'); -const db = require('models'); +const { handleErrorResponse } = require('../../helpers/errorHandlers.js'); +const db = require('../../models'); /* diff --git a/server/routes/assets/serveAssetByClaim.js b/server/routes/assets/serveAssetByClaim.js index 9eec9b93..e0f57792 100644 --- a/server/routes/assets/serveAssetByClaim.js +++ b/server/routes/assets/serveAssetByClaim.js @@ -1,7 +1,7 @@ -const { sendGAServeEvent } = require('helpers/googleAnalytics'); -const { determineResponseType, logRequestData, getClaimIdAndServeAsset } = require('helpers/serveHelpers.js'); -const lbryUri = require('helpers/lbryUri.js'); -const handleShowRender = require('helpers/handleShowRender.jsx'); +const { sendGAServeEvent } = require('../../helpers/googleAnalytics'); +const { determineResponseType, logRequestData, getClaimIdAndServeAsset } = require('../../helpers/serveHelpers.js'); +const lbryUri = require('../../helpers/lbryUri.js'); +const handleShowRender = require('../../helpers/handleShowRender.jsx'); const SERVE = 'SERVE'; /* diff --git a/server/routes/assets/serveAssetByIdentifierAndClaim.js b/server/routes/assets/serveAssetByIdentifierAndClaim.js index 2357b520..e9f42f17 100644 --- a/server/routes/assets/serveAssetByIdentifierAndClaim.js +++ b/server/routes/assets/serveAssetByIdentifierAndClaim.js @@ -1,12 +1,12 @@ -const { sendGAServeEvent } = require('helpers/googleAnalytics'); +const { sendGAServeEvent } = require('../../helpers/googleAnalytics'); const { determineResponseType, flipClaimNameAndIdForBackwardsCompatibility, logRequestData, getClaimIdAndServeAsset, -} = require('helpers/serveHelpers.js'); -const lbryUri = require('helpers/lbryUri.js'); -const handleShowRender = require('helpers/handleShowRender.jsx'); +} = require('../../helpers/serveHelpers.js'); +const lbryUri = require('../../helpers/lbryUri.js'); +const handleShowRender = require('../../helpers/handleShowRender.jsx'); const SERVE = 'SERVE'; diff --git a/server/routes/fallback/sendReactApp.js b/server/routes/fallback/sendReactApp.js index b6aac94b..794ab587 100644 --- a/server/routes/fallback/sendReactApp.js +++ b/server/routes/fallback/sendReactApp.js @@ -1,4 +1,4 @@ -const handlePageRender = require('helpers/handlePageRender.jsx'); +const handlePageRender = require('../../helpers/handlePageRender.jsx'); const sendReactApp = (req, res) => { handlePageRender(req, res);