From 831dc78bf59bf73e206600beeddc4b55178bcdb2 Mon Sep 17 00:00:00 2001 From: subnub Date: Sat, 10 Aug 2024 01:54:22 -0400 Subject: [PATCH] updated BE file naming convention --- .../{fileController.ts => file-controller.ts} | 20 ++++----- ...lderController.ts => folder-controller.ts} | 4 +- ...ageController.ts => storage-controller.ts} | 2 +- .../{userController.ts => user-controller.ts} | 6 +-- .../{createCookies.ts => create-cookies.ts} | 0 ...erverUtils.ts => mongoose-server-utils.ts} | 0 backend/db/mongoDB/fileDB.ts | 4 +- backend/db/mongoDB/folderDB.ts | 2 +- ...etEnvVariables.ts => get-env-variables.ts} | 0 .../{fileRouter.ts => file-router.ts} | 2 +- .../{folderRouter.ts => folder-router.ts} | 4 +- .../{userRouter.ts => user-router.ts} | 2 +- backend/key/get-key.ts | 27 ++++++++++++ .../key/{getWebUIKey.ts => get-web-UI-key.ts} | 0 backend/key/getKey.ts | 32 -------------- backend/middleware/authFullUser.ts | 2 +- backend/middleware/authLogout.ts | 2 +- .../middleware/authNoEmailVerificication.ts | 2 +- backend/middleware/authRefresh.ts | 2 +- backend/middleware/authStreamVideo.ts | 2 +- .../files-middleware.ts} | 2 +- .../folder-middleware.ts} | 2 +- .../middleware-utils.ts} | 0 .../models/{fileModel.ts => file-model.ts} | 0 ...ileSystemModel.ts => file-system-model.ts} | 0 .../{folderModel.ts => folder-model.ts} | 0 .../{thumbnailModel.ts => thumbnail-model.ts} | 0 .../models/{userModel.ts => user-model.ts} | 0 backend/server/server-start.ts | 36 ++++++++++++++++ backend/server/server.ts | 6 +-- backend/server/serverStart.ts | 42 ------------------- .../actions/S3-actions.ts} | 2 +- .../actions/file-system-actions.ts} | 4 +- .../chunk-service.ts} | 14 +++---- .../store-types.ts} | 0 .../utils/ChunkInterface.ts | 6 +-- .../utils/addToStorageSize.ts | 2 +- .../utils/awaitStream.ts | 0 .../utils/awaitStreamVideo.ts | 0 .../utils/awaitUploadStreamFS.ts | 0 .../utils/awaitUploadStreamS3.ts | 0 .../utils/cachedSubscriptionStatuses.ts | 0 .../utils/createImageThumbnail.ts | 12 +++--- .../utils/createThumbailAny.ts | 4 +- .../utils/createThumbnailFS.ts | 8 ++-- .../utils/createThumbnailS3.ts | 6 +-- .../utils/createVideoThumbnail.ts | 12 +++--- .../utils/createVideoThumbnailFS.ts | 8 ++-- .../utils/fixEndChunkLength.ts | 0 .../utils/fixStartChunkLength.ts | 0 .../utils/getBusboyData.ts | 0 .../utils/getFileSize.ts | 0 .../utils/getPrevIVFS.ts | 0 .../utils/getPrevIVS3.ts | 2 +- .../utils/removeChunksFS.ts | 0 .../utils/removeChunksS3.ts | 0 .../utils/removeTempToken.ts | 2 +- .../utils/storageHelper.ts | 0 .../utils/subtractFromStorageSize.ts | 2 +- .../utils/tempCreateVideoThumbnail.ts | 12 +++--- .../utils/tempCreateVideoThumbnailFS.ts | 8 ++-- .../file-service.ts} | 8 ++-- .../folder-service.ts} | 4 +- .../user-service.ts} | 4 +- backend/utils/convertDriveToMongo.ts | 2 +- backend/utils/sendPasswordResetEmail.ts | 2 +- backend/utils/sendVerificationEmail.ts | 2 +- backend/utils/sortGoogleMongoFolderList.ts | 2 +- backend/utils/sortGoogleMongoList.ts | 2 +- backend/utils/userUpdateCheck.ts | 4 +- 70 files changed, 163 insertions(+), 174 deletions(-) rename backend/controllers/{fileController.ts => file-controller.ts} (96%) rename backend/controllers/{folderController.ts => folder-controller.ts} (98%) rename backend/controllers/{storageController.ts => storage-controller.ts} (94%) rename backend/controllers/{userController.ts => user-controller.ts} (98%) rename backend/cookies/{createCookies.ts => create-cookies.ts} (100%) rename backend/db/connections/{mongooseServerUtils.ts => mongoose-server-utils.ts} (100%) rename backend/enviroment/{getEnvVariables.ts => get-env-variables.ts} (100%) rename backend/express-routers/{fileRouter.ts => file-router.ts} (98%) rename backend/express-routers/{folderRouter.ts => folder-router.ts} (93%) rename backend/express-routers/{userRouter.ts => user-router.ts} (96%) create mode 100644 backend/key/get-key.ts rename backend/key/{getWebUIKey.ts => get-web-UI-key.ts} (100%) delete mode 100644 backend/key/getKey.ts rename backend/middleware/{Files/FilesMiddleware.ts => files/files-middleware.ts} (81%) rename backend/middleware/{Folders/FolderMiddleware.ts => folders/folder-middleware.ts} (83%) rename backend/middleware/{Utils/MiddlewareUtils.ts => utils/middleware-utils.ts} (100%) rename backend/models/{fileModel.ts => file-model.ts} (100%) rename backend/models/{fileSystemModel.ts => file-system-model.ts} (100%) rename backend/models/{folderModel.ts => folder-model.ts} (100%) rename backend/models/{thumbnailModel.ts => thumbnail-model.ts} (100%) rename backend/models/{userModel.ts => user-model.ts} (100%) create mode 100644 backend/server/server-start.ts delete mode 100644 backend/server/serverStart.ts rename backend/services/{ChunkService/Actions/S3Actions.ts => chunk-service/actions/S3-actions.ts} (97%) rename backend/services/{ChunkService/Actions/FileSystemActions.ts => chunk-service/actions/file-system-actions.ts} (93%) rename backend/services/{ChunkService/chunkService.ts => chunk-service/chunk-service.ts} (97%) rename backend/services/{ChunkService/StoreTypes.ts => chunk-service/store-types.ts} (100%) rename backend/services/{ChunkService => chunk-service}/utils/ChunkInterface.ts (83%) rename backend/services/{ChunkService => chunk-service}/utils/addToStorageSize.ts (91%) rename backend/services/{ChunkService => chunk-service}/utils/awaitStream.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/awaitStreamVideo.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/awaitUploadStreamFS.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/awaitUploadStreamS3.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/cachedSubscriptionStatuses.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/createImageThumbnail.ts (90%) rename backend/services/{ChunkService => chunk-service}/utils/createThumbailAny.ts (80%) rename backend/services/{ChunkService => chunk-service}/utils/createThumbnailFS.ts (92%) rename backend/services/{ChunkService => chunk-service}/utils/createThumbnailS3.ts (94%) rename backend/services/{ChunkService => chunk-service}/utils/createVideoThumbnail.ts (92%) rename backend/services/{ChunkService => chunk-service}/utils/createVideoThumbnailFS.ts (92%) rename backend/services/{ChunkService => chunk-service}/utils/fixEndChunkLength.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/fixStartChunkLength.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/getBusboyData.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/getFileSize.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/getPrevIVFS.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/getPrevIVS3.ts (89%) rename backend/services/{ChunkService => chunk-service}/utils/removeChunksFS.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/removeChunksS3.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/removeTempToken.ts (80%) rename backend/services/{ChunkService => chunk-service}/utils/storageHelper.ts (100%) rename backend/services/{ChunkService => chunk-service}/utils/subtractFromStorageSize.ts (92%) rename backend/services/{ChunkService => chunk-service}/utils/tempCreateVideoThumbnail.ts (92%) rename backend/services/{ChunkService => chunk-service}/utils/tempCreateVideoThumbnailFS.ts (94%) rename backend/services/{fileService/fileService.ts => file-service/file-service.ts} (97%) rename backend/services/{folderService/folderService.ts => folder-service/folder-service.ts} (98%) rename backend/services/{userService/userService.ts => user-service/user-service.ts} (98%) diff --git a/backend/controllers/fileController.ts b/backend/controllers/file-controller.ts similarity index 96% rename from backend/controllers/fileController.ts rename to backend/controllers/file-controller.ts index 932dcf3..30c346b 100644 --- a/backend/controllers/fileController.ts +++ b/backend/controllers/file-controller.ts @@ -1,23 +1,23 @@ import { Request, Response } from "express"; -import FileService from "../services/fileService/fileService"; -import User, { UserInterface } from "../models/userModel"; +import FileService from "../services/file-service/file-service"; +import User, { UserInterface } from "../models/user-model"; import sendShareEmail from "../utils/sendShareEmail"; import { createStreamVideoCookie, removeStreamVideoCookie, -} from "../cookies/createCookies"; -import ChunkService from "../services/chunkService/chunkService"; +} from "../cookies/create-cookies"; +import ChunkService from "../services/chunk-service/chunk-service"; import streamToBuffer from "../utils/streamToBuffer"; import env from "../enviroment/env"; -import getFileSize from "../services/chunkService/utils/getFileSize"; -import File, { FileMetadateInterface } from "../models/fileModel"; +import getFileSize from "../services/chunk-service/utils/getFileSize"; +import File, { FileMetadateInterface } from "../models/file-model"; import imageChecker from "../utils/imageChecker"; import videoChecker from "../utils/videoChecker"; -import { S3Actions } from "../services/chunkService/actions/S3Actions"; -import { FilesystemActions } from "../services/chunkService/actions/fileSystemActions"; -import createVideoThumbnail from "../services/chunkService/utils/createVideoThumbnail"; +import { S3Actions } from "../services/chunk-service/actions/S3-actions"; +import { FilesystemActions } from "../services/chunk-service/actions/file-system-actions"; +import createVideoThumbnail from "../services/chunk-service/utils/createVideoThumbnail"; import NotAuthorizedError from "../utils/NotAuthorizedError"; -import createThumbnail from "../services/chunkService/utils/createImageThumbnail"; +import createThumbnail from "../services/chunk-service/utils/createImageThumbnail"; const fileService = new FileService(); type userAccessType = { diff --git a/backend/controllers/folderController.ts b/backend/controllers/folder-controller.ts similarity index 98% rename from backend/controllers/folderController.ts rename to backend/controllers/folder-controller.ts index 845a76d..26f99aa 100644 --- a/backend/controllers/folderController.ts +++ b/backend/controllers/folder-controller.ts @@ -1,6 +1,6 @@ -import FolderService from "../services/folderService/folderService"; +import FolderService from "../services/folder-service/folder-service"; import { Request, Response } from "express"; -import ChunkService from "../services/chunkService/chunkService"; +import ChunkService from "../services/chunk-service/chunk-service"; const folderService = new FolderService(); diff --git a/backend/controllers/storageController.ts b/backend/controllers/storage-controller.ts similarity index 94% rename from backend/controllers/storageController.ts rename to backend/controllers/storage-controller.ts index f08d037..347dcdc 100644 --- a/backend/controllers/storageController.ts +++ b/backend/controllers/storage-controller.ts @@ -1,7 +1,7 @@ import disk from "diskusage"; import env from "../enviroment/env"; import { Request, Response } from "express"; -import { UserInterface } from "../models/userModel"; +import { UserInterface } from "../models/user-model"; type userAccessType = { _id: string; diff --git a/backend/controllers/userController.ts b/backend/controllers/user-controller.ts similarity index 98% rename from backend/controllers/userController.ts rename to backend/controllers/user-controller.ts index 493d716..c15ea11 100644 --- a/backend/controllers/userController.ts +++ b/backend/controllers/user-controller.ts @@ -1,11 +1,11 @@ import env from "../enviroment/env"; -import UserService from "../services/userService/userService"; +import UserService from "../services/user-service/user-service"; import { Request, Response } from "express"; -import { UserInterface } from "../models/userModel"; +import { UserInterface } from "../models/user-model"; import { createLoginCookie, createLogoutCookie, -} from "../cookies/createCookies"; +} from "../cookies/create-cookies"; import NotFoundError from "../utils/NotFoundError"; import InternalServerError from "../utils/InternalServerError"; diff --git a/backend/cookies/createCookies.ts b/backend/cookies/create-cookies.ts similarity index 100% rename from backend/cookies/createCookies.ts rename to backend/cookies/create-cookies.ts diff --git a/backend/db/connections/mongooseServerUtils.ts b/backend/db/connections/mongoose-server-utils.ts similarity index 100% rename from backend/db/connections/mongooseServerUtils.ts rename to backend/db/connections/mongoose-server-utils.ts diff --git a/backend/db/mongoDB/fileDB.ts b/backend/db/mongoDB/fileDB.ts index 3defb86..f83b11d 100644 --- a/backend/db/mongoDB/fileDB.ts +++ b/backend/db/mongoDB/fileDB.ts @@ -1,7 +1,7 @@ import mongoose from "../connections/mongoose"; import { ObjectId } from "mongodb"; -import File from "../../models/fileModel"; -import { UserInterface } from "../../models/userModel"; +import File from "../../models/file-model"; +import { UserInterface } from "../../models/user-model"; import { QueryInterface } from "../../utils/createQuery"; class DbUtil { diff --git a/backend/db/mongoDB/folderDB.ts b/backend/db/mongoDB/folderDB.ts index bb183c1..ecf979f 100644 --- a/backend/db/mongoDB/folderDB.ts +++ b/backend/db/mongoDB/folderDB.ts @@ -1,4 +1,4 @@ -import Folder, { FolderInterface } from "../../models/folderModel"; +import Folder, { FolderInterface } from "../../models/folder-model"; import { ObjectId } from "mongodb"; class DbUtil { diff --git a/backend/enviroment/getEnvVariables.ts b/backend/enviroment/get-env-variables.ts similarity index 100% rename from backend/enviroment/getEnvVariables.ts rename to backend/enviroment/get-env-variables.ts diff --git a/backend/express-routers/fileRouter.ts b/backend/express-routers/file-router.ts similarity index 98% rename from backend/express-routers/fileRouter.ts rename to backend/express-routers/file-router.ts index bfad683..b6860e7 100644 --- a/backend/express-routers/fileRouter.ts +++ b/backend/express-routers/file-router.ts @@ -1,6 +1,6 @@ import { Router } from "express"; import auth from "../middleware/auth"; -import FileController from "../controllers/fileController"; +import FileController from "../controllers/file-controller"; import authFullUser from "../middleware/authFullUser"; import authStreamVideo from "../middleware/authStreamVideo"; diff --git a/backend/express-routers/folderRouter.ts b/backend/express-routers/folder-router.ts similarity index 93% rename from backend/express-routers/folderRouter.ts rename to backend/express-routers/folder-router.ts index f6ef5c7..52ec73d 100644 --- a/backend/express-routers/folderRouter.ts +++ b/backend/express-routers/folder-router.ts @@ -1,7 +1,7 @@ import { Router } from "express"; import auth from "../middleware/auth"; -import FolderController from "../controllers/folderController"; -import { moveFolderListValidationRules } from "../middleware/folders/folderMiddleware"; +import FolderController from "../controllers/folder-controller"; +import { moveFolderListValidationRules } from "../middleware/folders/folder-middleware"; const folderController = new FolderController(); const router = Router(); diff --git a/backend/express-routers/userRouter.ts b/backend/express-routers/user-router.ts similarity index 96% rename from backend/express-routers/userRouter.ts rename to backend/express-routers/user-router.ts index 3bd49fa..acf4469 100644 --- a/backend/express-routers/userRouter.ts +++ b/backend/express-routers/user-router.ts @@ -1,7 +1,7 @@ import { Router } from "express"; import auth from "../middleware/auth"; import authNoEmailVerification from "../middleware/authNoEmailVerificication"; -import UserController from "../controllers/userController"; +import UserController from "../controllers/user-controller"; import authRefresh from "../middleware/authRefresh"; import authLogout from "../middleware/authLogout"; diff --git a/backend/key/get-key.ts b/backend/key/get-key.ts new file mode 100644 index 0000000..564ff0d --- /dev/null +++ b/backend/key/get-key.ts @@ -0,0 +1,27 @@ +import env from "../enviroment/env"; +import crypto from "crypto"; +import getWebUIKey from "./get-web-UI-key"; + +const getKey = async () => { + if (process.env.KEY) { + // For Docker + + const password = process.env.KEY; + + env.key = crypto.createHash("md5").update(password).digest("hex"); + } else if (process.env.NODE_ENV === "production") { + let password = await getWebUIKey(); + + password = crypto.createHash("md5").update(password).digest("hex"); + + env.key = password; + } else { + let password = "1234"; + + password = crypto.createHash("md5").update(password).digest("hex"); + + env.key = password; + } +}; + +export default getKey; diff --git a/backend/key/getWebUIKey.ts b/backend/key/get-web-UI-key.ts similarity index 100% rename from backend/key/getWebUIKey.ts rename to backend/key/get-web-UI-key.ts diff --git a/backend/key/getKey.ts b/backend/key/getKey.ts deleted file mode 100644 index f621bde..0000000 --- a/backend/key/getKey.ts +++ /dev/null @@ -1,32 +0,0 @@ -import env from "../enviroment/env"; -import crypto from "crypto"; -import getWebUIKey from "./getWebUIKey"; - -const getKey = async() => { - - if (process.env.KEY) { - // For Docker - - const password = process.env.KEY; - - env.key = crypto.createHash("md5").update(password).digest("hex"); - - } else if (process.env.NODE_ENV === "production") { - - let password = await getWebUIKey(); - - password = crypto.createHash("md5").update(password).digest("hex"); - - env.key = password; - - } else { - - let password = "1234"; - - password = crypto.createHash("md5").update(password).digest("hex"); - - env.key = password; - } -} - -export default getKey; \ No newline at end of file diff --git a/backend/middleware/authFullUser.ts b/backend/middleware/authFullUser.ts index 2dccbb5..c13c84e 100644 --- a/backend/middleware/authFullUser.ts +++ b/backend/middleware/authFullUser.ts @@ -1,5 +1,5 @@ import jwt from "jsonwebtoken"; -import User, { UserInterface } from "../models/userModel"; +import User, { UserInterface } from "../models/user-model"; import env from "../enviroment/env"; import { Request, Response, NextFunction } from "express"; diff --git a/backend/middleware/authLogout.ts b/backend/middleware/authLogout.ts index e1d5ef0..8ccf076 100644 --- a/backend/middleware/authLogout.ts +++ b/backend/middleware/authLogout.ts @@ -1,7 +1,7 @@ import jwt from "jsonwebtoken"; import env from "../enviroment/env"; import { Request, Response, NextFunction } from "express"; -import { createLogoutCookie } from "../cookies/createCookies"; +import { createLogoutCookie } from "../cookies/create-cookies"; interface RequestType extends Request { user?: userAccessType; diff --git a/backend/middleware/authNoEmailVerificication.ts b/backend/middleware/authNoEmailVerificication.ts index 09a2a1d..a27f49d 100644 --- a/backend/middleware/authNoEmailVerificication.ts +++ b/backend/middleware/authNoEmailVerificication.ts @@ -1,5 +1,5 @@ import jwt from "jsonwebtoken"; -import User, { UserInterface } from "../models/userModel"; +import User, { UserInterface } from "../models/user-model"; import env from "../enviroment/env"; import { Request, Response, NextFunction } from "express"; import userUpdateCheck from "../utils/userUpdateCheck"; diff --git a/backend/middleware/authRefresh.ts b/backend/middleware/authRefresh.ts index 33a3220..9857eb6 100644 --- a/backend/middleware/authRefresh.ts +++ b/backend/middleware/authRefresh.ts @@ -1,5 +1,5 @@ import jwt from "jsonwebtoken"; -import User, { UserInterface } from "../models/userModel"; +import User, { UserInterface } from "../models/user-model"; import env from "../enviroment/env"; import { Request, Response, NextFunction } from "express"; import { ObjectId } from "mongodb"; diff --git a/backend/middleware/authStreamVideo.ts b/backend/middleware/authStreamVideo.ts index 06ce0cd..3845746 100644 --- a/backend/middleware/authStreamVideo.ts +++ b/backend/middleware/authStreamVideo.ts @@ -1,5 +1,5 @@ import jwt from "jsonwebtoken"; -import User, { UserInterface } from "../models/userModel"; +import User, { UserInterface } from "../models/user-model"; import env from "../enviroment/env"; import { Request, Response, NextFunction } from "express"; import { ObjectId } from "mongodb"; diff --git a/backend/middleware/Files/FilesMiddleware.ts b/backend/middleware/files/files-middleware.ts similarity index 81% rename from backend/middleware/Files/FilesMiddleware.ts rename to backend/middleware/files/files-middleware.ts index 12eba0e..19ecce0 100644 --- a/backend/middleware/Files/FilesMiddleware.ts +++ b/backend/middleware/files/files-middleware.ts @@ -1,6 +1,6 @@ import { query, validationResult } from "express-validator"; import { Request, Response, NextFunction } from "express"; -import { middlewareValidationFunction } from "../Utils/MiddlewareUtils"; +import { middlewareValidationFunction } from "../utils/middleware-utils"; export const moveFileValidationRules = [ query("fileID").isString().withMessage("Parent must be a string"), diff --git a/backend/middleware/Folders/FolderMiddleware.ts b/backend/middleware/folders/folder-middleware.ts similarity index 83% rename from backend/middleware/Folders/FolderMiddleware.ts rename to backend/middleware/folders/folder-middleware.ts index abeb241..72df2c5 100644 --- a/backend/middleware/Folders/FolderMiddleware.ts +++ b/backend/middleware/folders/folder-middleware.ts @@ -1,6 +1,6 @@ import { query, validationResult } from "express-validator"; import { Request, Response, NextFunction } from "express"; -import { middlewareValidationFunction } from "../Utils/MiddlewareUtils"; +import { middlewareValidationFunction } from "../utils/middleware-utils"; export const moveFolderListValidationRules = [ query("parent").optional().isString().withMessage("Parent must be a string"), diff --git a/backend/middleware/Utils/MiddlewareUtils.ts b/backend/middleware/utils/middleware-utils.ts similarity index 100% rename from backend/middleware/Utils/MiddlewareUtils.ts rename to backend/middleware/utils/middleware-utils.ts diff --git a/backend/models/fileModel.ts b/backend/models/file-model.ts similarity index 100% rename from backend/models/fileModel.ts rename to backend/models/file-model.ts diff --git a/backend/models/fileSystemModel.ts b/backend/models/file-system-model.ts similarity index 100% rename from backend/models/fileSystemModel.ts rename to backend/models/file-system-model.ts diff --git a/backend/models/folderModel.ts b/backend/models/folder-model.ts similarity index 100% rename from backend/models/folderModel.ts rename to backend/models/folder-model.ts diff --git a/backend/models/thumbnailModel.ts b/backend/models/thumbnail-model.ts similarity index 100% rename from backend/models/thumbnailModel.ts rename to backend/models/thumbnail-model.ts diff --git a/backend/models/userModel.ts b/backend/models/user-model.ts similarity index 100% rename from backend/models/userModel.ts rename to backend/models/user-model.ts diff --git a/backend/server/server-start.ts b/backend/server/server-start.ts new file mode 100644 index 0000000..1b3446d --- /dev/null +++ b/backend/server/server-start.ts @@ -0,0 +1,36 @@ +import getEnvVariables from "../enviroment/get-env-variables"; +getEnvVariables(); +import getKey from "../key/get-key"; +import servers from "./server"; + +const { server, serverHttps } = servers; + +const serverStart = async () => { + await getKey(); + + console.log("ENV", process.env.NODE_ENV); + + if (process.env.NODE_ENV === "production" && process.env.SSL === "true") { + server.listen(process.env.HTTP_PORT, process.env.URL, () => { + console.log("Http Server Running On Port:", process.env.HTTP_PORT); + }); + + serverHttps.listen(process.env.HTTPS_PORT, function () { + console.log("Https Server Running On Port:", process.env.HTTPS_PORT); + }); + } else if (process.env.NODE_ENV === "production") { + const port = process.env.HTTP_PORT || process.env.PORT; + + server.listen(port, process.env.URL, () => { + console.log("Http Server (No-SSL) Running On Port:", port); + }); + } else { + const port = process.env.HTTP_PORT || process.env.PORT; + + server.listen(port, process.env.URL, () => { + console.log("Development Server Running On Port:", port); + }); + } +}; + +serverStart(); diff --git a/backend/server/server.ts b/backend/server/server.ts index 7d2ed02..91af2cf 100755 --- a/backend/server/server.ts +++ b/backend/server/server.ts @@ -1,8 +1,8 @@ import express, { Request, Response } from "express"; import path from "path"; -import userRouter from "../express-routers/userRouter"; -import fileRouter from "../express-routers/fileRouter"; -import folderRouter from "../express-routers/folderRouter"; +import userRouter from "../express-routers/user-router"; +import fileRouter from "../express-routers/file-router"; +import folderRouter from "../express-routers/folder-router"; import bodyParser from "body-parser"; import https from "https"; import fs from "fs"; diff --git a/backend/server/serverStart.ts b/backend/server/serverStart.ts deleted file mode 100644 index 53ca0b8..0000000 --- a/backend/server/serverStart.ts +++ /dev/null @@ -1,42 +0,0 @@ -import getEnvVariables from "../enviroment/getEnvVariables"; -getEnvVariables(); -import getKey from "../key/getKey"; -import servers from "./server"; - -const {server, serverHttps} = servers; - -const serverStart = async() => { - - await getKey(); - - console.log("ENV", process.env.NODE_ENV); - - if (process.env.NODE_ENV === 'production' && process.env.SSL === "true") { - - server.listen(process.env.HTTP_PORT,process.env.URL, () => { - console.log("Http Server Running On Port:", process.env.HTTP_PORT); - }) - - serverHttps.listen(process.env.HTTPS_PORT, function () { - console.log( 'Https Server Running On Port:', process.env.HTTPS_PORT); - } ); - - } else if (process.env.NODE_ENV === 'production') { - - const port = process.env.HTTP_PORT || process.env.PORT; - - server.listen(port, process.env.URL, () => { - console.log("Http Server (No-SSL) Running On Port:", port); - }) - - } else { - - const port = process.env.HTTP_PORT || process.env.PORT; - - server.listen(port, process.env.URL, () => { - console.log("Development Server Running On Port:", port); - }) - } -} - -serverStart(); diff --git a/backend/services/ChunkService/Actions/S3Actions.ts b/backend/services/chunk-service/actions/S3-actions.ts similarity index 97% rename from backend/services/ChunkService/Actions/S3Actions.ts rename to backend/services/chunk-service/actions/S3-actions.ts index 291aac9..3cc5f06 100644 --- a/backend/services/ChunkService/Actions/S3Actions.ts +++ b/backend/services/chunk-service/actions/S3-actions.ts @@ -1,6 +1,6 @@ import s3 from "../../../db/connections/s3"; import env from "../../../enviroment/env"; -import { GenericParams, IStorageActions } from "../storeTypes"; +import { GenericParams, IStorageActions } from "../store-types"; import internal from "stream"; import { PassThrough } from "stream"; diff --git a/backend/services/ChunkService/Actions/FileSystemActions.ts b/backend/services/chunk-service/actions/file-system-actions.ts similarity index 93% rename from backend/services/ChunkService/Actions/FileSystemActions.ts rename to backend/services/chunk-service/actions/file-system-actions.ts index b5da7a5..de4c3fd 100644 --- a/backend/services/ChunkService/Actions/FileSystemActions.ts +++ b/backend/services/chunk-service/actions/file-system-actions.ts @@ -1,6 +1,6 @@ import fs from "fs"; -import { UserInterface } from "../../../models/userModel"; -import { GenericParams, IStorageActions } from "../storeTypes"; +import { UserInterface } from "../../../models/user-model"; +import { GenericParams, IStorageActions } from "../store-types"; import env from "../../../enviroment/env"; class FilesystemActions implements IStorageActions { diff --git a/backend/services/ChunkService/chunkService.ts b/backend/services/chunk-service/chunk-service.ts similarity index 97% rename from backend/services/ChunkService/chunkService.ts rename to backend/services/chunk-service/chunk-service.ts index d7be9c2..8549655 100644 --- a/backend/services/ChunkService/chunkService.ts +++ b/backend/services/chunk-service/chunk-service.ts @@ -1,23 +1,23 @@ import { Response, Request } from "express"; -import { UserInterface } from "../../models/userModel"; +import { UserInterface } from "../../models/user-model"; import NotAuthorizedError from "../../utils/NotAuthorizedError"; import NotFoundError from "../../utils/NotFoundError"; import crypto from "crypto"; import getBusboyData from "./utils/getBusboyData"; import videoChecker from "../../utils/videoChecker"; import uuid from "uuid"; -import File, { FileInterface } from "../../models/fileModel"; +import File, { FileInterface } from "../../models/file-model"; import FileDB from "../../db/mongoDB/fileDB"; import FolderDB from "../../db/mongoDB/folderDB"; -import Thumbnail, { ThumbnailInterface } from "../../models/thumbnailModel"; -import User from "../../models/userModel"; +import Thumbnail, { ThumbnailInterface } from "../../models/thumbnail-model"; +import User from "../../models/user-model"; import env from "../../enviroment/env"; import fixStartChunkLength from "./utils/fixStartChunkLength"; -import Folder, { FolderInterface } from "../../models/folderModel"; +import Folder, { FolderInterface } from "../../models/folder-model"; import ForbiddenError from "../../utils/ForbiddenError"; import { ObjectId } from "mongodb"; -import { S3Actions } from "./actions/S3Actions"; -import { FilesystemActions } from "./actions/fileSystemActions"; +import { S3Actions } from "./actions/S3-actions"; +import { FilesystemActions } from "./actions/file-system-actions"; import { createGenericParams } from "./utils/storageHelper"; const fileDB = new FileDB(); diff --git a/backend/services/ChunkService/StoreTypes.ts b/backend/services/chunk-service/store-types.ts similarity index 100% rename from backend/services/ChunkService/StoreTypes.ts rename to backend/services/chunk-service/store-types.ts diff --git a/backend/services/ChunkService/utils/ChunkInterface.ts b/backend/services/chunk-service/utils/ChunkInterface.ts similarity index 83% rename from backend/services/ChunkService/utils/ChunkInterface.ts rename to backend/services/chunk-service/utils/ChunkInterface.ts index 0d1335c..d9f8079 100644 --- a/backend/services/ChunkService/utils/ChunkInterface.ts +++ b/backend/services/chunk-service/utils/ChunkInterface.ts @@ -1,7 +1,7 @@ -import { UserInterface } from "../../../models/userModel"; -import { FileInterface } from "../../../models/fileModel"; +import { UserInterface } from "../../../models/user-model"; +import { FileInterface } from "../../../models/file-model"; import { Request, Response } from "express"; -import { FolderInterface } from "../../../models/folderModel"; +import { FolderInterface } from "../../../models/folder-model"; import crypto from "crypto"; interface ChunkInterface { diff --git a/backend/services/ChunkService/utils/addToStorageSize.ts b/backend/services/chunk-service/utils/addToStorageSize.ts similarity index 91% rename from backend/services/ChunkService/utils/addToStorageSize.ts rename to backend/services/chunk-service/utils/addToStorageSize.ts index 0ac52f6..72f8e54 100644 --- a/backend/services/ChunkService/utils/addToStorageSize.ts +++ b/backend/services/chunk-service/utils/addToStorageSize.ts @@ -1,4 +1,4 @@ -import { UserInterface } from "../../../models/userModel"; +import { UserInterface } from "../../../models/user-model"; import env from "../../../enviroment/env"; const addToStoageSize = async ( diff --git a/backend/services/ChunkService/utils/awaitStream.ts b/backend/services/chunk-service/utils/awaitStream.ts similarity index 100% rename from backend/services/ChunkService/utils/awaitStream.ts rename to backend/services/chunk-service/utils/awaitStream.ts diff --git a/backend/services/ChunkService/utils/awaitStreamVideo.ts b/backend/services/chunk-service/utils/awaitStreamVideo.ts similarity index 100% rename from backend/services/ChunkService/utils/awaitStreamVideo.ts rename to backend/services/chunk-service/utils/awaitStreamVideo.ts diff --git a/backend/services/ChunkService/utils/awaitUploadStreamFS.ts b/backend/services/chunk-service/utils/awaitUploadStreamFS.ts similarity index 100% rename from backend/services/ChunkService/utils/awaitUploadStreamFS.ts rename to backend/services/chunk-service/utils/awaitUploadStreamFS.ts diff --git a/backend/services/ChunkService/utils/awaitUploadStreamS3.ts b/backend/services/chunk-service/utils/awaitUploadStreamS3.ts similarity index 100% rename from backend/services/ChunkService/utils/awaitUploadStreamS3.ts rename to backend/services/chunk-service/utils/awaitUploadStreamS3.ts diff --git a/backend/services/ChunkService/utils/cachedSubscriptionStatuses.ts b/backend/services/chunk-service/utils/cachedSubscriptionStatuses.ts similarity index 100% rename from backend/services/ChunkService/utils/cachedSubscriptionStatuses.ts rename to backend/services/chunk-service/utils/cachedSubscriptionStatuses.ts diff --git a/backend/services/ChunkService/utils/createImageThumbnail.ts b/backend/services/chunk-service/utils/createImageThumbnail.ts similarity index 90% rename from backend/services/ChunkService/utils/createImageThumbnail.ts rename to backend/services/chunk-service/utils/createImageThumbnail.ts index 4d8750a..1aa3013 100644 --- a/backend/services/ChunkService/utils/createImageThumbnail.ts +++ b/backend/services/chunk-service/utils/createImageThumbnail.ts @@ -1,17 +1,17 @@ import mongoose from "../../../db/connections/mongoose"; import crypto from "crypto"; -import Thumbnail from "../../../models/thumbnailModel"; +import Thumbnail from "../../../models/thumbnail-model"; import sharp from "sharp"; -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import fs from "fs"; import uuid from "uuid"; import env from "../../../enviroment/env"; import { ObjectId } from "mongodb"; -import File from "../../../models/fileModel"; +import File from "../../../models/file-model"; import { createGenericParams } from "./storageHelper"; -import { S3Actions } from "../actions/S3Actions"; -import { FilesystemActions } from "../actions/fileSystemActions"; +import { S3Actions } from "../actions/S3-actions"; +import { FilesystemActions } from "../actions/file-system-actions"; const conn = mongoose.connection; diff --git a/backend/services/ChunkService/utils/createThumbailAny.ts b/backend/services/chunk-service/utils/createThumbailAny.ts similarity index 80% rename from backend/services/ChunkService/utils/createThumbailAny.ts rename to backend/services/chunk-service/utils/createThumbailAny.ts index e3665b6..98a0586 100644 --- a/backend/services/ChunkService/utils/createThumbailAny.ts +++ b/backend/services/chunk-service/utils/createThumbailAny.ts @@ -1,5 +1,5 @@ -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import createThumbnailS3 from "./createThumbnailS3"; import createThumbnailFilesystem from "./createThumbnailFS"; import env from "../../../enviroment/env"; diff --git a/backend/services/ChunkService/utils/createThumbnailFS.ts b/backend/services/chunk-service/utils/createThumbnailFS.ts similarity index 92% rename from backend/services/ChunkService/utils/createThumbnailFS.ts rename to backend/services/chunk-service/utils/createThumbnailFS.ts index c552bcf..6ca57fc 100644 --- a/backend/services/ChunkService/utils/createThumbnailFS.ts +++ b/backend/services/chunk-service/utils/createThumbnailFS.ts @@ -1,14 +1,14 @@ import mongoose from "../../../db/connections/mongoose"; import crypto from "crypto"; -import Thumbnail from "../../../models/thumbnailModel"; +import Thumbnail from "../../../models/thumbnail-model"; import sharp from "sharp"; -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import fs from "fs"; import uuid from "uuid"; import env from "../../../enviroment/env"; import { ObjectId } from "mongodb"; -import File from "../../../models/fileModel"; +import File from "../../../models/file-model"; const conn = mongoose.connection; diff --git a/backend/services/ChunkService/utils/createThumbnailS3.ts b/backend/services/chunk-service/utils/createThumbnailS3.ts similarity index 94% rename from backend/services/ChunkService/utils/createThumbnailS3.ts rename to backend/services/chunk-service/utils/createThumbnailS3.ts index f196ecd..920cfe9 100644 --- a/backend/services/ChunkService/utils/createThumbnailS3.ts +++ b/backend/services/chunk-service/utils/createThumbnailS3.ts @@ -1,9 +1,9 @@ import mongoose from "../../../db/connections/mongoose"; import crypto from "crypto"; -import Thumbnail from "../../../models/thumbnailModel"; +import Thumbnail from "../../../models/thumbnail-model"; import sharp from "sharp"; -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import uuid from "uuid"; import env from "../../../enviroment/env"; import s3 from "../../../db/connections/s3"; diff --git a/backend/services/ChunkService/utils/createVideoThumbnail.ts b/backend/services/chunk-service/utils/createVideoThumbnail.ts similarity index 92% rename from backend/services/ChunkService/utils/createVideoThumbnail.ts rename to backend/services/chunk-service/utils/createVideoThumbnail.ts index 9a2a17b..5fba7b3 100644 --- a/backend/services/ChunkService/utils/createVideoThumbnail.ts +++ b/backend/services/chunk-service/utils/createVideoThumbnail.ts @@ -1,18 +1,18 @@ import mongoose from "../../../db/connections/mongoose"; import crypto from "crypto"; -import Thumbnail from "../../../models/thumbnailModel"; +import Thumbnail from "../../../models/thumbnail-model"; import sharp from "sharp"; -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import fs from "fs"; import uuid from "uuid"; import env from "../../../enviroment/env"; import { ObjectId } from "mongodb"; -import File from "../../../models/fileModel"; +import File from "../../../models/file-model"; import ffmpeg from "fluent-ffmpeg"; import tempCreateVideoThumbnailFS from "./tempCreateVideoThumbnailFS"; -import { S3Actions } from "../actions/S3Actions"; -import { FilesystemActions } from "../actions/fileSystemActions"; +import { S3Actions } from "../actions/S3-actions"; +import { FilesystemActions } from "../actions/file-system-actions"; import { createGenericParams } from "./storageHelper"; const storageActions = diff --git a/backend/services/ChunkService/utils/createVideoThumbnailFS.ts b/backend/services/chunk-service/utils/createVideoThumbnailFS.ts similarity index 92% rename from backend/services/ChunkService/utils/createVideoThumbnailFS.ts rename to backend/services/chunk-service/utils/createVideoThumbnailFS.ts index 69359f7..8a60c65 100644 --- a/backend/services/ChunkService/utils/createVideoThumbnailFS.ts +++ b/backend/services/chunk-service/utils/createVideoThumbnailFS.ts @@ -1,14 +1,14 @@ import mongoose from "../../../db/connections/mongoose"; import crypto from "crypto"; -import Thumbnail from "../../../models/thumbnailModel"; +import Thumbnail from "../../../models/thumbnail-model"; import sharp from "sharp"; -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import fs from "fs"; import uuid from "uuid"; import env from "../../../enviroment/env"; import { ObjectId } from "mongodb"; -import File from "../../../models/fileModel"; +import File from "../../../models/file-model"; import ffmpeg from "fluent-ffmpeg"; import tempCreateVideoThumbnailFS from "./tempCreateVideoThumbnailFS"; diff --git a/backend/services/ChunkService/utils/fixEndChunkLength.ts b/backend/services/chunk-service/utils/fixEndChunkLength.ts similarity index 100% rename from backend/services/ChunkService/utils/fixEndChunkLength.ts rename to backend/services/chunk-service/utils/fixEndChunkLength.ts diff --git a/backend/services/ChunkService/utils/fixStartChunkLength.ts b/backend/services/chunk-service/utils/fixStartChunkLength.ts similarity index 100% rename from backend/services/ChunkService/utils/fixStartChunkLength.ts rename to backend/services/chunk-service/utils/fixStartChunkLength.ts diff --git a/backend/services/ChunkService/utils/getBusboyData.ts b/backend/services/chunk-service/utils/getBusboyData.ts similarity index 100% rename from backend/services/ChunkService/utils/getBusboyData.ts rename to backend/services/chunk-service/utils/getBusboyData.ts diff --git a/backend/services/ChunkService/utils/getFileSize.ts b/backend/services/chunk-service/utils/getFileSize.ts similarity index 100% rename from backend/services/ChunkService/utils/getFileSize.ts rename to backend/services/chunk-service/utils/getFileSize.ts diff --git a/backend/services/ChunkService/utils/getPrevIVFS.ts b/backend/services/chunk-service/utils/getPrevIVFS.ts similarity index 100% rename from backend/services/ChunkService/utils/getPrevIVFS.ts rename to backend/services/chunk-service/utils/getPrevIVFS.ts diff --git a/backend/services/ChunkService/utils/getPrevIVS3.ts b/backend/services/chunk-service/utils/getPrevIVS3.ts similarity index 89% rename from backend/services/ChunkService/utils/getPrevIVS3.ts rename to backend/services/chunk-service/utils/getPrevIVS3.ts index f38ba23..2acd51d 100644 --- a/backend/services/ChunkService/utils/getPrevIVS3.ts +++ b/backend/services/chunk-service/utils/getPrevIVS3.ts @@ -1,6 +1,6 @@ import s3 from "../../../db/s3"; import env from "../../../enviroment/env"; -import { UserInterface } from "../../../models/userModel"; +import { UserInterface } from "../../../models/user-model"; const getPrevIV = ( start: number, diff --git a/backend/services/ChunkService/utils/removeChunksFS.ts b/backend/services/chunk-service/utils/removeChunksFS.ts similarity index 100% rename from backend/services/ChunkService/utils/removeChunksFS.ts rename to backend/services/chunk-service/utils/removeChunksFS.ts diff --git a/backend/services/ChunkService/utils/removeChunksS3.ts b/backend/services/chunk-service/utils/removeChunksS3.ts similarity index 100% rename from backend/services/ChunkService/utils/removeChunksS3.ts rename to backend/services/chunk-service/utils/removeChunksS3.ts diff --git a/backend/services/ChunkService/utils/removeTempToken.ts b/backend/services/chunk-service/utils/removeTempToken.ts similarity index 80% rename from backend/services/ChunkService/utils/removeTempToken.ts rename to backend/services/chunk-service/utils/removeTempToken.ts index e500ca4..2d27626 100644 --- a/backend/services/ChunkService/utils/removeTempToken.ts +++ b/backend/services/chunk-service/utils/removeTempToken.ts @@ -1,4 +1,4 @@ -import { UserInterface } from "../../../models/userModel"; +import { UserInterface } from "../../../models/user-model"; const removeTempToken = async (user: UserInterface, tempToken: any) => { user.tempTokens = user.tempTokens.filter((filterToken) => { diff --git a/backend/services/ChunkService/utils/storageHelper.ts b/backend/services/chunk-service/utils/storageHelper.ts similarity index 100% rename from backend/services/ChunkService/utils/storageHelper.ts rename to backend/services/chunk-service/utils/storageHelper.ts diff --git a/backend/services/ChunkService/utils/subtractFromStorageSize.ts b/backend/services/chunk-service/utils/subtractFromStorageSize.ts similarity index 92% rename from backend/services/ChunkService/utils/subtractFromStorageSize.ts rename to backend/services/chunk-service/utils/subtractFromStorageSize.ts index 9169cb9..9b4d5e0 100644 --- a/backend/services/ChunkService/utils/subtractFromStorageSize.ts +++ b/backend/services/chunk-service/utils/subtractFromStorageSize.ts @@ -1,4 +1,4 @@ -import User, { UserInterface } from "../../../models/userModel"; +import User, { UserInterface } from "../../../models/user-model"; import env from "../../../enviroment/env"; const subtractFromStorageSize = async ( diff --git a/backend/services/ChunkService/utils/tempCreateVideoThumbnail.ts b/backend/services/chunk-service/utils/tempCreateVideoThumbnail.ts similarity index 92% rename from backend/services/ChunkService/utils/tempCreateVideoThumbnail.ts rename to backend/services/chunk-service/utils/tempCreateVideoThumbnail.ts index 78661ed..9994976 100644 --- a/backend/services/ChunkService/utils/tempCreateVideoThumbnail.ts +++ b/backend/services/chunk-service/utils/tempCreateVideoThumbnail.ts @@ -1,17 +1,17 @@ import mongoose from "../../../db/connections/mongoose"; import crypto from "crypto"; -import Thumbnail from "../../../models/thumbnailModel"; +import Thumbnail from "../../../models/thumbnail-model"; import sharp from "sharp"; -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import fs from "fs"; import uuid from "uuid"; import env from "../../../enviroment/env"; import { ObjectId } from "mongodb"; -import File from "../../../models/fileModel"; +import File from "../../../models/file-model"; import ffmpeg from "fluent-ffmpeg"; -import { S3Actions } from "../actions/S3Actions"; -import { FilesystemActions } from "../actions/fileSystemActions"; +import { S3Actions } from "../actions/S3-actions"; +import { FilesystemActions } from "../actions/file-system-actions"; import { createGenericParams } from "./storageHelper"; const storageActions = diff --git a/backend/services/ChunkService/utils/tempCreateVideoThumbnailFS.ts b/backend/services/chunk-service/utils/tempCreateVideoThumbnailFS.ts similarity index 94% rename from backend/services/ChunkService/utils/tempCreateVideoThumbnailFS.ts rename to backend/services/chunk-service/utils/tempCreateVideoThumbnailFS.ts index 6eb5ce9..993e7ad 100644 --- a/backend/services/ChunkService/utils/tempCreateVideoThumbnailFS.ts +++ b/backend/services/chunk-service/utils/tempCreateVideoThumbnailFS.ts @@ -1,14 +1,14 @@ import mongoose from "../../../db/connections/mongoose"; import crypto from "crypto"; -import Thumbnail from "../../../models/thumbnailModel"; +import Thumbnail from "../../../models/thumbnail-model"; import sharp from "sharp"; -import { FileInterface } from "../../../models/fileModel"; -import { UserInterface } from "../../../models/userModel"; +import { FileInterface } from "../../../models/file-model"; +import { UserInterface } from "../../../models/user-model"; import fs from "fs"; import uuid from "uuid"; import env from "../../../enviroment/env"; import { ObjectId } from "mongodb"; -import File from "../../../models/fileModel"; +import File from "../../../models/file-model"; import ffmpeg from "fluent-ffmpeg"; const tempCreateVideoThumbnailFS = ( diff --git a/backend/services/fileService/fileService.ts b/backend/services/file-service/file-service.ts similarity index 97% rename from backend/services/fileService/fileService.ts rename to backend/services/file-service/file-service.ts index 972ab18..68bb17f 100644 --- a/backend/services/fileService/fileService.ts +++ b/backend/services/file-service/file-service.ts @@ -2,15 +2,15 @@ import NotAuthorizedError from "../../utils/NotAuthorizedError"; import NotFoundError from "../../utils/NotFoundError"; import env from "../../enviroment/env"; import jwt from "jsonwebtoken"; -import Folder, { FolderInterface } from "../../models/folderModel"; +import Folder, { FolderInterface } from "../../models/folder-model"; import sortBySwitch from "../../utils/sortBySwitch"; import createQuery from "../../utils/createQuery"; import FileDB from "../../db/mongoDB/fileDB"; import FolderDB from "../../db/mongoDB/folderDB"; -import { UserInterface } from "../../models/userModel"; -import { FileInterface } from "../../models/fileModel"; +import { UserInterface } from "../../models/user-model"; +import { FileInterface } from "../../models/file-model"; import tempStorage from "../../tempStorage/tempStorage"; -import FolderService from "../folderService/folderService"; +import FolderService from "../folder-service/folder-service"; const fileDB = new FileDB(); const folderDB = new FolderDB(); diff --git a/backend/services/folderService/folderService.ts b/backend/services/folder-service/folder-service.ts similarity index 98% rename from backend/services/folderService/folderService.ts rename to backend/services/folder-service/folder-service.ts index 3e6d966..7493e06 100644 --- a/backend/services/folderService/folderService.ts +++ b/backend/services/folder-service/folder-service.ts @@ -1,10 +1,10 @@ -import Folder, { FolderInterface } from "../../models/folderModel"; +import Folder, { FolderInterface } from "../../models/folder-model"; import InternalServerError from "../../utils/InternalServerError"; import NotFoundError from "../../utils/NotFoundError"; import FileDB from "../../db/mongoDB/fileDB"; import FolderDB from "../../db/mongoDB/folderDB"; import sortBySwitch from "../../utils/sortBySwitchFolder"; -import { UserInterface } from "../../models/userModel"; +import { UserInterface } from "../../models/user-model"; type userAccessType = { _id: string; diff --git a/backend/services/userService/userService.ts b/backend/services/user-service/user-service.ts similarity index 98% rename from backend/services/userService/userService.ts rename to backend/services/user-service/user-service.ts index 165688a..79ef21c 100644 --- a/backend/services/userService/userService.ts +++ b/backend/services/user-service/user-service.ts @@ -1,9 +1,9 @@ -import User, { UserInterface } from "../../models/userModel"; +import User, { UserInterface } from "../../models/user-model"; import bcrypt from "bcrypt"; import NotFoundError from "../../utils/NotFoundError"; import InternalServerError from "../../utils/InternalServerError"; import sendEmailVerification from "../../utils/sendVerificationEmail"; -import File from "../../models/fileModel"; +import File from "../../models/file-model"; import env from "../../enviroment/env"; import jwt from "jsonwebtoken"; import sendVerificationEmail from "../../utils/sendVerificationEmail"; diff --git a/backend/utils/convertDriveToMongo.ts b/backend/utils/convertDriveToMongo.ts index 93ffacb..51697c8 100644 --- a/backend/utils/convertDriveToMongo.ts +++ b/backend/utils/convertDriveToMongo.ts @@ -1,5 +1,5 @@ import videoChecker from "./videoChecker"; -import { FileInterface } from "../models/fileModel"; +import { FileInterface } from "../models/file-model"; const convertDriveToMongo = ( driveObj: any, diff --git a/backend/utils/sendPasswordResetEmail.ts b/backend/utils/sendPasswordResetEmail.ts index 70b3dd3..3f1c3eb 100644 --- a/backend/utils/sendPasswordResetEmail.ts +++ b/backend/utils/sendPasswordResetEmail.ts @@ -1,5 +1,5 @@ import env from "../enviroment/env"; -import { UserInterface } from "../models/userModel"; +import { UserInterface } from "../models/user-model"; // import sgMail from "@sendgrid/mail"; const sendPasswordResetEmail = async ( diff --git a/backend/utils/sendVerificationEmail.ts b/backend/utils/sendVerificationEmail.ts index 89737fb..5d69ed2 100644 --- a/backend/utils/sendVerificationEmail.ts +++ b/backend/utils/sendVerificationEmail.ts @@ -1,6 +1,6 @@ import SMTPTransport from "nodemailer/lib/smtp-transport"; import env from "../enviroment/env"; -import { UserInterface } from "../models/userModel"; +import { UserInterface } from "../models/user-model"; import nodemailer from "nodemailer"; type MailOptionsType = { diff --git a/backend/utils/sortGoogleMongoFolderList.ts b/backend/utils/sortGoogleMongoFolderList.ts index 8bb2638..471f47c 100644 --- a/backend/utils/sortGoogleMongoFolderList.ts +++ b/backend/utils/sortGoogleMongoFolderList.ts @@ -1,4 +1,4 @@ -import { FolderInterface } from "../models/folderModel"; +import { FolderInterface } from "../models/folder-model"; const sortGoogleMongoFolderList = ( combinedList: FolderInterface[], diff --git a/backend/utils/sortGoogleMongoList.ts b/backend/utils/sortGoogleMongoList.ts index 2b2ce76..c7dd733 100644 --- a/backend/utils/sortGoogleMongoList.ts +++ b/backend/utils/sortGoogleMongoList.ts @@ -1,4 +1,4 @@ -import { FileInterface } from "../models/fileModel"; +import { FileInterface } from "../models/file-model"; const sortGoogleMongoList = (fileList: FileInterface[], query: any) => { let combinedList = fileList; diff --git a/backend/utils/userUpdateCheck.ts b/backend/utils/userUpdateCheck.ts index 340b729..a5f6901 100644 --- a/backend/utils/userUpdateCheck.ts +++ b/backend/utils/userUpdateCheck.ts @@ -1,8 +1,8 @@ -import User, { UserInterface } from "../models/userModel"; +import User, { UserInterface } from "../models/user-model"; import mongoose from "mongoose"; import { Request, Response, NextFunction } from "express"; import NotFoundError from "./NotFoundError"; -import { createLoginCookie } from "../cookies/createCookies"; +import { createLoginCookie } from "../cookies/create-cookies"; // interface RequestType extends Request { // user?: userAccessType,