Merge pull request #47 from web3privacy/pages-redesign

src/components/AboutItemGrid.astro

@@ -13,7 +13,9 @@ import AboutItem from "../components/AboutItem.astro";
         Check our annual reports, infographics, privacy awards, newsletter, and
         guidelines.
       </p>
-      <a class="button inverted"><button>web3privacy Research</button></a>
+      <a class="button inverted" href="/research"
+        ><button>web3privacy Research</button></a
+      >
     </div>
   </div>
 </AboutItem>
@@ -31,18 +33,17 @@ import AboutItem from "../components/AboutItem.astro";
         </div>
         <div>
           <div class="flex items-center flex-nowrap space-x-5">
-            <a href="">
+            <a href="https://explorer.web3privacy.info/" target="_blank">
-              PRIVACY EXPLORER
-
               <span
                 class="font-bold text-white underline"
                 style="text-underline-offset: 4px;"
               >
+                PRIVACY EXPLORER
               </span>
             </a>
           </div>
           <span class="text-[0.8rem] md:text-[1rem] mt-0 w-full"
-            >For Projects, Use-case list, Market & Funding info
+            >Helps individuals in discerning the privacy levels, security, and reliability of Web3 projects
           </span>
         </div>
       </div>
@@ -55,12 +56,14 @@ import AboutItem from "../components/AboutItem.astro";
         </div>
         <div>
           <div class="flex items-center flex-nowrap space-x-5">
-            <span
+            <a href="https://ideas.web3privacy.info/" target="_blank">
-              class="font-bold text-white underline"
+              <span
-              style="text-underline-offset: 4px;"
+                class="font-bold text-white underline"
-            >
+                style="text-underline-offset: 4px;"
-              HACKATHON IDEA GENERATOR
+              >
-            </span>
+                HACKATHON IDEA GENERATOR
+              </span>
+            </a>
           </div>
           <span class="text-[0.8rem] md:text-[1rem] mt-0 w-full"
             >Helps developers build applications that address real-world
@@ -76,12 +79,14 @@ import AboutItem from "../components/AboutItem.astro";
         </div>
         <div>
           <div class="flex items-center flex-nowrap space-x-5">
-            <span
+            <a href="https://news.web3privacy.info/" target="_blank">
-              class="font-bold text-white underline"
+              <span
-              style="text-underline-offset: 4px;"
+                class="font-bold text-white underline"
-            >
+                style="text-underline-offset: 4px;"
-              WEEK IN PRIVACY
+              >
-            </span>
+                WEEK IN PRIVACY
+              </span>
+            </a>
           </div>
           <span class="text-[1rem] mt-0 w-full"
             >Weekly newsletter with round-up of the most important news
@@ -100,12 +105,17 @@ import AboutItem from "../components/AboutItem.astro";
         We make privacy accessible for everyone, empowering people to learn and
         implement best practices effectively.
       </p>
+      <br>
       <p>
         From mentoring at hackathons, guidelines for developers, and the
         Cypherpunk Academy - we offer training, incubation, and acceleration
         programs.
       </p>
-      <a class="button inverted"><button>Privacy Academy</button></a>
+      <a
+        class="button inverted"
+        href="https://docs.web3privacy.info/projects/privacy-academy/"
+        target="_blank"><button>Privacy Academy</button></a
+      >
     </div>
   </div>
-</AboutItem>
+</AboutItem>

src/components/AboutWidget.astro

@@ -111,7 +111,7 @@ const { variant = "about" } = Astro.props;
       </div>
     </div>
   </div>
-  <a href={core.links.donate} target="_blank">
+  <a href="https://docs.web3privacy.info/get-involved/donate/" target="_blank">
     <span
       class="text-white md:text-center text-left w-full flex md:items-center justify-center mt-[24px]"
     >

src/components/MembershipOtherOptionsWidget.astro

@@ -105,7 +105,11 @@
               >
             </p>
           </div>
-          <a class="button inverted"><button>BECOME A SPONSOR</button></a>
+          <a
+            class="button inverted"
+            href="mailto:pg@web3privacy.info"
+            target="_blank"><button>BECOME A SPONSOR</button></a
+          >
         </div>
       </div>
     </div>
@@ -132,7 +136,11 @@
                 >
               </p>
             </div>
-            <a class="button inverted"><button>DONATE</button></a>
+            <a
+              class="button inverted"
+              href="https://docs.web3privacy.info/get-involved/donate/"
+              target="_blank"><button>DONATE</button></a
+            >
           </div>
         </div>
       </div>
@@ -157,7 +165,11 @@
               </p>
             </div>
           </div>
-          <a class="button inverted"><button>Become a speaker</button></a>
+          <a
+            class="button inverted"
+            href="https://tally.so/r/nrOzXl"
+            target="_blank"><button>Become a speaker</button></a
+          >
         </div>
       </div>
     </div>

src/components/MembershipWidget.astro

@@ -43,7 +43,9 @@ import core from "../core.json";
               >
                 €100 / Year
               </span>
-              <a class="button inverted" href={core.links.individual}
+              <a
+                class="button inverted"
+                href="https://docs.web3privacy.info/get-involved/personal-benefits/"
                 ><button>BECOME A MEMBER</button></a
               >
               <p class="max-w-72 text-sm">
@@ -145,8 +147,10 @@ import core from "../core.json";
                     3,000 € / year
                   </span>
                 </div>
-                <a class="button inverted" href={core.links.individual}
+                <a
-                  ><button>Request Tier Breakdown</button></a
+                  class="button inverted"
+                  href="mailto:pg@web3privacy.info"
+                  target="_blank"><button>Request Tier Breakdown</button></a
                 >
               </div>
               <img

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 coreContributorsOrder = [
-const members = core ? people.filter((p) => {
+  'mykola-siusko',
- return  team.includes(p.id)
+  'pg',
-}).filter((p) => p.imageUrl) : team;
+  '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) {
 }
 ---
 
