From 9cc5dc968c6f9f63ed04a9e6189e5da915b9ff11 Mon Sep 17 00:00:00 2001 From: nate stemen Date: Thu, 11 Jul 2019 14:45:50 -0400 Subject: [PATCH] Merge pull request #1957 from overleaf/ns-decaf-cleanup .../js/... -> .../src/... GitOrigin-RevId: ab509c633529440f05247d19c320ebb77d506768 --- services/web/scripts/add_git_bridge_feature.js | 2 +- services/web/scripts/add_multiple_emails.js | 2 +- .../web/scripts/beta-users/set_rich_text_beta_users.js | 2 +- services/web/scripts/check_institution_users.js | 2 +- services/web/scripts/dropbox/remove_duplicate_uids.js | 6 +++--- .../scripts/import-oauth/import_oauth_access_grants.js | 6 +++--- .../scripts/import-oauth/import_oauth_access_tokens.js | 8 ++++---- .../web/scripts/import-oauth/import_oauth_applications.js | 2 +- .../scripts/import-oauth/import_user_collabratec_ids.js | 6 +++--- services/web/scripts/increase_compile_timeouts.js | 2 +- .../project-tokens/add_readAndWritePrefix_index.js | 2 +- .../web/scripts/project-tokens/deactivate_projects.js | 2 +- .../project-tokens/extract_read_and_write_token_prefix.js | 2 +- .../web/scripts/project-tokens/reactivate_projects.js | 2 +- services/web/scripts/remove_brand_variation_ids.js | 2 +- services/web/scripts/remove_duplicate_v1_ids.js | 2 +- .../scripts/remove_password_fields_from_migrated_users.js | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/services/web/scripts/add_git_bridge_feature.js b/services/web/scripts/add_git_bridge_feature.js index f98f19fb98..a0bb51ae13 100644 --- a/services/web/scripts/add_git_bridge_feature.js +++ b/services/web/scripts/add_git_bridge_feature.js @@ -1,4 +1,4 @@ -const { db } = require('../app/js/infrastructure/mongojs') +const { db } = require('../app/src/infrastructure/mongojs') const logger = require('logger-sharelatex') logger.logger.level('error') diff --git a/services/web/scripts/add_multiple_emails.js b/services/web/scripts/add_multiple_emails.js index 1892b7b5a2..979207a46e 100644 --- a/services/web/scripts/add_multiple_emails.js +++ b/services/web/scripts/add_multiple_emails.js @@ -1,4 +1,4 @@ -const mongojs = require('../app/js/infrastructure/mongojs') +const mongojs = require('../app/src/infrastructure/mongojs') const { db } = mongojs const async = require('async') const minilist = require('minimist') diff --git a/services/web/scripts/beta-users/set_rich_text_beta_users.js b/services/web/scripts/beta-users/set_rich_text_beta_users.js index e21c516574..84bf1546a9 100644 --- a/services/web/scripts/beta-users/set_rich_text_beta_users.js +++ b/services/web/scripts/beta-users/set_rich_text_beta_users.js @@ -1,6 +1,6 @@ const fs = require('fs') const path = require('path') -const mongojs = require('../../app/js/infrastructure/mongojs') +const mongojs = require('../../app/src/infrastructure/mongojs') const { db, ObjectId } = mongojs const async = require('async') diff --git a/services/web/scripts/check_institution_users.js b/services/web/scripts/check_institution_users.js index 6fb1717974..7d2d17b8cc 100644 --- a/services/web/scripts/check_institution_users.js +++ b/services/web/scripts/check_institution_users.js @@ -1,4 +1,4 @@ -const InstitutionsManager = require('../app/js/Features/Institutions/InstitutionsManager') +const InstitutionsManager = require('../app/src/Features/Institutions/InstitutionsManager') const institutionId = parseInt(process.argv[2]) if (isNaN(institutionId)) throw new Error('No institution id') diff --git a/services/web/scripts/dropbox/remove_duplicate_uids.js b/services/web/scripts/dropbox/remove_duplicate_uids.js index 078b5a189d..6e39c189e8 100644 --- a/services/web/scripts/dropbox/remove_duplicate_uids.js +++ b/services/web/scripts/dropbox/remove_duplicate_uids.js @@ -1,6 +1,6 @@ -const { db } = require('../../app/js/infrastructure/mongojs') -const DropboxHandler = require('../../modules/dropbox/app/js/DropboxHandler') -const EmailHandler = require('../../app/js/Features/Email/EmailHandler') +const { db } = require('../../app/src/infrastructure/mongojs') +const DropboxHandler = require('../../modules/dropbox/app/src/DropboxHandler') +const EmailHandler = require('../../app/src/Features/Email/EmailHandler') const async = require('async') const minimist = require('minimist') diff --git a/services/web/scripts/import-oauth/import_oauth_access_grants.js b/services/web/scripts/import-oauth/import_oauth_access_grants.js index 80b447e292..fe5ea80411 100644 --- a/services/web/scripts/import-oauth/import_oauth_access_grants.js +++ b/services/web/scripts/import-oauth/import_oauth_access_grants.js @@ -12,11 +12,11 @@ 'use strict' -const OauthApplication = require('../../app/js/models/OauthApplication') +const OauthApplication = require('../../app/src/models/OauthApplication') .OauthApplication -const OauthAuthorizationCode = require('../../app/js/models/OauthAuthorizationCode') +const OauthAuthorizationCode = require('../../app/src/models/OauthAuthorizationCode') .OauthAuthorizationCode -const User = require('../../app/js/models/User').User +const User = require('../../app/src/models/User').User const async = require('async') const csvParser = require('csv-parser') const fs = require('fs') diff --git a/services/web/scripts/import-oauth/import_oauth_access_tokens.js b/services/web/scripts/import-oauth/import_oauth_access_tokens.js index e5b1186cb1..2e48187f93 100644 --- a/services/web/scripts/import-oauth/import_oauth_access_tokens.js +++ b/services/web/scripts/import-oauth/import_oauth_access_tokens.js @@ -16,12 +16,12 @@ 'use strict' -const OauthApplication = require('../../app/js/models/OauthApplication') +const OauthApplication = require('../../app/src/models/OauthApplication') .OauthApplication -const OauthAccessToken = require('../../app/js/models/OauthAccessToken') +const OauthAccessToken = require('../../app/src/models/OauthAccessToken') .OauthAccessToken -const User = require('../../app/js/models/User').User -const UserMapper = require('../../modules/overleaf-integration/app/js/OverleafUsers/UserMapper') +const User = require('../../app/src/models/User').User +const UserMapper = require('../../modules/overleaf-integration/app/src/OverleafUsers/UserMapper') const async = require('async') const csvParser = require('csv-parser') const fs = require('fs') diff --git a/services/web/scripts/import-oauth/import_oauth_applications.js b/services/web/scripts/import-oauth/import_oauth_applications.js index 980d9bba6c..335741c568 100644 --- a/services/web/scripts/import-oauth/import_oauth_applications.js +++ b/services/web/scripts/import-oauth/import_oauth_applications.js @@ -10,7 +10,7 @@ 'use strict' -const OauthApplication = require('../../app/js/models/OauthApplication') +const OauthApplication = require('../../app/src/models/OauthApplication') .OauthApplication const async = require('async') const csvParser = require('csv-parser') diff --git a/services/web/scripts/import-oauth/import_user_collabratec_ids.js b/services/web/scripts/import-oauth/import_user_collabratec_ids.js index c9eb86c1f4..d51040360a 100644 --- a/services/web/scripts/import-oauth/import_user_collabratec_ids.js +++ b/services/web/scripts/import-oauth/import_user_collabratec_ids.js @@ -10,9 +10,9 @@ 'use strict' -const UserMapper = require('../../modules/overleaf-integration/app/js/OverleafUsers/UserMapper') -const User = require('../../app/js/models/User').User -const UserStub = require('../../app/js/models/UserStub').UserStub +const UserMapper = require('../../modules/overleaf-integration/app/src/OverleafUsers/UserMapper') +const User = require('../../app/src/models/User').User +const UserStub = require('../../app/src/models/UserStub').UserStub const async = require('async') const csvParser = require('csv-parser') const fs = require('fs') diff --git a/services/web/scripts/increase_compile_timeouts.js b/services/web/scripts/increase_compile_timeouts.js index 0f83907648..ce5069586c 100644 --- a/services/web/scripts/increase_compile_timeouts.js +++ b/services/web/scripts/increase_compile_timeouts.js @@ -1,4 +1,4 @@ -const mongojs = require('../app/js/infrastructure/mongojs') +const mongojs = require('../app/src/infrastructure/mongojs') const { db } = mongojs const async = require('async') const minilist = require('minimist') diff --git a/services/web/scripts/project-tokens/add_readAndWritePrefix_index.js b/services/web/scripts/project-tokens/add_readAndWritePrefix_index.js index c8cdf6bcbf..abaa45b61b 100644 --- a/services/web/scripts/project-tokens/add_readAndWritePrefix_index.js +++ b/services/web/scripts/project-tokens/add_readAndWritePrefix_index.js @@ -1,4 +1,4 @@ -const mongojs = require('../../app/js/infrastructure/mongojs') +const mongojs = require('../../app/src/infrastructure/mongojs') const { db } = mongojs const keys = { 'tokens.readAndWritePrefix': 1 } diff --git a/services/web/scripts/project-tokens/deactivate_projects.js b/services/web/scripts/project-tokens/deactivate_projects.js index a949c80f92..85571b96f8 100644 --- a/services/web/scripts/project-tokens/deactivate_projects.js +++ b/services/web/scripts/project-tokens/deactivate_projects.js @@ -1,4 +1,4 @@ -const mongojs = require('../../app/js/infrastructure/mongojs') +const mongojs = require('../../app/src/infrastructure/mongojs') const { db, ObjectId } = mongojs const Async = require('async') diff --git a/services/web/scripts/project-tokens/extract_read_and_write_token_prefix.js b/services/web/scripts/project-tokens/extract_read_and_write_token_prefix.js index 042d85f4f8..2cba9b581f 100644 --- a/services/web/scripts/project-tokens/extract_read_and_write_token_prefix.js +++ b/services/web/scripts/project-tokens/extract_read_and_write_token_prefix.js @@ -1,4 +1,4 @@ -const mongojs = require('../../app/js/infrastructure/mongojs') +const mongojs = require('../../app/src/infrastructure/mongojs') const { db } = mongojs const Async = require('async') diff --git a/services/web/scripts/project-tokens/reactivate_projects.js b/services/web/scripts/project-tokens/reactivate_projects.js index 1c2e3a64ca..3259b049f0 100644 --- a/services/web/scripts/project-tokens/reactivate_projects.js +++ b/services/web/scripts/project-tokens/reactivate_projects.js @@ -1,4 +1,4 @@ -const ProjectDetailsHandler = require('../../app/js/Features/Project/ProjectDetailsHandler') +const ProjectDetailsHandler = require('../../app/src/Features/Project/ProjectDetailsHandler') const Async = require('async') const projectIds = [ diff --git a/services/web/scripts/remove_brand_variation_ids.js b/services/web/scripts/remove_brand_variation_ids.js index 9ddf809740..4a176a8190 100644 --- a/services/web/scripts/remove_brand_variation_ids.js +++ b/services/web/scripts/remove_brand_variation_ids.js @@ -10,7 +10,7 @@ // actually removes the brandVariationId attribute from project documents // that have brandVariationId attribute with value, "3" // -const { db } = require('../app/js/infrastructure/mongojs') +const { db } = require('../app/src/infrastructure/mongojs') const async = require('async') const minimist = require('minimist') diff --git a/services/web/scripts/remove_duplicate_v1_ids.js b/services/web/scripts/remove_duplicate_v1_ids.js index f45c741a0d..d7df8ee388 100644 --- a/services/web/scripts/remove_duplicate_v1_ids.js +++ b/services/web/scripts/remove_duplicate_v1_ids.js @@ -1,4 +1,4 @@ -const { db } = require('../app/js/infrastructure/mongojs') +const { db } = require('../app/src/infrastructure/mongojs') const async = require('async') const minimist = require('minimist') diff --git a/services/web/scripts/remove_password_fields_from_migrated_users.js b/services/web/scripts/remove_password_fields_from_migrated_users.js index 1acbfc3f47..f090bb8c42 100644 --- a/services/web/scripts/remove_password_fields_from_migrated_users.js +++ b/services/web/scripts/remove_password_fields_from_migrated_users.js @@ -1,4 +1,4 @@ -const { db } = require('../app/js/infrastructure/mongojs') +const { db } = require('../app/src/infrastructure/mongojs') const minimist = require('minimist') const argv = minimist(process.argv.slice(2))