add github url

This commit is contained in:
Kaczanowski Mateusz 2020-05-09 03:50:49 +02:00
parent 15e8f9f738
commit 85ee060a50
3 changed files with 7 additions and 10 deletions

View file

@ -274,9 +274,8 @@ fn get_url(cfg: &PastebinConfig) -> String {
} }
} }
fn get_error_response(html: String, status: Status, cfg: &PastebinConfig) -> Response { fn get_error_response<'r>(html: String, status: Status) -> Response<'r> {
let map = btreemap! { let map = btreemap! {
"hostname" => cfg.address.as_str(),
"version" => VERSION, "version" => VERSION,
"is_error" => "true", "is_error" => "true",
}; };
@ -330,7 +329,6 @@ fn get<'r>(
lang: Option<String>, lang: Option<String>,
state: State<'r, DB>, state: State<'r, DB>,
resources: State<'r, HashMap<&str, &[u8]>>, resources: State<'r, HashMap<&str, &[u8]>>,
cfg: State<PastebinConfig>,
) -> Response<'r> { ) -> Response<'r> {
let html = String::from_utf8_lossy(resources.get("../static/index.html").unwrap()).to_string(); let html = String::from_utf8_lossy(resources.get("../static/index.html").unwrap()).to_string();
@ -344,7 +342,6 @@ fn get<'r>(
}; };
let map = btreemap! { let map = btreemap! {
"hostname" => cfg.address.as_str(),
"version" => VERSION, "version" => VERSION,
"is_error" => "true", "is_error" => "true",
}; };
@ -371,7 +368,6 @@ fn get<'r>(
"pastebin_code" => std::str::from_utf8(entry.data().unwrap()).unwrap().to_string(), "pastebin_code" => std::str::from_utf8(entry.data().unwrap()).unwrap().to_string(),
"pastebin_id" => id, "pastebin_id" => id,
"pastebin_language" => selected_lang, "pastebin_language" => selected_lang,
"hostname" => cfg.address.clone(),
"version" => VERSION.to_string(), "version" => VERSION.to_string(),
}; };
@ -409,7 +405,6 @@ fn get<'r>(
fn get_new<'r>( fn get_new<'r>(
state: State<'r, DB>, state: State<'r, DB>,
resources: State<'r, HashMap<&str, &[u8]>>, resources: State<'r, HashMap<&str, &[u8]>>,
cfg: State<PastebinConfig>,
id: Option<String>, id: Option<String>,
level: Option<String>, level: Option<String>,
glyph: Option<String>, glyph: Option<String>,
@ -425,7 +420,6 @@ fn get_new<'r>(
let mut map = btreemap! { let mut map = btreemap! {
"is_editable" => "true", "is_editable" => "true",
"hostname" => cfg.address.as_str(),
"version" => VERSION, "version" => VERSION,
"msg" => msg.as_str(), "msg" => msg.as_str(),
"level" => level.as_str(), "level" => level.as_str(),
@ -497,7 +491,6 @@ fn get_binary(id: String, state: State<DB>) -> Response {
fn get_static<'r>( fn get_static<'r>(
resource: String, resource: String,
resources: State<'r, HashMap<&str, &[u8]>>, resources: State<'r, HashMap<&str, &[u8]>>,
cfg: State<'r, PastebinConfig>,
) -> Response<'r> { ) -> Response<'r> {
let pth = format!("../static/{}", resource); let pth = format!("../static/{}", resource);
let ext = get_extension(resource.as_str()).replace(".", ""); let ext = get_extension(resource.as_str()).replace(".", "");
@ -507,7 +500,7 @@ fn get_static<'r>(
None => { None => {
let html = let html =
String::from_utf8_lossy(resources.get("../static/index.html").unwrap()).to_string(); String::from_utf8_lossy(resources.get("../static/index.html").unwrap()).to_string();
return get_error_response(html, Status::NotFound, cfg.inner()); return get_error_response(html, Status::NotFound);
} }
}; };
let content_type = ContentType::from_extension(ext.as_str()).unwrap(); let content_type = ContentType::from_extension(ext.as_str()).unwrap();

View file

@ -18,6 +18,10 @@ body {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.footer a {
color: #000;
}
.form-group textarea { .form-group textarea {
margin: 0.5em 0px; margin: 0.5em 0px;
} }

View file

@ -271,7 +271,7 @@
</main> </main>
<footer class="footer"> <footer class="footer">
<span class="text-muted ml-4">{{hostname}} - pastebin v{{version}}</span> <span class="text-muted ml-4"><a href="https://github.com/mkaczanowski/pastebin"><i class="fab fa-github"></i></a> - pastebin v{{version}}</span>
</footer> </footer>
{{#if is_encrypted}} {{#if is_encrypted}}