+ viewport meta

Cargo.toml

@@ -19,6 +19,8 @@ lmdb-zero="0.4"
 rand="0.7"
 env_logger = "0.6"
 tera = "0.11"
-# actix="0.7"
+
-# tokio="0.1"
+[profile.release]
-# futures="0.1"
+opt-level = 3
+debug = false
+lto = true

src/main.rs

@@ -1,4 +1,3 @@
-// extern crate actix;
 extern crate actix_files;
 extern crate actix_web;
 extern crate serde;
@@ -6,7 +5,6 @@ extern crate serde;
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
-#[macro_use]
 extern crate ledb;
 #[macro_use]
 extern crate ledb_derive;
@@ -17,29 +15,15 @@ extern crate tera;
 
 use tera::Context;
 
-// extern crate futures;
-
-// extern crate tokio;
 
 use actix_web::{
-    error, guard, http::header, http::Method, middleware::Logger, middleware::NormalizePath, web,
+    guard, http::header, middleware::Logger, web,
-    App, Error, HttpRequest, HttpResponse, HttpServer, Responder, Result,
+    App, Error, HttpRequest, HttpResponse, HttpServer, Result,
 };
-use std::cell::Cell;
 
-use rand::seq::IteratorRandom;
+use rand::distributions::Uniform;
-use std::time::Instant;
+use rand::Rng;
 
-use std::{fs, io};
-// use tokio::spawn;
-// use futures::{Future};
-
-// use actix::Actor;
-// use actix::System;
-
-//use crate::tokio::prelude::Future;
-
-//use ledb_actix::{Document, Options, Storage, StorageAddrExt};
 
 use ledb::{Options, Storage};
 
