Started Seperating the backend from the frontend

subnub · Mar 13, 2020 · 37eeb1d · 37eeb1d
1 parent aeea06b
commit 37eeb1d
Show file tree

Hide file tree

Showing 49 changed files with 72 additions and 73 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/controllers/file.js → backend/controllers/file.js b/src/controllers/file.js → backend/controllers/file.js
diff --git a/src/controllers/folder.js → backend/controllers/folder.js b/src/controllers/folder.js → backend/controllers/folder.js
diff --git a/src/controllers/storage.js → backend/controllers/storage.js b/src/controllers/storage.js → backend/controllers/storage.js
diff --git a/src/controllers/user.js → backend/controllers/user.js b/src/controllers/user.js → backend/controllers/user.js
diff --git a/src/db/mongoose.js → backend/db/mongoose.js b/src/db/mongoose.js → backend/db/mongoose.js
diff --git a/src/db/mongooseServerUtils.js → backend/db/mongooseServerUtils.js b/src/db/mongooseServerUtils.js → backend/db/mongooseServerUtils.js
diff --git a/src/db/utils/fileUtils/index.js → backend/db/utils/fileUtils/index.js b/src/db/utils/fileUtils/index.js → backend/db/utils/fileUtils/index.js
diff --git a/src/db/utils/folderUtils/index.js → backend/db/utils/folderUtils/index.js b/src/db/utils/folderUtils/index.js → backend/db/utils/folderUtils/index.js
diff --git a/src/enviroment/env.js → backend/enviroment/env.js b/src/enviroment/env.js → backend/enviroment/env.js
diff --git a/src/express-routers/file.js → backend/express-routers/file.js b/src/express-routers/file.js → backend/express-routers/file.js
diff --git a/src/express-routers/folder.js → backend/express-routers/folder.js b/src/express-routers/folder.js → backend/express-routers/folder.js
diff --git a/src/express-routers/storage.js → backend/express-routers/storage.js b/src/express-routers/storage.js → backend/express-routers/storage.js
diff --git a/src/express-routers/user.js → backend/express-routers/user.js b/src/express-routers/user.js → backend/express-routers/user.js
diff --git a/src/middleware/auth.js → backend/middleware/auth.js b/src/middleware/auth.js → backend/middleware/auth.js
diff --git a/src/middleware/tempAuth.js → backend/middleware/tempAuth.js b/src/middleware/tempAuth.js → backend/middleware/tempAuth.js
diff --git a/src/middleware/tempAuthVideo.js → backend/middleware/tempAuthVideo.js b/src/middleware/tempAuthVideo.js → backend/middleware/tempAuthVideo.js
diff --git a/src/models/folder.js → backend/models/folder.js b/src/models/folder.js → backend/models/folder.js
diff --git a/src/models/thumbnail.js → backend/models/thumbnail.js b/src/models/thumbnail.js → backend/models/thumbnail.js
diff --git a/src/models/user.js → backend/models/user.js b/src/models/user.js → backend/models/user.js
diff --git a/src/services/FileService/index.js → backend/services/FileService/index.js b/src/services/FileService/index.js → backend/services/FileService/index.js
@@ -1,22 +1,22 @@
-const imageChecker = require("../../utils/imageChecker");
+const imageChecker = require("../../../src/utils/imageChecker");
 const crypto= require("crypto");
-const videoChecker = require("../../utils/videoChecker");
+const videoChecker = require("../../../src/utils/videoChecker");
 const mongoose = require("../../db/mongoose")
 const conn = mongoose.connection;
-const createThumbnail = require("./utils/createThumbnail");
+const createThumbnail = require("../../services/FileService/utils/createThumbnail");
 const Thumbnail = require("../../models/thumbnail");
 const ObjectID = require('mongodb').ObjectID
-const NotAuthorizedError = require("../../utils/NotAuthorizedError");
-const NotFoundError = require("../../utils/NotFoundError");
+const NotAuthorizedError = require("../../../src/utils/NotAuthorizedError");
+const NotFoundError = require("../../../src/utils/NotFoundError");
 const env = require("../../enviroment/env");
 const jwt = require("jsonwebtoken");
 const removeChunks = require("./utils/removeChunks");
 const User = require("../../models/user");
 
 
 const Folder = require("../../models/folder");
-const sortBySwitch = require("../../utils/sortBySwitch")
-const createQuery = require("../../utils/createQuery");
+const sortBySwitch = require("../../../src/utils/sortBySwitch")
+const createQuery = require("../../../src/utils/createQuery");
 const ffmpeg = require("fluent-ffmpeg");
 const temp = require("temp").track();
 const progress = require("progress-stream");

diff --git a/...ices/FileService/utils/createThumbnail.js → ...ices/FileService/utils/createThumbnail.js b/...ices/FileService/utils/createThumbnail.js → ...ices/FileService/utils/createThumbnail.js
diff --git a/...ervices/FileService/utils/removeChunks.js → ...ervices/FileService/utils/removeChunks.js b/...ervices/FileService/utils/removeChunks.js → ...ervices/FileService/utils/removeChunks.js
diff --git a/src/services/FolderService/index.js → backend/services/FolderService/index.js b/src/services/FolderService/index.js → backend/services/FolderService/index.js
@@ -1,13 +1,13 @@
 const Folder = require("../../models/folder");
-const InternalServerError = require("../../utils/InternalServerError");
-const NotFoundError = require("../../utils/NotFoundError");
+const InternalServerError = require("../../../src/utils/InternalServerError");
+const NotFoundError = require("../../../src/utils/NotFoundError");
 const UtilsFile = require("../../db/utils/fileUtils");
 const ObjectID = require('mongodb').ObjectID
 const UtilsFolder = require("../../db/utils/folderUtils");
 const mongoose = require("../../db/mongoose")
 const conn = mongoose.connection;
 const Thumbnail = require("../../models/thumbnail");
-const sortBySwitch = require("../../utils/sortBySwitchFolder")
+const sortBySwitch = require("../../../src/utils/sortBySwitchFolder")
 
 const utilsFile = new UtilsFile();
 const utilsFolder = new UtilsFolder();

diff --git a/src/services/UserService/index.js → backend/services/UserService/index.js b/src/services/UserService/index.js → backend/services/UserService/index.js
@@ -1,9 +1,9 @@
 const User = require("../../models/user");
 const bcrypt = require("bcrypt");
 const crypto = require("crypto");
-const NotFoundError = require("../../utils/NotFoundError");
-const InternalServerError = require("../../utils/InternalServerError");
-const NotAuthorizedError = require("../../utils/NotAuthorizedError");
+const NotFoundError = require("../../../src/utils/NotFoundError");
+const InternalServerError = require("../../../src/utils/InternalServerError");
+const NotAuthorizedError = require("../../../src/utils/NotAuthorizedError");
 
 const UserService = function() {
 

diff --git a/key/getKey.js b/key/getKey.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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;