diff --git a/.eslintignore b/.eslintignore index 062f955d0..685b64a84 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,5 @@ -src/lib/ot -src/lib/migrations +old_src/lib/ot +old_src/lib/migrations public/vendor public/build node_modules diff --git a/src/lib/app.ts b/old_src/lib/app.ts similarity index 99% rename from src/lib/app.ts rename to old_src/lib/app.ts index 1c42fa7e1..aa67b73f2 100644 --- a/src/lib/app.ts +++ b/old_src/lib/app.ts @@ -27,7 +27,7 @@ import { logger } from './logger' import { Revision, sequelize, runMigrations } from './models' import { realtime, State } from './realtime' import { handleTermSignals } from './utils/functions' -import { AuthRouter, BaseRouter, HistoryRouter, ImageRouter, NoteRouter, StatusRouter, UserRouter } from './web/' +import { AuthRouter, BaseRouter, HistoryRouter, ImageRouter, NoteRouter, StatusRouter, UserRouter } from './web' import { tooBusy, checkURI, redirectWithoutTrailingSlashes, codiMDVersion } from './web/middleware' const rootPath = path.join(__dirname, '..') diff --git a/src/lib/config/default.ts b/old_src/lib/config/default.ts similarity index 100% rename from src/lib/config/default.ts rename to old_src/lib/config/default.ts diff --git a/src/lib/config/defaultSSL.ts b/old_src/lib/config/defaultSSL.ts similarity index 100% rename from src/lib/config/defaultSSL.ts rename to old_src/lib/config/defaultSSL.ts diff --git a/src/lib/config/dockerSecret.ts b/old_src/lib/config/dockerSecret.ts similarity index 100% rename from src/lib/config/dockerSecret.ts rename to old_src/lib/config/dockerSecret.ts diff --git a/src/lib/config/enum.ts b/old_src/lib/config/enum.ts similarity index 100% rename from src/lib/config/enum.ts rename to old_src/lib/config/enum.ts diff --git a/src/lib/config/environment.ts b/old_src/lib/config/environment.ts similarity index 100% rename from src/lib/config/environment.ts rename to old_src/lib/config/environment.ts diff --git a/src/lib/config/hackmdEnvironment.ts b/old_src/lib/config/hackmdEnvironment.ts similarity index 100% rename from src/lib/config/hackmdEnvironment.ts rename to old_src/lib/config/hackmdEnvironment.ts diff --git a/src/lib/config/index.ts b/old_src/lib/config/index.ts similarity index 100% rename from src/lib/config/index.ts rename to old_src/lib/config/index.ts diff --git a/src/lib/config/interfaces.ts b/old_src/lib/config/interfaces.ts similarity index 100% rename from src/lib/config/interfaces.ts rename to old_src/lib/config/interfaces.ts diff --git a/src/lib/config/oldDefault.ts b/old_src/lib/config/oldDefault.ts similarity index 100% rename from src/lib/config/oldDefault.ts rename to old_src/lib/config/oldDefault.ts diff --git a/src/lib/config/oldEnvironment.ts b/old_src/lib/config/oldEnvironment.ts similarity index 100% rename from src/lib/config/oldEnvironment.ts rename to old_src/lib/config/oldEnvironment.ts diff --git a/src/lib/config/utils.ts b/old_src/lib/config/utils.ts similarity index 100% rename from src/lib/config/utils.ts rename to old_src/lib/config/utils.ts diff --git a/src/lib/csp.ts b/old_src/lib/csp.ts similarity index 100% rename from src/lib/csp.ts rename to old_src/lib/csp.ts diff --git a/src/lib/errors.ts b/old_src/lib/errors.ts similarity index 100% rename from src/lib/errors.ts rename to old_src/lib/errors.ts diff --git a/src/lib/history.ts b/old_src/lib/history.ts similarity index 100% rename from src/lib/history.ts rename to old_src/lib/history.ts diff --git a/src/lib/letter-avatars.ts b/old_src/lib/letter-avatars.ts similarity index 100% rename from src/lib/letter-avatars.ts rename to old_src/lib/letter-avatars.ts diff --git a/src/lib/library-ext.d.ts b/old_src/lib/library-ext.d.ts similarity index 100% rename from src/lib/library-ext.d.ts rename to old_src/lib/library-ext.d.ts diff --git a/src/lib/logger.ts b/old_src/lib/logger.ts similarity index 100% rename from src/lib/logger.ts rename to old_src/lib/logger.ts diff --git a/src/lib/migrations/20150504155329-create-users.js b/old_src/lib/migrations/20150504155329-create-users.js similarity index 100% rename from src/lib/migrations/20150504155329-create-users.js rename to old_src/lib/migrations/20150504155329-create-users.js diff --git a/src/lib/migrations/20150508114741-create-notes.js b/old_src/lib/migrations/20150508114741-create-notes.js similarity index 100% rename from src/lib/migrations/20150508114741-create-notes.js rename to old_src/lib/migrations/20150508114741-create-notes.js diff --git a/src/lib/migrations/20150515125813-create-temp.js b/old_src/lib/migrations/20150515125813-create-temp.js similarity index 100% rename from src/lib/migrations/20150515125813-create-temp.js rename to old_src/lib/migrations/20150515125813-create-temp.js diff --git a/src/lib/migrations/20150702001020-update-to-0_3_1.js b/old_src/lib/migrations/20150702001020-update-to-0_3_1.js similarity index 100% rename from src/lib/migrations/20150702001020-update-to-0_3_1.js rename to old_src/lib/migrations/20150702001020-update-to-0_3_1.js diff --git a/src/lib/migrations/20150915153700-change-notes-title-to-text.js b/old_src/lib/migrations/20150915153700-change-notes-title-to-text.js similarity index 100% rename from src/lib/migrations/20150915153700-change-notes-title-to-text.js rename to old_src/lib/migrations/20150915153700-change-notes-title-to-text.js diff --git a/src/lib/migrations/20160112220142-note-add-lastchange.js b/old_src/lib/migrations/20160112220142-note-add-lastchange.js similarity index 100% rename from src/lib/migrations/20160112220142-note-add-lastchange.js rename to old_src/lib/migrations/20160112220142-note-add-lastchange.js diff --git a/src/lib/migrations/20160420180355-note-add-alias.js b/old_src/lib/migrations/20160420180355-note-add-alias.js similarity index 100% rename from src/lib/migrations/20160420180355-note-add-alias.js rename to old_src/lib/migrations/20160420180355-note-add-alias.js diff --git a/src/lib/migrations/20160515114000-user-add-tokens.js b/old_src/lib/migrations/20160515114000-user-add-tokens.js similarity index 100% rename from src/lib/migrations/20160515114000-user-add-tokens.js rename to old_src/lib/migrations/20160515114000-user-add-tokens.js diff --git a/src/lib/migrations/20160607060246-support-revision.js b/old_src/lib/migrations/20160607060246-support-revision.js similarity index 100% rename from src/lib/migrations/20160607060246-support-revision.js rename to old_src/lib/migrations/20160607060246-support-revision.js diff --git a/src/lib/migrations/20160703062241-support-authorship.js b/old_src/lib/migrations/20160703062241-support-authorship.js similarity index 100% rename from src/lib/migrations/20160703062241-support-authorship.js rename to old_src/lib/migrations/20160703062241-support-authorship.js diff --git a/src/lib/migrations/20161009040430-support-delete-note.js b/old_src/lib/migrations/20161009040430-support-delete-note.js similarity index 100% rename from src/lib/migrations/20161009040430-support-delete-note.js rename to old_src/lib/migrations/20161009040430-support-delete-note.js diff --git a/src/lib/migrations/20161201050312-support-email-signin.js b/old_src/lib/migrations/20161201050312-support-email-signin.js similarity index 100% rename from src/lib/migrations/20161201050312-support-email-signin.js rename to old_src/lib/migrations/20161201050312-support-email-signin.js diff --git a/src/lib/migrations/20171009121200-longtext-for-mysql.js b/old_src/lib/migrations/20171009121200-longtext-for-mysql.js similarity index 100% rename from src/lib/migrations/20171009121200-longtext-for-mysql.js rename to old_src/lib/migrations/20171009121200-longtext-for-mysql.js diff --git a/src/lib/migrations/20180209120907-longtext-of-authorship.js b/old_src/lib/migrations/20180209120907-longtext-of-authorship.js similarity index 100% rename from src/lib/migrations/20180209120907-longtext-of-authorship.js rename to old_src/lib/migrations/20180209120907-longtext-of-authorship.js diff --git a/src/lib/migrations/20180306150303-fix-enum.js b/old_src/lib/migrations/20180306150303-fix-enum.js similarity index 100% rename from src/lib/migrations/20180306150303-fix-enum.js rename to old_src/lib/migrations/20180306150303-fix-enum.js diff --git a/src/lib/migrations/20180326103000-use-text-in-tokens.js b/old_src/lib/migrations/20180326103000-use-text-in-tokens.js similarity index 100% rename from src/lib/migrations/20180326103000-use-text-in-tokens.js rename to old_src/lib/migrations/20180326103000-use-text-in-tokens.js diff --git a/src/lib/migrations/20180525153000-user-add-delete-token.js b/old_src/lib/migrations/20180525153000-user-add-delete-token.js similarity index 100% rename from src/lib/migrations/20180525153000-user-add-delete-token.js rename to old_src/lib/migrations/20180525153000-user-add-delete-token.js diff --git a/src/lib/models/author.ts b/old_src/lib/models/author.ts similarity index 100% rename from src/lib/models/author.ts rename to old_src/lib/models/author.ts diff --git a/src/lib/models/index.ts b/old_src/lib/models/index.ts similarity index 100% rename from src/lib/models/index.ts rename to old_src/lib/models/index.ts diff --git a/src/lib/models/note.ts b/old_src/lib/models/note.ts similarity index 99% rename from src/lib/models/note.ts rename to old_src/lib/models/note.ts index 80ee43fae..ecd85a06b 100644 --- a/src/lib/models/note.ts +++ b/old_src/lib/models/note.ts @@ -30,7 +30,7 @@ import { generate as shortIdGenerate, isValid as shortIdIsValid } from 'shortid' import S from 'string' import { config } from '../config' import { logger } from '../logger' -import ot from '../ot' +import ot from '../ot/index' import { processData, stripNullByte } from '../utils/functions' import { Author, Revision, User } from './index' diff --git a/src/lib/models/revision.ts b/old_src/lib/models/revision.ts similarity index 100% rename from src/lib/models/revision.ts rename to old_src/lib/models/revision.ts diff --git a/src/lib/models/temp.ts b/old_src/lib/models/temp.ts similarity index 100% rename from src/lib/models/temp.ts rename to old_src/lib/models/temp.ts diff --git a/src/lib/models/user.ts b/old_src/lib/models/user.ts similarity index 100% rename from src/lib/models/user.ts rename to old_src/lib/models/user.ts diff --git a/src/lib/ot/client.js b/old_src/lib/ot/client.js similarity index 100% rename from src/lib/ot/client.js rename to old_src/lib/ot/client.js diff --git a/src/lib/ot/editor-socketio-server.ts b/old_src/lib/ot/editor-socketio-server.ts similarity index 100% rename from src/lib/ot/editor-socketio-server.ts rename to old_src/lib/ot/editor-socketio-server.ts diff --git a/src/lib/ot/index.js b/old_src/lib/ot/index.js similarity index 100% rename from src/lib/ot/index.js rename to old_src/lib/ot/index.js diff --git a/src/lib/ot/selection.js b/old_src/lib/ot/selection.js similarity index 100% rename from src/lib/ot/selection.js rename to old_src/lib/ot/selection.js diff --git a/src/lib/ot/server.js b/old_src/lib/ot/server.js similarity index 100% rename from src/lib/ot/server.js rename to old_src/lib/ot/server.js diff --git a/src/lib/ot/simple-text-operation.js b/old_src/lib/ot/simple-text-operation.js similarity index 100% rename from src/lib/ot/simple-text-operation.js rename to old_src/lib/ot/simple-text-operation.js diff --git a/src/lib/ot/text-operation.js b/old_src/lib/ot/text-operation.js similarity index 100% rename from src/lib/ot/text-operation.js rename to old_src/lib/ot/text-operation.js diff --git a/src/lib/ot/wrapped-operation.js b/old_src/lib/ot/wrapped-operation.js similarity index 100% rename from src/lib/ot/wrapped-operation.js rename to old_src/lib/ot/wrapped-operation.js diff --git a/src/lib/realtime.ts b/old_src/lib/realtime.ts similarity index 100% rename from src/lib/realtime.ts rename to old_src/lib/realtime.ts diff --git a/src/lib/response.ts b/old_src/lib/response.ts similarity index 100% rename from src/lib/response.ts rename to old_src/lib/response.ts diff --git a/src/lib/utils/PhotoProfile.ts b/old_src/lib/utils/PhotoProfile.ts similarity index 100% rename from src/lib/utils/PhotoProfile.ts rename to old_src/lib/utils/PhotoProfile.ts diff --git a/src/lib/utils/functions.ts b/old_src/lib/utils/functions.ts similarity index 100% rename from src/lib/utils/functions.ts rename to old_src/lib/utils/functions.ts diff --git a/src/lib/web/auth/dropbox/index.ts b/old_src/lib/web/auth/dropbox/index.ts similarity index 100% rename from src/lib/web/auth/dropbox/index.ts rename to old_src/lib/web/auth/dropbox/index.ts diff --git a/src/lib/web/auth/email/index.ts b/old_src/lib/web/auth/email/index.ts similarity index 100% rename from src/lib/web/auth/email/index.ts rename to old_src/lib/web/auth/email/index.ts diff --git a/src/lib/web/auth/facebook/index.ts b/old_src/lib/web/auth/facebook/index.ts similarity index 100% rename from src/lib/web/auth/facebook/index.ts rename to old_src/lib/web/auth/facebook/index.ts diff --git a/src/lib/web/auth/github/index.ts b/old_src/lib/web/auth/github/index.ts similarity index 100% rename from src/lib/web/auth/github/index.ts rename to old_src/lib/web/auth/github/index.ts diff --git a/src/lib/web/auth/gitlab/index.ts b/old_src/lib/web/auth/gitlab/index.ts similarity index 100% rename from src/lib/web/auth/gitlab/index.ts rename to old_src/lib/web/auth/gitlab/index.ts diff --git a/src/lib/web/auth/google/index.ts b/old_src/lib/web/auth/google/index.ts similarity index 100% rename from src/lib/web/auth/google/index.ts rename to old_src/lib/web/auth/google/index.ts diff --git a/src/lib/web/auth/index.ts b/old_src/lib/web/auth/index.ts similarity index 100% rename from src/lib/web/auth/index.ts rename to old_src/lib/web/auth/index.ts diff --git a/src/lib/web/auth/interface.ts b/old_src/lib/web/auth/interface.ts similarity index 100% rename from src/lib/web/auth/interface.ts rename to old_src/lib/web/auth/interface.ts diff --git a/src/lib/web/auth/ldap/index.ts b/old_src/lib/web/auth/ldap/index.ts similarity index 100% rename from src/lib/web/auth/ldap/index.ts rename to old_src/lib/web/auth/ldap/index.ts diff --git a/src/lib/web/auth/oauth2/index.ts b/old_src/lib/web/auth/oauth2/index.ts similarity index 100% rename from src/lib/web/auth/oauth2/index.ts rename to old_src/lib/web/auth/oauth2/index.ts diff --git a/src/lib/web/auth/oauth2/oauth2-custom-strategy.ts b/old_src/lib/web/auth/oauth2/oauth2-custom-strategy.ts similarity index 100% rename from src/lib/web/auth/oauth2/oauth2-custom-strategy.ts rename to old_src/lib/web/auth/oauth2/oauth2-custom-strategy.ts diff --git a/src/lib/web/auth/openid/index.ts b/old_src/lib/web/auth/openid/index.ts similarity index 100% rename from src/lib/web/auth/openid/index.ts rename to old_src/lib/web/auth/openid/index.ts diff --git a/src/lib/web/auth/saml/index.ts b/old_src/lib/web/auth/saml/index.ts similarity index 100% rename from src/lib/web/auth/saml/index.ts rename to old_src/lib/web/auth/saml/index.ts diff --git a/src/lib/web/auth/twitter/index.ts b/old_src/lib/web/auth/twitter/index.ts similarity index 100% rename from src/lib/web/auth/twitter/index.ts rename to old_src/lib/web/auth/twitter/index.ts diff --git a/src/lib/web/auth/utils.ts b/old_src/lib/web/auth/utils.ts similarity index 100% rename from src/lib/web/auth/utils.ts rename to old_src/lib/web/auth/utils.ts diff --git a/src/lib/web/baseRouter.ts b/old_src/lib/web/baseRouter.ts similarity index 100% rename from src/lib/web/baseRouter.ts rename to old_src/lib/web/baseRouter.ts diff --git a/src/lib/web/historyRouter.ts b/old_src/lib/web/historyRouter.ts similarity index 100% rename from src/lib/web/historyRouter.ts rename to old_src/lib/web/historyRouter.ts diff --git a/src/lib/web/imageRouter/azure.ts b/old_src/lib/web/imageRouter/azure.ts similarity index 100% rename from src/lib/web/imageRouter/azure.ts rename to old_src/lib/web/imageRouter/azure.ts diff --git a/src/lib/web/imageRouter/filesystem.ts b/old_src/lib/web/imageRouter/filesystem.ts similarity index 100% rename from src/lib/web/imageRouter/filesystem.ts rename to old_src/lib/web/imageRouter/filesystem.ts diff --git a/src/lib/web/imageRouter/imgur.ts b/old_src/lib/web/imageRouter/imgur.ts similarity index 93% rename from src/lib/web/imageRouter/imgur.ts rename to old_src/lib/web/imageRouter/imgur.ts index 487c1599a..384a63ff4 100644 --- a/src/lib/web/imageRouter/imgur.ts +++ b/old_src/lib/web/imageRouter/imgur.ts @@ -1,4 +1,4 @@ -import imgur from 'imgur' +import imgur from 'old_src/lib/web/imageRouter/imgur' import { config } from '../../config' import { logger } from '../../logger' diff --git a/src/lib/web/imageRouter/index.ts b/old_src/lib/web/imageRouter/index.ts similarity index 100% rename from src/lib/web/imageRouter/index.ts rename to old_src/lib/web/imageRouter/index.ts diff --git a/src/lib/web/imageRouter/lutim.ts b/old_src/lib/web/imageRouter/lutim.ts similarity index 94% rename from src/lib/web/imageRouter/lutim.ts rename to old_src/lib/web/imageRouter/lutim.ts index afb388afc..71b6e70fe 100644 --- a/src/lib/web/imageRouter/lutim.ts +++ b/old_src/lib/web/imageRouter/lutim.ts @@ -1,4 +1,4 @@ -import lutim from 'lutim' +import lutim from 'old_src/lib/web/imageRouter/lutim' import { config } from '../../config' import { logger } from '../../logger' diff --git a/src/lib/web/imageRouter/minio.ts b/old_src/lib/web/imageRouter/minio.ts similarity index 96% rename from src/lib/web/imageRouter/minio.ts rename to old_src/lib/web/imageRouter/minio.ts index 42c113fd4..b69c20a0c 100644 --- a/src/lib/web/imageRouter/minio.ts +++ b/old_src/lib/web/imageRouter/minio.ts @@ -1,6 +1,6 @@ import path from 'path' import fs from 'fs' -import { Client } from 'minio' +import { Client } from 'old_src/lib/web/imageRouter/minio' import { config } from '../../config' import { getImageMimeType } from '../../utils/functions' diff --git a/src/lib/web/imageRouter/s3.ts b/old_src/lib/web/imageRouter/s3.ts similarity index 100% rename from src/lib/web/imageRouter/s3.ts rename to old_src/lib/web/imageRouter/s3.ts diff --git a/src/lib/web/index.ts b/old_src/lib/web/index.ts similarity index 100% rename from src/lib/web/index.ts rename to old_src/lib/web/index.ts diff --git a/src/lib/web/middleware/checkURIValid.ts b/old_src/lib/web/middleware/checkURIValid.ts similarity index 100% rename from src/lib/web/middleware/checkURIValid.ts rename to old_src/lib/web/middleware/checkURIValid.ts diff --git a/src/lib/web/middleware/codiMDVersion.ts b/old_src/lib/web/middleware/codiMDVersion.ts similarity index 100% rename from src/lib/web/middleware/codiMDVersion.ts rename to old_src/lib/web/middleware/codiMDVersion.ts diff --git a/src/lib/web/middleware/index.ts b/old_src/lib/web/middleware/index.ts similarity index 100% rename from src/lib/web/middleware/index.ts rename to old_src/lib/web/middleware/index.ts diff --git a/src/lib/web/middleware/redirectWithoutTrailingSlashes.ts b/old_src/lib/web/middleware/redirectWithoutTrailingSlashes.ts similarity index 100% rename from src/lib/web/middleware/redirectWithoutTrailingSlashes.ts rename to old_src/lib/web/middleware/redirectWithoutTrailingSlashes.ts diff --git a/src/lib/web/middleware/tooBusy.ts b/old_src/lib/web/middleware/tooBusy.ts similarity index 100% rename from src/lib/web/middleware/tooBusy.ts rename to old_src/lib/web/middleware/tooBusy.ts diff --git a/src/lib/web/note/actions.ts b/old_src/lib/web/note/actions.ts similarity index 100% rename from src/lib/web/note/actions.ts rename to old_src/lib/web/note/actions.ts diff --git a/src/lib/web/note/controller.ts b/old_src/lib/web/note/controller.ts similarity index 100% rename from src/lib/web/note/controller.ts rename to old_src/lib/web/note/controller.ts diff --git a/src/lib/web/note/router.ts b/old_src/lib/web/note/router.ts similarity index 100% rename from src/lib/web/note/router.ts rename to old_src/lib/web/note/router.ts diff --git a/src/lib/web/note/slide.ts b/old_src/lib/web/note/slide.ts similarity index 100% rename from src/lib/web/note/slide.ts rename to old_src/lib/web/note/slide.ts diff --git a/src/lib/web/note/util.ts b/old_src/lib/web/note/util.ts similarity index 100% rename from src/lib/web/note/util.ts rename to old_src/lib/web/note/util.ts diff --git a/src/lib/web/statusRouter.ts b/old_src/lib/web/statusRouter.ts similarity index 100% rename from src/lib/web/statusRouter.ts rename to old_src/lib/web/statusRouter.ts diff --git a/src/lib/web/userRouter.ts b/old_src/lib/web/userRouter.ts similarity index 100% rename from src/lib/web/userRouter.ts rename to old_src/lib/web/userRouter.ts diff --git a/src/lib/web/utils.ts b/old_src/lib/web/utils.ts similarity index 100% rename from src/lib/web/utils.ts rename to old_src/lib/web/utils.ts diff --git a/src/lib/workers/dmpWorker.ts b/old_src/lib/workers/dmpWorker.ts similarity index 100% rename from src/lib/workers/dmpWorker.ts rename to old_src/lib/workers/dmpWorker.ts diff --git a/src/test/auth.ts b/old_src/test/auth.ts similarity index 100% rename from src/test/auth.ts rename to old_src/test/auth.ts diff --git a/src/test/csp.ts b/old_src/test/csp.ts similarity index 100% rename from src/test/csp.ts rename to old_src/test/csp.ts diff --git a/src/test/letter-avatars.ts b/old_src/test/letter-avatars.ts similarity index 100% rename from src/test/letter-avatars.ts rename to old_src/test/letter-avatars.ts diff --git a/src/test/user.ts b/old_src/test/user.ts similarity index 100% rename from src/test/user.ts rename to old_src/test/user.ts