center style and remove cancelled speakers

ethereumjp · Jul 30, 2024 · 12645ed · 12645ed
1 parent 74f4318
commit 12645ed
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 99 deletions.
diff --git a/public/images/contributors/makoto.jpg b/public/images/contributors/makoto.jpg
diff --git a/public/images/contributors/uttamsingh.png b/public/images/contributors/uttamsingh.png
diff --git a/src/components/organisms/Mentors.tsx b/src/components/organisms/Mentors.tsx
@@ -36,7 +36,7 @@ const MentorsSection = () => {
             width: 96px;
 
             ${mq.laptop}{
-              width: 144px;
+              width: 120px;
             }
           `}
         />
@@ -112,40 +112,36 @@ const MentorsSection = () => {
       </h2>
       <div
         css={css`
-          display: grid;
+          display: flex;
+          flex-wrap: wrap;
           gap: 2rem;
-          grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-          justify-items: center;
+          justify-content: center;
           margin: 0 auto;
-          max-width: 1200px;
+          max-width: 1500px;
 
           ${mq.tablet} {
-            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+            gap: 2.5rem;
           }
 
           ${mq.laptop} {
-            gap: 4rem;
+            gap: 3rem;
           }
         `}
       >
         {currentMentors.map((mentor) => (
-          <MentorIcon key={mentor.name} {...mentor} />
+          <div
+            key={mentor.name}
+            css={css`
+              flex: 0 0 150px;
+              ${mq.tablet} {
+                flex: 0 0 160px;
+              }
+            `}
+          >
+            <MentorIcon {...mentor} />
+          </div>
         ))}
       </div>
-      {/* <div>
-        <p>
-          ❗
-          <a
-            css={css`:hover {color: ${info.Attention}};`}
-            href="https://forms.gle/1wtFYnTRfi4mFnRQ9"
-            target="_blank"
-            rel="noreferrer"
-          >
-            We are currently accepting speaker applications
-          </a>
-          ❗
-        </p>
-      </div> */}
     </section>
   );
 };

diff --git a/src/components/organisms/Speakers.tsx b/src/components/organisms/Speakers.tsx
@@ -39,7 +39,6 @@ import ShogoPic from "public/images/contributors/shogoochiai.jpg";
 import SujithPic from "public/images/contributors/sujithsomraaj.jpeg";
 import TomaszPic from "public/images/contributors/tomaszstanczak.png";
 import TomoPic from "public/images/contributors/tomosaito.jpg";
-import UttamPic from "public/images/contributors/uttamsingh.png";
 import VarunPic from "public/images/contributors/varundoshi.jpg";
 import VitalikPic from "public/images/contributors/vitalik.jpg";
 import VladPic from "public/images/contributors/vladsvitanko.jpg";
@@ -88,7 +87,7 @@ const SpeakersSection = () => {
             width: 96px;
 
             ${mq.laptop}{
-              width: 144px;
+              width: 120px;
             }
           `}
         />
