Merge branch 'WebXDAO:main' into main

ArslanYM · Jun 15, 2023 · 20586f4 · 20586f4
2 parents b0109b7 + 518b347
commit 20586f4
Show file tree

Hide file tree

Showing 13 changed files with 326 additions and 156 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
     url: https://bio.link/WebXDAO
     about: Feel free to contact us via your preferred platform.
   - name: Discord community
-    url: https://discord.gg/TSRwqx4K2v
+    url: https://discord.webxdao.xyz
     about: Join our inclusive Discord community.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![Open in GitPod](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/WebXDAO/WebXDAO.github.io)
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/WebXDAO/WebXDAO.github.io/blob/master/LICENSE)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/WebXDAO/WebXDAO.github.io/blob/main/LICENSE)
 ![GitHub repo size](https://img.shields.io/github/repo-size/WebXDAO/WebXDAO.github.io)
 
 The content in this repository is temporary, as we are working on a new web design for WebX DAO, which is available in the [website v3 project](https://github.com/orgs/WebXDAO/projects/9). 
@@ -12,10 +12,14 @@ If you need any assistance, please feel free to message us on [Discord](https://
 
 > Before you begin, make sure to read our [contributing guidelines](https://github.com/WebXDAO/WebXDAO.github.io/blob/main/CONTRIBUTING.md).
 
-### 1. Skip all the steps below by using Gitpod, which automates the setup process
+### Skip all the steps below by using Gitpod, which automates the setup process
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/WebXDAO/WebXDAO.github.io)
 
+### 1. Fork the repository
+
+Fork the repository on the [fork page](https://github.com/WebXDAO/WebXDAO.github.io/fork).
+
 ### 2. Check the Node.js version on your local machine
 
 Ensure that you have Node.js installed. You can check the Node.js version by running the following command:
@@ -30,7 +34,7 @@ If Node.js is not installed, you can download it from [nodejs.org](https://nodej
 To clone this repository to your local machine, run the following command:
 
 ```
-git clone https://github.com/WebXDAO/WebXDAO.github.io.git
+git clone https://github.com/<your-username>/WebXDAO.github.io.git
 ```
 
 ### 4. Navigate to the Directory
@@ -58,6 +62,7 @@ npm run dev
 ```
 
 ### Important Points to Remember
+
 - Make sure your local environment has Node.js installed, with a minimum version of 16 (node >= v16).
 - If you need to change the Node.js version for your development environment, you can use a version manager like [nvm](https://github.com/nvm-sh/nvm).
 

diff --git a/app/projects/page.tsx b/app/projects/page.tsx
@@ -61,17 +61,12 @@ export default async function Projects() {
               html_url: string;
               index: number;
             }) => (
-              <div
+              <ProjectCard
                 key={index}
-                className="focus:shadow-outline col-span-3 flex cursor-pointer flex-col items-stretch justify-between rounded-md p-2 transition duration-300 ease-in-out hover:scale-105 focus:outline-none md:col-span-1"
-              >
-                <ProjectCard
-                  key={index}
-                  full_name={full_name}
-                  description={description}
-                  url={html_url}
-                />
-              </div>
+                full_name={full_name}
+                description={description}
+                url={html_url}
+              />
             )
           )}
       </div>

diff --git a/components/Footer.tsx b/components/Footer.tsx
@@ -33,6 +33,9 @@ export default function Footer() {
               <Link
                 href={siteConfig.links.webxdao_discord}
                 target="_blank"
+                aria-label="Join us on Discord"
+                title="Discord (External Link)"
+                rel="noopener noreferrer" 
                 className="dark:fill-white "
               >
                 <Icons.discord
@@ -41,21 +44,39 @@ export default function Footer() {
                   height={25}
                 />
               </Link>
-              <Link href={siteConfig.links.webxdao_twitter} target="_blank">
+              <Link 
+                  href={siteConfig.links.webxdao_twitter}
+                  target="_blank"
+                  aria-label="Visit us on Twitter"
+                  title="Twitter (External Link)"
+                  rel="noopener noreferrer"
+                >
                 <Icons.twitter
                   className="cursor-pointer transition duration-500 hover:scale-150 hover:fill-blue-800"
                   width={25}
                   height={25}
                 />
               </Link>
-              <Link href={siteConfig.links.webxdao_gh} target="_blank">
+              <Link 
+                  href={siteConfig.links.webxdao_gh} 
+                  target="_blank"
+                  aria-label="Visit us on Github"
+                  title="Github (External Link)"
+                  rel="noopener noreferrer" 
+                >
                 <Icons.gitHub
                   className="cursor-pointer transition duration-500 hover:scale-150 hover:fill-blue-800"
                   width={25}
                   height={25}
                 />
               </Link>
-              <Link href={siteConfig.links.webxdao_linkedin} target="_blank">
+              <Link 
+                  href={siteConfig.links.webxdao_linkedin} 
+                  target="_blank"
+                  aria-label="Visit us on Linkedin"
+                  title="Linkedin (External Link)"
+                  rel="noopener noreferrer" 
+                >
                 <Icons.linkedin
                   className="cursor-pointer transition  duration-500 hover:scale-150 hover:fill-blue-800"
                   width={25}

diff --git a/components/ProjectCard.tsx b/components/ProjectCard.tsx
@@ -1,6 +1,8 @@
 import Link from "next/link";
-import { Icons } from "./icons";
 import { Button, buttonVariants } from "./ui/button";
+import { ImArrowUpRight2 } from "react-icons/im";
+import { cn }  from "../lib/utils";
+import { fontSans } from "@/lib/fonts";
 
 const ProjectCard = ({
   full_name,
@@ -12,27 +14,26 @@ const ProjectCard = ({
   description: string;
 }) => {
   return (
-    <div className="bg-white-900/60 dark:border-white-700 flex h-full w-full flex-col justify-between rounded-lg border p-5 shadow">
-      <div>
-        <div className="flex flex-row">
-          {/*<img src={owner?.avatar_url} className="rounded h-40 w-40"/>*/}
-          <p>
-            <span className="text-black-300 font-semibold">{full_name}</span>
-          </p>
-        </div>
-        <p className="dark:text-white-500 mt-3 text-xs text-gray-500">{description}</p>
-        <div className="flex items-center justify-center px-2 py-4">
-          <Link
-            href={url}
-            target="_blank"
-            rel="noreferrer"
-            className={buttonVariants({ size: "lg" })}
-          >
-            Read more
-          </Link> 
+    <>
+      {/* Project Card Container */}
+      <div className={cn(fontSans.variable ,"flex w-[356px] flex-col items-start justify-between gap-8 justify-self-center rounded-[10px] border border-black/5 px-[28px] pb-[24px] pt-[28px] shadow-[0px_0px_10px_0px_#00000010] hover:shadow-sm dark:border-white/20 dark:shadow-[0px_0px_10px_0px_#FFFFFF25] md:w-full md:lg:min-h-[240px]")}>
+        {/* Heading and Description Container */}
+        <div className="flex flex-col items-start gap-3">
+          {/* Heading */}
+          <h2 className="text-base font-bold">{full_name}</h2>
+          {/* Description */}
+          <p className="text-justify text-base font-normal dark:text-white/50">{description}</p>
         </div>
+        {/* Read More Button */}
+        <Link
+          href={url}
+          className="border-3 flex w-fit flex-row items-center justify-start gap-1 rounded-[10px] border border-black bg-white px-2 py-1 transition-all hover:shadow-sm hover:outline hover:outline-1 dark:border-white/60 dark:bg-black"
+        >
+          <ImArrowUpRight2/>
+          <span className="text-sm font-semibold dark:text-white">Read More</span>
+        </Link>
       </div>
-    </div>
+    </>
   );
 };
 

diff --git a/components/landing/Blurbs.tsx b/components/landing/Blurbs.tsx
@@ -5,7 +5,7 @@ export default function Blurbs() {
       <section className=" flex justify-center px-4 py-0 md:px-10">
         <div className="my-12 flex flex-col md:flex-row md:gap-8">
           <div className="flex flex-col items-center justify-center gap-3 text-center">
-            <div className="border-l-3 flex justify-center rounded-lg border-white bg-white p-8 shadow-md shadow-purple-300">
+            <div className="border-l-3 flex justify-center rounded-lg border-white bg-white p-8 shadow-md shadow-purple-300 transition-all duration-300 hover:-translate-y-2 hover:scale-105">
               <Icons.collaborate className="h-15 w-15 mr-1" />
             </div>
             <div className="text-lg font-bold">Collaborate</div>
@@ -15,7 +15,7 @@ export default function Blurbs() {
           </div>
 
           <div className="mt-8 flex flex-col items-center justify-center gap-3 text-center md:mt-0">
-            <div className="border-l-3 flex justify-center rounded-lg border-white bg-white p-8 shadow-md shadow-purple-300">
+            <div className="border-l-3 flex justify-center rounded-lg border-white bg-white p-8 shadow-md shadow-purple-300 transition-all duration-300 hover:-translate-y-2 hover:scale-105">
               <Icons.blockchain className="h-15 w-15 mr-1" />
             </div>
             <div className="text-lg font-bold">Blockchain</div>
@@ -26,7 +26,7 @@ export default function Blurbs() {
           </div>
 
           <div className="mt-8 flex flex-col items-center justify-center gap-3 text-center md:mt-0">
-            <div className="border-l-3 flex justify-center rounded-lg border-white bg-white p-8 shadow-md shadow-purple-300">
+            <div className="border-l-3 flex justify-center rounded-lg border-white bg-white p-8 shadow-md shadow-purple-300 transition-all duration-300 hover:-translate-y-2 hover:scale-105">
               <Icons.decentralization className="h-15 w-15 mr-1" />
             </div>
             <div className="text-lg font-bold">Decentralization</div>

diff --git a/components/landing/Main.tsx b/components/landing/Main.tsx
@@ -7,7 +7,7 @@ import CursorHoverster from "@/components/cursor-hoverster";
 
 export default function Main () {
     return (
-        <section className="relative flex min-h-screen flex-col items-center justify-center overflow-hidden text-center">
+        <section className="relative flex min-h-screen flex-col items-center justify-center overflow-hidden pt-12 text-center">
         <div className="relative z-10 flex flex-col gap-6">
           <div className="flex max-w-[980px] flex-col items-center gap-2 ">
             <h1 className="bg-gradient-to-r from-indigo-700 via-purple-700 to-slate-900 bg-clip-text text-3xl font-medium leading-tight tracking-tighter text-transparent mix-blend-difference sm:text-5xl md:text-6xl lg:text-7xl">

diff --git a/components/landing/Partners.tsx b/components/landing/Partners.tsx
@@ -17,8 +17,8 @@ const data = [
     },
     {
         img: "/Lumos-Labs-1.png",
-        para: "Lumos labs is building a metaverse for builders and Web3 ecosystem enablers to share opportunities to build scale-up.",
-        url: "https://twitter.com/lumoslabsHQ",
+        para: "Lumos Labs is building a metaverse for builders and Web3 ecosystem enablers to share opportunities to build scale-up.",
+        url: "https://www.lumoslabs.co/",
     },
 ];
 

diff --git a/components/main-nav.tsx b/components/main-nav.tsx
@@ -65,6 +65,8 @@ export function MainNav({ items }: MainNavProps) {
               href={siteConfig.links.webxdao_gh}
               target="_blank"
               rel="noreferrer"
+              aria-label="Visit us on Github"
+              title="Github (External Link)"
             >
               <div
                 className={buttonVariants({
@@ -81,6 +83,8 @@ export function MainNav({ items }: MainNavProps) {
               href={siteConfig.links.webxdao_twitter}
               target="_blank"
               rel="noreferrer"
+              aria-label="Visit us on Twitter"
+              title="Twitter (External Link)"
             >
               <div
                 className={buttonVariants({
@@ -146,6 +150,8 @@ export function MainNav({ items }: MainNavProps) {
                 <Link
                   href={siteConfig.links.webxdao_gh}
                   target="_blank"
+                  aria-label="Visit us on Github"
+                  title="Github (External Link)"
                   rel="noreferrer"
                 >
                   <div
@@ -162,6 +168,8 @@ export function MainNav({ items }: MainNavProps) {
                 <Link
                   href={siteConfig.links.webxdao_twitter}
                   target="_blank"
+                  aria-label="Visit us on Twitter"
+                  title="Twitter (External Link)"
                   rel="noreferrer"
                 >
                   <div

diff --git a/components/site-header.tsx b/components/site-header.tsx
@@ -8,7 +8,7 @@ import { ThemeToggle } from "@/components/theme-toggle"
 
 export function SiteHeader() {
   return (
-    <header className="sticky top-0 z-40 w-full border-b bg-background">
+    <header className="sticky top-0 z-999 w-full border-b bg-background">
       <div className="container flex h-20 items-center space-x-4 sm:justify-between sm:space-x-0">
         <MainNav items={siteConfig.mainNav} />
       </div>