Merge branch 'main' into redesign-ajai

ObieSource · Sep 14, 2023 · 57d1d97 · 57d1d97
2 parents e718dc9 + 392dc81
commit 57d1d97
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/navbar/Navbar.jsx b/src/components/navbar/Navbar.jsx
@@ -6,6 +6,20 @@ import { Link } from "react-router-dom";
 const Navbar = () => {
   const [toggleMenu, setToggleMenu] = useState(false);
 
+  const links = (
+    <>
+      <p>
+        <Link to="/resources">Resources</Link>
+      </p>
+      <p>
+        <Link to="/contact">Contact</Link>
+      </p>
+      <p>
+        <Link to="/about">About</Link>
+      </p>
+    </>
+  );
+
   return (
     <div className="obs__navbar ">
       <div className="obs__navbar-links">
@@ -16,17 +30,7 @@ const Navbar = () => {
             </Link>
           </p>
         </div>
-        <div className="obs__navbar-links_container">
-          <p>
-            <Link to="/resources">Resources</Link>
-          </p>
-          <p>
-            <Link to="/contact">Contact</Link>
-          </p>
-          <p>
-            <Link to="/about">About</Link>
-          </p>
-        </div>
+        <div className="obs__navbar-links_container">{links}</div>
       </div>
       <div className="obs__navbar-menu">
         {toggleMenu ? (
@@ -44,17 +48,7 @@ const Navbar = () => {
         )}
         {toggleMenu && (
           <div className="obs__navbar-menu_container">
-            <div className="obs__navbar-menu_container-links">
-              <p>
-                <Link to="/about">About</Link>
-              </p>
-              <p>
-                <Link to="/members">Members</Link>
-              </p>
-              <p>
-                <Link to="/contact">Contact</Link>
-              </p>
-            </div>
+            <div className="obs__navbar-menu_container-links">{links}</div>
           </div>
         )}
       </div>

diff --git a/src/members.js b/src/members.js
@@ -5,6 +5,7 @@ const members = [];
 // and put their contents into the members array.
 function importAll(memberRequirer) {
   const filenames = memberRequirer.keys();
+  console.log(filenames);
   filenames.forEach((filename) => {
     const data = memberRequirer(filename);
     if (typeof data !== "object") {
@@ -26,6 +27,6 @@ function importAll(memberRequirer) {
   });
 }
 // import all json files in the members directory (except for _template.json)
-importAll(require.context("./members", true, /^[^_].*\.json$/));
+importAll(require.context("./members", true, /\/[^_][^/]+\.json$/));
 
 export default members;
diff --git a/src/members/nelson.json b/src/members/nelson.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "../member.schema.json",
+  "name": "Ajai Nelson",
+  "status": "officer",
+  "pronouns": "he/him/his",
+  "class": "'25",
+  "socials": ["https://github.com/AjaiKN/", "https://ajai.dev/"],
+  "bio": "Hi, I'm Ajai! My hobbies include worrying that someone will ask me to write a description of myself.",
+  "projects": [
+    {
+      "name": "OPrestissimo",
+      "description": "A student-run alternative course catalog / schedule of classes for Oberlin. It was made 10 years ago by other students, and I'm the current maintainer. Let me know if you want to help!",
+      "website": "https://oprestissimo.com/"
+    }
+  ]
+}