mtrx/crablog
1
0
Fork 0
Code Issues 12 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

Bumped to 0.3.0. Switched /blog routes to / prefix and moved preevious / route to /about. Changed some env var loading code.

Browse source
This commit is contained in:
Leonard Lorenz 2021-04-03 23:26:10 +02:00
parent 5c1c0de1b1
commit accbdb6f7a
11 changed files with 167 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -44,12 +44,14 @@ ROOT_PATH=/path/to/template/directory/and/sqliteDB
## Routes ## Routes
- / site welcome | Route | Description |
- /blog shows the last 5 posts | ---------- | -------------------------------------------------- |
- /blog/id/<id> shows a single post by id | / | shows the last 5 posts |
- /blog/all shows all posts | /id/<id> | shows a single post by id |
- /blog/submit set your submit token and create posts | /all | shows all posts |
- /blog/edit/<id> edit, delete or hide posts | /submit | set your submit token and create posts |
| /edit/<id> | edit, delete or hide posts |
| /about | information about this blog, social media accounts |
**API Routes** **API Routes**

6
content/templates/index.html → content/templates/about.html
View file

@ -13,9 +13,11 @@
<body> <body>
<h1>Hi, I'm {{ username }}</h1> <h1>Hi, I'm {{ username }}</h1>
<p style="text-align: right">
<a href="/">Back to the blog</a>
</p>
<p> <p>
I have a <a href="/blog">blog.</a><br> This is my blog. If you have questions or input for me please send me an E-Mail to {{ email }}
If you have questions or input for me please send me an E-Mail to {{ email }}
</p> </p>
<br> <br>
<p> <p>

9
content/templates/blog-all-posts.html
View file

@ -13,13 +13,16 @@
</head> </head>
<body> <body>
<h1><a href="/blog" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1> <h1><a href="/" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1>
<p style="text-align: right"><a href="/">Home</a> <a href="/blog">Last 5 posts</a></p> <p style="text-align: right">
<a href="/about">About</a>
<a href="/">Last 5 posts</a>
</p>
<ul> <ul>
{% for post in posts %} {% for post in posts %}
<article> <article>
<div> <div>
<a href="/blog/id/{{ post.id }}" class="post-link">[link]</a> <a href="/id/{{ post.id }}" class="post-link">[link]</a>
</div> </div>
<div class="post-content"> <div class="post-content">
<h2 class="post-title">{{ post.title }}</h2> <h2 class="post-title">{{ post.title }}</h2>

10
content/templates/blog-by-id.html
View file

@ -13,12 +13,16 @@
</head> </head>
<body> <body>
<h1><a href="/blog" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1> <h1><a href="/" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1>
<p style="text-align: right"><a href="/">Home</a> <a href="/blog">Last 5 Posts</a> <a href="/blog/all">All Posts</a></p> <p style="text-align: right">
<a href="/">Home</a>
<a href="/about">About</a>
<a href="/all">All Posts</a>
</p>
<ul> <ul>
<article> <article>
<div> <div>
<a href="/blog/id/{{ post.id }}" class="post-link">[link]</a> <a href="/id/{{ post.id }}" class="post-link">[link]</a>
</div> </div>
<div class="post-content"> <div class="post-content">
<h2 class="post-title">{{ post.title }}</h2> <h2 class="post-title">{{ post.title }}</h2>

8
content/templates/blog.html
View file

@ -13,13 +13,15 @@
</head> </head>
<body> <body>
<h1><a href="/blog" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1> <h1><a href="/" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1>
<p style="text-align: right"><a href="/">Home</a> <a href="/blog/all">All Posts</a></p> <p style="text-align: right">
<a href="/about">About</a>
<a href="/all">All Posts</a></p>
<ul> <ul>
{% for post in posts %} {% for post in posts %}
<article> <article>
<div> <div>
<a href="/blog/id/{{ post.id }}" class="post-link">[link]</a> <a href="/id/{{ post.id }}" class="post-link">[link]</a>
</div> </div>
<div class="post-content"> <div class="post-content">
<h2 class="post-title">{{ post.title }}</h2> <h2 class="post-title">{{ post.title }}</h2>

