diff --git a/controllers/mediaController.js b/controllers/mediaController.js
index 122ec9c..a917b43 100644
--- a/controllers/mediaController.js
+++ b/controllers/mediaController.js
@@ -1,24 +1,45 @@
 const Media = require("../models/mediaModel");
-const { internalServerError } = require("../utils/errorHandler");
+const { internalServerError, handleError } = require("../utils/errorHandler");
 
 const uploadMedia = async (request, response) => {
-  const { title, description, duration, url } = request.body;
+  const { mediaUrl, title } = request.body;
 
   try {
-
-    // check if the required fields are being sent
-
-    
-
+    if (!mediaUrl) {
+      return response
+        .status(422)
+        .json(
+          handleError(
+            422,
+            "Media URL is Required",
+            "the client did not send the media url"
+          )
+        );
+    }
+
+    await Media.create({ mediaUrl, title });
+
+    response
+      .status(200)
+      .json({ status: true, message: "Media Uploaded Successfully" });
   } catch (error) {
     console.log(error);
     response.status(500).json(internalServerError(error));
   }
 };
 
+const getAllMedia = async (request, response) => {
+  try {
+    const videos = await Media.find().sort({ createdAt: -1 });
 
-
+    response.status(200).json({ status: true, videos });
+  } catch (error) {
+    console.log(error);
+    response.status(500).json(internalServerError(error));
+  }
+};
 
 module.exports = {
-    uploadMedia
-}
\ No newline at end of file
+  uploadMedia,
+  getAllMedia,
+};
diff --git a/controllers/merchantController.js b/controllers/merchantController.js
index 00f190c..8df97e0 100644
--- a/controllers/merchantController.js
+++ b/controllers/merchantController.js
@@ -188,7 +188,7 @@ const loginMerchant = async (request, response) => {
 
     response
       .status(200)
-      .json({ status: true, message: "Login Successful", token });
+      .json({ status: true, message: "Login Successful", token, merchant });
   } catch (error) {
     console.log(error);
     response.status(500).json(internalServerError(error));
diff --git a/controllers/userAuthController.js b/controllers/userAuthController.js
index 828719a..a69ae9e 100644
--- a/controllers/userAuthController.js
+++ b/controllers/userAuthController.js
@@ -177,7 +177,7 @@ const login = async (request, response) => {
 
     response
       .status(200)
-      .json({ status: true, message: "Login Successful", token });
+      .json({ status: true, message: "Login Successful", token, user });
   } catch (error) {
     console.log(error);
     response.status(500).json(internalServerError(error));
diff --git a/index.js b/index.js
index d26dd61..97dec09 100644
--- a/index.js
+++ b/index.js
@@ -33,6 +33,7 @@ const reviewRoutes = require("./routes/review.router");
 const adminAuthRoutes = require("./routes/adminRoutes/adminAuthRoutes");
 const adminUserManagementRoutes = require("./routes/adminRoutes/usersRouter");
 const adminMerchantRoutes = require("./routes/adminRoutes/merchantsRoutes");
+const mediaRoutes = require("./routes/adminRoutes/mediaRoutes");
 
 const authenticateSocket = require("./middlewares/authenticateSocket");
 
@@ -51,6 +52,11 @@ app.use("/api/v1/review", reviewRoutes);
 app.use("/api/v1/admin/auth", adminAuthRoutes);
 app.use("/api/v1/admin/user_management", adminUserManagementRoutes);
 app.use("/api/v1/admin/merchant_management", adminMerchantRoutes);
+app.use("/api/v1/admin/media", mediaRoutes);
+
+app.get("/test", (req, res) => {
+  res.status(200).json({ message: "Okay" });
+});
 
 // Messaging Related Models
 const User = require("./models/userModel");
diff --git a/models/mediaModel.js b/models/mediaModel.js
index 611b5cb..915f414 100644
--- a/models/mediaModel.js
+++ b/models/mediaModel.js
@@ -3,18 +3,7 @@ const Schema = mongoose.Schema;
 
 const mediaSchema = new Schema(
   {
-    title: {
-      type: String,
-      required: true,
-    },
-    description: {
-      type: String,
-      required: true,
-    },
-    previewUrl: String,
-    duration: {
-      type: String,
-    },
+    title: String,
     mediaUrl: {
       type: String,
       required: true,
diff --git a/public/chat.html b/public/chat.html
index 7160caa..d1df333 100644
--- a/public/chat.html
+++ b/public/chat.html
@@ -79,21 +79,21 @@
       </div>
     </div>
 
-    <!-- <div class="container">
+    <div class="container">
       <div class="input-group">
         <label for="token">Token:</label>
         <input
-          value="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2M2ExNWJmZTIwOWQxZGFmZmM5ODljOCIsImlhdCI6MTcxNTA4MjY4N30.U128tJ7QrMe-tEZRQbrTX-Ctqb9CuT5QIETYPwf8e7Y"
+          value="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2NmQ5N2Y0NmEyYTRlOGUyYmVhNzk4ZCIsImlhdCI6MTcxODQ1ODM1Nn0.aWw1gnowa28_65YWs4orG5sv0UI4sFC9k1c1JqabMRc"
           type="text"
           id="token"
         />
       </div>
       <div class="input-group">
         <label for="hash">Hash:</label>
-        <input value="a7db40decd" type="text" id="hash" />
+        <input value="dbc2e3ef2a" type="text" id="hash" />
       </div>
       <button onclick="saveCredentials()">Save Credentials</button>
-    </div> -->
+    </div>
 
     <script src="./socket-io.js"></script>
     <script>
@@ -154,6 +154,9 @@
       socket.on("connect", () => {
         console.log("Connected to server");
       });
+      socket.on("connect_error", (err) => {
+        console.log("Error",err);
+      });
 
       socket.emit("conversation-opened", {
         conversationId: urlparams.get("id"),
diff --git a/routes/adminRoutes/mediaRoutes.js b/routes/adminRoutes/mediaRoutes.js
new file mode 100644
index 0000000..8c80673
--- /dev/null
+++ b/routes/adminRoutes/mediaRoutes.js
@@ -0,0 +1,12 @@
+const express = require("express");
+const authenticateAdmin = require("../../middlewares/adminAuthMiddleware");
+const {
+  uploadMedia,
+  getAllMedia,
+} = require("../../controllers/mediaController");
+const router = express.Router();
+
+router.post("/upload", authenticateAdmin, uploadMedia);
+router.post("/get/all", authenticateAdmin, getAllMedia);
+
+module.exports = router;