diff --git a/app.js b/app.js index e440538..185e69c 100644 --- a/app.js +++ b/app.js @@ -3,13 +3,14 @@ import cookieParser from 'cookie-parser'; import { PORT } from './config/env.js'; -import userRouter from './routes/user.routes.js'; -import authRouter from './routes/auth.routes.js'; -import subscriptionRouter from './routes/subscription.routes.js'; +// Routes +import { + userRouter, authRouter, subscriptionRouter, workflowRouter +} from './routes/index.js' +// Database import connectToDatabase from './database/mongodb.js' -import errorMiddleware from './middlewares/error.middleware.js' -import arcjetMiddleware from './middlewares/arcjet.middleware.js' -import workflowRouter from './routes/workflow.routes.js' +// Middleware +import { errorMiddleware, arcjetMiddleware } from './middlewares/index.js' const app = express(); diff --git a/controllers/auth.controller.js b/controllers/auth.controller.js index 84b1102..137f6c6 100644 --- a/controllers/auth.controller.js +++ b/controllers/auth.controller.js @@ -2,7 +2,7 @@ import mongoose from 'mongoose'; import bcrypt from 'bcryptjs'; import jwt from 'jsonwebtoken'; -import User from '../models/user.model.js'; +import { User } from '../models/index.js'; import { JWT_SECRET, JWT_EXPIRES_IN } from '../config/env.js' export const signUp = async (req, res, next) => { diff --git a/controllers/subscription.controller.js b/controllers/subscription.controller.js index 7dd528f..3dd571b 100644 --- a/controllers/subscription.controller.js +++ b/controllers/subscription.controller.js @@ -1,4 +1,4 @@ -import Subscription from '../models/subscription.model.js' +import { Subscription } from '../models/index.js'; import { workflowClient } from '../config/upstash.js' import { SERVER_URL } from '../config/env.js' diff --git a/controllers/user.controller.js b/controllers/user.controller.js index 2cfceab..aede3d3 100644 --- a/controllers/user.controller.js +++ b/controllers/user.controller.js @@ -1,4 +1,4 @@ -import User from '../models/user.model.js' +import { User } from '../models/index.js'; export const getUsers = async (req, res, next) => { try { diff --git a/controllers/workflow.controller.js b/controllers/workflow.controller.js index a70b5dc..fd2be87 100644 --- a/controllers/workflow.controller.js +++ b/controllers/workflow.controller.js @@ -2,7 +2,7 @@ import dayjs from 'dayjs' import { createRequire } from 'module'; const require = createRequire(import.meta.url); const { serve } = require("@upstash/workflow/express"); -import Subscription from '../models/subscription.model.js'; +import { Subscription } from '../models/index.js'; import { sendReminderEmail } from '../utils/send-email.js' const REMINDERS = [7, 5, 2, 1] diff --git a/middlewares/index.js b/middlewares/index.js new file mode 100644 index 0000000..2a6600b --- /dev/null +++ b/middlewares/index.js @@ -0,0 +1,6 @@ +import arcjetMiddleware from './arcjet.middleware.js'; +import authorize from './auth.middleware.js'; +import errorMiddleware from './error.middleware.js'; + +export { arcjetMiddleware, authorize, errorMiddleware }; + diff --git a/models/index.js b/models/index.js new file mode 100644 index 0000000..46e537f --- /dev/null +++ b/models/index.js @@ -0,0 +1,4 @@ +import User from "./user.model.js"; +import Subscription from "./subscription.model.js"; + +export { User, Subscription }; \ No newline at end of file diff --git a/routes/index.js b/routes/index.js new file mode 100644 index 0000000..f383f12 --- /dev/null +++ b/routes/index.js @@ -0,0 +1,6 @@ +import authRouter from "./auth.routes.js"; +import userRouter from "./user.routes.js"; +import subscriptionRouter from "./subscription.routes.js"; +import workflowRouter from "./workflow.routes.js"; + +export { workflowRouter, subscriptionRouter, userRouter, authRouter }; \ No newline at end of file diff --git a/routes/subscription.routes.js b/routes/subscription.routes.js index bba6be3..d05cca7 100644 --- a/routes/subscription.routes.js +++ b/routes/subscription.routes.js @@ -1,5 +1,5 @@ import { Router } from 'express'; -import authorize from '../middlewares/auth.middleware.js' +import { authorize } from '../middlewares/index.js' import { createSubscription, getUserSubscriptions, diff --git a/routes/user.routes.js b/routes/user.routes.js index 8719613..bd6f6f9 100644 --- a/routes/user.routes.js +++ b/routes/user.routes.js @@ -1,6 +1,6 @@ import { Router } from 'express'; -import authorize from '../middlewares/auth.middleware.js' +import { authorize } from '../middlewares/index.js' import { getUser, getUsers } from '../controllers/user.controller.js' const userRouter = Router();