@@ -208,18 +207,6 @@ const SpeakersSection = () => {
             </p>
           </HackathonTrackCard>
         </div>
-        <div>
-          <p css={css`font-size: 1.2rem;`}>
-            ✋
-            <a
-              href="https://forms.gle/nv1DFjb9GBXKZmAf9"
-              target="_blank"
-              rel="noreferrer"
-            >
-              Hacking mentors welcome!
-            </a>
-          </p>
-        </div>
         {/* <br />
         <div>
           <Link
@@ -253,7 +240,7 @@ const SpeakersSection = () => {
             font-size: 3rem;
           }`}
       >
-        Event Speakers
+        Speakers
       </h2>
       <div
         css={css`
@@ -450,13 +437,6 @@ const SpeakersSection = () => {
           org="Quarkchain"
           orgUrl="https://quarkchain.io/"
         />
-        <SpeakerIcon
-          source={UttamPic}
-          name="Uttam Singh"
-          link="https://x.com/uttam_singhk"
-          org="Flare Network"
-          orgUrl="https://flare.network/"
-        />
         <SpeakerIcon
           source={DavidPic}
           name="David Cao"
@@ -570,20 +550,6 @@ const SpeakersSection = () => {
           orgUrl="https://kyuzan.com/"
         />
       </div>
-      <div>
-        <p>
-          ❗
-          <a
-            css={css`:hover {color: ${info.Attention}};`}
-            href="https://forms.gle/1wtFYnTRfi4mFnRQ9"
-            target="_blank"
-            rel="noreferrer"
-          >
-            We are currently accepting speaker applications
-          </a>
-          ❗
-        </p>
-      </div>
     </section>
   );
 };

diff --git a/src/data/mentors.json b/src/data/mentors.json
@@ -2,24 +2,31 @@
   {
     "name": "Özgür Armanc Yiğit",
     "role": "ZK Engineer",
-    "org": "Ethereum Foundation PSE",
+    "org": "EF, PSE",
     "orgUrl": "https://pse.dev/",
     "imagePath": "/images/contributors/ozgurarmancyigit.jpg"
   },
   {
     "name": "yuroitaki",
-    "role": "Software Engineer",
-    "org": "Ethereum Foundation PSE",
+    "role": "Engineering",
+    "org": "EF, PSE",
     "orgUrl": "https://pse.dev/",
     "imagePath": "/images/contributors/yuroitaki.jpeg"
   },
   {
     "name": "Francesco Andreoli",
-    "role": "Head of Developer Community",
+    "role": "Dev Community",
     "org": "MetaMask",
     "orgUrl": "https://metamask.io/",
     "imagePath": "/images/contributors/francescoandreoli.jpg"
   },
+  {
+    "name": "Qi Zhou",
+    "role": "Founder",
+    "org": "EthStorage",
+    "orgUrl": "https://ethstorage.io/",
+    "imagePath": "/images/contributors/qizhou.png"
+  },
   {
     "name": "Chua Zheng Leong",
     "role": "Co-founder",
@@ -29,7 +36,7 @@
   },
   {
     "name": "Suhyeon Lee",
-    "role": "Security Researcher",
+    "role": "Sec Researcher",
     "org": "Tokamak Network",
     "orgUrl": "https://www.tokamak.network/",
     "imagePath": "/images/contributors/suhyeonlee.png"
@@ -42,26 +49,47 @@
     "imagePath": "/images/contributors/jehyukjang.jpg"
   },
   {
-    "name": "Qi Zhou",
-    "role": "EthStorage",
-    "org": "Founder",
-    "orgUrl": "https://ethstorage.io/",
-    "imagePath": "/images/contributors/qizhou.png"
+    "name": "Harry Bairstow",
+    "role": "Engineering",
+    "org": "Lit Protocol",
+    "orgUrl": "https://www.litprotocol.com/",
+    "imagePath": "/images/contributors/harrybairstow.jpg"
+  },
+  {
+    "name": "James He",
+    "role": "Core dev",
+    "org": "Offchain Labs",
+    "orgUrl": "https://www.offchainlabs.com/",
+    "imagePath": "/images/contributors/jameshe.jpeg"
   },
   {
     "name": "Varun Doshi",
-    "role": "Blockchain Engineer",
+    "role": "Engineering",
     "org": "Chainrisk",
     "orgUrl": "https://www.chainrisk.cloud/",
     "imagePath": "/images/contributors/varundoshi.jpg"
   },
+  {
+    "name": "Qiang Zhu",
+    "role": "Engineering",
+    "org": "Quarkchain",
+    "orgUrl": "https://quarkchain.io/",
+    "imagePath": "/images/contributors/qiangju.png"
+  },
   {
     "name": "Rohit Ramesh",
-    "role": "Devrel Engineer",
+    "role": "Devrel",
     "org": "Crossmint",
     "orgUrl": "https://www.crossmint.com/",
     "imagePath": "/images/contributors/rohitramesh.jpg"
   },
+  {
+    "name": "Yash Jagtap",
+    "role": "Tech Support",
+    "org": "TheGraph",
+    "orgUrl": "https://thegraph.com/",
+    "imagePath": "/images/contributors/yashjagtap.jpeg"
+  },
   {
     "name": "Ryohei Komiyama",
     "role": "CTO",
@@ -71,7 +99,7 @@
   },
   {
     "name": "Yuki Yuminaga",
-    "role": "Research & Strategy",
+    "role": "R&D",
     "org": "Sorella Labs",
     "orgUrl": "https://github.com/SorellaLabsl",
     "imagePath": "/images/contributors/yukiyuminaga.jpeg"
@@ -82,33 +110,5 @@
     "org": "Chainbase",
     "orgUrl": "https://chainbase.com/",
     "imagePath": "/images/contributors/lukisong.jpg"
-  },
-  {
-    "name": "James He",
-    "role": "Core developer",
-    "org": "Offchain Labs",
-    "orgUrl": "https://www.offchainlabs.com/",
-    "imagePath": "/images/contributors/jameshe.jpeg"
-  },
-  {
-    "name": "Qiang Zhu",
-    "role": "Head of Engineering",
-    "org": "Quarkchain",
-    "orgUrl": "https://quarkchain.io/",
-    "imagePath": "/images/contributors/qiangju.png"
-  },
-  {
-    "name": "Yash Jagtap",
-    "role": "Tech Support Engineer",
-    "org": "TheGraph",
-    "orgUrl": "https://thegraph.com/",
-    "imagePath": "/images/contributors/yashjagtap.jpeg"
-  },
-  {
-    "name": "Harry Bairstow",
-    "role": "Software Engineer",
-    "org": "Lit Protocol",
-    "orgUrl": "https://www.litprotocol.com/",
-    "imagePath": "/images/contributors/harrybairstow.jpg"
   }
 ]