misc

tfredh · tfredh · commit 4511b002ee42 · 2022-10-09T16:34:46.000-04:00
diff --git a/cache/cache.js b/cache/cache.js
diff --git a/components/ImageInfoLayout.jsx b/components/ImageInfoLayout.jsx
@@ -9,7 +9,6 @@ import { media } from "../utils";
 import { baseTheme } from "../theme";
 
 /**
- *
  * Student Resource Component
  * @prop {string} titleText - resource title
  * @prop {string} descriptionText - resource description
diff --git a/pages/_app.jsx b/pages/_app.jsx
@@ -24,11 +24,13 @@ function MyApp({ Component, pageProps }) {
       <Head>
         <meta httpEquiv="Content-Type" content="text/html; charset=utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
+
         <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
         <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
         <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
         <link rel="manifest" href="/site.webmanifest" />
         <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#fec63d" />
+
         <meta name="msapplication-TileColor" content="#0d1d3f" />
         <meta name="theme-color" content="#0d1d3f" />
         <meta property="og:type" content="website" />
@@ -40,6 +42,7 @@ function MyApp({ Component, pageProps }) {
         />
         <meta property="og:image" content="https://pumprofessionals.org/meta.png" />
       </Head>
+
       <ThemeProvider theme={baseTheme}>
         <Component {...pageProps} />
         <GlobalStyle />
diff --git a/pages/about.jsx b/pages/about.jsx
@@ -195,6 +195,7 @@ export default function About() {
         <title>PuMP | About Us</title>
         <meta name="description" content="Get to know the PuMP family" />
       </Head>
+      
       <PageLayout>
         <Title
           title="About Us"
diff --git a/pages/api/blog.js b/pages/api/blog.js
@@ -8,6 +8,7 @@ import { posts } from "../../cache/cache";
     - tags = tags to filter
 */
 export default async (req, res) => {
+  // console.log("tt", req.query);
   let results;
   try {
     results = await prisma.post.findMany();
@@ -20,18 +21,18 @@ export default async (req, res) => {
       post.title.toLowerCase().includes(req.query.search.toLowerCase())
     );
   }
+
+  const selectedTags = req.query.tags.split(",");
+  if (selectedTags.length) {
+    results = results.filter((post) =>
+      post.tags.some((tag) => selectedTags.includes(tag))
+    );
+  }
+
   let allResults = [];
   let filteredResults;
-  if (req.query.tags) {
-    for (let tag of req.query.tags.split(",")) {
-      filteredResults = results.filter((post) => post.tags.includes(tag));
-      allResults.push(...filteredResults);
-    }
-    results = allResults;
-  }
-  allResults = [];
   if (req.query.release) {
-    for (let release of req.query.release.split(",")) {
+    for (const release of req.query.release.split(",")) {
       filteredResults = results.filter((post) => post.releaseBatch === release);
       allResults.push(...filteredResults);
     }
diff --git a/pages/index.jsx b/pages/index.jsx
@@ -45,6 +45,7 @@ export default function Home() {
       </Notification> */}
       <PageLayout>
         <TopSection />
+        
         <WhatsHappening />
         <Video
           embedId="f5jsJWl5WS0"
diff --git a/pages/resources.jsx b/pages/resources.jsx
@@ -13,6 +13,7 @@ export default function Resources({ ...props }) {
           content="Learn more about our resources including University Admissions Server, blog, and opportunities"
         />
       </Head>
+      
       <PageLayout>
         <Title title="Student Resources" />
         <ResourcesSection />
diff --git a/pages/resources/blog.jsx b/pages/resources/blog.jsx
@@ -29,12 +29,15 @@ export default function Blog({ blogs, ...props }) {
   const [releaseBatch, setReleaseBatch] = useState("");
   const [blogPosts, setBlogPosts] = useState([]);
   const [isLoading, setIsLoading] = useState(true);
+
   useEffect(() => {
+    // console.log(blogs);
     setBlogPosts(blogs);
     setIsLoading(false);
   }, []);
 
   const handleChange = (searchValue, tagValues, releaseValues) => {
+    // console.log([searchValue, tagValues, releaseValues]);
     setIsLoading(true);
     axios
       .get(
@@ -63,6 +66,7 @@ export default function Blog({ blogs, ...props }) {
           content="Read advice about interview dos and don'ts, medical school tips, careers in health sciences, and much more. All under one roof!"
         />
       </Head>
+
       <PageLayout>
         <ToastContainer />
         <div {...props}>
@@ -76,6 +80,7 @@ export default function Blog({ blogs, ...props }) {
               medical school tips, time management skills, careers in 
               health sciences, and much more. All under one roof!"
           />
+
           <InputsWrapper>
             <SInput
               placeholder="Search by Title"
@@ -85,6 +90,7 @@ export default function Blog({ blogs, ...props }) {
               onChange={handleSearch}
             />
           </InputsWrapper>
+
           <BottomWrapper>
             <FilterWrapper>
               <FilterTitle size={baseTheme.size.h2} bold="true">
diff --git a/pages/resources/blog/[slug].jsx b/pages/resources/blog/[slug].jsx
@@ -37,7 +37,6 @@ const BlogsPage = ({ source, frontMatter }) => {
     </div>
   );
 };
-
 export default BlogsPage;
 
 export const getStaticProps = async ({ params }) => {
diff --git a/pages/scholarship.jsx b/pages/scholarship.jsx
@@ -15,7 +15,7 @@ export default function Resources({ ...props }) {
         <iframe
           id="JotFormIFrame-221947443957064"
           title="PuMP Foundation Scholarship"
-          onLoad="window.parent.scrollTo(0,0)"
+          onLoad={() => window.parent.scrollTo(0, 0)}
           allowTransparency="true"
           allowFullScreen="true"
           allow="geolocation; microphone; camera"
diff --git a/sections/Navbar.jsx b/sections/Navbar.jsx
@@ -12,10 +12,19 @@ import { baseTheme } from "../theme";
 import { media } from "../utils";
 
 {
-  /* TODO: Refactor into object? paths must be same as linked pages*/
+  /* @TODO: Refactor into object? paths must be same as linked pages */
+  // done i think?
 }
+
+// map array to preserve order
 const RESOURCES = ["Home", "About Us", "Resources", "Events", "Community"];
-const PATHS = ["", "about", "resources", "events", "community"];
+const PATH_NAMES = {
+  Home: "",
+  "About Us": "about",
+  Resources: "resources",
+  Events: "events",
+  Community: "community",
+};
 
 export const Navbar = ({
   backgroundColor = baseTheme.colors.navy,
@@ -24,7 +33,9 @@ export const Navbar = ({
   ...props
 }) => {
   const [isHidden, setIsHidden] = useState(false);
+
   const handleClick = () => setIsHidden(!isHidden);
+
   return (
     <NavbarContainer
       backgroundColor={backgroundColor}
@@ -38,32 +49,22 @@ export const Navbar = ({
             <PumpImg src={PumpLogo} alt="Pump Logo" width={80} height={50} />
           </a>
         </Link>
-        {isHidden ? (
-          <Icon
-            src={Close}
-            alt="Cross icon"
-            width={30}
-            height={30}
-            onClick={handleClick}
-          />
-        ) : (
-          <Icon
-            src={Open}
-            alt="Hamburger icon"
-            width={30}
-            height={30}
-            onClick={handleClick}
-          />
-        )}
+        <Icon
+          src={isHidden ? Close : Open}
+          alt={isHidden ? "Cross icon" : "Hamburger icon"}
+          width={30}
+          height={30}
+          onClick={handleClick}
+        />
       </LogoContainer>
       <Container isHidden={isHidden}>
         <ResourcesContainer>
-          {RESOURCES.map((resource, index) => (
+          {RESOURCES.map((resource) => (
             <Resource key={resource}>
-              <Link href={`/${PATHS[index]}`}>
+              <Link href={`/${PATH_NAMES[resource]}`}>
                 <ResourceLink
                   fontColor={fontColor}
-                  isSelected={path == PATHS[index]}
+                  isSelected={path === PATH_NAMES[resource]}
                 >
                   {resource}
                 </ResourceLink>
diff --git a/sections/home/TopSection.jsx b/sections/home/TopSection.jsx
@@ -25,7 +25,7 @@ export const TopSection = ({ ...props }) => (
     <SecondColumn>
       <Graphic
         src={MainGraphic}
-        alt="Title graphic - Doctor with stethoscope"
+        alt="Title graphic - 4 pictures of the pump team"
         height={450}
         width={450}
       />
diff --git a/sections/resources/ResourcesSection.jsx b/sections/resources/ResourcesSection.jsx
@@ -6,62 +6,63 @@ import UASLogo from "../../public/resources/uas-logo.png";
 import { baseTheme } from "../../theme";
 
 /* TODO-2022: Edit Resources to fit SectionWrapper */
-export const ResourcesSection = () => {
-  const resources = [
-    {
-      titleText: "PuMP Direct",
-      descriptionText: `Browse and filter through our database of volunteering, research, and leadership opportunities near you.`,
-      buttons: [
-        {
-          color: "yellow",
-          text: "Browse Opportunities",
-          link: "/resources/opportunities",
-        },
-      ],
-      graphic: PuMPDirect,
-      isGraphicLeft: false,
-    },
-    {
-      titleText: "University Admissions Server (UAS)",
-      descriptionText: `Join a Discord comunity for high school and
-        undergraduate students to learn more about diverse medical university
-        programs.`,
-      buttons: [
-        {
-          color: "yellow",
-          text: "Join our community of 900+ students",
-          link: "https://discord.com/invite/vpyF7nCtkm",
-          external: true,
-        },
-        {
-          color: "yellow",
-          text: "Learn more",
-          link: "/resources/uas",
-        },
-      ],
-      graphic: UASLogo,
-      graphicWidth: 300,
-      graphicHeight: 300,
-    },
-    {
-      titleText: "PuMP Digest",
-      descriptionText: `Read advice about interview dos and don'ts, medical
-        school tips, time management skills, careers in health sciences, and much
-        more. All under one roof!`,
-      buttons: [
-        {
-          color: "yellow",
-          text: "Read Blog",
-          link: "/resources/blog",
-        },
-      ],
-      graphic: PuMPDigest,
-      isGraphicLeft: false,
-      graphicWidth: 250,
-      graphicHeight: 250,
-    },
-  ];
 
+const resources = [
+  {
+    titleText: "PuMP Direct",
+    descriptionText: `Browse and filter through our database of volunteering, research, and leadership opportunities near you.`,
+    buttons: [
+      {
+        color: "yellow",
+        text: "Browse Opportunities",
+        link: "/resources/opportunities",
+      },
+    ],
+    graphic: PuMPDirect,
+    isGraphicLeft: false,
+  },
+  {
+    titleText: "University Admissions Server (UAS)",
+    descriptionText: `Join a Discord comunity for high school and
+      undergraduate students to learn more about diverse medical university
+      programs.`,
+    buttons: [
+      {
+        color: "yellow",
+        text: "Join our community of 900+ students",
+        link: "https://discord.com/invite/vpyF7nCtkm",
+        external: true,
+      },
+      {
+        color: "yellow",
+        text: "Learn more",
+        link: "/resources/uas",
+      },
+    ],
+    graphic: UASLogo,
+    graphicWidth: 300,
+    graphicHeight: 300,
+  },
+  {
+    titleText: "PuMP Digest",
+    descriptionText: `Read advice about interview dos and don'ts, medical
+      school tips, time management skills, careers in health sciences, and much
+      more. All under one roof!`,
+    buttons: [
+      {
+        color: "yellow",
+        text: "Read Blog",
+        link: "/resources/blog",
+      },
+    ],
+    graphic: PuMPDigest,
+    isGraphicLeft: false,
+    graphicWidth: 250,
+    graphicHeight: 250,
+  },
+];
+
+export const ResourcesSection = () => {
   return (
     <>
       <ImageInfoLayout
diff --git a/utils/helpers.js b/utils/helpers.js
@@ -0,0 +1,10 @@
+// export function capitalizeWords(str) {
+//   /**
+//    * @example: "av vv cv" -> "Av Vv Cv"
+//    */
+
+//   return str
+//     .split(" ")
+//     .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+//     .join(" ");
+// }
diff --git a/utils/markdownUtils.js b/utils/markdownUtils.js
@@ -15,10 +15,12 @@ export function getSlug(pathType, slugName) {
   let folderPath;
   let matchedPost;
   let releaseBatch;
+
   switch (pathType) {
     case "blog":
       folderPath = DIGEST_PATHS;
       matchedPost = posts.find((post) => post.slug.trim() == slugName.trim());
+
       if (matchedPost) {
         releaseBatch = matchedPost.releaseBatch.split(" ");
         releaseBatch[MONTH] = releaseBatch[MONTH].toLowerCase();
