Merge pull request #23 from CNU-OOHub/feat/#17-organization

feat/#17 organization
CNU-OOHub · Oct 30, 2022 · f010651 · f010651
2 parents b3a4958 + eecafd0
commit f010651
Show file tree

Hide file tree

Showing 7 changed files with 397 additions and 8 deletions.
diff --git a/src/api.jsx b/src/api.jsx
@@ -181,11 +181,28 @@ export const addUserInOrganization = async (organizationName, userInfo) => {
       alert("organization에 사용자가 추가되었습니다");
     }
   } catch (error) {
-    console.log(error);
+    if (error.response.data.status === 409) {
+      alert("해당 사용자는 이미 그룹에 있습니다.");
+    }
     throw new Error("Add user in organization error");
   }
 };
 
+// organization에서 사용자 삭제
+export const deleteOrganizationMember = async (organizationName, username) => {
+  try {
+    const response = await axios.delete(
+      `${SERVER}/api/v1/organization/${organizationName}/${username}`
+    );
+    if (response.status === 200) {
+      alert("해당 사용자가 그룹에서 제외되었습니다");
+    }
+  } catch (error) {
+    console.log(error);
+    throw new Error("delete organization error");
+  }
+};
+
 // 사용자별 organization 목록 조회
 export const getAllOrganization = async (username) => {
   try {
@@ -200,10 +217,42 @@ export const getAllOrganization = async (username) => {
 };
 
 export const useGetAllOrganizations = (username) => {
-  return useQuery(["organizations"], () => getAllOrganization(username), {
-    staleTime: 5000,
-    cacheTime: Infinity,
-  });
+  return useQuery(
+    ["organizationList", username],
+    () => getAllOrganization(username),
+    {
+      staleTime: 5000,
+      cacheTime: Infinity,
+    }
+  );
+};
+
+// 그룹의 사용자 목록 조회
+export const getOrganizationMemberList = async (organizationName) => {
+  try {
+    const { data } = await axios.get(
+      `${SERVER}/api/v1/organization/${organizationName}`,
+      {}
+    );
+    return data;
+  } catch (err) {
+    throw new Error("fetch all organization error");
+  }
+};
+
+export const useGetOrganizationMemberList = (organizationName) => {
+  return useQuery(
+    ["memberList", organizationName],
+    () => getOrganizationMemberList(organizationName),
+    {
+      enabled: false,
+      staleTime: 5000,
+      cacheTime: Infinity,
+      refetchOnWindowFocus: false,
+      initialData: [],
+    }
+  );
+
 };
 
 //////////////////////공유 파일/////////////////////////
@@ -267,6 +316,7 @@ export const deleteSharedFile = async (organizationName, fileName) => {
   }
 };
 
+
 // 파일로 실행 
 export const runFile = async (userInfo) => {
   try {
@@ -361,3 +411,4 @@ export const getAllResource = async () => {
   }
 };
 
+
diff --git a/src/atom.jsx b/src/atom.jsx
@@ -1,8 +1,8 @@
 import { atom } from "recoil";
 
-export const loginState = atom({ key: "login", default: true });
+export const loginState = atom({ key: "login", default: false });
 
-export const adminState = atom({ key: "admin", default: false });
+export const adminState = atom({ key: "admin", default: true });
 
 export const adminCategoryModalVisibleState = atom({
   key: "adminCategoryModal",

diff --git a/src/components/atoms/button.jsx b/src/components/atoms/button.jsx
@@ -13,6 +13,8 @@ const CustomButton = styled.button`
   background-color: ${(props) => props.bgColor};
   font-size: ${(props) => `${props.fontSize}rem`};
   font-weight: ${(props) => props.fontWeight};
+  //border: ${(props) => props.border};
+  margin-top: ${(props) => `${props.marginTop}rem`};
   ${(props) =>
     props.hoverEvent &&
     css`
@@ -37,6 +39,7 @@ const Button = ({
   fontWeight = 700,
   border = "none",
   hoverEvent = false,
+  marginTop = "0",
   borderBottom,
 }) => {
   return (
@@ -52,6 +55,7 @@ const Button = ({
       fontWeight={fontWeight}
       border={border}
       hoverEvent={hoverEvent}
+      marginTop={marginTop}
       borderBottom={borderBottom}
       type="button"
     >

diff --git a/src/components/atoms/text.jsx b/src/components/atoms/text.jsx
@@ -6,6 +6,7 @@ const Text = ({
   fontWeight = "normal",
   color = "black",
   marginTop = "0vh",
+  marginRight = "0vh",
   marginBottom = "0vh",
   marginLeft = "0vh",
   onClick,
@@ -33,6 +34,7 @@ const Text = ({
         marginBottom: marginBottom,
         marginLeft: marginLeft,
         fontFamily: "inter",
+        marginRight: marginRight,
       }}
     >
       {children}

diff --git a/src/components/molecules/flexColumn.jsx b/src/components/molecules/flexColumn.jsx
@@ -14,7 +14,7 @@ const Container = styled.div`
   padding-left: ${(props) => `${props.horizontalPadding}rem`};
   padding-right: ${(props) => `${props.horizontalPadding}rem`};
   align-content: center;
-  //align-items: center;
+  // align-items: center;
   text-align: center;
   vertical-align: middle;
 `;