Revert "Feature/autoclose profile (#413)"

This reverts commit 2c97d45.
wasedatime · Oct 27, 2022 · 0a8d8ab · 0a8d8ab
1 parent 2c97d45
commit 0a8d8ab
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 190 deletions.
diff --git a/root/src/assets/img/partners/kredit.png b/root/src/assets/img/partners/kredit.png
diff --git a/root/src/components/aboutUs/AboutUs.tsx b/root/src/components/aboutUs/AboutUs.tsx
@@ -11,7 +11,7 @@ import styled from "styled-components";
 
 import JoinUs from "@app/components/aboutUs/JoinUs";
 import OurMission from "@app/components/aboutUs/OurMission";
-import Partners from "@app/components/aboutUs/PartnersPage/Partners";
+import Partners from "@app/components/aboutUs/Partners";
 import { gaAppendActionWithLng, gaChangeLanguage } from "@app/ga/eventActions";
 import { gaLanguage } from "@app/ga/eventCategories";
 import { ThemeContext } from "@app/utils/theme-context";

diff --git a/root/src/components/aboutUs/MeetOurTeam/MeetOurTeam.tsx b/root/src/components/aboutUs/MeetOurTeam/MeetOurTeam.tsx
@@ -1,12 +1,12 @@
-import React, { useEffect, useState } from "react";
+import React from "react";
 
 import { Wrapper } from "@bit/wasedatime.core.ts.styles.wrapper";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 
 import {
-  CurrentList,
   AlumniList,
+  CurrentList,
 } from "@app/components/aboutUs/MeetOurTeam/memberList";
 
 import { ProfileCard } from "@app/components/block/ProfileCard";
@@ -33,11 +33,6 @@ const CardArea = styled("div")`
 
 const MeetOurTeam = () => {
   const { t } = useTranslation();
-  const [activeCardName, setActiveCardName] = useState("");
-
-  useEffect(() => {
-    console.log(activeCardName);
-  }, [activeCardName]);
 
   return (
     <Wrapper>
@@ -55,9 +50,6 @@ const MeetOurTeam = () => {
             positions={member.positions}
             socials={member.socials}
             profileText={member.profileText}
-            isOpen={activeCardName !== "" && member.name === activeCardName}
-            onClick={() => setActiveCardName(member.name)}
-            onClose={() => setActiveCardName("")}
           />
         ))}
       </CardArea>
@@ -73,8 +65,6 @@ const MeetOurTeam = () => {
             positions={member.positions}
             socials={member.socials}
             profileText={member.profileText}
-            onClick={() => setActiveCardName(member.name)}
-            isOpen={member.name === activeCardName}
           />
         ))}
       </CardArea>

diff --git a/root/src/components/aboutUs/MeetOurTeam/memberList.ts b/root/src/components/aboutUs/MeetOurTeam/memberList.ts
@@ -37,8 +37,6 @@ export interface Members {
   positions: Array<string>;
   socials?: Array<{ platform: string; link: string }>;
   profileText?: string;
-  isOpen?: boolean;
-  onClick?: () => void;
 }
 
 export const CurrentList: Array<Members> = [

diff --git a/root/src/components/aboutUs/PartnersPage/PartnerList.ts b/root/src/components/aboutUs/PartnersPage/PartnerList.ts
diff --git a/root/src/components/aboutUs/PartnersPage/Partners.tsx b/root/src/components/aboutUs/PartnersPage/Partners.tsx
diff --git a/root/src/components/block/ProfileCard.tsx b/root/src/components/block/ProfileCard.tsx
@@ -26,12 +26,9 @@ const MediaIcon = styled("img")`
 export interface ProfileCardProps {
   image: string;
   name: string;
-  positions?: Array<string>;
+  positions: Array<string>;
   socials?: Array<{ platform: string; link: string }>;
   profileText?: string;
-  onClick?: () => void;
-  onClose?: () => void;
-  isOpen?: boolean;
   // mini?: boolean;
 }
 
@@ -41,24 +38,23 @@ export const ProfileCard = ({
   positions,
   socials,
   profileText,
-  onClick,
-  onClose,
-  isOpen,
 }: // mini,
 ProfileCardProps) => {
   const [showCard, setShowCard] = useState<boolean>(false);
-
   const handleClick = () => {
     setShowCard(!showCard);
   };
 
   return (
     <Card
       className="block group cursor-pointer transition ease-in-out delay-300ms transition-duration:1500ms md:mx-8 md:my-6 lg:mx-10 lg:my-8"
-
+      onClick={handleClick}
     >
-      {isOpen ? (
-        <div className="card w-auto card-side rounded-8xl bg-gradient-to-r from-light-card2 to-light-card1 dark:bg-gradient-to-r dark:from-dark-card2 dark:to-dark-bgMain drop-shadow-lg translate-x-[5px] transition ease-in-out delay-200ms transition-duration:3000ms my-[9px] sm:my-[16px] z-20">
+      {showCard ? (
+        <div
+          // Card: pic + hidden card-body +  Name
+          className="card w-auto card-side rounded-8xl bg-gradient-to-r from-light-card2 to-light-card1 dark:bg-gradient-to-r dark:from-dark-card2 dark:to-dark-bgMain drop-shadow-lg translate-x-[5px] transition ease-in-out delay-200ms transition-duration:3000ms my-[9px] sm:my-[16px] z-20"
+        >
           {/* Profile pic */}
           <figure className="px-3 py-3 sm:px-5 sm:py-5">
             {/* responsive for smaller screen: w/h - [100px] */}
@@ -70,7 +66,7 @@ ProfileCardProps) => {
           {/* Card Body */}
           <div className="card-body items-left text-left w-[200px] sm:w-[260px] block opacity-100 p-[10px] sm:p-[20px]">
             {/* close button from daisyui */}
-            <div className="card-actions justify-end" onClick={onClose}>
+            <div className="card-actions justify-end">
               <button className="btn btn-square btn-sm border-transparent hover:border-transparent bg-light-card1 hover:bg-light-card2 focus:bg-light-card3 dark:bg-transparent dark:hover:bg-dark-card1 dark:focus:bg-dark-card2">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
@@ -126,8 +122,7 @@ ProfileCardProps) => {
           </div>
         </div>
       ) : (
-        // Card: pic + hidden card-body +  Name
-        <div onClick={onClick}>
+        <div>
           <div>
             <p className="text-center text-lg sm:text-xl text-transparent font-bold group-hover:text-light-text2 dark:group-hover:text-dark-text1 translate-y-[85px] sm:translate-y-[110px] z-10">
               Click to view the profile!