@@ -119,6 +103,21 @@ struct Question {
 struct AppState {
     storage: Storage,
     template: tera::Tera,
+    database_distribution: Uniform<u32>,
+}
+
+fn get_database_distribution(storage: &Storage) -> Uniform<u32> {
+    let collection = storage
+        .collection("questions")
+        .expect("collection \"questions\"");
+    let last_id = collection.last_id().expect("\"questions\" last_id");
+
+    rand::distributions::Uniform::new_inclusive(1u32, last_id)
+}
+
+fn random_question_id(database_distribution: &Uniform<u32>) -> u32 {
+    let mut rng = rand::thread_rng();
+    rng.sample(database_distribution)
 }
 
 fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, Error> {
@@ -126,8 +125,8 @@ fn get_question(storage: &Storage, id: u32) -> Result<Option<Question>, Error> {
         return Ok(None);
     }
 
-    let collection = storage.collection("questions").unwrap();
+    let collection = storage.collection("questions").expect("collection questions");
-    let last_id = collection.last_id().unwrap();
+    let last_id = collection.last_id().expect("questions last id");
 
     if id > last_id {
         Err(Error::from(()))
@@ -151,10 +150,15 @@ fn show_question_details(template_file: &str, data: web::Data<AppState>, id: web
 
         if question.is_some() {
             let question = question.unwrap();
-            let body = data.template.render(template_file, &question).unwrap();
+            let mut context = serde_json::to_value(question).expect("question serialize");
+            if context.is_object() {
+                let next_id = random_question_id(&data.database_distribution);
+                context["next"] = serde_json::to_value(next_id).expect("question id serialize");
+            }
+            let body = data.template.render(template_file, &context).expect("template render - show_question_details");
             Ok(HttpResponse::Ok().content_type("text/html").body(body))
         } else {
-            Ok(HttpResponse::Found()
+            Ok(HttpResponse::PermanentRedirect()
                 .header(header::LOCATION, "/q/")
                 .finish())
         }
@@ -175,15 +179,12 @@ fn show_answer(data: web::Data<AppState>, id: web::Path<u32>) -> Result<HttpResp
     show_question_details("answer.html", data, id)
 }
 
-fn index(data: web::Data<AppState>, req: HttpRequest) -> Result<HttpResponse, Error> {
+fn index(data: web::Data<AppState>, _req: HttpRequest) -> Result<HttpResponse, Error> {
-    let collection = data.storage.collection("questions").unwrap();
+    let id = random_question_id(&data.database_distribution);
-    let mut rng = rand::thread_rng();
-    let last_id = collection.last_id().unwrap();
-    let id = (1..(last_id + 1)).choose(&mut rng).unwrap();
 
-    let url = req.url_for("question", &[format!("{}", id)])?;
+    let url = format!("/q/{}", id);
 
-    Ok(HttpResponse::Found()
+    Ok(HttpResponse::TemporaryRedirect()
         .header(header::LOCATION, url.as_str())
         .finish())
 }
@@ -193,34 +194,39 @@ fn main() {
     env_logger::init();
 
     let options: Options = serde_json::from_value(json!({
-    "read_only": true,
+        "read_only": true,
-    "no_lock": true,
+        "no_lock": true,
     }))
-    .unwrap();
+    .expect("options json parse");
 
-    let storage = Storage::new("db", options).unwrap();
+    let storage = Storage::new("db", options).expect("db open");
 
     HttpServer::new(move || {
-        let data = AppState {
+        let mut data = AppState {
             storage: storage.clone(),
             template: compile_templates!("./templates/**/*"),
+            database_distribution: Uniform::new(1, 3),
         };
+        data.database_distribution = get_database_distribution(&data.storage);
+        let data = data;
+
         App::new()
             .wrap(Logger::default())
             .data(data)
+            .service(actix_files::Files::new("/static", "./static"))
             .route("/q", web::to(index))
             .service(
                 web::scope("/q")
                     .service(actix_files::Files::new("/static", "./static"))
                     .service(
                         web::resource("/{id}")
-                            .name("question") // <- set resource name, then it could be used in `url_for`
+                            .name("question") 
                             .guard(guard::Get())
                             .to(show_question),
                     )
                     .service(
                         web::resource("/{id}/a/")
-                            .name("answer") // <- set resource name, then it could be used in `url_for`
+                            .name("answer") 
                             .guard(guard::Get())
                             .to(show_answer),
                     )
@@ -228,8 +234,8 @@ fn main() {
             )
             .route("/", web::to(index))
     })
-    .bind("127.0.0.1:8088")
+    .bind("0.0.0.0:8088")
-    .unwrap()
+    .expect("HttpServer::bind to 8088")
     .run()
-    .unwrap();
+    .expect("HttpServer::run");
 }

static/style.css

@@ -9,3 +9,17 @@ body {
 .content-block-inner {
     margin: auto;
 }
+
+.footer {
+    widows: 100%;
+    text-align: center;
+    z-index: -1;
+}
+
+details {
+    text-align: center;
+}
+
+#details {
+    text-align: justify;
+}

templates/answer.html

@@ -1,12 +1,13 @@
-{% extends "base.html" %} {% block title %} Ответ {% endblock title %}
+{% extends "base.html" %} {% block title %} Ответ {% endblock title %} {% block nav %}
-
+<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
-{% block content %}
+{% endblock nav %} {% block content %}
 <!-- <h1>{{ id }}</h1> -->
 <div class="content-block">
     <div id="question" class="content-block-inner">
-        <p><font color="#544669">
+        <p>
-            <h4> {{ description }} </h4>
+            <font color="#544669">
-        </font>
+                <h4> {{ description }} </h4>
+            </font>
         </p>
     </div>
 </div><br />
@@ -15,46 +16,33 @@
         <hr/>
         <p>
             <!-- <h2> Ответ: </h2> -->
-            <h1>{{ answer }}</h1>
+            <h1 class="d-flex justify-content-center text-center">{{ answer }}</h1>
         </p>
-        <hr/><br><br/><details>
+        <hr/><br><br/>
-        <div id="details">
+        <details>
-            {% if comment | length or comment1 | length %}
+            <div id="details">
-            <p><span>Комментарии:</span>
+                {% if comment | length or comment1 | length %}
-                {% if comment | length %}
+                <p><span>Комментарии:</span> {% if comment | length %} {{ comment }} {% endif %} {% if comment1 | length %}
-                {{ comment }}
+                    <br/> {{ comment1 }} {% endif %}
+                </p>
+                {% endif %} {% if author | length %}
+                <p><span>Автор: </span> {{ author }}</p>
+                {% endif %} {% if copyright | length %}
+                <p><span>Копирайт: </span> {{ copyright }}</p>
+                {% endif %} {% if source | length %}
+                <p><span>Источник: </span> {{ source }}</p>
+                {% endif %} {% if theme | length %}
+                <p><span>Тема: </span> {{ theme }}</p>
+                {% endif %} {% if rating | length %}
+                <p><span>Рейтинг: </span> {{ author }}</p>
+                {% endif %} {% if batch_info.description | length %}
+                <p><span>Чемпионат: </span> {{ batch_info.description }}</p>
+                {% endif %} {% if tour | length %}
+                <p><span>Тур: </span> {{ tour }}</p>
+                {% endif %} {% if id | length %}
+                <p><span>Номер: </span> {{ id }}</p>
                 {% endif %}
-                {% if comment1 | length %}
+            </div>
-                <br/>
+        </details>
-                {{ comment1 }}
-                {% endif %}
-            </p>
-            {% endif %}
-            {% if author | length %}
-            <p><span>Автор: </span> {{ author }}</p>
-            {% endif %}
-            {% if copyright | length %}
-            <p><span>Копирайт: </span> {{ copyright }}</p>
-            {% endif %}
-            {% if source | length %}
-            <p><span>Источник: </span> {{ source }}</p>
-            {% endif %}
-            {% if theme | length %}
-            <p><span>Тема: </span> {{ theme }}</p>
-            {% endif %}
-            {% if rating | length %}
-            <p><span>Рейтинг: </span> {{ author }}</p>
-            {% endif %}
-            {% if batch_info.description | length %}
-            <p><span>Чемпионат: </span> {{ batch_info.description }}</p>
-            {% endif %}
-            {% if tour | length %}
-            <p><span>Тур: </span> {{ tour }}</p>
-            {% endif %}
-            {% if id | length %}
-            <p><span>Номер: </span> {{ id }}</p>
-            {% endif %}
-        </div></details>
     </div>
-    <br />
+    <br /> {% endblock content %}
-    {% endblock content %}

templates/base.html

@@ -1,13 +1,61 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-  <meta charset="utf-8" />
+    <meta charset="utf-8" />
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" type="text/css" href="/q/static/style.css" />
+    <link rel="stylesheet" type="text/css" href="/q/static/bootstrap.min.css">
-  <title>{% block title %}{% endblock title %}</title>
+    <link rel="stylesheet" type="text/css" href="/q/static/style.css" />
+    <title>{% block title %}{% endblock title %}</title>
 </head>
+
 <body>
-    {% include "nav.html" %}
+    <header>
-    <div id="content" class="container">{% block content %}{% endblock content %}</div>
+        <nav class="navbar navbar-expand-sm container sticky-top navbar-light justify-content-center">
+            <ul class="nav navbar-nav">
+                {% include "nav.html" %} {% block nav %}{% endblock nav %}
+            </ul>
+        </nav>
+        <hr/>
+    </header>
+    <article>
+        <div id="content" class="container">{% block content %}{% endblock content %}</div>
+    </article>
+    <footer class="footer fixed-bottom">
+        <hr/>
+        <p class="text-secondary">Источник: <a class="text-secondary" href="https://db.chgk.info/">db.chgk.info</a></p>
+    </footer>
+    <!-- Yandex.Metrika counter -->
+    <script type="text/javascript">
+        (function(d, w, c) {
+            (w[c] = w[c] || []).push(function() {
+                try {
+                    w.yaCounter48214757 = new Ya.Metrika2({
+                        id: 48214757,
+                        clickmap: true,
+                        trackLinks: true,
+                        accurateTrackBounce: true,
+                        trackHash: true,
+                        ut: "noindex"
+                    });
+                } catch (e) {}
+            });
+            var n = d.getElementsByTagName("script")[0],
+                s = d.createElement("script"),
+                f = function() {
+                    n.parentNode.insertBefore(s, n);
+                };
+            s.type = "text/javascript";
+            s.async = true;
+            s.src = "https://mc.yandex.ru/metrika/tag.js";
+            if (w.opera == "[object Opera]") {
+                d.addEventListener("DOMContentLoaded", f, false);
+            } else {
+                f();
+            }
+        })(document, window, "yandex_metrika_callbacks2");
+    </script> <noscript><div><img src="https://mc.yandex.ru/watch/48214757?ut=noindex" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+    <!-- /Yandex.Metrika counter -->
 </body>
+
 </html>

templates/nav.html

@@ -1,3 +1 @@
-<nav class="nav nav-pills container justify-content-center">
+<li class="nav-item"><a class="nav-link text-info" href="/">Главная</a></li>
-    <a class="nav-link" href="/q/">Ещё</a>
-</nav>

templates/question.html

@@ -1,17 +1,20 @@
-{% extends "base.html" %} {% block title %} Вопрос {% endblock title %} 
+{% extends "base.html" %} {% block title %} Вопрос {% endblock title %} {% block nav %}
-
+<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
-{% block content %}
+{% endblock nav %} {% block content %}
 <!-- <h1>{{ id }}</h1> -->
-<div class="content-block"><div id="question" class="content-block-inner">
+<div class="content-block">
-<p>
+    <div id="question" class="content-block-inner">
-    <h3> {{ description }} </h3>
+        <p>
-</p>
+            <h3> {{ description }} </h3>
-</div></div>
+        </p>
+    </div>
+</div>
 <br/>
 <br/>
-<br/><details>
+<br/>
-<nav class="nav nav-pills container justify-content-center">
+<details>
-        <a class="nav-link" href="/q/{{ num }}/a/">Ответ</a>
+    <summary>Ответ</summary><br/>
-</nav></details>
+    <a class="btn btn-dark" href="/q/{{ num }}/a/">Показать ответ</a>
+</details>
 
 {% endblock content %}