From 58170b378cc4d91eaf04b1d9e4b600b5f7c0e907 Mon Sep 17 00:00:00 2001 From: louis-antoine-etsmtl Date: Fri, 29 Mar 2024 20:15:32 -0400 Subject: [PATCH] change folder name --- docker-compose.yaml | 2 +- {serveur => server}/Dockerfile | 0 {serveur => server}/__tests__/image.test.js | 0 {serveur => server}/__tests__/socket.test.js | 0 {serveur => server}/app.js | 2 +- {serveur => server}/config/db.js | 0 {serveur => server}/config/email.js | 0 {serveur => server}/constants/errorCodes.js | 0 {serveur => server}/controllers/folders.js | 2 +- {serveur => server}/controllers/images.js | 2 +- {serveur => server}/controllers/quiz.js | 2 +- {serveur => server}/controllers/users.js | 2 +- {serveur => server}/middleware/AppError.js | 0 {serveur => server}/middleware/errorHandler.js | 0 {serveur => server}/middleware/jwtToken.js | 2 +- {serveur => server}/models/folders.js | 0 {serveur => server}/models/images.js | 0 {serveur => server}/models/quiz.js | 0 {serveur => server}/models/users.js | 4 ++-- {serveur => server}/package-lock.json | 0 {serveur => server}/package.json | 0 {serveur => server}/routers/folders.js | 0 {serveur => server}/routers/images.js | 0 {serveur => server}/routers/quiz.js | 0 {serveur => server}/routers/users.js | 0 {serveur => server}/socket/socket.js | 0 26 files changed, 9 insertions(+), 9 deletions(-) rename {serveur => server}/Dockerfile (100%) rename {serveur => server}/__tests__/image.test.js (100%) rename {serveur => server}/__tests__/socket.test.js (100%) rename {serveur => server}/app.js (96%) rename {serveur => server}/config/db.js (100%) rename {serveur => server}/config/email.js (100%) rename {serveur => server}/constants/errorCodes.js (100%) rename {serveur => server}/controllers/folders.js (99%) rename {serveur => server}/controllers/images.js (97%) rename {serveur => server}/controllers/quiz.js (99%) rename {serveur => server}/controllers/users.js (98%) rename {serveur => server}/middleware/AppError.js (100%) rename {serveur => server}/middleware/errorHandler.js (100%) rename {serveur => server}/middleware/jwtToken.js (95%) rename {serveur => server}/models/folders.js (100%) rename {serveur => server}/models/images.js (100%) rename {serveur => server}/models/quiz.js (100%) rename {serveur => server}/models/users.js (98%) rename {serveur => server}/package-lock.json (100%) rename {serveur => server}/package.json (100%) rename {serveur => server}/routers/folders.js (100%) rename {serveur => server}/routers/images.js (100%) rename {serveur => server}/routers/quiz.js (100%) rename {serveur => server}/routers/users.js (100%) rename {serveur => server}/socket/socket.js (100%) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5f3591a..b2ab359 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,7 +11,7 @@ services: backend: build: - context: ./serveur + context: ./server container_name: backend ports: - "3000:3000" diff --git a/serveur/Dockerfile b/server/Dockerfile similarity index 100% rename from serveur/Dockerfile rename to server/Dockerfile diff --git a/serveur/__tests__/image.test.js b/server/__tests__/image.test.js similarity index 100% rename from serveur/__tests__/image.test.js rename to server/__tests__/image.test.js diff --git a/serveur/__tests__/socket.test.js b/server/__tests__/socket.test.js similarity index 100% rename from serveur/__tests__/socket.test.js rename to server/__tests__/socket.test.js diff --git a/serveur/app.js b/server/app.js similarity index 96% rename from serveur/app.js rename to server/app.js index 432c5fa..8d742ed 100644 --- a/serveur/app.js +++ b/server/app.js @@ -4,7 +4,7 @@ const http = require("http"); const dotenv = require('dotenv') // Import Sockets -const { setupWebsocket } = require("./socket/socket"); +const { setupWebsocket } = require("./socket/socket.js"); const { Server } = require("socket.io"); //import routers diff --git a/serveur/config/db.js b/server/config/db.js similarity index 100% rename from serveur/config/db.js rename to server/config/db.js diff --git a/serveur/config/email.js b/server/config/email.js similarity index 100% rename from serveur/config/email.js rename to server/config/email.js diff --git a/serveur/constants/errorCodes.js b/server/constants/errorCodes.js similarity index 100% rename from serveur/constants/errorCodes.js rename to server/constants/errorCodes.js diff --git a/serveur/controllers/folders.js b/server/controllers/folders.js similarity index 99% rename from serveur/controllers/folders.js rename to server/controllers/folders.js index 17a5039..a050d83 100644 --- a/serveur/controllers/folders.js +++ b/server/controllers/folders.js @@ -2,7 +2,7 @@ const model = require('../models/folders.js'); const AppError = require('../middleware/AppError.js'); -const { MISSING_REQUIRED_PARAMETER, NOT_IMPLEMENTED, FOLDER_NOT_FOUND, FOLDER_ALREADY_EXISTS, GETTING_FOLDER_ERROR, DELETE_FOLDER_ERROR, UPDATE_FOLDER_ERROR, MOVING_FOLDER_ERROR, DUPLICATE_FOLDER_ERROR, COPY_FOLDER_ERROR } = require('../constants/errorCodes'); +const { MISSING_REQUIRED_PARAMETER, NOT_IMPLEMENTED, FOLDER_NOT_FOUND, FOLDER_ALREADY_EXISTS, GETTING_FOLDER_ERROR, DELETE_FOLDER_ERROR, UPDATE_FOLDER_ERROR, MOVING_FOLDER_ERROR, DUPLICATE_FOLDER_ERROR, COPY_FOLDER_ERROR } = require('../constants/errorCodes.js'); class FoldersController { diff --git a/serveur/controllers/images.js b/server/controllers/images.js similarity index 97% rename from serveur/controllers/images.js rename to server/controllers/images.js index 757961c..51cfb52 100644 --- a/serveur/controllers/images.js +++ b/server/controllers/images.js @@ -1,7 +1,7 @@ const model = require('../models/images.js'); const AppError = require('../middleware/AppError.js'); -const { MISSING_REQUIRED_PARAMETER, IMAGE_NOT_FOUND } = require('../constants/errorCodes'); +const { MISSING_REQUIRED_PARAMETER, IMAGE_NOT_FOUND } = require('../constants/errorCodes.js'); class ImagesController { diff --git a/serveur/controllers/quiz.js b/server/controllers/quiz.js similarity index 99% rename from serveur/controllers/quiz.js rename to server/controllers/quiz.js index 8b8b247..43af3db 100644 --- a/serveur/controllers/quiz.js +++ b/server/controllers/quiz.js @@ -3,7 +3,7 @@ const folderModel = require('../models/folders.js'); const emailer = require('../config/email.js'); const AppError = require('../middleware/AppError.js'); -const { MISSING_REQUIRED_PARAMETER, NOT_IMPLEMENTED, QUIZ_NOT_FOUND, FOLDER_NOT_FOUND, QUIZ_ALREADY_EXISTS, GETTING_QUIZ_ERROR, DELETE_QUIZ_ERROR, UPDATE_QUIZ_ERROR, MOVING_QUIZ_ERROR, DUPLICATE_QUIZ_ERROR, COPY_QUIZ_ERROR } = require('../constants/errorCodes'); +const { MISSING_REQUIRED_PARAMETER, NOT_IMPLEMENTED, QUIZ_NOT_FOUND, FOLDER_NOT_FOUND, QUIZ_ALREADY_EXISTS, GETTING_QUIZ_ERROR, DELETE_QUIZ_ERROR, UPDATE_QUIZ_ERROR, MOVING_QUIZ_ERROR, DUPLICATE_QUIZ_ERROR, COPY_QUIZ_ERROR } = require('../constants/errorCodes.js'); class QuizController { diff --git a/serveur/controllers/users.js b/server/controllers/users.js similarity index 98% rename from serveur/controllers/users.js rename to server/controllers/users.js index 4494f1d..7981016 100644 --- a/serveur/controllers/users.js +++ b/server/controllers/users.js @@ -3,7 +3,7 @@ const model = require('../models/users.js'); const jwt = require('../middleware/jwtToken.js'); const AppError = require('../middleware/AppError.js'); -const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR, DELETE_USER_ERROR } = require('../constants/errorCodes'); +const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR, DELETE_USER_ERROR } = require('../constants/errorCodes.js'); class UsersController { diff --git a/serveur/middleware/AppError.js b/server/middleware/AppError.js similarity index 100% rename from serveur/middleware/AppError.js rename to server/middleware/AppError.js diff --git a/serveur/middleware/errorHandler.js b/server/middleware/errorHandler.js similarity index 100% rename from serveur/middleware/errorHandler.js rename to server/middleware/errorHandler.js diff --git a/serveur/middleware/jwtToken.js b/server/middleware/jwtToken.js similarity index 95% rename from serveur/middleware/jwtToken.js rename to server/middleware/jwtToken.js index 292e591..ba713ac 100644 --- a/serveur/middleware/jwtToken.js +++ b/server/middleware/jwtToken.js @@ -1,7 +1,7 @@ const jwt = require('jsonwebtoken') const dotenv = require('dotenv') const AppError = require('./AppError.js'); -const { UNAUTHORIZED_NO_TOKEN_GIVEN, UNAUTHORIZED_INVALID_TOKEN } = require('../constants/errorCodes'); +const { UNAUTHORIZED_NO_TOKEN_GIVEN, UNAUTHORIZED_INVALID_TOKEN } = require('../constants/errorCodes.js'); dotenv.config(); diff --git a/serveur/models/folders.js b/server/models/folders.js similarity index 100% rename from serveur/models/folders.js rename to server/models/folders.js diff --git a/serveur/models/images.js b/server/models/images.js similarity index 100% rename from serveur/models/images.js rename to server/models/images.js diff --git a/serveur/models/quiz.js b/server/models/quiz.js similarity index 100% rename from serveur/models/quiz.js rename to server/models/quiz.js diff --git a/serveur/models/users.js b/server/models/users.js similarity index 98% rename from serveur/models/users.js rename to server/models/users.js index caef0a1..926c42e 100644 --- a/serveur/models/users.js +++ b/server/models/users.js @@ -2,8 +2,8 @@ const db = require('../config/db.js'); const bcrypt = require('bcrypt'); const AppError = require('../middleware/AppError.js'); -const { USER_ALREADY_EXISTS } = require('../constants/errorCodes'); -const Folders = require('../models/folders.js'); +const { USER_ALREADY_EXISTS } = require('../constants/errorCodes.js'); +const Folders = require('./folders.js'); class Users { diff --git a/serveur/package-lock.json b/server/package-lock.json similarity index 100% rename from serveur/package-lock.json rename to server/package-lock.json diff --git a/serveur/package.json b/server/package.json similarity index 100% rename from serveur/package.json rename to server/package.json diff --git a/serveur/routers/folders.js b/server/routers/folders.js similarity index 100% rename from serveur/routers/folders.js rename to server/routers/folders.js diff --git a/serveur/routers/images.js b/server/routers/images.js similarity index 100% rename from serveur/routers/images.js rename to server/routers/images.js diff --git a/serveur/routers/quiz.js b/server/routers/quiz.js similarity index 100% rename from serveur/routers/quiz.js rename to server/routers/quiz.js diff --git a/serveur/routers/users.js b/server/routers/users.js similarity index 100% rename from serveur/routers/users.js rename to server/routers/users.js diff --git a/serveur/socket/socket.js b/server/socket/socket.js similarity index 100% rename from serveur/socket/socket.js rename to server/socket/socket.js