4
content/templates/edit.html
View file

@ -11,11 +11,11 @@
<link rel="shortcut icon" type="image/jpg" href="/static/favicon.ico"/> <link rel="shortcut icon" type="image/jpg" href="/static/favicon.ico"/>
</head> </head>
<body> <body>
<h1><a href="/blog" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1> <h1><a href="/" class="post-link" style="text-decoration:none;color:black;">{{ username }}' blog</a></h1>
<h2>Edit posts</h2> <h2>Edit posts</h2>
<ul style="list-style: none;"> <ul style="list-style: none;">
{% for post in posts %} {% for post in posts %}
<li><a href="/blog/edit/{{ post.id }}">{{ post.title }}</a></li> <li><a href="/edit/{{ post.id }}">{{ post.title }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
</body> </body>

2
docker-compose.yml
View file

@ -1,4 +1,4 @@
version: "3.8" version: "3.0"
services: services:
crablog: crablog:
build: . build: .

2
site/Cargo.lock generated
View file

@ -572,7 +572,7 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
[[package]] [[package]]
name = "crablog" name = "crablog"
version = "0.2.3" version = "0.3.0"
dependencies = [ dependencies = [
"actix-files", "actix-files",
"actix-web", "actix-web",

2
site/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "crablog" name = "crablog"
version = "0.2.3" version = "0.3.0"
authors = ["Leonard Lorenz <dev@leonardlorenz.de>"] authors = ["Leonard Lorenz <dev@leonardlorenz.de>"]
edition = "2018" edition = "2018"

101
site/src/main.rs
View file

@ -9,50 +9,89 @@ extern crate serde_derive;
extern crate tera; extern crate tera;
use actix_files as fs; use actix_files as fs;
use actix_web::{App, HttpServer, middleware::Logger}; use actix_web::{middleware::Logger, App, HttpServer};
use env_logger::Env; use env_logger::Env;
use tera::Tera;
use std::{env, sync::RwLock, collections::HashMap};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::{collections::HashMap, env, sync::RwLock};
use tera::Tera;
pub static CONFIG_MAP: Lazy<RwLock<HashMap<String, String>>> = Lazy::new(|| { pub static CONFIG_MAP: Lazy<RwLock<HashMap<String, String>>> = Lazy::new(|| {
let mut config: HashMap<String, String> = HashMap::new(); let mut config: HashMap<String, String> = HashMap::new();
config.insert(String::from("SUBMIT_TOKEN"), env::var("SUBMIT_TOKEN").expect("SUBMIT_TOKEN variable not set."));
config.insert(String::from("ROOT_PATH"), env::var("ROOT_PATH").expect("ROOT_PATH variable not set.")); let required_env_vars = [
config.insert(String::from("USERNAME"), env::var("USERNAME").expect("USERNAME variable not set.")); "SUBMIT_TOKEN",
config.insert(String::from("EMAIL"), env::var("EMAIL").expect("EMAIL variable not set.")); "ROOT_PATH",
config.insert(String::from("BIND_PORT"), env::var("BIND_PORT").expect("BIND_PORT variable not set.")); "USERNAME",
if let Ok(acc) = env::var("GITHUB_ACCOUNT") { "EMAIL",
config.insert(String::from("GITHUB_ACCOUNT"), acc.clone()); "BIND_PORT",
];
let optional_env_vars = [
"GITHUB_ACCOUNT",
"TWITTER_ACCOUNT",
"MASTODON_ACCOUNT",
"DISCORD_ACCOUNT",
"REDDIT_ACCOUNT",
];
// Test if variable is set. If not, panic.
let mut insert_required_env = |env: &str| {
let env_string = String::from(env);
config.insert(
env_string.clone(), // env var name
env::var(env_string).expect(format!("`{}` variable not set.", env).as_str()), // env var content
)
};
for var in required_env_vars.iter() {
insert_required_env(var);
} }
if let Ok(acc) = env::var("TWITTER_ACCOUNT") {
config.insert(String::from("TWITTER_ACCOUNT"), acc.clone()); // Test if variable is set. If it is insert into config.
let mut insert_optional_env = |env: &str| {
if let Ok(var_content) = env::var(String::from(env)) {
config.insert(String::from(env), var_content.clone());
} }
if let Ok(acc) = env::var("MASTODON_ACCOUNT") { };
config.insert(String::from("MASTODON_ACCOUNT"), acc.clone());
} for var in optional_env_vars.iter() {
if let Ok(acc) = env::var("DISCORD_ACCOUNT") { insert_optional_env(var);
config.insert(String::from("DISCORD_ACCOUNT"), acc.clone());
}
if let Ok(acc) = env::var("REDDIT_ACCOUNT") {
config.insert(String::from("REDDIT_ACCOUNT"), acc.clone());
} }
// Print some info about the current configuration
println!("Submit token = `{}`", config.get("SUBMIT_TOKEN").unwrap());
println!(
"Current working directory = `{}`",
env::current_dir().unwrap().to_str().unwrap()
);
println!("Root path = `{}`", config.get("ROOT_PATH").unwrap());
println!(
"Template path = `{}/templates/*`",
config.get("ROOT_PATH").unwrap()
);
println!("Launching on 0.0.0.0:{}", config.get("BIND_PORT").unwrap());
RwLock::new(config) RwLock::new(config)
}); });
#[actix_web::main] #[actix_web::main]
async fn main() -> std::io::Result<()> { async fn main() -> std::io::Result<()> {
HttpServer::new(|| { HttpServer::new(|| {
let mut tera = Tera::new(
let mut tera = Tera::new(format!("{}{}", CONFIG_MAP.read().unwrap().get("ROOT_PATH").unwrap(), "/templates/*").as_str()).unwrap(); format!(
"{}{}",
CONFIG_MAP.read().unwrap().get("ROOT_PATH").unwrap(),
"/templates/*"
)
.as_str(),
)
.unwrap();
tera.autoescape_on(vec![".sql"]); tera.autoescape_on(vec![".sql"]);
env_logger::Builder::from_env(Env::default().default_filter_or("info")); env_logger::Builder::from_env(Env::default().default_filter_or("info"));
App::new() App::new()
.data(tera) .data(tera)
.service(routes::root) .service(routes::about)
.service(routes::blog) .service(routes::blog)
.service(routes::blog_all) .service(routes::blog_all)
.service(routes::blog_by_id) .service(routes::blog_by_id)
@ -64,10 +103,20 @@ async fn main() -> std::io::Result<()> {
.service(api::blog_edit_post) .service(api::blog_edit_post)
.service(api::blog_hide_post) .service(api::blog_hide_post)
.service(api::blog_delete_post) .service(api::blog_delete_post)
.service(fs::Files::new("/static", format!("{}{}", CONFIG_MAP.read().unwrap().get("ROOT_PATH").unwrap(), "/static"))) .service(fs::Files::new(
"/static",
format!(
"{}{}",
CONFIG_MAP.read().unwrap().get("ROOT_PATH").unwrap(),
"/static"
),
))
.wrap(Logger::new("%a %r %t")) .wrap(Logger::new("%a %r %t"))
}) })
.bind(format!("0.0.0.0:{}", CONFIG_MAP.read().unwrap().get("BIND_PORT").unwrap()))? .bind(format!(
"0.0.0.0:{}",
CONFIG_MAP.read().unwrap().get("BIND_PORT").unwrap()
))?
.run() .run()
.await .await
} }

84
site/src/routes.rs
View file

@ -1,8 +1,8 @@
use crate::db; use crate::db;
use actix_web::{get, http::StatusCode, web, HttpResponse, Error, error};
use tera::Context;
use super::CONFIG_MAP; use super::CONFIG_MAP;
use actix_web::{error, get, http::StatusCode, web, Error, HttpResponse};
use tera::Context;
/// tests if the post id is a valid i32 integer bigger than zero /// tests if the post id is a valid i32 integer bigger than zero
/// assert(!(id_valid("2147483648").0)) /// assert(!(id_valid("2147483648").0))
@ -33,10 +33,13 @@ pub fn replace_br_tags(x: &str) -> String {
x.replace("<br>", "\n") x.replace("<br>", "\n")
} }
#[get("/")] #[get("/about")]
async fn root(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> { async fn about(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> {
let mut context = Context::new(); let mut context = Context::new();
context.insert("username", CONFIG_MAP.read().unwrap().get("USERNAME").unwrap()); context.insert(
"username",
CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
);
context.insert("email", CONFIG_MAP.read().unwrap().get("EMAIL").unwrap()); context.insert("email", CONFIG_MAP.read().unwrap().get("EMAIL").unwrap());
if let Some(acc) = CONFIG_MAP.read().unwrap().get("GITHUB_ACCOUNT") { if let Some(acc) = CONFIG_MAP.read().unwrap().get("GITHUB_ACCOUNT") {
context.insert("github_account", acc); context.insert("github_account", acc);
@ -54,89 +57,113 @@ async fn root(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> {
context.insert("reddit_account", acc); context.insert("reddit_account", acc);
} }
let result = tmpl.render("index.html", &context) let result = tmpl
.render("about.html", &context)
.map_err(|e| error::ErrorInternalServerError(format!("Template error\n{}", e)))?; .map_err(|e| error::ErrorInternalServerError(format!("Template error\n{}", e)))?;
Ok(HttpResponse::Ok().content_type("text/html").body(result)) Ok(HttpResponse::Ok().content_type("text/html").body(result))
} }
#[get("/blog")] #[get("/")]
async fn blog(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> { async fn blog(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> {
let posts = db::get_last_five_posts(); let posts = db::get_last_five_posts();
let mut context = Context::new(); let mut context = Context::new();
context.insert("posts", &posts); context.insert("posts", &posts);
context.insert("username", CONFIG_MAP.read().unwrap().get("USERNAME").unwrap()); context.insert(
"username",
CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
);
let result = tmpl.render("blog.html", &context) let result = tmpl
.render("blog.html", &context)
.map_err(|_| error::ErrorInternalServerError("Template error"))?; .map_err(|_| error::ErrorInternalServerError("Template error"))?;
Ok(HttpResponse::Ok().content_type("text/html").body(result)) Ok(HttpResponse::Ok().content_type("text/html").body(result))
} }
#[get("/blog/all")] #[get("/all")]
async fn blog_all(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> { async fn blog_all(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> {
let posts = db::get_all_posts(); let posts = db::get_all_posts();
let mut context = Context::new(); let mut context = Context::new();
context.insert("posts", &posts); context.insert("posts", &posts);
context.insert("username", CONFIG_MAP.read().unwrap().get("USERNAME").unwrap()); context.insert(
"username",
CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
);
let result = tmpl.render("blog-all-posts.html", &context) let result = tmpl
.render("blog-all-posts.html", &context)
.map_err(|_| error::ErrorInternalServerError("Template error"))?; .map_err(|_| error::ErrorInternalServerError("Template error"))?;
Ok(HttpResponse::Ok().content_type("text/html").body(result)) Ok(HttpResponse::Ok().content_type("text/html").body(result))
} }
#[get("/blog/id/{post_id}")] #[get("/id/{post_id}")]
async fn blog_by_id(tmpl: web::Data<tera::Tera>, web::Path(post_id): web::Path<std::string::String>) -> Result<HttpResponse, Error> { async fn blog_by_id(
tmpl: web::Data<tera::Tera>,
web::Path(post_id): web::Path<std::string::String>,
) -> Result<HttpResponse, Error> {
let (valid, id) = id_valid(post_id); let (valid, id) = id_valid(post_id);
if valid { if valid {
let post = db::get_post_by_id(id as i32); let post = db::get_post_by_id(id as i32);
if !post.published { if !post.published {
return Ok(HttpResponse::new(StatusCode::UNAUTHORIZED)) return Ok(HttpResponse::new(StatusCode::UNAUTHORIZED));
} }
let mut context = Context::new(); let mut context = Context::new();
context.insert("post", &post); context.insert("post", &post);
context.insert("username", CONFIG_MAP.read().unwrap().get("USERNAME").unwrap()); context.insert(
"username",
CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
);
let result = tmpl.render("blog-by-id.html", &context) let result = tmpl
.render("blog-by-id.html", &context)
.map_err(|_| error::ErrorInternalServerError("Template error"))?; .map_err(|_| error::ErrorInternalServerError("Template error"))?;
return Ok(HttpResponse::Ok().content_type("text/html").body(result)) return Ok(HttpResponse::Ok().content_type("text/html").body(result));
} else { } else {
return Ok(HttpResponse::new(StatusCode::NOT_FOUND)) return Ok(HttpResponse::new(StatusCode::NOT_FOUND));
} }
} }
#[get("/blog/submit")] #[get("/submit")]
async fn blog_submit(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> { async fn blog_submit(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> {
let mut context = Context::new(); let mut context = Context::new();
context.insert("title", ""); context.insert("title", "");
context.insert("body", ""); context.insert("body", "");
let result = tmpl.render("submit.html", &context) let result = tmpl
.render("submit.html", &context)
.map_err(|_| error::ErrorInternalServerError("Template error"))?; .map_err(|_| error::ErrorInternalServerError("Template error"))?;
return Ok(HttpResponse::Ok().content_type("text/html").body(result)) return Ok(HttpResponse::Ok().content_type("text/html").body(result));
} }
#[get("/blog/edit")] #[get("/edit")]
async fn blog_edit(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> { async fn blog_edit(tmpl: web::Data<tera::Tera>) -> Result<HttpResponse, Error> {
let mut context = Context::new(); let mut context = Context::new();
context.insert("posts", &db::get_all_posts()); context.insert("posts", &db::get_all_posts());
context.insert("username", CONFIG_MAP.read().unwrap().get("USERNAME").unwrap()); context.insert(
"username",
CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
);
let result = tmpl.render("edit.html", &context) let result = tmpl
.render("edit.html", &context)
.map_err(|_| error::ErrorInternalServerError("Template error"))?; .map_err(|_| error::ErrorInternalServerError("Template error"))?;
Ok(HttpResponse::Ok().content_type("text/html").body(result)) Ok(HttpResponse::Ok().content_type("text/html").body(result))
} }
#[get("/blog/edit/{post_id}")] #[get("/edit/{post_id}")]
async fn blog_edit_by_id(tmpl: web::Data<tera::Tera>, web::Path(post_id): web::Path<std::string::String>) -> Result<HttpResponse, Error> { async fn blog_edit_by_id(
tmpl: web::Data<tera::Tera>,
web::Path(post_id): web::Path<std::string::String>,
) -> Result<HttpResponse, Error> {
let (valid, id) = id_valid(post_id); let (valid, id) = id_valid(post_id);
if valid { if valid {
let mut post = db::get_post_by_id(id as i32); let mut post = db::get_post_by_id(id as i32);
@ -149,7 +176,8 @@ async fn blog_edit_by_id(tmpl: web::Data<tera::Tera>, web::Path(post_id): web::P
context.insert("body", &post.body); context.insert("body", &post.body);
context.insert("id", &id); context.insert("id", &id);
let result = tmpl.render("edit-form.html", &context) let result = tmpl
.render("edit-form.html", &context)
.map_err(|_| error::ErrorInternalServerError("Template error"))?; .map_err(|_| error::ErrorInternalServerError("Template error"))?;
Ok(HttpResponse::Ok().content_type("text/html").body(result)) Ok(HttpResponse::Ok().content_type("text/html").body(result))