diff --git a/backend/api/routes/index.js b/backend/api/routes/index.js index 0057624c5..2f227245d 100644 --- a/backend/api/routes/index.js +++ b/backend/api/routes/index.js @@ -6,10 +6,9 @@ const API_ROUTE_MAP = { "/config": require("./config"), "/results": require("./result"), "/presets": require("./preset"), - "/quote-ratings": require("./quote-ratings"), "/psa": require("./psa"), "/leaderboard": require("./leaderboards"), - "/new-quotes": require("./new-quotes"), + "/quotes": require("./quotes"), }; function addApiRoutes(app) { diff --git a/backend/api/routes/quote-ratings.js b/backend/api/routes/quote-ratings.js deleted file mode 100644 index d883b4c4c..000000000 --- a/backend/api/routes/quote-ratings.js +++ /dev/null @@ -1,22 +0,0 @@ -const { authenticateRequest } = require("../../middlewares/auth"); -const { Router } = require("express"); -const QuoteRatingsController = require("../controllers/quote-ratings"); -const RateLimit = require("../../middlewares/rate-limit"); - -const router = Router(); - -router.get( - "/get", - RateLimit.quoteRatingsGet, - authenticateRequest, - QuoteRatingsController.getRating -); - -router.post( - "/submit", - RateLimit.quoteRatingsSubmit, - authenticateRequest, - QuoteRatingsController.submitRating -); - -module.exports = router; diff --git a/backend/api/routes/new-quotes.js b/backend/api/routes/quotes.js similarity index 54% rename from backend/api/routes/new-quotes.js rename to backend/api/routes/quotes.js index c6acfcfa0..93eb1d828 100644 --- a/backend/api/routes/new-quotes.js +++ b/backend/api/routes/quotes.js @@ -1,38 +1,51 @@ const { authenticateRequest } = require("../../middlewares/auth"); const { Router } = require("express"); const NewQuotesController = require("../controllers/new-quotes"); +const QuoteRatingsController = require("../controllers/quote-ratings"); const RateLimit = require("../../middlewares/rate-limit"); -const router = Router(); +const quotesRouter = Router(); -router.get( - "/get", +quotesRouter.get( + "/", RateLimit.newQuotesGet, authenticateRequest, NewQuotesController.getQuotes ); -router.post( - "/add", +quotesRouter.post( + "/", RateLimit.newQuotesAdd, authenticateRequest, NewQuotesController.addQuote ); -router.post( +quotesRouter.post( "/approve", RateLimit.newQuotesAction, authenticateRequest, NewQuotesController.approve ); -router.post( - "/refuse", +quotesRouter.post( + "/reject", RateLimit.newQuotesAction, authenticateRequest, NewQuotesController.refuse ); -//Add route to allow moderator to edit before submisison +quotesRouter.get( + "/rating", + RateLimit.quoteRatingsGet, + authenticateRequest, + QuoteRatingsController.getRating +); -module.exports = router; +quotesRouter.post( + "/rating", + RateLimit.quoteRatingsSubmit, + authenticateRequest, + QuoteRatingsController.submitRating +); + +module.exports = quotesRouter; diff --git a/src/js/popups/quote-approve-popup.js b/src/js/popups/quote-approve-popup.js index ae646b230..097a55a6c 100644 --- a/src/js/popups/quote-approve-popup.js +++ b/src/js/popups/quote-approve-popup.js @@ -50,7 +50,7 @@ async function getQuotes() { Loader.show(); let response; try { - response = await axiosInstance.get("/new-quotes/get"); + response = await axiosInstance.get("/quotes"); } catch (e) { Loader.hide(); let msg = e?.response?.data?.message ?? e.message; @@ -134,7 +134,7 @@ $(document).on("click", "#quoteApprovePopup .quote .approve", async (e) => { Loader.show(); let response; try { - response = await axiosInstance.post("/new-quotes/approve", { + response = await axiosInstance.post("/quotes/approve", { quoteId: dbid, }); } catch (e) { @@ -167,7 +167,7 @@ $(document).on("click", "#quoteApprovePopup .quote .refuse", async (e) => { Loader.show(); let response; try { - response = await axiosInstance.post("/new-quotes/refuse", { + response = await axiosInstance.post("/quotes/reject", { quoteId: dbid, }); } catch (e) { @@ -202,7 +202,7 @@ $(document).on("click", "#quoteApprovePopup .quote .edit", async (e) => { Loader.show(); let response; try { - response = await axiosInstance.post("/new-quotes/approve", { + response = await axiosInstance.post("/quotes/approve", { quoteId: dbid, editText, editSource, diff --git a/src/js/popups/quote-submit-popup.js b/src/js/popups/quote-submit-popup.js index 3dafcb8b0..c4c28cd20 100644 --- a/src/js/popups/quote-submit-popup.js +++ b/src/js/popups/quote-submit-popup.js @@ -40,7 +40,7 @@ async function submitQuote() { Loader.show(); let response; try { - response = await axiosInstance.post("/new-quotes/add", data); + response = await axiosInstance.post("/quotes", data); } catch (e) { Loader.hide(); let msg = e?.response?.data?.message ?? e.message; diff --git a/src/js/popups/rate-quote-popup.js b/src/js/popups/rate-quote-popup.js index ce66d229d..e68472441 100644 --- a/src/js/popups/rate-quote-popup.js +++ b/src/js/popups/rate-quote-popup.js @@ -21,7 +21,7 @@ export async function getQuoteStats(quote) { if (quote) currentQuote = quote; let response; try { - response = await axiosInstance.get("/quote-ratings/get", { + response = await axiosInstance.get("/quotes/rating", { params: { quoteId: currentQuote.id, language: currentQuote.language }, }); } catch (e) { @@ -132,7 +132,7 @@ async function submit() { hide(); let response; try { - response = await axiosInstance.post("/quote-ratings/submit", { + response = await axiosInstance.post("/quotes/rating", { quoteId: currentQuote.id, rating: rating, language: currentQuote.language,