gmatte/EvalueTonSavoir
1
0
Fork 0
mirror of https://github.com/ets-cfuhrman-pfe/EvalueTonSavoir.git synced 2025-08-11 21:23:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renommer pour plus de cohérence

Browse source
This commit is contained in:
C. Fuhrman 2025-03-15 14:53:37 -04:00
parent e6a3af5838
commit 5909ff99cc
15 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/__tests__/folders.mongodb.test.js
View file

@ -1,5 +1,5 @@
const Folder = require('../models/folders'); const Folder = require('../models/folder');
const Quiz = require('../models/quizzes'); const Quiz = require('../models/quiz');
const db = require('../config/db'); const db = require('../config/db');
console.log('db:', db); // Debugging line console.log('db:', db); // Debugging line

2
server/__tests__/folders.test.js
View file

@ -1,4 +1,4 @@
const Folders = require('../models/folders'); const Folders = require('../models/folder');
const ObjectId = require('mongodb').ObjectId; const ObjectId = require('mongodb').ObjectId;
const Quizzes = require('../models/quiz'); const Quizzes = require('../models/quiz');

6
server/__tests__/users.test.js
View file

@ -1,12 +1,12 @@
const Users = require('../models/users'); const Users = require('../models/user');
const bcrypt = require('bcrypt'); const bcrypt = require('bcrypt');
const Quizzes = require('../models/quiz'); const Quizzes = require('../models/quiz');
const Folders = require('../models/folders'); const Folders = require('../models/folder');
const { ObjectId } = require('mongodb'); const { ObjectId } = require('mongodb');
jest.mock('bcrypt'); jest.mock('bcrypt');
jest.mock('../middleware/AppError'); jest.mock('../middleware/AppError');
jest.mock('../models/folders'); jest.mock('../models/folder');
describe('Users', () => { describe('Users', () => {
let users; let users;

34
server/app.js
View file

@ -14,38 +14,38 @@ const quiz = require('./models/quiz.js');
const quizModel = new quiz(db); const quizModel = new quiz(db);
const room = require('./models/room.js'); const room = require('./models/room.js');
const roomModel = new room(db); const roomModel = new room(db);
const folders = require('./models/folders.js'); const folders = require('./models/folder.js');
const foldersModel = new folders(db, quizModel); const foldersModel = new folders(db, quizModel);
const users = require('./models/users.js'); const users = require('./models/user.js');
const userModel = new users(db, foldersModel); const userModel = new users(db, foldersModel);
const images = require('./models/images.js'); const images = require('./models/image.js');
const imageModel = new images(db); const imageModel = new images(db);
// instantiate the controllers // instantiate the controllers
const usersController = require('./controllers/users.js'); const usersController = require('./controllers/user.js');
const usersControllerInstance = new usersController(userModel); const userControllerInstance = new usersController(userModel);
const roomsController = require('./controllers/room.js'); const roomsController = require('./controllers/room.js');
const roomsControllerInstance = new roomsController(roomModel); const roomControllerInstance = new roomsController(roomModel);
const foldersController = require('./controllers/folders.js'); const foldersController = require('./controllers/folder.js');
const foldersControllerInstance = new foldersController(foldersModel); const folderControllerInstance = new foldersController(foldersModel);
const quizController = require('./controllers/quiz.js'); const quizController = require('./controllers/quiz.js');
const quizControllerInstance = new quizController(quizModel, foldersModel); const quizControllerInstance = new quizController(quizModel, foldersModel);
const imagesController = require('./controllers/images.js'); const imagesController = require('./controllers/image.js');
const imagesControllerInstance = new imagesController(imageModel); const imageControllerInstance = new imagesController(imageModel);
// export the controllers // export the controllers
module.exports.users = usersControllerInstance; module.exports.users = userControllerInstance;
module.exports.rooms = roomsControllerInstance; module.exports.rooms = roomControllerInstance;
module.exports.folders = foldersControllerInstance; module.exports.folders = folderControllerInstance;
module.exports.quizzes = quizControllerInstance; module.exports.quizzes = quizControllerInstance;
module.exports.images = imagesControllerInstance; module.exports.images = imageControllerInstance;
//import routers (instantiate controllers as side effect) //import routers (instantiate controllers as side effect)
const userRouter = require('./routers/users.js'); const userRouter = require('./routers/user.js');
const roomRouter = require('./routers/room.js'); const roomRouter = require('./routers/room.js');
const folderRouter = require('./routers/folders.js'); const folderRouter = require('./routers/folder.js');
const quizRouter = require('./routers/quiz.js'); const quizRouter = require('./routers/quiz.js');
const imagesRouter = require('./routers/images.js') const imagesRouter = require('./routers/image.js')
const AuthManager = require('./auth/auth-manager.js') const AuthManager = require('./auth/auth-manager.js')
const authRouter = require('./routers/auth.js') const authRouter = require('./routers/auth.js')

2
server/auth/modules/simpleauth.js
View file

@ -1,7 +1,7 @@
const jwt = require('../../middleware/jwtToken.js'); const jwt = require('../../middleware/jwtToken.js');
const emailer = require('../../config/email.js'); const emailer = require('../../config/email.js');
const model = require('../../models/users.js'); const model = require('../../models/user.js');
const AppError = require('../../middleware/AppError.js'); const AppError = require('../../middleware/AppError.js');
const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR } = require('../../constants/errorCodes'); const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR } = require('../../constants/errorCodes');
const { name } = require('../../models/authProvider.js'); const { name } = require('../../models/authProvider.js');

6
server/controllers/folders.js → server/controllers/folder.js
View file

@ -1,9 +1,9 @@
//controller //controller
const AppError = require('../middleware/AppError.js'); const AppError = require('../middleware/AppError.js');
const { MISSING_REQUIRED_PARAMETER, FOLDER_NOT_FOUND, FOLDER_ALREADY_EXISTS, GETTING_FOLDER_ERROR, DELETE_FOLDER_ERROR, UPDATE_FOLDER_ERROR, DUPLICATE_FOLDER_ERROR, COPY_FOLDER_ERROR } = require('../constants/errorCodes'); const { MISSING_REQUIRED_PARAMETER, FOLDER_NOT_FOUND, FOLDER_ALREADY_EXISTS, GETTING_FOLDER_ERROR, DELETE_FOLDER_ERROR, UPDATE_FOLDER_ERROR, DUPLICATE_FOLDER_ERROR, COPY_FOLDER_ERROR } = require('../constants/errorCodes.js');
// controllers must use arrow functions to bind 'this' to the class instance in order to access class properties as callbacks in Express // controllers must use arrow functions to bind 'this' to the class instance in order to access class properties as callbacks in Express
class FoldersController { class FolderController {
constructor(foldersModel) { constructor(foldersModel) {
this.folders = foldersModel; this.folders = foldersModel;
@ -267,4 +267,4 @@ class FoldersController {
module.exports = FoldersController; module.exports = FolderController;

6
server/controllers/images.js → server/controllers/image.js
View file

@ -1,7 +1,7 @@
const AppError = require('../middleware/AppError.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 { class ImageController {
constructor(imagesModel) { constructor(imagesModel) {
this.images = imagesModel; this.images = imagesModel;
@ -52,4 +52,4 @@ class ImagesController {
} }
module.exports = ImagesController; module.exports = ImageController;

6
server/controllers/users.js → server/controllers/user.js
View file

@ -2,10 +2,10 @@ const emailer = require('../config/email.js');
const jwt = require('../middleware/jwtToken.js'); const jwt = require('../middleware/jwtToken.js');
const AppError = require('../middleware/AppError.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');
// controllers must use arrow functions to bind 'this' to the class instance in order to access class properties as callbacks in Express // controllers must use arrow functions to bind 'this' to the class instance in order to access class properties as callbacks in Express
class UsersController { class UserController {
constructor(userModel) { constructor(userModel) {
this.users = userModel; this.users = userModel;
@ -143,4 +143,4 @@ class UsersController {
} }
} }
module.exports = UsersController; module.exports = UserController;

0
server/models/folders.js → server/models/folder.js
View file

4
server/models/images.js → server/models/image.js
View file

@ -1,6 +1,6 @@
const { ObjectId } = require('mongodb'); const { ObjectId } = require('mongodb');
class Images { class Image {
constructor(db) { constructor(db) {
this.db = db; this.db = db;
@ -44,4 +44,4 @@ class Images {
} }
module.exports = Images; module.exports = Image;

0
server/models/quizzes.js → server/models/quiz.js
View file

10
server/models/users.js → server/models/user.js
View file

@ -1,8 +1,8 @@
const bcrypt = require("bcrypt"); const bcrypt = require("bcrypt");
const AppError = require("../middleware/AppError.js"); const AppError = require("../middleware/AppError.js");
const { USER_ALREADY_EXISTS } = require("../constants/errorCodes"); const { USER_ALREADY_EXISTS } = require("../constants/errorCodes.js");
class Users { class User {
constructor(db, foldersModel) { constructor(db, foldersModel) {
this.db = db; this.db = db;
@ -53,7 +53,7 @@ class Users {
} }
async login(email, password) { async login(email, password) {
console.log(`models/users: login: email: ${email}, password: ${password}`); console.log(`models/user: login: email: ${email}, password: ${password}`);
try { try {
const conn = await this.db.getConnection(); const conn = await this.db.getConnection();
const userCollection = conn.collection("users"); const userCollection = conn.collection("users");
@ -73,7 +73,7 @@ class Users {
error.statusCode = 401; error.statusCode = 401;
throw error; throw error;
} }
console.log(`models/users: login: FOUND user: ${JSON.stringify(user)}`); console.log(`models/user: login: FOUND user: ${JSON.stringify(user)}`);
return user; return user;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
@ -171,4 +171,4 @@ class Users {
} }
} }
module.exports = Users; module.exports = User;

0
server/routers/folders.js → server/routers/folder.js
View file

0
server/routers/images.js → server/routers/image.js
View file

2
server/routers/users.js → server/routers/user.js
View file

@ -3,7 +3,7 @@ const router = express.Router();
const users = require('../app.js').users; const users = require('../app.js').users;
const jwt = require('../middleware/jwtToken.js'); const jwt = require('../middleware/jwtToken.js');
const asyncHandler = require('./routerUtils.js'); const asyncHandler = require('./routerUtils.js');
const usersController = require('../controllers/users.js') const usersController = require('../controllers/user.js')
router.post("/register", asyncHandler(users.register)); router.post("/register", asyncHandler(users.register));
router.post("/login", asyncHandler(users.login)); router.post("/login", asyncHandler(users.login));