Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a navigation bar #614

Merged
merged 5 commits into from
Oct 5, 2022
Merged

Add a navigation bar #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b1ce00
Add a navigation bar
casey Oct 4, 2022
f4415a2
Add root link
casey Oct 5, 2022
97409c1
Remove more links
casey Oct 5, 2022
b7448cf
tweak
casey Oct 5, 2022
040104c
tweak
casey Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/subcommand/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,9 +1051,7 @@ mod tests {
test_server.assert_response_regex(
"/",
StatusCode::OK,
".*<title>Ordinals</title>.*<h1>Ordinals</h1>
<nav>.*</nav>
.*
".*<title>Ordinals</title>.*
<h2>Status</h2>
<dl>
<dt>cycle</dt><dd>0</dd>
Expand Down
14 changes: 13 additions & 1 deletion src/subcommand/server/templates.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ mod tests {
}
}

pretty_assertions::assert_eq!(
assert_regex_match!(
Foo.page().to_string(),
"<!doctype html>
<html lang=en>
Expand All @@ -70,7 +70,19 @@ mod tests {
<link href=/static/modern-normalize.css rel=stylesheet>
</head>
<body>
<header>
<nav>
<a href=/>Ordinals</a>
.*
<form action=/search method=get>
<input type=text .*>
<input type=submit value=Search>
</form>
</nav>
</header>
<main>
<h1>Foo</h1>
</main>
</body>
</html>
"
Expand Down
6 changes: 1 addition & 5 deletions src/subcommand/server/templates/home.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ mod tests {
)
],)
.to_string(),
"<h1>Ordinals</h1>
<nav>.*</nav>
<h2>Search</h2>
<form action=/search method=get>.*</form>
<h2>Status</h2>
"<h2>Status</h2>
<dl>
<dt>cycle</dt><dd>1</dd>
<dt>epoch</dt><dd>6</dd>
Expand Down
31 changes: 19 additions & 12 deletions static/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
html {
margin-left: 1rem;
margin-right: 1rem;
background-color: #121212;
color: white;
}

input[type="text"], textarea {
background-color: #242424;
border-style: solid;
border-width: 1px;
border-radius: 0.0625rem;
}

body {
margin: 0 auto 0 auto !important;
main {
margin: 0 auto 0 auto;
padding: 0 1rem 0 1rem;
max-width: 100%;
width: 50rem;
}
Expand Down Expand Up @@ -53,7 +45,22 @@ a:visited {
nav {
display: flex;
gap: 1rem;
justify-content: left;
padding: 1rem;
background-color: #242424;
}

nav > form {
margin-left: auto;
}

@media (max-width: 38rem) {
nav {
flex-direction: column;
}

nav > form {
margin-left: 0;
}
}

.blocks {
Expand Down
16 changes: 0 additions & 16 deletions templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
<h1>Ordinals</h1>
<nav>
<a href=https://rodarmor.com/blog/ordinal-theory/>Theory</a>
<a href=https://docs.ordinals.com/faq/>FAQ</a>
<a href=https://docs.ordinals.com/bounty/>Bounties</a>
<a href=https://github.com/casey/ord/blob/master/bip.mediawiki>BIP</a>
<a href=https://github.com/casey/ord>GitHub</a>
<a href=https://discord.gg/87cjuz4FYg>Discord</a>
<a href=/clock>Clock</a>
<a href=/rare.txt>rare.txt</a>
</nav>
<h2>Search</h2>
<form action=/search method=get>
<input autocapitalize=off autocomplete=off autocorrect=off autofocus name=query spellcheck=false type=text>
<input type=submit>
</form>
%% if let Some(starting_ordinal) = self.starting_ordinal {
<h2>Status</h2>
<dl>
Expand Down
15 changes: 15 additions & 0 deletions templates/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
<link href=/static/modern-normalize.css rel=stylesheet>
</head>
<body>
<header>
<nav>
<a href=/>Ordinals</a>
<a href=https://docs.ordinals.com/>Docs</a>
<a href=https://github.com/casey/ord>GitHub</a>
<a href=/clock>Clock</a>
<a href=/rare.txt>rare.txt</a>
<form action=/search method=get>
<input type=text autocapitalize=off autocomplete=off autocorrect=off autofocus name=query spellcheck=false>
<input type=submit value=Search>
</form>
</nav>
</header>
<main>
$$ Trusted(&self.content)
</main>
</body>
</html>