Merge pull request #23 from EdVentureDev/main

Updating Prod branch

Backend/src/Routes/OTP.ts

@@ -7,7 +7,7 @@ dotenv.config();
 let transporter = nodemailer.createTransport({
   host: "smtp.naver.com",
   port: 587,
-  secure: false, // upgrade later with STARTTLS
+  secure: false,
   auth: {
     user: process.env.EMAIL_USERNAME,
     pass: process.env.EMAIL_PASSWORD,

Backend/src/Routes/user.ts

@@ -4,7 +4,7 @@ import argon from "argon2";
 import { User } from "../db";
 import { getGeneratedOTP, sendOTP } from "./OTP";
 import jwt from "jsonwebtoken"
-import JWT_SECRET from "../config";
+const JWT_SECRET = require( "../config");
 const router = express.Router();
 
 async function hashPassword(password: string) {

Backend/src/config.ts

@@ -1,3 +1,10 @@
-const JWT_SECRET = "MYSECRETKEY"
+const path = require("path")
+const dotenv = require("dotenv");
 
-export default JWT_SECRET;
+dotenv.config({ path: path.join(process.cwd(), "..", ".env") })
+
+const port = process.env.PORT;
+const dbURL = process.env.DATABASE_URL;
+const JWT_SECRET = "MYSECRETKEY";
+
+module.exports = { port, dbURL, JWT_SECRET };

Backend/src/db/index.ts

@@ -1,17 +1,15 @@
-require('dotenv').config();
-import mongoose from "mongoose";
+const env = require("../config");
+import mongoose from 'mongoose';
 
-const databaseUrl = process.env.DATABASE_URL;
 
-if (!databaseUrl) {
+if (!env.dbURL) {
   throw new Error('DATABASE_URL is not defined in the environment variables');
 }
 
-mongoose.connect(databaseUrl)
+mongoose.connect(env.dbURL)
 .then(() => console.log('Database connected successfully'))
 .catch(err => console.error('Database connection error:', err));
 
-
 const UserSchema = new mongoose.Schema({
     firstName: String,
     lastName: String,
@@ -20,8 +18,7 @@ const UserSchema = new mongoose.Schema({
     educational_institute: String,
     password: String,
     groups: [],
-
-})
+});
 
 const GroupsSchema = new mongoose.Schema({
     createdBy: String,
@@ -30,18 +27,16 @@ const GroupsSchema = new mongoose.Schema({
     messages: [{
         sentBy: String,
         content: String,
-        time: Date
+        time: Date,
     }],
-})
+});
 
 const ConversationSchema = new mongoose.Schema({
     first: String,
     second: String,
-    msgs:   {
-
-    } 
-})
+    msgs: {},
+});
 
-export const User= mongoose.model("User", UserSchema)
-export const Group = mongoose.model("Group",GroupsSchema)
-export const Convo = mongoose.model("Conversations",ConversationSchema)
+export const User = mongoose.model('User', UserSchema);
+export const Group = mongoose.model('Group', GroupsSchema);
+export const Convo = mongoose.model('Conversations', ConversationSchema);

EdVenture-FrontEnd/src/app/components/dashboard/chat/chat.component.html

@@ -6,7 +6,7 @@
             </div>
             <div id="leftUsername">
                 <div class="name">
-                    Harshit Shukla
+                    itsUser1
                 </div>
                 <div class="status">
                     <div class="dot"></div>

package.json

@@ -23,8 +23,8 @@
     "otp-generator": "^4.0.1",
     "typescript": "^5.5.3",
     "ws": "^8.16.0",
-    "zod": "^3.22.4"
-  },
+    "zod": "^3.22.4",
+    "typescript": "^5.4.5"
   "devDependencies": {
     "@types/cookie-parser": "^1.4.7",
     "cookie-parser": "^1.4.6"