Skip to content

Commit 2afb7c2

Browse files
shartteshartte
committed
Work on pages
1 parent 3852c32 commit 2afb7c2

File tree

6 files changed

+442
-392
lines changed

6 files changed

+442
-392
lines changed

‎components/FeaturesSideNav.tsx

-19
This file was deleted.

‎components/NavBar.tsx

+48-87
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,73 @@
11
import React, { useState } from "react";
22
import Link from "next/link";
33
import Icon from "@mdi/react";
4-
import { mdiDiscord, mdiFileDocumentEdit, mdiGithub } from "@mdi/js";
5-
import FeaturesSideNav from "./FeaturesSideNav";
4+
import { mdiDiscord, mdiGithub } from "@mdi/js";
65
import { DocSearch } from "@docsearch/react";
76

87
export interface NavBarProps {
98
pagePath?: string;
109
}
1110

1211
function NavBar({ pagePath }: NavBarProps) {
13-
const [menuOpen, setMenuOpen] = useState(false);
14-
15-
const toggleMenu = (e: React.MouseEvent) => {
16-
e.preventDefault();
17-
setMenuOpen((o) => !o);
18-
};
19-
20-
function closeMenuOnNavigation(e: React.MouseEvent) {
21-
// Close the menu when a link is clicked
22-
if (e.target instanceof HTMLAnchorElement) {
23-
setMenuOpen(false);
24-
}
25-
}
26-
2712
return (
2813
<nav
2914
className="navbar has-shadow"
3015
role="navigation"
3116
aria-label="main navigation"
3217
>
33-
<div className="navbar-brand">
34-
<Link className="navbar-item" href="/">
35-
<img alt="" src="/assets/logo/logo_00.png" />
36-
Applied Energistics 2
37-
</Link>
38-
39-
<a
40-
role="button"
41-
className={menuOpen ? "navbar-burger is-active" : "navbar-burger"}
42-
aria-label="menu"
43-
aria-expanded={menuOpen}
44-
onClick={toggleMenu}
45-
>
46-
<span aria-hidden="true" />
47-
<span aria-hidden="true" />
48-
<span aria-hidden="true" />
49-
</a>
50-
</div>
51-
52-
<div className={menuOpen ? "navbar-menu is-active" : "navbar-menu"}>
53-
<div className="navbar-start">
54-
<Link href="/" className="navbar-item">
55-
Documentation
18+
<div className="container">
19+
<div className="navbar-brand">
20+
<Link className="navbar-item" href="/">
21+
<img alt="" src="/assets/logo/logo_00.png" />
22+
Applied Energistics 2
5623
</Link>
24+
</div>
5725

58-
<Link href="/pages" className="navbar-item">
59-
Download
60-
</Link>
26+
<div className={"navbar-menu"}>
27+
<div className="navbar-start">
28+
<Link href="/guide" className="navbar-item">
29+
Documentation
30+
</Link>
6131

62-
<a
63-
className="navbar-item"
64-
href="https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new/choose"
65-
>
66-
Report Issue
67-
</a>
68-
</div>
32+
<Link href="/download" className="navbar-item">
33+
Download
34+
</Link>
6935

70-
<div className="navbar-end">
71-
<div className="navbar-item">
72-
<DocSearch
73-
appId="BH4D9OD16A"
74-
indexName="appliedenergistics"
75-
apiKey="94d3e24246b4e2a2e8bc6cb3c2da05e4"
76-
/>
77-
</div>
78-
<div className="navbar-item">
79-
<div className="buttons">
80-
<a
81-
href="https://discord.gg/Zd6t9ka7ne"
82-
target="_blank"
83-
rel="noreferrer"
84-
className="button"
85-
>
86-
<span className="icon">
87-
<Icon path={mdiDiscord} color="#5865F2" />
88-
</span>
89-
<span>Discord</span>
90-
</a>
91-
<a
92-
href="https://github.com/AppliedEnergistics/Applied-Energistics-2"
93-
target="_blank"
94-
rel="noreferrer"
95-
className="button"
96-
>
97-
<span className="icon">
98-
<Icon path={mdiGithub} color="#181717" />
99-
</span>
100-
<span>GitHub</span>
101-
</a>
102-
</div>
36+
<a
37+
className="navbar-item"
38+
href="https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new/choose"
39+
>
40+
Report Issue
41+
</a>
10342
</div>
10443

105-
<div
106-
className="navbar-item is-hidden-desktop"
107-
onClick={closeMenuOnNavigation}
108-
>
109-
<FeaturesSideNav />
44+
<div className="navbar-end">
45+
<div className="navbar-item">
46+
<div className="buttons">
47+
<a
48+
href="https://discord.gg/Zd6t9ka7ne"
49+
target="_blank"
50+
rel="noreferrer"
51+
className="button"
52+
>
53+
<span className="icon">
54+
<Icon path={mdiDiscord} color="#5865F2" />
55+
</span>
56+
<span>Discord</span>
57+
</a>
58+
<a
59+
href="https://github.com/AppliedEnergistics/Applied-Energistics-2"
60+
target="_blank"
61+
rel="noreferrer"
62+
className="button"
63+
>
64+
<span className="icon">
65+
<Icon path={mdiGithub} color="#181717" />
66+
</span>
67+
<span>GitHub</span>
68+
</a>
69+
</div>
70+
</div>
11071
</div>
11172
</div>
11273
</div>

‎pages/_app.tsx

+5-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import "../styles/globals.scss";
22
import type { AppProps } from "next/app";
33
import Head from "next/head";
44
import NavBar from "../components/NavBar";
5-
import FeaturesSideNav from "../components/FeaturesSideNav";
65
import "@docsearch/css";
76

87
function MyApp({ Component, pageProps }: AppProps) {
@@ -14,16 +13,11 @@ function MyApp({ Component, pageProps }: AppProps) {
1413
<link rel="icon" href="/favicon.png" sizes="any" />
1514
</Head>
1615
<NavBar pagePath={pagePath} />
17-
<div className="main-container">
18-
<aside className="menu is-hidden-touch">
19-
<FeaturesSideNav />
20-
</aside>
21-
<main>
22-
<div className="container">
23-
<Component {...pageProps} />
24-
</div>
25-
</main>
26-
</div>
16+
<main>
17+
<div className="container">
18+
<Component {...pageProps} />
19+
</div>
20+
</main>
2721
</>
2822
);
2923
}

0 commit comments

Comments
 (0)