Merge pull request #44 from ethereumjp/2025-init

2025 init
ethereumjp · Jan 11, 2025 · 9c87755 · 9c87755
2 parents be0f9d7 + 780b9ce
commit 9c87755
Show file tree

Hide file tree

Showing 7 changed files with 537 additions and 323 deletions.
diff --git a/src/components/layouts/base.tsx b/src/components/layouts/base.tsx
@@ -77,9 +77,7 @@ const fontInter = Inter({
 const Layout: FC<PageProps> = ({ pageTitle, children }) => {
   const siteTitle = "ETHTokyo'24";
   const baseLayoutStyle = css``;
-  const mainLayoutStyle = css`
-    background-color: ${brand.Miyabi};
-  `;
+  const mainLayoutStyle = css``;
 
   return (
     <>

diff --git a/src/components/organisms/Footer/index.tsx b/src/components/organisms/Footer/index.tsx
@@ -1,12 +1,10 @@
 import { mq } from "@/themes/settings/breakpoints";
-import { brand } from "@/themes/settings/color";
 import type { ComponentProps } from "@/types";
 import { css } from "@emotion/react";
-import type { FC } from "react";
 
+import type { FC } from "react";
 const Footer: FC<ComponentProps> = ({ children }) => {
   const footerStyle = css`
-    background-color: ${brand.Shuiro};
     padding: 1rem 0;
     text-align: center;
     width: 100%;
@@ -24,8 +22,7 @@ const Footer: FC<ComponentProps> = ({ children }) => {
           }
         `}
       >
-        © 2024 ETHTokyo - Ethereum Japan. Domain (ethtokyo.com) provided by
-        Yusuke Obinata.
+        © {new Date().getFullYear()} ETHTokyo - Ethereum Japan.
       </span>
     </footer>
   );

diff --git a/src/components/organisms/Schedule.tsx b/src/components/organisms/Schedule.tsx
@@ -1,10 +1,6 @@
+import eventDetails from "@/data/eventDetails.json";
 import { mq } from "@/themes/settings/breakpoints";
-import { brand, neutral, themeLight } from "@/themes/settings/color";
 import { css } from "@emotion/react";
-import Image from "next/image";
-import Link from "next/link";
-import seikaiha from "public/images/seikaiha.png";
-import { GoInfo } from "react-icons/go";
 import { HiCalendarDays, HiOutlineMapPin } from "react-icons/hi2";
 import { Socials } from "./Socials";
 
@@ -16,7 +12,7 @@ const Info = () => {
         display:flex;
         flex-direction:column;
         justify-content: center;
-        padding: 4rem;
+        padding: 4rem 2rem 2rem 0;
         text-align: center;
 
         ${mq.laptop} {
@@ -25,36 +21,70 @@ const Info = () => {
         }
       `}
       >
-        <div css={css`align-self:center;`}>
+        <div css={css`align-self:start;`}>
           <HiCalendarDays size={60} />
         </div>
-        <div css={css`padding: 0 1rem;`}>
-          <h2 css={css`margin:0;`}>Hackathon</h2>
-          <p css={css`font-size: 1rem; margin:0;`}>23-25 August 2024</p>
-        </div>
-        <div css={css`padding: 0 1rem;`}>
-          <h2 css={css`margin:0;`}>Conference</h2>
-          <p css={css`font-size: 1rem; margin:0;`}>26 August 2024</p>
+
+        <div
+          css={css`
+          display: flex;
+          flex-direction: column;
+          padding: 0 1rem;
+        `}
+        >
+          <div>
+            <h2 css={css`margin:0;`}>Conference</h2>
+            <p css={css`font-size: 1rem; margin:0;`}>
+              {eventDetails.eventDate.conference}
+            </p>
+          </div>
+          <div css={css`margin-top: 1rem;`}>
+            <h2 css={css`margin:0;`}>Hackathon</h2>
+            <p css={css`font-size: 1rem; margin:0;`}>
+              {eventDetails.eventDate.hackathon}
+            </p>
+          </div>
         </div>
         <div css={css`height:2rem; ${mq.laptop}{width: 2rem;}`} />
-        <div css={css`align-self:center;`}>
+        <div css={css`align-self:start;`}>
           <HiOutlineMapPin size={60} />
         </div>
-        <div css={css`padding: 0 1rem;`}>
-          <h2 css={css`margin:0;`}>Digital Garage</h2>
-          <a
-            css={css`text-decoration: none; :hover {text-decoration: underline;} ;`}
-            href="https://maps.app.goo.gl/aCRdR2pX4qRaUz6MA"
-            target="_blank"
-            rel="noreferrer"
-          >
-            <p css={css`font-size: 1rem; margin:0;`}>
-              15-1 Udagawacho, Shibuya City, Tokyo
-            </p>
-          </a>
+        <div
+          css={css`
+          display: flex;
+          flex-direction: column;
+          padding: 0 1rem;
+        `}
+        >
+          <div css={css``}>
+            <h2 css={css`margin:0;`}>United Nations University</h2>
+            <a
+              css={css`text-decoration: none; :hover {text-decoration: underline;} ;`}
+              href="https://maps.app.goo.gl/uZKbVZm5wmGyCsAg6"
+              target="_blank"
+              rel="noreferrer"
+            >
+              <p css={css`font-size: 1rem; margin:0;`}>
+                5-53-70 Jingumae, Shibuya, Tokyo
+              </p>
+            </a>
+          </div>
+          <div css={css`margin-top: 1rem;`}>
+            <h2 css={css`margin:0;`}>Digital Garage</h2>
+            <a
+              css={css`text-decoration: none; :hover {text-decoration: underline;} ;`}
+              href="https://maps.app.goo.gl/aCRdR2pX4qRaUz6MA"
+              target="_blank"
+              rel="noreferrer"
+            >
+              <p css={css`font-size: 1rem; margin:0;`}>
+                15-1 Udagawacho, Shibuya, Tokyo
+              </p>
+            </a>
+          </div>
         </div>
         <div css={css`height:2rem; ${mq.laptop}{width: 2rem;}`} />
-        <div css={css`align-self:center;`}>
+        {/* <div css={css`align-self:center;`}>
           <GoInfo size={60} />
         </div>
         <div css={css`padding: 0 1rem;`}>
@@ -70,7 +100,7 @@ const Info = () => {
               Click to see all events
             </a>
           </p>
-        </div>
+        </div> */}
       </div>
     </div>
   );
@@ -81,12 +111,6 @@ const ScheduleSection = () => {
     <section
       id="schedule"
       css={css`
-        background-color: ${brand.Miyabi};
-        background-image: url(${seikaiha.src});
-        background-position: center;
-        background-repeat: repeat;
-        background-size: cover;
-        padding: 2rem 0;
         text-align: center;
         width: 100%;
       `}

diff --git a/src/components/organisms/Statement.tsx b/src/components/organisms/Statement.tsx
@@ -1,19 +1,34 @@
+import eventDetails from "@/data/eventDetails.json";
 import { mq } from "@/themes/settings/breakpoints";
 import { brand } from "@/themes/settings/color";
 import { css } from "@emotion/react";
 import Image from "next/image";
 import ETHDiamondLogo from "public/logo/ETHDiamondLogo.png";
+import ETHTokyoLogo from "public/logo/ETHTokyoLogo.png";
 
 const StatementSection = () => {
+  const EventLogo = () => {
+    return (
+      <Image
+        src={ETHTokyoLogo}
+        alt="ETHTokyo logo"
+        css={css`
+          height: auto;
+          max-width: 256px;
+          padding-left: 11px;
+          padding-top: 1rem;
+        `}
+      />
+    );
+  };
+
   return (
     //background: linear-gradient(45deg, , );
     <section
       id="statement"
       css={css`
-        background: linear-gradient(0deg, #FF5544, #FF6F9D);
+        background: linear-gradient(0deg, ${brand.Shuiro}, #000);
         border-radius: 0 0 0 0 / 0 0 100% 100%;
-        clip-path:  ellipse(120% 100% at 50% 100%);
-        margin-top: -4rem;
         z-index: 10;
       `}
     >
@@ -28,10 +43,11 @@ const StatementSection = () => {
         }
       `}
       >
-        <Image src={ETHDiamondLogo} alt="Ethereum diamond" />
-        <h2 css={css`color: ${brand.Miyabi}; font-weight: 300;`}>
-          Welcome and join us!
-        </h2>
+        {/* <Image src={ETHDiamondLogo} alt="Ethereum diamond" /> */}
+        <div css={css`padding: 2rem 0;`}>
+          <EventLogo />
+        </div>
+        <h2 css={css`font-weight: 600;`}>Welcome and join us!</h2>
         <p css={css`text-align: justify; ${mq.laptop}{font-size: 1.25rem;}`}>
           ETHTokyo is a engaging hackathon for the global Ethereum community
           where people with all sorts of backgrounds, ideas, and skills come
@@ -41,6 +57,7 @@ const StatementSection = () => {
           foster the creation of amazing new innovations for the future. Join us
           and be a part of shaping what's next in the Ethereum universe!
         </p>
+        Further details will be announced soon.
       </div>
     </section>
   );

diff --git a/src/data/eventDetails.json b/src/data/eventDetails.json
@@ -0,0 +1,8 @@
+{
+  "eventDate": {
+    "duration": "Sep 12-15, 2025",
+    "conference": "September 12",
+    "hackathon": "September 13-15"
+  },
+  "eventLocation": "Tokyo, Japan"
+}