diff --git a/app/[lang]/programs/page.tsx b/app/[lang]/programs/page.tsx index c8817e4..10b9ccf 100644 --- a/app/[lang]/programs/page.tsx +++ b/app/[lang]/programs/page.tsx @@ -3,8 +3,8 @@ import { ReactNode, useCallback, useEffect, useRef, useState } from "react" import Image from "next/image" import Link from "next/link" -import { accelerationProgramFaq } from "@/data/programs/accelerationProgramFaq" -import { contributionsProgramFaq } from "@/data/programs/contributionsProgramFaq" +import { acceleratorProgramFaq } from "@/data/programs/acceleratorProgramFaq" +import { coreProgramFaq } from "@/data/programs/coreProgramFaq" import { twMerge } from "tailwind-merge" import { siteConfig } from "@/config/site" @@ -21,10 +21,9 @@ import { useTranslation } from "@/app/i18n/client" type ProgramDetailProps = { region?: string title: ReactNode + deadline?: string location?: string date: string - application?: string - size?: "xs" | "sm" } const SectionTitle = ({ label }: { label: string }) => { @@ -65,69 +64,54 @@ const ProgramDetail = ({ title, location, date, - application, region, - size = "sm", + deadline, }: ProgramDetailProps) => { return ( -
-
- - {region} +
+ + {region}
+ {title} + + + {deadline && ( + + Application Deadline: {deadline} - - {title} - -
-
- {application && ( -
- - - {application} - -
- )} - {location && ( -
- - - {location} - -
- )} + )} + + {location && (
- + - {date} + {location}
+ )} +
+ + {date}
) } -const ProgramSections = ["contributionsProgram", "accelerationProgram"] as const +const ProgramSections = ["coreProgram", "acceleratorProgram"] as const const ChooseProgramItems: { label: string; value: string; href?: string }[] = [ { label: "Contributions Program Asia", - value: "contributionsProgramAsia", + value: "coreProgramAsia", href: siteConfig.links.applyContributionProgram, }, { label: "Contributions Program LatAm", - value: "contributionsProgramaLatAm", + value: "coreProgramaLatAm", href: siteConfig.links.applyContributionProgram, }, { label: "Acceleration Program", - value: "accelerationProgram", + value: "acceleratorProgram", href: siteConfig.links.applyContributionProgram, }, ] @@ -148,12 +132,12 @@ export default function ProgramsPage({ params: { lang } }: any) { returnObjects: true, }) || [] - const contributionsProgramDescription: any[] = - t("contributionsProgram.description", { + const coreProgramDescription: any[] = + t("coreProgram.description", { returnObjects: true, }) || [] - const accelerationProgramDescription: any[] = - t("accelerationProgram.description", { + const acceleratorProgramDescription: any[] = + t("acceleratorProgram.description", { returnObjects: true, }) ?? [] @@ -269,19 +253,20 @@ export default function ProgramsPage({ params: { lang } }: any) {
- +
@@ -300,7 +285,8 @@ export default function ProgramsPage({ params: { lang } }: any) { @@ -318,21 +304,19 @@ export default function ProgramsPage({ params: { lang } }: any) {
- {contributionsProgramDescription?.map( - (description, index) => { - return ( - - {description} - - ) - } - )} + {coreProgramDescription?.map((description, index) => { + return ( + + {description} + + ) + })}
-
+
-
- +
+ {t("common.week", { week: index, })} @@ -364,7 +348,7 @@ export default function ProgramsPage({ params: { lang } }: any) { {title}
-
+
    {items.map( (label: string, index: number) => { @@ -394,16 +378,23 @@ export default function ProgramsPage({ params: { lang } }: any) { id="faq" className="!border-anakiwa-300" size="xs" - items={contributionsProgramFaq.map( + items={coreProgramFaq.map( ({ question, answer }, index) => { return { label: ( - + {question} ), value: index.toString(), - children: answer, + children: ( + + ), } } )} @@ -462,18 +453,23 @@ export default function ProgramsPage({ params: { lang } }: any) {
    - + + Acceleration Program
    + Round 2 + + } + deadline="May 31, 2024" + location="Remote Application" + date="June 1, 2024 - August 31, 2024" />
    - {accelerationProgramDescription?.map((description, index) => { + {acceleratorProgramDescription?.map((description, index) => { return ( {description} @@ -520,9 +516,9 @@ export default function ProgramsPage({ params: { lang } }: any) { className="flex flex-col gap-8" >
    - + {t("howToApply.openTasks.title")} - +
      {howToApply?.openTasks?.description?.map( (task: string, index: number) => { @@ -532,6 +528,7 @@ export default function ProgramsPage({ params: { lang } }: any) { className="ml-8 list-item items-center" >
      - + {t("howToApply.submitIdea.title")} - +
        {howToApply?.submitIdea?.description?.map( (task: string, index: number) => { @@ -555,6 +552,7 @@ export default function ProgramsPage({ params: { lang } }: any) { className="ml-8 list-item items-center" >
        - {t("howToApply.description")} + + {t("howToApply.description")} +
    @@ -588,16 +588,20 @@ export default function ProgramsPage({ params: { lang } }: any) { { return { label: ( - + {question} ), value: index.toString(), - children: answer, + children: ( + + {answer} + + ), } } )} diff --git a/app/i18n/locales/en/programs-page.json b/app/i18n/locales/en/programs-page.json index 3548850..a7df600 100644 --- a/app/i18n/locales/en/programs-page.json +++ b/app/i18n/locales/en/programs-page.json @@ -58,21 +58,21 @@ ] } ], - "contributionsProgram": { - "title": "Contributions Program", + "coreProgram": { + "title": "Core Program", "description": [ - "The Contributions Program is a hands on entry-level course for university students looking to explore the world of programmable cryptography. This eight-week program will be conducted simultaneously across Argentina (Buenos Aires), Costa Rica (San José), Ecuador (Cuenca), Japan (Tokyo), South Korea (Seoul), and Taiwan (Taipei).", + "PSE's Core Program is an eight-week introductory course for university students looking to explore the world of programmable cryptography. The program will be run hybrid style with online and in-person sessions in Argentina (Buenos Aires), Costa Rica (San José), Ecuador (Cuenca), Japan (Tokyo), South Korea (Seoul), and Taiwan (Taipei).", "By the end of the program, you will gain comprehensive knowledge about Zero Knowledge Proofs (ZKP), Fully Homomorphic Encryption (FHE), and Multiparty Computation (MPC). You will also bolster your GitHub portfolio, and potentially receive grants for further research and contributions!" ] }, - "accelerationProgram": { - "title": "Acceleration Program", + "acceleratorProgram": { + "title": "Accelerator Program", "description": [ - "The Acceleration Program supports alumni of our entry level programs (e.g. Contributions Program, ZK Playground) to deepen their explorations of ZKP, FHE, MPC, and related technologies through grants and mentorship. This program operates on a round-based application system, focusing on specific open tasks for each round." + "The Accelerator Program supports alumni of our entry level programs (e.g. Core Program, ZK Summer, ZK Playground) to deepen explorations of ZKP, FHE, MPC, and related technologies through grants and mentorship. This program operates on a round-based application system, focusing on specific open tasks for each round." ] }, "howToApply": { - "description": "We encourage people to apply as each round opens because we review applications on a first-come first-serve basis. If there are multiple proposals about the same issue, we may consider granting multiple applications on a case-by-case basis.", + "description": "We encourage people to apply as each round opens because we review applications on a first-come first-serve basis! If there are multiple proposals about the same issue, we may consider granting multiple applications on a case-by-case basis.", "openTasks": { "title": "To apply for an open task:", "description": [ diff --git a/data/programs/accelerationProgramFaq.tsx b/data/programs/acceleratorProgramFaq.tsx similarity index 81% rename from data/programs/accelerationProgramFaq.tsx rename to data/programs/acceleratorProgramFaq.tsx index 440fcb1..c739d29 100644 --- a/data/programs/accelerationProgramFaq.tsx +++ b/data/programs/acceleratorProgramFaq.tsx @@ -1,10 +1,10 @@ import { Faq } from "@/lib/types" -export const accelerationProgramFaq: Faq[] = [ +export const acceleratorProgramFaq: Faq[] = [ { question: "Who can apply?", answer: - "The program is open to alumni of our entry level programs (e.g. Contributions Program, ZK Playground) and other applicants at beginner to intermediate levels with programmable cryptography.", + "The Accelerator program is open to alumni of our entry level programs (e.g. Launch Program, ZK Playground) and other applicants at beginner to intermediate levels with programmable cryptography.", }, { question: "What platform does the program use?", @@ -36,7 +36,7 @@ export const accelerationProgramFaq: Faq[] = [ { question: "How long will I have to tackle the open tasks?", answer: - "Though our rounds are run in three month periods, grants may last longer depending on task details.", + "Though our rounds are run in three month periods, the duration of your grant may be shorter or longer depending on task details.", }, { question: "Can I propose an open task?", diff --git a/data/programs/contributionsProgramFaq.tsx b/data/programs/contributionsProgramFaq.tsx deleted file mode 100644 index e3764cf..0000000 --- a/data/programs/contributionsProgramFaq.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { Faq } from "@/lib/types" - -export const contributionsProgramFaq: Faq[] = [ - { - question: "Who can apply?", - answer: - "The program is open to university students based in Japan, South Korea, Taiwan, Costa Rica, Ecuador and Argentina with a basic understanding of programming. If you're currently enrolled in a mathematics or computer science program, you're likely an excellent fit.", - }, - { - question: "What is the structure of the program?", - answer: - "Our program adopts a hybrid learning model with the majority of learning happening online and weekly in-person meetings for discussions and problem-solving. It consists of three stages: Self-Driven Exploration & Guidance, Hands-On Circuit Writing, and Open-Source Project Contribution.", - }, - { - question: "How much time will I need to commit?", - answer: - "We're looking for dedicated students who can commit 40 hours a week from mid-July to September. You will be required to attend an in-person meetup once a week and make presentations.", - }, - { - question: "Can I participate remotely?", - answer: - "Unfortunately no, the weekly in-person sessions are required for in-depth discussions and collaborative problem-solving.", - }, - { - question: "What will I gain from this program?", - answer: - "Upon completing the program, you'll have comprehensive knowledge about Zero-Knowledge Proofs (ZKP), a bolstered GitHub portfolio from contributing to open-source projects, and potentially earn a grant for further research and contributions.", - }, - { - question: "What if I have more questions?", - answer: - "For any further questions or additional information, you can join our Telegram group!", - }, -] diff --git a/data/programs/coreProgramFaq.tsx b/data/programs/coreProgramFaq.tsx new file mode 100644 index 0000000..1ad8259 --- /dev/null +++ b/data/programs/coreProgramFaq.tsx @@ -0,0 +1,34 @@ +import { Faq } from "@/lib/types" + +export const coreProgramFaq: Faq[] = [ + { + question: "Who can apply?", + answer: + "The Core Program is open to university students based in Japan, South Korea, Taiwan, Costa Rica, Ecuador and Argentina with a basic understanding of programming. If you're currently enrolled in a mathematics or computer science program, you're likely an excellent fit.", + }, + { + question: "What is the structure of the program?", + answer: + "We use a hybrid learning model with the majority of learning happening online and weekly in-person meetings for discussions and problem-solving. The program consists of three stages: 1) self-driven exploration & guidance, 2) hands-on circuit writing, and 3) open-source project contribution.", + }, + { + question: "How much time will I need to commit?", + answer: + "We're looking for dedicated students who can commit 40 hours a week from mid-July to September. You will be required to attend in-person meetups once a week and make presentations.", + }, + { + question: "Can I participate remotely?", + answer: + "Unfortunately no, the weekly in-person sessions are required for in-depth discussions and collaborative problem-solving.", + }, + { + question: "What will I gain from this program?", + answer: + "Upon completing the program, you'll have comprehensive knowledge about programmable cryptography, a bolstered GitHub portfolio, and opportunities to apply for grants for further research and contributions.", + }, + { + question: "What if I have more questions?", + answer: + "For any further questions or additional information, you can join our Telegram group!", + }, +]