Skip to content

Commit 6c66eb7

Browse files
committed
Merge branch 'blog-page' of https://github.com/Anuran12/WebXDAO.github.io into blog-page
2 parents 4ce1d65 + 4ffbf89 commit 6c66eb7

File tree

10 files changed

+82
-24
lines changed

10 files changed

+82
-24
lines changed

.github/workflows/deploy-node.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ name: Node.js CI
66
on:
77
push:
88
branches: [main]
9-
pull_request:
10-
branches: [main]
119

1210
jobs:
1311
build:
1412
runs-on: ubuntu-latest
1513

1614
strategy:
1715
matrix:
18-
node-version: [14.x, 16.x]
16+
node-version: [18.x]
1917
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2018

2119
steps:

Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM node:16.17.0-alpine
2+
WORKDIR '/app'
3+
4+
COPY package.json .
5+
RUN npm install
6+
COPY . .
7+
8+
CMD ["npm","run","dev"]
9+
10+
11+
12+
# if facing error while building image, paste there two command in terminal.
13+
14+
# export DOCKER_BUILDKIT=0
15+
#export COMPOSE_DOCKER_CLI_BUILD=0

docker-compose.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: "3"
2+
services:
3+
react-app:
4+
restart: always
5+
build:
6+
context: ./
7+
dockerfile: Dockerfile
8+
image: amazon-clone
9+
stdin_open: true
10+
ports:
11+
- "3000:3000"
12+
networks:
13+
- app
14+
volumes:
15+
- ./src:/app/src
16+
- ./app/node_modules
17+
18+
networks:
19+
app:
20+
driver: bridge

package.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "webxdao.github.io",
33
"private": true,
4+
"homepage": "https://webxdao.github.io",
45
"scripts": {
56
"dev": "next dev",
67
"build": "next build",
@@ -25,5 +26,22 @@
2526
"eslint-config-next": "12.3.0",
2627
"postcss": "^8.4.5",
2728
"tailwindcss": "^3.0.13"
29+
},
30+
"description": "WebXDAO website",
31+
"repository": {
32+
"type": "git",
33+
"url": "git+https://github.com/WebXDAO/WebXDAO.github.io.git"
34+
},
35+
"keywords": [
36+
"javascript",
37+
"typescript",
38+
"tailwindcss",
39+
"nextjs",
40+
"webxdao"
41+
],
42+
"author": "WebXDAO",
43+
"license": "MIT",
44+
"bugs": {
45+
"url": "https://github.com/WebXDAO/WebXDAO.github.io/issues"
2846
}
2947
}

src/components/Global/Footer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const Footer = () => {
6969
{item.name}
7070
</p>
7171

72-
<nav className="mt-8">
72+
<nav className="mt-8" aria-label={item.name}>
7373
<ul className="space-y-4 text-sm">
7474
{item.children.map((child) => (
7575
<li key={child.name}>

src/components/Global/Navbar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Fragment } from "react";
21
import Link from 'next/link';
2+
import { Fragment } from "react";
33
import { Popover, Transition } from "@headlessui/react";
44
import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline";
55
import { SiGithubsponsors } from "react-icons/si";
@@ -23,11 +23,11 @@ const Navbar = () => {
2323
>
2424
<div className="flex flex-1 items-center">
2525
<div className="flex w-full items-center justify-between md:w-auto">
26-
<Link href={'/'}>
26+
<Link href="/">
2727
<>
28-
<span className="sr-only">WebX DAO</span>
28+
<span className="sr-only ">WebX DAO</span>
2929
<img
30-
className="h-8 w-auto sm:h-10"
30+
className="h-8 w-auto sm:h-10 cursor-pointer"
3131
src="/images/logo/white_logo.png"
3232
alt="WebX DAO White Logo"
3333
/>

src/components/Home/HeroSection/ContributeButton.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ import Link from 'next/link';
44
const ContributeButton = () => {
55
return (
66
<>
7-
<motion.button
7+
<motion.a
88
className="inline-flex items-center justify-center px-8 py-3 text-base font-medium transition-all duration-100 bg-gray-100 border border-transparent rounded-md shadow-md border-dark hover:border-white/80 text-slate-700 hover:bg-gray-700 hover:text-slate-100 focus:outline-none focus:ring-2 focus:ring-cyber-webx focus:ring-offset-2"
99
whileHover={{ scale: 1.05 }}
1010
whileTap={{ scale: 1 }}
11+
href="https://github.com/webxdao"
1112
>
12-
<Link href="https://github.com/webxdao">
13-
<a className="inline-flex items-center justify-center w-full">
14-
Contribute
15-
</a>
16-
</Link>
17-
</motion.button>
13+
Contribute
14+
</motion.a>
1815
</>
1916
);
2017
};

src/components/Home/HeroSection/DiscordButton.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ import Link from 'next/link';
55
const DiscordButton = () => {
66
return (
77
<>
8-
<motion.button
8+
<motion.a
99
className="inline-flex items-center justify-center px-4 py-3 text-base font-medium transition-all duration-100 border border-transparent rounded-md shadow-sm hover:border-white/80 bg-cyber-webx text-white/80 hover:text-white hover:bg-gradient-to-r hover:from-pink-700 hover:to-pink-900 focus:outline-none focus:ring-2 focus:ring-cyber-webx focus:ring-offset-2"
1010
whileHover={{ scale: 1.05 }}
1111
whileTap={{ scale: 1 }}
12+
href="https://dsc.gg/webxdao"
1213
>
13-
<Link href="https://dsc.gg/webxdao">
14-
<a className="inline-flex items-center justify-center w-full">
15-
Join WebXDAO
16-
<FaDiscord className="w-5 h-5 ml-3 -mr-1" aria-hidden="true" />
17-
</a>
18-
</Link>
19-
</motion.button>
14+
Join WebXDAO
15+
<FaDiscord className="w-5 h-5 ml-3 -mr-1" aria-hidden="true" />
16+
</motion.a>
2017
</>
2118
);
2219
};

src/components/Home/HeroSection/Hero.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default function Hero() {
3333
</div>
3434
<CallToActionHero></CallToActionHero>
3535
<p className="mt-3 text-sm text-white/70 sm:mt-4">
36-
We are a opensource community working around the
36+
We are an opensource community working around the
3737
future of the web. Learn blockchain technology
3838
together. The community is powered by{' '}
3939
<Link href="https://devprotocol.xyz/">

src/pages/_document.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Html, Head, Main, NextScript } from 'next/document'
2+
3+
export default function Document() {
4+
return (
5+
<Html lang="en">
6+
<Head />
7+
<body>
8+
<Main />
9+
<NextScript />
10+
</body>
11+
</Html>
12+
)
13+
}

0 commit comments

Comments
 (0)