Feature/v1.0.0 beta.2 (#27)

* add keywords * update db * Input issue when deleting the input chip #26
Mixtini · Jun 28, 2020 · bb4880f · bb4880f
1 parent 3e6565a
commit bb4880f
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 22 deletions.
diff --git a/app/src/assets/wording/common.json b/app/src/assets/wording/common.json
@@ -1,3 +1,4 @@
 {
-    "title": "Over Party Lab 醉佳話。研酒室"
+    "title": "Over Party Lab 醉佳話。研酒室",
+    "version": "v1.0.0-beta.2"
 }
diff --git a/app/src/container/contact/contact.js b/app/src/container/contact/contact.js
@@ -6,6 +6,7 @@ import InstagramIcon from '@material-ui/icons/Instagram';
 import CollectionsBookmarkTwoToneIcon from '@material-ui/icons/CollectionsBookmarkTwoTone';
 
 import logo from '../../assets/images/overpartylab-logo.jpg';
+import COMMON_TEXT from '../../assets/wording/common.json';
 import CONTACT_TEXT from '../../assets/wording/contact.json';
 import { LINK } from '../../config/contact';
 
@@ -49,7 +50,7 @@ const Contact = () => {
             </Item>
             <Footer>
                 <div>
-                    © {(new Date()).getFullYear()} <a href={LINK.INSTAGRAM} target="_blank">{CONTACT_TEXT.account}</a> v1.0.0-beta.1
+                    © {(new Date()).getFullYear()} <a href={LINK.INSTAGRAM} target="_blank">{CONTACT_TEXT.account}</a> {COMMON_TEXT.version}
                 </div>
             </Footer>
         </Container>

diff --git a/app/src/container/search/search.js b/app/src/container/search/search.js
@@ -140,10 +140,9 @@ const Search = ({ searchPageData, getCocktailsList }) => {
         const signature = e.target.checked;
         setUserAction({ ...userAction, signature });
     };
-    const onChipInputChange = (newValue) => { 
-        const find = findExistInTwoArray(value, newValue);
-        if (value.length < 3 && !find) {
-            setUserAction({ ...userAction, value: [...value, ...newValue], isSearch: false });
+    const onChipInputChange = (newValue) => {
+        if (value.length < 3) {
+            setUserAction({ ...userAction, value: [...value, newValue], isSearch: false });
         }
     };
     const onSelectChange = (newValue) => {
@@ -218,7 +217,8 @@ const Search = ({ searchPageData, getCocktailsList }) => {
                                     value={value}
                                     fullWidth={true}
                                     newChipKeys={[]}
-                                    onChange={(chips) => onChipInputChange(chips)}
+                                    allowDuplicates={false}
+                                    onAdd={(chips) => onChipInputChange(chips)}
                                     onDelete={(chip, index) => handleDeleteChip(chip, index)}
                                 />
                             </SearchContainer>

diff --git a/database/overpartylab-4c6d2-export.json b/database/overpartylab-4c6d2-export.json
@@ -203,7 +203,7 @@
         {
             "igtoken": "BvGwwDTlTyc",
             "key": "vodka_lime",
-            "keys": ["伏特加萊姆", "伏特加", "vodka", "酸的", "檸檬", "lemon", "lime", "鹽口"],
+            "keys": ["伏特加萊姆", "伏特加", "vodka", "酸的", "檸檬", "lemon", "lime", "鹽口", "酒感"],
             "name": {
                 "en": "Vodka Lime",
                 "zh": "伏特加萊姆"
@@ -483,7 +483,7 @@
         {
             "igtoken": "B31o5_UFRCT",
             "key": "mango_fizz",
-            "keys": ["芒果費茲", "Mango Fizz", "Gin Fizz", "琴酒", "gin", "長飲", "檸檬", "lemon", "清爽", "果香", "芒果", "mango"],
+            "keys": ["芒果費茲", "Mango Fizz", "Gin Fizz", "琴酒", "gin", "長飲", "檸檬", "lemon", "甜的", "清爽", "果香", "芒果", "mango"],
             "name": {
                 "en": "Mango Fizz",
                 "zh": "芒果費茲"
@@ -513,7 +513,7 @@
         {
             "igtoken": "B4r_aGllVdG",
             "key": "TEAquila",
-            "keys": ["茶舌蘭", "TEAquila", "龍舌蘭", "tequila", "短飲", "檸檬", "lemon", "蜂蜜", "茶香", "茶"],
+            "keys": ["茶舌蘭", "TEAquila", "龍舌蘭", "tequila", "短飲", "檸檬", "lemon", "蜂蜜", "茶香", "茶", "甜的"],
             "name": {
                 "en": "TEAquila",
                 "zh": "茶舌蘭"
@@ -563,7 +563,7 @@
         {
             "igtoken": "B6p--4OlbgF",
             "key": "pallini_sunshine",
-            "keys": ["陽光下的帕里尼", "Pallini Sunshine", "gin", "琴酒", "葡萄柚", "果香", "短飲", "檸檬", "lemon", "君度", "cointreau"],
+            "keys": ["陽光下的帕里尼", "Pallini Sunshine", "gin", "琴酒", "葡萄柚", "果香", "酸的", "短飲", "檸檬", "lemon", "君度", "cointreau"],
             "name": {
                 "en": "Pallini Sunshine",
                 "zh": "陽光下的帕里尼"
@@ -583,7 +583,7 @@
         {
             "igtoken": "BwzJebUF48u",
             "key": "coffee_gin_tonic",
-            "keys": ["咖啡琴通寧", "Coffee Gin Tonic", "tonic", "琴酒", "gin", "長飲", "檸檬", "lemon", "清爽", "咖啡", "coffee"],
+            "keys": ["咖啡琴通寧", "Coffee Gin Tonic", "tonic", "琴酒", "gin", "長飲", "檸檬", "lemon", "酸的", "清爽", "咖啡", "coffee"],
             "name": {
                 "en": "Coffee Gin Tonic",
                 "zh": "咖啡琴通寧"
@@ -693,7 +693,7 @@
         {
             "igtoken": "By46D0plHm-",
             "key": "gin_fruit_tea",
-            "keys": ["深琴水果茶", "Gin Fruit Tea", "Gin", "琴酒", "水果茶", "茶", "茶香", "水果", "甜的", "夏日", "Bubble Tea", "Fruit Tea", "手搖飲料", "手搖", "懶人"],
+            "keys": ["深琴水果茶", "Gin Fruit Tea", "Gin", "琴酒", "水果茶", "茶", "茶香", "水果", "果香", "甜的", "夏日", "Bubble Tea", "Fruit Tea", "手搖飲料", "手搖", "懶人"],
             "name": {
                 "en": "Gin Fruit Tea",
                 "zh": "深琴水果茶"
@@ -723,7 +723,7 @@
         {
             "igtoken": "BzVicdClfyt",
             "key": "sex_on_the_beach_ii",
-            "keys": ["性感海灘 II", "性感海灘", "Sex on the Beach II", "Vodka", "伏特加", "茶", "水果茶", "茶香", "水果", "甜的", "酸的", "夏日", "鳳梨", "Pineapple", "蔓越莓", "Cranberry", "Bubble Tea", "Fruit Tea", "手搖飲料", "手搖", "懶人"],
+            "keys": ["性感海灘 II", "性感海灘", "Sex on the Beach II", "Vodka", "伏特加", "茶", "水果茶", "茶香", "水果", "果香", "甜的", "酸的", "夏日", "鳳梨", "Pineapple", "蔓越莓", "Cranberry", "Bubble Tea", "Fruit Tea", "手搖飲料", "手搖", "懶人"],
             "name": {
                 "en": "Sex on the Beach II",
                 "zh": "性感海灘 II"
@@ -733,7 +733,7 @@
         {
             "igtoken": "BznFwrzlERu",
             "key": "sugar_cane_family",
-            "keys": ["甘蔗一家", "Sugar Cane Family", "Rum", "蘭姆酒", "萊姆酒", "朗姆酒", "茶", "水果茶", "茶香", "水果", "甜的", "夏日", "甘蔗", "Sugar Cane", "Bubble Tea", "Fruit Tea", "手搖飲料", "手搖", "懶人"],
+            "keys": ["甘蔗一家", "Sugar Cane Family", "Rum", "蘭姆酒", "萊姆酒", "朗姆酒", "茶", "水果茶", "茶香", "水果", "果香", "甜的", "夏日", "甘蔗", "Sugar Cane", "Bubble Tea", "Fruit Tea", "手搖飲料", "手搖", "懶人"],
             "name": {
                 "en": "Sugar Cane Family",
                 "zh": "甘蔗一家"
@@ -753,7 +753,7 @@
         {
             "igtoken": "B0dj7qZFGyp",
             "key": "te_sangria",
-            "keys": ["桑格莉亞茶", "Té Sangria", "Red Wine", "紅酒", "伯爵茶", "茶香", "茶", "水果茶", "水果", "甜的", "酸的", "夏日", "Earl Grey", "Bubble Tea", "Fruit Tea", "Tea", "手搖飲料", "手搖", "懶人"],
+            "keys": ["桑格莉亞茶", "Té Sangria", "Red Wine", "紅酒", "伯爵茶", "茶香", "茶", "水果茶", "水果", "果香", "甜的", "酸的", "夏日", "Earl Grey", "Bubble Tea", "Fruit Tea", "Tea", "手搖飲料", "手搖", "懶人"],
             "name": {
                 "en": "Té Sangria",
                 "zh": "桑格莉亞茶"
@@ -869,6 +869,26 @@
                 "zh": "檸檬冬瓜燒酒"
             },
             "signature": true
+        },
+        {
+            "igtoken": "CBab1holZzy",
+            "key": "may_fantasia",
+            "keys": ["五月的幻想曲", "May Fantasia", "花香", "果香", "茶香", "短飲", "白酒", "wine", "甜的", "玫瑰花", "rose", "桃", "水蜜桃"],
+            "name": {
+                "en": "May Fantasia",
+                "zh": "五月的幻想曲"
+            },
+            "signature": true
+        },
+        {
+            "igtoken": "CBscaiglqUV",
+            "key": "martini",
+            "keys": ["馬丁尼", "Martini", "琴酒", "gin", "短飲", "香艾酒", "vermouth", "酒感"],
+            "name": {
+                "en": "Martini",
+                "zh": "馬丁尼"
+            },
+            "signature": false
         }
     ]
 }
diff --git a/public/main.js b/public/main.js