topic backend added

backend/config/database.js

@@ -14,8 +14,8 @@ const connectMongoDb = ()=>{
 
                     /*Debugging Purpose*/
         // const sample  = async ()=>{
-        // const title = "Overview"
-        // const no = 1
+        // const title = "What are the ways to apply License?"
+        // const no = 3
         // const videoUrl = "videourl"
         // const script = '<h1 >This is an script</h1>'
         // const questions = [

backend/server.js

@@ -5,7 +5,7 @@ const cookieParser = require('cookie-parser')
 
 const connectMongoDb = require("./config/database")
 const authRoutes = require('./src/routes/authRoutes');
-
+const materialRoutes = require('./src/routes/materialRoutes')
 
 const app = express()
 app.use(cookieParser())
@@ -24,7 +24,7 @@ connectMongoDb()
 
 
 app.use('/api/auth', authRoutes); 
-
+app.use('/api/material',materialRoutes )
 
 
 

backend/src/controllers/authController.js

@@ -144,8 +144,9 @@ const googleLoginBase = async (req, res, isWeb) => {
       const saltRounds = 10; // Adjust
       const hashedPassword = await bcrypt.hash(password, saltRounds);
 
+      const isAdmin = false
       //create a new user
-      const newUser = new User({ email, hashedPassword, name })
+      const newUser = new User({ email, hashedPassword, name, isAdmin })
       await newUser.save()
 
       // Send the response

backend/src/controllers/topicController.js

@@ -0,0 +1,20 @@
+const Topic = require('../models/topic')
+const jwt = require("jsonwebtoken");
+
+
+exports.getAllTopics = async (req, res) => {
+//   console.log(req.email)
+
+try{
+    const topics = await Topic.find().select('title no videoUrl _id')
+    res.status(200).json(topics)
+}
+catch(err){
+    res.status(500).json({error: err})
+}
+}
+
+
+
+
+

backend/src/repositories/topicRepository.js

@@ -0,0 +1,28 @@
+// repositories/useroRepository.js
+
+const Topic = require('../models/topic');
+
+class TopicRepository {
+  async getAll() {
+    return await Topic.find().exec()
+  }
+
+//   async getById(userId){
+//     return await Topic.findById(userId).exec()
+//   }
+
+//   async create(userInfo) {
+//     const user = new User(userInfo)
+//     return await user.save()
+//   }
+
+//   async deleteById(useId){
+//     return await User.findByIdAndDelete(useId)
+//   }
+
+//   async updateById(userId, userInfo){
+//     return await User.findByIdAndUpdate(userId,userInfo)
+//   }
+}
+
+module.exports = TopicRepository

backend/src/routes/materialRoutes.js

@@ -0,0 +1,36 @@
+const express = require('express');
+const router = express.Router();
+const jwt = require("jsonwebtoken");
+const topicController = require('../controllers/topicController');
+require('dotenv').config();
+
+
+const  verifyUser = (req,res,next) => {
+    const token = req.cookies.token
+    if(!token){
+      res.json({msg:"provide token!"})
+    }
+    else{
+      jwt.verify(token,process.env.SECURITY_KEY, (err,decoded)=>{
+        if(err){
+            try {
+                res.clearCookie('token')
+                res.json({ msg: "Done" })
+              }
+              catch (err) {
+                res.status(404).json({error:err})
+              }
+        }
+        else{
+          req.email = decoded.email
+          next()
+        }
+      })
+    }
+  }
+
+router.get('/topics',verifyUser,topicController.getAllTopics)
+
+
+
+module.exports = router;

backend/src/services/topicServices.js

@@ -0,0 +1,39 @@
+// services/topicService.js
+
+const TopicRepository = require('../repositories/topicRepository');
+
+
+class TopicService {
+  constructor() {
+    this.topicRepository = new TopicRepository()
+
+  }
+
+//   async createUser(userInfo, type){
+//     userInfo = this.userFactory.createUser(userInfo, type)
+//     return await this.userRepository.create(userInfo)
+//   }
+
+  async getAllTopics() {
+    return await this.topicRepository.getAll()
+  }
+
+//   async getUserById(userId){
+//     return await this.userRepository.getById(userId)
+//   }
+
+//   async deleteUserById(useId){
+//     return await this.userRepository.deleteUserById(useId)
+//   }
+
+//   async updatePasswordById(userId, newpassword){
+//     const updatedInfo = {
+//         hashedPassword: newpassword
+//     }
+//     return await this.userRepository.updateById(userId, updatedInfo)
+//   }
+
+
+}
+
+module.exports = TopicService;

webapp/src/assets/CSS/headingStyle.css

@@ -12,7 +12,7 @@ a{
 
 .hover-effect {
     transition: background-color, box-shadow 0.5s ease; 
-    background-color: rgb(225, 238, 254);
+    background-color: rgb(241, 246, 253);
   }
 .hover-effect:hover {
     background-color: rgb(233, 242, 255); 

webapp/src/components/HeadingComponent.js

@@ -13,12 +13,12 @@ function HeadingComponent({heading}) {
           style={{cursor:'pointer'}}
           data-bs-toggle="collapse" 
           onClick={()=>setToggle(prv=>!prv)}
-          data-bs-target={`#id${heading.id}`} 
+          data-bs-target={`#id${heading._id}`} 
           aria-expanded={toggle}
-          aria-controls={`id${heading.id}`}>
+          aria-controls={`id${heading._id}`}>
           <div className=' text-start row pe-2'>
             <h5 className=' col-11 CourseHeading'>
-              {heading.name}
+              {heading.no + ". "+ heading.title}
               <span className='instructionFamily badge ms-1  p-2 text-dark bg-success-subtle'>
                 Completed!
               </span>
@@ -27,7 +27,7 @@ function HeadingComponent({heading}) {
 
           </div>
         </div>
-        <div className="collapse" id={`id${heading.id}`}>
+        <div className="collapse" id={`id${heading._id}`}>
         <hr  className=' hrFirst mt-0 m-1'/>
           <div className='rounded-3 mb-3 p-3 pb-0 '>
             <div className='text-start mb-3 p-1'>
@@ -36,15 +36,12 @@ function HeadingComponent({heading}) {
                   <span class=" rounded-5 bg-success-subtle p-2 m-1 ">
                     <i class="bi  bi-book"></i>
                   </span>
-                  {heading.subHeadings[0]}
+                  {heading.videoUrl? `${heading.no}.1 Interactive Video and notes` :"" }
                 </Link>
               </h5>
               <span className='instructionFamily badge m-1 p-2 text-dark bg-success-subtle'>
                 Done: Complete the activity
               </span>
-              <span className='instructionFamily badge m-1 p-2 text-dark bg-warning-subtle'>
-                To unlock: Upgrade to premium
-              </span>
             </div>
             <div>
               <hr/>
@@ -55,12 +52,15 @@ function HeadingComponent({heading}) {
                   <span class=" rounded-5 bg-danger-subtle p-2 m-1 ">
                     <i class="bi  bi-pencil"></i>
                   </span>
-                  {heading.subHeadings[1]}
+                  {`${heading.no}.2 Quiz`}
                 </Link>
               </h5>
               <span className='instructionFamily badge m-1 p-2 text-dark bg-danger-subtle'>
                   To do: Complete the activity
               </span>
+              <span className='instructionFamily badge m-1 p-2 text-dark bg-warning-subtle'>
+                To unlock: Upgrade to premium
+              </span>
             </div>