diff --git a/src/components/layouts/base.tsx b/src/components/layouts/base.tsx index 6e23513..ec8e1cd 100644 --- a/src/components/layouts/base.tsx +++ b/src/components/layouts/base.tsx @@ -77,9 +77,7 @@ const fontInter = Inter({ const Layout: FC = ({ 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 index 32349cb..32b2988 100644 --- 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 = ({ children }) => { const footerStyle = css` - background-color: ${brand.Shuiro}; padding: 1rem 0; text-align: center; width: 100%; @@ -24,8 +22,7 @@ const Footer: FC = ({ children }) => { } `} > - © 2024 ETHTokyo - Ethereum Japan. Domain (ethtokyo.com) provided by - Yusuke Obinata. + © {new Date().getFullYear()} ETHTokyo - Ethereum Japan. ); diff --git a/src/components/organisms/Schedule.tsx b/src/components/organisms/Schedule.tsx index c092092..c338484 100644 --- 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 = () => { } `} > -
+
-
-

Hackathon

-

23-25 August 2024

-
-
-

Conference

-

26 August 2024

+ +
+
+

Conference

+

+ {eventDetails.eventDate.conference} +

+
+
+

Hackathon

+

+ {eventDetails.eventDate.hackathon} +

+
-
+
-
-

Digital Garage

- -

- 15-1 Udagawacho, Shibuya City, Tokyo -

-
+
+
+

United Nations University

+ +

+ 5-53-70 Jingumae, Shibuya, Tokyo +

+
+
+
-
+ {/*
@@ -70,7 +100,7 @@ const Info = () => { Click to see all events

-
+
*/}
); @@ -81,12 +111,6 @@ const ScheduleSection = () => {
{ + const EventLogo = () => { + return ( + ETHTokyo logo + ); + }; + return ( //background: linear-gradient(45deg, , );
@@ -28,10 +43,11 @@ const StatementSection = () => { } `} > - Ethereum diamond -

- Welcome and join us! -

+ {/* Ethereum diamond */} +
+ +
+

Welcome and join us!

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!

+ Further details will be announced soon.
); diff --git a/src/data/eventDetails.json b/src/data/eventDetails.json new file mode 100644 index 0000000..552c3b4 --- /dev/null +++ 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" +} diff --git a/src/pages/index.tsx b/src/pages/index.tsx index bedd0c4..adfdeef 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,292 +1,28 @@ import Layout from "@/components/layouts/base"; -import { CountdownPanel } from "@/components/organisms/Countdown"; -import Header from "@/components/organisms/Header"; -import JudgesSection from "@/components/organisms/Judges"; -import MentorsSection from "@/components/organisms/Mentors"; +// import { CountdownPanel } from "@/components/organisms/Countdown"; import ScheduleSection from "@/components/organisms/Schedule"; -import SpeakersSection from "@/components/organisms/Speakers"; import StatementSection from "@/components/organisms/Statement"; -import SupportersSection from "@/components/organisms/Supporters"; -import { mq } from "@/themes/settings/breakpoints"; -import { brand, neutral, themeLight } from "@/themes/settings/color"; +import { brand } from "@/themes/settings/color"; import type { PageProps } from "@/types"; import type { ComponentProps } from "@/types"; import { css } from "@emotion/react"; import type { NextPage } from "next"; -import Image from "next/image"; -import Link from "next/link"; -import topHero from "public/images/hero_top.jpg"; import seikaiha from "public/images/seikaiha.png"; -import ETHTokyoLogo from "public/logo/ETHTokyoLogo.png"; const Page: NextPage = ({ params, searchParams }) => { - const TriangleJpWaveBackground = ({ children }: ComponentProps) => { - const jpWaveBackgroundStyle = css` - background: linear-gradient( - to right, - #773E6B 50%, - #773E6B 50%, - ${brand.Miyabi} 50%, - ${brand.Miyabi} 100% - ); - clip-path: polygon(calc(50% - 380px) 0, calc(50% + 380px) 0, 50% 500px); - height: 500px; - text-align: center; - `; - - return ( -
+ return ( + +
+
- {children} +
- ); - }; - - const EventLogo = () => { - return ( - ETHTokyo logo - ); - }; - - const TopSection = () => { - const topBackgroundStyle = css` - background-image: url(${topHero.src}); - background-position: top 4rem center; - background-size: cover; - height: 100vh; - width: 100%; - `; - - return ( -
- -

- Ethereum Community Hackathon -

- - -
-

Aug 23-26, 2024

-

Tokyo, Japan

-
-
- {/* */} -
- ); - }; - - const LinkedButton = (props: { - href: string; - text: string; - color: string; - disabled?: boolean; - }) => ( - - - - ); - - const GetTicketsSection = () => ( -
-

- Event Schedule -

- -

- Participate -

-
-
*:not(:last-child) { - margin-bottom: 1.5rem; - ${mq.laptop} { - margin-bottom: 0; - margin-right: 2rem; - } - } - `} - > - - - -
-
- ); - - return ( - -
-
- - - - - - - - -
); }; diff --git a/src/pages/past-events/2024/index.tsx b/src/pages/past-events/2024/index.tsx new file mode 100644 index 0000000..bfe893c --- /dev/null +++ b/src/pages/past-events/2024/index.tsx @@ -0,0 +1,434 @@ +import Layout from "@/components/layouts/base"; +import { CountdownPanel } from "@/components/organisms/Countdown"; +import Header from "@/components/organisms/Header"; +import JudgesSection from "@/components/organisms/Judges"; +import MentorsSection from "@/components/organisms/Mentors"; +import ScheduleSection from "@/components/organisms/Schedule"; +import { Socials } from "@/components/organisms/Socials"; +import SpeakersSection from "@/components/organisms/Speakers"; +import SupportersSection from "@/components/organisms/Supporters"; +import { mq } from "@/themes/settings/breakpoints"; +import { brand, neutral, themeLight } from "@/themes/settings/color"; +import type { PageProps } from "@/types"; +import type { ComponentProps } from "@/types"; +import { css } from "@emotion/react"; +import type { NextPage } from "next"; +import Image from "next/image"; +import Link from "next/link"; +import topHero from "public/images/hero_top.jpg"; +import seikaiha from "public/images/seikaiha.png"; +import ETHDiamondLogo from "public/logo/ETHDiamondLogo.png"; +import ETHTokyoLogo from "public/logo/ETHTokyoLogo.png"; +import { GoInfo } from "react-icons/go"; +import { HiCalendarDays, HiOutlineMapPin } from "react-icons/hi2"; + +const Page: NextPage = ({ params, searchParams }) => { + const TriangleJpWaveBackground = ({ children }: ComponentProps) => { + const jpWaveBackgroundStyle = css` + background: linear-gradient( + to right, + #773E6B 50%, + #773E6B 50%, + ${brand.Miyabi} 50%, + ${brand.Miyabi} 100% + ); + clip-path: polygon(calc(50% - 380px) 0, calc(50% + 380px) 0, 50% 500px); + height: 500px; + text-align: center; + `; + + return ( +
+
+ {children} +
+
+ ); + }; + + const EventLogo = () => { + return ( + ETHTokyo logo + ); + }; + + const TopSection = () => { + const topBackgroundStyle = css` + background-image: url(${topHero.src}); + background-position: top 4rem center; + background-size: cover; + height: 100vh; + width: 100%; + `; + + return ( +
+ +

+ Ethereum Community Hackathon +

+ + +
+

Aug 23-26, 2024

+

Tokyo, Japan

+
+
+ +
+ ); + }; + + const StatementSection = () => { + return ( + //background: linear-gradient(45deg, , ); +
+
+ Ethereum diamond +

+ Welcome and join us! +

+

+ ETHTokyo is a engaging hackathon for the global Ethereum community + where people with all sorts of backgrounds, ideas, and skills come + together to share their love for Ethereum and its world. Whether + you're a seasoned expert or just curious, you'll find friends and + inspiration here. Our goal is simple: to connect diverse minds and + 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! +

+
+
+ ); + }; + + const LinkedButton = (props: { + href: string; + text: string; + color: string; + disabled?: boolean; + }) => ( + + + + ); + + const GetTicketsSection = () => ( +
+

+ Event Schedule +

+ +

+ Participate +

+
+
*:not(:last-child) { + margin-bottom: 1.5rem; + ${mq.laptop} { + margin-bottom: 0; + margin-right: 2rem; + } + } + `} + > + + + +
+
+ ); + + const Info = () => { + return ( +
+
+
+ +
+ +
+
+

Hackathon

+

Aug 23-25, 2024

+
+
+

Conference

+

Aug 26, 2024

+
+
+ +
+
+ +
+ + + +
+
+ +
+
+

Nearby Events

+ +

+ + Click to see all events + +

+
+
+
+ ); + }; + + const ScheduleSection = () => { + return ( +
+ + +
+ ); + }; + + return ( + +
+
+ + + + + + + + +
+ + ); +}; + +export default Page;