From 8b98b85346627dba1ec5931496e9cfaaab2dfbda Mon Sep 17 00:00:00 2001 From: NoobDeveloper412 Date: Wed, 2 Oct 2024 23:30:29 +0500 Subject: [PATCH 1/5] Added links to CTA, fixed the about page data. --- src/components/AboutWidget.astro | 2 +- .../MembershipOtherOptionsWidget.astro | 18 +++++++++-- src/components/MembershipWidget.astro | 10 ++++-- src/config.yaml | 8 +++-- src/pages/about.astro | 31 ++++++++++++++++--- src/pages/membership/index.astro | 17 +++++----- 6 files changed, 61 insertions(+), 25 deletions(-) diff --git a/src/components/AboutWidget.astro b/src/components/AboutWidget.astro index cd2a91d..e300119 100644 --- a/src/components/AboutWidget.astro +++ b/src/components/AboutWidget.astro @@ -111,7 +111,7 @@ const { variant = "about" } = Astro.props; - + diff --git a/src/components/MembershipOtherOptionsWidget.astro b/src/components/MembershipOtherOptionsWidget.astro index 7337b01..82faa40 100644 --- a/src/components/MembershipOtherOptionsWidget.astro +++ b/src/components/MembershipOtherOptionsWidget.astro @@ -105,7 +105,11 @@ >

- + @@ -132,7 +136,11 @@ >

- + @@ -157,7 +165,11 @@

- + diff --git a/src/components/MembershipWidget.astro b/src/components/MembershipWidget.astro index f4b43f0..69533a0 100644 --- a/src/components/MembershipWidget.astro +++ b/src/components/MembershipWidget.astro @@ -43,7 +43,9 @@ import core from "../core.json"; > €100 / Year -

@@ -145,8 +147,10 @@ import core from "../core.json"; 3,000 € / year -
- 
We envision a world where privacy is a conscious, actively chosen lifestyle, accessible to everyone, everywhere. To turn this into reality, we need to unite our efforts and carve out a path toward a more equitable, decentralized and privacy-respecting digital space. + With unified efforts, we carve out a path toward a more equitable, decentralized and freedom-respecting digital commons. +

+ 'Our task is to secure self-determination where we can, to hold back the coming dystopia where we cannot, and if all else fails, to accelerate its 
self-destruction' - Julian Assange, Cypherpunks (2012). event: | Our aim with gatherings is to build understanding and solidarity between different groups of interests, cultures, states, chains, ecosystems and backgrounds.

@@ -247,7 +249,7 @@ organisation: education: - objective: Academy details: | - Structured learning paths, playlists, and cohort-based programs + Structured learning paths, playlists, and cohort-based programs height: 40 - objective: Hackathon Curation Pack diff --git a/src/pages/about.astro b/src/pages/about.astro index 9b661d8..fff13d2 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -54,11 +54,8 @@ for (const e of upcomingEvents) { featuredEvents.push(e); } } - - --- -

activism. care. solidarity.

-
+ +
+ We are a think-and-Do tank of hundreds of people, projects, and + organizations committed to protecting and advancing civil liberties, + decentralization, and open-source software. + +
+ + Ecosystem is a catalyst for change: we facilitate cross-stack and + cross-community collaboration with a poly-disciplinary approach to + drive meaningful impact. +
+
- - PRIVACY EXPLORER - + + PRIVACY EXPLORER
@@ -55,12 +56,14 @@ import AboutItem from "../components/AboutItem.astro";
- - HACKATHON IDEA GENERATOR - + + + HACKATHON IDEA GENERATOR + +
Helps developers build applications that address real-world @@ -76,12 +79,14 @@ import AboutItem from "../components/AboutItem.astro";
- - WEEK IN PRIVACY - + + + WEEK IN PRIVACY + +
Weekly newsletter with round-up of the most important news @@ -105,7 +110,11 @@ import AboutItem from "../components/AboutItem.astro"; Cypherpunk Academy - we offer training, incubation, and acceleration programs.

