From efa54143b6959fa4724f7b20294d2d8e6318d7ef Mon Sep 17 00:00:00 2001
From: Diex5 <diexfive@gmail.com>
Date: Mon, 6 May 2024 11:45:17 +0200
Subject: [PATCH] feat: request part 1

---
 src/components/AboutItem.astro     |  2 +-
 src/components/AboutItemGrid.astro | 10 +++++-----
 src/components/AboutWidget.astro   |  2 +-
 src/core.json                      |  8 +++++---
 src/pages/about.astro              | 12 ++++++------
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/components/AboutItem.astro b/src/components/AboutItem.astro
index 85c88fe..9af90e9 100644
--- a/src/components/AboutItem.astro
+++ b/src/components/AboutItem.astro
@@ -28,7 +28,7 @@ const { title, subtext, variant = "primary" } = Astro.props;
             src="arrow.svg"
             class="inline-block min-h-full w-[1rem] self-start"
           />
-          <span class="text-[1rem] leading-[1rem]">{subtext}</span>
+          <span class="text-[1rem] leading-[1.3rem]">{subtext}</span>
         </div>
       </div>
     )
diff --git a/src/components/AboutItemGrid.astro b/src/components/AboutItemGrid.astro
index 0f55208..14cb84c 100644
--- a/src/components/AboutItemGrid.astro
+++ b/src/components/AboutItemGrid.astro
@@ -184,7 +184,7 @@ import AboutItem from "../components/AboutItem.astro";
     <div class="flex md:flex-row flex-col gap-[32px]">
       <div class="flex flex-col gap-[16px]">
         <div class="flex flex-col gap-[4px]">
-          <span class="font-bold text-white leading-[1rem] uppercase">
+          <span class="font-bold text-white my-2 leading-[1rem] uppercase">
             GENERAL PUBLIC
           </span>
           <ul class="list-decimal ml-[18px]">
@@ -193,7 +193,7 @@ import AboutItem from "../components/AboutItem.astro";
           </ul>
         </div>
         <div class="flex flex-col gap-[4px]">
-          <span class="font-bold text-white leading-[1rem] uppercase">
+          <span class="font-bold text-white my-2 leading-[1rem] uppercase">
             PROJECTS
           </span>
           <ul class="list-decimal ml-[18px]">
@@ -203,7 +203,7 @@ import AboutItem from "../components/AboutItem.astro";
           </ul>
         </div>
         <div class="flex flex-col gap-[4px]">
-          <span class="font-bold text-white leading-[1rem] uppercase">
+          <span class="font-bold text-white my-2 leading-[1rem] uppercase">
             SECURITY AUDIT COMPANIES
           </span>
           <ul class="list-decimal ml-[18px]">
@@ -214,7 +214,7 @@ import AboutItem from "../components/AboutItem.astro";
       </div>
       <div class="flex flex-col gap-[16px]">
         <div class="flex flex-col gap-[4px]">
-          <span class="font-bold text-white leading-[1rem] uppercase">
+          <span class="font-bold text-white mb-2 mt-0 leading-[1rem] uppercase">
             DEVELOPERS
           </span>
           <ul class="list-decimal ml-[18px] w-full">
@@ -223,7 +223,7 @@ import AboutItem from "../components/AboutItem.astro";
           </ul>
         </div>
         <div class="flex flex-col gap-[4px] w-full">
-          <span class="font-bold text-white leading-[1rem] uppercase">
+          <span class="font-bold text-white my-2 leading-[1rem] uppercase">
             STARTUPERS
           </span>
           <ul class="list-decimal ml-[18px]">
diff --git a/src/components/AboutWidget.astro b/src/components/AboutWidget.astro
index 1e0b0f1..8a7cd6a 100644
--- a/src/components/AboutWidget.astro
+++ b/src/components/AboutWidget.astro
@@ -11,7 +11,7 @@ const { variant = "about" } = Astro.props;
 <div>
   <div class="border-4 border-white w-full">
     <div class="bg-white w-full text-center px-[16px] text-black">
-      <h3 style="color:black !important">
+      <h3 style="color:black !important" class="pb-[3px]">
         together we are stronger - support us via membership
       </h3>
     </div>
diff --git a/src/core.json b/src/core.json
index 3b1022b..ef00f34 100644
--- a/src/core.json
+++ b/src/core.json
@@ -15,10 +15,12 @@
     "forum": "https://forum.web3privacy.info",
     "explorer": "https://explorer.web3privacy.info",
     "news": "https://news.web3privacy.info",
-    "telegram": "https://t.me/web3privacynow",
+    "telegram": "https://t.me/+DMkrxGNeJzYyYzM0",
     "cfp": "https://cfp.web3privacy.info",
-    "signal": "https://signal.group/#CjQKILd3qhOu7_p8OB0bob3bU3Ko0jfgfxm9DK39oK1eiMe_EhA47ns-aCFke2YA3iMnuxqJ"
-
+    "signal": "https://signal.group/#CjQKILd3qhOu7_p8OB0bob3bU3Ko0jfgfxm9DK39oK1eiMe_EhA47ns-aCFke2YA3iMnuxqJ",
+    "projects": "https://docs.web3privacy.info/#our-projects",
+    "research": "https://web3privacy.info/research/",
+    "brand":"https://github.com/web3privacy/brand"
   },
   "teams": {
     "core-team": [
diff --git a/src/pages/about.astro b/src/pages/about.astro
index aaebaa2..82acbad 100644
--- a/src/pages/about.astro
+++ b/src/pages/about.astro
@@ -29,7 +29,7 @@ import AboutWidget from "../components/AboutWidget.astro";
             <a class="button inverted" href={core.links.manifesto}
               ><button>Read manifesto</button></a
             >
-            <a class="button" href={core.links.manifesto}
+            <a class="button" href={core.links.telegram}
               ><button>Join us</button></a
             >
           </div>
@@ -70,10 +70,10 @@ import AboutWidget from "../components/AboutWidget.astro";
           <h1>Our Projects & research</h1>
           <div set:html={config.landing.research} />
           <div class="mt-8 flex gap-6 items-center w-full">
-            <a class="button inverted" href={"/projects"}
+            <a class="button inverted" href={core.links.projects}
               ><button>Projects</button></a
             >
-            <a class="button inverted" href={"/research"}
+            <a class="button inverted" href={core.links.research}
               ><button>Research</button></a
             >
           </div>
@@ -86,7 +86,7 @@ import AboutWidget from "../components/AboutWidget.astro";
         </div> -->
       </div>
     </div>
-    <AboutWidget />
+    <AboutWidget variant="membership" />
     <div
       class="flex md:flex-row flex-col items-center gap-[24px] justify-center w-full mt-[24px]"
     >
@@ -94,8 +94,8 @@ import AboutWidget from "../components/AboutWidget.astro";
         <h1>empowering community with our brand</h1>
         <div set:html={config.landing.merch} />
         <div class="mt-8 flex gap-6 items-center w-full">
-          <a class="button inverted" href={"/merch"}
-            ><button>MERCH STORE</button></a
+          <a class="button inverted" href={core.links.brand}
+            ><button>Brand on Github</button></a
           >
         </div>
       </div>