Merge branch 'main' into responsivess-design-fix

ArslanYM · May 13, 2023 · 9186564 · 9186564
2 parents 5a1d725 + 102589a
commit 9186564
Show file tree

Hide file tree

Showing 23 changed files with 516 additions and 337 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,13 @@
+.git
+.husky 
+.github
+.gitignore
+.gitpod.yml
+.prettierrc 
+.eslintrc.json 
+
+LICENSE
+README.md
+Dockerfile
+CONTRIBUTING.md
+CODE_OF_CONDUCT.md
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [WebXDAO]
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,20 +1,21 @@
 version: "3"
+
 services:
-  react-app:
-    restart: always
+  next-app:
     build:
-      context: ./
+      context: .
       dockerfile: Dockerfile
-    image: amazon-clone
+    image: webxdao-website
+    restart: always
     stdin_open: true
     ports:
       - "3000:3000"
     networks:
-      - app
+      - app-net
     volumes:
       - ./src:/app/src
-      - ./app/node_modules
+      - /app/node_modules
 
 networks:
-  app:
+  app-net:
     driver: bridge
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,12 +23,12 @@
   },
   "devDependencies": {
     "autoprefixer": "^10.4.2",
-    "prettier": "^2.7.1",
     "eslint": "8.6.0",
     "eslint-config-next": "12.3.0",
+    "husky": "^8.0.0",
     "postcss": "^8.4.5",
-    "tailwindcss": "^3.0.13",
-    "husky": "^8.0.0"
+    "prettier": "^2.7.1",
+    "tailwindcss": "^3.2.4"
   },
   "description": "WebXDAO website",
   "repository": {

diff --git a/public/logo 3.4.png → public/images/logo/partners/DevProtocol.png b/public/logo 3.4.png → public/images/logo/partners/DevProtocol.png
diff --git a/public/images/logo/partners/LumosLabs.jpg b/public/images/logo/partners/LumosLabs.jpg
diff --git a/public/images/logo/partners/TheAlgorithms.png b/public/images/logo/partners/TheAlgorithms.png
diff --git a/src/components/Global/Footer.js b/src/components/Global/Footer.js
@@ -6,32 +6,32 @@ const navigation = [
     name: "About Us",
     href: "/about",
     children: [
-      { name: "Who we are?", href: "/about#who" },
-      { name: "What we do?", href: "/about#what" },
+      { name: "Who we are?", href: "/about-us#who" },
+      { name: "What we do?", href: "/about-us#what" },
       { name: "Team WebX", href: "/team" },
     ],
   },
   {
     name: "Socials",
     href: "/",
     children: [
-      { name: "GitHub", href: "" },
-      { name: "Twitter", href: "" },
-      { name: "Discord", href: "" },
-      { name: "LinkedIn", href: "" },
+      { name: "GitHub", href: "https://github.com/WebXDAO" },
+      { name: "Twitter", href: "https://twitter.com/WebXDAO" },
+      { name: "Discord", href: "https://discord.webxdao.xyz/" },
+      { name: "LinkedIn", href: "https://www.linkedin.com/company/76098793" },
     ],
   },
   {
     name: "Contact",
     href: "/contact",
-    children: [{ name: "Contact us", href: "" }],
+    children: [{ name: "Contact us", href: "mailto:web3opensourcecommunity@gmail.com" }],
   },
   {
     name: "Partners",
     href: "/partners",
     children: [
-      { name: "Our partners", href: "" },
-      { name: "Get partner", href: "" },
+      { name: "Our partners", href: "/partners" },
+      { name: "Partner with us", href: "/partners" },
     ],
   },
 ];
@@ -43,15 +43,15 @@ const Footer = () => {
         <div className="grid grid-cols-1 gap-8 lg:grid-cols-3">
           <div>
             <div className="flex justify-center text-teal-600 sm:justify-start">
-              <a href="https://webxdao.github.io/">
+              <a href="https://webxdao.xyz">
                 <span className="sr-only">WebX DAO</span>
                 <img className="w-auto sm:h-14 md:h-16 h-12" src="/images/logo/logo.png" alt="" />
               </a>
             </div>
-            {/*
+            {/* 
             <p className="max-w-md mx-auto mt-6 leading-relaxed text-center text-white/80 sm:max-w-xs sm:mx-0 sm:text-left">
               Add organization description here!
-            </p>*/}
+            </p> */}
           </div>
 
           <div className="grid grid-cols-1 gap-8 sm:grid-cols-2 lg:col-span-2 md:grid-cols-4">

diff --git a/src/components/Global/Navbar.js b/src/components/Global/Navbar.js
@@ -24,16 +24,16 @@ const Navbar = () => {
           <div className="flex items-center flex-1">
             <div className="flex items-center justify-between w-full lg:w-auto">
               <Link href="/">
+                  <a>
                 <>
-                  <a href="https://webxdao.github.io/">
                     <span className="sr-only ">WebX DAO</span>
                     <img
-                      className="h-10 w-auto sm:h-10 md:h-[4.2rem] cursor-pointer"
+                      className="h-12 w-auto sm:h-12 md:h-[4.2rem] cursor-pointer"
                       src="/images/logo/logo.png"
                       alt="WebX DAO White Logo"
                     />
+                        </>
                   </a>
-                </>
               </Link>
               <div className="flex items-center justify-between -mr-2 lg:hidden ">
                 <Popover.Button className="inline-flex items-center justify-center p-2 text-gray-400 bg-transparent rounded-md focus-ring-inset hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-white">
@@ -56,7 +56,7 @@ const Navbar = () => {
             </div>
 
             <a
-              href="#"
+              href="https://github.com/sponsors/WebXDAO"
               className="inline-flex items-center px-4 py-2 text-base font-medium text-gray-600 bg-gray-100 border border-transparent rounded-md hover:text-white/80 hover:bg-gray-700"
             >
               GitHub
@@ -101,7 +101,7 @@ const Navbar = () => {
                   <a
                     key={item.name}
                     href={item.href}
-                    className="block px-3 py-2 text-base font-medium text-gray-100 rounded-md hover:bg-gray-50"
+                    className="block px-3 py-2 text-base font-medium text-gray-100 rounded-md hover:bg-gray-600"
                   >
                     {item.name}
                   </a>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# These are supported funding model platforms

		github: [WebXDAO]