From 37eeb1db5b12bb3d5bb7a0857de0b15c43535330 Mon Sep 17 00:00:00 2001 From: subnub Date: Fri, 13 Mar 2020 13:47:31 -0400 Subject: [PATCH] Started Seperating the backend from the frontend --- .DS_Store | Bin 6148 -> 6148 bytes {src => backend}/controllers/file.js | 0 {src => backend}/controllers/folder.js | 0 {src => backend}/controllers/storage.js | 0 {src => backend}/controllers/user.js | 0 {src => backend}/db/mongoose.js | 0 {src => backend}/db/mongooseServerUtils.js | 0 {src => backend}/db/utils/fileUtils/index.js | 0 .../db/utils/folderUtils/index.js | 0 {src => backend}/enviroment/env.js | 0 {src => backend}/express-routers/file.js | 0 {src => backend}/express-routers/folder.js | 0 {src => backend}/express-routers/storage.js | 0 {src => backend}/express-routers/user.js | 0 {src => backend}/middleware/auth.js | 0 {src => backend}/middleware/tempAuth.js | 0 {src => backend}/middleware/tempAuthVideo.js | 0 {src => backend}/models/folder.js | 0 {src => backend}/models/thumbnail.js | 0 {src => backend}/models/user.js | 0 .../services/FileService/index.js | 14 +++++++------- .../FileService/utils/createThumbnail.js | 0 .../FileService/utils/removeChunks.js | 0 .../services/FolderService/index.js | 6 +++--- .../services/UserService/index.js | 6 +++--- key/getKey.js | 2 +- key/getNewKey.js | 2 +- server/server.js | 10 +++++----- serverUtils/backupDatabase.js | 2 +- serverUtils/changeEncryptionPassword.js | 4 ++-- serverUtils/cleanDatabase.js | 2 +- serverUtils/createIndexes.js | 2 +- serverUtils/createTempDirectory.js | 2 +- serverUtils/createThumbnailBuffer.js | 6 +++--- serverUtils/deleteDatabase.js | 2 +- serverUtils/deleteTempDatabase.js | 2 +- serverUtils/restoreDatabase.js | 2 +- serverUtils/restoreFromTempDirectory.js | 2 +- tests/db/utils/fileUtils/index.test.js | 6 +++--- tests/db/utils/folderUtils/index.test.js | 8 ++++---- tests/express-routers/file.test.js | 10 +++++----- tests/express-routers/folder.test.js | 9 ++++----- tests/express-routers/user.test.js | 6 +++--- tests/fixtures/createFile.js | 2 +- tests/fixtures/createUser.js | 6 +++--- tests/fixtures/createUser2.js | 6 +++--- tests/services/FileService/index.test.js | 12 ++++++------ tests/services/FolderService/index.test.js | 8 ++++---- tests/services/UserService/index.test.js | 6 +++--- 49 files changed, 72 insertions(+), 73 deletions(-) rename {src => backend}/controllers/file.js (100%) rename {src => backend}/controllers/folder.js (100%) rename {src => backend}/controllers/storage.js (100%) rename {src => backend}/controllers/user.js (100%) rename {src => backend}/db/mongoose.js (100%) rename {src => backend}/db/mongooseServerUtils.js (100%) rename {src => backend}/db/utils/fileUtils/index.js (100%) rename {src => backend}/db/utils/folderUtils/index.js (100%) rename {src => backend}/enviroment/env.js (100%) rename {src => backend}/express-routers/file.js (100%) rename {src => backend}/express-routers/folder.js (100%) rename {src => backend}/express-routers/storage.js (100%) rename {src => backend}/express-routers/user.js (100%) rename {src => backend}/middleware/auth.js (100%) rename {src => backend}/middleware/tempAuth.js (100%) rename {src => backend}/middleware/tempAuthVideo.js (100%) rename {src => backend}/models/folder.js (100%) rename {src => backend}/models/thumbnail.js (100%) rename {src => backend}/models/user.js (100%) rename {src => backend}/services/FileService/index.js (98%) rename {src => backend}/services/FileService/utils/createThumbnail.js (100%) rename {src => backend}/services/FileService/utils/removeChunks.js (100%) rename {src => backend}/services/FolderService/index.js (97%) rename {src => backend}/services/UserService/index.js (87%) diff --git a/.DS_Store b/.DS_Store index 454ab206e7178af466cf01676c1ed2a0c9cfc7ef..7c761f1b784e8677673c03dcb31c11dee19e48b2 100644 GIT binary patch delta 108 zcmZoMXfc@JFUrBdz`)4BAi%(o%8A&DW8A( { diff --git a/key/getNewKey.js b/key/getNewKey.js index 39ccb75..6e62f2e 100644 --- a/key/getNewKey.js +++ b/key/getNewKey.js @@ -1,5 +1,5 @@ const prompt = require('password-prompt') -const env = require("../src/enviroment/env") +const env = require("../backend/enviroment/env") const crypto = require("crypto"); const getKey = async() => { diff --git a/server/server.js b/server/server.js index c8696a2..3f7aaab 100755 --- a/server/server.js +++ b/server/server.js @@ -2,10 +2,10 @@ const express = require("express"); const app = express(); const path = require("path") const publicPath = path.join(__dirname, "..", "public"); -const userRouter = require("../src/express-routers/user") -const fileRouter = require("../src/express-routers/file") -const folderRouter = require("../src/express-routers/folder"); -const storageRouter = require("../src/express-routers/storage"); +const userRouter = require("../backend/express-routers/user") +const fileRouter = require("../backend/express-routers/file") +const folderRouter = require("../backend/express-routers/folder"); +const storageRouter = require("../backend/express-routers/storage"); const bodyParser = require('body-parser'); const https = require("https"); const fs = require("fs"); @@ -39,7 +39,7 @@ server = http.createServer(app); -require("../src/db/mongoose") +require("../backend/db/mongoose"); app.use(helmet()) diff --git a/serverUtils/backupDatabase.js b/serverUtils/backupDatabase.js index c199ba0..d19d635 100644 --- a/serverUtils/backupDatabase.js +++ b/serverUtils/backupDatabase.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const conn = mongoose.connection; const prompts = require("prompts"); const createTempDirectory = require("./createTempDirectory"); diff --git a/serverUtils/changeEncryptionPassword.js b/serverUtils/changeEncryptionPassword.js index a7976d5..2371b76 100644 --- a/serverUtils/changeEncryptionPassword.js +++ b/serverUtils/changeEncryptionPassword.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const conn = mongoose.connection; const ObjectID = require('mongodb').ObjectID const imageChecker = require("../src/utils/imageChecker"); @@ -7,7 +7,7 @@ const prompts = require("prompts"); const getKey = require("../key/getKey"); const getNewKey = require("../key/getNewKey"); const crypto = require("crypto"); -const env = require("../src/enviroment/env"); +const env = require("../backend/enviroment/env"); const cliProgress = require('cli-progress'); const createTempDirectory = require("./createTempDirectory"); diff --git a/serverUtils/cleanDatabase.js b/serverUtils/cleanDatabase.js index 8393201..f7cc390 100644 --- a/serverUtils/cleanDatabase.js +++ b/serverUtils/cleanDatabase.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const conn = mongoose.connection; const ObjectID = require('mongodb').ObjectID const prompts = require("prompts"); diff --git a/serverUtils/createIndexes.js b/serverUtils/createIndexes.js index dc035d9..8056617 100644 --- a/serverUtils/createIndexes.js +++ b/serverUtils/createIndexes.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongoose"); +const mongoose = require("../backend/db/mongoose"); const conn = mongoose.connection; const waitForDatabase = () => { diff --git a/serverUtils/createTempDirectory.js b/serverUtils/createTempDirectory.js index 7d14880..7faaaa5 100644 --- a/serverUtils/createTempDirectory.js +++ b/serverUtils/createTempDirectory.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const conn = mongoose.connection; const cliProgress = require('cli-progress'); diff --git a/serverUtils/createThumbnailBuffer.js b/serverUtils/createThumbnailBuffer.js index 480e168..33de081 100644 --- a/serverUtils/createThumbnailBuffer.js +++ b/serverUtils/createThumbnailBuffer.js @@ -1,8 +1,8 @@ -const mongoose = require("../src/db/mongooseServerUtils") +const mongoose = require("../backend/db/mongooseServerUtils") const conn = mongoose.connection; const crypto= require("crypto"); -const env = require("../src/enviroment/env"); -const Thumbnail = require("../src/models/thumbnail"); +const env = require("../backend/enviroment/env"); +const Thumbnail = require("../backend/models/thumbnail"); const ObjectID = require('mongodb').ObjectID const sharp = require("sharp"); const concat = require("concat-stream") diff --git a/serverUtils/deleteDatabase.js b/serverUtils/deleteDatabase.js index f635232..97c1c48 100644 --- a/serverUtils/deleteDatabase.js +++ b/serverUtils/deleteDatabase.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const prompts = require("prompts"); const conn = mongoose.connection; diff --git a/serverUtils/deleteTempDatabase.js b/serverUtils/deleteTempDatabase.js index 2662cad..66eb81c 100644 --- a/serverUtils/deleteTempDatabase.js +++ b/serverUtils/deleteTempDatabase.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const prompts = require("prompts"); const conn = mongoose.connection; diff --git a/serverUtils/restoreDatabase.js b/serverUtils/restoreDatabase.js index bd28159..aebabee 100644 --- a/serverUtils/restoreDatabase.js +++ b/serverUtils/restoreDatabase.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const prompts = require("prompts"); const restoreFromTempDirectory = require("./restoreFromTempDirectory"); const conn = mongoose.connection; diff --git a/serverUtils/restoreFromTempDirectory.js b/serverUtils/restoreFromTempDirectory.js index 2749966..810bf20 100644 --- a/serverUtils/restoreFromTempDirectory.js +++ b/serverUtils/restoreFromTempDirectory.js @@ -1,4 +1,4 @@ -const mongoose = require("../src/db/mongooseServerUtils"); +const mongoose = require("../backend/db/mongooseServerUtils"); const cliProgress = require('cli-progress'); const conn = mongoose.connection; diff --git a/tests/db/utils/fileUtils/index.test.js b/tests/db/utils/fileUtils/index.test.js index ae684f8..cf24ed3 100644 --- a/tests/db/utils/fileUtils/index.test.js +++ b/tests/db/utils/fileUtils/index.test.js @@ -1,10 +1,10 @@ -const User = require("../../../../src/models/user"); -const mongoose = require("../../../../src/db/mongoose"); +const User = require("../../../../backend/models/user"); +const mongoose = require("../../../../backend/db/mongoose"); const conn = mongoose.connection; const createUser = require("../../../fixtures/createUser"); const path = require("path"); const createFile = require("../../../fixtures/createFile"); -const UtilsFile = require("../../../../src/db/utils/fileUtils"); +const UtilsFile = require("../../../../backend/db/utils/fileUtils"); const ObjectID = require('mongodb').ObjectID const jwt = require("jsonwebtoken"); const utilsFile = new UtilsFile(); diff --git a/tests/db/utils/folderUtils/index.test.js b/tests/db/utils/folderUtils/index.test.js index d53663b..b143337 100644 --- a/tests/db/utils/folderUtils/index.test.js +++ b/tests/db/utils/folderUtils/index.test.js @@ -1,10 +1,10 @@ -const User = require("../../../../src/models/user"); -const mongoose = require("../../../../src/db/mongoose"); +const User = require("../../../../backend/models/user"); +const mongoose = require("../../../../backend/db/mongoose"); const conn = mongoose.connection; const createUser = require("../../../fixtures/createUser"); -const UtilsFolder = require("../../../../src/db/utils/folderUtils"); +const UtilsFolder = require("../../../../backend/db/utils/folderUtils"); const utilsFolder = new UtilsFolder(); -const Folder = require("../../../../src/models/folder"); +const Folder = require("../../../../backend/models/folder"); let user; let folder; diff --git a/tests/express-routers/file.test.js b/tests/express-routers/file.test.js index cf3f6af..39a73cc 100644 --- a/tests/express-routers/file.test.js +++ b/tests/express-routers/file.test.js @@ -1,18 +1,18 @@ -const User = require("../../src/models/user"); -const mongoose = require("../../src/db/mongoose"); +const User = require("../../backend/models/user"); +const mongoose = require("../../backend/db/mongoose"); const conn = mongoose.connection; const createUser = require("../fixtures/createUser"); const createUser2 = require("../fixtures/createUser2"); const createFile = require("../fixtures/createFile"); const crypto = require("crypto"); const path = require("path"); -const env = require("../../src/enviroment/env"); -const createThumbnail = require("../../src/services/FileService/utils/createThumbnail"); +const env = require("../../backend/enviroment/env"); +const createThumbnail = require("../../backend/services/FileService/utils/createThumbnail"); const request = require("supertest"); const jwt = require("jsonwebtoken"); const ObjectID = require('mongodb').ObjectID const app = require("../../server/server"); -const Folder = require("../../src/models/folder"); +const Folder = require("../../backend/models/folder"); const temp = require("temp").track(); const binaryPhraser = require("superagent-binary-parser"); diff --git a/tests/express-routers/folder.test.js b/tests/express-routers/folder.test.js index c6ddb87..9b0df30 100644 --- a/tests/express-routers/folder.test.js +++ b/tests/express-routers/folder.test.js @@ -1,18 +1,17 @@ -const User = require("../../src/models/user"); -const mongoose = require("../../src/db/mongoose"); +const User = require("../../backend/models/user"); +const mongoose = require("../../backend/db/mongoose"); const conn = mongoose.connection; const createUser = require("../fixtures/createUser"); const createUser2 = require("../fixtures/createUser2"); const createFile = require("../fixtures/createFile"); const crypto = require("crypto"); const path = require("path"); -const env = require("../../src/enviroment/env"); -const createThumbnail = require("../../src/services/FileService/utils/createThumbnail"); +const env = require("../../backend/enviroment/env"); const request = require("supertest"); const jwt = require("jsonwebtoken"); const ObjectID = require('mongodb').ObjectID const app = require("../../server/server"); -const Folder = require("../../src/models/folder"); +const Folder = require("../../backend/models/folder"); const temp = require("temp").track(); const binaryPhraser = require("superagent-binary-parser"); diff --git a/tests/express-routers/user.test.js b/tests/express-routers/user.test.js index 58a240e..a5b471b 100644 --- a/tests/express-routers/user.test.js +++ b/tests/express-routers/user.test.js @@ -1,10 +1,10 @@ -const User = require("../../src/models/user"); -const mongoose = require("../../src/db/mongoose"); +const User = require("../../backend/models/user"); +const mongoose = require("../../backend/db/mongoose"); const conn = mongoose.connection; const createUser = require("../fixtures/createUser"); const app = require("../../server/server"); const request = require("supertest"); -const env = require("../../src/enviroment/env") +const env = require("../../backend/enviroment/env") let user; let userToken; diff --git a/tests/fixtures/createFile.js b/tests/fixtures/createFile.js index 3dc7d49..235684f 100644 --- a/tests/fixtures/createFile.js +++ b/tests/fixtures/createFile.js @@ -1,4 +1,4 @@ -const mongoose = require("../../src/db/mongoose"); +const mongoose = require("../../backend/db/mongoose"); const conn = mongoose.connection; const crypto = require("crypto"); const fs = require("fs"); diff --git a/tests/fixtures/createUser.js b/tests/fixtures/createUser.js index 6397017..b6479ca 100644 --- a/tests/fixtures/createUser.js +++ b/tests/fixtures/createUser.js @@ -1,7 +1,7 @@ const jwt = require("jsonwebtoken"); -const mongoose = require("../../src/db/mongoose"); -const User = require("../../src/models/user"); -const env = require("../../src/enviroment/env"); +const mongoose = require("../../backend/db/mongoose"); +const User = require("../../backend/models/user"); +const env = require("../../backend/enviroment/env"); const createUser = async() => { diff --git a/tests/fixtures/createUser2.js b/tests/fixtures/createUser2.js index 03e75a9..de36b71 100644 --- a/tests/fixtures/createUser2.js +++ b/tests/fixtures/createUser2.js @@ -1,7 +1,7 @@ const jwt = require("jsonwebtoken"); -const mongoose = require("../../src/db/mongoose"); -const User = require("../../src/models/user"); -const env = require("../../src/enviroment/env"); +const mongoose = require("../../backend/db/mongoose"); +const User = require("../../backend/models/user"); +const env = require("../../backend/enviroment/env"); const createUser2 = async() => { diff --git a/tests/services/FileService/index.test.js b/tests/services/FileService/index.test.js index b5fc32e..625edb4 100644 --- a/tests/services/FileService/index.test.js +++ b/tests/services/FileService/index.test.js @@ -1,16 +1,16 @@ -const User = require("../../../src/models/user"); -const mongoose = require("../../../src/db/mongoose"); +const User = require("../../../backend/models/user"); +const mongoose = require("../../../backend/db/mongoose"); const conn = mongoose.connection; const createUser = require("../../fixtures/createUser"); const path = require("path"); const createFile = require("../../fixtures/createFile"); const crypto = require("crypto"); -const createThumbnail = require("../../../src/services/FileService/utils/createThumbnail"); -const env = require("../../../src/enviroment/env"); +const createThumbnail = require("../../../backend/services/FileService/utils/createThumbnail"); +const env = require("../../../backend/enviroment/env"); const jwt = require("jsonwebtoken"); const ObjectID = require('mongodb').ObjectID -const Folder = require("../../../src/models/folder"); -const FileService = require("../../../src/services/FileService"); +const Folder = require("../../../backend/models/folder"); +const FileService = require("../../../backend/services/FileService"); const fileService = new FileService(); let user; diff --git a/tests/services/FolderService/index.test.js b/tests/services/FolderService/index.test.js index 80261b7..c963b5b 100644 --- a/tests/services/FolderService/index.test.js +++ b/tests/services/FolderService/index.test.js @@ -1,13 +1,13 @@ -const User = require("../../../src/models/user"); +const User = require("../../../backend/models/user"); const createUser = require("../../fixtures/createUser"); -const Folder = require("../../../src/models/folder"); -const mongoose = require("../../../src/db/mongoose"); +const Folder = require("../../../backend/models/folder"); +const mongoose = require("../../../backend/db/mongoose"); const conn = mongoose.connection; const crypto = require("crypto"); const createFile = require("../../fixtures/createFile"); const path = require("path"); const ObjectID = require('mongodb').ObjectID -const FolderService = require("../../../src/services/FolderService"); +const FolderService = require("../../../backend/services/FolderService"); const folderService = new FolderService(); let user; diff --git a/tests/services/UserService/index.test.js b/tests/services/UserService/index.test.js index 487cc04..0dbeabd 100644 --- a/tests/services/UserService/index.test.js +++ b/tests/services/UserService/index.test.js @@ -1,9 +1,9 @@ -const User = require("../../../src/models/user"); -const mongoose = require("../../../src/db/mongoose"); +const User = require("../../../backend/models/user"); +const mongoose = require("../../../backend/db/mongoose"); const conn = mongoose.connection; const createUser = require("../../fixtures/createUser"); -const UserService = require("../../../src/services/UserService"); +const UserService = require("../../../backend/services/UserService"); const userService = new UserService(); let user;