diff --git a/app.js b/app.js index 4b01db6..c8ce50c 100644 --- a/app.js +++ b/app.js @@ -82,6 +82,7 @@ app.use("/api/banner", bannerRoute); // Content app.use("/api/content", ContentRoute); // User Address +app.use("/api/user-address", UserAddressRoute); app.use("/api/shipping/address", ShippingAddressRoute); //Order app.use("/api/order", orderRoute); diff --git a/resources/ContactRequests/ContactRequestRoute.js b/resources/ContactRequests/ContactRequestRoute.js index 1b986f3..a718dd0 100644 --- a/resources/ContactRequests/ContactRequestRoute.js +++ b/resources/ContactRequests/ContactRequestRoute.js @@ -1,21 +1,15 @@ - - - -import express from 'express' +import express from "express"; import { isAuthenticatedUser, authorizeRoles } from "../../middlewares/auth.js"; -import { AddNewContactRequest, FindAllContactRequest } from './ContactRequestsController.js'; - -const router = express.Router() - -router.route("/new").post(isAuthenticatedUser, authorizeRoles("admin"), AddNewContactRequest) -router.route("/getAll").get(isAuthenticatedUser, authorizeRoles("admin"), FindAllContactRequest) - - - +import { + AddNewContactRequest, + FindAllContactRequest, +} from "./ContactRequestsController.js"; +const router = express.Router(); +router.route("/new").post(AddNewContactRequest); +router.route("/getAll").get(FindAllContactRequest); // router.route("/product/getAll/").get(getAllProduct) -export default router - +export default router; diff --git a/resources/ContactRequests/ContactRequestsController.js b/resources/ContactRequests/ContactRequestsController.js index d523ef0..9c55500 100644 --- a/resources/ContactRequests/ContactRequestsController.js +++ b/resources/ContactRequests/ContactRequestsController.js @@ -1,50 +1,46 @@ - -import { ContactRequest } from './ContactRequestsModel.js' +import { ContactRequest } from "./ContactRequestsModel.js"; export const AddNewContactRequest = async (req, res) => { - try { - if (!req?.user) return res.status(400).json({ message: "please login !" }); + try { + // if (!req?.user) return res.status(400).json({ message: "please login !" }); - const contactRequest = await ContactRequest.create(req.body); + const contactRequest = await ContactRequest.create(req.body); - res.status(201).json({ - success: true, - contactRequest, - message: 'ContactRequest Added', - }); - - } catch (error) { - res.status(500).json({ - success: false, - message: error.message ? error.message : 'Something went Wrong', - }); - } -} + res.status(201).json({ + success: true, + contactRequest, + message: "ContactRequest Added", + }); + } catch (error) { + res.status(500).json({ + success: false, + message: error.message ? error.message : "Something went Wrong", + }); + } +}; export const FindAllContactRequest = async (req, res) => { - try { - if (!req?.user) return res.status(400).json({ message: "please login !" }); - // console.log(req?.user) + try { + // if (!req?.user) return res.status(400).json({ message: "please login !" }); + // console.log(req?.user) + const contactRequest = await ContactRequest.find().sort({ createdAt: -1 }); + if (contactRequest) { + return res.status(200).json({ + success: true, + contactRequest, + message: "Fetched All ContactRequest", + }); + } else { + return res.status(404).json({ + success: true, - const contactRequest = await ContactRequest.find().sort({ createdAt: -1 }); - if (contactRequest) { - return res.status(200).json({ - success: true, - contactRequest, - message: 'Fetched All ContactRequest', - }); - } - else { - return res.status(404).json({ - success: true, - - message: 'No ContactRequest till Now', - }); - } - } catch (error) { - res.status(500).json({ - success: false, - message: error.message ? error.message : 'Something went Wrong', - }); + message: "No ContactRequest till Now", + }); } -} \ No newline at end of file + } catch (error) { + res.status(500).json({ + success: false, + message: error.message ? error.message : "Something went Wrong", + }); + } +}; diff --git a/resources/userAddress/useAddressRoute.js b/resources/userAddress/useAddressRoute.js index 177579b..166aed6 100644 --- a/resources/userAddress/useAddressRoute.js +++ b/resources/userAddress/useAddressRoute.js @@ -13,12 +13,8 @@ const router = express.Router(); router .route("/addAddress") .post(isAuthenticatedUser, authorizeRoles("admin"), addUserAddress); -router - .route("/getAddressess") - .get(isAuthenticatedUser, authorizeRoles("admin"), getUserAddress); -router - .route("/getOneAddress/:_id") - .get(isAuthenticatedUser, authorizeRoles("admin"), getOneAddress); +router.route("/getAddressess").get(getUserAddress); +router.route("/getOneAddress/:_id").get(getOneAddress); router .route("/updateAddress/:_id") .patch(isAuthenticatedUser, authorizeRoles("admin"), updateAddress); diff --git a/resources/userAddress/userAddressController.js b/resources/userAddress/userAddressController.js index 713b104..fb82933 100644 --- a/resources/userAddress/userAddressController.js +++ b/resources/userAddress/userAddressController.js @@ -37,9 +37,9 @@ export const addUserAddress = async (req, res) => { export const getUserAddress = async (req, res) => { try { - if (!req?.user) return res.status(400).json({ message: "please login !" }); + // if (!req?.user) return res.status(400).json({ message: "please login !" }); const userAddress = await UserAddressModel.find({ - addedBy: req.user._id, + // addedBy: req.user._id, }).sort({ createdAt: -1, });