rfac: workspace-view

mdgspace · Feb 16, 2024 · 416af5d · 416af5d
1 parent f756b4d
commit 416af5d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/app/components/timeRangeSwitch/index.tsx b/src/app/components/timeRangeSwitch/index.tsx
@@ -14,7 +14,7 @@ const TimeRangeSwitch: React.FC<Props> = ({ weekly, setWeekly }) => {
   // const dispatch = useDispatch();
   // const isWeekly = useSelector((state: timeRangeModel) => state.isWeekly.value);
  useEffect(()=>{
-  console.log(weekly,"makki")
+
  },[weekly, setWeekly])
   return (
     <div className='timerange-cont'>

diff --git a/src/app/index.scss b/src/app/index.scss
@@ -37,3 +37,8 @@ a:hover {
 .bd-white {
   border: 1px solid white;
 }
+
+
+.pointer{
+  cursor: pointer;
+}
diff --git a/src/features/workspace-view/index.tsx b/src/features/workspace-view/index.tsx
@@ -15,6 +15,7 @@ const WorkspaceView = () => {
   const [isLoad, setIsLoad] = useState<boolean>(false);
   const [archeives, setArcheives] = useState<boolean>(false);
   const token = localStorage.getItem('token');
+  const [orgs, setOrgs] = useState<UserOrgDetails[]>();
   const navigate = useNavigate();
   const fetchData = async () => {
     if (token && userContext?.username) {
@@ -25,6 +26,7 @@ const WorkspaceView = () => {
           userContext?.username.toString()
         );
         userContext?.setUserOrgs(userOrgs.data);
+
       } catch (e) {}
 
       setIsLoad(false);

diff --git a/src/features/workspace-view/workspace-card/index.tsx b/src/features/workspace-view/workspace-card/index.tsx
@@ -22,6 +22,7 @@ type workspaceCardProps = {
   bookmark: boolean;
   archeives: boolean;
 };
+
 interface members {
   [username: string]: string;
 }
@@ -31,7 +32,6 @@ const WorkspaceCard = (props: workspaceCardProps) => {
   const [description, setDescription] = useState<null | string>(null);
   const [showPopUp, setShowPopUp] = useState(false);
   const token = localStorage.getItem('token');
-  const [fileName, setFileName] = useState<string | null>(null);
   const [imageSrc, setImageSrc] = useState<string | null>(null);
   const [members, setMembers] = useState<members | null>(null);
   const [membersArray, setMembersArray]= useState<{username:string}[]>([]);
@@ -167,7 +167,7 @@ const WorkspaceCard = (props: workspaceCardProps) => {
         <div className='workspace-card'>
           <div className='workspace-card-body'>
             <div
-              className='workspace-popup-btn'
+              className='workspace-popup-btn pointer'
               onClick={() => setShowPopUp(showPopUp ? false : true)}
             >
               {!workspaceName.endsWith('-userspace') && (
@@ -178,24 +178,24 @@ const WorkspaceCard = (props: workspaceCardProps) => {
               )}
             </div>
             <div className={showPopUp ? 'workspace-popup' : 'hide'}>
-              <div className='pin' onClick={HandlePin}>
+              <div className='pin pointer' onClick={HandlePin}>
                 {bookmark ? 'UnPin' : 'Pin'}
               </div>
-              <div className='archive' onClick={HandleArchive}>
+              <div className='archive pointer' onClick={HandleArchive}>
                 {archeive ? 'Unarchive' : 'archive'}
               </div>
               {members &&
                 userContext?.username &&
                 members[userContext?.username.toString()] === 'admin' && (
-                  <div className='delete' onClick={HandleDelete}>
+                  <div className='delete pointer' onClick={HandleDelete}>
                     delete
                   </div>
                 )}
               {members &&
                 userContext?.username &&
                 members[userContext?.username.toString()] === 'admin' && (
                   <div
-                    className='Edit'
+                    className='Edit pointer'
                     onClick={() => navigate(`/editWorkspace/${workspaceName}`)}
                   >
                     edit
@@ -219,7 +219,7 @@ const WorkspaceCard = (props: workspaceCardProps) => {
                     ? "USER's WORKSPACE"
                     : workspaceName}
                 </div>
-                <div className='members-view-container' onClick={()=>navigate(`/workspaceMembers/${workspaceName}`)}>
+                <div className='members-view-container pointer' onClick={()=>navigate(`/workspaceMembers/${workspaceName}`)}>
                   <div className='workspace-members-imgs'>
                     <div className='image-stack'>
                       { membersArray.length > 0 ? (
@@ -258,6 +258,7 @@ const WorkspaceCard = (props: workspaceCardProps) => {
             <div className='workspace-details-btn'>
               <img
                 src={rightNavbtn}
+                className='pointer'
                 onClick={() => navigate(`/workspace/${workspaceName}`)}
                 alt=''
               />