12 Commits
54 changed files with 1460 additions and 505 deletions

No files matched your search

+9 -9
View File
@@ -1,19 +1,19 @@
# postgres settings # postgres settings
DB_HOST=localhost DB_HOST=localhost
DB_PORT=5432 DB_PORT=5432
POSTGRES_PASSWORD= #POSTGRES_PASSWORD=
POSTGRES_USER= POSTGRES_USER=nocturne
POSTGRES_DB=nocturne POSTGRES_DB=nocturne
POSTGRES_HOST=postgres
# backend settings # backend settings
#GIT_WORK_DIR=../blog_posts_git #GIT_WORK_DIR=../blog_posts_git
#LOG_ROOT_DIR=/var/log/nocturne #LOG_ROOT_DIR=/var/log/nocturne
#BLOG_ENDPOINT=https://github.com/Lumither/blog-posts.git
BLOG_ENDPOINT=https://github.com/Lumither/blog-posts.git BLOG_GIT_URL=https://github.com/Lumither/blog-posts.git
WORK_DIR=~/.nocturne WORK_DIR=/nocturne
BACKEND_PORT=3001 #BACKEND_PORT=3001
# frontend settings # frontend settings
API_LOCAL_URL=http://localhost:3001 API_LOCAL_URL=http://backend:3001
API_REMOTE_URL=https://lumither.com/api API_REMOTE_URL=https://lumither.com/api
+13 -3
View File
@@ -1,6 +1,16 @@
ddev: ARCH := $(shell uname -m)
ifeq ($(ARCH), arm64)
ARCH := aarch64
endif
all: release
release:
docker compose -f prod.compose.yaml build --build-arg ARCH=$(ARCH)
dev:
docker-compose -f dev.compose.yaml up --build docker-compose -f dev.compose.yaml up --build
dclean: clean:
docker-compose -f dev.compose.yaml rm -fsv docker-compose -f prod.compose.yaml -f dev.compose.yaml rm -fsv
+2 -4
View File
@@ -1,14 +1,12 @@
# `Nocturne: personal website & CMS` # `Nocturne: personal website & CMS`
> This is the last working version
This is the code repo of my personal website, and [here](https://github.com/Lumither/blog-posts/) is the link of the This is the code repo of my personal website, and [here](https://github.com/Lumither/blog-posts/) is the link of the
content repo. content repo.
Powered by Next.js and Rust, built with passion and love Powered by Next.js and Rust, built with passion and love
<p align="center">
<img src="https://avatars.githubusercontent.com/u/46409277?v=4" alt="GitHub Avatar"/>
</p>
*will add more here in the future *will add more here in the future
## Nav: ## Nav:
+2
View File
@@ -1 +1,3 @@
/target /target
/Cargo.lock
+5 -3
View File
@@ -4,7 +4,9 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
macros = { path = "../macros" }
constants = { path = "../constants" } constants = { path = "../constants" }
markdown = { path = "../markdown" }
chrono = { version = "0.4.38", features = ["serde", "alloc"] } chrono = { version = "0.4.38", features = ["serde", "alloc"] }
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] } tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] }
@@ -13,11 +15,11 @@ dotenv = "0.15.0"
dirs = "5.0.1" dirs = "5.0.1"
tokio = { version = "1.40.0", features = ["full"] } tokio = { version = "1.40.0", features = ["full"] }
sqlx = { version = "0.8.2", features = ["runtime-tokio", "tls-native-tls", "postgres", "chrono", "uuid"] } sqlx = { version = "0.8.2", features = ["runtime-tokio", "tls-native-tls", "postgres", "chrono", "uuid"] }
axum = "0.7.5" axum = { version = "0.7.5", features = ["macros"] }
serde = { version = "1.0.199", features = ["derive"] } serde = { version = "1.0.199", features = ["derive"] }
serde_json = "1.0.128" serde_json = "1.0.128"
uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] } uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }
futures = { version = "0.3.30", features = ["executor"] } futures = { version = "0.3.30", features = ["executor"] }
sha2 = "0.10.8" cron = "0.13.0"
cron = "0.12.1"
git2 = "0.19.0" git2 = "0.19.0"
thiserror = "2.0.3"
@@ -1,3 +1,5 @@
use std::error::Error;
use constants::blog::PAGE_SIZE; use constants::blog::PAGE_SIZE;
use axum::{extract::Query, extract::State, http::StatusCode, Json}; use axum::{extract::Query, extract::State, http::StatusCode, Json};
@@ -14,6 +16,7 @@ pub struct Params {
page: Option<u32>, page: Option<u32>,
} }
#[axum::debug_handler]
pub async fn get_post_list( pub async fn get_post_list(
State(db_connection): State<PgPool>, State(db_connection): State<PgPool>,
Query(params): Query<Params>, Query(params): Query<Params>,
@@ -47,33 +50,72 @@ pub async fn get_post_list(
} }
}; };
let mut res = Map::new(); let mut res = Vec::new();
let posts: Vec<_> = post_list let posts: Vec<_> = post_list
.into_iter() .into_iter()
.map(|post| analyze_post(&db_connection, post)) .map(|post| async { analyze_post(&db_connection, post).await })
.collect(); .collect();
let posts = join_all(posts).await; let posts = join_all(posts).await;
for post in posts {
match post {
Ok(p) => res.push(p),
Err(e) => {
return Err((
StatusCode::INTERNAL_SERVER_ERROR,
Json::from(json!(("error", e.to_string()))),
))
}
}
}
res.insert("posts".to_string(), Value::from(posts)); // res.insert("posts".to_string(), Value::from(posts));
Ok(Json::from(Value::from(res))) Ok(Json::from(Value::from(res)))
} }
async fn analyze_post(db_connection: &PgPool, post: PgRow) -> Value { async fn analyze_post(db_connection: &PgPool, post: PgRow) -> Result<Value, Box<dyn Error + Send>> {
let post_id: Uuid = post.get("post_id"); let post_id: Uuid = post.get("post_id");
let tags = fetch_post_tags(db_connection, post_id).await; let tags = fetch_post_tags(db_connection, post_id).await;
let meta = fetch_post_meta(db_connection, post_id).await.unwrap();
let header_img = meta.get("header_img");
let last_update = meta.get("last_update");
json!({ Ok(json!({
"post_id": post_id.to_string(), "post_id": post_id.to_string(),
"title": post.get::<String, _>("title"), "title": post.get::<String, _>("title"),
"category": post.get::<String, _>("category"), "category": post.get::<String, _>("category"),
"header_img": post.get::<String, _>("header_img"), "header_img": header_img,
"sub_title": post.get::<String, _>("sub_title"), "sub_title": post.get::<String, _>("sub_title"),
"summary": post.get::<String, _>("summary"), "summary": post.get::<String, _>("summary"),
"last_update": post.get::<DateTime<Utc>, _>("last_update"), "last_update": last_update,
"first_update": post.get::<DateTime<Utc>, _>("first_update"), "first_update": post.get::<DateTime<Utc>, _>("first_update"),
"tags": tags, "tags": tags,
}) }))
}
async fn fetch_post_meta(db_connection: &PgPool, post_id: Uuid) -> Option<Value> {
match query(
r#"
SELECT jsonb_strip_nulls(to_jsonb(t.*)) - 'post_id' AS meta
FROM meta t
WHERE post_id = $1;
"#,
)
.bind(post_id)
.fetch_one(db_connection)
.await
{
Ok(value) => Some(value.get::<Value, _>("meta")),
Err(e) => {
error!(
"Database error on Reading `{}` from table `{}`: <{}>: {}",
"post meta data",
"meta",
post_id.to_string(),
e.to_string()
);
None
}
}
} }
async fn fetch_post_tags(db_connection: &PgPool, post_id: Uuid) -> Vec<String> { async fn fetch_post_tags(db_connection: &PgPool, post_id: Uuid) -> Vec<String> {
-1
View File
@@ -1,4 +1,3 @@
pub mod get_page_count; pub mod get_page_count;
pub mod get_post; pub mod get_post;
pub mod get_post_list; pub mod get_post_list;
pub mod refresh;
-190
View File
@@ -1,190 +0,0 @@
use std::path::Path;
use std::str::FromStr;
use axum::extract::{Query, State};
use axum::http::StatusCode;
use axum::Json;
use serde::Deserialize;
use serde_json::{Map, Value};
use sqlx::PgPool;
// use crate::api::post::errors::refresh::PostIdxError;
// use crate::api::post::utils::{build_post_idx, post};
// use crate::model::blog::{POST_BASE_MODEL, POST_HASH_MODEL, POST_META_MODEL, TAG_MODEL};
#[derive(Deserialize)]
pub struct Params {
/// refresh level
level: Option<String>,
}
pub async fn refresh(
State(db_connection): State<PgPool>,
Query(params): Query<Params>,
) -> Result<StatusCode, (StatusCode, Json<Value>)> {
// let is_force_refresh = params.level.unwrap_or("".to_string()) == "force";
//
// // search post
// let data_repo_dir = match env::var("GIT_WORK_DIR") {
// Ok(value) => value,
// Err(_) => {
// return Err((
// StatusCode::INTERNAL_SERVER_ERROR,
// Json::from(json!((
// "error",
// "error at parsing environment variable: GIT_WORK_DIR"
// ))),
// ));
// }
// };
// let post_dir = Path::new(&data_repo_dir).join("posts");
//
// if is_force_refresh {
// if let Err(e) = query("DROP TABLE IF EXISTS hash, meta, post, tag;")
// .execute(&db_connection)
// .await
// {
// error!(
// "DB query error when deleting table: `hash`, `meta`, `post`, `tag`: {}",
// e.to_string()
// );
// return Err((
// StatusCode::INTERNAL_SERVER_ERROR,
// Json::from(json!(("error", e.to_string()))),
// ));
// }
// }
//
// // generate post idx
// let post_path = search_md(&post_dir);
//
// let post_list_with_hash: Vec<(Map<_, _>, Vec<_>)> = post_path
// .into_iter()
// .filter_map(|post_path| match post::from_path(&post_path) {
// Ok(post) => match fs::read(&post_path) {
// Ok(bytes) => {
// let mut hasher = Sha256::new();
// hasher.update(bytes);
// let hash = hasher.finalize().to_vec();
// Some((post, hash))
// }
// Err(e) => {
// error!(
// "Failed to read file while hashing the post <{}>, skipping: {}",
// post_path,
// e.to_string()
// );
// None
// }
// },
// Err(e) => {
// error!(
// "Failed to parse post <{}>, skipping: {}",
// post_path,
// e.to_string()
// );
// None
// }
// })
// .collect();
//
// // db create
// query(POST_BASE_MODEL)
// .execute(&db_connection)
// .await
// .unwrap();
// query(POST_META_MODEL)
// .execute(&db_connection)
// .await
// .unwrap();
// query(TAG_MODEL).execute(&db_connection).await.unwrap();
// query(POST_HASH_MODEL)
// .execute(&db_connection)
// .await
// .unwrap();
//
// let res: Vec<_> = stream::iter(post_list_with_hash)
// .map(|(post, hash)| {
// let db_clone = db_connection.clone();
// async move { build_post_idx(&db_clone, post, hash).await }
// })
// .buffer_unordered(usize::MAX)
// .collect()
// .await;
//
// let errs: Vec<_> = res
// .into_iter()
// .filter_map(|res| res.err())
// .map(|e| e.to_string())
// .collect();
//
// if !errs.is_empty() {
// Err((
// StatusCode::INTERNAL_SERVER_ERROR,
// Json::from(json!({"error": errs})),
// ))
// } else {
// Ok(StatusCode::OK)
// }
todo!()
}
/// Search a dir, return a list of markdown files
///
/// # Arguments
/// * `entry`: dir path
///
/// # Returns
/// Vec<String, Global>
/// * `String`: path of a markdown file
///
fn search_md(entry: &Path) -> Vec<String> {
if entry.ends_with(".git") {
return vec![];
}
if entry.is_dir() {
if let Ok(files) = entry.read_dir() {
files
.flat_map(|file| {
let file_path = file.unwrap().path();
search_md(file_path.as_path())
})
.collect()
} else {
vec![]
}
} else if entry.extension().is_some_and(|ext| ext == "md") {
vec![entry.to_str().unwrap().to_string()]
} else {
vec![]
}
}
async fn build_post_idx(
db_connection: &PgPool,
post: Map<String, Value>,
hash: Vec<u8>,
// ) -> Result<(), PostIdxError> {
) -> Result<(), ()> {
todo!()
// let meta = &post["meta"];
//
// // extract post id
// let post_id = match Uuid::from_str(post["post_id"].as_str().unwrap()) {
// Ok(id) => id,
// Err(e) => {
// return Err(PostIdxError::InvalidUUID {
// id: post["post_id"].as_str().unwrap().to_string(),
// err_msg: e.to_string(),
// })
// }
// };
//
// if build_post_idx::hash(db_connection, post_id, hash).await? {
// build_post_idx::base(db_connection, &post, post_id, meta).await?;
// build_post_idx::tag(db_connection, post_id, meta).await?;
// build_post_idx::meta(db_connection, post_id, meta).await?;
// }
//
// Ok(())
}
@@ -1,24 +0,0 @@
use dirs::home_dir;
use std::env;
pub fn task() {
// get dir
let git_work_dir_path = &env::var("GIT_WORK_DIR").unwrap_or_else(|e| {
if let Ok(default_log_path) = env::var("WORK_DIR") {
if default_log_path.starts_with('~') {
let home_path = home_dir().unwrap_or_else(|| panic!("Cannot find home directory"));
home_path
.join(default_log_path.strip_prefix("~/").unwrap())
.into_os_string()
.into_string()
.expect(
"[fatal] failed to parse env `WORK_DIR`, try to use absolute path instead",
)
} else {
default_log_path
}
} else {
panic!("[fatal] failed to parse env `GIT_WORK_DIR`: {}", e);
}
});
}
@@ -0,0 +1,49 @@
use thiserror::Error;
#[derive(Error, Debug)]
pub enum PostIdxError {
#[error("missing essential field `{}` for file `{}`", field, filename)]
MissingField { field: String, filename: String },
#[error(
"invalid field `{}` for file `{}`, <{}>: {}",
field_name,
filename,
err_field,
msg
)]
InvalidField {
field_name: String,
err_field: String,
filename: String,
msg: String,
},
#[error(
"database error on writing `{}` to table `{}`: <{}>: {}",
data_desc,
db_table,
id,
msg
)]
DBWriteFailure {
data_desc: String,
db_table: String,
id: String,
msg: String,
},
#[error(
"Database error on Reading `{}` from table `{}`: <{}>: {}",
data_desc,
db_table,
id,
msg
)]
DBReadFailure {
data_desc: String,
db_table: String,
id: String,
msg: String,
},
}
@@ -0,0 +1,351 @@
use std::error::Error;
use std::path::Path;
use crate::blog::cron::check_update::utils::get_md_file_basename;
use crate::blog::cron::check_update::{error::PostIdxError, utils::parse_date};
use markdown::MdFile;
use sqlx::{query, PgPool, Pool, Postgres, Row};
use tokio::runtime::Runtime;
use tracing::{info, warn};
async fn base(db_connection: &PgPool, post: &MdFile) -> Result<(), PostIdxError> {
let post_id = post.file_id;
let title = match post.meta.get("title") {
None => {
return Err(PostIdxError::MissingField {
field: "title".to_string(),
filename: post.filename.clone(),
})
}
Some(title) => title.as_str().unwrap_or_else(|| {
warn!("invalid title for `{}`", &post.filename);
"invalid title"
}),
};
let sub_title = post
.meta
.get("sub_title")
.and_then(|v| v.as_str())
.unwrap_or("");
let summary = post
.meta
.get("summary")
.and_then(|v| v.as_str())
.unwrap_or("");
let content = post.content.as_str();
let category = match post.meta.get("category") {
None => {
return Err(PostIdxError::MissingField {
field: "category".to_string(),
filename: post.filename.clone(),
})
}
Some(title) => title.as_str().unwrap_or_else(|| {
warn!("invalid category for `{}`", &post.filename);
"invalid category"
}),
};
let last_update = {
if let Some(last_update) = post.meta.get("last_update") {
match parse_date(last_update.as_str().unwrap()) {
Ok(date) => Some(date),
Err(e) => {
return Err(PostIdxError::InvalidField {
field_name: "last_update".to_string(),
err_field: last_update.to_string(),
filename: post.filename.clone(),
msg: e.to_string(),
})
}
}
} else {
None
}
};
let first_update = match post.meta.get("date") {
None => {
return Err(PostIdxError::MissingField {
field: "date".to_string(),
filename: post.filename.clone(),
})
}
Some(first_update) => match parse_date(first_update.as_str().unwrap()) {
Ok(date) => date,
Err(e) => {
return Err(PostIdxError::InvalidField {
field_name: "date".to_string(),
err_field: first_update.to_string(),
filename: post.filename.clone(),
msg: e.to_string(),
})
}
},
};
let filename = get_md_file_basename(&post.filename);
if let Err(e) = query(
r##"
INSERT INTO Post (post_id, title, summary, content, last_update, first_update, sub_title, category, filename)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
ON CONFLICT (post_id) DO
UPDATE SET
title = EXCLUDED.title,
summary = EXCLUDED.summary,
content = EXCLUDED.content,
last_update = EXCLUDED.last_update,
first_update = EXCLUDED.first_update,
sub_title = EXCLUDED.sub_title,
category = EXCLUDED.category,
filename = EXCLUDED.filename;
"##,
)
.bind(post_id)
.bind(title)
.bind(summary)
.bind(content)
.bind(last_update)
.bind(first_update)
.bind(sub_title)
.bind(category)
.bind(filename)
.execute(db_connection)
.await
{
return Err(
PostIdxError::DBWriteFailure {
data_desc: "post base information".to_string(),
db_table: "Post".to_string(),
id: post_id.to_string(),
msg: e.to_string(),
}
);
}
Ok(())
}
async fn tag(db_connection: &PgPool, post: &MdFile) -> Result<(), PostIdxError> {
if let Some(tags_string) = post.meta.get("tags").to_owned() {
let tags = match tags_string.as_array().map(|vec| {
vec.iter()
.map(|val| val.as_str().unwrap())
.collect::<Vec<_>>()
}) {
None => {
return Err(PostIdxError::MissingField {
field: "tags".to_string(),
filename: post.filename.clone(),
})
}
Some(val) => val,
};
let post_id = post.file_id;
// remove old record
if let Err(e) = query("DELETE FROM Tag WHERE post_id = $1")
.bind(post_id)
.execute(db_connection)
.await
{
return Err(PostIdxError::DBWriteFailure {
data_desc: "post tag information".to_string(),
db_table: "Tag".to_string(),
id: post_id.to_string(),
msg: e.to_string(),
});
}
// add new record
for tag in tags {
match query("INSERT INTO Tag VALUES ($1, $2);")
.bind(post_id)
.bind(tag)
.execute(db_connection)
.await
{
Ok(_) => {}
Err(e) => {
return Err(PostIdxError::DBWriteFailure {
data_desc: "post tag information".to_string(),
db_table: "Tag".to_string(),
id: post_id.to_string(),
msg: e.to_string(),
})
}
}
}
}
Ok(())
}
async fn hash(db_connection: &PgPool, post: &MdFile) -> Result<bool, PostIdxError> {
let base64_form = post.hash.clone();
match query("SELECT hash FROM Hash WHERE post_id = $1")
.bind(post.file_id)
.fetch_optional(db_connection)
.await
{
Ok(row) => {
let db_record: String = match row {
None => "".to_string(),
Some(row) => row.try_get("hash").unwrap_or("".to_string()),
};
if base64_form == db_record {
Ok(false)
} else {
if let Err(e) = query(
r#"
INSERT INTO Hash (post_id, hash) VALUES ($1, $2)
ON CONFLICT (post_id) DO UPDATE SET hash = EXCLUDED.hash"#,
)
.bind(post.file_id)
.bind(&base64_form)
.execute(db_connection)
.await
{
return Err(PostIdxError::DBWriteFailure {
data_desc: "post hash".to_string(),
db_table: "Hash".to_string(),
id: post.file_id.to_string(),
msg: e.to_string(),
});
}
Ok(true)
}
}
Err(e) => Err(PostIdxError::DBReadFailure {
data_desc: "post hash".to_string(),
db_table: "Hash".to_string(),
id: post.file_id.to_string(),
msg: e.to_string(),
}),
}
}
async fn meta(db_connection: &PgPool, post: &MdFile) -> Result<(), PostIdxError> {
if let Err(e) = query(
// todo: sanitization
format!(
r#"
DO
$$
DECLARE
_post_id UUID := '{}';
_meta_cols JSONB := '{}';
_exists BOOLEAN;
_col_name TEXT;
_col_value TEXT;
_sql TEXT;
_insert_columns TEXT := 'post_id';
_insert_values TEXT := quote_literal(_post_id);
_update_set TEXT := '';
_blacklist TEXT[] := ARRAY['tags'];
BEGIN
SELECT EXISTS(SELECT 1 FROM meta WHERE post_id = _post_id) INTO _exists;
FOR _col_name, _col_value IN SELECT key, value FROM jsonb_each_text(_meta_cols)
LOOP
IF _col_name = ANY(_blacklist) THEN
CONTINUE;
END IF;
IF NOT EXISTS (SELECT 1
FROM information_schema.columns
WHERE table_name = 'meta'
AND column_name = _col_name
-- may change in the future
AND table_schema = 'public') THEN
_sql := 'ALTER TABLE meta ADD COLUMN ' || quote_ident(_col_name) || ' TEXT';
EXECUTE _sql;
END IF;
_insert_columns := _insert_columns || ', ' || quote_ident(_col_name);
_insert_values := _insert_values || ', ' || quote_literal(_col_value);
_update_set := _update_set || ', ' || quote_ident(_col_name) || ' = ' || quote_literal(_col_value);
END LOOP;
_update_set := substring(_update_set FROM 3);
IF _exists THEN
_sql := 'UPDATE meta SET ' || _update_set || ' WHERE post_id = ' || quote_literal(_post_id);
EXECUTE _sql;
ELSE
_sql := 'INSERT INTO meta (' || _insert_columns || ') VALUES (' || _insert_values || ')';
EXECUTE _sql;
END IF;
END;
$$ LANGUAGE plpgsql;
"#, post.file_id.to_string().as_str(), post.meta
).as_str()
)
.execute(db_connection)
.await {
Err(PostIdxError::DBWriteFailure {
data_desc: "post meta data".to_string(),
db_table: "Meta".to_string(),
id: post.file_id.to_string(),
msg: e.to_string(),
})
} else {
Ok(())
}
}
pub async fn index_file(path: &Path, db_conn: &Pool<Postgres>) -> Result<(), Box<dyn Error>> {
let md_file = MdFile::from_file(path)?;
async fn trail(db_conn: &Pool<Postgres>, md_file: &MdFile) -> Result<(), PostIdxError> {
base(db_conn, md_file).await?;
tag(db_conn, md_file).await?;
meta(db_conn, md_file).await?;
hash(db_conn, md_file).await.map(|_| ())
}
let mut cnt = 5;
while let Err(e) = trail(db_conn, &md_file).await {
match e {
PostIdxError::DBWriteFailure { .. } => {
cnt -= 1;
}
PostIdxError::DBReadFailure { .. } => {
cnt -= 1;
}
_ => return Err(e.into()),
}
if cnt <= 0 {
return Err(e.into());
}
}
info!("indexed markdown file: {}", path.display());
Ok(())
}
pub fn drop_index(file_basename: &str, db_conn: &Pool<Postgres>) -> Result<(), Box<dyn Error>> {
let rt = Runtime::new().unwrap();
rt.block_on(async {
if let Err(e) = query(
r#"
WITH deleted_post AS (
DELETE FROM post
WHERE id = (SELECT id FROM post WHERE filename = $1)
RETURNING id
)
DELETE FROM tag WHERE post_id IN (SELECT id FROM deleted_post);
DELETE FROM meta WHERE post_id IN (SELECT id FROM deleted_post);
DELETE FROM hash WHERE post_id IN (SELECT id FROM deleted_post);
"#,
)
.bind(file_basename)
.execute(db_conn)
.await
{
Err(Box::from(
format!("failed to drop index: {}", e).to_string(),
))
} else {
Ok(())
}
})
}
@@ -0,0 +1,146 @@
use std::env;
use std::fs::remove_dir_all;
use std::path::{Path, PathBuf};
use crate::{
blog::cron::check_update::{
index::drop_index,
utils::{expand_path, get_md_file_basename, index_files, search_md},
},
utils::git,
};
use constants::config::general::{default_value, var_name};
use macros::panic_with_log;
use git2::{Delta, Repository};
use sqlx::{Pool, Postgres};
use tracing::{error, info, warn, Level};
mod error;
mod index;
mod utils;
pub fn task(db_connection: &Pool<Postgres>) {
// init
let git_work_dir = {
let path = if let Ok(default_log_path) = env::var(var_name::WORK_DIR) {
expand_path(default_log_path)
} else {
let fallback_path = expand_path(default_value::WORK_DIR.to_string());
warn!(
"unset env var `{}`, using default path: {}/blog_git",
var_name::WORK_DIR,
fallback_path
);
fallback_path
};
Path::new(&path).join("blog_git")
};
// clone & check update
let git_url = match env::var(var_name::BLOG_GIT_URL) {
Ok(url) => url,
Err(e) => {
panic_with_log!(
Level::ERROR,
"failed to read `{}`: {}",
var_name::BLOG_GIT_URL,
e
)
}
};
let git_remote_name = env::var(var_name::BLOG_GIT_REMOTE_NAME)
.unwrap_or(default_value::BLOG_GIT_REMOTE_NAME.to_string());
let git_remote_branch = env::var(var_name::BLOG_GIT_REMOTE_BRANCH)
.unwrap_or(default_value::BLOG_GIT_REMOTE_BRANCH.to_string());
match Repository::open(&git_work_dir) {
Ok(repo) => {
// prevent git remote url mismatch (clean cache)
match repo.find_remote(&git_remote_name) {
Ok(remote) => {
if remote.url().is_some_and(|url| url != git_url) {
remove_dir_all(&git_work_dir).unwrap();
warn!("blog content git({}) url mismatch, reinitialized", &git_url);
return;
}
}
Err(e) => {
remove_dir_all(&git_work_dir).unwrap();
error!(
"unexpected error on indexing blog content git({}), reinitialized: {}",
&git_url, e
);
}
}
match git::sync(&git_remote_name, &git_remote_branch, &repo) {
Ok(updates) => {
if !updates.is_empty() {
// incremental update
info!(
"blog content git({}) update detected: {:?}",
&git_url, updates
);
let mut update_md: Vec<PathBuf> = vec![];
for update in updates {
if [Delta::Deleted, Delta::Untracked].contains(&update.status) {
if let Some(path) = &update.old_path {
if drop_index(
&get_md_file_basename(
path.file_name().unwrap().to_str().unwrap(),
),
db_connection,
)
.is_ok()
{
info!(
"blog content git({}) file `{}` is detected as deleted/untracked, index dropped",
&git_url,
&path.display()
);
} else {
error!(
"blog content git({}) file `{}` is detected as deleted/untracked, failed to drop index",
&git_url,
&path.display()
)
}
}
} else if let Some(path) = &update.new_path {
if path.components().any(|comp| comp.as_os_str() == "posts")
&& path.extension().is_some_and(|ext| ext == "md")
{
update_md.push(path.to_path_buf());
}
}
}
index_files(&update_md, db_connection);
}
}
Err(e) => {
error!(
"failed to sync blog content git({}) updates: {}",
&git_url, e
);
}
}
}
Err(_) => {
match Repository::clone(&git_url, &git_work_dir) {
Ok(_repo) => {
// full repo index
let files = search_md(git_work_dir.join("posts"));
index_files(&files, db_connection);
}
Err(e) => {
error!("failed to clone blog content git({}): {}", &git_url, e);
}
}
}
};
}
@@ -0,0 +1,86 @@
use dirs::home_dir;
use std::path::PathBuf;
use crate::blog::cron::check_update::index::index_file;
use chrono::{DateTime, FixedOffset, ParseResult};
use constants::config::general::{default_value, var_name};
use constants::time::DEFAULT_DATE_FORMAT;
use futures::executor::block_on;
use futures::future::join_all;
use sqlx::{Pool, Postgres};
use tokio::runtime::Runtime;
use tokio::spawn;
use tracing::{error, warn};
pub fn search_md(entry: PathBuf) -> Vec<PathBuf> {
if entry.ends_with(".git") {
return vec![];
}
if entry.is_dir() {
if let Ok(files) = entry.read_dir() {
files
.flat_map(|file| {
let file_path = file.unwrap().path();
search_md(file_path)
})
.collect()
} else {
vec![]
}
} else if entry.extension().is_some_and(|ext| ext == "md") {
vec![entry]
} else {
vec![]
}
}
pub fn index_files(files: &[PathBuf], db_conn: &Pool<Postgres>) {
let rt = Runtime::new().unwrap();
rt.block_on(async {
let files_clone = files.to_owned();
let handlers = files_clone
.into_iter()
.map(|file: PathBuf| {
let conn_clone = db_conn.clone();
spawn(async move {
if let Err(e) = index_file(&file, &conn_clone).await {
error!("failed to index markdown file `{}`: {}", file.display(), e);
}
})
})
.collect::<Vec<_>>();
block_on(join_all(handlers));
});
}
pub fn expand_path(path: String) -> String {
if path.starts_with('~') {
home_dir()
.map(|dir| {
dir.join(path.strip_prefix("~/").unwrap())
.into_os_string()
.into_string()
.unwrap()
})
.unwrap_or_else(|| {
warn!(
"failed to parse env var `{}`, using default value `{}`",
var_name::WORK_DIR,
default_value::WORK_DIR
);
default_value::WORK_DIR.to_string()
})
} else {
path
}
}
pub fn parse_date(date_str: &str) -> ParseResult<DateTime<FixedOffset>> {
DateTime::parse_from_str(format!("{}T120000", date_str).as_str(), DEFAULT_DATE_FORMAT)
}
pub fn get_md_file_basename(f_name: &str) -> String {
f_name.replace(".md", "")
}
+13
View File
@@ -1 +1,14 @@
use crate::scheduler::tasks::basic::BasicTask;
use crate::scheduler::tasks::Task;
use sqlx::{Pool, Postgres};
pub mod check_update; pub mod check_update;
pub fn get_tasks(db_connection: Pool<Postgres>) -> Vec<Box<dyn Task>> {
let db_conn_clone = db_connection.clone();
vec![
BasicTask::new(move || check_update::task(&db_conn_clone), "0/15 * * * * *")
.unwrap()
.to_task(),
]
}
+1 -3
View File
@@ -5,14 +5,12 @@ use crate::blog::api::{
get_page_count::get_page_count, get_post::get_post, get_post_list::get_post_list, get_page_count::get_page_count, get_post::get_post, get_post_list::get_post_list,
}; };
use crate::blog::api::refresh::refresh; use axum::routing::get;
use axum::routing::{get, post};
use axum::Router; use axum::Router;
use sqlx::{Pool, Postgres}; use sqlx::{Pool, Postgres};
pub fn get_router() -> Router<Pool<Postgres>> { pub fn get_router() -> Router<Pool<Postgres>> {
Router::new() Router::new()
.route("/refresh_posts", post(refresh))
.route("/get_post_list", get(get_post_list)) .route("/get_post_list", get(get_post_list))
.route("/get_page_count", get(get_page_count)) .route("/get_page_count", get(get_page_count))
.route("/get_post/:post_id", get(get_post)) .route("/get_post/:post_id", get(get_post))
-56
View File
@@ -1,56 +0,0 @@
use crate::logger;
use std::{
backtrace::{Backtrace, BacktraceStatus},
env, panic,
panic::PanicHookInfo,
};
use tracing::{error, event, span, Level};
use tracing_appender::non_blocking::WorkerGuard;
pub fn logger_init() -> (WorkerGuard, WorkerGuard) {
let ret = logger::init();
panic::set_hook(Box::new(panic_hook));
ret
}
pub fn load_env() {
if let Some(env_file) = env::args().nth(1) {
match dotenv::from_filename(&env_file) {
Ok(_) => {
println!("[info] env loaded from {}, starting up", env_file);
}
Err(e) => {
panic!("[fatal] failed to read {}: {}", env_file, e);
}
}
} else {
println!("[info] no .env file referred, starting up")
}
}
fn panic_hook(panic_info: &PanicHookInfo) {
let payload = panic_info.payload();
// panic_info.
let payload = if let Some(s) = payload.downcast_ref::<&str>() {
Some(&**s)
} else {
payload.downcast_ref::<String>().map(|s| s.as_str())
};
// let location = panic_info.location().map(|l| l.to_string());
// let backtrace = Backtrace::capture();
// let note = (backtrace.status() == BacktraceStatus::Disabled)
// .then_some("run with RUST_BACKTRACE=1 environment variable to display a backtrace");
// (Some(backtrace), note)
// };
//
// panic_info.
if let Some(location) = panic_info.location() {
eprintln!("err filename: {}", location.file())
}
event!(target: "test", Level::ERROR, "panic hook: {:?}", panic_info);
}
+12
View File
@@ -0,0 +1,12 @@
use crate::blog;
use crate::scheduler::Scheduler;
use sqlx::{Pool, Postgres};
pub fn start(db_pool: Pool<Postgres>) {
let scheduler = Scheduler::new();
let _ = vec![blog::cron::get_tasks(db_pool.clone())]
.into_iter()
.map(|list| scheduler.insert_list(list))
.collect::<Vec<_>>();
scheduler.start().unwrap()
}
+41
View File
@@ -0,0 +1,41 @@
use std::env;
use std::error::Error;
use std::str::FromStr;
use constants::config::database::{default_value, var_name};
use sqlx::postgres::{PgConnectOptions, PgPoolOptions};
use sqlx::{ConnectOptions, Pool, Postgres};
use tracing::info;
pub async fn init() -> Result<Pool<Postgres>, Box<dyn Error>> {
let db_connect_option = PgConnectOptions::from_str(&parse_db_uri())
.unwrap()
.disable_statement_logging();
Ok(PgPoolOptions::new()
.max_connections(1) // todo: temporal solution, to be fixed
.connect_with(db_connect_option)
.await?)
}
fn parse_db_uri() -> String {
env::var(var_name::URI).unwrap_or_else(|_| {
info!(
"`{}` env var is not set, \
using `{}`, `{}`, `{}`, `{}` and `{}`",
var_name::URI,
var_name::USERNAME,
var_name::PASSWORD,
var_name::HOST,
var_name::PORT,
var_name::DBNAME
);
let postgres_user = env::var(var_name::USERNAME).unwrap_or(default_value::USERNAME.into());
let postgres_password =
env::var(var_name::PASSWORD).unwrap_or(default_value::PASSWORD.into());
let db_host = env::var(var_name::HOST).unwrap_or(default_value::HOST.into());
let db_port = env::var(var_name::PORT).unwrap_or(default_value::PORT.into());
let postgres_db = env::var(var_name::DBNAME).unwrap_or(default_value::DBNAME.into());
let db_type = default_value::DATABASE_TYPE;
format!("{db_type}://{postgres_user}:{postgres_password}@{db_host}:{db_port}/{postgres_db}")
})
}
@@ -2,6 +2,7 @@ use std::path::Path;
use std::{env, io}; use std::{env, io};
use chrono::Local; use chrono::Local;
use constants::config::general::{default_value, var_name};
use dirs::home_dir; use dirs::home_dir;
use tracing::info; use tracing::info;
use tracing_appender::{non_blocking, non_blocking::WorkerGuard, rolling}; use tracing_appender::{non_blocking, non_blocking::WorkerGuard, rolling};
@@ -25,33 +26,26 @@ impl FormatTime for LocalTimer {
type _LogWriter = dyn for<'writer> MakeWriter<'writer, Writer = dyn io::Write + 'static> + 'static; type _LogWriter = dyn for<'writer> MakeWriter<'writer, Writer = dyn io::Write + 'static> + 'static;
pub fn init() -> (WorkerGuard, WorkerGuard) { pub fn init() -> (WorkerGuard, WorkerGuard) {
let log_path = &env::var("LOG_ROOT_DIR").unwrap_or_else(|e| { let log_path = match env::var(var_name::LOG_DIR) {
if let Ok(default_log_path) = env::var("WORK_DIR") { Ok(path) => Path::new(&path).to_path_buf(),
if default_log_path.starts_with('~') { Err(_) => {
let home_path = home_dir() let path = if let Ok(default_log_path) = env::var(var_name::WORK_DIR) {
.expect("[fatal] unable to locate home dir with parsing env `WORK_DIR`, try to use absolute path instead"); expand_home_path(default_log_path)
home_path
.join(default_log_path.strip_prefix("~/").unwrap())
.into_os_string()
.into_string()
.expect("[fatal] failed to parse env `WORK_DIR`, try to use absolute path instead")
} else { } else {
default_log_path let fallback_path = expand_home_path(default_value::WORK_DIR.to_string());
} println!(
} else { "[warn] unset env var `{}` and `{}`, trying to log on fallback path: {}/log",
panic!("[fatal] failed to parse env `LOG_ROOT_DIR`: {}", e); var_name::LOG_DIR,
var_name::WORK_DIR,
fallback_path
);
fallback_path
};
Path::new(&path).join("log")
} }
}); };
let log_path = Path::new(log_path)
.join("log")
.join("backend")
.into_os_string()
.into_string()
.unwrap_or_else(|e| panic!("[fatal] failed to parse {:?}", e));
let (info_log_writer, info_guard) = non_blocking(rolling::never(&log_path, "info.log")); let (info_log_writer, info_guard) = non_blocking(rolling::never(&log_path, "info.log"));
let (err_log_writer, error_guard) = non_blocking(rolling::never(&log_path, "error.log")); let (err_log_writer, error_guard) = non_blocking(rolling::never(&log_path, "error.log"));
let info_format = tracing_subscriber::fmt::format() let info_format = tracing_subscriber::fmt::format()
@@ -70,9 +64,6 @@ pub fn init() -> (WorkerGuard, WorkerGuard) {
.with_source_location(true) .with_source_location(true)
.with_timer(LocalTimer); .with_timer(LocalTimer);
// let default_filter = tracing_subscriber::filter::EnvFilter::try_from_default_env()
// .unwrap_or_else(|_| "tower_http=debug,axum::rejection=trace".into());
let subscribers = Registry::default() let subscribers = Registry::default()
.with( .with(
fmt::Layer::default() fmt::Layer::default()
@@ -95,8 +86,21 @@ pub fn init() -> (WorkerGuard, WorkerGuard) {
tracing::subscriber::set_global_default(subscribers) tracing::subscriber::set_global_default(subscribers)
.expect("[fatal] failed to setup logging system"); .expect("[fatal] failed to setup logging system");
info!("module started: logger"); info!("logging to dir: {}", log_path.to_str().unwrap());
info!("logging to dir: {}", log_path);
(info_guard, error_guard) (info_guard, error_guard)
} }
fn expand_home_path(path: String) -> String {
if path.starts_with('~') {
let home_path = home_dir()
.unwrap_or_else(|| panic!("[fatal] unable to locate home dir when parsing env `{}`, try to use absolute path instead", var_name::WORK_DIR));
home_path
.join(path.strip_prefix("~/").unwrap())
.into_os_string()
.into_string()
.unwrap()
} else {
path
}
}
+14
View File
@@ -0,0 +1,14 @@
use git2::opts::{set_server_connect_timeout_in_milliseconds, set_server_timeout_in_milliseconds};
use tracing::warn;
pub fn init() {
// git2 option
unsafe {
if let Err(e) = set_server_connect_timeout_in_milliseconds(10_000) {
warn!("failed to set git2 server connect timeout: {}", e);
}
if let Err(e) = set_server_timeout_in_milliseconds(60_000) {
warn!("failed to set git2 server timeout: {}", e);
}
}
}
+58
View File
@@ -0,0 +1,58 @@
mod cron;
mod database;
pub mod logger;
mod misc;
mod schema;
pub mod server;
use macros::panic_with_log;
use std::{env, panic};
use tracing::{info, Level};
pub fn load_env() {
if let Some(env_file) = env::args().nth(1) {
match dotenv::from_filename(&env_file) {
Ok(_) => {
println!("[info] env loaded from {}, starting up", env_file);
}
Err(e) => {
panic!("[fatal] failed to read {}: {}", env_file, e);
}
}
} else {
println!("[info] no .env file referred, starting up")
}
}
pub async fn start() {
misc::init();
// connect database
let db_pool = match database::init().await {
Ok(pool) => {
info!("database connection pool initialized");
pool
}
Err(e) => {
panic_with_log!(
Level::ERROR,
"database connection pool failed to initialize: {}",
e
);
}
};
// schema init
schema::init(&db_pool).await;
// load cron task
cron::start(db_pool.clone());
// api serve
match server::start(db_pool).await {
Ok(_) => {}
Err(e) => {
panic_with_log!(Level::ERROR, "server panicked: {}", e)
}
}
}
+49
View File
@@ -0,0 +1,49 @@
use sqlx::{query, Pool, Postgres};
use tracing::info;
const POST_BASE_MODEL: &str = r##"
CREATE TABLE IF NOT EXISTS Post
(
post_id UUID PRIMARY KEY,
title VARCHAR(255) NOT NULL,
category VARCHAR(255) NOT NULL,
filename TEXT UNIQUE NOT NULL,
summary TEXT,
sub_title TEXT,
content TEXT NOT NULL,
last_update TIMESTAMPTZ,
first_update TIMESTAMPTZ NOT NULL
);
"##;
// base model, will add more cols at runtime
const POST_META_MODEL: &str = r##"
CREATE TABLE IF NOT EXISTS Meta
(
post_id UUID PRIMARY KEY
);
"##;
const POST_HASH_MODEL: &str = r##"
CREATE TABLE IF NOT EXISTS Hash
(
post_id UUID PRIMARY KEY,
hash VARCHAR(44)
);
"##;
const TAG_MODEL: &str = r##"
CREATE TABLE IF NOT EXISTS Tag
(
post_id UUID NOT NULL,
tag VARCHAR(255) NOT NULL
);
"##;
pub async fn init(db_connection: &Pool<Postgres>) {
query(POST_BASE_MODEL).execute(db_connection).await.unwrap();
query(POST_META_MODEL).execute(db_connection).await.unwrap();
query(TAG_MODEL).execute(db_connection).await.unwrap();
query(POST_HASH_MODEL).execute(db_connection).await.unwrap();
info!("database schema initialized");
}
+52
View File
@@ -0,0 +1,52 @@
use std::env;
use std::error::Error;
use std::num::ParseIntError;
use std::process::exit;
use crate::blog;
use axum::Router;
use constants::config::server::{default_value, var_name};
use macros::panic_with_log;
use sqlx::{Pool, Postgres};
use tracing::{error, info, warn, Level};
pub async fn start(db_pool: Pool<Postgres>) -> Result<(), Box<dyn Error>> {
let app = Router::new()
.nest("/blog", blog::get_router())
.with_state(db_pool);
let port: u32 = match env::var(var_name::PORT) {
Ok(value) => value.parse().unwrap_or_else(|e: ParseIntError| {
warn!(
"failed to parse `{}`, using default port: {}",
var_name::PORT,
e.to_string()
);
default_value::PORT
}),
Err(_) => default_value::PORT,
};
let listener =
match tokio::net::TcpListener::bind(format!("{}:{}", default_value::HOST, port)).await {
Ok(listener) => {
info!("server started on {}:{}", default_value::HOST, port);
listener
}
Err(e) => {
panic_with_log!(
Level::ERROR,
"failed to start server on {}:{}: {}",
default_value::HOST,
port,
e.to_string()
);
}
};
axum::serve(listener, app).await.unwrap_or_else(|e| {
error!("failed to start axum: {}", e.to_string());
exit(1);
});
Ok(())
}
+3 -10
View File
@@ -1,20 +1,13 @@
mod blog; mod blog;
mod init; mod init;
mod logger;
mod scheduler; mod scheduler;
mod server; mod utils;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
init::load_env(); init::load_env();
let _guards = init::logger_init();
// panic!("test"); let _guards = init::logger::init();
match server::start().await { init::start().await;
Ok(_) => {}
Err(e) => {
panic!("server start failed: {}", e);
}
};
} }
+4
View File
@@ -157,6 +157,10 @@ impl Scheduler {
Ok(id) Ok(id)
} }
pub fn insert_list(&self, tasks: Vec<Box<dyn Task>>) -> Result<Vec<Uuid>, SchedulerError> {
tasks.into_iter().map(|t| self.insert(t)).collect()
}
pub fn new() -> Self { pub fn new() -> Self {
Self::default() Self::default()
} }
-81
View File
@@ -1,81 +0,0 @@
use std::env;
use std::error::Error;
use std::num::ParseIntError;
use std::process::exit;
use std::str::FromStr;
use crate::blog;
use crate::scheduler::tasks::basic::BasicTask;
use crate::scheduler::Scheduler;
use axum::Router;
use sqlx::{
postgres::{PgConnectOptions, PgPoolOptions},
ConnectOptions,
};
use tracing::{error, info, warn};
pub async fn start() -> Result<(), Box<dyn Error>> {
let port: u32 = match env::var("BACKEND_PORT") {
Ok(value) => value.parse().unwrap_or_else(|e: ParseIntError| {
warn!("failed to parse BACKEND_PORT: {}", e.to_string());
3001
}),
Err(_) => 3001,
};
let db_connect_option = PgConnectOptions::from_str(&parse_db_uri())
.unwrap()
.disable_statement_logging();
let db_pool = match PgPoolOptions::new().connect_with(db_connect_option).await {
Ok(pool) => {
info!("database connected");
pool
}
Err(e) => {
error!("failed to load database: {}", e.to_string());
exit(1);
}
};
// cron task
let scheduler = Scheduler::new();
let test_str = "hello world".to_string();
// scheduler.insert(
// BasicTask::new(
// move || blog::cron::check_update::task(test_str.clone()),
// "* * * * * *",
// )?
// .to_task(),
// )?;
// http server
let app = Router::new()
.nest("blog", blog::get_router())
.with_state(db_pool);
let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:{}", port))
.await
.unwrap_or_else(|e| {
error!("failed to build TCP listener: {}", e.to_string());
exit(1);
});
axum::serve(listener, app).await.unwrap_or_else(|e| {
error!("failed to start axum: {}", e.to_string());
exit(1);
});
Ok(())
}
fn parse_db_uri() -> String {
let postgres_user = env::var("POSTGRES_USER").unwrap_or("".to_string());
let postgres_password = env::var("POSTGRES_PASSWORD").unwrap_or("".to_string());
let db_host = env::var("DB_HOST").unwrap_or("localhost".to_string());
let db_port = env::var("DB_PORT")
.unwrap_or("5432".to_string())
.to_string();
let postgres_db = env::var("POSTGRES_DB").unwrap_or("nocturne".to_string());
format!("postgresql://{postgres_user}:{postgres_password}@{db_host}:{db_port}/{postgres_db}")
}
+195
View File
@@ -0,0 +1,195 @@
/// git merge
/// based on https://github.com/rust-lang/git2-rs/blob/master/examples/pull.rs
/// https://github.com/rust-lang/git2-rs/commit/f3b87baed1e33d6c2d94fe1fa6aa6503a071d837
///
use git2::{
build, AnnotatedCommit, AutotagOption, Delta, FetchOptions, Reference, Remote, Repository,
};
use std::path::PathBuf;
use tracing::{error, warn};
#[derive(Debug, Eq, PartialEq)]
pub struct FileDelta {
pub old_path: Option<PathBuf>,
pub new_path: Option<PathBuf>,
pub status: Delta,
}
fn do_fetch<'a>(
repo: &'a Repository,
refs: &[&str],
remote: &'a mut Remote,
) -> Result<AnnotatedCommit<'a>, git2::Error> {
let mut fetch_option = FetchOptions::new();
// Always fetch all tags.
// Perform a download and also update tips
fetch_option.download_tags(AutotagOption::All);
remote.fetch(refs, Some(&mut fetch_option), None)?;
let fetch_head = repo.find_reference("FETCH_HEAD")?;
repo.reference_to_annotated_commit(&fetch_head)
}
fn fast_forward(
repo: &Repository,
lb: &mut Reference,
rc: &AnnotatedCommit,
) -> Result<(), git2::Error> {
let name = match lb.name() {
Some(s) => s.to_string(),
None => String::from_utf8_lossy(lb.name_bytes()).to_string(),
};
let msg = format!("fast-forward({}) -> {}", name, rc.id());
// println!("{}", msg);
lb.set_target(rc.id(), &msg)?;
repo.set_head(&name)?;
repo.checkout_head(Some(
build::CheckoutBuilder::default()
// For some reason, the force is required to make the working directory actually get updated
// I suspect we should be adding some logic to handle dirty working directory states,
// but this is just an example so maybe not.
.force(),
))?;
Ok(())
}
fn normal_merge(
repo: &Repository,
local: &AnnotatedCommit,
remote: &AnnotatedCommit,
) -> Result<(), git2::Error> {
let local_tree = repo.find_commit(local.id())?.tree()?;
let remote_tree = repo.find_commit(remote.id())?.tree()?;
let ancestor = repo
.find_commit(repo.merge_base(local.id(), remote.id())?)?
.tree()?;
let mut idx = repo.merge_trees(&ancestor, &local_tree, &remote_tree, None)?;
if idx.has_conflicts() {
warn!("merge conflicts detected");
repo.checkout_index(Some(&mut idx), None)?;
return Ok(());
}
let result_tree = repo.find_tree(idx.write_tree_to(repo)?)?;
// now create the merge commit
let msg = format!("merge({}) -> {}", remote.id(), local.id());
let sig = repo.signature()?;
let local_commit = repo.find_commit(local.id())?;
let remote_commit = repo.find_commit(remote.id())?;
// Do our merge commit and set the current branch head to that commit.
let _merge_commit = repo.commit(
Some("HEAD"),
&sig,
&sig,
&msg,
&result_tree,
&[&local_commit, &remote_commit],
)?;
// Set working tree to match head.
repo.checkout_head(None)?;
Ok(())
}
fn do_merge<'a>(
repo: &'a Repository,
remote_branch: &str,
fetch_commit: AnnotatedCommit<'a>,
) -> Result<Vec<FileDelta>, git2::Error> {
// 1. do a merge analysis
let analysis = repo.merge_analysis(&[&fetch_commit])?;
let head_commit = repo.reference_to_annotated_commit(&repo.head()?)?;
// 2. Do the appropriate merge
if analysis.0.is_fast_forward() {
// println!("Doing a fast-forward");
// do a fast-forward
let ref_name = format!("refs/heads/{}", remote_branch);
match repo.find_reference(&ref_name) {
Ok(mut r) => {
fast_forward(repo, &mut r, &fetch_commit)?;
}
Err(_) => {
// The branch doesn't exist, so set the reference to the
// commit directly. Usually this is because you are pulling
// into an empty repository.
repo.reference(
&ref_name,
fetch_commit.id(),
true,
&format!("({}) -> {}", remote_branch, fetch_commit.id()),
)?;
repo.set_head(&ref_name)?;
repo.checkout_head(Some(
build::CheckoutBuilder::default()
.allow_conflicts(true)
.conflict_style_merge(true)
.force(),
))?;
}
};
} else if analysis.0.is_normal() {
// do a normal merge
normal_merge(repo, &head_commit, &fetch_commit)?;
}
// else {
// // already up-to-date
// println!("Nothing to do...");
// }
calculate_diff(repo, &head_commit, &fetch_commit)
}
fn calculate_diff(
repo: &Repository,
local: &AnnotatedCommit,
remote: &AnnotatedCommit,
) -> Result<Vec<FileDelta>, git2::Error> {
let local_tree = repo.find_commit(local.id())?.tree()?;
let remote_tree = repo.find_commit(remote.id())?.tree()?;
let diff = repo.diff_tree_to_tree(Some(&local_tree), Some(&remote_tree), None)?;
let mut updated_files: Vec<FileDelta> = Vec::new();
if let Err(e) = diff.foreach(
&mut |d, _| {
// let delta = d.status();
//
// let n_path = d.new_file().path();
// let o_path = d.old_file().path();
//
// if let Some(path) = n_path {
// updated_files.insert(path.to_owned());
// }
// if let Some(path) = o_path {
// updated_files.insert(path.to_owned());
// }
updated_files.push(FileDelta {
old_path: d.old_file().path().map(PathBuf::from),
new_path: d.new_file().path().map(PathBuf::from),
status: d.status(),
});
true // Continue
},
None,
None,
None,
) {
error!("error at calculating diff: {:?}", e);
}
Ok(updated_files.into_iter().collect())
}
pub fn sync(
remote_name: &str,
remote_branch: &str,
repo: &Repository,
) -> Result<Vec<FileDelta>, git2::Error> {
let mut remote = repo.find_remote(remote_name)?;
let fetch_commit = do_fetch(repo, &[remote_branch], &mut remote)?;
do_merge(repo, remote_branch, fetch_commit)
}
+1
View File
@@ -0,0 +1 @@
pub mod git;
+48
View File
@@ -0,0 +1,48 @@
// Database related
pub mod database {
pub mod var_name {
pub const URI: &str = "DATABASE_URL";
pub const USERNAME: &str = "POSTGRES_USER";
pub const PASSWORD: &str = "POSTGRES_PASSWORD";
pub const HOST: &str = "POSTGRES_HOST";
pub const PORT: &str = "POSTGRES_PORT";
pub const DBNAME: &str = "POSTGRES_DB";
}
pub mod default_value {
pub const USERNAME: &str = "";
pub const PASSWORD: &str = "";
pub const HOST: &str = "localhost";
pub const PORT: &str = "5432";
pub const DBNAME: &str = "nocturne";
pub const DATABASE_TYPE: &str = "postgresql";
}
}
pub mod server {
pub mod var_name {
pub const PORT: &str = "BACKEND_PORT";
pub const HOST: &str = "BACKEND_HOST";
}
pub mod default_value {
pub const PORT: u32 = 3001;
pub const HOST: &str = "0.0.0.0";
}
}
pub mod general {
pub mod var_name {
pub const LOG_DIR: &str = "LOG_DIR";
pub const WORK_DIR: &str = "WORK_DIR";
pub const BLOG_GIT_URL: &str = "BLOG_GIT_URL";
pub const BLOG_GIT_REMOTE_BRANCH: &str = "BLOG_GIT_REMOTE_BRANCH";
pub const BLOG_GIT_REMOTE_NAME: &str = "BLOG_GIT_REMOTE_NAME";
}
pub mod default_value {
pub const WORK_DIR: &str = "~/.nocturne";
pub const BLOG_GIT_REMOTE_BRANCH: &str = "master";
pub const BLOG_GIT_REMOTE_NAME: &str = "origin";
}
}
+1
View File
@@ -1,2 +1,3 @@
pub mod blog; pub mod blog;
pub mod config;
pub mod time; pub mod time;
+1
View File
@@ -1 +1,2 @@
pub const DEFAULT_TIME_FORMAT: &str = "%Y-%m-%dT%H:%M:%S%z"; pub const DEFAULT_TIME_FORMAT: &str = "%Y-%m-%dT%H:%M:%S%z";
pub const DEFAULT_DATE_FORMAT: &str = "%Y-%m-%d%zT%H%M%S";
+2
View File
@@ -4,3 +4,5 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
+1 -14
View File
@@ -1,14 +1 @@
pub fn add(left: u64, right: u64) -> u64 { mod log;
left + right
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn it_works() {
let result = add(2, 2);
assert_eq!(result, 4);
}
}
+45
View File
@@ -0,0 +1,45 @@
/// log the message at specific log level and exit(1)
///
/// # Example
/// ```rust
///
/// use macros::panic_with_log;
/// use tracing::Level;
///
/// panic_with_log!(Level::ERROR, "Test panicked: {}", 42);
/// ```
#[macro_export]
macro_rules! panic_with_log {
($level:expr, $msg:literal $(, $($arg:tt)*)?) => {{
use std::process;
use tracing::event;
event!($level, $msg $(, $($arg)*)?);
process::exit(1);
}};
}
#[cfg(test)]
mod tests {
#[test]
fn test_panic_with_log() {
use std::io;
use tracing::Level;
use tracing_subscriber::prelude::*;
use tracing_subscriber::{fmt, Registry};
let format = tracing_subscriber::fmt::format()
.with_level(true)
.with_target(true)
.with_source_location(true);
let subscriber = Registry::default().with(
fmt::Layer::default()
.with_writer(io::stderr)
.event_format(format),
);
tracing::subscriber::set_global_default(subscriber).unwrap();
panic_with_log!(Level::ERROR, "Test panicked: {}", 42);
}
}
+1 -1
View File
@@ -5,10 +5,10 @@ edition = "2021"
[dependencies] [dependencies]
uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] } uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }
chrono = { version = "0.4.38", features = ["serde", "alloc"] }
serde = { version = "1.0.209", features = ["derive"] } serde = { version = "1.0.209", features = ["derive"] }
serde_json = "1.0.128" serde_json = "1.0.128"
regex = "1.10.4" regex = "1.10.4"
yaml-rust2 = "0.9.0" yaml-rust2 = "0.9.0"
sha2 = "0.10.8" sha2 = "0.10.8"
base64 = "0.22.1" base64 = "0.22.1"
thiserror = "2.0.3"
+16
View File
@@ -0,0 +1,16 @@
use thiserror::Error;
#[derive(Error, Debug)]
pub enum Error {
#[error("missing front-matter field: id")]
MissingID,
#[error("invalid file id: {}", msg)]
InvalidID { msg: String },
#[error("invalid front-matter: {}", msg)]
InvalidFrontMatter { msg: String },
#[error("fs error: {}", msg)]
FSError { msg: String },
}
+26 -13
View File
@@ -1,35 +1,48 @@
mod error;
mod utils; mod utils;
use std::error::Error;
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
use std::str::FromStr; use std::str::FromStr;
use crate::error::Error;
use crate::utils::front_matter::{parse_front_matter, split_md_front_matter};
use base64::{engine::general_purpose, Engine}; use base64::{engine::general_purpose, Engine};
use serde::Serialize; use serde::Serialize;
use serde_json::Value; use serde_json::Value;
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use uuid::Uuid; use uuid::Uuid;
use crate::utils::front_matter::{parse_front_matter, split_md_front_matter};
#[derive(Default, Debug, Serialize)] #[derive(Default, Debug, Serialize)]
pub struct MdFile { pub struct MdFile {
file_id: Uuid, pub file_id: Uuid,
file_name: String, pub filename: String,
meta: Value, pub meta: Value,
content: String, pub content: String,
hash: String, pub hash: String,
} }
impl MdFile { impl MdFile {
pub async fn from_file(file_path: &str) -> Result<MdFile, Box<dyn Error>> { pub fn from_file(file_path: &Path) -> Result<MdFile, Error> {
let raw_file = fs::read_to_string(file_path)?; let raw_file = match fs::read_to_string(file_path) {
Ok(file) => file,
Err(e) => return Err(Error::FSError { msg: e.to_string() }),
};
let raw_file_bytes = raw_file.as_bytes().to_vec(); let raw_file_bytes = raw_file.as_bytes().to_vec();
let (front_matter_str, content) = split_md_front_matter(raw_file); let (front_matter_str, content) = split_md_front_matter(raw_file);
let front_matter = parse_front_matter(&front_matter_str)?; let front_matter = match parse_front_matter(&front_matter_str) {
Ok(front_matter) => front_matter,
Err(e) => return Err(Error::InvalidFrontMatter { msg: e.to_string() }),
};
let hash = calculate_hash_base64(&raw_file_bytes); let hash = calculate_hash_base64(&raw_file_bytes);
let file_id = Uuid::from_str(front_matter["id"].to_string().as_str())?; let file_id = match front_matter["id"].as_str() {
Some(id) => match Uuid::from_str(id) {
Ok(id) => id,
Err(e) => return Err(Error::InvalidID { msg: e.to_string() }),
},
None => return Err(Error::MissingID),
};
let file_name = Path::new(file_path) let file_name = Path::new(file_path)
.file_name() .file_name()
.unwrap() .unwrap()
@@ -39,7 +52,7 @@ impl MdFile {
Ok(MdFile { Ok(MdFile {
file_id, file_id,
file_name, filename: file_name,
meta: front_matter, meta: front_matter,
content, content,
hash, hash,
+6 -2
View File
@@ -16,8 +16,12 @@ pub fn split_md_front_matter(raw_file: String) -> (String, String) {
} }
pub fn parse_front_matter(front_matter: &str) -> Result<Value, Box<dyn Error>> { pub fn parse_front_matter(front_matter: &str) -> Result<Value, Box<dyn Error>> {
let parsed_f_matter = YamlLoader::load_from_str(front_matter)?[0].clone(); let parsed_f_matter = YamlLoader::load_from_str(front_matter)?;
Ok(Value::from(yaml_to_serde(&parsed_f_matter))) if parsed_f_matter.is_empty() {
Ok(Value::String(String::new()))
} else {
Ok(yaml_to_serde(&parsed_f_matter[0]))
}
} }
#[cfg(test)] #[cfg(test)]
+10
View File
@@ -0,0 +1,10 @@
FROM rust:latest AS builder
WORKDIR /app
COPY . .
RUN ["cargo", "build", "-r"]
FROM gcr.io/distroless/cc AS production
ARG ARCH
COPY --from=builder /app/target/release/api_server ./api_server
COPY --from=builder /usr/lib/${ARCH}-linux-gnu/libz.so.1 /usr/lib/${ARCH}-linux-gnu/
ENTRYPOINT ["./api_server"]
+15
View File
@@ -0,0 +1,15 @@
FROM node:22 AS builder
WORKDIR /app
ENV NEXT_TELEMETRY_DISABLED=1
COPY package*.json ./
RUN npm install
COPY . .
RUN npm run build
FROM gcr.io/distroless/nodejs22 AS production
ENV NEXT_TELEMETRY_DISABLED=1
COPY --from=builder /app/next.config.mjs ./
COPY --from=builder /app/.next/standalone ./
COPY --from=builder /app/.next/static ./.next/static
ENV HOSTNAME="0.0.0.0"
CMD ["./server.js"]
+7 -7
View File
@@ -1,11 +1,11 @@
services: services:
frontend: frontend:
build: build:
context: ./frontend context: ./frontend
dockerfile: ../container/dev/frontend.containerfile dockerfile: ../container/dev/frontend.containerfile
restart: always restart: always
ports: ports:
- 3000:3000 - "3000:3000"
volumes: volumes:
- ./frontend:/app - ./frontend:/app
- /app/node_modules - /app/node_modules
@@ -14,15 +14,15 @@ services:
- ./container/dev/.env - ./container/dev/.env
dns: dns:
- 1.1.1.1 - 1.1.1.1
backend: backend:
build: build:
context: ./backend context: ./backend
dockerfile: ../container/dev/backend.containerfile dockerfile: ../container/dev/backend.containerfile
restart: always restart: always
ports: ports:
- 3001:3001 - "3001:3001"
volumes: volumes:
- ./blog_posts_git:/app/blog_posts_git:ro - ./blog_posts_git:/app/blog_posts_git:ro
env_file: env_file:
+2 -2
View File
@@ -1,7 +1,7 @@
/node_modules /node_modules
/.next/ /.next
/out/ /out
/build /build
.DS_Store .DS_Store
+3 -3
View File
@@ -18,7 +18,7 @@ function BlogPostCard({ post }: Props) {
// let last_update = new Date((post as any)['last_update']); // let last_update = new Date((post as any)['last_update']);
let first_update = new Date((post as any)['first_update']); let first_update = new Date((post as any)['first_update']);
let post_id = (post as any)['post_id']; let post_id = (post as any)['post_id'];
let header_img = (post as any)['header_img']; let header_img = ((post as any)['header_img'] as string | null);
return ( return (
@@ -29,7 +29,7 @@ function BlogPostCard({ post }: Props) {
isHoverable isHoverable
> >
{ header_img !== '' && <div className={ `w-full overflow h-80 relative` }> { header_img && <div className={ `w-full overflow h-80 relative` }>
<Image <Image
alt={ 'cover picture' } alt={ 'cover picture' }
src={ header_img } src={ header_img }
@@ -48,7 +48,7 @@ function BlogPostCard({ post }: Props) {
<CardBody className={ `overflow-visible` }> <CardBody className={ `overflow-visible` }>
<div className={ `flex flex-row justify-between` }> <div className={ `flex flex-row justify-between` }>
<div className={ `mx-2 ${ header_img !== '' ? '-mt-6' : 'mt-2' }` }> <div className={ `mx-2 ${ header_img ? '-mt-6' : 'mt-2' }` }>
<Chip className={ `mb-2 z-30 text-lg` } radius={ `sm` } size={ 'lg' } color={ `secondary` } <Chip className={ `mb-2 z-30 text-lg` } radius={ `sm` } size={ 'lg' } color={ `secondary` }
variant={ `solid` }>{ category }</Chip> variant={ `solid` }>{ category }</Chip>
<p className={ `text-4xl font-bold` }> { title }</p> <p className={ `text-4xl font-bold` }> { title }</p>
+2 -2
View File
@@ -8,8 +8,8 @@ import { Card, CardBody } from '@nextui-org/card';
const PostList = async ({ page }: { page: number }) => { const PostList = async ({ page }: { page: number }) => {
try { try {
const res = await fetchNocturneApi(`/get_post_list?page=${ page }`); const res = await fetchNocturneApi(`/blog/get_post_list?page=${ page }`);
let posts = (await res.json() as any)['posts']; const posts = await res.json();
return ( return (
// blog list // blog list
<div className={ 'w-full' }> <div className={ 'w-full' }>
+6 -6
View File
@@ -2,15 +2,15 @@ import PostList from '@/app/blog/PostList';
import Pagination from '@/app/blog/Pagination'; import Pagination from '@/app/blog/Pagination';
import { fetchNocturneApi } from '@/app/blog/api'; import { fetchNocturneApi } from '@/app/blog/api';
async function Blog({ searchParams }: { async function Blog({
searchParams?: { searchParams
page?: number }: {
}; searchParams: Promise<{ [key: string]: string | string[] | undefined }>
}) { }) {
const parsePage = Number(searchParams?.page); const parsePage = Number((await searchParams)?.page);
const currPage = parsePage > 0 ? parsePage : 1; const currPage = parsePage > 0 ? parsePage : 1;
const ret = await fetchNocturneApi(`/get_page_count`); const ret = await fetchNocturneApi(`/blog/get_page_count`);
const pageCount = (await ret.json() as any)['res'] as number; const pageCount = (await ret.json() as any)['res'] as number;
return ( return (
+11 -9
View File
@@ -17,7 +17,7 @@ const Footer = (props: Props) => {
const author = post['meta']['author'] ?? 'Tao'; const author = post['meta']['author'] ?? 'Tao';
const author_link = post['meta']['author_link'] ?? '/about'; const author_link = post['meta']['author_link'] ?? '/about';
const post_date = new Date(post['first_update']); const post_date = new Date(post['first_update']);
const update_date = new Date(post['last_update']); const update_date: Date | undefined = post['last_update'] ? new Date(post['last_update']) : undefined;
const cc = post['meta']['cc'] ?? 'by-nc-sa'; const cc = post['meta']['cc'] ?? 'by-nc-sa';
@@ -55,14 +55,16 @@ const Footer = (props: Props) => {
year: `numeric` year: `numeric`
}) }</p> }) }</p>
</div> </div>
<div> { update_date &&
<p className={ 'text-lg font-bold' }>Updated on</p> <div>
<p>{ update_date.toLocaleString('default', { <p className={ 'text-lg font-bold' }>Updated on</p>
month: `long`, <p>{ update_date.toLocaleString('default', {
day: `numeric`, month: `long`,
year: `numeric` day: `numeric`,
}) }</p> year: `numeric`
</div> }) }</p>
</div>
}
<div> <div>
<p className={ 'text-lg font-bold' }>Published under</p> <p className={ 'text-lg font-bold' }>Published under</p>
<Link href={ `https://creativecommons.org/licenses/${ cc }/4.0/` }> <Link href={ `https://creativecommons.org/licenses/${ cc }/4.0/` }>
+4 -4
View File
@@ -18,11 +18,11 @@ const Headers = (props: Props) => {
// let last_update = new Date((post as any)['last_update']); // let last_update = new Date((post as any)['last_update']);
let first_update = new Date(post['first_update']); let first_update = new Date(post['first_update']);
// let post_id = (post as any)['post_id']; // let post_id = (post as any)['post_id'];
let header_img = post['header_img']; let header_img = post['meta']['header_img'] as string | null;
return ( return (
<> <>
{ header_img !== '' && <div className={ `w-full overflow h-96 relative` }> { header_img && <div className={ `w-full overflow h-96 relative` }>
<Image <Image
alt={ 'cover picture' } alt={ 'cover picture' }
src={ header_img } src={ header_img }
@@ -38,11 +38,11 @@ const Headers = (props: Props) => {
</div> } </div> }
<div <div
className={ header_img !== '' ? className={ header_img ?
'mx-8 -mt-16 backdrop-blur transition bg-zinc-300/80 dark:bg-gray-600/25 rounded-2xl z-30' 'mx-8 -mt-16 backdrop-blur transition bg-zinc-300/80 dark:bg-gray-600/25 rounded-2xl z-30'
: 'mx-6 mt-6' : 'mx-6 mt-6'
}> }>
<div className={ header_img !== '' ? `p-4` : 'p-4 pt-2' }> <div className={ header_img ? `p-4` : 'p-4 pt-2' }>
<Chip className={ `mb-2` } radius={ `sm` } color={ `secondary` } <Chip className={ `mb-2` } radius={ `sm` } color={ `secondary` }
variant={ `solid` }>{ category }</Chip> variant={ `solid` }>{ category }</Chip>
<p className={ `text-4xl font-bold` }> { title }</p> <p className={ `text-4xl font-bold` }> { title }</p>
+1 -1
View File
@@ -13,7 +13,7 @@ async function PostCard(props: Props) {
try { try {
const res = await fetchNocturneApi(`/get_post/${ props.id }`); const res = await fetchNocturneApi(`/blog/get_post/${ props.id }`);
const ret: any = await res.json(); const ret: any = await res.json();
return ( return (
<div> <div>
+6 -2
View File
@@ -3,7 +3,11 @@ import PostCard from '@/app/blog/post/[id]/PostCard';
import { MotionDiv } from '@/app/public/MotionDiv'; import { MotionDiv } from '@/app/public/MotionDiv';
import ButtonGoBack from '@/app/blog/post/[id]/ButtonGoBack'; import ButtonGoBack from '@/app/blog/post/[id]/ButtonGoBack';
function BlogReader({ params }: { params: { id: string } }) { async function BlogReader({
params
}: {
params: Promise<{ id: string }>
}) {
return ( return (
<MotionDiv <MotionDiv
@@ -13,7 +17,7 @@ function BlogReader({ params }: { params: { id: string } }) {
transition={ { ease: 'easeInOut', duration: 0.5 } } transition={ { ease: 'easeInOut', duration: 0.5 } }
> >
<div className={ `max-w-full` }> <div className={ `max-w-full` }>
<PostCard id={ params.id } /> <PostCard id={ (await params).id } />
</div> </div>
<div className={ 'mt-3' }> <div className={ 'mt-3' }>
<ButtonGoBack /> <ButtonGoBack />
+14 -13
View File
@@ -3,7 +3,16 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Button } from '@nextui-org/react'; import { Button } from '@nextui-org/react';
import Image from 'next/image'; import Image from 'next/image';
import { IoHome, IoInformationCircle, IoLink, IoLogoGithub, IoMail, IoPencil, IoSearch } from 'react-icons/io5'; import {
IoFlask,
IoHome,
IoInformationCircle,
IoLink,
IoLogoGithub,
IoMail,
IoPencil,
IoSearch
} from 'react-icons/io5';
import Link from 'next/link'; import Link from 'next/link';
import ThemeSwitcher from '@/components/ThemeSwitcher'; import ThemeSwitcher from '@/components/ThemeSwitcher';
import { usePathname } from 'next/navigation'; import { usePathname } from 'next/navigation';
@@ -34,6 +43,10 @@ const entries: { display_name: string; href: string; icon: React.ReactNode }[] =
icon: <IoSearch size={ `20px` }></IoSearch>, icon: <IoSearch size={ `20px` }></IoSearch>,
display_name: 'Search', display_name: 'Search',
href: '/search' href: '/search'
}, {
icon: <IoFlask size={ '20px' } />,
display_name: 'Lab',
href: 'https://lab.lmt.moe'
} }
]; ];
@@ -51,18 +64,6 @@ const connections: { label: string, href: string, icon: React.ReactNode }[] = [
]; ];
function Navbar() { function Navbar() {
// const [ scrolled, setScrolled ] = useState(false);
// useEffect(() => {
// const handleScroll = () => {
// const isScrolled = window.scrollY > 0;
// setScrolled(isScrolled);
// };
// window.addEventListener('scroll', handleScroll);
// return () => {
// window.removeEventListener('scroll', handleScroll);
// };
// }, []);
const path = usePathname(); const path = usePathname();
const [ shownPath, setShownPath ] = useState(path); const [ shownPath, setShownPath ] = useState(path);
+2 -2
View File
@@ -49,9 +49,9 @@ function ThemeSwitcher() {
fullWidth fullWidth
isIconOnly={ isMobile } isIconOnly={ isMobile }
> >
{ switcherElements.get(currTheme.values().next().value)?.icon } { switcherElements.get(currTheme.values().next().value as string)?.icon }
<p className={ 'hidden lg:block' }> <p className={ 'hidden lg:block' }>
{ switcherElements.get(currTheme.values().next().value)?.display_name } { switcherElements.get(currTheme.values().next().value as string)?.display_name }
</p> </p>
</Button> </Button>
</DropdownTrigger> </DropdownTrigger>
+2 -2
View File
@@ -11,8 +11,8 @@ const nextConfig = {
hostname: 'pic.re' hostname: 'pic.re'
} }
] ]
} },
// output: 'standalone' output: 'standalone'
}; };
export default nextConfig; export default nextConfig;
+1 -1
View File
@@ -13,7 +13,7 @@
"@types/react-syntax-highlighter": "^15.5.13", "@types/react-syntax-highlighter": "^15.5.13",
"framer-motion": "^11.3.24", "framer-motion": "^11.3.24",
"lxgw-wenkai-webfont": "^1.7.0", "lxgw-wenkai-webfont": "^1.7.0",
"next": "14.2.3", "next": "^15.0.3",
"next-themes": "^0.3.0", "next-themes": "^0.3.0",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
+38
View File
@@ -0,0 +1,38 @@
services:
frontend:
depends_on:
- backend
build:
context: ./frontend
dockerfile: ../container/release/frontend.containerfile
restart: always
ports:
- "3000:3000"
env_file:
- ./.env
backend:
depends_on:
- postgres
build:
context: ./backend
dockerfile: ../container/release/backend.containerfile
args:
ARCH: ${ARCH}
restart: always
ports:
- "3001:3001"
env_file:
- ./.env
- ./.env.local
dns:
- 1.1.1.1
postgres:
image: postgres:16.3
ports:
- "5432:5432"
env_file:
- ./.env
- ./.env.local