- +
- \ No newline at end of file + diff --git a/src/layouts/base.astro b/src/layouts/base.astro index d9832f6..2047c81 100644 --- a/src/layouts/base.astro +++ b/src/layouts/base.astro @@ -211,32 +211,40 @@ function genHeading(str) {

- Manifesto + Manifesto

- How to get involved? + How to get involved?

- Grants / Support Us + Grants / Support Us

- Events + Events

- Articles + Articles

- Talks + Talks

- Privacy Explorer + + Privacy Explorer

- Privacy use-cases database + Privacy use-cases database

From cf2b728cfcef1c8016624d99f0408c9cde72825a Mon Sep 17 00:00:00 2001 From: NoobDeveloper412 Date: Thu, 3 Oct 2024 00:01:04 +0500 Subject: [PATCH 3/5] Fixed the order for the coreContributors. --- src/components/SpeakerGrid.astro | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/components/SpeakerGrid.astro b/src/components/SpeakerGrid.astro index c9d64b8..6133603 100644 --- a/src/components/SpeakerGrid.astro +++ b/src/components/SpeakerGrid.astro @@ -3,13 +3,27 @@ import { parseAndWrapCaptions } from "../../utils/captionParser"; const { people, team, core, contributors } = Astro.props; -// Filter based on the `core` parameter -const members = core ? people.filter((p) => { - return team.includes(p.id) -}).filter((p) => p.imageUrl) : team; +const coreContributorsOrder = [ + 'mykola-siusko', + 'pg', + 'michael-parenti', + 'coinmandeer', + 'robert', + 'cat', + 'odd', + 'mf' +]; + +// Filter based on the `core` parameter +const members = core + ? people.filter((p) => team.includes(p.id)).filter((p) => p.imageUrl) + : team; + +// Filter and sort `filteredPeople` based on `coreContributorsOrder` +const filteredPeople = members.filter((p) => p.imageUrl).sort((a, b) => { + return coreContributorsOrder.indexOf(a.id) - coreContributorsOrder.indexOf(b.id); +}); -// const filteredPeople = members.filter((p) => p.imageUrl).slice(0, 12); -const filteredPeople = members.filter((p) => p.imageUrl); function personLink(person) { if (person.refs?.twitter) { @@ -32,6 +46,7 @@ function personLink(person) { } --- +
From c7b3281288d7ef7f8bf7ec3ff405187302576fb7 Mon Sep 17 00:00:00 2001 From: NoobDeveloper412 Date: Thu, 3 Oct 2024 00:14:11 +0500 Subject: [PATCH 4/5] Added more link fixes. --- src/layouts/base.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/base.astro b/src/layouts/base.astro index 2047c81..fcd8f81 100644 --- a/src/layouts/base.astro +++ b/src/layouts/base.astro @@ -217,7 +217,7 @@ function genHeading(str) { How to get involved?

- Grants / Support Us + Grants / Support Us

From f8965731801b948f2b81fde28e03c17282449915 Mon Sep 17 00:00:00 2001 From: NoobDeveloper412 Date: Thu, 3 Oct 2024 00:21:09 +0500 Subject: [PATCH 5/5] Fixed text. --- src/components/AboutItemGrid.astro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/AboutItemGrid.astro b/src/components/AboutItemGrid.astro index 2c06144..7f96d70 100644 --- a/src/components/AboutItemGrid.astro +++ b/src/components/AboutItemGrid.astro @@ -43,7 +43,7 @@ import AboutItem from "../components/AboutItem.astro";
For Projects, Use-case list, Market & Funding info + >Helps individuals in discerning the privacy levels, security, and reliability of Web3 projects
@@ -105,6 +105,7 @@ import AboutItem from "../components/AboutItem.astro"; We make privacy accessible for everyone, empowering people to learn and implement best practices effectively.

+

From mentoring at hackathons, guidelines for developers, and the Cypherpunk Academy - we offer training, incubation, and acceleration