From c3f18c72ae9d5c5022d74995f931c8f2e0c1cc94 Mon Sep 17 00:00:00 2001 From: HaudinFlorence Date: Wed, 21 Aug 2024 13:43:58 +0200 Subject: [PATCH 1/5] Try to render the popup portrait on a dedicated page. --- src/components/about/SubTeam.tsx | 17 +++++++++-------- src/components/about/index.tsx | 17 +++++++++++------ src/pages/{about.tsx => about/Johan/index.tsx} | 4 ++-- src/pages/about/Sylvain/index.tsx | 17 +++++++++++++++++ src/pages/about/index.tsx | 13 +++++++++++++ 5 files changed, 52 insertions(+), 16 deletions(-) rename src/pages/{about.tsx => about/Johan/index.tsx} (74%) create mode 100644 src/pages/about/Sylvain/index.tsx create mode 100644 src/pages/about/index.tsx diff --git a/src/components/about/SubTeam.tsx b/src/components/about/SubTeam.tsx index 93cbca3ad..68b67d7b7 100644 --- a/src/components/about/SubTeam.tsx +++ b/src/components/about/SubTeam.tsx @@ -1,10 +1,12 @@ import styles from "./styles.module.css"; import PopupPortrait from "./SmallPortraitCard"; +import Link from "@docusaurus/Link"; +import { useLocation } from "@docusaurus/router"; +import { IProps } from "."; + +export default function SubTeam({ subTeamName, subTeam}) { + const location = useLocation().pathname; -export default function SubTeam({ - subTeamName, - subTeam -}) { return (

{subTeamName}

@@ -13,10 +15,9 @@ export default function SubTeam({ {subTeam.map((person, index) => (
  • - + + +
    • ))} diff --git a/src/components/about/index.tsx b/src/components/about/index.tsx index 2a307e33b..ee610bf1f 100644 --- a/src/components/about/index.tsx +++ b/src/components/about/index.tsx @@ -1,12 +1,18 @@ import styles from "./styles.module.css"; -import { coreTeam, QSCollaboratorsTeam, leadershipTeam } from "./Team/team"; +import { coreTeam, QSCollaboratorsTeam, leadershipTeam } from "./Team/team"; import FourValues from "./FourValues"; import SubTeam from "./SubTeam"; import LinkToContact from "../home/LinkToContact"; +import PopupPortrait from "./SmallPortraitCard"; +import { Interface } from "readline"; + +export interface IProps { +popup : React.JSX.Element | null +} export function About() { return ( -
    +
    @@ -29,11 +35,10 @@ export function About() { - + - {() => } + {() => } ); } diff --git a/src/pages/about/Sylvain/index.tsx b/src/pages/about/Sylvain/index.tsx new file mode 100644 index 000000000..07595276a --- /dev/null +++ b/src/pages/about/Sylvain/index.tsx @@ -0,0 +1,17 @@ +import Layout from "@theme/Layout"; +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; +import { useLocation } from "@docusaurus/router"; + +export default function AboutPage(): JSX.Element { + const location = useLocation().pathname; + console.log("In components:", location); + const { siteConfig } = useDocusaurusContext(); + return ( + + {() => + } + + ); +} diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx new file mode 100644 index 000000000..985b85038 --- /dev/null +++ b/src/pages/about/index.tsx @@ -0,0 +1,13 @@ +import Layout from "@theme/Layout"; +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + const { siteConfig } = useDocusaurusContext(); + return ( + + {() => } + + ); +} From e2363610d159f08a93a64a27faac276b0ccc7c27 Mon Sep 17 00:00:00 2001 From: HaudinFlorence Date: Thu, 22 Aug 2024 19:22:05 +0200 Subject: [PATCH 2/5] Add logics to render one single person page with the popup opened. --- src/components/about/LargePortraitCard.tsx | 2 +- src/components/about/SmallPortraitCard.tsx | 20 ++++++------ src/components/about/SocialMediaContacts.tsx | 8 ++--- src/components/about/SubTeam.tsx | 32 +++++++++++-------- src/pages/about/Sylvain/index.tsx | 17 ---------- .../about/{Johan/index.tsx => alexis.tsx} | 2 -- src/pages/about/anastasiia.tsx | 11 +++++++ src/pages/about/andreas.tsx | 11 +++++++ src/pages/about/anutosh.tsx | 11 +++++++ src/pages/about/darian.tsx | 11 +++++++ src/pages/about/david.tsx | 11 +++++++ src/pages/about/denisa.tsx | 11 +++++++ src/pages/about/florence.tsx | 11 +++++++ src/pages/about/gabriela.tsx | 11 +++++++ src/pages/about/greg.tsx | 11 +++++++ src/pages/about/hind.tsx | 11 +++++++ src/pages/about/ian.tsx | 11 +++++++ src/pages/about/index.tsx | 2 -- src/pages/about/isabel.tsx | 11 +++++++ src/pages/about/jeremy.tsx | 11 +++++++ src/pages/about/joel.tsx | 11 +++++++ src/pages/about/johan.tsx | 11 +++++++ src/pages/about/julien.tsx | 11 +++++++ src/pages/about/kerim.tsx | 11 +++++++ src/pages/about/martin.tsx | 11 +++++++ src/pages/about/meriem.tsx | 11 +++++++ src/pages/about/nicolas.tsx | 11 +++++++ src/pages/about/nour.tsx | 11 +++++++ src/pages/about/sylvain.tsx | 14 ++++++++ src/pages/about/thorsten.tsx | 11 +++++++ src/pages/about/trung.tsx | 11 +++++++ 31 files changed, 301 insertions(+), 49 deletions(-) delete mode 100644 src/pages/about/Sylvain/index.tsx rename src/pages/about/{Johan/index.tsx => alexis.tsx} (70%) create mode 100644 src/pages/about/anastasiia.tsx create mode 100644 src/pages/about/andreas.tsx create mode 100644 src/pages/about/anutosh.tsx create mode 100644 src/pages/about/darian.tsx create mode 100644 src/pages/about/david.tsx create mode 100644 src/pages/about/denisa.tsx create mode 100644 src/pages/about/florence.tsx create mode 100644 src/pages/about/gabriela.tsx create mode 100644 src/pages/about/greg.tsx create mode 100644 src/pages/about/hind.tsx create mode 100644 src/pages/about/ian.tsx create mode 100644 src/pages/about/isabel.tsx create mode 100644 src/pages/about/jeremy.tsx create mode 100644 src/pages/about/joel.tsx create mode 100644 src/pages/about/johan.tsx create mode 100644 src/pages/about/julien.tsx create mode 100644 src/pages/about/kerim.tsx create mode 100644 src/pages/about/martin.tsx create mode 100644 src/pages/about/meriem.tsx create mode 100644 src/pages/about/nicolas.tsx create mode 100644 src/pages/about/nour.tsx create mode 100644 src/pages/about/sylvain.tsx create mode 100644 src/pages/about/thorsten.tsx create mode 100644 src/pages/about/trung.tsx diff --git a/src/components/about/LargePortraitCard.tsx b/src/components/about/LargePortraitCard.tsx index d536c346d..1e952ecab 100644 --- a/src/components/about/LargePortraitCard.tsx +++ b/src/components/about/LargePortraitCard.tsx @@ -8,7 +8,7 @@ import Avatar from "./Avatar"; export function Distinction({ person }) { if (person.distinctionTitle.length !== 0) { return person.distinctionTitle.map((distinction, index) => ( -
    +
    {distinction} diff --git a/src/components/about/SmallPortraitCard.tsx b/src/components/about/SmallPortraitCard.tsx index d9f6d5a45..404bf429f 100644 --- a/src/components/about/SmallPortraitCard.tsx +++ b/src/components/about/SmallPortraitCard.tsx @@ -4,16 +4,16 @@ import SocialMediaContacts from "./SocialMediaContacts"; import { useRef, useState } from "react"; import LargePortraitCard from "./LargePortraitCard"; import Avatar from "./Avatar"; -import Link from "@docusaurus/Link"; const contentStyle = { background: "white", borderRadius: "10px", + opacity: 1.0 }; const overlayStyle = { backgroundColor: "var(--ifm-background-color-popup-overlay)", - opacity: "0.4", + opacity: 0.4, width: "100%", height: "100%", }; @@ -21,6 +21,7 @@ const overlayStyle = { function getCenterOfViewport() { let horizontalCenter = Math.floor(window.innerWidth / 2); let verticalCenter = Math.floor(window.innerHeight / 2); + console.log("Center of viewport:", [horizontalCenter, verticalCenter]); return [horizontalCenter, verticalCenter]; } @@ -35,6 +36,7 @@ function calculateOffsets(elementRef) { xViewportCenter - xCardCenter, yViewportCenter - yCardCenter, ]; + console.log("Offsets are:", offsets); return offsets; } @@ -73,23 +75,21 @@ export function SmallPortraitCard({ person, setOffsets }) {
    ); } -export default function PopupPortrait({ person }) { +export default function PopupPortrait({ person, ...props }) { const [offsets, setOffsets] = useState([0, 0]); - let [isPopupOpen, setIsPopupOpen] = useState(false); - + let [isPopupOpen, setIsPopupOpen] = useState(props.isPopupOpen); return (
    +
    + +
    setIsPopupOpen(false)} - trigger={ -
    - -
    - } onOpen={() => { + props.isPopupOpen = true; setIsPopupOpen(true); }} contentStyle={contentStyle} diff --git a/src/components/about/SocialMediaContacts.tsx b/src/components/about/SocialMediaContacts.tsx index 399d4654f..93fc70e8e 100644 --- a/src/components/about/SocialMediaContacts.tsx +++ b/src/components/about/SocialMediaContacts.tsx @@ -8,14 +8,14 @@ export default function SocialMediaContacts({ person }) { return ( <>
    - {} + {/* {} {} - {} + {} */}
    - + {/* {person.githubName} - + */}
    ); diff --git a/src/components/about/SubTeam.tsx b/src/components/about/SubTeam.tsx index 68b67d7b7..701d826ea 100644 --- a/src/components/about/SubTeam.tsx +++ b/src/components/about/SubTeam.tsx @@ -2,25 +2,31 @@ import styles from "./styles.module.css"; import PopupPortrait from "./SmallPortraitCard"; import Link from "@docusaurus/Link"; import { useLocation } from "@docusaurus/router"; -import { IProps } from "."; - -export default function SubTeam({ subTeamName, subTeam}) { - const location = useLocation().pathname; +export default function SubTeam({ subTeamName, subTeam }) { + const firstName = useLocation().pathname.split("/about/")[1]; return (

    {subTeamName}

      - {subTeam.map((person, index) => ( -
    • -
      - - - -
      -
      • - ))} + {subTeam.map( + (person, index) => + !void 0 && ( +
    • +
      + + + +
      +
      • + ) + )}
    diff --git a/src/pages/about/Sylvain/index.tsx b/src/pages/about/Sylvain/index.tsx deleted file mode 100644 index 07595276a..000000000 --- a/src/pages/about/Sylvain/index.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import Layout from "@theme/Layout"; -import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; -import { About } from "@site/src/components/about"; -import BrowserOnly from "@docusaurus/BrowserOnly"; -import { useLocation } from "@docusaurus/router"; - -export default function AboutPage(): JSX.Element { - const location = useLocation().pathname; - console.log("In components:", location); - const { siteConfig } = useDocusaurusContext(); - return ( - - {() => - } - - ); -} diff --git a/src/pages/about/Johan/index.tsx b/src/pages/about/alexis.tsx similarity index 70% rename from src/pages/about/Johan/index.tsx rename to src/pages/about/alexis.tsx index 985b85038..8fd02be9c 100644 --- a/src/pages/about/Johan/index.tsx +++ b/src/pages/about/alexis.tsx @@ -1,10 +1,8 @@ import Layout from "@theme/Layout"; -import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; import { About } from "@site/src/components/about"; import BrowserOnly from "@docusaurus/BrowserOnly"; export default function AboutPage(): JSX.Element { - const { siteConfig } = useDocusaurusContext(); return ( {() => } diff --git a/src/pages/about/anastasiia.tsx b/src/pages/about/anastasiia.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/anastasiia.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/andreas.tsx b/src/pages/about/andreas.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/andreas.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/anutosh.tsx b/src/pages/about/anutosh.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/anutosh.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/darian.tsx b/src/pages/about/darian.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/darian.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/david.tsx b/src/pages/about/david.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/david.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/denisa.tsx b/src/pages/about/denisa.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/denisa.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/florence.tsx b/src/pages/about/florence.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/florence.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/gabriela.tsx b/src/pages/about/gabriela.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/gabriela.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/greg.tsx b/src/pages/about/greg.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/greg.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/hind.tsx b/src/pages/about/hind.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/hind.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/ian.tsx b/src/pages/about/ian.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/ian.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx index 985b85038..8fd02be9c 100644 --- a/src/pages/about/index.tsx +++ b/src/pages/about/index.tsx @@ -1,10 +1,8 @@ import Layout from "@theme/Layout"; -import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; import { About } from "@site/src/components/about"; import BrowserOnly from "@docusaurus/BrowserOnly"; export default function AboutPage(): JSX.Element { - const { siteConfig } = useDocusaurusContext(); return ( {() => } diff --git a/src/pages/about/isabel.tsx b/src/pages/about/isabel.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/isabel.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/jeremy.tsx b/src/pages/about/jeremy.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/jeremy.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/joel.tsx b/src/pages/about/joel.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/joel.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/johan.tsx b/src/pages/about/johan.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/johan.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/julien.tsx b/src/pages/about/julien.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/julien.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/kerim.tsx b/src/pages/about/kerim.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/kerim.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/martin.tsx b/src/pages/about/martin.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/martin.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/meriem.tsx b/src/pages/about/meriem.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/meriem.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/nicolas.tsx b/src/pages/about/nicolas.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/nicolas.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/nour.tsx b/src/pages/about/nour.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/nour.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/sylvain.tsx b/src/pages/about/sylvain.tsx new file mode 100644 index 000000000..563759c65 --- /dev/null +++ b/src/pages/about/sylvain.tsx @@ -0,0 +1,14 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; +import { useRef } from "react"; + +export default function AboutPage(): JSX.Element { + const elementRef = useRef(null); + console.log('elementRef:', elementRef) + return ( + + {() => } + + ); +} diff --git a/src/pages/about/thorsten.tsx b/src/pages/about/thorsten.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/thorsten.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} diff --git a/src/pages/about/trung.tsx b/src/pages/about/trung.tsx new file mode 100644 index 000000000..8fd02be9c --- /dev/null +++ b/src/pages/about/trung.tsx @@ -0,0 +1,11 @@ +import Layout from "@theme/Layout"; +import { About } from "@site/src/components/about"; +import BrowserOnly from "@docusaurus/BrowserOnly"; + +export default function AboutPage(): JSX.Element { + return ( + + {() => } + + ); +} From 97a3ec28d98547dc5bd5fec4d19ca6212b9cdc97 Mon Sep 17 00:00:00 2001 From: HaudinFlorence Date: Wed, 28 Aug 2024 16:13:48 +0200 Subject: [PATCH 3/5] Try to fix the popup background and its content opened state. Update static.yml and docusaurus.config.ts files. --- .github/workflows/static.yml | 26 ++++++- docusaurus.config.ts | 100 ++----------------------- src/components/about/styles.module.css | 1 + 3 files changed, 30 insertions(+), 97 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 10f2492ce..62a0b1d9e 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -4,10 +4,10 @@ name: Deploy static content to Pages on: # Runs on pushes targeting the default branch push: - branches: ["master"] + branches: "open_the_popup_portrait_on_a_specific_page" pull_request: branches: - - '*' + - "open_the_popup_portrait_on_a_specific_page" # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages @@ -19,6 +19,24 @@ concurrency: cancel-in-progress: false jobs: +replace_string: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set environment variable for branch name + env: + BRANCH_NAME: ${{ github.ref_name }} + REPO_NAME: ${{github.repository_name}} + + run: echo "Branch name is $BRANCH_NAME" + + - name: Replace 'BaseUrl' with branch name in file + run: | + sed -i "s/BaseUrl/${BRANCH_NAME}/g" docusaurus.config.ts + build: runs-on: ubuntu-latest steps: @@ -38,8 +56,8 @@ jobs: path: ./build deploy: - needs: build - if: github.ref == 'refs/heads/master' + needs: build, replace_string + if: github.ref == 'refs/heads/open_the_popup_portrait_on_a_specific_page' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 918ae9e8c..8ad35d934 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -12,11 +12,11 @@ const config: Config = { url: "https://quantstack.net/", // Set the // pathname under which your site is served // For GitHub pages deployment, it is often '//' - baseUrl: "/", + baseUrl: "/quantstack.github.io/", // GitHub pages deployment config. // If you aren't using GitHub pages, you don't need these. - organizationName: "/QuantStack/", // Usually your GitHub org/user name. + organizationName: "/HaudinFlorence/", // Usually your GitHub org/user name. projectName: "quantstack.github.io", // Usually your repo name. onBrokenLinks: "throw", @@ -64,7 +64,7 @@ const config: Config = { title: "", logo: { alt: "QuantStack Logo", - src: "img/quantstack/logo-website.svg" + src: "img/quantstack/logo-website.svg", }, items: [ @@ -131,96 +131,10 @@ const config: Config = { ], }, - footer: { - links: [ - { - title: " ", - items: [ - { - label: " ", - className: "astronaut-footer", - href: "/home", - }, - ], - }, - - { - title: "Follow QuantStack on", - items: [ - { - label: "GitHub", - className: "github-icon", - href: "https://github.com/QuantStack", - }, - { - label: "LinkedIn", - className: "linkedin-icon", - href: "https://www.linkedin.com/company/quantstack/mycompany/", - }, - { - label: "X", - className: "x-icon", - href: "https://twitter.com/QuantStack", - }, - ], - }, - { - title: "Menu ", - items: [ - { - label: "Home", - href: "/home/", - }, - { - label: "Projects", - href: "/projects/", - }, - { - label: "Services", - href: "/services/", - }, - { - label: "About", - href: "/about/", - }, - { - label: "Careers", - href: "/careers/", - }, - { - label: "Blog", - href: "/blog/", - }, - ], - }, - - - { - title: "QuantStack office ", - items: [ - { - html: ` - -
    - 16, avenue Curti
    - 94100 Saint-Maur-des-Fossés
    - France -
    - - `, - }, - ], - }, - ], - - copyright: copyright, - }, - - colorMode: { - defaultMode: 'light', - disableSwitch: true, - respectPrefersColorScheme: false, - + colorMode: { + defaultMode: "light", + disableSwitch: true, + respectPrefersColorScheme: false, }, prism: { diff --git a/src/components/about/styles.module.css b/src/components/about/styles.module.css index 15ad08df8..5ecd6e512 100644 --- a/src/components/about/styles.module.css +++ b/src/components/about/styles.module.css @@ -210,6 +210,7 @@ div .join_the_team_text { .large_portrait_card { width: 1000px; padding: var(--ifm-spacing-xl) var(--ifm-spacing-2xl); + background-color: orange; } .subteam_container { From 555f18519d8c26d9fdd3c0e0af877213766b89f4 Mon Sep 17 00:00:00 2001 From: HaudinFlorence Date: Tue, 3 Sep 2024 19:00:53 +0200 Subject: [PATCH 4/5] Change baseUrl in docusaurus.config.ts. --- docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 8ad35d934..3c764c351 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -12,7 +12,7 @@ const config: Config = { url: "https://quantstack.net/", // Set the // pathname under which your site is served // For GitHub pages deployment, it is often '//' - baseUrl: "/quantstack.github.io/", + baseUrl: "/", // GitHub pages deployment config. // If you aren't using GitHub pages, you don't need these. From 857ba619b51df21ff6266ddfda3aa657824c501a Mon Sep 17 00:00:00 2001 From: HaudinFlorence Date: Wed, 30 Oct 2024 16:39:20 +0100 Subject: [PATCH 5/5] Add a capital letter at the beginning of the page name of the persons of the team. --- src/components/about/SmallPortraitCard.tsx | 14 +++++++++----- src/components/about/SubTeam.tsx | 9 ++++++--- src/components/about/styles.module.css | 3 ++- src/pages/about/{alexis.tsx => Alexis.tsx} | 0 src/pages/about/{anastasiia.tsx => Anastasiia.tsx} | 0 src/pages/about/{andreas.tsx => Andreas.tsx} | 0 src/pages/about/{anutosh.tsx => Anutosh.tsx} | 0 src/pages/about/{darian.tsx => Darian.tsx} | 0 src/pages/about/{david.tsx => David.tsx} | 0 src/pages/about/{denisa.tsx => Denisa.tsx} | 0 src/pages/about/{florence.tsx => Florence.tsx} | 0 src/pages/about/{gabriela.tsx => Gabriela.tsx} | 0 src/pages/about/{greg.tsx => Greg.tsx} | 0 src/pages/about/{hind.tsx => Hind.tsx} | 0 src/pages/about/{ian.tsx => Ian.tsx} | 0 src/pages/about/{isabel.tsx => Isabel.tsx} | 0 src/pages/about/{jeremy.tsx => Jeremy.tsx} | 0 src/pages/about/{joel.tsx => Joel.tsx} | 0 src/pages/about/{johan.tsx => Johan.tsx} | 0 src/pages/about/{julien.tsx => Julien.tsx} | 0 src/pages/about/{kerim.tsx => Kerim.tsx} | 0 src/pages/about/{martin.tsx => Martin.tsx} | 0 src/pages/about/{meriem.tsx => Meriem.tsx} | 0 src/pages/about/{nicolas.tsx => Nicolas.tsx} | 0 src/pages/about/{nour.tsx => Nour.tsx} | 0 src/pages/about/{thorsten.tsx => Sylvain.tsx} | 0 src/pages/about/{trung.tsx => Thorsten.tsx} | 0 src/pages/about/{sylvain.tsx => Trung.tsx} | 3 --- 28 files changed, 17 insertions(+), 12 deletions(-) rename src/pages/about/{alexis.tsx => Alexis.tsx} (100%) rename src/pages/about/{anastasiia.tsx => Anastasiia.tsx} (100%) rename src/pages/about/{andreas.tsx => Andreas.tsx} (100%) rename src/pages/about/{anutosh.tsx => Anutosh.tsx} (100%) rename src/pages/about/{darian.tsx => Darian.tsx} (100%) rename src/pages/about/{david.tsx => David.tsx} (100%) rename src/pages/about/{denisa.tsx => Denisa.tsx} (100%) rename src/pages/about/{florence.tsx => Florence.tsx} (100%) rename src/pages/about/{gabriela.tsx => Gabriela.tsx} (100%) rename src/pages/about/{greg.tsx => Greg.tsx} (100%) rename src/pages/about/{hind.tsx => Hind.tsx} (100%) rename src/pages/about/{ian.tsx => Ian.tsx} (100%) rename src/pages/about/{isabel.tsx => Isabel.tsx} (100%) rename src/pages/about/{jeremy.tsx => Jeremy.tsx} (100%) rename src/pages/about/{joel.tsx => Joel.tsx} (100%) rename src/pages/about/{johan.tsx => Johan.tsx} (100%) rename src/pages/about/{julien.tsx => Julien.tsx} (100%) rename src/pages/about/{kerim.tsx => Kerim.tsx} (100%) rename src/pages/about/{martin.tsx => Martin.tsx} (100%) rename src/pages/about/{meriem.tsx => Meriem.tsx} (100%) rename src/pages/about/{nicolas.tsx => Nicolas.tsx} (100%) rename src/pages/about/{nour.tsx => Nour.tsx} (100%) rename src/pages/about/{thorsten.tsx => Sylvain.tsx} (100%) rename src/pages/about/{trung.tsx => Thorsten.tsx} (100%) rename src/pages/about/{sylvain.tsx => Trung.tsx} (72%) diff --git a/src/components/about/SmallPortraitCard.tsx b/src/components/about/SmallPortraitCard.tsx index 404bf429f..3a0329ffd 100644 --- a/src/components/about/SmallPortraitCard.tsx +++ b/src/components/about/SmallPortraitCard.tsx @@ -6,9 +6,14 @@ import LargePortraitCard from "./LargePortraitCard"; import Avatar from "./Avatar"; const contentStyle = { + position: "fixed", + top: "50%", + left: "50%", + transform: "translate(-50%, -50%)", background: "white", - borderRadius: "10px", - opacity: 1.0 + borderRadius: "20px", + opacity: 1.0, + zIndex: "4000" }; const overlayStyle = { @@ -16,6 +21,7 @@ const overlayStyle = { opacity: 0.4, width: "100%", height: "100%", + zIndex: "1000", }; function getCenterOfViewport() { @@ -68,9 +74,7 @@ export function SmallPortraitCard({ person, setOffsets }) { > {person.position}
    -
    - -
    +
    ); diff --git a/src/components/about/SubTeam.tsx b/src/components/about/SubTeam.tsx index 701d826ea..4dc2d6b22 100644 --- a/src/components/about/SubTeam.tsx +++ b/src/components/about/SubTeam.tsx @@ -4,7 +4,10 @@ import Link from "@docusaurus/Link"; import { useLocation } from "@docusaurus/router"; export default function SubTeam({ subTeamName, subTeam }) { - const firstName = useLocation().pathname.split("/about/")[1]; + let firstName = useLocation().pathname.split("/about/")[1]; + console.log('First name before transformation:', firstName); + + return (

    {subTeamName}

    @@ -15,11 +18,11 @@ export default function SubTeam({ subTeamName, subTeam }) { !void 0 && (
  • - + diff --git a/src/components/about/styles.module.css b/src/components/about/styles.module.css index 5ecd6e512..a9f8931a1 100644 --- a/src/components/about/styles.module.css +++ b/src/components/about/styles.module.css @@ -210,7 +210,8 @@ div .join_the_team_text { .large_portrait_card { width: 1000px; padding: var(--ifm-spacing-xl) var(--ifm-spacing-2xl); - background-color: orange; + border-radius: 10px; + } .subteam_container { diff --git a/src/pages/about/alexis.tsx b/src/pages/about/Alexis.tsx similarity index 100% rename from src/pages/about/alexis.tsx rename to src/pages/about/Alexis.tsx diff --git a/src/pages/about/anastasiia.tsx b/src/pages/about/Anastasiia.tsx similarity index 100% rename from src/pages/about/anastasiia.tsx rename to src/pages/about/Anastasiia.tsx diff --git a/src/pages/about/andreas.tsx b/src/pages/about/Andreas.tsx similarity index 100% rename from src/pages/about/andreas.tsx rename to src/pages/about/Andreas.tsx diff --git a/src/pages/about/anutosh.tsx b/src/pages/about/Anutosh.tsx similarity index 100% rename from src/pages/about/anutosh.tsx rename to src/pages/about/Anutosh.tsx diff --git a/src/pages/about/darian.tsx b/src/pages/about/Darian.tsx similarity index 100% rename from src/pages/about/darian.tsx rename to src/pages/about/Darian.tsx diff --git a/src/pages/about/david.tsx b/src/pages/about/David.tsx similarity index 100% rename from src/pages/about/david.tsx rename to src/pages/about/David.tsx diff --git a/src/pages/about/denisa.tsx b/src/pages/about/Denisa.tsx similarity index 100% rename from src/pages/about/denisa.tsx rename to src/pages/about/Denisa.tsx diff --git a/src/pages/about/florence.tsx b/src/pages/about/Florence.tsx similarity index 100% rename from src/pages/about/florence.tsx rename to src/pages/about/Florence.tsx diff --git a/src/pages/about/gabriela.tsx b/src/pages/about/Gabriela.tsx similarity index 100% rename from src/pages/about/gabriela.tsx rename to src/pages/about/Gabriela.tsx diff --git a/src/pages/about/greg.tsx b/src/pages/about/Greg.tsx similarity index 100% rename from src/pages/about/greg.tsx rename to src/pages/about/Greg.tsx diff --git a/src/pages/about/hind.tsx b/src/pages/about/Hind.tsx similarity index 100% rename from src/pages/about/hind.tsx rename to src/pages/about/Hind.tsx diff --git a/src/pages/about/ian.tsx b/src/pages/about/Ian.tsx similarity index 100% rename from src/pages/about/ian.tsx rename to src/pages/about/Ian.tsx diff --git a/src/pages/about/isabel.tsx b/src/pages/about/Isabel.tsx similarity index 100% rename from src/pages/about/isabel.tsx rename to src/pages/about/Isabel.tsx diff --git a/src/pages/about/jeremy.tsx b/src/pages/about/Jeremy.tsx similarity index 100% rename from src/pages/about/jeremy.tsx rename to src/pages/about/Jeremy.tsx diff --git a/src/pages/about/joel.tsx b/src/pages/about/Joel.tsx similarity index 100% rename from src/pages/about/joel.tsx rename to src/pages/about/Joel.tsx diff --git a/src/pages/about/johan.tsx b/src/pages/about/Johan.tsx similarity index 100% rename from src/pages/about/johan.tsx rename to src/pages/about/Johan.tsx diff --git a/src/pages/about/julien.tsx b/src/pages/about/Julien.tsx similarity index 100% rename from src/pages/about/julien.tsx rename to src/pages/about/Julien.tsx diff --git a/src/pages/about/kerim.tsx b/src/pages/about/Kerim.tsx similarity index 100% rename from src/pages/about/kerim.tsx rename to src/pages/about/Kerim.tsx diff --git a/src/pages/about/martin.tsx b/src/pages/about/Martin.tsx similarity index 100% rename from src/pages/about/martin.tsx rename to src/pages/about/Martin.tsx diff --git a/src/pages/about/meriem.tsx b/src/pages/about/Meriem.tsx similarity index 100% rename from src/pages/about/meriem.tsx rename to src/pages/about/Meriem.tsx diff --git a/src/pages/about/nicolas.tsx b/src/pages/about/Nicolas.tsx similarity index 100% rename from src/pages/about/nicolas.tsx rename to src/pages/about/Nicolas.tsx diff --git a/src/pages/about/nour.tsx b/src/pages/about/Nour.tsx similarity index 100% rename from src/pages/about/nour.tsx rename to src/pages/about/Nour.tsx diff --git a/src/pages/about/thorsten.tsx b/src/pages/about/Sylvain.tsx similarity index 100% rename from src/pages/about/thorsten.tsx rename to src/pages/about/Sylvain.tsx diff --git a/src/pages/about/trung.tsx b/src/pages/about/Thorsten.tsx similarity index 100% rename from src/pages/about/trung.tsx rename to src/pages/about/Thorsten.tsx diff --git a/src/pages/about/sylvain.tsx b/src/pages/about/Trung.tsx similarity index 72% rename from src/pages/about/sylvain.tsx rename to src/pages/about/Trung.tsx index 563759c65..8fd02be9c 100644 --- a/src/pages/about/sylvain.tsx +++ b/src/pages/about/Trung.tsx @@ -1,11 +1,8 @@ import Layout from "@theme/Layout"; import { About } from "@site/src/components/about"; import BrowserOnly from "@docusaurus/BrowserOnly"; -import { useRef } from "react"; export default function AboutPage(): JSX.Element { - const elementRef = useRef(null); - console.log('elementRef:', elementRef) return ( {() => }