Merge pull request #373 from AndreWohnsland/dev

Sort available ingredients alphabetically

Author: AndreWohnsland

.vscode/launch.json

@@ -17,40 +17,48 @@
       "justMyCode": true
     },
     {
-      "name": "Python: Calibration program",
+      "name": "Calibration program over CLI",
       "type": "debugpy",
       "request": "launch",
-      "program": "${file}",
+      "program": "${workspaceFolder}/runme.py",
       "console": "integratedTerminal",
       "justMyCode": true,
       "args": ["-c"]
     },
     {
-      "name": "Python: Main program in debug mode",
+      "name": "Main program in debug mode over CLI",
       "type": "debugpy",
       "request": "launch",
-      "program": "${file}",
+      "program": "${workspaceFolder}/runme.py",
       "console": "integratedTerminal",
       "justMyCode": true,
       "args": ["-d"]
     },
     {
-      "name": "Debug FastApi over uvicorn",
+      "name": "Run Backend over CLI",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/api.py",
+      "console": "integratedTerminal",
+      "justMyCode": true
+    },
+    {
+      "name": "Debug FastApi (Backend) over uvicorn",
       "type": "debugpy",
       "request": "launch",
       "module": "uvicorn",
       "args": ["src.api.api:app", "--reload"]
     },
     {
-      "name": "Debug FastApi over fastapi CLI",
+      "name": "Debug FastApi (Backend) over fastapi CLI",
       "type": "debugpy",
       "request": "launch",
       "module": "fastapi",
       "cwd": "${workspaceFolder}/src/api/",
       "args": ["dev", "./api.py"]
     },
     {
-      "name": "Run Frontend",
+      "name": "Node: Run Frontend",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}/web_client",

src/api/api.py

@@ -11,6 +11,7 @@
 
 from src import __version__
 from src.api.api_config import DESCRIPTION, TAGS_METADATA
+from src.api.internal.log_config import log_config
 from src.api.internal.validation import ValidationError
 from src.api.models import ApiMessage
 from src.api.routers import bottles, cocktails, ingredients, options
@@ -132,4 +133,4 @@ async def root() -> ApiMessage:
 
 
 def run_api(port: int = 8000) -> None:
-    uvicorn.run(app, host="0.0.0.0", port=port)
+    uvicorn.run(app, host="0.0.0.0", port=port, log_config=log_config)

src/api/internal/log_config.py

@@ -0,0 +1,9 @@
+import copy
+
+from uvicorn.config import LOGGING_CONFIG
+
+log_config = copy.deepcopy(LOGGING_CONFIG)
+log_config["formatters"]["default"]["fmt"] = "%(asctime)s %(levelprefix)s - %(message)s"
+log_config["formatters"]["access"]["fmt"] = (
+    '%(asctime)s %(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s'
+)

web_client/src/components/bottle/ListView.tsx

@@ -12,9 +12,17 @@ const ListView: React.FC<ListViewProps> = ({ ingredientList, setSelected, select
     setSelected((prev) => (prev.includes(ingredient) ? prev.filter((i) => i !== ingredient) : [...prev, ingredient]));
   };
 
+  // Sort ingredients: hand=true first, then by name alphabetically
+  const sortedIngredients = [...ingredientList].sort((a, b) => {
+    if (a.hand === b.hand) {
+      return a.name.localeCompare(b.name);
+    }
+    return a.hand ? -1 : 1;
+  });
+
   return (
     <div className='h-full overflow-y-auto border-2 border-neutral rounded-md px-2 py-1'>
-      {ingredientList.map((ingredient) => (
+      {sortedIngredients.map((ingredient) => (
         <div
           key={ingredient.id}
           onClick={() => handleSelect(ingredient)}

web_client/src/index.css

@@ -226,3 +226,20 @@ input[type='time']::-webkit-calendar-picker-indicator {
   overflow: hidden;
   padding-right: var(--scrollbar-width, 15px); /* Prevent layout shift when scrollbar disappears */
 }
+
+/* Custom Scrollbar Styling */
+/* Chrome, Edge, Safari */
+::-webkit-scrollbar {
+  background: var(--background-color);
+}
+::-webkit-scrollbar-thumb {
+  background: var(--primary-color);
+}
+::-webkit-scrollbar-track {
+  background: var(--background-color);
+}
+
+/* Firefox */
+* {
+  scrollbar-color: var(--primary-color) var(--background-color);
+}