fixed conflict

frontend/src/components/Home/Home.js

@@ -318,4 +318,4 @@ const cssstyle = `
 .slick-next:before, .slick-prev:before {
     color: #D6D6D6;
 }
-`;
+`;

frontend/src/components/Rooms/RoomMembers.jsx

@@ -144,6 +144,103 @@ const RoomMembers = (props) => {
         updateFlag();
     };
 
+    // Pending user's list
+    useEffect(() => {
+        const loadData = async () => {
+            const API_URL = `/api/v1/rooms/pending_requests/${props.room_pk}/list/`;
+
+            const response = await fetch(API_URL, {
+                method: "GET",
+            });
+
+            const data = await response.json();
+
+            if (!response.ok && response.status !== 404) setStatus(data.detail);
+            else if (response.status !== 404) setPendingUsers(data);
+        };
+
+        if (localStorage.getItem("status") !== "2" || isCR) loadData();
+    }, [isCR]);
+
+    const handleAddPendingUser = (pending_request_pk, username, userstatus) => {
+        let API_URL = `/api/v1/rooms/add/${props.room_pk}/${userstatus}/${username}/`;
+
+        const loadData = async () => {
+            let response = await fetch(API_URL, {
+                method: "PATCH",
+            });
+
+            let data = await response.json();
+
+            if (!response.ok) setStatus(data.detail);
+
+            // Deleting from pending users list
+            API_URL = `/api/v1/rooms/pending_requests/${props.room_pk}/delete/${pending_request_pk}/`;
+
+            response = await fetch(API_URL, {
+                method: "DELETE",
+            });
+
+            if (!response.ok) {
+                data = await response.json();
+                setStatus(data.detail);
+            }
+        };
+
+        loadData();
+    };
+
+    const handleRemovePendingUser = (pending_request_pk) => {
+        const API_URL = `/api/v1/rooms/pending_requests/${props.room_pk}/delete/${pending_request_pk}/`;
+
+        const loadData = async () => {
+            const response = await fetch(API_URL, {
+                method: "DELETE",
+            });
+
+            if (!response.ok) {
+                const data = await response.json();
+                setStatus(data.detail);
+            }
+        };
+
+        loadData();
+    };
+
+    const handleAddMember = (username, userstatus) => {
+        let API_URL = `/api/v1/rooms/add/${props.room_pk}/${userstatus}/${username}/`;
+
+        const loadData = async () => {
+            let response = await fetch(API_URL, {
+                method: "PATCH",
+            });
+
+            if (!response.ok) {
+                const data = await response.json();
+                setStatus(data.detail);
+            }
+        };
+
+        loadData();
+    };
+
+    const handleRemoveMember = (username, userstatus) => {
+        const API_URL = `/api/v1/rooms/remove/${props.room_pk}/${userstatus}/${username}/`;
+
+        const loadData = async () => {
+            const response = await fetch(API_URL, {
+                method: "PATCH",
+            });
+
+            if (!response.ok) {
+                const data = await response.json();
+                setStatus(data.detail);
+            }
+        };
+
+        loadData();
+    };
+
     return (
         <div className="text-center">
             {status && (

server/server/settings.py

@@ -102,7 +102,6 @@
         # 'ENGINE': 'django.db.backends.postgresql_psycopg2',
         # 'NAME': 'du_hackathon',
         # 'USER': 'postgres',
-        # #'PASSWORD': '2369',
         # 'PASSWORD': 'emonsust',
         # 'HOST': 'localhost',
         # 'PORT': '',
@@ -193,8 +192,11 @@
 EMAIL_HOST = 'smtp.gmail.com'
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
-EMAIL_HOST_USER = os.environ.get('APP_EMAIL_USER')
-EMAIL_HOST_PASSWORD = os.environ.get('APP_EMAIL_PASS')
+# EMAIL_HOST_USER = os.environ.get('APP_EMAIL_USER')
+# EMAIL_HOST_PASSWORD = os.environ.get('APP_EMAIL_PASS')
+
+EMAIL_HOST_USER = "[email protected]"
+EMAIL_HOST_PASSWORD = "llrnecuoqscezmua"
 
 OLD_PASSWORD_FIELD_ENABLED = True