From aa86b95b3b49dbf6011bbdca55d0d29afdc21421 Mon Sep 17 00:00:00 2001
From: 1989ONCE <susanloveselena@gmail.com>
Date: Mon, 12 Sep 2022 11:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=AA=E9=99=A4=E6=B4=BB=E5=8B=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/Active.js                               | 11 +++++++++++
 screens/Event/activityList.jsx                     | 10 +++++-----
 screens/Event/manage.jsx                           | 11 +++++++----
 screens/Event/style_folder/Styles_activityList.jsx |  2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/controller/Active.js b/controller/Active.js
index 08e515f..7a77625 100644
--- a/controller/Active.js
+++ b/controller/Active.js
@@ -624,6 +624,16 @@ async function getAllAttendees(docID) {
   }
   return info;
 }
+async function deleteEverySingleAttendee(docID) {
+  const db = firebase.firestore();
+  const activesRef = db.collection('attendees');
+  const querySnapshot = await activesRef.get();
+  querySnapshot.forEach(async (student) => {
+    await activesRef.doc(student.id).collection('attendedEvent').doc(docID).delete();
+    await activesRef.doc(student.id).collection('hostedEvent').doc(docID).delete();
+  });
+  console.log('delete successfully!');
+}
 
 async function removeAttendee(docID, studentID) { // remove attendee
   const db = firebase.firestore();
@@ -792,6 +802,7 @@ export default {
   getHangOutActive,
   getEventActive,
   deleteOneActive,
+  deleteEverySingleAttendee,
   getOneActive,
   fuseSearchName,
   sentMessage,
diff --git a/screens/Event/activityList.jsx b/screens/Event/activityList.jsx
index 704f1a7..7630719 100644
--- a/screens/Event/activityList.jsx
+++ b/screens/Event/activityList.jsx
@@ -89,8 +89,8 @@ function list({ navigation }) {
           <Box style={{ marginHorizontal: Dimensions.get('window').width * 0.0592 }}>
             <Box style={styles.more}>
               <HStack>
-                <Text style={{ marginRight: Dimensions.get('window').width * 0.62 }}>近期揪人</Text>
-                <Text style={{ textDecorationLine: 'underline' }} onPress={() => { navigation.navigate('moreHang'); }}>查看更多</Text>
+                <Text style={{ color: '#28527a', fontSize: 18, marginRight: Dimensions.get('window').width * 0.57 }}>近期揪人</Text>
+                <Text style={{ color: '#28527a' }} onPress={() => { navigation.navigate('moreHang'); }}>顯示更多</Text>
               </HStack>
             </Box>
             <Divider style={{ marginTop: 5 }} bg="#BFBFBF" /* my=margin-top and margin-bottom */ />
@@ -154,11 +154,11 @@ function list({ navigation }) {
               </View>
             </ScrollView>
           </View>
-          <Box style={{ marginHorizontal: Dimensions.get('window').width * 0.0592 }}>
+          <Box style={{ marginHorizontal: Dimensions.get('window').width * 0.06 }}>
             <Box style={styles.more}>
               <HStack>
-                <Text style={{ marginRight: Dimensions.get('window').width * 0.62 }}>近期活動</Text>
-                <Text style={{ textDecorationLine: 'underline' }} onPress={() => { navigation.navigate('more'); }}>查看更多</Text>
+                <Text style={{ color: '#28527a', fontSize: 18, marginRight: Dimensions.get('window').width * 0.57 }}>熱門活動</Text>
+                <Text style={{ color: '#28527a' }} onPress={() => { navigation.navigate('more'); }}>顯示更多</Text>
               </HStack>
             </Box>
             <Divider style={{ marginTop: 5 }} bg="#BFBFBF" /* my=margin-top and margin-bottom */ />
diff --git a/screens/Event/manage.jsx b/screens/Event/manage.jsx
index dca985a..a99c726 100644
--- a/screens/Event/manage.jsx
+++ b/screens/Event/manage.jsx
@@ -190,16 +190,18 @@ function manage({ route, navigation }) {
                             </Box>
                             <Box
                               style={{ marginTop: 10 }}
-                              onPress={() => {
-                                ActiveController.removeAttendee(passedID, item.studentID);
-                              }}
                             >
                               <Text
                                 style={{
                                   color: '#ffffff', backgroundColor: '#ef4444', padding: 10, borderRadius: 4, marginLeft: 10, marginTop: Dimensions.get('window').width * 0.009,
                                 }}
+                                onPress={() => {
+                                  setShowDialog1(false);
+                                  ActiveController.deleteOneActive(passedID);
+                                  ActiveController.deleteEverySingleAttendee(passedID);
+                                }}
                               >
-                                移除
+                                刪除
 
                               </Text>
                             </Box>
@@ -433,6 +435,7 @@ function manage({ route, navigation }) {
                                       <Box
                                         style={{ marginTop: 10 }}
                                         onPress={() => {
+                                          setShowDialog2(false);
                                           ActiveController.removeAttendee(passedID, item.studentID);
                                         }}
                                       >
diff --git a/screens/Event/style_folder/Styles_activityList.jsx b/screens/Event/style_folder/Styles_activityList.jsx
index 251df98..4d7747c 100644
--- a/screens/Event/style_folder/Styles_activityList.jsx
+++ b/screens/Event/style_folder/Styles_activityList.jsx
@@ -50,7 +50,7 @@ export default StyleSheet.create({
     marginTop: -3,
   },
   more: {
-    height: 27,
+    height: 35,
     paddingTop: 10,
   },
   pic: {