Skip to content

Commit 51936d8

Browse files
AJ-KulunduAJ-Kulundu
committed
Merge branch 'develop' into events-page
2 parents 6073ea2 + 2d96591 commit 51936d8

11 files changed

Lines changed: 123 additions & 11 deletions

File tree

components/Navbar.js renamed to components/Navbar.jsx

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,69 @@
1-
import Link from "next/link";
21
import React from "react";
2+
import Link from "next/link";
3+
import Image from "next/image";
4+
import logo from "../public/reactdevske.svg";
5+
import {
6+
ABOUT,
7+
CONTACT,
8+
EVENTS,
9+
FORUM,
10+
HOME,
11+
MEMBERS,
12+
NEWS,
13+
} from "../util/routeConstants";
314

415
const Navbar = () => {
516
return (
617
<>
718
<header className="px-[181px] w-full shadow-md bg-white">
819
<nav className="nav py-4 flex justify-between items-center">
920
<div>
10-
<Link href={"/"}>
11-
<div className="bg-gray-400 w-[137px] h-[61px]"></div>
21+
<Link href={HOME}>
22+
<a>
23+
<Image src={logo} alt="reactdevske logo" width={137} height={60} />
24+
</a>
1225
</Link>
1326
</div>
1427
<div className="">
1528
<ul className="flex items-center space-x-[37px]">
16-
<Link href={"/#about"}>
29+
<Link href={ABOUT}>
1730
<a>
1831
<li>About us</li>
1932
</a>
2033
</Link>
21-
<Link href={"/#members"}>
34+
<Link href={MEMBERS}>
2235
<a>
2336
<li>Members</li>
2437
</a>
2538
</Link>
26-
<Link href={"/#events"}>
39+
<Link href={EVENTS}>
2740
<a>
2841
<li>Events</li>
2942
</a>
3043
</Link>
31-
<Link href={"/#news"}>
44+
<Link href={NEWS}>
3245
<a>
3346
<li>News</li>
3447
</a>
3548
</Link>
36-
<Link href={"/#forum"}>
49+
<Link href={FORUM}>
3750
<a>
3851
<li>Forum</li>
3952
</a>
4053
</Link>
41-
<Link href={"/#contact"}>
54+
<Link href={CONTACT}>
4255
<a>
4356
<li>Contact</li>
4457
</a>
4558
</Link>
4659
</ul>
4760
</div>
4861
<div>
62+
<a target="_blank" href="https://bit.ly/joinreactdevske" rel="noopener noreferrer">
4963
<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">
5064
Join Community
5165
</button>
66+
</a>
5267
</div>
5368
</nav>
5469
</header>

pages/_app.js renamed to pages/_app.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import Navbar from "../components/Navbar";
1+
import Navbar from "../components/Navbar.jsx";
22
import "../styles/globals.css";
33

44
function MyApp({ Component, pageProps }) {
55
return (
66
<>
7-
<Navbar/>
7+
<Navbar />
88
<Component {...pageProps} />
99
</>
1010
);

pages/_document.js renamed to pages/_document.jsx

File renamed without changes.

‎pages/about.jsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import Head from "next/head";
2+
import React from "react";
3+
4+
export default function AboutPage() {
5+
return (
6+
<>
7+
<Head>
8+
<title>React Devs Kenya - About</title>
9+
</Head>
10+
<main className="flex justify-center items-center min-h-screen">
11+
<h1 className="text-white">About page will be here</h1>
12+
</main>
13+
</>
14+
);
15+
}

‎pages/contact.jsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from "react";
2+
import Head from "next/head";
3+
4+
export default function ContactPage() {
5+
return (
6+
<>
7+
<Head>
8+
<title>React Devs Kenya - Contact</title>
9+
</Head>
10+
<main className="flex justify-center items-center min-h-screen">
11+
<h1 className="text-white">Contact page will be here</h1>
12+
</main>
13+
</>
14+
);
15+
}

‎pages/events.jsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from "react";
2+
import Head from "next/head";
3+
4+
export default function EventsPage() {
5+
return (
6+
<>
7+
<Head>
8+
<title>React Devs Kenya - Events</title>
9+
</Head>
10+
<main className="flex justify-center items-center min-h-screen">
11+
<h1 className="text-white">Events page will be here</h1>
12+
</main>
13+
</>
14+
);
15+
}

‎pages/forum.jsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from "react";
2+
import Head from "next/head";
3+
4+
export default function ForumPage() {
5+
return (
6+
<>
7+
<Head>
8+
<title>React Devs Kenya - Forum</title>
9+
</Head>
10+
<main className="flex justify-center items-center min-h-screen">
11+
<h1 className="text-white">Forum page will be here</h1>
12+
</main>
13+
</>
14+
);
15+
}

pages/index.js renamed to pages/index.jsx

File renamed without changes.

‎pages/members.jsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from "react";
2+
import Head from "next/head";
3+
4+
export default function MembersPage() {
5+
return (
6+
<>
7+
<Head>
8+
<title>React Devs Kenya - About</title>
9+
</Head>
10+
<main className="flex justify-center items-center min-h-screen">
11+
<h1 className="text-white">Members page will be here</h1>
12+
</main>
13+
</>
14+
);
15+
}

‎pages/news.jsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from "react";
2+
import Head from "next/head";
3+
4+
export default function NewsPage() {
5+
return (
6+
<>
7+
<Head>
8+
<title>React Devs Kenya - News</title>
9+
</Head>
10+
<main className="flex justify-center items-center min-h-screen">
11+
<h1 className="text-white">News page will be here</h1>
12+
</main>
13+
</>
14+
);
15+
}

0 commit comments

Comments
 (0)