feat(shop): Add enchantment search and display to shop directory

api/internal_redirect/announcement.js

@@ -1,4 +1,4 @@
-import { hasPermission, postAPIRequest } from "../common";
+import { hasPermission, postAPIRequest } from "../common.js";
 
 export default function announcementRedirectRoute(app, config, lang) {
   const baseEndpoint = "/redirect/announcement";

api/internal_redirect/application.js

@@ -1,7 +1,7 @@
-import { hasPermission, postAPIRequest } from "../common";
+import { hasPermission, postAPIRequest } from "../common.js";
 
 export default function applicationRedirectRoute(app, config, lang) {
-  const baseEndpoint = "/redirect/application";
+  const baseEndpoint = "/redirect/applications";
 
   app.post(baseEndpoint + "/create", async function (req, res) {
     if (!hasPermission("zander.web.application", req, res)) return;

api/internal_redirect/bridge.js

@@ -0,0 +1,23 @@
+import { hasPermission, postAPIRequest } from "../common.js";
+
+export default function bridgeRedirectRoute(app, config, lang) {
+  const baseEndpoint = "/redirect/bridge";
+
+  app.post(baseEndpoint + "/command/add", async function (req, res) {
+    if (!hasPermission("zander.web.bridge", req, res)) return;
+
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/bridge/command/add`,
+      req.body,
+      `${process.env.siteAddress}/dashboard/bridge`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/dashboard/bridge`);
+
+    return res;
+  });
+}

api/internal_redirect/index.js

@@ -1,11 +1,17 @@
-import applicationRedirectRoute from "./application";
-import serverRedirectRoute from "./server";
-import webRedirectRoute from "./web";
-import announcementsRedirectRoute from "./announcement";
+import applicationRedirectRoute from "./application.js";
+import serverRedirectRoute from "./server.js";
+import webRedirectRoute from "./web.js";
+import announcementsRedirectRoute from "./announcement.js";
+import reportRedirectRoute from "./report.js";
+import vaultRedirectRoute from "./vault.js";
+import bridgeRedirectRoute from "./bridge.js";
 
 export default (app, config, lang) => {
   applicationRedirectRoute(app, config, lang);
   serverRedirectRoute(app, config, lang);
+  reportRedirectRoute(app, config, lang);
   webRedirectRoute(app, config, lang);
   announcementsRedirectRoute(app, config, lang);
+  vaultRedirectRoute(app, config, lang);
+  bridgeRedirectRoute(app, config, lang);
 };

api/internal_redirect/report.js

@@ -0,0 +1,20 @@
+import { hasPermission, postAPIRequest } from "../common.js";
+
+export default function reportRedirectRoute(app, config, lang) {
+  const baseEndpoint = "/redirect/report";
+
+  app.post(baseEndpoint + "/create", async function (req, res) {
+    req.body.reporterUser = req.session.user.username;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/report/create`,
+      req.body,
+      `${process.env.siteAddress}/report`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/`);
+
+    return res;
+  });
+}

api/internal_redirect/server.js

@@ -1,4 +1,4 @@
-import { hasPermission, postAPIRequest } from "../common";
+import { hasPermission, postAPIRequest } from "../common.js";
 
 export default function serverRedirectRoute(app, config, lang) {
   const baseEndpoint = "/redirect/server";

api/internal_redirect/vault.js

@@ -0,0 +1,59 @@
+import { hasPermission, postAPIRequest } from "../common.js";
+
+export default function vaultRedirectRoute(app, config, lang) {
+  const baseEndpoint = "/redirect/vault";
+
+  app.post(baseEndpoint + "/create", async function (req, res) {
+    if (!hasPermission("zander.web.vault", req, res)) return;
+
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/vault/create`,
+      req.body,
+      `${process.env.siteAddress}/dashboard/vault`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/dashboard/vault`);
+
+    return res;
+  });
+
+  app.post(baseEndpoint + "/edit", async function (req, res) {
+    if (!hasPermission("zander.web.vault", req, res)) return;
+
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/vault/edit`,
+      req.body,
+      `${process.env.siteAddress}/dashboard/vault`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/dashboard/vault`);
+
+    return res;
+  });
+
+  app.post(baseEndpoint + "/delete", async function (req, res) {
+    if (!hasPermission("zander.web.vault", req, res)) return;
+
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/vault/delete`,
+      req.body,
+      `${process.env.siteAddress}/dashboard/vault`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/dashboard/vault`);
+
+    return res;
+  });
+}

