diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..49718c4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+run:
+ cd site && cargo run
diff --git a/README.md b/README.md
index fbddbc6..ee6f4fc 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ Pure rust. Built with actix, diesel, tera, serde and sqlite3.
## Run instructions using docker
+**TODO REWRITE, OUTDATED**
+
1. Clone the repository
```bash
git clone https://github.com/mtrx1337/crablog
@@ -23,23 +25,22 @@ docker-compose up -d
## Configuration environment file
-All configuration options are defined in crablog.env, an example configuration is provided.
-When not using Docker you may have to add crablog.env to your startup script or define the variables there.
+All configuration options are defined in .env which should be placed in the path where crablog is run. An example configuration is provided:
-`crablog.env`
+`.env`
```
-USERNAME=yourusername
-EMAIL=me@mydomain.tld
-BIND_PORT=8000
-SUBMIT_TOKEN=Submit!123 # token needed for submitting
-GITHUB_ACCOUNT=usernam3
-TWITTER_ACCOUNT=usernam3
-MASTODON_ACCOUNT=usernam3@mastodon.social
-REDDIT_ACCOUNT=usernam3
-DISCORD_ACCOUNT=usernam3
+CL_USERNAME=yourusername
+CL_EMAIL=me@mydomain.tld # optional
+CL_BIND_PORT=8000 # optional
+CL_SUBMIT_TOKEN=Submit!123 # required, token needed for submitting
+CL_GITHUB_ACCOUNT=yourusername # optional
+CL_TWITTER_ACCOUNT=yourusername # optional
+CL_MASTODON_ACCOUNT=yourusername@mastodon.social # optional
+CL_REDDIT_ACCOUNT=yourusername # optional
+CL_DISCORD_ACCOUNT=yourusername # optional
# only needed when not using a docker container
-ROOT_PATH=/path/to/template/directory/and/sqliteDB
+CL_ROOT_PATH=/path/to/template/directory/and/sqliteDB
```
## Routes
@@ -58,3 +59,7 @@ ROOT_PATH=/path/to/template/directory/and/sqliteDB
| Route | Description |
| ---------------- | ------------------------- |
| `api/blog/posts` | returns all posts as json |
+
+## Regenerate Migrations from Schema:
+
+`diesel migration generate --diff-schema=./src/db/schema.rs create_posts`
diff --git a/content/static/css/index.css b/content/static/css/index.css
deleted file mode 100644
index beb14fc..0000000
--- a/content/static/css/index.css
+++ /dev/null
@@ -1,24 +0,0 @@
-* {
- margin: 0;
- padding: 0;
-}
-
-html {
- font-family: sans-serif;
- padding: 20px;
- width: 60%;
- padding-left: 20%;
-}
-
-.social-icon {
- height: 1em;
- width: 1em;
-}
-
-@media (max-width:1080px) {
- html {
- font-family: sans-serif;
- padding: 20px;
- width: 90%;
- padding-left: 5%;
-}
diff --git a/content/static/js/blog.js b/content/static/js/blog.js
deleted file mode 100644
index 1d01900..0000000
--- a/content/static/js/blog.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function setTokenCookie() {
- let token = document.getElementById('set-token').value;
- let tokenCookie = 'token=' + token + "; SameSite=None; secure";
- document.cookie = tokenCookie;
- setFormTokens(token);
- document.getElementById("cookie-block").hidden = true;
-}
-
-function clearTokenCookie() {
- document.cookie = "token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; SameSite=None; secure";
- document.getElementById("cookie-block").hidden = false;
-}
-
-function setFormTokens(token) {
- let tokenFields = document.querySelectorAll(".token");
- for (t of tokenFields) {
- t.value = token;
- }
-}
-
-// if cookie is set, use it to pass the token
-let c_pairs = document.cookie.split(";");
-let cookie_set = false;
-for (c of c_pairs) {
- if (c.trim().split("=")[0].startsWith("token")){
- // stick token into all the form input fields
- let token = c.split("=")[1];
- setFormTokens(token);
- cookie_set = true;
- }
-}
-
-if (!cookie_set) {
- document.getElementById("cookie-block").hidden = false;
-}
diff --git a/content/templates/about.html b/content/templates/about.html
deleted file mode 100644
index b52bc53..0000000
--- a/content/templates/about.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
- {{ username }}' site
-
-
-
-
-
- Hi, I'm {{ username }}
-
- Back to the blog
-
-
- This is my blog. If you have questions or input for me please send me an E-Mail to {{ email }}
-
-
-
-
-
-
-
diff --git a/content/templates/blog-all-posts.html b/content/templates/blog-all-posts.html
deleted file mode 100644
index 7f9eeaf..0000000
--- a/content/templates/blog-all-posts.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
- All posts
-
-
-
-
-
-
-
- About
- Last 5 posts
-
-
-
-
diff --git a/content/templates/blog-by-id.html b/content/templates/blog-by-id.html
deleted file mode 100644
index 89f4ec4..0000000
--- a/content/templates/blog-by-id.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ post.title }} | {{ username }}' blog
-
-
-
-
-
-
-
- Home
- About
- All Posts
-
-
-
-
-
-
{{ post.title }}
-
{{ post.publish_date | date(format="%Y-%m-%d at %H:%M") }}
-
{{ post.body }}
-
-
-
diff --git a/content/templates/blog.html b/content/templates/blog.html
deleted file mode 100644
index c5a13ee..0000000
--- a/content/templates/blog.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ username }}' blog
-
-
-
-
-
-
-
- About
- All Posts
-
- {% for post in posts %}
-
-
-
-
{{ post.title }}
-
{{ post.publish_date | date(format="%Y-%m-%d at %H:%M") }}
-
{{ post.body }}
-
-
-
diff --git a/content/templates/edit-form.html b/content/templates/edit-form.html
deleted file mode 100644
index 5215c94..0000000
--- a/content/templates/edit-form.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
- Edit '{{ title }}'
-
-
-
-
-
-
Please set your token cookie first.
-
-
-
Edit posts
-
-
-
diff --git a/content/templates/submit.html b/content/templates/submit.html
deleted file mode 100644
index 449c02e..0000000
--- a/content/templates/submit.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
- Submit post
-
-
-
-
-
-
Please set your token cookie first.
-
-
-
+ Back to the blog
+
+
+ This is my blog.
+
+ {% if email %}
+ If you have questions or input for me please send me an E-Mail to 
{{ email }}
+ {% endif %}
+
+
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/site/content/templates/article.html.macro b/site/content/templates/article.html.macro
new file mode 100644
index 0000000..bd24fe7
--- /dev/null
+++ b/site/content/templates/article.html.macro
@@ -0,0 +1,11 @@
+{% macro article(id, title, body, publish_date) %}
+
+
+
+ {{ title }}
+
+
{{ publish_date | date(format="%Y-%m-%d at %H:%M") }}
+
{{ body }}
+
+ {% block content %}
+ {% endblock content %}
+
+
+
+
\ No newline at end of file
diff --git a/site/content/templates/blog-all-posts.html b/site/content/templates/blog-all-posts.html
new file mode 100644
index 0000000..b40a86a
--- /dev/null
+++ b/site/content/templates/blog-all-posts.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% import "article.html.macro" as article_macro %}
+
+{% block head %}
+{{ super() }}
+
+
+
+ All posts
+{% endblock head %}
+
+
+{% block content %}
+
+
+ About
+ Last 5 posts
+
+
+ {% for post in posts %}
+ {{ article_macro::article(id=post.id,title=post.title,body=post.body,publish_date=post.publish_date) }}
+ {% endfor %}
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/site/content/templates/blog-by-id.html b/site/content/templates/blog-by-id.html
new file mode 100644
index 0000000..d4bcd8a
--- /dev/null
+++ b/site/content/templates/blog-by-id.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% import "article.html.macro" as article_macro %}
+
+{% block head %}
+{{ super() }}
+
+
+ {{ post.title }} | {{ username }}' blog
+{% endblock head %}
+
+{% block content %}
+
+
+
+{{ article_macro::article(id=post.id,title=post.title,body=post.body,publish_date=post.publish_date) }}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/site/content/templates/blog.html b/site/content/templates/blog.html
new file mode 100644
index 0000000..3153265
--- /dev/null
+++ b/site/content/templates/blog.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{% import "article.html.macro" as article_macro %}
+
+{% block head %}
+{{ super() }}
+
+
+ {{ username }} blog
+{% endblock head %}
+
+{% block content %}
+
+
+ About
+ All Posts
+
+
+ {% for post in posts %}
+ {{ article_macro::article(id=post.id,title=post.title,body=post.body,publish_date=post.publish_date) }}
+ {% endfor %}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/site/content/templates/edit-form.html b/site/content/templates/edit-form.html
new file mode 100644
index 0000000..5952609
--- /dev/null
+++ b/site/content/templates/edit-form.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block head %}
+{{ super() }}
+Edit '{{ post.title }}'
+
+{% endblock head %}
+
+{% block content %}
+
+
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/site/content/templates/edit.html b/site/content/templates/edit.html
new file mode 100644
index 0000000..ba11447
--- /dev/null
+++ b/site/content/templates/edit.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+
+{% block head %}
+{{ super() }}
+
+Edit posts...
+{% endblock head %}
+
+{% block content %}
+
+Edit posts
+
+{% endblock content %}
\ No newline at end of file
diff --git a/site/content/templates/submit.html b/site/content/templates/submit.html
new file mode 100644
index 0000000..599d7da
--- /dev/null
+++ b/site/content/templates/submit.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% block head %}
+{{ super() }}
+Submit post
+
+{% endblock head %}
+
+
+{% block content %}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/site/migrations/.gitkeep b/site/migrations/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/site/src/api.rs b/site/src/api.rs
index cb03b02..7e7eab0 100644
--- a/site/src/api.rs
+++ b/site/src/api.rs
@@ -1,8 +1,8 @@
+use crate::config::CONFIG;
use crate::db::*;
use crate::routes::{id_valid, replace_newlines};
use actix_web::{get, http::StatusCode, post, web, web::Form, HttpResponse, Responder};
use serde::Deserialize;
-use super::CONFIG_MAP;
#[derive(Deserialize)]
struct NewPostForm {
@@ -18,7 +18,7 @@ struct BlogActionForm {
#[post("/api/blog/create")]
async fn blog_create_post(form: Form) -> impl Responder {
- if *CONFIG_MAP.read().unwrap().get("SUBMIT_TOKEN").unwrap() == form.token {
+ if CONFIG.submit_token == form.token {
create_post(&form.title.as_str(), replace_newlines(&form.body).as_str());
println!("New blog post created.");
} else {
@@ -26,17 +26,14 @@ async fn blog_create_post(form: Form) -> impl Responder {
}
HttpResponse::MovedPermanently()
- .set_header("LOCATION", "/blog")
+ .insert_header(("LOCATION", "/"))
.finish()
}
#[post("/api/blog/posts/edit/{post_id}")]
-async fn blog_edit_post(
- web::Path(post_id): web::Path,
- form: Form,
-) -> impl Responder {
- let (valid, id) = id_valid(post_id);
- if valid && *CONFIG_MAP.read().unwrap().get("SUBMIT_TOKEN").unwrap() == form.token {
+async fn blog_edit_post(post_id: web::Path, form: Form) -> impl Responder {
+ let (valid, id) = id_valid(post_id.into_inner());
+ if valid && CONFIG.submit_token == form.token {
edit_post_by_id(
id as i32,
&form.title.as_str(),
@@ -49,17 +46,17 @@ async fn blog_edit_post(
}
return HttpResponse::MovedPermanently()
- .set_header("LOCATION", "/blog")
+ .insert_header(("LOCATION", "/"))
.finish();
}
#[post("/api/blog/posts/delete/{post_id}")]
async fn blog_delete_post(
- web::Path(post_id): web::Path,
+ post_id: web::Path,
form: Form,
) -> impl Responder {
- let (valid, id) = id_valid(post_id);
- if valid && *CONFIG_MAP.read().unwrap().get("SUBMIT_TOKEN").unwrap() == form.token {
+ let (valid, id) = id_valid(post_id.into_inner());
+ if valid && CONFIG.submit_token == form.token {
println!("Deleted post: {}", id);
delete_post_by_id(id as i32);
} else {
@@ -68,17 +65,14 @@ async fn blog_delete_post(
}
return HttpResponse::MovedPermanently()
- .set_header("LOCATION", "/blog")
+ .insert_header(("LOCATION", "/"))
.finish();
}
#[post("/api/blog/posts/hide/{post_id}")]
-async fn blog_hide_post(
- web::Path(post_id): web::Path,
- form: Form,
-) -> impl Responder {
- let (valid, id) = id_valid(post_id);
- if valid && *CONFIG_MAP.read().unwrap().get("SUBMIT_TOKEN").unwrap() == form.token {
+async fn blog_hide_post(post_id: web::Path, form: Form) -> impl Responder {
+ let (valid, id) = id_valid(post_id.into_inner());
+ if valid && CONFIG.submit_token == form.token {
println!("Hid post: {}", id);
hide_post_by_id(id as i32);
} else {
@@ -87,7 +81,7 @@ async fn blog_hide_post(
}
return HttpResponse::MovedPermanently()
- .set_header("LOCATION", "/blog")
+ .insert_header(("LOCATION", "/"))
.finish();
}
diff --git a/site/src/config.rs b/site/src/config.rs
new file mode 100644
index 0000000..fcdd2b8
--- /dev/null
+++ b/site/src/config.rs
@@ -0,0 +1,83 @@
+use dotenvy::dotenv;
+use once_cell::sync::Lazy;
+
+pub const ENV_PREFIX: &str = "CL_";
+
+pub struct Config {
+ pub submit_token: String,
+ pub root_path: String,
+ pub username: String,
+ pub bind_port: String,
+ pub accounts: Accounts,
+}
+
+pub struct Accounts {
+ pub email: Option,
+ pub github: Option,
+ pub twitter: Option,
+ pub mastodon: Option,
+ pub discord: Option,
+ pub reddit: Option,
+}
+
+fn load_config() -> Config {
+ dotenv().expect(".env file not found");
+
+ // return config value or panic if not set
+ fn eval_required_conf(variable_name: String) -> String {
+ match std::env::var(variable_name.clone()) {
+ Ok(value) => {
+ println!("{}: {}", variable_name, value);
+ return value;
+ }
+ Err(_) => {
+ panic!("{} not set!", variable_name)
+ }
+ }
+ }
+
+ // return optional value
+ fn eval_optional_conf(variable_name: String, default_value: Option<&str>) -> Option {
+ match std::env::var(variable_name.clone()) {
+ Ok(value) => {
+ println!("{}: {}", variable_name, value);
+ return Some(value);
+ }
+ Err(_) => match default_value {
+ Some(val) => {
+ println!("Variable {variable_name} not set. Using default value: {val}.");
+ return Some(String::from(val));
+ }
+ None => {
+ println!("Variable {variable_name} not set. No default, leaving this empty.");
+ None
+ }
+ },
+ }
+ }
+
+ fn eval_conf_var(name: &str, required_var: bool, default: Option<&str>) -> Option {
+ if required_var {
+ Some(eval_required_conf(format!("{ENV_PREFIX}{name}")))
+ } else {
+ eval_optional_conf(format!("{ENV_PREFIX}{name}"), default)
+ }
+ }
+
+ Config {
+ submit_token: eval_conf_var("SUBMIT_TOKEN", true, None).unwrap(),
+ root_path: eval_conf_var("ROOT_PATH", false, Some("./content")).unwrap(),
+ username: eval_conf_var("USERNAME", true, None).unwrap(),
+ bind_port: eval_conf_var("BIND_PORT", false, Some("8000")).unwrap(),
+ accounts: Accounts {
+ email: eval_conf_var("EMAIL", false, None),
+ github: eval_conf_var("GITHUB_ACCOUNT", false, None),
+ discord: eval_conf_var("DISCORD_ACCOUNT", false, None),
+ twitter: eval_conf_var("TWITTER_ACCOUNT", false, None),
+ mastodon: eval_conf_var("MASTODON_ACCOUNT", false, None),
+ reddit: eval_conf_var("REDDIT_ACCOUNT", false, None),
+ },
+ }
+}
+
+pub static CONFIG: Lazy = Lazy::new(|| load_config());
diff --git a/site/src/db.rs b/site/src/db.rs
index a6484a7..02e41ec 100644
--- a/site/src/db.rs
+++ b/site/src/db.rs
@@ -4,11 +4,12 @@ mod schema;
use diesel::prelude::*;
use diesel::sqlite::SqliteConnection;
use models::*;
-use std::env;
+
+use crate::config::CONFIG;
/// Returns an SqliteConnection if connection successful.
fn establish_connection() -> SqliteConnection {
- let db_path = env::var("ROOT_PATH").unwrap() + "/db.sqlite3";
+ let db_path = CONFIG.root_path.clone() + "/db.sqlite3";
SqliteConnection::establish(&db_path)
.unwrap_or_else(|_| panic!("Error, connection to {} failed.", &db_path))
}
@@ -16,33 +17,33 @@ fn establish_connection() -> SqliteConnection {
/// Returns all posts
pub fn get_all_posts() -> std::vec::Vec {
use schema::posts::dsl::*;
- let connection = establish_connection();
+ let mut connection = establish_connection();
posts
.filter(published.eq(true))
.order(id.desc())
- .load::(&connection)
+ .load::(&mut connection)
.expect("Error, couldn't load posts.")
}
/// Returns the last five posts.
pub fn get_last_five_posts() -> std::vec::Vec {
use schema::posts::dsl::*;
- let connection = establish_connection();
+ let mut connection = establish_connection();
posts
.filter(published.eq(true))
.order(id.desc())
.limit(5)
- .load::(&connection)
+ .load::(&mut connection)
.expect("Error, couldn't load posts.")
}
/// Returns the post with the given ID.
pub fn get_post_by_id(post_id: i32) -> Post {
use schema::posts::dsl::*;
- let connection = establish_connection();
+ let mut connection = establish_connection();
posts
.find(post_id)
- .get_result(&connection)
+ .get_result(&mut connection)
.expect("Error, couldn't find post.")
}
@@ -51,7 +52,7 @@ pub fn create_post(title: &str, body: &str) {
use chrono::prelude::*;
use schema::posts;
- let connection = establish_connection();
+ let mut connection = establish_connection();
let new_post = NewPost {
title,
@@ -62,40 +63,40 @@ pub fn create_post(title: &str, body: &str) {
diesel::insert_into(posts::table)
.values(&new_post)
- .execute(&connection)
+ .execute(&mut connection)
.unwrap_or_else(|_| panic!("Error, couldn't insert new Post."));
}
/// Updates a post with the new title and body.
pub fn edit_post_by_id(post_id: i32, new_title: &str, new_body: &str) {
use schema::posts::dsl::*;
- let connection = establish_connection();
+ let mut connection = establish_connection();
diesel::update(posts)
.filter(id.eq(post_id))
.set((title.eq(new_title), body.eq(new_body)))
- .execute(&connection)
+ .execute(&mut connection)
.expect("Error, couldn't update post.");
}
/// Deletes a post by id.
pub fn delete_post_by_id(post_id: i32) {
use schema::posts::dsl::*;
- let connection = establish_connection();
+ let mut connection = establish_connection();
diesel::delete(posts.filter(id.eq(post_id)))
- .execute(&connection)
+ .execute(&mut connection)
.expect("Error, couldn't update post.");
}
/// Sets the published bool of a post to false.
pub fn hide_post_by_id(post_id: i32) {
use schema::posts::dsl::*;
- let connection = establish_connection();
+ let mut connection = establish_connection();
diesel::update(posts)
.filter(id.eq(post_id))
.set(published.eq(false))
- .execute(&connection)
+ .execute(&mut connection)
.expect("Error, couldn't update post.");
}
diff --git a/site/src/db/models.rs b/site/src/db/models.rs
index ae5bbf0..94d518c 100644
--- a/site/src/db/models.rs
+++ b/site/src/db/models.rs
@@ -1,6 +1,7 @@
-use super::schema::posts;
+use crate::db::schema::posts;
use serde::{Deserialize, Serialize};
+
#[derive(Queryable, Serialize, Deserialize)]
pub struct Post {
pub id: i32,
@@ -11,7 +12,7 @@ pub struct Post {
}
#[derive(Insertable)]
-#[table_name = "posts"]
+#[diesel(table_name = posts)]
pub struct NewPost<'a> {
pub title: &'a str,
pub body: &'a str,
diff --git a/site/src/main.rs b/site/src/main.rs
index ad7d5a1..5be401f 100644
--- a/site/src/main.rs
+++ b/site/src/main.rs
@@ -1,4 +1,5 @@
mod api;
+mod config;
mod db;
mod routes;
@@ -9,88 +10,22 @@ extern crate serde_derive;
extern crate tera;
use actix_files as fs;
-use actix_web::{middleware::Logger, App, HttpServer};
+use actix_web::{middleware::Logger, web::Data, App, HttpServer};
+use config::CONFIG;
use env_logger::Env;
-use once_cell::sync::Lazy;
-use std::{collections::HashMap, env, sync::RwLock};
use tera::Tera;
-pub static CONFIG_MAP: Lazy>> = Lazy::new(|| {
- let mut config: HashMap = HashMap::new();
-
- let required_env_vars = [
- "SUBMIT_TOKEN",
- "ROOT_PATH",
- "USERNAME",
- "EMAIL",
- "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);
- }
-
- // 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());
- }
- };
-
- for var in optional_env_vars.iter() {
- insert_optional_env(var);
- }
-
- // 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)
-});
-
#[actix_web::main]
async fn main() -> std::io::Result<()> {
- HttpServer::new(|| {
- let mut tera = Tera::new(
- format!(
- "{}{}",
- CONFIG_MAP.read().unwrap().get("ROOT_PATH").unwrap(),
- "/templates/*"
- )
- .as_str(),
- )
- .unwrap();
+ HttpServer::new(move || {
+ let mut tera =
+ Tera::new(format!("{}{}", CONFIG.root_path, "/templates/*").as_str()).unwrap();
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("debug"));
App::new()
- .data(tera)
+ .app_data(Data::new(tera))
.service(routes::about)
.service(routes::blog)
.service(routes::blog_all)
@@ -105,18 +40,11 @@ async fn main() -> std::io::Result<()> {
.service(api::blog_delete_post)
.service(fs::Files::new(
"/static",
- format!(
- "{}{}",
- CONFIG_MAP.read().unwrap().get("ROOT_PATH").unwrap(),
- "/static"
- ),
+ format!("{}{}", CONFIG.root_path, "/static"),
))
.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.bind_port))?
.run()
.await
}
diff --git a/site/src/routes.rs b/site/src/routes.rs
index aadc38f..15c0071 100644
--- a/site/src/routes.rs
+++ b/site/src/routes.rs
@@ -1,6 +1,6 @@
use crate::db;
-use super::CONFIG_MAP;
+use super::CONFIG;
use actix_web::{error, get, http::StatusCode, web, Error, HttpResponse};
use tera::Context;
@@ -36,30 +36,36 @@ pub fn replace_br_tags(x: &str) -> String {
#[get("/about")]
async fn about(tmpl: web::Data) -> Result {
let mut context = Context::new();
- context.insert(
- "username",
- CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
- );
- context.insert("email", CONFIG_MAP.read().unwrap().get("EMAIL").unwrap());
- if let Some(acc) = CONFIG_MAP.read().unwrap().get("GITHUB_ACCOUNT") {
- context.insert("github_account", acc);
- }
- if let Some(acc) = CONFIG_MAP.read().unwrap().get("TWITTER_ACCOUNT") {
- context.insert("twitter_account", acc);
- }
- if let Some(acc) = CONFIG_MAP.read().unwrap().get("MASTODON_ACCOUNT") {
- context.insert("mastodon_account", acc);
- }
- if let Some(acc) = CONFIG_MAP.read().unwrap().get("DISCORD_ACCOUNT") {
- context.insert("discord_account", acc);
- }
- if let Some(acc) = CONFIG_MAP.read().unwrap().get("REDDIT_ACCOUNT") {
- context.insert("reddit_account", acc);
+ context.insert("username", &CONFIG.username);
+ match &CONFIG.accounts.email {
+ Some(acc) => context.insert("email", &acc.replace("@", " (at) ")),
+ None => (),
}
+ match &CONFIG.accounts.github {
+ Some(acc) => context.insert("github_account", &acc),
+ None => (),
+ };
+ match &CONFIG.accounts.twitter {
+ Some(acc) => context.insert("twitter_account", &acc),
+ None => (),
+ };
+ match &CONFIG.accounts.mastodon {
+ Some(acc) => context.insert("mastodon_account", &acc),
+ None => (),
+ };
+ match &CONFIG.accounts.reddit {
+ Some(acc) => context.insert("reddit_account", &acc),
+ None => (),
+ };
+ match &CONFIG.accounts.discord {
+ Some(acc) => context.insert("discord_account", &acc),
+ None => (),
+ };
let result = tmpl
.render("about.html", &context)
- .map_err(|e| error::ErrorInternalServerError(format!("Template error\n{}", e)))?;
+ .map_err(|err| error::ErrorInternalServerError(err))
+ .unwrap();
Ok(HttpResponse::Ok().content_type("text/html").body(result))
}
@@ -70,14 +76,12 @@ async fn blog(tmpl: web::Data) -> Result {
let mut context = Context::new();
context.insert("posts", &posts);
- context.insert(
- "username",
- CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
- );
+ context.insert("username", &CONFIG.username);
let result = tmpl
.render("blog.html", &context)
- .map_err(|_| error::ErrorInternalServerError("Template error"))?;
+ .map_err(|err| error::ErrorInternalServerError(err))
+ .unwrap();
Ok(HttpResponse::Ok().content_type("text/html").body(result))
}
@@ -88,14 +92,12 @@ async fn blog_all(tmpl: web::Data) -> Result {
let mut context = Context::new();
context.insert("posts", &posts);
- context.insert(
- "username",
- CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
- );
+ context.insert("username", &CONFIG.username);
let result = tmpl
.render("blog-all-posts.html", &context)
- .map_err(|_| error::ErrorInternalServerError("Template error"))?;
+ .map_err(|err| error::ErrorInternalServerError(err))
+ .unwrap();
Ok(HttpResponse::Ok().content_type("text/html").body(result))
}
@@ -103,9 +105,9 @@ async fn blog_all(tmpl: web::Data) -> Result {
#[get("/id/{post_id}")]
async fn blog_by_id(
tmpl: web::Data,
- web::Path(post_id): web::Path,
+ post_id: web::Path, // web::Path(post_id): web::Path,
) -> Result {
- let (valid, id) = id_valid(post_id);
+ let (valid, id) = id_valid(post_id.into_inner());
if valid {
let post = db::get_post_by_id(id as i32);
@@ -114,15 +116,13 @@ async fn blog_by_id(
}
let mut context = Context::new();
+ context.insert("username", &CONFIG.username);
context.insert("post", &post);
- context.insert(
- "username",
- CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
- );
let result = tmpl
.render("blog-by-id.html", &context)
- .map_err(|_| error::ErrorInternalServerError("Template error"))?;
+ .map_err(|err| error::ErrorInternalServerError(err))
+ .unwrap();
return Ok(HttpResponse::Ok().content_type("text/html").body(result));
} else {
@@ -138,7 +138,8 @@ async fn blog_submit(tmpl: web::Data) -> Result
let result = tmpl
.render("submit.html", &context)
- .map_err(|_| error::ErrorInternalServerError("Template error"))?;
+ .map_err(|err| error::ErrorInternalServerError(err))
+ .unwrap();
return Ok(HttpResponse::Ok().content_type("text/html").body(result));
}
@@ -147,14 +148,12 @@ async fn blog_submit(tmpl: web::Data) -> Result
async fn blog_edit(tmpl: web::Data) -> Result {
let mut context = Context::new();
context.insert("posts", &db::get_all_posts());
- context.insert(
- "username",
- CONFIG_MAP.read().unwrap().get("USERNAME").unwrap(),
- );
+ context.insert("username", &CONFIG.username);
let result = tmpl
.render("edit.html", &context)
- .map_err(|_| error::ErrorInternalServerError("Template error"))?;
+ .map_err(|err| error::ErrorInternalServerError(err))
+ .unwrap();
Ok(HttpResponse::Ok().content_type("text/html").body(result))
}
@@ -162,9 +161,9 @@ async fn blog_edit(tmpl: web::Data) -> Result {
#[get("/edit/{post_id}")]
async fn blog_edit_by_id(
tmpl: web::Data,
- web::Path(post_id): web::Path,
+ post_id: web::Path,
) -> Result {
- let (valid, id) = id_valid(post_id);
+ let (valid, id) = id_valid(post_id.into_inner());
if valid {
let mut post = db::get_post_by_id(id as i32);
@@ -172,13 +171,13 @@ async fn blog_edit_by_id(
post.body = replace_br_tags(&post.body);
let mut context = Context::new();
- context.insert("title", &post.title);
- context.insert("body", &post.body);
- context.insert("id", &id);
+ context.insert("username", &CONFIG.username);
+ context.insert("post", &post);
let result = tmpl
.render("edit-form.html", &context)
- .map_err(|_| error::ErrorInternalServerError("Template error"))?;
+ .map_err(|err| error::ErrorInternalServerError(err))
+ .unwrap();
Ok(HttpResponse::Ok().content_type("text/html").body(result))
} else {
diff --git a/site/src/schema.rs b/site/src/schema.rs
deleted file mode 100644
index 22b279e..0000000
--- a/site/src/schema.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-table! {
- posts (id) {
- id -> Nullable,
- title -> Text,
- body -> Text,
- published -> Bool,
- publish_date -> Timestamp,
- }
-}