Merge branch 'master' of https://github.com/Miodec/monkeytype

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) {

backend/api/routes/quote-ratings.js

@@ -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;

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;

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,

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;

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,

static/themes/_list.json

@@ -670,6 +670,11 @@
      "mainColor":"#6d44a6"
    }
   ,{
+    "name": "ryujinscales",
+    "bgColor": "#081426",
+    "mainColor": "#f17754"
+   }
+   ,{
     "name": "trackday",
     "bgColor": "#464d66",
     "mainColor": "#e0513e"

static/themes/ryujinscales.css

@@ -0,0 +1,13 @@
+:root {
+    --bg-color: #081426;
+    --main-color: #f17754;
+    --caret-color: #ef6d49;
+    --sub-color: #ffbc90;
+    --text-color: #ffe4bc;
+    --error-color: #ca4754;
+    --error-extra-color: #7e2a33;
+    --colorful-error-color: #ca4754;
+    --colorful-error-extra-color: #7e2a33;
+  }
+
+/* your theme has been added to the _list file and the textColor property is the theme's main color */