Bugfix: radio buttons, new badges, sort

AGENTS.md

@@ -1,5 +1,10 @@
 Beer-inventory project for home use. 
 
+The project has three aspects. 
+ - The website, which people can visit to see the current inventory of drinks. They can see in which section a drink is stored.
+ - The Admin website, which is part of the main website but only to logged in admin users. Which allows updating drinks, inventory, and adding or editing data.
+ - The scanner, which is a raspberry pi with touchscreen display and a USB barcode scanner. This is next to the fridge, and people use it to scan a drink to remove it from the inventory. 
+
 Used technology:
 - remix.run (now known as react router)
 - prisma

app/components/cards/drink.card.tsx

@@ -17,7 +17,6 @@ function toDate(value: Date | string | null | undefined): Date | null {
 }
 
 function DrinkCard(arg:Arguments) {
-  var trimmedDescription = arg.drink.description.length > 120 ? arg.drink.description.substring(0, 120) + "..." : arg.drink.description;
   var link = "/inventory/";
 
   switch (arg.drink.type) {
@@ -61,10 +60,7 @@ function DrinkCard(arg:Arguments) {
   }
 
   const drinkAddedAt = toDate((arg.drink as { addedAt?: Date | string | null }).addedAt ?? null);
-  const latestTimestamp = drinkAddedAt && (!latestActivity || drinkAddedAt.getTime() > latestActivity.getTime())
+  const isNewlyAdded = drinkAddedAt ? (Date.now() - drinkAddedAt.getTime()) <= 30 * 24 * 60 * 60 * 1000 : false;
-    ? drinkAddedAt
-    : latestActivity;
-  const isNewlyAdded = latestTimestamp ? (Date.now() - latestTimestamp.getTime()) <= 30 * 24 * 60 * 60 * 1000 : false;
   const isRecentlyRestocked = latestActivity ? (Date.now() - latestActivity.getTime()) <= 14 * 24 * 60 * 60 * 1000 : false;
 
   return (
@@ -72,11 +68,11 @@ function DrinkCard(arg:Arguments) {
       <div style={{ position: 'relative', width: '100%', aspectRatio: '1 / 1', overflow: 'hidden' }}>
         { (isNewlyAdded || isRecentlyRestocked) ? (
           <Badge
-            bg={isRecentlyRestocked ? "success" : "primary"}
+            bg={isNewlyAdded ? "primary" : "success"}
             className='position-absolute top-0 start-0 m-2 text-wrap'
             style={{ zIndex: 2 }}
           >
-            {isNewlyAdded && isRecentlyRestocked ? "New · Restocked" : isNewlyAdded ? "New" : "Recently added"}
+            {isNewlyAdded ? "New" : (isRecentlyRestocked ? "Restocked" : "")}
           </Badge>
         ) : null }
         <Card.Img

app/components/filters/drink.filter.tsx

@@ -2,7 +2,7 @@
 import { useSubmit } from '@remix-run/react';
 import { BeerStyle, Manufacturer, WineStyle } from '@zenstackhq/runtime/models';
 import { useRef, useState } from 'react';
-import { Form, Col, Row } from 'react-bootstrap';
+import { Button, Form, Col, Row } from 'react-bootstrap';
 
 interface Arguments {
   beerStyles: BeerStyle[];
@@ -20,11 +20,28 @@ function DrinkFilter(arg : Arguments) {
   const showSodaFilter = arg.searchParams.has("drink", "Soda");
   const showCocktailFilter = arg.searchParams.has("drink", "Cocktail");
 
-  const form = useRef(null);
+  const form = useRef<HTMLFormElement | null>(null);
+  const drinkTypes = ["Beer", "Wine", "Soda", "Cocktail"];
+  const [beerStyleExpanded, setBeerStyleExpanded] = useState(false);
+  const [wineStyleExpanded, setWineStyleExpanded] = useState(false);
 
-  const submitAfterRender = function(){
+  const toggleDrinkType = (drinkType: string) => {
-    setTimeout(() => submit(form.current), 10);
+    const params = new URLSearchParams(arg.searchParams.toString());
-  }
+    const values = params.getAll("drink");
+
+    if (values.includes(drinkType)) {
+      params.delete("drink");
+      values.filter((value) => value !== drinkType).forEach((value) => params.append("drink", value));
+    } else {
+      params.append("drink", drinkType);
+    }
+
+    if (params.get("abv") === "all") {
+      params.delete("abv");
+    }
+
+    submit(params, { method: "get", replace: true });
+  };
 
   const handleFormChange = (event: React.ChangeEvent<HTMLFormElement>) => {
     const formData = new FormData(event.currentTarget);
@@ -37,6 +54,8 @@ function DrinkFilter(arg : Arguments) {
   }
 
   const abvSelection = arg.searchParams.get("abv") || "all";
+  const selectedBeerStyleCount = arg.searchParams.getAll("beerstyle").length;
+  const selectedWineStyleCount = arg.searchParams.getAll("winestyle").length;
   const abvOptions = [
     { value: "all", label: "All" },
     { value: "alcohol-free", label: "Alcohol free" },
@@ -57,7 +76,7 @@ function DrinkFilter(arg : Arguments) {
     />
   ));
 
-  const sortKey = arg.searchParams.get("sort") || "name";
+  const sortKey = arg.searchParams.get("sort") || "new";
 
   return (
     <Form noValidate method="GET" ref={form} className='pe-2' onChange={handleFormChange}>
@@ -66,8 +85,8 @@ function DrinkFilter(arg : Arguments) {
             <Form.Group controlId="sort" className='bg-body-secondary rounded p-3'>
                 <Form.Label className='fw-bold'>Sort</Form.Label>
                 { [
-                  ["name", "Name"],
                   ["new", "New"],
+                  ["name", "Name"],
                   ["popular", "Popularity"],
                   ["abv-asc", "Alcohol (Low -> High)"],
                   ["abv-desc", "Alcohol (High -> Low)"],
@@ -87,17 +106,24 @@ function DrinkFilter(arg : Arguments) {
             </Form.Group>
             <Form.Group controlId="drink-type" className='bg-body-secondary rounded p-3 mt-3'>
               <Form.Label className='fw-bold'>Drink Type</Form.Label>
-              { ["Beer", "Wine", "Soda", "Cocktail"].map(key => (
+              <div className='row row-cols-2 g-2'>
-                  <Form.Check
+                {drinkTypes.map((key) => (
-                    id={"drink-" + key}
+                  <div className='col' key={key}>
-                    type="checkbox"
+                    <Button
-                    label={key}
+                      type="button"
-                    name="drink"
+                      variant={arg.searchParams.has("drink", key) ? "primary" : "outline-primary"}
-                    value={key}
+                      className='w-100 text-start'
-                    defaultChecked={arg.searchParams.has("drink", key) ? true : false}
+                      aria-pressed={arg.searchParams.has("drink", key)}
-                  />
+                      onClick={() => toggleDrinkType(key)}
+                    >
+                      {key}
+                    </Button>
+                  </div>
+                ))}
+              </div>
+              {arg.searchParams.getAll("drink").map((drinkValue) => (
+                <input key={drinkValue} type="hidden" name="drink" value={drinkValue} />
               ))}
-              
             </Form.Group>
             <Form.Group controlId="drink-abv" className='bg-body-secondary rounded p-3 mt-3'>
               <Form.Label className='fw-bold'>Alcohol Percentage</Form.Label>
@@ -119,34 +145,67 @@ function DrinkFilter(arg : Arguments) {
             { showBeerFilter ? (
             <>
             <Form.Group controlId="beer-style" className='bg-body-secondary rounded p-3 mt-3'>
-              <Form.Label className='fw-bold mt-3'>Beer style</Form.Label>
+              <div className='d-flex justify-content-between align-items-center'>
-              { arg.beerStyles.map(style => (
+                <Form.Label className='fw-bold mb-0'>Beer style {selectedBeerStyleCount > 0 ? ( <span className="badge text-bg-dark">{selectedBeerStyleCount} selected</span>) :  ''}</Form.Label>
-                  <Form.Check
+                <Button
-                    id={"beerstyle-" + style.name}
+                  type='button'
-                    type="checkbox"
+                  variant='outline-secondary'
-                    label={style.name}
+                  size='sm'
-                    name="beerstyle"
+                  onClick={() => setBeerStyleExpanded((current) => !current)}
-                    value={style.id}
+                >
-                    defaultChecked={arg.searchParams.has("beerstyle", style.id.toString()) ? true : false}
+                  {beerStyleExpanded ? 'Collapse' : 'Expand'}
-                  />
+                </Button>
-              ))}
+              </div>
+              {beerStyleExpanded ? (
+                <div className='mt-3'>
+                  { arg.beerStyles.map(style => (
+                    <Form.Check
+                      key={style.id}
+                      id={"beerstyle-" + style.name}
+                      type="checkbox"
+                      label={style.name}
+                      name="beerstyle"
+                      value={style.id}
+                      defaultChecked={arg.searchParams.has("beerstyle", style.id.toString()) ? true : false}
+                    />
+                  ))}
+                </div>
+              ) : (
+                <div className='text-muted mt-3'>Tap expand to show beer styles</div>
+              )}
             </Form.Group>
             </>
             ) : ""}
             { showWineFilter ? (
             <Form.Group controlId="wine-style" className='bg-body-secondary rounded p-3 mt-3'>
-              <Form.Label className='fw-bold'>Wine style</Form.Label>
+              <div className='d-flex justify-content-between align-items-center'>
-              { arg.wineStyles.map(style => (
+                <Form.Label className='fw-bold mb-0'>Wine style {selectedWineStyleCount > 0 ? ( <span className="badge text-bg-dark">{selectedWineStyleCount} selected</span>) :  ''}</Form.Label>
-                  <Form.Check
+                <Button
-                    id={"winestyle-" + style.name}
+                  type='button'
-                    type="checkbox"
+                  variant='outline-secondary'
-                    label={style.name}
+                  size='sm'
-                    name="winestyle"
+                  onClick={() => setWineStyleExpanded((current) => !current)}
-                    value={style.id}
+                >
-                    defaultChecked={arg.searchParams.has("winestyle", style.id.toString()) ? true : false}
+                  {wineStyleExpanded ? 'Collapse' : 'Expand'}
-                  />
+                </Button>
-              ))}
+              </div>
-            </Form.Group>
+              {wineStyleExpanded ? (
+                <div className='mt-3'>
+                { arg.wineStyles.map(style => (
+                    <Form.Check
+                      id={"winestyle-" + style.name}
+                      type="checkbox"
+                      label={style.name}
+                      name="winestyle"
+                      value={style.id}
+                      defaultChecked={arg.searchParams.has("winestyle", style.id.toString()) ? true : false}
+                    />
+                ))}
+                </div>
+              ) : (
+                <div className='text-muted mt-3'>Tap expand to show wine styles</div>
+              )}
+              </Form.Group>
             ) : ""}
             { showSodaFilter ? (
             <Form.Group controlId="soda-carbonated" className='bg-body-secondary rounded p-3 mt-3'>
@@ -154,6 +213,7 @@ function DrinkFilter(arg : Arguments) {
                 <Form.Check
                   type="radio"
                   label="Both"
+                  id="carbonated-both"
                   name="carbonated"
                   value={0}
                   defaultChecked={(arg.searchParams.get("carbonated") == "0" || !arg.searchParams.has("carbonated")) ? true : false}
@@ -161,6 +221,7 @@ function DrinkFilter(arg : Arguments) {
                 <Form.Check
                   type="radio"
                   label="Sparkling"
+                  id="carbonated-sparkling"
                   name="carbonated"
                   value={1}
                   defaultChecked={arg.searchParams.get("carbonated") == "1" ? true : false}
@@ -168,6 +229,7 @@ function DrinkFilter(arg : Arguments) {
                 <Form.Check
                   type="radio"
                   label="Non-sparkling"
+                  id="carbonated-flat"
                   name="carbonated"
                   value={2}
                   defaultChecked={arg.searchParams.get("carbonated") == "2" ? true : false}

app/models/drinks.sort.server.ts

@@ -97,7 +97,11 @@ function sortNewest(n1:DrinkComposite, n2:DrinkComposite) : number{
 
 export function sortDrinksFromSearch(searchParams: URLSearchParams, searchResult: DrinkComposite[]) : DrinkComposite[] {
     
-    var callback = sortName;
+    var callback = sortNewest;
+
+    if(searchParams.has("sort", "new")){
+        callback = sortNewest;
+    }
 
     if(searchParams.has("sort", "name")){
         callback = sortName;
@@ -123,10 +127,6 @@ export function sortDrinksFromSearch(searchParams: URLSearchParams, searchResult
         callback = sortPopularity;
     }
 
-    if(searchParams.has("sort", "new")){
-        callback = sortNewest;
-    }
-
     var sortedArray: DrinkComposite[] = searchResult.sort(callback);
 
     return sortedArray;

app/root.tsx

@@ -83,7 +83,7 @@ export function ErrorBoundary() {
 
     const hourly = window.setInterval(() => {
       tryRefresh();
-    }, 60 * 60 * 1000);
+    }, 15 * 60 * 1000); // Every 15 minutes
 
     return () => {
       window.removeEventListener("online", handleOnline);
@@ -120,7 +120,7 @@ export function ErrorBoundary() {
                       >
                         Try refresh now
                       </button>
-                      <div className="mt-2">Status: {isOnline ? "Online" : "Offline"}. Will retry automatically every hour.</div>
+                      <div className="mt-2">Status: {isOnline ? "Online" : "Offline"}. Will retry automatically every 15 minutes.</div>
                     </div>
                 </div>
             </Col>
@@ -159,7 +159,7 @@ export function ErrorBoundary() {
                       >
                         Try refresh now
                       </button>
-                      <div className="mt-2">Status: {isOnline ? "Online" : "Offline"}. Will retry automatically every hour.</div>
+                      <div className="mt-2">Status: {isOnline ? "Online" : "Offline"}. Will retry automatically every 15 minutes.</div>
                     </div>
                 </div>
             </Col>

app/routes/inventory/route.tsx

@@ -78,11 +78,7 @@ export default function BeersRoute() {
       return;
     }
 
-    if (key === "sort" && value === "name") {
+    if (key === "sort" && value === "new") {
-      return;
-    }
-
-    if ((key === "min-abv" && value === "0") || (key === "max-abv" && value === "50") || (key === "min-ibu" && value === "0") || (key === "max-ibu" && value === "150")) {
       return;
     }
 

app/routes/scan/layout.tsx

@@ -41,7 +41,7 @@ export default function InventoryLayout() {
           setCheckouts(newCheckouts);
         }
         
-      }, 5000);
+      }, 30000);
     
       return () => clearTimeout(timer);
     });

app/routes/scan/route.tsx

@@ -1,8 +1,8 @@
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
 import { json, redirect } from "@remix-run/node";
-import { useActionData, useLoaderData } from "@remix-run/react";
+import { Form as RemixForm, useActionData, useLoaderData } from "@remix-run/react";
 import { useEffect, useRef, useState } from "react";
-import { Col, Container, Form, Row, Table } from "react-bootstrap";
+import { Col, Container, Form as BootstrapForm, Row, Table } from "react-bootstrap";
 import timeAgo from "~/utils/datetime";
 
 import { enhance } from "~/utils/db.server";
@@ -16,7 +16,7 @@ export async function loader({
     return redirect("/");
   }
 
-  const history = await dbe.history.findMany({select: {id: true, checkoutAt: true, inventoryAfter: true, container: {select: {drink: true}}}, take: 10, orderBy: {checkoutAt: "desc"}});
+  const history = await dbe.history.findMany({select: {id: true, checkoutAt: true, inventoryAfter: true, container: {select: {drink: true}}}, take: 5, orderBy: {checkoutAt: "desc"}});
   return json({history});
 }
 
@@ -116,6 +116,10 @@ export default function ScanRoute() {
         return;
       }
 
+      if (inputRef.current) {
+        inputRef.current.value = "";
+      }
+
       setLastScanned(aData.lastScanned);
       setShowLastScanned(true);
 
@@ -137,7 +141,7 @@ export default function ScanRoute() {
                     <tr>
                       <th>Drink</th>
                       <th>When</th>
-                      <th>Amount left</th>
+                      <th># Left</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -158,14 +162,15 @@ export default function ScanRoute() {
                 <Col>
                   {/* Hidden fullscreen toggle button - triggered by clicking the h3 headers */}
                   <button
+                    type="button"
                     ref={fullscreenBtnRef}
                     onClick={toggleFullscreen}
                     style={{ display: 'none' }}
                     aria-hidden="true"
                   />
-                  <Form method="post" action="/scan?index" noValidate>
+                  <RemixForm method="post" action="/scan?index" noValidate>
-                    <Form.Group>
+                    <BootstrapForm.Group>
-                      <Form.Control
+                      <BootstrapForm.Control
                           ref={inputRef}
                           type="text"
                           name="barcode"
@@ -175,11 +180,11 @@ export default function ScanRoute() {
                           inputMode="text"
                           style={{ height: '3rem', fontSize: '1.8rem', textAlign: 'center' }}
                       />
-                      <Form.Control.Feedback type="invalid">
+                      <BootstrapForm.Control.Feedback type="invalid">
                         {aData?.error}
-                      </Form.Control.Feedback>
+                      </BootstrapForm.Control.Feedback>
-                    </Form.Group>
+                    </BootstrapForm.Group>
-                  </Form>
+                  </RemixForm>
                 </Col>
               </Row>
               <Row>