feat: add more cocktails (#409)

* feat: add more cocktails

* fix test

* fix

cypress/e2e/cocktails.cy.ts

@@ -47,11 +47,15 @@ describe('Cocktails', () => {
         it('Category - Should display only result from filter', () => {
             cy.visit('#/cocktails');
 
-            cy.get('[data-cy=all-cocktails-filter] [data-cy=open-filters]').click();
-            cy.dataCy('select-category').select('Shot');
-            cy.dataCy('filter-dialog-close').click();
-            cy.dataCy('active-filters').should('contain', '1');
-            cy.dataCy('cocktails-wrapper').children().should('have.length', '6'); //Todo remove magic number
+            cy.dataCy('cocktails-wrapper')
+                .children()
+                .then(el => {
+                    cy.get('[data-cy=all-cocktails-filter] [data-cy=open-filters]').click();
+                    cy.dataCy('select-category').select('Shot');
+                    cy.dataCy('filter-dialog-close').click();
+                    cy.dataCy('active-filters').should('contain', '1');
+                    cy.dataCy('cocktails-wrapper').children().should('have.length.lessThan', el.length);
+                });
         });
     });
 

src/data/cocktail-data.ts

@@ -2428,5 +2428,42 @@ const cocktails: StaticCocktail[] = [
             { amount: '1', ingredientId: '141', unit: Unit.TSP }
         ],
         tags: [Tag.Halloween]
+    },
+    {
+        id: '177',
+        imageSrc: 'images/apple_highball.jpg',
+        isImagePortrait: false,
+        translation: 'apple-highball',
+        category: DrinkCategory.Cocktail,
+        ingredientGroups: [
+            { amount: '1', ingredientId: '106', unit: '' },
+            { amount: '45', ingredientId: '155', unit: Unit.ML },
+            { amount: '45', ingredientId: '61', unit: Unit.ML }
+        ],
+        tags: []
+    },
+    {
+        id: '178',
+        imageSrc: 'images/apple_slammer.jpg',
+        isImagePortrait: false,
+        translation: 'apple-slammer',
+        category: DrinkCategory.Shot,
+        ingredientGroups: [
+            { amount: '30', ingredientId: '156', unit: Unit.ML },
+            { amount: '30', ingredientId: '155', unit: Unit.ML }
+        ],
+        tags: [Tag.Halloween]
+    },
+    {
+        id: '179',
+        imageSrc: 'images/vodka_lemon.jpg',
+        isImagePortrait: false,
+        translation: 'vodka-lemon',
+        category: DrinkCategory.Cocktail,
+        ingredientGroups: [
+            { amount: '60', ingredientId: '8', unit: Unit.ML },
+            { amount: '60', ingredientId: '10', unit: Unit.ML }
+        ],
+        tags: []
     }
 ];

src/data/ingredient-data.ts

