edward/bunbun
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: edward:0ffa1419bc6de139eabad5658d1a00c776040b9a
Branches Tags
edward:master
edward:0.8.1
edward:0.8.0
edward:0.7.0
edward:0.6.2
edward:0.6.1
edward:0.6.0
edward:0.5.0
edward:0.4.1
edward:0.4.0
edward:0.3.0
edward:0.2.2
edward:0.2.1
edward:0.1.1
edward:0.2.0
edward:0.1.0
..
compare: edward:9cf01f59913b860ad21027f1f3b261c434dd2333
Branches Tags
edward:master
edward:0.8.1
edward:0.8.0
edward:0.7.0
edward:0.6.2
edward:0.6.1
edward:0.6.0
edward:0.5.0
edward:0.4.1
edward:0.4.0
edward:0.3.0
edward:0.2.2
edward:0.2.1
edward:0.1.1
edward:0.2.0
edward:0.1.0

No commits in common. "0ffa1419bc6de139eabad5658d1a00c776040b9a" and "9cf01f59913b860ad21027f1f3b261c434dd2333" have entirely different histories.
0ffa1419bc ... 9cf01f5991

5 changed files with 8 additions and 21 deletions
Show stats Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -386,7 +386,7 @@ dependencies = [
[[package]]
name = "bunbun"
version = "0.6.2"
version = "0.6.1"
dependencies = [
"actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"actix-web 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "bunbun"
version = "0.6.2"
version = "0.6.1"
authors = ["Edward Shen <code@eddie.sh>"]
edition = "2018"
description = "Re-implementation of bunny1 in Rust"

3
src/main.rs
View file

@ -121,9 +121,6 @@ fn compile_templates() -> Handlebars {
handlebars
.register_partial("bunbun_version", env!("CARGO_PKG_VERSION"))
.unwrap();
handlebars
.register_partial("bunbun_src", env!("CARGO_PKG_REPOSITORY"))
.unwrap();
macro_rules! register_template {
[ $( $template:expr ),* ] => {
$(

1
src/routes.rs
View file

@ -1,4 +1,5 @@
use crate::{template_args, BunBunError, Route, State};
use actix_web::http::header::ContentType;
use actix_web::web::{Data, Query};
use actix_web::{get, http::header};
use actix_web::{HttpRequest, HttpResponse, Responder};

21
src/templates/index.hbs
View file

@ -7,8 +7,6 @@
<style type="text/css">
body {
display: flex;
margin: 0;
min-height: 100vh;
flex-direction: column;
align-items: center;
background-color: #212121;
@ -16,18 +14,11 @@
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}
h1, p { margin: 0; }
h1 { margin-top: 1rem; }
main { display: flex; }
a { color: white; }
footer {
display: flex;
justify-self: end;
justify-content: space-between;
}
.spacer { flex-grow: 1; }
footer p, footer p a {
margin: 1rem 0.5rem;
color: #555;
margin-top: 1rem;
color: #444;
}
</style>
<link rel="search"
@ -37,7 +28,7 @@
</head>
<body>
<h1>Bunbun</h1>
<p>Welcome to bunbun! To setup bunbun for your web browser, follow these steps:</p>
<p>Thanks for installing bunbun! To setup bunbun for your web browser, follow these steps:</p>
<main>
<section>
<h2>Firefox</h2>
@ -62,11 +53,9 @@
</ol>
</section>
</main>
<p>To view a full list of commands currently available on this instance, check out the <a href="/ls">command list</a>.</p>
<p>To view a full list of commands, check out the <a href="/ls">command list</a>.</p>
</body>
<div class="spacer"></div>
<footer>
<p>{{> bunbun_version }}</p>
<p><a href="{{> bunbun_src }}">Source Code</a></p>
<p>{{> bunbun_version}}</p>
</footer>
</html>