+
 <div
   class="grid grid-cols-3 lg:grid-cols-4 xl:grid-cols-6  place-items-start"
 >

src/config.yaml

@@ -63,9 +63,11 @@ landing:
   research: |
     We cultivate a culture of privacy in web3 making data free and public. 
Enjoy our researches, infographics, annual reports, tools, newsletter, guidelines & more.
   mission: |
-    Empower individuals to take control of their digital privacy.
+    We aim to manifest profound political and social change by advocating 
Privacy in the Web3 Era.

     <br><br>
-    
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.
+    <br><br>
+    <i>'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).</i>
   event: |
     Our aim with gatherings is to build understanding and solidarity between different groups of interests, cultures, states, chains, ecosystems and backgrounds.
     <br><br>
@@ -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

src/layouts/base.astro

@@ -211,32 +211,40 @@ function genHeading(str) {
           <div class="grid-1 grid gap-8 md:grid-cols-2 lg:grid-cols-3">
             <div class="">
               <p class="mb-4">
-                <a href="#!">Manifesto</a>
+                <a href="https://docs.web3privacy.info/about-us/manifesto/" target="_blank">Manifesto</a>
               </p>
               <p class="mb-4">
-                <a href="#!">How to get involved?</a>
+                <a href="/membership" target="_blank">How to get involved?</a>
               </p>
               <p class="mb-4">
-                <a href="#!">Grants / Support Us</a>
+                <a href="https://docs.web3privacy.info/get-involved/index" target="_blank">Grants / Support Us</a>
               </p>
             </div>
             <div>
               <p class="mb-4">
-                <a href="#!">Events</a>
+                <a href="/events">Events</a>
               </p>
               <p class="mb-4">
-                <a href="#!">Articles</a>
+                <a
+                  href="https://mirror.xyz/0x0f1F3DAf416B74DB3DE55Eb4D7513a80F4841073"
+                  >Articles</a
+                >
               </p>
               <p class="mb-4">
-                <a href="#!">Talks</a>
+                <a href="https://www.youtube.com/@Web3PrivacyNow">Talks</a>
               </p>
             </div>
             <div>
               <p class="mb-4">
-                <a href="/#">Privacy Explorer</a>
+                <a href="https://explorer.web3privacy.info/" target="_blank">
+                  Privacy Explorer</a
+                >
               </p>
               <p class="mb-4">
-                <a href="/#">Privacy use-cases database</a>
+                <a
+                  href="https://github.com/web3privacy/web3privacy"
+                  target="_blank">Privacy use-cases database</a
+                >
               </p>
             </div>
           </div>

src/pages/about.astro

@@ -54,11 +54,8 @@ for (const e of upcomingEvents) {
     featuredEvents.push(e);
   }
 }
-
-
 ---
 
-
 <BaseLayout
   title="About web3privacy"
   image="og_about"
@@ -70,7 +67,19 @@ for (const e of upcomingEvents) {
       <div class="flex flex-col gap-[36px] md:order-2">
         <div class="md:hidden block mb-[12px]">
           <h1>activism. care. solidarity.</h1>
-          <div set:html={config.landing.mission} />
+          <!-- <div set:html={config.landing.mission} /> -->
+          <div>
+            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.
+
+            <br />
+
+            Ecosystem is a catalyst for change: we facilitate cross-stack and
+            cross-community collaboration with a poly-disciplinary approach to
+            drive meaningful impact.
+            <br />
+          </div>
           <div class="mt-8 flex gap-6 items-center w-full">
             <a class="button inverted" href={core.links.manifesto}
               ><button>Read manifesto</button></a
@@ -87,7 +96,19 @@ for (const e of upcomingEvents) {
       <div class="md:order-1 order-2">
         <div class="md:block hidden">
           <h1 class="glitch-text">activism. care. solidarity.</h1>
-          <div set:html={config.landing.mission} />
+          <div>
+            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.
+
+            <br />
+            <br />
+
+            Ecosystem is a catalyst for change: we facilitate cross-stack and
+            cross-community collaboration with a poly-disciplinary approach to
+            drive meaningful impact.
+            <br />
+          </div>
           <div class="mt-8 flex gap-6 items-center w-full">
             <a class="button inverted" href={core.links.manifesto}
               ><button>Read manifesto</button></a

src/pages/membership/index.astro

@@ -65,7 +65,11 @@ const sectionsConfig = [
         }
       </div>
       <div class="flex gap-4 p-4 lg:gap-6 pt-4 flex-wrap">
-        <a href={core.links.telegram} class="button inverted">
+        <a
+          target="_blank"
+          href="https://docs.web3privacy.info/contributors/index"
+          class="button inverted"
+        >
           <button>Become a Contributor</button>
         </a>
       </div>
@@ -84,11 +88,7 @@ const sectionsConfig = [
   <div class="mx-4 mt-16">
     <h1 class="my-6 middle-pane-medium">Members</h1>
     <div class="middle-pane-big">
-      <MembersGrid
+      <MembersGrid people={core.people} team={core.members} core={false} />
-        people={core.people}
-        team={core.members}
-        core={false}
-      />
     </div>
   </div>
 
@@ -145,10 +145,7 @@ const sectionsConfig = [
   <div class="mt-16 mx-4">
     <h1 class="my-6 middle-pane-medium">Community Partners</h1>
     <div class="middle-pane-big">
-      <MembersGrid
+      <MembersGrid people={core.people} team={core["community-partners"]} />
-        people={core.people}
-        team={core["community-partners"]}
-      />
     </div>
   </div>