Skip to content

Commit

Permalink
fix some issue and full migrate code into module type
Browse files Browse the repository at this point in the history
  • Loading branch information
amitamrutiya committed Nov 17, 2023
1 parent ce002d4 commit 4f1dc6a
Show file tree
Hide file tree
Showing 38 changed files with 131 additions and 122 deletions.
7 changes: 2 additions & 5 deletions backend/config/database.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import mongoose from "mongoose";
require("dotenv").config();
// require("dotenv").config();

const connectDB = async () => {
try {
const connectionInstance = await mongoose.connect(
process.env.MONGODB_URL
);
const connectionInstance = await mongoose.connect(process.env.MONGODB_URL);
console.log(
`\n MongoDB connected !! DB HOST: ${connectionInstance.connection.host}`
);
Expand All @@ -16,4 +14,3 @@ const connectDB = async () => {
};

export default connectDB;

6 changes: 4 additions & 2 deletions backend/config/razorpay.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import Razorpay from "razorpay";
require("dotenv").config();
// require("dotenv").config();

export default instance = new Razorpay({
const instance = new Razorpay({
key_id: process.env.RAZORPAY_KEY_ID,
key_secret: process.env.RAZORPAY_KEY_SECRET,
});

export default instance;
13 changes: 7 additions & 6 deletions backend/controllers/Auth.controller.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import User from "../models/User.model";
import OTP from "../models/OTP.model";
import Profile from "../models/Profile.model";
import User from "../models/User.model.js";
import OTP from "../models/OTP.model.js";
import Profile from "../models/Profile.model.js";
import otpGenerator from "otp-generator";
import bcrypt from "bcrypt";
import jwt from "jsonwebtoken";
import mailSender from "../utils/mailSender";
import passwordUpdated from "../mail/templates/passwordUpdate";
import mailSender from "../utils/mailSender.js";
import passwordUpdated from "../mail/templates/passwordUpdate.js";

require("dotenv").config();
// require("dotenv").config();

// Send Otp
export async function sendOTP(req, res) {
Expand Down Expand Up @@ -267,6 +267,7 @@ export async function changePassword(req, res) {
try {
const emailResponse = await mailSender(
updatedUserDetails.email,
"Password updated successfully - [StudyNotion]",
passwordUpdated(
updatedUserDetails.email,
`Password updated successfully for ${updatedUserDetails.firstName} ${updatedUserDetails.lastName}`
Expand Down
2 changes: 1 addition & 1 deletion backend/controllers/Cart.controller.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import User from "../models/User.model";
import User from "../models/User.model.js";

export async function addCourseIntoCart(req, res) {
try {
Expand Down
2 changes: 1 addition & 1 deletion backend/controllers/Category.controller.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Category from "../models/Category.model";
import Category from "../models/Category.model.js";

function getRandomInt(max) {
return Math.floor(Math.random() * max);
Expand Down
6 changes: 3 additions & 3 deletions backend/controllers/ContactUs.controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import contactUsEmail from "../mail/templates/contactFormRes";
import mailSender from "../utils/mailSender";
require("dotenv").config();
import contactUsEmail from "../mail/templates/contactFormRes.js";
import mailSender from "../utils/mailSender.js";
// require("dotenv").config();

export async function contactUsController(req, res) {
// fetch data
Expand Down
18 changes: 9 additions & 9 deletions backend/controllers/Course.controller.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Course from "../models/Course.model";
import Category from "../models/Category.model";
import User from "../models/User.model";
import SubSection from "../models/SubSection.model";
import Section from "../models/Section.model";
import CourseProgress from "../models/CourseProgress.model";
import uploadFileToCloudinary from "../utils/fileUploader";
import convertSecondsToDuration from "../utils/secToDuration";
require("dotenv").config();
import Course from "../models/Course.model.js";
import Category from "../models/Category.model.js";
import User from "../models/User.model.js";
import SubSection from "../models/SubSection.model.js";
import Section from "../models/Section.model.js";
import CourseProgress from "../models/CourseProgress.model.js";
import uploadFileToCloudinary from "../utils/fileUploader.js";
import convertSecondsToDuration from "../utils/secToDuration.js";
// require("dotenv").config();

//createCourse handler function
export async function createCourse(req, res) {
Expand Down
14 changes: 7 additions & 7 deletions backend/controllers/Payments.controller.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import instance from "../config/razorpay";
import Course from "../models/Course.model";
import CourseProgress from "../models/CourseProgress.model";
import User from "../models/User.model";
import mailSender from "../utils/mailSender";
import instance from "../config/razorpay.js";
import Course from "../models/Course.model.js";
import CourseProgress from "../models/CourseProgress.model.js";
import User from "../models/User.model.js";
import mailSender from "../utils/mailSender.js";
import crypto from "crypto";
import courseEnrollmentEmail from "../mail/templates/courseEnrollmentEmail";
import courseEnrollmentEmail from "../mail/templates/courseEnrollmentEmail.js";
import mongoose from "mongoose";
import paymentSuccessEmail from "../mail/templates/paymentSuccessEmail";
import paymentSuccessEmail from "../mail/templates/paymentSuccessEmail.js";

//initiate the razorpay order
export async function capturePayment(req, res) {
Expand Down
14 changes: 7 additions & 7 deletions backend/controllers/Profile.controller.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Profile from "../models/Profile.model";
import User from "../models/User.model";
import Course from "../models/Course.model";
import CourseProgress from "../models/CourseProgress.model";
import uploadFileToCloudinary from "../utils/fileUploader";
import convertSecondsToDuration from "../utils/secToDuration";
require("dotenv").config();
import Profile from "../models/Profile.model.js";
import User from "../models/User.model.js";
import Course from "../models/Course.model.js";
import CourseProgress from "../models/CourseProgress.model.js";
import uploadFileToCloudinary from "../utils/fileUploader.js";
import convertSecondsToDuration from "../utils/secToDuration.js";
// require("dotenv").config();

// Update Profile
export async function updateProfile(req, res) {
Expand Down
4 changes: 2 additions & 2 deletions backend/controllers/RatingAndReview.controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import RatingAndReview from "../models/RatingAndReview.model";
import Course from "../models/Course.model";
import RatingAndReview from "../models/RatingAndReview.model.js";
import Course from "../models/Course.model.js";
import mongoose from "mongoose";

// create Rating and review
Expand Down
12 changes: 8 additions & 4 deletions backend/controllers/ResetPassword.controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import resetPassword from "../mail/templates/resetPasswordTemplate";
import User from "../models/User.model";
import mailSender from "../utils/mailSender";
import resetPasswordTemplate from "../mail/templates/resetPasswordTemplate.js";
import User from "../models/User.model.js";
import mailSender from "../utils/mailSender.js";
import bcrypt from "bcrypt";
import crypto from "crypto";

Expand Down Expand Up @@ -41,7 +41,11 @@ export async function resetPasswordToken(req, res) {
const url = `http://localhost:3000/update-password/${token}`;

//send email to user
await mailSender(email, "Password Reset Link", resetPassword(email, url));
await mailSender(
email,
"Password Reset Link",
resetPasswordTemplate(email, url)
);

//return response successful
res.status(200).json({
Expand Down
6 changes: 3 additions & 3 deletions backend/controllers/Section.controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Section from "../models/Section.model";
import Course from "../models/Course.model";
import SubSection from "../models/SubSection.model";
import Section from "../models/Section.model.js";
import Course from "../models/Course.model.js";
import SubSection from "../models/SubSection.model.js";

// Create Section
export async function createSection(req, res) {
Expand Down
8 changes: 4 additions & 4 deletions backend/controllers/SubSection.controller.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SubSection from "../models/SubSection.model";
import Section from "../models/Section.model";
import uploadFileToCloudinary from "../utils/fileUploader";
require("dotenv").config();
import SubSection from "../models/SubSection.model.js";
import Section from "../models/Section.model.js";
import uploadFileToCloudinary from "../utils/fileUploader.js";
// require("dotenv").config();

// Create SubSection
export async function createSubSection(req, res) {
Expand Down
6 changes: 3 additions & 3 deletions backend/controllers/User.controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import User from "../models/User.model";
import Profile from "../models/Profile.model";
import Course from "../models/Course.model";
import User from "../models/User.model.js";
import Profile from "../models/Profile.model.js";
import Course from "../models/Course.model.js";
import mongoose from "mongoose";

//Delete Account
Expand Down
4 changes: 2 additions & 2 deletions backend/controllers/courseProgress.controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SubSection from "../models/SubSection.model";
import CourseProgress from "../models/CourseProgress.model";
import SubSection from "../models/SubSection.model.js";
import CourseProgress from "../models/CourseProgress.model.js";

export async function updateCourseProgress(req, res) {
const { courseId, subsectionId } = req.body;
Expand Down
14 changes: 7 additions & 7 deletions backend/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import express from "express";
import userRoutes from "./routes/User";
import profileRoutes from "./routes/Profile";
import paymentRoutes from "./routes/Payment";
import courseRoutes from "./routes/Course";
import contactUsRoute from "./routes/ContactUs";
import connectDB from "./config/database";
import userRoutes from "./routes/User.js";
import profileRoutes from "./routes/Profile.js";
import paymentRoutes from "./routes/Payment.js";
import courseRoutes from "./routes/Course.js";
import contactUsRoute from "./routes/ContactUs.js";
import connectDB from "./config/database.js";
import cookieParser from "cookie-parser";
import cors from "cors";
import { cloudinaryConnect } from "./config/cloudinary";
import { cloudinaryConnect } from "./config/cloudinary.js";
import fileUpload from "express-fileupload";
import dotenv from "dotenv";

Expand Down
2 changes: 1 addition & 1 deletion backend/mail/templates/resetPasswordTemplate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default function resetPassword(email, url) {
export default function resetPasswordTemplate(email, url) {
return `
<!DOCTYPE html>
<html>
Expand Down
2 changes: 1 addition & 1 deletion backend/middlewares/auth.middelware.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import jwt from "jsonwebtoken";
require("dotenv").config();
// require("dotenv").config();

//auth
export async function auth(req, res, next) {
Expand Down
2 changes: 1 addition & 1 deletion backend/models/Category.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ const categorySchems = new Schema({
],
});

export default Category = model("Category", categorySchems);
export default model("Category", categorySchems);
2 changes: 1 addition & 1 deletion backend/models/Course.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ const courseSchems = new Schema({
},
});

export default Course = model("Course", courseSchems);
export default model("Course", courseSchems);
2 changes: 1 addition & 1 deletion backend/models/CourseProgress.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ const courseProgressSchems = new Schema({
],
});

export default CourseProgress = model("CourseProgress", courseProgressSchems);
export default model("CourseProgress", courseProgressSchems);
2 changes: 1 addition & 1 deletion backend/models/OTP.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ OTPShema.pre("save", async function (next) {
next();
});

export default OTP = model("OTP", OTPShema);
export default model("OTP", OTPShema);
2 changes: 1 addition & 1 deletion backend/models/Profile.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ const profileSchems = new Schema({
},
});

export default Profile = model("Profile", profileSchems);
export default model("Profile", profileSchems);
41 changes: 19 additions & 22 deletions backend/models/RatingAndReview.model.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
import { Schema, model } from "mongoose";

const ratingAndReviewSchema = new Schema({
user: {
type: Schema.Types.ObjectId,
required: true,
ref: "User",
},
course: {
type: Schema.Types.ObjectId,
required: true,
ref: "Course",
},
rating: {
type: Number,
required: true,
},
review: {
type: String,
required: true,
},
user: {
type: Schema.Types.ObjectId,
required: true,
ref: "User",
},
course: {
type: Schema.Types.ObjectId,
required: true,
ref: "Course",
},
rating: {
type: Number,
required: true,
},
review: {
type: String,
required: true,
},
});

export default RatingAndReview = model(
"RatingAndReview",
ratingAndReviewSchema
);
export default model("RatingAndReview", ratingAndReviewSchema);
2 changes: 1 addition & 1 deletion backend/models/Section.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ const sectionSchems = new Schema({
],
});

export default Section = model("Section", sectionSchems);
export default model("Section", sectionSchems);
2 changes: 1 addition & 1 deletion backend/models/SubSection.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ const subSectionSchems = new Schema({
},
});

export default SubSection = model("SubSection", subSectionSchems);
export default model("SubSection", subSectionSchems);
2 changes: 1 addition & 1 deletion backend/models/Tags.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ const tagsSchema = new Schema({
},
});

export default Tag = model("Tag", tagsSchema);
export default model("Tag", tagsSchema);
2 changes: 1 addition & 1 deletion backend/models/User.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ const userSchems = new Schema({
},
});

export default User = model("User", userSchems);
export default model("User", userSchems);
2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "module",
"scripts": {
"start": "node index.js",
"dev": "nodemon -r dotenv/config --experimental-json-modules src/index.js",
"dev": "nodemon -r dotenv/config --experimental-json-modules index.js",
"test": "jest",
"build": "npm i"
},
Expand Down
2 changes: 1 addition & 1 deletion backend/routes/ContactUs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Router } from "express";
const router = Router();
import { contactUsController } from "../controllers/ContactUs.controller";
import { contactUsController } from "../controllers/ContactUs.controller.js";

router.post("/contact", contactUsController);

Expand Down
Loading

0 comments on commit 4f1dc6a

Please sign in to comment.