WIP: Remove Handles from Graph

gatsby-config.js

@@ -19,13 +19,6 @@ const plugins = [
       name: `orgs`,
     },
   },
-  {
-    resolve: `gatsby-source-filesystem`,
-    options: {
-      path: `${__dirname}/_data/handles`,
-      name: `handles`,
-    },
-  },
   {
     resolve: `gatsby-source-filesystem`,
     options: {

netlify/functions/get-user.ts

@@ -1,4 +1,4 @@
-import { findUser } from "../util/user-utils";
+import { findUser, getUsers } from "../util/user-utils";
 
 exports.handler = async (event) => {
   // only allow GET
@@ -12,11 +12,17 @@ exports.handler = async (event) => {
 
   const userHandle = event.queryStringParameters.id;
   try {
-    const user = await findUser(userHandle);
+    let res;
+    if (userHandle === undefined) {
+      res = getUsers();
+    }
+    else {
+      res = await findUser(userHandle);
+    }
 
     return {
       statusCode: 200,
-      body: JSON.stringify(user),
+      body: JSON.stringify(res),
     };
   } catch (error) {
     return {

netlify/functions/handles.ts

@@ -0,0 +1,46 @@
+import fs, { readFileSync, readdir, readdirSync } from "fs";
+
+//need to set up the members portion of the handles data (i think the members field is for teams)
+//so my plan is to add a call to get the teams data here
+const getHandles = () => {
+    const allHandles : {handle : string, link : string, moralisId: string, image : string, members: string[],  }[] = [];
+    const data = readdirSync(`./_data/handles`);
+    data.forEach((file) => {
+           if(file.endsWith('.json')){
+               const buffer = readFileSync(`./_data/handles/${file}`);
+               const wardenFileData = JSON.parse(buffer.toString());
+               if (wardenFileData.image) {
+                const imagePath = wardenFileData.image.slice(2);
+                wardenFileData.imageUrl = `https://raw.githubusercontent.com/${process.env.GITHUB_REPO_OWNER}/${process.env.REPO}/${process.env.BRANCH_NAME}/_data/handles/${imagePath}`;
+              }
+                allHandles.push({...wardenFileData})
+           }
+       });
+
+    return allHandles;
+}
+
+exports.handler = async (event) => {
+    // only allow GET
+    if (event.httpMethod !== "GET") {
+      return {
+        statusCode: 405,
+        body: "Method not allowed",
+        headers: { Allow: "GET" },
+      };
+    }
+
+    try {
+      // handle
+     const allHandles = getHandles();
+      return {
+        statusCode: 200,
+        body: JSON.stringify(allHandles),
+      };
+    } catch (error) {
+      return {
+        statusCode: 500,
+        body: JSON.stringify({ error: error.toString(), details: error.stack }),
+      };
+    }
+  };

netlify/util/user-utils.ts

@@ -1,4 +1,4 @@
-import { readFileSync } from "fs";
+import { readFileSync, readdirSync } from "fs";
 import Moralis from "moralis-v1/node";
 import fetch from "node-fetch";
 import uniq from "lodash/uniq";
@@ -43,6 +43,51 @@ export async function findUser(userHandle) {
   }
 }
 
+export async function getUsers() {
+  const allHandles : {handle : string, link : string, moralisId: string, image : string}[] = [];
+  const data = readdirSync(`./_data/handles`);
+  // just return the objects?
+  // without members
+  data.forEach((file) => {
+    if(file.endsWith('.json')){
+        const buffer = readFileSync(`./_data/handles/${file}`);
+        const wardenFileData = JSON.parse(buffer.toString());
+        if (wardenFileData.image) {
+         const imagePath = wardenFileData.image.slice(2);
+         wardenFileData.imageUrl = `https://raw.githubusercontent.com/${process.env.GITHUB_REPO_OWNER}/${process.env.REPO}/${process.env.BRANCH_NAME}/_data/handles/${imagePath}`;
+       }
+       if(!wardenFileData.members){
+         allHandles.push({...wardenFileData})
+       }
+    }
+});
+return allHandles;
+}
+
+export async function getTeams() {
+  // just return the objects?
+  // with members
+  const teamHandles : {handle : string, link : string, moralisId: string, image : string}[] = [];
+  const data = readdirSync(`./_data/handles`);
+  // just return the objects?
+  // without members
+  data.forEach((file) => {
+    if(file.endsWith('.json')){
+        const buffer = readFileSync(`./_data/handles/${file}`);
+        const wardenFileData = JSON.parse(buffer.toString());
+        if (wardenFileData.image) {
+         const imagePath = wardenFileData.image.slice(2);
+         wardenFileData.imageUrl = `https://raw.githubusercontent.com/${process.env.GITHUB_REPO_OWNER}/${process.env.REPO}/${process.env.BRANCH_NAME}/_data/handles/${imagePath}`;
+       }
+       if(wardenFileData.members){
+         teamHandles.push({...wardenFileData})
+       }
+    }
+});
+
+return teamHandles;
+}
+
 export async function getUserTeams(username: string): Promise<string[]> {
   let teamHandles: string[] = [];
 

src/pages/judge-application.js

@@ -1,5 +1,4 @@
 import React, { useState } from "react";
-import { StaticQuery, graphql } from "gatsby";
 
 import Widgets from "../components/reporter/widgets/Widgets";
 import useUser from "../hooks/UserContext";
@@ -87,26 +86,6 @@ const FormStatus = {
   Error: "error",
 };
 
-const wardenListQuery = graphql`
-  query WardenList {
-    allHandlesJson(sort: { fields: handle, order: ASC }) {
-      edges {
-        node {
-          id
-          handle
-          image {
-            childImageSharp {
-              resize(width: 80) {
-                src
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
 const JudgeApplication = () => {
   const [state, setState] = useState(initialState);
   const [status, setStatus] = useState("unsubmitted");
@@ -168,113 +147,101 @@ const JudgeApplication = () => {
   };
 
   return (
-    <StaticQuery
-      query={wardenListQuery}
-      render={(data) => {
-        const wardens = data.allHandlesJson.edges.map(({ node }) => {
-          return { value: node.handle, image: node.image };
-        });
-        fields[0].options = wardens;
-
-        return (
-          <ProtectedPage
-            bodyClass="judge-application"
-            pageTitle="Judge Application | Code4rena"
-          >
-            <div className="wrapper-main">
-              {(status === FormStatus.Unsubmitted ||
-                status === FormStatus.Submitting) && (
-                <>
-                  <h1 className="page-header">Judge Application</h1>
-                  <form>
-                    <Widgets
-                      fields={fields}
-                      onChange={handleChange}
-                      fieldState={state}
-                    />{" "}
-                    {status === FormStatus.Error && (
-                      <div
-                        className="error-message"
-                        role="alert"
-                        aria-atomic="true"
-                      >
-                        <p>
-                          An error occurred; please try again. If you continue
-                          to receive this error, let us know in{" "}
-                          <a href="https://discord.gg/code4rena">Discord</a>.
-                          All fields are required.
-                        </p>
-                      </div>
-                    )}
-                    <button
-                      className="button cta-button"
-                      type="button"
-                      onClick={handleSubmit}
-                    >
-                      {status === FormStatus.Submitting
-                        ? "Submitting..."
-                        : "Apply to be a Judge"}
-                    </button>
-                  </form>
-                </>
-              )}
-
-              {status === FormStatus.Submitted && (
-                <div className="thank-you">
-                  <h1>Thanks for applying!</h1>
-                  <p>
-                    <strong>Here's what happens next:</strong>
-                  </p>
-                  <ol>
-                    <li>
-                      Judge applications are reviewed by the C4 judge selection
-                      committee, which includes top leaderboard wardens and past
-                      judges. The committee will review your application and
-                      give you a "yes" or "not yet".
-                    </li>
-                    <li>
-                      The review process begins after the application window
-                      closes, and we expect it to take about a week, depending
-                      on the number of applications the committee receives.
-                    </li>
-                    <li>
-                      You'll be contacted via DM to let you know if your
-                      application has been successful this time around.
-                    </li>
-                    <li>
-                      If you're accepted as a judge, an organizer will onboard
-                      you and get you set up to judge your first contest!
-                    </li>
-                  </ol>
+    <ProtectedPage
+      bodyClass="judge-application"
+      pageTitle="Judge Application | Code4rena"
+    >
+      <div className="wrapper-main">
+        {(status === FormStatus.Unsubmitted ||
+          status === FormStatus.Submitting) && (
+          <>
+            <h1 className="page-header">Judge Application</h1>
+            <form>
+              <Widgets
+                fields={fields}
+                onChange={handleChange}
+                fieldState={state}
+              />{" "}
+              {status === FormStatus.Error && (
+                <div
+                  className="error-message"
+                  role="alert"
+                  aria-atomic="true"
+                >
                   <p>
-                    In the meantime, if you have questions, feel free to reach
-                    out to us in the C4 Discord, or have a closer look at the{" "}
-                    <a href="https://docs.code4rena.com/roles/judges/how-to-judge-a-contest">
-                      How to judge a contest
-                    </a>{" "}
-                    section in the Code4rena docs.
+                    An error occurred; please try again. If you continue
+                    to receive this error, let us know in{" "}
+                    <a href="https://discord.gg/code4rena">Discord</a>.
+                    All fields are required.
                   </p>
                 </div>
               )}
-              {status === FormStatus.Error && (
-                <div className="centered-text">
-                  <h1>Whoops!</h1>
-                  <p>An error occurred while processing your application.</p>
-                  {errorMessage && <p>{errorMessage}</p>}
-                  <button
-                    className="button cta-button"
-                    type="button"
-                    onClick={() => setStatus(FormStatus.Unsubmitted)}
-                  >
-                    Try again
-                  </button>
-                </div>
-              )}
-            </div>
-          </ProtectedPage>
-        );
-      }}
-    />
+              <button
+                className="button cta-button"
+                type="button"
+                onClick={handleSubmit}
+              >
+                {status === FormStatus.Submitting
+                  ? "Submitting..."
+                  : "Apply to be a Judge"}
+              </button>
+            </form>
+          </>
+        )}
+
+        {status === FormStatus.Submitted && (
+          <div className="thank-you">
+            <h1>Thanks for applying!</h1>
+            <p>
+              <strong>Here's what happens next:</strong>
+            </p>
+            <ol>
+              <li>
+                Judge applications are reviewed by the C4 judge selection
+                committee, which includes top leaderboard wardens and past
+                judges. The committee will review your application and
+                give you a "yes" or "not yet".
+              </li>
+              <li>
+                The review process begins after the application window
+                closes, and we expect it to take about a week, depending
+                on the number of applications the committee receives.
+              </li>
+              <li>
+                You'll be contacted via DM to let you know if your
+                application has been successful this time around.
+              </li>
+              <li>
+                If you're accepted as a judge, an organizer will onboard
+                you and get you set up to judge your first contest!
+              </li>
+            </ol>
+            <p>
+              In the meantime, if you have questions, feel free to reach
+              out to us in the C4 Discord, or have a closer look at the{" "}
+              <a href="https://docs.code4rena.com/roles/judges/how-to-judge-a-contest">
+                How to judge a contest
+              </a>{" "}
+              section in the Code4rena docs.
+            </p>
+          </div>
+        )}
+        {status === FormStatus.Error && (
+          <div className="centered-text">
+            <h1>Whoops!</h1>
+            <p>An error occurred while processing your application.</p>
+            {errorMessage && <p>{errorMessage}</p>}
+            <button
+              className="button cta-button"
+              type="button"
+              onClick={() => setStatus(FormStatus.Unsubmitted)}
+            >
+              Try again
+            </button>
+          </div>
+        )}
+      </div>
+    </ProtectedPage>
   );
 };