Skip to content

2
2023-029
Commit 6d3ca78f authored by janithGamage's avatar janithGamage
Browse files
Options

fix; update 

Desc : update user node_server
parent 2053bb22
Hide whitespace changes
Inline Side-by-side
Showing with 436 additions and 87 deletions
Project/Backend/ML_Models/Learning_Model/ML_Model_Calculate_Similarity_Score.ipynb
View file @ 6d3ca78f
This source diff could not be displayed because it is too large. You can view the blob instead.
Project/Backend/Server_Node/controllers/user.controller.js
View file @ 6d3ca78f
...@@ -41,7 +41,7 @@ export const signUp = async (req, res) => { ...@@ -41,7 +41,7 @@ export const signUp = async (req, res) => {
} = req.body; } = req.body;
try { try {
if (!type) return res.status(400).json({ code: "02", message: "Type Field Required" }) // if (!type) return res.status(400).json({ code: "02", message: "Type Field Required" })
if (!email) return res.status(400).json({ code: "02", message: "Email Field Required" }) if (!email) return res.status(400).json({ code: "02", message: "Email Field Required" })
if (!userFirstName) return res.status(400).json({ code: "02", message: "User First Name Field Required" }) if (!userFirstName) return res.status(400).json({ code: "02", message: "User First Name Field Required" })
if (!userLastName) return res.status(400).json({ code: "02", message: "User Last Name Field Required" }) if (!userLastName) return res.status(400).json({ code: "02", message: "User Last Name Field Required" })
...@@ -50,51 +50,74 @@ export const signUp = async (req, res) => { ...@@ -50,51 +50,74 @@ export const signUp = async (req, res) => {
const existingUser = await User.findOne({ email }) const existingUser = await User.findOne({ email })
if (existingUser) return res.status(400).json({ code: "02", message: "User already exists" }) if (existingUser) return res.status(400).json({ code: "02", message: "User already exists" })
if (type === "buyer") { // if (type === "buyer") {
if (!password) return res.status(400).json({ code: "02", message: "Password Field Required" }) // if (!password) return res.status(400).json({ code: "02", message: "Password Field Required" })
if (password !== confirmPassword) return res.status(400).json({ code: "02", message: "Passwords do not match" }) // if (password !== confirmPassword) return res.status(400).json({ code: "02", message: "Passwords do not match" })
const hashedPassword = await bcrypt.hash(password, 12) // const hashedPassword = await bcrypt.hash(password, 12)
const userDetails = new User({ // const userDetails = new User({
email, // email,
password: hashedPassword, // password: hashedPassword,
type, // type,
userDetails: { // userDetails: {
userQNumber: uuidv4(), // userQNumber: uuidv4(),
userEmail: email, // userEmail: email,
userName: `${userFirstName} ${userLastName}`, // userName: `${userFirstName} ${userLastName}`,
userContactNumber, // userContactNumber,
userAddress: `${userAddressLine1}, ${userAddressLine2}, ${userAddressLine3}`, // userAddress: `${userAddressLine1}, ${userAddressLine2}, ${userAddressLine3}`,
userType: type, // userType: type,
} // }
}) // })
const userResult = await userDetails.save() // const userResult = await userDetails.save()
const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" }) // const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" })
res.status(200).json({ code: "01", result: userResult, token }) // res.status(200).json({ code: "01", result: userResult, token })
} else if (type === "trader") { // } else if (type === "trader") {
const userDetails = new User({ // const userDetails = new User({
email, // email,
type, // type,
userDetails: { // userDetails: {
userQNumber: uuidv4(), // userQNumber: uuidv4(),
userEmail: email, // userEmail: email,
userName: `${userFirstName} ${userLastName}`, // userName: `${userFirstName} ${userLastName}`,
userContactNumber, // userContactNumber,
userAddress: `${userAddressLine1}, ${userAddressLine2}, ${userAddressLine3}`, // userAddress: `${userAddressLine1}, ${userAddressLine2}, ${userAddressLine3}`,
userType: type, // userType: type,
}, // },
states: 2 // states: 2
}) // })
const userResult = await userDetails.save() // const userResult = await userDetails.save()
const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" }) // const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" })
res.status(200).json({ code: "01", result: userResult, token }) // res.status(200).json({ code: "01", result: userResult, token })
} // }
if (!password) return res.status(400).json({ code: "02", message: "Password Field Required" })
if (password !== confirmPassword) return res.status(400).json({ code: "02", message: "Passwords do not match" })
const hashedPassword = await bcrypt.hash(password, 12)
const userDetails = new User({
email,
password: hashedPassword,
type,
userDetails: {
userQNumber: uuidv4(),
userEmail: email,
userName: `${userFirstName} ${userLastName}`,
userContactNumber,
userAddress: `${userAddressLine1}, ${userAddressLine2}, ${userAddressLine3}`,
}
})
const userResult = await userDetails.save()
const token = jwt.sign({ email: userResult.email, id: userResult._id }, 'test', { expiresIn: "1h" })
res.status(200).json({ code: "01", result: userResult, token })
} catch (error) { } catch (error) {
res.status(500).json({ code: "00", message: "Something went wrong" }) res.status(500).json({ code: "00", message: "Something went wrong" })
......
Project/Backend/Server_Node/mocq_data/Curriculums.ts
View file @ 6d3ca78f
...@@ -3,10 +3,12 @@ const curriculums = [ ...@@ -3,10 +3,12 @@ const curriculums = [
"curriculumCode": "01", "curriculumCode": "01",
"curriculumLevel": "Base Level", "curriculumLevel": "Base Level",
"curriculumName": "Learn Sign Language", "curriculumName": "Learn Sign Language",
"curriculumImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"tutorials": [ "tutorials": [
{ {
"tutorialCode": "01", "tutorialCode": "01",
"tutorialTitle": "Numbers and Counting in Sign Language", "tutorialTitle": "Numbers and Counting in Sign Language",
"tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"taskItems": [ "taskItems": [
{ {
"title": "Learn Number One", "title": "Learn Number One",
...@@ -83,23 +85,41 @@ const curriculums = [ ...@@ -83,23 +85,41 @@ const curriculums = [
{ {
"tutorialCode": "02", "tutorialCode": "02",
"tutorialTitle": "Learn the Basics of Sign Language", "tutorialTitle": "Learn the Basics of Sign Language",
"tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"tutorialContent": "Introduce the concept of sign language and its importance.\nTeach basic greetings and expressions, such as hello, goodbye, thank you, and sorry.\nProvide visual demonstrations and practice exercises for learners to practice these basic signs." "tutorialContent": "Introduce the concept of sign language and its importance.\nTeach basic greetings and expressions, such as hello, goodbye, thank you, and sorry.\nProvide visual demonstrations and practice exercises for learners to practice these basic signs."
}, },
{ {
"tutorialCode": "03", "tutorialCode": "03",
"tutorialTitle": "Family Signs in Sign Language", "tutorialTitle": "Family Signs in Sign Language",
"tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"tutorialContent": "Teach signs for family members, such as mother, father, sister, brother, etc.\nIntroduce signs for common family-related words, such as family, love, and home.\nProvide visual demonstrations and practice exercises for learners to practice these family signs." "tutorialContent": "Teach signs for family members, such as mother, father, sister, brother, etc.\nIntroduce signs for common family-related words, such as family, love, and home.\nProvide visual demonstrations and practice exercises for learners to practice these family signs."
}, },
{ {
"tutorialCode": "04", "tutorialCode": "04",
"tutorialTitle": "Everyday Vocabulary in Sign Language", "tutorialTitle": "Everyday Vocabulary in Sign Language",
"tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"tutorialContent": "Teach signs for everyday objects and activities, such as eat, drink, sleep, book, pen, etc.\nIntroduce signs for common words used in daily life.\nProvide visual demonstrations and interactive exercises for learners to practice using these signs." "tutorialContent": "Teach signs for everyday objects and activities, such as eat, drink, sleep, book, pen, etc.\nIntroduce signs for common words used in daily life.\nProvide visual demonstrations and interactive exercises for learners to practice using these signs."
}, },
{ {
"tutorialCode": "05", "tutorialCode": "05",
"tutorialTitle": "Basic Conversational Phrases in Sign Language", "tutorialTitle": "Basic Conversational Phrases in Sign Language",
"tutorialImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"tutorialContent": "Teach simple conversational phrases, such as \"What is your name?\" or \"How are you?\"\nIntroduce signs for common question words and phrases.\nProvide visual demonstrations and practice exercises for learners to practice these conversational phrases." "tutorialContent": "Teach simple conversational phrases, such as \"What is your name?\" or \"How are you?\"\nIntroduce signs for common question words and phrases.\nProvide visual demonstrations and practice exercises for learners to practice these conversational phrases."
} }
] ]
},
{
"curriculumCode": "02",
"curriculumLevel": "Medium Level",
"curriculumName": "Learn Sign Language",
"curriculumImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"tutorials": []
},
{
"curriculumCode": "03",
"curriculumLevel": "Advance Level",
"curriculumName": "Learn Sign Language",
"curriculumImage": "https://drive.google.com/uc?export=view&id=1YACBlu7X-O7-DKv5DoW3AM9kgfT7Yhdc",
"tutorials": []
} }
] ]
Project/Backend/Server_Node/models/user.model.js
View file @ 6d3ca78f
...@@ -36,6 +36,7 @@ const userSchema = mongoose.Schema({ ...@@ -36,6 +36,7 @@ const userSchema = mongoose.Schema({
}, },
userType: { userType: {
type: String, type: String,
default: "N/A",
required: true required: true
}, },
}, },
......
Project/Backend/Server_Node/server.js
View file @ 6d3ca78f
...@@ -5,8 +5,8 @@ import express from "express"; ...@@ -5,8 +5,8 @@ import express from "express";
import mongoose from "mongoose"; import mongoose from "mongoose";
//import routes //import routes
import userRoutes from "./routes/user.routes.js";
import translateRoutes from "./routes/translate.routes.js"; import translateRoutes from "./routes/translate.routes.js";
import userRoutes from "./routes/user.routes.js";
dotenv.config(); dotenv.config();
const app = express(); const app = express();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment