Merge branch 'sudo' of github.com:mdgspace/activity-leaderboard into kitu

kituuu · kituuu · commit 22cc4e6430c7 · 2024-02-16T15:46:07.000+05:30
diff --git a/src/app/api/.gitkeep b/src/app/api/.gitkeep
diff --git a/src/app/api/file.ts b/src/app/api/file.ts
@@ -7,6 +7,9 @@ export interface FileUpload {
   statusCode: number;
 }
 
+export interface IconNameRes{
+  message: string
+}
 export const uploadIcon = async (
   authorizationToken: string,
   orgName: string,
@@ -53,3 +56,20 @@ export const deleteFile = async (
   });
   return respnse;
 };
+
+
+export const getIconName = async(
+  authorizationToken: string,
+  orgName: string 
+): Promise<AxiosResponse<IconNameRes>>=>{
+  const url= BACKEND_URL+'/api/protected/file/getIconName/'+orgName
+  const response = await axios.get<IconNameRes>(url,
+    {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${authorizationToken}`,
+      },
+    })
+    return response
+
+}
diff --git a/src/app/api/user.ts b/src/app/api/user.ts
@@ -13,7 +13,7 @@ export interface UserOrgDetails {
   [key: string]: {
     bookmark: string;
     role: string;
-    archive: string;
+    archeive: string;
   };
 }
 
diff --git a/src/app/components/timeRangeSwitch/index.tsx b/src/app/components/timeRangeSwitch/index.tsx
@@ -13,21 +13,23 @@ interface Props {
 const TimeRangeSwitch: React.FC<Props> = ({ weekly, setWeekly }) => {
   // const dispatch = useDispatch();
   // const isWeekly = useSelector((state: timeRangeModel) => state.isWeekly.value);
-  useEffect(() => {
-    console.log(weekly);
-  }, [weekly, setWeekly]);
+ useEffect(()=>{
+  console.log(weekly,"makki")
+ },[weekly, setWeekly])
   return (
     <div className='timerange-cont'>
       <button
         onClick={() => setWeekly(true)}
-        className={weekly ? 'active' : ''}
-        // className={'active'}
+        className={weekly ? 'active' :''}
+        style={weekly?{}:{background:'transparent'}}
+     
       >
         Weekly{' '}
       </button>
       <button
         onClick={() => setWeekly(false)}
-        className={weekly ? '' : 'active'}
+        className={weekly ? '' :'active'}
+        style={weekly?{background:'transparent'}:{}}
       >
         Monthly{' '}
       </button>
diff --git a/src/features/EditWorkspace/index.tsx b/src/features/EditWorkspace/index.tsx
@@ -51,8 +51,10 @@ const EditWorkspace = () => {
         setUsers(users_aray);
         setOrgs(org_aray);
       }
-      if (token && spaceName) {
-        SetName(spaceName);
+      if(token&&spaceName){
+        SetName(spaceName)
+        setUniqueName(true)
+        setValidName(true)
       }
       if (token && spaceName) {
         const Org = await getOrg(token, spaceName);
@@ -105,33 +107,7 @@ const EditWorkspace = () => {
     }
   };
 
-  const addMembers = () => {
-    if (memberName) {
-      if (
-        users.includes(memberName) &&
-        memberName != userContext?.username &&
-        !members.includes(memberName)
-      ) {
-        setMembers([...members, memberName]);
-        setMemberName(null);
-      }
-    }
-  };
-
-  const removeMembers = (member: string) => {
-    const indexToRemove = members.indexOf(member);
 
-    if (indexToRemove !== -1) {
-      const updatedMembers = [
-        ...members.slice(0, indexToRemove),
-        ...members.slice(indexToRemove + 1),
-      ];
-
-      setMembers(updatedMembers);
-    } else {
-      console.warn(`Member "${member}" not found in the members array.`);
-    }
-  };
   const SubmitHandler = async (): Promise<void> => {
     if (
       description &&
@@ -142,6 +118,7 @@ const EditWorkspace = () => {
       uniqueName &&
       validDescription
     ) {
+     
       const func = async (): Promise<void> => {
         const dataRes = await updateOrg(token, spaceName, {
           name: name,
@@ -163,6 +140,7 @@ const EditWorkspace = () => {
         error: <b>Could not save</b>,
       });
     } else {
+   
       toast.error('Invalid inputs');
     }
   };
diff --git a/src/features/project-members /components/MemberCard.tsx b/src/features/project-members /components/MemberCard.tsx
@@ -50,31 +50,24 @@ const MemberCard = ({
     }
   };
 
-  const HandleRoleChange = async (event: ChangeEvent<HTMLSelectElement>) => {
-    const new_role = event.target.value;
-    if (
-      token &&
-      spaceName &&
-      orgMembers &&
-      projectMembers &&
-      new_role != role
-    ) {
-      const func = async () => {
-        console.log({ [name]: new_role });
-        const res = await changeProjectMembersStatus(
-          token,
-          projectName,
-          spaceName,
-          { [name]: new_role }
-        );
-        projectMembers[name] = new_role;
-        setProjectMembers(projectMembers);
-      };
-      toast.promise(func(), {
-        loading: 'Changing Role',
-        success: <b>Role changed</b>,
-        error: <b>Unable to change</b>,
-      });
+  const HandleRoleChange= async(event:ChangeEvent<HTMLSelectElement>)=>{
+    
+    const new_role= event.target.value
+    if(token&&spaceName&&orgMembers&&projectMembers&&new_role!=role){
+    
+
+        const func= async()=>{
+    
+          const res= await changeProjectMembersStatus(token,projectName ,spaceName,{[name]:new_role})
+          projectMembers[name]=new_role
+          setProjectMembers(projectMembers)
+        }
+        toast.promise(func(), {
+          loading: 'Changing Role',
+          success: <b>Role changed</b>,
+          error: <b>Unable to change</b>,
+        });
+        
     }
   };
 
diff --git a/src/features/workspace-members /components/BackNavigation.tsx b/src/features/workspace-members /components/BackNavigation.tsx
@@ -1,10 +1,8 @@
 import { useNavigate } from 'react-router-dom';
 
 const BackNavigation = () => {
-  // const clickBack = () => {
-  //   console.log('Back button clicked');
-  // };
-  const navigate = useNavigate();
+
+  const navigate= useNavigate()
   return (
     <div className='back-title-container'>
       <button className='button' onClick={() => navigate('/')}>
diff --git a/src/features/workspace-members /components/MemberCard.tsx b/src/features/workspace-members /components/MemberCard.tsx
@@ -40,13 +40,22 @@ const MemberCard = ({
     }
   };
 
-  const HandleRoleChange = async (event: ChangeEvent<HTMLSelectElement>) => {
-    const new_role = event.target.value;
-    if (token && spaceName && orgMembers && new_role != role) {
-      const func = async () => {
-        console.log({ [name]: new_role });
-        const res = await changeOrgMembersStatus(token, spaceName, {
-          [name]: new_role,
+  const HandleRoleChange= async(event:ChangeEvent<HTMLSelectElement>)=>{
+    
+    const new_role= event.target.value
+    if(token&&spaceName&&orgMembers&&new_role!=role){
+    
+
+        const func= async()=>{
+    
+          const res= await changeOrgMembersStatus(token, spaceName,{[name]:new_role})
+          orgMembers[name]=new_role
+          setOrgMembers(orgMembers)
+        
+        toast.promise(func(), {
+          loading: 'Changing Role',
+          success: <b>Role changed</b>,
+          error: <b>Unable to change</b>,
         });
         orgMembers[name] = new_role;
         setOrgMembers(orgMembers);
diff --git a/src/features/workspace-view/index.tsx b/src/features/workspace-view/index.tsx
@@ -9,6 +9,7 @@ import loader from '../../app/assets/gifs/loader.gif';
 import { Navigate, useNavigate } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import FirstVisit from 'app/components/firstVisit';
+import toast from 'react-hot-toast';
 
 const WorkspaceView = () => {
   const userContext = useContext(UserContext);
@@ -42,40 +43,54 @@ const WorkspaceView = () => {
     searchValue,
   ]);
 
+  const LogoutHandler= async()=>{
+    try{
+        localStorage.removeItem('token')
+        toast.success('Logout successful!');
+        navigate("/login")
+    }catch(e){
+
+    }
+  }
   return (
     <div className='workspaceview-container'>
       <FirstVisit />
       <div className='workspaceview-header'>
         <SearchBar />
 
-        <button onClick={() => setArcheives(!archeives)}>Archeives</button>
+        <button onClick={() => setArcheives(!archeives)} style={archeives?{background: '#141432'}:{}}>Archeives</button>
+        
         <button onClick={() => navigate('/addWorkspace')}>
           Create a workspace
         </button>
+        <button onClick={LogoutHandler}>
+          Logout
+        </button>
       </div>
 
       <div className='workspaceview-card-container'>
         {isLoad ? (
           <img src={loader} className='loader' />
         ) : (
-            userContext?.userOrgs &&
-              Object.entries(userContext.userOrgs.userOrgs)
-                .filter(([key, value]) => {
-                  if (key.toLowerCase().includes(searchValue.toLowerCase()))
-                    return [key, value];
-                })
-                .map(([orgName, details]) => {
-                  return (
-                    <WorkspaceCard
-                      key={orgName}
-                      workspaceName={orgName}
-                      archeive={'true' === details.archive}
-                      bookmark={'true' === details.bookmark}
-                      role={details.role}
-                      archeives={archeives}
-                    />
-                  );
-                })
+          userContext?.userOrgs &&
+          Object.entries(userContext.userOrgs.userOrgs)
+            .filter(([key, value]) => {
+              if (key.toLowerCase().includes(searchValue.toLowerCase()))
+                return [key, value];
+            })
+            .map(([orgName, details]) => {
+              
+              return (
+                <WorkspaceCard
+                  key={orgName}
+                  workspaceName={orgName}
+                  archeive={'true' === details.archeive}
+                  bookmark={'true' === details.bookmark}
+                  role={details.role}
+                  archeives={archeives}
+                />
+              );
+            })
         )}
       </div>
     </div>
diff --git a/src/features/workspace-view/workspace-card/index.tsx b/src/features/workspace-view/workspace-card/index.tsx
@@ -2,7 +2,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import './index.scss';
 import rightNavbtn from '../../../app/assets/images/right_navigation_button.svg';
 import { deleteOrg, getOrg, getOrgMembers } from 'app/api/organization';
-import { deleteFile, getIcon } from 'app/api/file';
+import { deleteFile, getIcon, getIconName } from 'app/api/file';
 import { getMembers } from 'app/api/project';
 import UserContext from 'app/context/user/userContext';
 import toast from 'react-hot-toast';
@@ -58,6 +58,13 @@ const WorkspaceCard = (props: workspaceCardProps) => {
         );
         setMembersArray(membersArray);
       } catch (e) {}
+
+      try{
+
+        const iconRes= await getIconName(token, workspaceName)
+        const fileName= iconRes.data.message
+        const deleteRes= await deleteFile(token, fileName)
+      }catch(e){}
     }
   };
 
@@ -122,12 +129,14 @@ const WorkspaceCard = (props: workspaceCardProps) => {
         const status: { [key: string]: boolean } = {
           [workspaceName]: !archeive,
         };
-        console.log(status);
-        const res = await setOrgArcheiveStatus(token, status);
-        console.log(res);
+    
+  
+         const res = await setOrgArcheiveStatus(token, status);
+     
+      
         const orgs = userContext?.userOrgs;
         if (orgs?.userOrgs.hasOwnProperty(workspaceName)) {
-          orgs.userOrgs[workspaceName].archive = (!archeive).toString();
+          orgs.userOrgs[workspaceName].archeive= (!archeive).toString();
           userContext?.setUserOrgs(orgs);
         }
       };
diff --git a/src/features/workspace/components/projectCard/index.tsx b/src/features/workspace/components/projectCard/index.tsx
@@ -38,12 +38,10 @@ const ProjectCard: React.FC<Props> = ({
   const [showPopUp, setShowPopUp] = useState(false);
   const userContext = useContext(UserContext);
   const navigate = useNavigate();
-  const [pin, setPin] = useState<boolean>(status.archeive);
-  const [archive, setArchive] = useState<boolean>(status.bookmark);
-  const [project, setProject] = useState<GetProject | null>(null);
-  const [projectMembers, setProjectMembers] = useState<
-    { key: string; value: string }[]
-  >([]);
+  const [pin, setPin] = useState<boolean>(status.bookmark);
+  const [archive, setArchive] = useState<boolean>(status.archeive);
+  const [project, setProject]= useState<GetProject|null>(null)
+  const [projectMembers, setProjectMembers]= useState<{key:string, value: string}[]>([])
 
   const fetchProjectData = async () => {
     if (token != null) {
diff --git a/src/features/workspace/components/projectCardContainer/index.tsx b/src/features/workspace/components/projectCardContainer/index.tsx
@@ -25,7 +25,6 @@ const ProjectCardCont: React.FC<Props> = ({
   const searchValue = useSelector((state: any) => state.searchKeyword.value);
 
   useEffect(() => {
-    console.log(orgProjects);
   }, [weekly, searchValue]);
 
   return (

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export interface UserOrgDetails {`
`13`	`13`	`[key: string]: {`
`14`	`14`	`bookmark: string;`
`15`	`15`	`role: string;`
`16`		`- archive: string;`
	`16`	`+ archeive: string;`
`17`	`17`	`};`
`18`	`18`	`}`
`19`	`19`