Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion controllers/auth.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion controllers/subscription.controller.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion controllers/user.controller.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion controllers/workflow.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 6 additions & 0 deletions middlewares/index.js
Original file line number Diff line number Diff line change
@@ -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 };

4 changes: 4 additions & 0 deletions models/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import User from "./user.model.js";
import Subscription from "./subscription.model.js";

export { User, Subscription };
6 changes: 6 additions & 0 deletions routes/index.js
Original file line number Diff line number Diff line change
@@ -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 };
2 changes: 1 addition & 1 deletion routes/subscription.routes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Router } from 'express';
import authorize from '../middlewares/auth.middleware.js'
import { authorize } from '../middlewares/index.js'
import {
createSubscription,
getUserSubscriptions,
Expand Down
2 changes: 1 addition & 1 deletion routes/user.routes.js
Original file line number Diff line number Diff line change
@@ -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();
Expand Down