adding templating/static, trimming structs

Cargo.toml

@@ -10,7 +10,7 @@ description = ""
 
 [dependencies]
 rocket = "0.4.4"
-rocket_contrib = "0.4.4"
+rocket_contrib = {version = "0.4.4", features = ["handlebars_templates", "tera_templates"]}
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"

src/data_types.rs

@@ -32,14 +32,14 @@ impl Default for RPCParams {
     }
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Hash, Eq, PartialEq, Debug)]
 pub struct GetInfo {
     pub jsonrpc: String,
     pub id: String,
     pub result: GetInfoResult
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Hash, Eq, PartialEq, Debug)]
 pub struct GetInfoResult {
     pub alt_blocks_count: u32,
     pub block_size_limit: u32,
@@ -110,26 +110,19 @@ pub struct BlockHeader {
     pub orphan_status: bool,
     pub prev_hash: String,
     pub reward: u64,
-    pub timestamp: u64
+    pub timestamp: i64
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct GetTransactions {
-    pub credits: u32,
-    pub status: String,
-    pub top_hash: String,
     pub txs: Vec<GetTransactionsTxs>
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct GetTransactionsTxs {
     pub block_height: u32,
-    pub block_timestamp: u64,
+    pub block_timestamp: i64,
     pub double_spend_seen: bool,
     pub in_pool: bool,
     pub output_indices: Vec<u32>,
-    pub prunable_as_hex: String,
-    pub prunable_hash: String,
-    pub pruned_as_hex: String,
-    pub tx_hash: String
 }

src/main.rs

@@ -5,6 +5,8 @@
 extern crate reqwest;
 mod data_types;
 use rocket_contrib::json::{Json, JsonValue};
+use rocket_contrib::templates::Template;
+use rocket_contrib::serve::StaticFiles;
 use reqwest::blocking::RequestBuilder;
 use std::env;
 use data_types::*;
@@ -63,6 +65,14 @@ fn get_daemon_info() -> Json<GetInfoResult> {
     Json(res.result)
 }
 
+#[get("/")]
+fn index() -> Template {
+    let res: GetInfo = issue_rpc(&"get_info", None)
+        .send().unwrap().json().unwrap();
+    // let res_json = serde_json::to_string(&res.result).unwrap();
+    Template::render("index", &res.result)
+}
+
 #[catch(404)]
 fn not_found() -> JsonValue {
     json!({
@@ -77,13 +87,16 @@ fn main() {
         Ok(_) => {
             rocket::ignite()
                 .mount("/", routes![
+                    index,
                     get_daemon_info
                 ])
                 .mount("/block", routes![
                     get_block_header_by_block_hash,
                     get_block_header_by_transaction_hash
                 ])
+                .mount("/static", StaticFiles::from("./static"))
                 .register(catchers![not_found])
+                .attach(Template::fairing())
                 .launch();
         },
         Err(_) => panic!("Environment variable `DAEMON_URI` not provided.")

static/css/main.css

@@ -0,0 +1,265 @@
+/*! HTML5 Boilerplate v7.3.0 | MIT License | https://html5boilerplate.com/ */
+
+/* main.css 2.0.0 | MIT License | https://github.com/h5bp/main.css#readme */
+/*
+ * What follows is the result of much research on cross-browser styling.
+ * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
+ * Kroc Camen, and the H5BP dev community and team.
+ */
+
+/* ==========================================================================
+   Base styles: opinionated defaults
+   ========================================================================== */
+
+html {
+  color: #222;
+  font-size: 1em;
+  line-height: 1.4;
+}
+
+/*
+ * Remove text-shadow in selection highlight:
+ * https://twitter.com/miketaylr/status/12228805301
+ *
+ * Vendor-prefixed and regular ::selection selectors cannot be combined:
+ * https://stackoverflow.com/a/16982510/7133471
+ *
+ * Customize the background color to match your design.
+ */
+
+::-moz-selection {
+  background: #b3d4fc;
+  text-shadow: none;
+}
+
+::selection {
+  background: #b3d4fc;
+  text-shadow: none;
+}
+
+/*
+ * A better looking default horizontal rule
+ */
+
+hr {
+  display: block;
+  height: 1px;
+  border: 0;
+  border-top: 1px solid #ccc;
+  margin: 1em 0;
+  padding: 0;
+}
+
+/*
+ * Remove the gap between audio, canvas, iframes,
+ * images, videos and the bottom of their containers:
+ * https://github.com/h5bp/html5-boilerplate/issues/440
+ */
+
+audio,
+canvas,
+iframe,
+img,
+svg,
+video {
+  vertical-align: middle;
+}
+
+/*
+ * Remove default fieldset styles.
+ */
+
+fieldset {
+  border: 0;
+  margin: 0;
+  padding: 0;
+}
+
+/*
+ * Allow only vertical resizing of textareas.
+ */
+
+textarea {
+  resize: vertical;
+}
+
+/* ==========================================================================
+   Browser Upgrade Prompt
+   ========================================================================== */
+
+.browserupgrade {
+  margin: 0.2em 0;
+  background: #ccc;
+  color: #000;
+  padding: 0.2em 0;
+}
+
+/* ==========================================================================
+   Author's custom styles
+   ========================================================================== */
+
+/* ==========================================================================
+   Helper classes
+   ========================================================================== */
+
+/*
+ * Hide visually and from screen readers
+ */
+
+.hidden {
+  display: none !important;
+}
+
+/*
+* Hide only visually, but have it available for screen readers:
+* https://snook.ca/archives/html_and_css/hiding-content-for-accessibility
+*
+* 1. For long content, line feeds are not interpreted as spaces and small width
+*    causes content to wrap 1 word per line:
+*    https://medium.com/@jessebeach/beware-smushed-off-screen-accessible-text-5952a4c2cbfe
+*/
+
+.sr-only {
+  border: 0;
+  clip: rect(0, 0, 0, 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  white-space: nowrap;
+  width: 1px;
+  /* 1 */
+}
+
+/*
+* Extends the .sr-only class to allow the element
+* to be focusable when navigated to via the keyboard:
+* https://www.drupal.org/node/897638
+*/
+
+.sr-only.focusable:active,
+.sr-only.focusable:focus {
+  clip: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  position: static;
+  white-space: inherit;
+  width: auto;
+}
+
+/*
+* Hide visually and from screen readers, but maintain layout
+*/
+
+.invisible {
+  visibility: hidden;
+}
+
+/*
+* Clearfix: contain floats
+*
+* For modern browsers
+* 1. The space content is one way to avoid an Opera bug when the
+*    `contenteditable` attribute is included anywhere else in the document.
+*    Otherwise it causes space to appear at the top and bottom of elements
+*    that receive the `clearfix` class.
+* 2. The use of `table` rather than `block` is only necessary if using
+*    `:before` to contain the top-margins of child elements.
+*/
+
+.clearfix:before,
+.clearfix:after {
+  content: " ";
+  /* 1 */
+  display: table;
+  /* 2 */
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+/* ==========================================================================
+   EXAMPLE Media Queries for Responsive Design.
+   These examples override the primary ('mobile first') styles.
+   Modify as content requires.
+   ========================================================================== */
+
+@media only screen and (min-width: 35em) {
+  /* Style adjustments for viewports that meet the condition */
+}
+
+@media print,
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 1.25dppx),
+  (min-resolution: 120dpi) {
+  /* Style adjustments for high resolution devices */
+}
+
+/* ==========================================================================
+   Print styles.
+   Inlined to avoid the additional HTTP request:
+   https://www.phpied.com/delay-loading-your-print-css/
+   ========================================================================== */
+
+@media print {
+  *,
+  *:before,
+  *:after {
+    background: transparent !important;
+    color: #000 !important;
+    /* Black prints faster */
+    box-shadow: none !important;
+    text-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  /*
+     * Don't show links that are fragment identifiers,
+     * or use the `javascript:` pseudo protocol
+     */
+  a[href^="#"]:after,
+  a[href^="javascript:"]:after {
+    content: "";
+  }
+  pre {
+    white-space: pre-wrap !important;
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  /*
+     * Printing Tables:
+     * https://web.archive.org/web/20180815150934/http://css-discuss.incutio.com/wiki/Printing_Tables
+     */
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+

static/css/normalize.css

@@ -0,0 +1,349 @@
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+   ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers.
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Render the `main` element consistently in IE.
+ */
+
+main {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove the border on images inside links in IE 10.
+ */
+
+img {
+  border-style: none;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Misc
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10+.
+ */
+
+template {
+  display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+  display: none;
+}

templates/index.html.tera

@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+ <head>
+   <meta charset="UTF-8">
+   <title>Monero Block Explorer</title>
+   <link rel="stylesheet" href="/static/css/main.css"/>
+   <link rel="stylesheet" href="/static/css/normalize.css"/>
+ </head>
+ <body>
+
+<div class="title">
+<h1>Monero Block Explorer</h1>
+</div>
+<div class="search">
+<h2>Search</h2>
+<form action="/" method="post">
+<input type="text" name="search_value" placeholder="Enter a transaction hash, block hash, or block height.">
+<input type="submit" value="Search">
+</form>
+</div>
+<div class="server-info">
+<h2>Server Info</h2>
+</div>
+<div class="network-stats">
+<h2>Network Stats</h2>
+</div>
+<div class="tx-pool">
+<h2>Transaction Pool</h2>
+</div>
+<div class="">
+<h2>Top Block</h2>
+</div>
+<div class="">
+<h2>Previous Block</h2>
+</div>
+   <!--
+   <p>alt_blocks_count: {{ alt_blocks_count }}</p>
+   <p>block_size_limit: {{ block_size_limit }}</p>
+   <p>block_size_median: {{ block_size_median }}</p>
+   <p>block_weight_limit: {{ block_weight_limit }}</p>
+   <p>block_weight_median: {{ block_weight_median }}</p>
+   <p>bootstrap_daemon_address: {{ bootstrap_daemon_address }}</p>
+   <p>credits: {{ credits }}</p>
+   <p>cumulative_difficulty: {{ cumulative_difficulty }}</p>
+   <p>cumulative_difficulty_top64: {{ cumulative_difficulty_top64 }}</p>
+   <p>database_size: {{ database_size }}</p>
+   <p>difficulty: {{ difficulty }}</p>
+   <p>difficulty_top64: {{ difficulty_top64 }}</p>
+   <p>free_space: {{ free_space }}</p>
+   <p>grey_peerlist_size: {{ grey_peerlist_size }}</p>
+   <p>height: {{ height }}</p>
+   <p>height_without_bootstrap: {{ height_without_bootstrap }}</p>
+   <p>incoming_connections_count: {{ incoming_connections_count }}</p>
+   <p>mainnet: {{ mainnet }}</p>
+   <p>nettype: {{ nettype }}</p>
+   <p>offline: {{ offline }}</p>
+   <p>outgoing_connections_count: {{ outgoing_connections_count }}</p>
+   <p>rpc_connections_count: {{ rpc_connections_count }}</p>
+   <p>stagenet: {{ stagenet }}</p>
+   <p>start_time: {{ start_time }}</p>
+   <p>status: {{ status }}</p>
+   <p>target: {{ target }}</p>
+   <p>target_height: {{ target_height }}</p>
+   <p>testnet: {{ testnet }}</p>
+   <p>top_block_hash: {{ top_block_hash }}</p>
+   <p>top_hash: {{ top_hash }}</p>
+   <p>tx_count: {{ tx_count }}</p>
+   <p>tx_pool_size: {{ tx_pool_size }}</p>
+   <p>untrusted: {{ untrusted }}</p>
+   <p>update_available: {{ update_available }}</p>
+   <p>version: {{ version }}</p>
+   <p>was_bootstrap_ever_used: {{ was_bootstrap_ever_used }}</p>
+   <p>white_peerlist_size: {{ white_peerlist_size }}</p>
+   <p>wide_cumulative_difficulty: {{ wide_cumulative_difficulty }}</p>
+   <p>wide_difficulty: {{ wide_difficulty }}</p> -->
+
+ </body>
+</html>