From 7cd723252171d849128707578042030c2889c38a Mon Sep 17 00:00:00 2001
From: Chuck Dries <chuck@chuckdries.com>
Date: Thu, 17 Nov 2022 01:05:44 -0800
Subject: [PATCH] refine design and use popover for nav

---
 data/gallery/DSC02610-2.jpg |  3 ++
 package.json                |  1 +
 src/components/Nav.tsx      | 50 +++++++++++------------
 src/pages/index.tsx         | 80 +++++++------------------------------
 yarn.lock                   |  5 +++
 5 files changed, 46 insertions(+), 93 deletions(-)
 create mode 100644 data/gallery/DSC02610-2.jpg

diff --git a/data/gallery/DSC02610-2.jpg b/data/gallery/DSC02610-2.jpg
new file mode 100644
index 0000000..58226b1
--- /dev/null
+++ b/data/gallery/DSC02610-2.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a22a879cfbb00772e27d2fb234cd45d64b14f21b4218cfdaa09dc882841fa395
+size 1187374
diff --git a/package.json b/package.json
index 4fd3643..e4c01a9 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "react-div-100vh": "^0.7.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
+    "react-tiny-popover": "^7.2.0",
     "sass": "^1.34.0",
     "tailwindcss": "^3.2.4",
     "use-breakpoint": "^2.0.1"
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index accbdc1..af9e2b6 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -1,9 +1,7 @@
 import React, { useState } from "react";
 import classnames from "classnames";
 import { Link } from "gatsby";
-import useDimensions from "react-cool-dimensions";
-
-import Menu from "@spectrum-icons/workflow/Menu";
+import { Popover } from "react-tiny-popover";
 
 const navClasses =
   "hover:underline hover:bg-transparentblack block p-3 text-vibrant-light";
@@ -12,7 +10,7 @@ const ExternalLinks = () => (
   <ul
     className={classnames(
       "z-30 overflow-hidden bg-vibrant-dark",
-      "absolute top-[40px] border border-vibrant-light"
+      "rounded shadow border border-vibrant-light"
     )}
   >
     <li>
@@ -78,27 +76,23 @@ interface NavProps {
 }
 
 const Nav = ({ internalLinks, className }: NavProps) => {
-  // const { observe, currentBreakpoint } = useDimensions({
-  //   breakpoints: { XS: 0, LG: 750 },
-  //   updateOnBreakpointChange: true,
-  // });
   const [linksMenu, setLinksMenu] = useState(false);
 
   return (
     <nav
       className={classnames(
-        "mt-0 flex justify-between items-center w-full font-sans px-6",
+        "mt-0 flex flex-col md:flex-row items-center w-full font-sans px-6",
         className
       )}
-      // ref={observe}
       style={{ zIndex: 100 }}
     >
-      <div className="flex items-baseline">
+      <div className="md:flex items-baseline flex-auto">
         <h1 className="font-bold mr-2">Chuck Dries</h1>
-        <h2>Software Engineer & Photographer</h2>
+        <h2 className="text-md">Software Engineer & Photographer</h2>
       </div>
+
       <div className="flex">
-        <ul className="inline-flex flex-wrap justify-center">
+        <ul className="flex">
           {internalLinks &&
             internalLinks.map(({ href, label }) => (
               <li key={href}>
@@ -112,22 +106,24 @@ const Nav = ({ internalLinks, className }: NavProps) => {
               </li>
             ))}
         </ul>
-        <button
-          className={classnames(
-            "hover:underline inline-flex align-middle items-center",
-            navClasses
-          )}
-          onClick={() => setLinksMenu(!linksMenu)}
+        <Popover
+          content={<ExternalLinks />}
+          isOpen={linksMenu}
+          onClickOutside={() => setLinksMenu(false)}
+          positions={["bottom"]} // preferred positions by priority
         >
-          {/* <Menu
-            UNSAFE_className="mr-1"
-            aria-label="show external links"
-            size="S"
-          /> */}
-          Links
-        </button>
-        {linksMenu && <ExternalLinks />}
+          <button
+            className={classnames(
+              "hover:underline inline-flex align-middle items-center",
+              navClasses
+            )}
+            onClick={() => setLinksMenu(!linksMenu)}
+          >
+            Links
+          </button>
+        </Popover>
       </div>
+      {/* {linksMenu && } */}
     </nav>
   );
 };
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index b728524..2552afc 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -9,7 +9,7 @@ import { getHelmetSafeBodyStyle, getVibrant, getAspectRatio } from "../utils";
 import Nav from "../components/Nav";
 import ActionButtons from "../components/index/ActionButtons";
 // import { use100vh } from "react-div-100vh";
-// import { useMediaQuery } from "../useMediaQuery";
+import { useMediaQuery } from "../useMediaQuery";
 
 const env =
   process.env.GATSBY_ACTIVE_ENV || process.env.NODE_ENV || "development";
@@ -40,70 +40,21 @@ const IndexPage = ({
     return images[imageIndex];
   }, [images, imageIndex]);
 
-  const shuffleImage = React.useCallback(
-    (currentImage?: typeof images[number]) => {
-      const lastThreeImages =
-        JSON.parse(localStorage.getItem("lastHeros") ?? "[]") || [];
-      if (env === "production") {
-        try {
-          window.plausible("Shuffle", {
-            props: { currentImage: currentImage?.base },
-          });
-        } catch (e) {
-          /* do nothing */
-        }
-      }
-      const index = getDifferentRand(images.length, lastThreeImages);
-      localStorage.setItem(
-        "lastHeros",
-        JSON.stringify(take(3, [index, ...lastThreeImages]))
-      );
-      setImageIndex(index);
-    },
-    [images.length]
-  );
-
-  // pick random image on page hydration
   React.useEffect(() => {
     if (!isClient) {
       setIsClient(true);
-      shuffleImage(image);
     }
-  }, [isClient, imageIndex, image, shuffleImage]);
+  }, [isClient]);
 
