Skip to content

Commit a169f69

Browse files
committed
Merge branch 'develop' into events-page
2 parents 88576b4 + 58a4cc5 commit a169f69

12 files changed

Lines changed: 438 additions & 44 deletions

File tree

.github/workflows/playwright.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: End-to-end Tests
2+
on:
3+
push:
4+
branches: [main, develop]
5+
pull_request:
6+
branches: [main, develop]
7+
jobs:
8+
test:
9+
timeout-minutes: 60
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-node@v2
14+
with:
15+
node-version: '14.x'
16+
- name: Install dependencies
17+
run: npm ci
18+
- name: Install Playwright Browsers
19+
run: npx playwright install --with-deps
20+
- name: Run Playwright tests
21+
run: npx playwright test
22+
- uses: actions/upload-artifact@v2
23+
if: always()
24+
with:
25+
name: playwright-report
26+
path: playwright-report/
27+
retention-days: 5

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@ yarn-error.log*
3535
yarn.lock
3636

3737
#eslint
38-
.eslintrc.json
38+
.eslintrc.json
39+
/test-results/
40+
/playwright-report/
41+
/playwright/.cache/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
This is the repo for the showcase website of the React Developer Community in Kenya
77

88

9-
Check out the live version [HERE](https://reactdevske.netlify.app/)
9+
Check out the live version [HERE](https://reactdevske.vercel.app/)
1010

1111
## Contributing to the project
1212

components/Navbar.js

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import Link from "next/link";
2+
import React from "react";
3+
4+
const Navbar = () => {
5+
return (
6+
<>
7+
<header className="px-[181px] w-full shadow-md bg-white">
8+
<nav className="nav py-4 flex justify-between items-center">
9+
<div>
10+
<Link href={"/"}>
11+
<div className="bg-gray-400 w-[137px] h-[61px]"></div>
12+
</Link>
13+
</div>
14+
<div className="">
15+
<ul className="flex items-center space-x-[37px]">
16+
<Link href={"/#about"}>
17+
<a>
18+
<li>About us</li>
19+
</a>
20+
</Link>
21+
<Link href={"/#members"}>
22+
<a>
23+
<li>Members</li>
24+
</a>
25+
</Link>
26+
<Link href={"/#events"}>
27+
<a>
28+
<li>Events</li>
29+
</a>
30+
</Link>
31+
<Link href={"/#news"}>
32+
<a>
33+
<li>News</li>
34+
</a>
35+
</Link>
36+
<Link href={"/#forum"}>
37+
<a>
38+
<li>Forum</li>
39+
</a>
40+
</Link>
41+
<Link href={"/#contact"}>
42+
<a>
43+
<li>Contact</li>
44+
</a>
45+
</Link>
46+
</ul>
47+
</div>
48+
<div>
49+
<button className="flex mx-auto bg-gray-300 border-0 py-[10px] px-[33px] focus:outline-none hover:bg-gray-600 hover:text-white rounded text-lg">
50+
Join Community
51+
</button>
52+
</div>
53+
</nav>
54+
</header>
55+
</>
56+
);
57+
};
58+
59+
export default Navbar;

e2e-tests/default.spec.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// @ts-check
2+
const { test, expect } = require('@playwright/test');
3+
4+
test.beforeEach(async ({ page }) => {
5+
await page.goto('http://localhost:3000');
6+
});
7+
8+
test.describe('Basic test', () => {
9+
test('should show the title', async ({ page }) => {
10+
const title = page.locator('title');
11+
await expect(title).toHaveText('React Devs Kenya');
12+
});
13+
});

package-lock.json

Lines changed: 87 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"dev": "next dev",
77
"build": "next build",
88
"start": "next start",
9-
"lint": "next lint"
9+
"lint": "next lint",
10+
"test": "playwright test"
1011
},
1112
"dependencies": {
1213
"next": "12.1.6",
@@ -15,10 +16,11 @@
1516
},
1617
"devDependencies": {
1718
"@tailwindcss/aspect-ratio": "^0.4.0",
18-
"autoprefixer": "^10.4.7",
19+
"@playwright/test": "1.22.2",
20+
"autoprefixer": "10.4.7",
1921
"eslint": "8.17.0",
2022
"eslint-config-next": "12.1.6",
21-
"postcss": "^8.4.14",
22-
"tailwindcss": "^3.1.2"
23+
"postcss": "8.4.14",
24+
"tailwindcss": "3.1.2"
2325
}
2426
}

pages/_app.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
import '../styles/globals.css'
1+
import Navbar from "../components/Navbar";
2+
import "../styles/globals.css";
23

34
function MyApp({ Component, pageProps }) {
4-
return <Component {...pageProps} />
5+
return (
6+
<>
7+
<Navbar/>
8+
<Component {...pageProps} />
9+
</>
10+
);
511
}
612

7-
export default MyApp
13+
export default MyApp;

0 commit comments

Comments
 (0)