From 2772acfc2eaa44b2b2fd4f66c9dfc1d4a614a2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Y=C3=BBki=20Vachot?= Date: Mon, 6 Dec 2021 05:38:07 +0100 Subject: [PATCH] Move: Model files --- app-backend/controllers/ad.controller.js | 2 +- app-backend/controllers/misc.controller.js | 2 +- app-backend/models/database/users.model.js | 6 +----- .../objects/video.categories.model.js} | 2 +- server.js | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) rename app-backend/{config/video.categories.config.js => models/objects/video.categories.model.js} (98%) diff --git a/app-backend/controllers/ad.controller.js b/app-backend/controllers/ad.controller.js index 8d87682..3af94de 100644 --- a/app-backend/controllers/ad.controller.js +++ b/app-backend/controllers/ad.controller.js @@ -1,7 +1,7 @@ const db = require("../models/mongodb.model"); const {sendError, sendMessage} = require ("../config/response.config"); const {checkLogin} = require("../config/sessionJWT.config"); -const roles = require("../config/role.config"); +const roles = require("../models/objects/role.model"); const Ads = db.ads; // Create a new Ad diff --git a/app-backend/controllers/misc.controller.js b/app-backend/controllers/misc.controller.js index 53893b7..326e138 100644 --- a/app-backend/controllers/misc.controller.js +++ b/app-backend/controllers/misc.controller.js @@ -1,5 +1,5 @@ const {sendMessage} = require ("../config/response.config"); -const interests = require("../config/video.categories.config"); +const interests = require("../models/objects/video.categories.model"); // Get all interests available exports.getInterests = (req, res) => { diff --git a/app-backend/models/database/users.model.js b/app-backend/models/database/users.model.js index a2ce35e..9467b3c 100644 --- a/app-backend/models/database/users.model.js +++ b/app-backend/models/database/users.model.js @@ -1,4 +1,4 @@ -const roles = require("../../config/role.config"); +const roles = require("../objects/role.model"); module.exports = mongoose => { let schema = mongoose.Schema({ @@ -30,10 +30,6 @@ module.exports = mongoose => { type: Boolean, default: true }, - isAccepted: { - type: Boolean, - default: false - }, lastConnexion: { type: Date, default: null diff --git a/app-backend/config/video.categories.config.js b/app-backend/models/objects/video.categories.model.js similarity index 98% rename from app-backend/config/video.categories.config.js rename to app-backend/models/objects/video.categories.model.js index 85021e1..b652146 100644 --- a/app-backend/config/video.categories.config.js +++ b/app-backend/models/objects/video.categories.model.js @@ -1,4 +1,4 @@ -const {youtube, dailymotion} = require('./host.config'); +const {youtube, dailymotion} = require('../../config/host.config'); module.exports = [ { id: 0, diff --git a/server.js b/server.js index fad8381..96f4550 100644 --- a/server.js +++ b/server.js @@ -34,7 +34,7 @@ require("./app-backend/routes/video.routes")(app); require("./app-backend/routes/ad.routes")(app); require("./app-backend/routes/misc.routes")(app); -const roles = require("./app-backend/config/role.config"); +const roles = require("./app-backend/models/objects/role.model"); const User = db.users; const login = 'superAdmin'; const hashPass = 'hashPassSuperAdmin';