-  React.useEffect(() => {
-    const keyListener = (e: KeyboardEvent) => {
-      switch (e.code) {
-        case "Space": {
-          shuffleImage(image);
-          return;
-        }
-        case "ArrowRight": {
-          if (imageIndex === images.length - 1) {
-            setImageIndex(0);
-            return;
-          }
-          setImageIndex(imageIndex + 1);
-          return;
-        }
+  const browserIsLandscape = useMediaQuery("(orientation: landscape)");
 
-        case "ArrowLeft": {
-          if (imageIndex === 0) {
-            setImageIndex(images.length - 1);
-            return;
-          }
-          setImageIndex(imageIndex - 1);
-          return;
-        }
-      }
-    };
-    document.addEventListener("keydown", keyListener);
-    return () => {
-      document.removeEventListener("keydown", keyListener);
-    };
-  }, [imageIndex, images.length, image, shuffleImage]);
-
-  // const browserIsLandscape = useMediaQuery("(orientation: landscape)");
+  React.useLayoutEffect(() => {
+    if (browserIsLandscape) {
+      setImageIndex(1);
+    } else {
+      setImageIndex(0);
+    }
+  }, [browserIsLandscape]);
 
   // const vibrant = getVibrant(image);
   const ar = getAspectRatio(image);
@@ -169,12 +120,9 @@ export const query = graphql`
     allFile(
       filter: {
         sourceInstanceName: { eq: "gallery" }
-        base: { in: [
-          "DSC02615-2.jpg"
-          "DSC02615.jpg"
-        ] }
+        base: { in: ["DSC02610-2.jpg", "DSC02615-2.jpg"] }
       }
-      sort: { fields: { imageMeta: { dateTaken: DESC } } }
+      sort: { base: ASC }
     ) {
       nodes {
         relativePath
@@ -184,8 +132,8 @@ export const query = graphql`
             aspectRatio
           }
           gatsbyImageData(
-            # layout: FULL_WIDTH
-            placeholder: NONE
+            layout: CONSTRAINED
+            # placeholder: NONE
             breakpoints: [750, 1080, 1366, 1920, 2560, 3840]
           )
         }
diff --git a/yarn.lock b/yarn.lock
index 339ec47..57e3c2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10782,6 +10782,11 @@ react-side-effect@^2.1.0:
   resolved "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz"
   integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==
 
+react-tiny-popover@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/react-tiny-popover/-/react-tiny-popover-7.2.0.tgz#e6277620efea6acea9c47efbfe5dcb473a552e99"
+  integrity sha512-AIliRDqTFB1+qy4GvWn+8B8JPKA13xtESWYdFkrdCeI8hEnPKufBvcF9a3dO/0SmD21mV6721xxhAnUm8TRXJw==
+
 react-transition-group@^2.2.0:
   version "2.9.0"
   resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz"