Fix: selecting user to delete

src/components/Content/AdminContent.js

@@ -1,23 +1,21 @@
-import React from "react";
+import React, { useState } from "react";
 import styled from "styled-components";
 import { useSelector, useDispatch } from "react-redux";
 import AdminDeleteModal from "../Modal/AdminDeleteModal";
 import { adminDelete } from "../../store/actions/exporterActions";
 
 const AdminContent = ({
   admin,
-  deleteAdmin,
-  cancleAdminDeleteModal,
   isAdminDeleteModalActive,
   setIsAdminDeleteModalActive,
+  setSelectedAdmiin,
 }) => {
-  const dispatch = useDispatch();
   const changeTheme = useSelector((store) => store.darkThemeReducer);
   const handleAdminDelete = (e) => {
-    const payload = e.target.name;
     setIsAdminDeleteModalActive(!isAdminDeleteModalActive);
-    dispatch(adminDelete(payload));
+    setSelectedAdmiin(e.target.name);
   };
+
   return (
     <AdminCard dark={changeTheme}>
       <AdminInfo>
@@ -34,13 +32,6 @@ const AdminContent = ({
       >
         Resign
       </AdminResign>
-      {isAdminDeleteModalActive && (
-        <AdminDeleteModal
-          adminName={admin.username}
-          deleteAdmin={deleteAdmin}
-          cancleAdminDeleteModal={cancleAdminDeleteModal}
-        />
-      )}
     </AdminCard>
   );
 };

src/components/Content/UsersContent.js

@@ -23,8 +23,6 @@ const UsersContent = ({
       setUserType(e.target.name);
       setIsAdminAddModalActive(true);
     }
-    console.log(e.target.id);
-    console.log(e.target.name);
   };
   return (
     <>

src/components/Login/Login.js

@@ -15,10 +15,6 @@ const Login = ({ history }) => {
   const callBackUrl = window.location.href;
   const code = callBackUrl.substring(callBackUrl.indexOf("=") + 1);
   const dispatch = useDispatch();
-  console.log("code ?? >>", code);
-  console.log("id ?? >> ", clientID);
-  console.log("secret ?? >> ", clientSecret);
-  console.log("url ?? >>", callBackUrl);
   const getAccessToken = () => {
     axios({
       method: "POST",
@@ -34,7 +30,6 @@ const Login = ({ history }) => {
       },
     })
       .then((res) => {
-        console.log("성공1 res >> ", res);
         setAccessToken(res.data["access_token"]);
       })
       .catch((err) => console.log(err));
@@ -48,7 +43,6 @@ const Login = ({ history }) => {
       },
     })
       .then((res) => {
-        console.log("성공2 res >> ", res);
         sessionStorage.setItem("access_token", res.data.access_token);
         sessionStorage.setItem("user_type", res.data.type);
         dispatch(getLoginState(true));

src/components/Modal/AdminAddModal.js

@@ -13,8 +13,7 @@ const AdminAddModal = ({
     cancleAdminAddModal();
     setSearchUser("");
   };
-  console.log("a", userName);
-  console.log("b", userType);
+
   return (
     <ModalContainer>
       <Div>

src/components/Modal/AdminDeleteModal.js

@@ -1,15 +1,17 @@
 import React from "react";
 import styled from "styled-components";
-import { useSelector } from "react-redux";
 
-const AdminDeleteModal = ({ cancleAdminDeleteModal, deleteAdmin }) => {
-  const selectAdmin = useSelector((store) => store.adminDeleteReducer);
+const AdminDeleteModal = ({
+  cancleAdminDeleteModal,
+  deleteAdmin,
+  adminName,
+}) => {
   return (
     <ModalContainer>
       <Div>
         <h4>Are you sure to resign this admin ?</h4>
         <Container>
-          <button onClick={() => deleteAdmin(selectAdmin)}>Yes</button>
+          <button onClick={() => deleteAdmin(adminName)}>Yes</button>
           <button onClick={cancleAdminDeleteModal}>Cancle</button>
         </Container>
       </Div>

src/components/MyBucket/MyBucket.js

@@ -36,17 +36,9 @@ const MyBucket = () => {
       <Permission
         isAdminAddModalActive={isAdminAddModalActive}
         setIsAdminAddModalActive={setIsAdminAddModalActive}
-        // isAdminDeleteModalActive={isAdminDeleteModalActive}
-        // setIsAdminDeleteModalActive={setIsAdminDeleteModalActive}
-        // cancleAdminDeleteModal={cancleAdminDeleteModal}
       />
     ),
   };
-  // console.log("삭제모달켜짐?", isAdminDeleteModalActive);
-  // const TABMENU = [
-  //   { id: 0, tabName: "Fork" },
-  //   { id: 1, tabName: "Set Admin" },
-  // ];
 
   const TABMENU = isAdmin
     ? [

src/components/MyBucket/components/Permission.js

@@ -7,6 +7,7 @@ import axios from "axios";
 import { changeBucketPage } from "../../../store/actions/exporterActions";
 import { ADMIN_API, API_SURVER } from "../../../config";
 import UsersContent from "../../Content/UsersContent";
+import AdminDeleteModal from "../../Modal/AdminDeleteModal";
 
 const Permission = () => {
   const [searchUser, setSearchUser] = useState();
@@ -17,6 +18,7 @@ const Permission = () => {
   const [isAdminDeleteModalActive, setIsAdminDeleteModalActive] = useState(
     false
   );
+  const [selectedAdmin, setSelectedAdmiin] = useState();
   const token = sessionStorage.getItem("access_token");
   const changeTheme = useSelector((store) => store.darkThemeReducer);
   const dispatch = useDispatch();
@@ -152,20 +154,21 @@ const Permission = () => {
               cancleAdminDeleteModal={cancleAdminDeleteModal}
               isAdminDeleteModalActive={isAdminDeleteModalActive}
               setIsAdminDeleteModalActive={setIsAdminDeleteModalActive}
+              setSelectedAdmiin={setSelectedAdmiin}
             />
           );
         })}
       </AdminContainer>
       <AlertModal isActive={alertModal}>
         <p>Invitation has been sent to the user's email!!</p>
       </AlertModal>
-      {/* {isAdminDeleteModalActive && (
+      {isAdminDeleteModalActive && (
         <AdminDeleteModal
-          adminName={admin.username}
+          adminName={selectedAdmin}
           deleteAdmin={deleteAdmin}
           cancleAdminDeleteModal={cancleAdminDeleteModal}
         />
-      )} */}
+      )}
     </Container>
   );
 };

src/store/actions/exporterActions.js

@@ -1,6 +1,5 @@
 const ADD_ADMIN_STATE = "ADD_ADMIN_STATE";
 const ADD_ADMIN_TYPE_STATE = "ADD_ADMIN_TYPE_STATE";
-const DELETE_ADMIN_STATE = "DELETE_ADMIN_STATE";
 const CHANGE_BUCKET_PAGE = "CHANGE_BUCKET_PAGE";
 const FILTER_BY_USER = "FILTER_BY_USER";
 const ALL_DATA = "ALL_DATA";
@@ -24,11 +23,6 @@ export const adminAdd = (payload) => ({
   payload,
 });
 
-export const adminDelete = (payload) => ({
-  type: DELETE_ADMIN_STATE,
-  payload,
-});
-
 export const changeDarkTheme = (payload) => ({
   type: GET_DARK_THEME,
   payload,

src/store/reducers/adminAddTypeReducer.js

@@ -5,7 +5,6 @@ const initialState = null;
 const adminAddTypeReducer = (state = initialState, action) => {
   switch (action.type) {
     case ADD_ADMIN_TYPE_STATE:
-      console.log("type >> ", action.payload);
       return action.payload;
     default:
       return state;

src/store/reducers/index.js

@@ -13,7 +13,6 @@ import navFilterReducer from "./navFilterReducer";
 import cateFilterReducer from "./cateFilterReducer";
 import sortFilterReducer from "./sortFilterReducer";
 import darkThemeReducer from "./darkThemeReducer";
-import adminDeleteReducer from "./adminDeleteReducer";
 import adminAddReducer from "./adminAddReducer";
 import adminAddTypeReducer from "./adminAddTypeReducer";
 export default combineReducers({
@@ -31,7 +30,6 @@ export default combineReducers({
   sortFilterReducer,
   searchFilterReducer,
   darkThemeReducer,
-  adminDeleteReducer,
   adminAddReducer,
   adminAddTypeReducer,
 });