From 9faef7e1f28a4726e3b19ea1bca6737774d4350a Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Sat, 15 Jun 2024 23:59:59 -0500
Subject: [PATCH] Refine upload styles, date/query behavior

---
 src/components/ImageInput.tsx              | 35 +++++++++++-----------
 src/components/primitives/LoaderButton.tsx |  2 +-
 src/photo/db/index.ts                      |  4 +--
 src/site/globals.css                       |  4 +--
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/components/ImageInput.tsx b/src/components/ImageInput.tsx
index 057db1d6..74d340ab 100644
--- a/src/components/ImageInput.tsx
+++ b/src/components/ImageInput.tsx
@@ -5,10 +5,10 @@ import { useRef, useState } from 'react';
 import { CopyExif } from '@/lib/CopyExif';
 import exifr from 'exifr';
 import { clsx } from 'clsx/lite';
-import Spinner from './Spinner';
 import { ACCEPTED_PHOTO_FILE_TYPES } from '@/photo';
 import { FiUploadCloud } from 'react-icons/fi';
 import { MAX_IMAGE_SIZE } from '@/services/next-image';
+import LoaderButton from './primitives/LoaderButton';
 
 const INPUT_ID = 'file';
 
@@ -36,7 +36,8 @@ export default function ImageInput({
   showUploadStatus?: boolean
   debug?: boolean
 }) {
-  const ref = useRef<HTMLCanvasElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+  const canvasRef = useRef<HTMLCanvasElement>(null);
 
   const [image, setImage] = useState<HTMLImageElement>();
   const [filesLength, setFilesLength] = useState(0);
@@ -57,26 +58,24 @@ export default function ImageInput({
             loading && 'pointer-events-none cursor-not-allowed',
           )}
         >
-          <span
-            className={clsx(
-              'button primary normal-case',
-              loading && 'disabled'
-            )}
+          <LoaderButton
+            type="button"
+            isLoading={loading}
+            className="primary"
+            icon={<FiUploadCloud
+              size={17}
+              className="translate-y-[0.5px]"
+            />}
             aria-disabled={loading}
+            onClick={() => inputRef.current?.click()}
+            hideTextOnMobile={false}
           >
-            <span className="w-4 inline-flex items-center mr-1">
-              {loading
-                ? <Spinner color="text" className="translate-y-[0.5px]" />
-                : <FiUploadCloud
-                  size={17}
-                  className="translate-y-[0.5px] shrink-0"
-                />}
-            </span>
             {loading
               ? 'Uploading'
               : 'Upload Photos'}
-          </span>
+          </LoaderButton>
           <input
+            ref={inputRef}
             id={INPUT_ID}
             type="file"
             className="!hidden"
@@ -100,7 +99,7 @@ export default function ImageInput({
 
                   const isPng = callbackArgs.extension === 'png';
                   
-                  const canvas = ref.current;
+                  const canvas = canvasRef.current;
 
                   // Specify wide gamut to avoid data loss while resizing
                   const ctx = canvas?.getContext(
@@ -227,7 +226,7 @@ export default function ImageInput({
           </div>}
       </div>
       <canvas
-        ref={ref}
+        ref={canvasRef}
         className={clsx(
           'bg-gray-50 dark:bg-gray-900/50 rounded-md',
           'border border-gray-200 dark:border-gray-800',
diff --git a/src/components/primitives/LoaderButton.tsx b/src/components/primitives/LoaderButton.tsx
index 91ede1b6..e16fd03c 100644
--- a/src/components/primitives/LoaderButton.tsx
+++ b/src/components/primitives/LoaderButton.tsx
@@ -51,7 +51,7 @@ export default function LoaderButton(props: {
         <span className={clsx(
           'min-w-[1.25rem] h-4',
           styleAs === 'button' ? 'translate-y-[-0.5px]' : 'translate-y-[0.5px]',
-          'inline-flex justify-center',
+          'inline-flex justify-center shrink-0',
         )}>
           {isLoading
             ? <Spinner
diff --git a/src/photo/db/index.ts b/src/photo/db/index.ts
index 0ab0a847..748cdcff 100644
--- a/src/photo/db/index.ts
+++ b/src/photo/db/index.ts
@@ -52,11 +52,11 @@ export const getWheresFromOptions = (
   }
 
   if (takenBefore) {
-    wheres.push(`taken_at > $${valuesIndex++}`);
+    wheres.push(`taken_at < $${valuesIndex++}`);
     wheresValues.push(takenBefore.toISOString());
   }
   if (takenAfterInclusive) {
-    wheres.push(`taken_at <= $${valuesIndex++}`);
+    wheres.push(`taken_at >= $${valuesIndex++}`);
     wheresValues.push(takenAfterInclusive.toISOString());
   }
   if (query) {
diff --git a/src/site/globals.css b/src/site/globals.css
index 33a29657..56555c3e 100644
--- a/src/site/globals.css
+++ b/src/site/globals.css
@@ -98,8 +98,8 @@
     @apply
       text-invert
       bg-gray-900 dark:bg-gray-100
-      disabled:text-gray-300 disabled:dark:text-gray-700
-      disabled:bg-white disabled:dark:bg-black
+      disabled:bg-main
+      disabled:text-gray-400 disabled:dark:text-gray-600
       disabled:border-gray-200 disabled:dark:border-gray-700
       border-gray-900 dark:border-gray-100
       active:bg-gray-700 active:border-gray-700