Merge pull request #316 from AndreWohnsland/dev

Indicate if preparation is in virgin mode

Author: AndreWohnsland

web_client/src/components/cocktail/CocktailList.tsx

@@ -24,18 +24,10 @@ const CocktailList: React.FC = () => {
   if (isLoading) return <LoadingData />;
   if (error) return <ErrorComponent text={error.message} />;
 
-  const handleCocktailClick = (cocktail: Cocktail) => {
-    setSelectedCocktail(cocktail);
-  };
-
   const handleCloseModal = () => {
     setSelectedCocktail(null);
   };
 
-  const handleHideToggle = () => {
-    setShowOnlyVirginPossible(!showOnlyVirginPossible);
-  };
-
   let displayedCocktails = cocktails;
   if (search) {
     displayedCocktails = displayedCocktails?.filter(
@@ -53,7 +45,7 @@ const CocktailList: React.FC = () => {
 
   const virginToggleButton = (
     <button
-      onClick={handleHideToggle}
+      onClick={() => setShowOnlyVirginPossible(!showOnlyVirginPossible)}
       className={`flex items-center justify-center p-2 !border pointer-events-auto ${
         showOnlyVirginPossible ? 'button-secondary' : 'button-primary'
       }`}
@@ -72,7 +64,7 @@ const CocktailList: React.FC = () => {
             <div
               key={cocktail.id}
               className='border-2 border-primary active:border-secondary rounded-xl box-border overflow-hidden min-w-56 max-w-64 basis-1 grow text-xl font-bold bg-primary active:bg-secondary text-background'
-              onClick={() => handleCocktailClick(cocktail)}
+              onClick={() => setSelectedCocktail(cocktail)}
               role='button'
             >
               <h2 className='text-center py-1 flex items-center justify-center'>

web_client/src/components/cocktail/CocktailSelection.tsx

@@ -35,7 +35,7 @@ const CocktailSelection: React.FC<CocktailModalProps> = ({ selectedCocktail, han
   const originalCocktail = JSON.parse(JSON.stringify(selectedCocktail));
   const [alcohol, setAlcohol] = useState<alcoholState>(selectedCocktail.only_virgin ? 'virgin' : 'normal');
   const [displayCocktail, setDisplayCocktail] = useState<Cocktail>(
-    selectedCocktail.only_virgin ? scaleCocktail(originalCocktail, alcoholFactor['virgin']) : selectedCocktail,
+    selectedCocktail.only_virgin ? scaleCocktail(originalCocktail, 0) : selectedCocktail,
   );
   const [isProgressModalOpen, setIsProgressModalOpen] = useState(false);
   // Refill state
@@ -207,7 +207,7 @@ const CocktailSelection: React.FC<CocktailModalProps> = ({ selectedCocktail, han
         isOpen={isProgressModalOpen}
         onRequestClose={() => setIsProgressModalOpen(false)}
         progress={0}
-        displayName={displayCocktail.name}
+        displayName={`${alcohol === 'virgin' ? 'Virgin ' : ''}${displayCocktail.name}`}
         triggerOnClose={handleCloseModal}
       />
       <TeamSelection