סידור מחדש של מבנה התקיות והקבצים לטובת היררכיה שטוחה וברורה יותר

Author: ShlomoCode

app.js

@@ -17,9 +17,9 @@ app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 
 /* Routes api */
-const usersRoutes = require('./src/api/routes/users');
-const feedsRoutes = require('./src/api/routes/feeds');
-const subscriptionsRoutes = require('./src/api/routes/subscriptions');
+const usersRoutes = require('@routes/users');
+const feedsRoutes = require('@routes/feeds');
+const subscriptionsRoutes = require('@routes/subscriptions');
 
 app.use('/api/users', usersRoutes);
 app.use('/api/feeds', feedsRoutes);

jsconfig.json

@@ -3,9 +3,13 @@
         "baseUrl": ".",
         "paths": {
             "@/*": ["./src/*"],
-            "@services/*": ["./src/services/*"],
             "@models/*": ["./src/models/*"],
+            "@middlewares/*": ["./src/middlewares/*"],
+            "@services/*": ["./src/services/*"],
             "@templates/*": ["./src/templates/*"],
+            "@utils/*": ["./src/utils"],
+            "@controllers/*": ["./src/controllers"],
+            "@routes/*": ["./src/routes"]
         }
     }
 }

package.json

@@ -47,8 +47,12 @@
   },
   "_moduleAliases": {
     "@": "./src",
-    "@modules": "./src/modules",
+    "@models": "./src/models",
+    "@middlewares": "./src/middlewares",
     "@services": "./src/services",
-    "@templates": "./src/templates"
+    "@templates": "./src/templates",
+    "@utils": "./src/utils",
+    "@controllers": "./src/controllers",
+    "@routes": "./src/routes"
   }
 }

src/api/controllers/feeds.js src/controllers/feeds.jssrc/api/controllers/feeds.js renamed to src/controllers/feeds.js

@@ -1,5 +1,5 @@
 const mongoose = require('mongoose');
-const Feed = require('@/models/feed');
+const Feed = require('@models/feed');
 const parseRss = require('@services/rss2json');
 const { decode: decodeHtml } = require('html-entities');
 

src/api/controllers/subscriptions.js src/controllers/subscriptions.jssrc/api/controllers/subscriptions.js renamed to src/controllers/subscriptions.js

@@ -1,5 +1,5 @@
-const User = require('@/models/user');
-const Feed = require('@/models/feed');
+const User = require('@models/user');
+const Feed = require('@models/feed');
 const mongoose = require('mongoose');
 
 async function unsubscribeAll (req, res) {

src/api/controllers/users.js src/controllers/users.jssrc/api/controllers/users.js renamed to src/controllers/users.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
-const User = require('@/models/user');
-const Session = require('@/models/session');
+const User = require('@models/user');
+const Session = require('@models/session');
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
 const zxcvbn = require('zxcvbn');

src/api/middlewares/checkLogin.js src/middlewares/checkLogin.jssrc/api/middlewares/checkLogin.js renamed to src/middlewares/checkLogin.js

@@ -1,6 +1,6 @@
 const jwt = require('jsonwebtoken');
-const User = require('@/models/user');
-const Session = require('@/models/session');
+const User = require('@models/user');
+const Session = require('@models/session');
 
 const checkLogin = async (req, res, next) => {
     let token = req.cookies.jwt || req.headers.authorization;