Merge pull request #25 from nAgI314/main

Added: confirmation when deleting
suiranfes · May 30, 2024 · 8238cfc · 8238cfc
2 parents 8c238ea + 62d3ffe
commit 8238cfc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -188,7 +188,7 @@ function App() {
   let sum = 0;
 
   // 模擬店かどうか判別
-  if (code.indexOf("焼きそば") === 0) {
+  if (code.indexOf("チュロス") === 0) {
     const allArray = code.split(";");// 品ごとに分割
     var nameArray: string[] = new Array(allArray.length - 1);
     var costArray: number[] = new Array(allArray.length - 1);
@@ -222,7 +222,7 @@ function App() {
     const _code = e;
 
     // 模擬店かどうか判別
-    if (_code.indexOf("焼きそば") === 0) {
+    if (_code.indexOf("チュロス") === 0) {
       // 品ごとに分割
       const _allArray = _code.replace(/\s+/g, "").split(";");
       var _nameArray: string[] = new Array(_allArray.length - 1);

diff --git a/src/dataToFirebase.tsx b/src/dataToFirebase.tsx
@@ -54,7 +54,7 @@ export const PreserveDataComponent: React.FC<{ data: Obj[], data2: Obj[] }> = ({
     const getPassword = async () => {
       const querySnapshot = await getDocs(collection(db, "passwords"));
       const fetchedData = querySnapshot.docs.map(doc => doc.data());
-      console.log(fetchedData);
+      //console.log(fetchedData);
       //passwordArray
       for (let i = 0; i < fetchedData.length; i++) {
         passwordArray[i] = fetchedData[i].password;

diff --git a/src/showCal.tsx b/src/showCal.tsx
@@ -105,10 +105,12 @@ const ItemTable: React.FC<{ items: Item[] }> = ({ items }) => {
   };
 
   const deleteData = () => {
-    setItemList(items.map(item => ({ ...item, quantity: 0 })));
-    setSum(0);
-    set_InputValue("");
-    setchange(0);
+    if(window.confirm("本当に削除しますか？")===true){
+      setItemList(items.map(item => ({ ...item, quantity: 0 })));
+      setSum(0);
+      set_InputValue("");
+      setchange(0);
+    }
   }
 
   // const returnChange = () => {