Merge branch 'main' into transaction

# Conflicts:
#	config/.env
#	package-lock.json
#	package.json
#	setup/routerEndpoints.js
This commit is contained in:
2025-04-19 23:37:59 +03:30
25 changed files with 2184 additions and 124 deletions
+4 -2
View File
@@ -1,6 +1,4 @@
const express = require('express')
const AppError = require('../globalErrorHandler/AppError')
const catchAsync = require('../globalErrorHandler/catchAsync')
const userRoutes = require('../components/user/userRoutes')
const roleRoutes = require('../components/role/roleRoutes')
const permissionRoutes = require('../components/permission/permissionRoutes')
@@ -11,6 +9,8 @@ const transactionRoutes = require('../components/transaction/transactionRoutes')
// const CRMRoutes = require('../components/pages/crmRoutes')
// const LoginRoute = require('../components/pages/loginRoutes')
const fileRoutes = require('../components/file/fileRoutes')
const featureRoutes = require('../components/feature/featureRoutes')
const routerEndpoints = new express.Router()
routerEndpoints.use('/users', userRoutes)
@@ -20,4 +20,6 @@ routerEndpoints.use('/roles', roleRoutes)
routerEndpoints.use('/categories', categoryRoutes)
routerEndpoints.use('/transactions', transactionRoutes)
routerEndpoints.use('/files', fileRoutes)
routerEndpoints.use('/features', featureRoutes)
module.exports = routerEndpoints