@@ -71,7 +71,7 @@ const currentIngredients: StaticIngredient[] = [
     { id: '42', translation: 'sugar', spiritType: SpiritType.None },
     { id: '43', translation: 'coffee-liqueur', spiritType: SpiritType.None, abv: 16, replacementIds: ['55'] },
     { id: '44', translation: 'blue-curacao', spiritType: SpiritType.None, abv: 21 },
-    { id: '45', translation: 'sprite', spiritType: SpiritType.None },
+    { id: '45', translation: 'sprite', spiritType: SpiritType.None, replacementIds: ['156'] },
     { id: '46', translation: 'salt', spiritType: SpiritType.None },
     { id: '47', translation: 'creme-de-cacao', spiritType: SpiritType.None, abv: 24 },
     { id: '48', translation: 'light-cream', spiritType: SpiritType.None },
@@ -223,5 +223,7 @@ const currentIngredients: StaticIngredient[] = [
     { id: '151', translation: 'hard-cider', spiritType: SpiritType.None, abv: 4 },
     { id: '152', translation: 'gammel-dansk', spiritType: SpiritType.None, abv: 38 },
     { id: '153', translation: 'calvados', spiritType: SpiritType.CognacBrandy, abv: 42, replacementIds: ['65'] },
-    { id: '154', translation: 'wheat-beer', spiritType: SpiritType.None, abv: 5 }
+    { id: '154', translation: 'wheat-beer', spiritType: SpiritType.None, abv: 5 },
+    { id: '155', translation: 'apple-schnapps', spiritType: SpiritType.None, abv: 18 },
+    { id: '156', translation: '7-up', spiritType: SpiritType.None, replacementIds: ['45'] }
 ];

src/locales/en/cocktails.json

@@ -174,5 +174,8 @@
     "bloody-punch": "Bloody Punch",
     "black-margarita": "Black Margarita",
     "pumpkin-martini": "Pumpkin Martini",
-    "pumpkin-pie-spice": "Pumpkin Pie Spice"
+    "pumpkin-pie-spice": "Pumpkin Pie Spice",
+    "apple-highball": "Apple Highball",
+    "apple-slammer": "Apple Slammer",
+    "vodka-lemon": "Vodka Lemon"
 }

src/locales/en/ingredients.json

@@ -151,5 +151,7 @@
     "hard-cider": "Hard Cider",
     "gammel-dansk": "Gammel Dansk",
     "calvados": "Calvados",
-    "wheat-beer": "Wheat Beer"
+    "wheat-beer": "Wheat Beer",
+    "apple-schnapps": "Apple Schnapps",
+    "7-up": "7 Up"
 }

src/locales/en/instructions.json

@@ -174,5 +174,8 @@
     "bloody-punch": "Place the thawed strawberries in a large bowl.\n\nMash them with a fork to ensure no large chunks.\n\nStep 2 In a punch bowl or pitcher, combine mashed strawberries, lime pulp and soda.\n\nMix well.\n\nStep 3 Add blueberries and raisins.\n\nThey will float and look like bugs in the punch.",
     "black-margarita": "Add the fine sea salt to a small bowl and open up the charcoal capsule. Mix well and transfer to a small shallow plate.\nRun the lime wedge along the rim of your glass and dip it in the black salt. Set aside.\n\nAdd the Tequila, Cointreau, lime juice, orange bitters, and maple syrup to a cocktail shaker. Open up the capsule and add the powder to the shaker. Add a handful of ice and shake for a few seconds.\nPour into the prepared glass over ice and enjoy.",
     "pumpkin-martini": "Crush a graham cracker with your fingers, and place it on a plate. On another plate, add a small pool of maple syrup. Run the rim of a martini glass in the maple syrup first, rotating the glass so the rim is evenly coated. Then roll the rim in the crushed graham crackers until evenly coated.\nPlace all ingredients in a cocktail shaker. Add a handful of ice and shake until cold. Strain the drink into the prepared martini glass.",
-    "pumpkin-pie-spice": "Combine all ingredients in a spice jar and shake! Keeps for up to 6 months."
+    "pumpkin-pie-spice": "Combine all ingredients in a spice jar and shake! Keeps for up to 6 months.",
+    "apple-highball": "Add ice in a highball glass.\nRub a wedge of fresh lime around rim and place it in the glass.\nAdd a shot of Apple schnapps, a shot of Courvoisier and top up with ginger ale.",
+    "apple-slammer": "Pour into a shot glass and present to consumer, they are expected to cover the top of the shotglass with thier palm, raise the glass, slam it on the bar and the swallow quickly.",
+    "vodka-lemon": "The vodka lemon is prepared directly in a highball glass or in a large tumbler: put 6-7 ice cubes in the glass, pour the vodka, lemonade and mix with a bar spoon.\nFinally decorate with a slice of lemon and, if you prefer, add a few mint leaves.\nYour vodka lemon is ready to be served."
 }