Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: updating meet our team page #426

Merged
merged 10 commits into from
May 5, 2023
2 changes: 1 addition & 1 deletion .github/actions/microapp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:
shell: bash
working-directory: ${{ inputs.path }}
run: |
npm install -g pnpm
npm install -g pnpm@6
pnpm install --filter .

# - name: Test
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const MeetOurTeam = () => {
socials={member.socials}
profileText={member.profileText}
onClick={() => setActiveCardName(member.name)}
onClose={() => setActiveCardName("")}
isOpen={member.name === activeCardName}
/>
))}
Expand Down
30 changes: 12 additions & 18 deletions apps/root/src/components/aboutUs/MeetOurTeam/memberList.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import akylai from "@app/assets/img/contributors/akylai.jpg";
import alina from "@app/assets/img/contributors/alina.jpg";
import austin from "@app/assets/img/contributors/austin.jpg";
import george from "@app/assets/img/contributors/george.jpg";
Expand All @@ -11,7 +10,7 @@ import kaede from "@app/assets/img/contributors/kaede.jpg";
import kaiqing from "@app/assets/img/contributors/kaiqing.jpg";
import kong from "@app/assets/img/contributors/kong.jpg";
import mei from "@app/assets/img/contributors/mei.jpg";
import mona from "@app/assets/img/contributors/mona.jpg";
import michael from "@app/assets/img/contributors/michael.jpg";
import naomi from "@app/assets/img/contributors/naomi.jpg";
import nicholas from "@app/assets/img/contributors/nicholas.jpg";
import oscar from "@app/assets/img/contributors/oscar.jpg";
Expand Down Expand Up @@ -76,20 +75,21 @@ export const CurrentList: Array<Members> = [
{
image: jason,
name: "Jason Park",
positions: ["Backend Engineer", "Marketing"],
positions: ["Backend Engineer", "CheerLeader"],
socials: [
{
platform: linkedin,
link: "https://www.linkedin.com/in/%E6%B5%9A%E5%BD%AC-%E6%9C%B4-a9a503200",
},
{ platform: github, link: "https://github.com/JasonNotJson" },
],
profileText: "Imagine Sisyphus happy.",
},
// nicholas
{
image: nicholas,
name: "Nicholas Narmada",
positions: ["Frontend Engineer"],
positions: ["Frontend - react"],
socials: [
{ platform: instagram, link: "https://www.instagram.com/nichnarmada/" },
{ platform: github, link: "https://github.com/nichnarmada" },
Expand Down Expand Up @@ -130,26 +130,20 @@ export const CurrentList: Array<Members> = [
],
profileText: "Stay real, stay cool :)",
},
// akylai
// michael
{
image: akylai,
name: "Akylai",
positions: ["Frontend Apprentice"],
image: michael,
name: "Michael Kaminski",
positions: ["Frontend - react"],
socials: [
{
platform: instagram,
link: "https://www.instagram.com/akylaimanalieva/",
link: "https://www.instagram.com/michaelkaminsk/",
},
{ platform: github, link: "https://github.com/kamlnskll" },
{ platform: linkedin, link: "https://www.linkedin.com/in/mkaminsk/" },
],
},
// mona
{
image: mona,
name: "Mona Matsuda",
positions: ["Frontend Apprentice"],
socials: [
{ platform: instagram, link: "https://www.instagram.com/monamrym/" },
],
profileText: "Coming up with one!",
},
];

Expand Down
5 changes: 1 addition & 4 deletions apps/root/src/components/block/ProfileCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ ProfileCardProps) => {
};

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"

>
<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">
{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">
{/* Profile pic */}
Expand Down