api/internal_redirect/web.js

@@ -1,4 +1,4 @@
-import { postAPIRequest } from "../common";
+import { postAPIRequest } from "../common.js";
 
 export default function webRedirectRoute(app, config, lang) {
   const baseEndpoint = "/redirect/web";

api/routes/announcement.js

@@ -1,12 +1,17 @@
-import { isFeatureEnabled, required, optional, generateLog } from "../common";
+import {
+  isFeatureEnabled,
+  required,
+  optional,
+  generateLog,
+} from "../common.js";
 
 export default function announcementApiRoute(app, config, db, features, lang) {
   const baseEndpoint = "/api/announcement";
 
   app.get(baseEndpoint + "/get", async function (req, res) {
     isFeatureEnabled(features.announcements, res, lang);
-    const announcementId = optional(req.query, "id");
+    const announcementId = optional(req.query, "announcementId");
     const announcementType = optional(req.query, "announcementType");
     const enabled = optional(req.query, "enabled");
 
     try {
@@ -26,6 +31,8 @@
             });
           }
 
+          console.log(results);
+
           res.send({
             success: true,
             data: results,
@@ -34,7 +41,7 @@
       }
 
       // Get Announcement by specific ID.
-      if (req.query === "announcementId") {
+      if (announcementId) {
         let dbQuery = `SELECT * FROM announcements WHERE announcementId=${announcementId};`;
         getAnnouncements(dbQuery);
         return res;
@@ -157,14 +164,14 @@
     try {
       db.query(
         `
-                UPDATE announcements 
-                    SET 
-                        enabled=?,
-                        announcementType=?,
-                        body=?,
-                        colourMessageFormat=?,
-                        link=?
-                    WHERE announcementId=?;`,
+          UPDATE announcements 
+              SET 
+                  enabled=?,
+                  announcementType=?,
+                  body=?,
+                  colourMessageFormat=?,
+                  link=?
+              WHERE announcementId=?;`,
         [
           enabled,
           announcementType,
@@ -208,6 +215,7 @@
   app.post(baseEndpoint + "/delete", async function (req, res) {
     isFeatureEnabled(features.announcements, res, lang);
 
+    const actioningUser = required(req.body, "actioningUser", res);
     const announcementId = required(req.body, "announcementId", res);
 
     try {

api/routes/application.js

@@ -1,19 +1,24 @@
-import { isFeatureEnabled, required, optional, generateLog } from "../common";
+import {
+  isFeatureEnabled,
+  required,
+  optional,
+  generateLog,
+} from "../common.js";
 
 export default function applicationApiRoute(app, config, db, features, lang) {
   const baseEndpoint = "/api/application";
 
   app.get(baseEndpoint + "/get", async function (req, res) {
     isFeatureEnabled(features.applications, res, lang);
-    const applicationId = optional(req.query, "applicationId");
+    const applicationId = optional(req.query, "id");
 
     try {
       function getApplications(dbQuery) {
         db.query(dbQuery, function (error, results, fields) {
           console.log(results);
 
           if (error) {
-            res.send({
+            return res.send({
               success: false,
               message: `${error}`,
             });
@@ -37,6 +42,7 @@
       if (applicationId) {
         let dbQuery = `SELECT * FROM applications WHERE applicationId=${applicationId};`;
         getApplications(dbQuery);
+        return; // Add return statement here
       }
 
       // Return all Servers by default