[S03P31A503-132] feature/FE/drinkCount : Add SweetAlert For DrunkWarning

해당 주종의 음주량을 넘었을 시 sweetalert 띄워주기 해당 주종이 0일시 -버튼 못 누르게 pointer 추가
scl2589 · Nov 14, 2020 · 02955bb · 02955bb
1 parent d6ed120
commit 02955bb
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 73 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/components/meetingpage/UserVideo.vue b/frontend/src/components/meetingpage/UserVideo.vue
@@ -160,6 +160,7 @@ p {
   z-index: 20;
   opacity: 0;
   padding : 10px;
+  cursor:pointer;
 }
 
 .drink-minus{
@@ -175,6 +176,7 @@ p {
   z-index: 20;
   opacity: 0;
   padding : 10px;
+  cursor:pointer;
 }
 
 .drink-plus{
@@ -189,7 +191,8 @@ p {
   text-align: center;
   z-index: 20;
   opacity: 0;
-  padding : 10px
+  padding : 10px;
+  cursor:pointer;
 }
 
 .select-other{
@@ -203,13 +206,15 @@ p {
   -ms-transform: translate(-50%, -50%);
   text-align: center;
   z-index: 30;
-  padding : 10px;
 }
 
 .other{
 	color: black;
 	position: relative;
 	z-index: 30;
+	cursor:pointer;
+	border-bottom: 0.5px solid grey;
+	padding:3px;
 }
 
 .overlay-drink-count{

diff --git a/frontend/src/store/modules/meetingStore.js b/frontend/src/store/modules/meetingStore.js
@@ -1427,8 +1427,33 @@ const meetingStore = {
       commit('SET_GOT_WASTED', null);
     },
     updateUserDrinkRecord({ state, rootGetters , commit }, num) {
-      commit('SET_TOTAL_DRINK', num);
+      let user = rootGetters.getUser;
+      let currentDrinkNum = 0;
+      let currentDrinkId = 0;   //DB상 ID
+      for(let i=0; i<user.drinks.length; i++){
+        if(user.drinks[i].liquorName==state.currentDrink){
+          if(user.drinks[i].liquorId){ //데이터가 있을 때
+            if(user.drinks[i].liquorNum == 0 && num == -1) return;  //현재까지 마신 양이 0이고 -1을 눌렀으면 return
+            user.drinks[i].liquorNum += num;
+            currentDrinkNum = user.drinks[i].liquorNum;
+            currentDrinkId = user.drinks[i].liquorId;
+
+            //주량체크
+            if(!(user.drinks[i].isOver)){ //플래그가 없을 때
+              if(user.drinks[i].liquorLimit < user.drinks[i].liquorNum){
+                  Swal.fire({
+                    title: `${state.currentDrink}의 주량을 넘었습니다`,
+                    icon: "warning",
+                  })
+                user.drinks[i].isOver = true;
+              }
+            }
+          }
+        }
+      }
+      commit('setUser', user, { root:true });
 
+      commit('SET_TOTAL_DRINK', num);
       //send drink signal JSON.stringify(song),
       let data = {
         "userId": state.publisher.stream.connection.connectionId,
@@ -1446,19 +1471,7 @@ const meetingStore = {
           console.log(err)
       })
 
-      let user = rootGetters.getUser;
-      let currentDrinkNum = 0;
-      let currentDrinkId = 0;   //DB상 ID
-      for(let i=0; i<user.drinks.length; i++){
-        if(user.drinks[i].liquorName==state.currentDrink){
-          if(user.drinks[i].liquorId){ //데이터가 있을 때
-            user.drinks[i].liquorNum += num;
-            currentDrinkNum = user.drinks[i].liquorNum;
-            currentDrinkId = user.drinks[i].liquorId;
-          }
-        }
-      }
-      commit('setUser', user, { root:true });
+      //API에 보내기
       const drinkData = {
         "liquorLimit": currentDrinkNum,
         "liquorName": state.currentDrink,