diff --git a/Cargo.lock b/Cargo.lock index 4cc545a..7ab3fce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1288,6 +1288,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + [[package]] name = "getrandom" version = "0.2.15" @@ -2455,6 +2464,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "pulldown-cmark" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" +dependencies = [ + "bitflags 2.9.0", + "getopts", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + [[package]] name = "qoi" version = "0.4.1" @@ -2752,6 +2780,41 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rust-embed" +version = "8.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5fbc0ee50fcb99af7cebb442e5df7b5b45e9460ffa3f8f549cd26b862bec49d" +dependencies = [ + "axum", + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf418c9a2e3f6663ca38b8a7134cc2c2167c9d69688860e8961e3faa731702e" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.100", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d55b95147fe01265d06b3955db798bdaed52e60e2211c41137701b3aba8e21" +dependencies = [ + "sha2", + "walkdir", +] + [[package]] name = "rust_decimal" version = "1.37.1" @@ -2858,6 +2921,15 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "samey" version = "0.1.0" @@ -2873,8 +2945,11 @@ dependencies = [ "image", "itertools 0.14.0", "migration", + "mime_guess", "password-auth", + "pulldown-cmark", "rand 0.9.0", + "rust-embed", "sea-orm", "serde", "serde_json", @@ -3993,6 +4068,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + [[package]] name = "untrusted" version = "0.9.0" @@ -4078,6 +4159,16 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4205,6 +4296,15 @@ dependencies = [ "wasite", ] +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "windows-core" version = "0.61.0" diff --git a/Cargo.toml b/Cargo.toml index 069801b..3694c23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,11 @@ futures-util = "0.3.31" image = "0.25.6" itertools = "0.14.0" migration = { path = "migration" } +mime_guess = "2.0.5" password-auth = "1.0.0" +pulldown-cmark = "0.13.0" rand = "0.9.0" +rust-embed = { version = "8.7.0", features = ["axum", "debug-embed"] } sea-orm = { version = "1.1.8", features = [ "sqlx-sqlite", "runtime-tokio-rustls", diff --git a/README.md b/README.md index 38245b1..c028cf9 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,17 @@ Sam's small image board. Currently a WIP. ## TODO -- [ ] Cleanup/fixup background tasks -- [ ] User management +- [ ] Rename pool - [ ] CSS -- [ ] Cleanup, CLI, env vars, logging, better errors... +- [ ] Logging, better errors... + +### Post-0.1.0 roadmap + +- [ ] Bulk edit tags/Fix tag capitalization +- [ ] User management +- [ ] Text media +- [ ] Cleanup/fixup background tasks +- [ ] Migrate to Cot...? ## Running in development diff --git a/bacon.toml b/bacon.toml index f13b8df..bea3efb 100644 --- a/bacon.toml +++ b/bacon.toml @@ -3,4 +3,4 @@ command = ["cargo", "run"] background = false need_stdout = true on_change_strategy = "kill_then_restart" -watch = ["templates"] +watch = ["templates", "static"] diff --git a/src/lib.rs b/src/lib.rs index 77e65bf..39c8e1d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,13 +7,19 @@ pub(crate) mod rating; pub(crate) mod video; pub(crate) mod views; -use std::sync::Arc; +use std::{ + path::{Path, PathBuf}, + sync::Arc, +}; use axum::{ Router, extract::DefaultBodyLimit, + http::{StatusCode, header::CONTENT_TYPE}, + response::IntoResponse, routing::{delete, get, post, put}, }; +use axum_extra::routing::RouterExt; use axum_login::AuthManagerLayerBuilder; use entities::{prelude::SameyConfig, samey_config}; use password_auth::generate_hash; @@ -26,19 +32,34 @@ use crate::auth::{Backend, SessionStorage}; use crate::config::APPLICATION_NAME_KEY; use crate::entities::{prelude::SameyUser, samey_user}; pub use crate::error::SameyError; -use crate::views::{ - add_post_source, add_post_to_pool, change_pool_visibility, create_pool, delete_post, - edit_post_details, get_full_media, get_media, get_pools, get_pools_page, index, login, logout, - post_details, posts, posts_page, remove_field, remove_pool_post, search_tags, select_tag, - settings, sort_pool, submit_post_details, update_settings, upload, view_pool, view_post, -}; +use crate::views::*; pub(crate) const NEGATIVE_PREFIX: &str = "-"; pub(crate) const RATING_PREFIX: &str = "rating:"; +#[derive(rust_embed::Embed)] +#[folder = "static/"] +struct Asset; + +fn assets_router() -> Router { + Router::new().route( + "/{*file}", + get(|uri: axum::http::Uri| async move { + let path = uri.path().trim_start_matches('/'); + match Asset::get(path) { + Some(content) => { + let mime = mime_guess::MimeGuess::from_path(path).first_or_octet_stream(); + ([(CONTENT_TYPE, mime.as_ref())], content.data).into_response() + } + None => StatusCode::NOT_FOUND.into_response(), + } + }), + ) +} + #[derive(Clone)] pub(crate) struct AppState { - files_dir: Arc, + files_dir: Arc, db: DatabaseConnection, application_name: Arc>, } @@ -60,7 +81,10 @@ pub async fn create_user( Ok(()) } -pub async fn get_router(db: DatabaseConnection, files_dir: &str) -> Result { +pub async fn get_router( + db: DatabaseConnection, + files_dir: impl AsRef, +) -> Result { let application_name = match SameyConfig::find() .filter(samey_config::Column::Key.eq(APPLICATION_NAME_KEY)) .one(&db) @@ -70,11 +94,11 @@ pub async fn get_router(db: DatabaseConnection, files_dir: &str) -> Result "Samey".to_owned(), }; let state = AppState { - files_dir: Arc::new(files_dir.into()), + files_dir: Arc::new(files_dir.as_ref().to_owned()), db: db.clone(), application_name: Arc::new(RwLock::new(application_name)), }; - fs::create_dir_all(files_dir).await?; + fs::create_dir_all(files_dir.as_ref()).await?; let session_store = SessionStorage::new(db.clone()); let session_layer = SessionManagerLayer::new(session_store); @@ -82,43 +106,47 @@ pub async fn get_router(db: DatabaseConnection, files_dir: &str) -> Result { - create_user(db, username, password, false) - .await - .expect("Unable to add user"); - } Some(Commands::AddAdminUser { username, password }) => { create_user(db, username, password, true) .await - .expect("Unable to add admin"); + .expect("Unable to add admin user"); } Some(Commands::Run) | None => { Migrator::up(&db, None) diff --git a/src/query.rs b/src/query.rs index 6d6d9fc..4784203 100644 --- a/src/query.rs +++ b/src/query.rs @@ -19,7 +19,7 @@ use crate::{ pub(crate) struct PostOverview { pub(crate) id: i32, pub(crate) thumbnail: String, - pub(crate) tags: String, + pub(crate) tags: Option, pub(crate) media_type: String, pub(crate) rating: String, } @@ -60,9 +60,9 @@ pub(crate) fn search_posts( Expr::cust("GROUP_CONCAT(\"samey_tag\".\"name\", ' ')"), "tags", ) - .inner_join(SameyTagPost) + .left_join(SameyTagPost) .join( - sea_orm::JoinType::InnerJoin, + sea_orm::JoinType::LeftJoin, samey_tag_post::Relation::SameyTag.def(), ); if !include_ratings.is_empty() { @@ -83,9 +83,9 @@ pub(crate) fn search_posts( Expr::cust("GROUP_CONCAT(\"samey_tag\".\"name\", ' ')"), "tags", ) - .inner_join(SameyTagPost) + .left_join(SameyTagPost) .join( - sea_orm::JoinType::InnerJoin, + sea_orm::JoinType::LeftJoin, samey_tag_post::Relation::SameyTag.def(), ); if !include_tags.is_empty() { @@ -136,7 +136,7 @@ pub(crate) fn search_posts( query }; - filter_by_user(query, user) + filter_posts_by_user(query, user) .group_by(samey_post::Column::Id) .order_by_desc(samey_post::Column::Id) .into_model::() @@ -154,6 +154,7 @@ pub(crate) struct PoolPost { pub(crate) id: i32, pub(crate) thumbnail: String, pub(crate) rating: String, + pub(crate) media_type: String, pub(crate) pool_post_id: i32, pub(crate) position: f32, pub(crate) tags: String, @@ -163,11 +164,12 @@ pub(crate) fn get_posts_in_pool( pool_id: i32, user: Option<&User>, ) -> Selector> { - filter_by_user( + filter_posts_by_user( SameyPost::find() .column(samey_post::Column::Id) .column(samey_post::Column::Thumbnail) .column(samey_post::Column::Rating) + .column(samey_post::Column::MediaType) .column_as(samey_pool_post::Column::Id, "pool_post_id") .column(samey_pool_post::Column::Position) .column_as( @@ -188,7 +190,10 @@ pub(crate) fn get_posts_in_pool( .into_model::() } -pub(crate) fn filter_by_user(query: Select, user: Option<&User>) -> Select { +pub(crate) fn filter_posts_by_user( + query: Select, + user: Option<&User>, +) -> Select { match user { None => query.filter(samey_post::Column::IsPublic.into_simple_expr()), Some(user) if user.is_admin => query, diff --git a/src/views.rs b/src/views.rs index def1eb5..405140d 100644 --- a/src/views.rs +++ b/src/views.rs @@ -39,17 +39,32 @@ use crate::{ }, error::SameyError, query::{ - PoolPost, PostOverview, filter_by_user, get_posts_in_pool, get_tags_for_post, search_posts, + PoolPost, PostOverview, filter_posts_by_user, get_posts_in_pool, get_tags_for_post, + search_posts, }, video::{generate_thumbnail, get_dimensions_for_video}, }; const MAX_THUMBNAIL_DIMENSION: u32 = 192; +// Filters + +mod filters { + pub(crate) fn markdown( + s: impl std::fmt::Display, + ) -> askama::Result> { + let s = s.to_string(); + let parser = pulldown_cmark::Parser::new(&s); + let mut output = String::new(); + pulldown_cmark::html::push_html(&mut output, parser); + Ok(askama::filters::Safe(output)) + } +} + // Index view #[derive(Template)] -#[template(path = "index.html")] +#[template(path = "pages/index.html")] struct IndexTemplate { application_name: String, user: Option, @@ -73,6 +88,27 @@ pub(crate) async fn index( // Auth views +#[derive(Template)] +#[template(path = "pages/login.html")] +struct LoginPageTemplate { + application_name: String, +} + +pub(crate) async fn login_page( + State(AppState { + application_name, .. + }): State, + auth_session: AuthSession, +) -> Result { + if auth_session.user.is_some() { + return Ok(Redirect::to("/").into_response()); + } + + let application_name = application_name.read().await.clone(); + + Ok(Html(LoginPageTemplate { application_name }.render()?).into_response()) +} + pub(crate) async fn login( mut auth_session: AuthSession, Form(credentials): Form, @@ -98,7 +134,28 @@ pub(crate) async fn logout(mut auth_session: AuthSession) -> Result, + auth_session: AuthSession, +) -> Result { + if auth_session.user.is_none() { + return Err(SameyError::Forbidden); + } + + let application_name = application_name.read().await.clone(); + + Ok(Html(UploadPageTemplate { application_name }.render()?).into_response()) +} enum Format { Video(&'static str), @@ -151,34 +208,47 @@ pub(crate) async fn upload( let mut thumbnail_file: Option = None; let mut thumbnail_width: Option> = None; let mut thumbnail_height: Option> = None; - let base_path = std::path::Path::new(files_dir.as_ref()); + let base_path = files_dir.as_ref(); // Read multipart form data while let Some(mut field) = multipart.next_field().await.unwrap() { match field.name().unwrap() { "tags" => { if let Ok(tags) = field.text().await { - let tags: HashSet = tags.split_whitespace().map(String::from).collect(); + let tags: HashSet = tags + .split_whitespace() + .filter_map(|tag| { + if tag.starts_with(NEGATIVE_PREFIX) || tag.starts_with(RATING_PREFIX) { + None + } else { + Some(String::from(tag)) + } + }) + .collect(); let normalized_tags: HashSet = tags.iter().map(|tag| tag.to_lowercase()).collect(); - SameyTag::insert_many(tags.into_iter().map(|tag| samey_tag::ActiveModel { - normalized_name: Set(tag.to_lowercase()), - name: Set(tag), - ..Default::default() - })) - .on_conflict( - OnConflict::column(samey_tag::Column::NormalizedName) - .do_nothing() - .to_owned(), - ) - .exec_without_returning(&db) - .await?; - upload_tags = Some( - SameyTag::find() - .filter(samey_tag::Column::NormalizedName.is_in(normalized_tags)) - .all(&db) - .await?, - ); + if tags.is_empty() { + upload_tags = Some(vec![]); + } else { + SameyTag::insert_many(tags.into_iter().map(|tag| samey_tag::ActiveModel { + normalized_name: Set(tag.to_lowercase()), + name: Set(tag), + ..Default::default() + })) + .on_conflict( + OnConflict::column(samey_tag::Column::NormalizedName) + .do_nothing() + .to_owned(), + ) + .exec_without_returning(&db) + .await?; + upload_tags = Some( + SameyTag::find() + .filter(samey_tag::Column::NormalizedName.is_in(normalized_tags)) + .all(&db) + .await?, + ); + } } } @@ -337,17 +407,17 @@ pub(crate) async fn upload( .last_insert_id; // Add tags to post - SameyTagPost::insert_many( - upload_tags - .into_iter() - .map(|tag| samey_tag_post::ActiveModel { + if !upload_tags.is_empty() { + SameyTagPost::insert_many(upload_tags.into_iter().map(|tag| { + samey_tag_post::ActiveModel { post_id: Set(uploaded_post), tag_id: Set(tag.id), ..Default::default() - }), - ) - .exec(&db) - .await?; + } + })) + .exec(&db) + .await?; + } Ok(Redirect::to(&format!("/post/{}", uploaded_post))) } else { @@ -363,7 +433,7 @@ struct SearchTag { } #[derive(Template)] -#[template(path = "search_tags.html")] +#[template(path = "fragments/search_tags.html")] struct SearchTagsTemplate { tags: Vec, selection_end: usize, @@ -458,9 +528,9 @@ pub(crate) async fn search_tags( } #[derive(Template)] -#[template(path = "select_tag.html")] +#[template(path = "fragments/select_tag.html")] struct SelectTagTemplate { - tags: String, + tags_value: String, } #[derive(Debug, Deserialize)] @@ -475,29 +545,31 @@ pub(crate) async fn select_tag( ) -> Result { let mut tags = String::new(); for (tag, _) in body.tags[..body.selection_end].split(' ').tuple_windows() { - if !tags.is_empty() { - tags.push(' '); + if !tag.is_empty() { + if !tags.is_empty() { + tags.push(' '); + } + tags.push_str(tag); } - tags.push_str(tag); } if !tags.is_empty() { tags.push(' '); } tags.push_str(&body.new_tag); for tag in body.tags[body.selection_end..].split(' ') { - if !tags.is_empty() { + if !tag.is_empty() { tags.push(' '); + tags.push_str(tag); } - tags.push_str(tag); } tags.push(' '); - Ok(Html(SelectTagTemplate { tags }.render()?)) + Ok(Html(SelectTagTemplate { tags_value: tags }.render()?)) } // Post list views #[derive(Template)] -#[template(path = "posts.html")] +#[template(path = "pages/posts.html")] struct PostsTemplate<'a> { application_name: String, tags: Option>, @@ -541,12 +613,12 @@ pub(crate) async fn posts_page( let posts = posts .into_iter() .map(|post| { - let mut tags_vec: Vec<_> = post.tags.split_ascii_whitespace().collect(); - tags_vec.sort(); - PostOverview { - tags: tags_vec.into_iter().join(" "), - ..post - } + let tags: Option = post.tags.map(|tags| { + let mut tags_vec = tags.split_ascii_whitespace().collect::>(); + tags_vec.sort(); + tags_vec.into_iter().join(" ") + }); + PostOverview { tags, ..post } }) .collect(); @@ -565,6 +637,27 @@ pub(crate) async fn posts_page( // Pool views +#[derive(Template)] +#[template(path = "pages/create_pool.html")] +struct CreatePoolPageTemplate { + application_name: String, +} + +pub(crate) async fn create_pool_page( + State(AppState { + application_name, .. + }): State, + auth_session: AuthSession, +) -> Result { + if auth_session.user.is_none() { + return Err(SameyError::Forbidden); + } + + let application_name = application_name.read().await.clone(); + + Ok(Html(CreatePoolPageTemplate { application_name }.render()?).into_response()) +} + pub(crate) async fn get_pools( state: State, auth_session: AuthSession, @@ -573,7 +666,7 @@ pub(crate) async fn get_pools( } #[derive(Template)] -#[template(path = "pools.html")] +#[template(path = "pages/pools.html")] struct GetPoolsTemplate { application_name: String, pools: Vec, @@ -645,7 +738,7 @@ pub(crate) async fn create_pool( } #[derive(Template)] -#[template(path = "pool.html")] +#[template(path = "pages/pool.html")] struct ViewPoolTemplate { application_name: String, pool: samey_pool::Model, @@ -734,14 +827,14 @@ pub(crate) struct AddPostToPoolForm { } #[derive(Debug, FromQueryResult)] -pub(crate) struct PoolWithMaxPosition { +struct PoolWithMaxPosition { id: i32, uploader_id: i32, max_position: Option, } #[derive(Template)] -#[template(path = "add_post_to_pool.html")] +#[template(path = "fragments/add_post_to_pool.html")] struct AddPostToPoolTemplate { pool: PoolWithMaxPosition, posts: Vec, @@ -775,7 +868,7 @@ pub(crate) async fn add_post_to_pool( return Err(SameyError::Forbidden); } - let post = filter_by_user( + let post = filter_posts_by_user( SameyPost::find_by_id(body.post_id), auth_session.user.as_ref(), ) @@ -841,7 +934,7 @@ pub(crate) struct SortPoolForm { } #[derive(Template)] -#[template(path = "pool_posts.html")] +#[template(path = "fragments/pool_posts.html")] struct PoolPostsTemplate { pool: samey_pool::Model, posts: Vec, @@ -916,7 +1009,7 @@ pub(crate) async fn sort_pool( // Settings views #[derive(Template)] -#[template(path = "settings.html")] +#[template(path = "pages/settings.html")] struct SettingsTemplate { application_name: String, } @@ -997,32 +1090,34 @@ pub(crate) async fn update_settings( // Single post views #[derive(Template)] -#[template(path = "view_post.html")] -struct ViewPostTemplate { +#[template(path = "pages/view_post.html")] +struct ViewPostPageTemplate { application_name: String, post: samey_post::Model, tags: Vec, - tags_text: String, + tags_text: Option, + tags_post: String, sources: Vec, can_edit: bool, parent_post: Option, children_posts: Vec, } -pub(crate) async fn view_post( +pub(crate) async fn view_post_page( State(AppState { db, application_name, .. }): State, auth_session: AuthSession, + Query(query): Query, Path(post_id): Path, ) -> Result { let application_name = application_name.read().await.clone(); let post_id = post_id; let tags = get_tags_for_post(post_id).all(&db).await?; - let tags_text = tags.iter().map(|tag| &tag.name).join(" "); + let tags_post = tags.iter().map(|tag| &tag.name).join(" "); let sources = SameyPostSource::find() .filter(samey_post_source::Column::PostId.eq(post_id)) @@ -1035,19 +1130,21 @@ pub(crate) async fn view_post( .ok_or(SameyError::NotFound)?; let parent_post = if let Some(parent_id) = post.parent_id { - match filter_by_user(SameyPost::find_by_id(parent_id), auth_session.user.as_ref()) + match filter_posts_by_user(SameyPost::find_by_id(parent_id), auth_session.user.as_ref()) .one(&db) .await? { Some(parent_post) => Some(PostOverview { id: parent_id, thumbnail: parent_post.thumbnail, - tags: get_tags_for_post(post_id) - .all(&db) - .await? - .iter() - .map(|tag| &tag.name) - .join(" "), + tags: Some( + get_tags_for_post(post_id) + .all(&db) + .await? + .iter() + .map(|tag| &tag.name) + .join(" "), + ), rating: parent_post.rating, media_type: parent_post.media_type, }), @@ -1057,7 +1154,7 @@ pub(crate) async fn view_post( None }; - let children_posts_models = filter_by_user( + let children_posts_models = filter_posts_by_user( SameyPost::find().filter(samey_post::Column::ParentId.eq(post_id)), auth_session.user.as_ref(), ) @@ -1069,12 +1166,14 @@ pub(crate) async fn view_post( children_posts.push(PostOverview { id: child_post.id, thumbnail: child_post.thumbnail, - tags: get_tags_for_post(child_post.id) - .all(&db) - .await? - .iter() - .map(|tag| &tag.name) - .join(" "), + tags: Some( + get_tags_for_post(child_post.id) + .all(&db) + .await? + .iter() + .map(|tag| &tag.name) + .join(" "), + ), rating: child_post.rating, media_type: child_post.media_type, }); @@ -1090,11 +1189,12 @@ pub(crate) async fn view_post( } Ok(Html( - ViewPostTemplate { + ViewPostPageTemplate { application_name, post, tags, - tags_text, + tags_text: query.tags, + tags_post, sources, can_edit, parent_post, @@ -1105,7 +1205,7 @@ pub(crate) async fn view_post( } #[derive(Template)] -#[template(path = "post_details.html")] +#[template(path = "fragments/post_details.html")] struct PostDetailsTemplate { post: samey_post::Model, sources: Vec, @@ -1159,7 +1259,7 @@ pub(crate) struct SubmitPostDetailsForm { } #[derive(Template)] -#[template(path = "submit_post_details.html")] +#[template(path = "fragments/submit_post_details.html")] struct SubmitPostDetailsTemplate { post: samey_post::Model, parent_post: Option, @@ -1197,19 +1297,21 @@ pub(crate) async fn submit_post_details( description => Some(description.to_owned()), }; let parent_post = if let Some(parent_id) = body.parent_post.trim().parse().ok() { - match filter_by_user(SameyPost::find_by_id(parent_id), auth_session.user.as_ref()) + match filter_posts_by_user(SameyPost::find_by_id(parent_id), auth_session.user.as_ref()) .one(&db) .await? { Some(parent_post) => Some(PostOverview { id: parent_id, thumbnail: parent_post.thumbnail, - tags: get_tags_for_post(post_id) - .all(&db) - .await? - .iter() - .map(|tag| &tag.name) - .join(" "), + tags: Some( + get_tags_for_post(post_id) + .all(&db) + .await? + .iter() + .map(|tag| &tag.name) + .join(" "), + ), rating: parent_post.rating, media_type: parent_post.media_type, }), @@ -1259,31 +1361,36 @@ pub(crate) async fn submit_post_details( .filter(samey_tag_post::Column::PostId.eq(post_id)) .exec(&db) .await?; - // TODO: Improve this to not recreate existing tag-post entries (see above) - SameyTag::insert_many(tags.into_iter().map(|tag| samey_tag::ActiveModel { - normalized_name: Set(tag.to_lowercase()), - name: Set(tag), - ..Default::default() - })) - .on_conflict( - OnConflict::column(samey_tag::Column::NormalizedName) - .do_nothing() - .to_owned(), - ) - .exec_without_returning(&db) - .await?; - let mut upload_tags = SameyTag::find() - .filter(samey_tag::Column::NormalizedName.is_in(normalized_tags)) - .all(&db) + let tags = if tags.is_empty() { + vec![] + } else { + // TODO: Improve this to not recreate existing tag-post entries (see above) + SameyTag::insert_many(tags.into_iter().map(|tag| samey_tag::ActiveModel { + normalized_name: Set(tag.to_lowercase()), + name: Set(tag), + ..Default::default() + })) + .on_conflict( + OnConflict::column(samey_tag::Column::NormalizedName) + .do_nothing() + .to_owned(), + ) + .exec_without_returning(&db) .await?; - SameyTagPost::insert_many(upload_tags.iter().map(|tag| samey_tag_post::ActiveModel { - post_id: Set(post_id), - tag_id: Set(tag.id), - ..Default::default() - })) - .exec(&db) - .await?; - upload_tags.sort_by(|a, b| a.name.cmp(&b.name)); + let mut upload_tags = SameyTag::find() + .filter(samey_tag::Column::NormalizedName.is_in(normalized_tags)) + .all(&db) + .await?; + SameyTagPost::insert_many(upload_tags.iter().map(|tag| samey_tag_post::ActiveModel { + post_id: Set(post_id), + tag_id: Set(tag.id), + ..Default::default() + })) + .exec(&db) + .await?; + upload_tags.sort_by(|a, b| a.name.cmp(&b.name)); + upload_tags + }; let sources = SameyPostSource::find() .filter(samey_post_source::Column::PostId.eq(post_id)) @@ -1294,7 +1401,7 @@ pub(crate) async fn submit_post_details( SubmitPostDetailsTemplate { post, sources, - tags: upload_tags, + tags, parent_post, can_edit: true, } @@ -1307,7 +1414,7 @@ struct EditPostSource { } #[derive(Template)] -#[template(path = "edit_post_details.html")] +#[template(path = "fragments/edit_post_details.html")] struct EditDetailsTemplate { post: samey_post::Model, sources: Vec, @@ -1362,7 +1469,7 @@ pub(crate) async fn edit_post_details( } #[derive(Template)] -#[template(path = "post_source.html")] +#[template(path = "fragments/post_source.html")] struct AddPostSourceTemplate { source: EditPostSource, } @@ -1381,7 +1488,7 @@ pub(crate) async fn remove_field() -> impl IntoResponse { } #[derive(Template)] -#[template(path = "get_image_media.html")] +#[template(path = "fragments/get_image_media.html")] struct GetMediaTemplate { post: samey_post::Model, } @@ -1409,7 +1516,7 @@ pub(crate) async fn get_media( } #[derive(Template)] -#[template(path = "get_full_image_media.html")] +#[template(path = "fragments/get_full_image_media.html")] struct GetFullMediaTemplate { post: samey_post::Model, } @@ -1458,7 +1565,7 @@ pub(crate) async fn delete_post( SameyPost::delete_by_id(post.id).exec(&db).await?; tokio::spawn(async move { - let base_path = std::path::Path::new(files_dir.as_ref()); + let base_path = files_dir.as_ref(); let _ = std::fs::remove_file(base_path.join(post.media)); let _ = std::fs::remove_file(base_path.join(post.thumbnail)); }); diff --git a/static/htmx.js b/static/htmx.js new file mode 100644 index 0000000..59937d7 --- /dev/null +++ b/static/htmx.js @@ -0,0 +1 @@ +var htmx=function(){"use strict";const Q={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=cn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true},parseInterval:null,_:null,version:"2.0.4"};Q.onLoad=j;Q.process=kt;Q.on=ye;Q.off=be;Q.trigger=he;Q.ajax=Rn;Q.find=u;Q.findAll=x;Q.closest=g;Q.remove=z;Q.addClass=K;Q.removeClass=G;Q.toggleClass=W;Q.takeClass=Z;Q.swap=$e;Q.defineExtension=Fn;Q.removeExtension=Bn;Q.logAll=V;Q.logNone=_;Q.parseInterval=d;Q._=e;const n={addTriggerHandler:St,bodyContains:le,canAccessLocalStorage:B,findThisElement:Se,filterValues:hn,swap:$e,hasAttribute:s,getAttributeValue:te,getClosestAttributeValue:re,getClosestMatch:o,getExpressionVars:En,getHeaders:fn,getInputValues:cn,getInternalData:ie,getSwapSpecification:gn,getTriggerSpecs:st,getTarget:Ee,makeFragment:P,mergeObjects:ce,makeSettleInfo:xn,oobSwap:He,querySelectorExt:ae,settleImmediately:Kt,shouldCancel:ht,triggerEvent:he,triggerErrorEvent:fe,withExtensions:Ft};const r=["get","post","put","delete","patch"];const H=r.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function te(e,t){return ee(e,t)||ee(e,"data-"+t)}function c(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function ne(){return document}function m(e,t){return e.getRootNode?e.getRootNode({composed:t}):ne()}function o(e,t){while(e&&!t(e)){e=c(e)}return e||null}function i(e,t,n){const r=te(t,n);const o=te(t,"hx-disinherit");var i=te(t,"hx-inherit");if(e!==t){if(Q.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function re(t,n){let r=null;o(t,function(e){return!!(r=i(t,ue(e),n))});if(r!=="unset"){return r}}function h(e,t){const n=e instanceof Element&&(e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector);return!!n&&n.call(e,t)}function T(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function q(e){const t=new DOMParser;return t.parseFromString(e,"text/html")}function L(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function A(e){const t=ne().createElement("script");se(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}return t}function N(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function I(e){Array.from(e.querySelectorAll("script")).forEach(e=>{if(N(e)){const t=A(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){O(e)}finally{e.remove()}}})}function P(e){const t=e.replace(/]*)?>[\s\S]*?<\/head>/i,"");const n=T(t);let r;if(n==="html"){r=new DocumentFragment;const i=q(e);L(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=q(t);L(r,i.body);r.title=i.title}else{const i=q('");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){if(Q.config.allowScriptTags){I(r)}else{r.querySelectorAll("script").forEach(e=>e.remove())}}return r}function oe(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function k(e){return typeof e==="function"}function D(e){return t(e,"Object")}function ie(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function M(t){const n=[];if(t){for(let e=0;e=0}function le(e){return e.getRootNode({composed:true})===document}function F(e){return e.trim().split(/\s+/)}function ce(e,t){for(const n in t){if(t.hasOwnProperty(n)){e[n]=t[n]}}return e}function S(e){try{return JSON.parse(e)}catch(e){O(e);return null}}function B(){const e="htmx:localStorageTest";try{localStorage.setItem(e,e);localStorage.removeItem(e);return true}catch(e){return false}}function U(t){try{const e=new URL(t);if(e){t=e.pathname+e.search}if(!/^\/$/.test(t)){t=t.replace(/\/+$/,"")}return t}catch(e){return t}}function e(e){return vn(ne().body,function(){return eval(e)})}function j(t){const e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function V(){Q.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function _(){Q.logger=null}function u(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return u(ne(),e)}}function x(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return x(ne(),e)}}function E(){return window}function z(e,t){e=y(e);if(t){E().setTimeout(function(){z(e);e=null},t)}else{c(e).removeChild(e)}}function ue(e){return e instanceof Element?e:null}function $(e){return e instanceof HTMLElement?e:null}function J(e){return typeof e==="string"?e:null}function f(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function K(e,t,n){e=ue(y(e));if(!e){return}if(n){E().setTimeout(function(){K(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function G(e,t,n){let r=ue(y(e));if(!r){return}if(n){E().setTimeout(function(){G(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function W(e,t){e=y(e);e.classList.toggle(t)}function Z(e,t){e=y(e);se(e.parentElement.children,function(e){G(e,t)});K(ue(e),t)}function g(e,t){e=ue(y(e));if(e&&e.closest){return e.closest(t)}else{do{if(e==null||h(e,t)){return e}}while(e=e&&ue(c(e)));return null}}function l(e,t){return e.substring(0,t.length)===t}function Y(e,t){return e.substring(e.length-t.length)===t}function ge(e){const t=e.trim();if(l(t,"<")&&Y(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function p(t,r,n){if(r.indexOf("global ")===0){return p(t,r.slice(7),true)}t=y(t);const o=[];{let t=0;let n=0;for(let e=0;e"){t--}}if(n0){const r=ge(o.shift());let e;if(r.indexOf("closest ")===0){e=g(ue(t),ge(r.substr(8)))}else if(r.indexOf("find ")===0){e=u(f(t),ge(r.substr(5)))}else if(r==="next"||r==="nextElementSibling"){e=ue(t).nextElementSibling}else if(r.indexOf("next ")===0){e=pe(t,ge(r.substr(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=ue(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=me(t,ge(r.substr(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=m(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const c=f(m(t,!!n));i.push(...M(c.querySelectorAll(e)))}return i}var pe=function(t,e,n){const r=f(m(t,n)).querySelectorAll(e);for(let e=0;e=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ae(e,t){if(typeof e!=="string"){return p(e,t)[0]}else{return p(ne().body,e)[0]}}function y(e,t){if(typeof e==="string"){return u(f(t)||document,e)}else{return e}}function xe(e,t,n,r){if(k(t)){return{target:ne().body,event:J(e),listener:t,options:n}}else{return{target:y(e),event:J(t),listener:n,options:r}}}function ye(t,n,r,o){Vn(function(){const e=xe(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=k(n);return e?n:r}function be(t,n,r){Vn(function(){const e=xe(t,n,r);e.target.removeEventListener(e.event,e.listener)});return k(n)?n:r}const ve=ne().createElement("output");function we(e,t){const n=re(e,t);if(n){if(n==="this"){return[Se(e,t)]}else{const r=p(e,n);if(r.length===0){O('The selector "'+n+'" on '+t+" returned no matches!");return[ve]}else{return r}}}}function Se(e,t){return ue(o(e,function(e){return te(ue(e),t)!=null}))}function Ee(e){const t=re(e,"hx-target");if(t){if(t==="this"){return Se(e,"hx-target")}else{return ae(e,t)}}else{const n=ie(e);if(n.boosted){return ne().body}else{return e}}}function Ce(t){const n=Q.config.attributesToSettle;for(let e=0;e0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=p(t,n,false);if(r){se(r,function(e){let t;const n=o.cloneNode(true);t=ne().createDocumentFragment();t.appendChild(n);if(!Re(s,e)){t=f(n)}const r={shouldSwap:true,target:e,fragment:t};if(!he(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){qe(t);_e(s,e,e,t,i);Te()}se(i.elts,function(e){he(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);fe(ne().body,"htmx:oobErrorNoTarget",{content:o})}return e}function Te(){const e=u("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=u("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function qe(e){se(x(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=te(e,"id");const n=ne().getElementById(t);if(n!=null){if(e.moveBefore){let e=u("#--htmx-preserve-pantry--");if(e==null){ne().body.insertAdjacentHTML("afterend","
");e=u("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function Le(l,e,c){se(e.querySelectorAll("[id]"),function(t){const n=ee(t,"id");if(n&&n.length>0){const r=n.replace("'","\\'");const o=t.tagName.replace(":","\\:");const e=f(l);const i=e&&e.querySelector(o+"[id='"+r+"']");if(i&&i!==e){const s=t.cloneNode();Oe(t,i);c.tasks.push(function(){Oe(t,s)})}}})}function Ae(e){return function(){G(e,Q.config.addedClass);kt(ue(e));Ne(f(e));he(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=$(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function a(e,t,n,r){Le(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;K(ue(o),Q.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Ae(o))}}}function Ie(e,t){let n=0;while(n0}function $e(e,t,r,o){if(!o){o={}}e=y(e);const i=o.contextElement?m(o.contextElement,false):ne();const n=document.activeElement;let s={};try{s={elt:n,start:n?n.selectionStart:null,end:n?n.selectionEnd:null}}catch(e){}const l=xn(e);if(r.swapStyle==="textContent"){e.textContent=t}else{let n=P(t);l.title=n.title;if(o.selectOOB){const u=o.selectOOB.split(",");for(let t=0;t0){E().setTimeout(c,r.settleDelay)}else{c()}}function Je(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=S(r);for(const i in o){if(o.hasOwnProperty(i)){let e=o[i];if(D(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}he(n,i,e)}}}else{const s=r.split(",");for(let e=0;e0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=vn(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){fe(ne().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(tt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function C(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function rt(e){let t;if(e.length>0&&Ye.test(e[0])){e.shift();t=C(e,Qe).trim();e.shift()}else{t=C(e,v)}return t}const ot="input, textarea, select";function it(e,t,n){const r=[];const o=et(t);do{C(o,w);const l=o.length;const c=C(o,/[,\[\s]/);if(c!==""){if(c==="every"){const u={trigger:"every"};C(o,w);u.pollInterval=d(C(o,/[,\[\s]/));C(o,w);var i=nt(e,o,"event");if(i){u.eventFilter=i}r.push(u)}else{const a={trigger:c};var i=nt(e,o,"event");if(i){a.eventFilter=i}C(o,w);while(o.length>0&&o[0]!==","){const f=o.shift();if(f==="changed"){a.changed=true}else if(f==="once"){a.once=true}else if(f==="consume"){a.consume=true}else if(f==="delay"&&o[0]===":"){o.shift();a.delay=d(C(o,v))}else if(f==="from"&&o[0]===":"){o.shift();if(Ye.test(o[0])){var s=rt(o)}else{var s=C(o,v);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=rt(o);if(h.length>0){s+=" "+h}}}a.from=s}else if(f==="target"&&o[0]===":"){o.shift();a.target=rt(o)}else if(f==="throttle"&&o[0]===":"){o.shift();a.throttle=d(C(o,v))}else if(f==="queue"&&o[0]===":"){o.shift();a.queue=C(o,v)}else if(f==="root"&&o[0]===":"){o.shift();a[f]=rt(o)}else if(f==="threshold"&&o[0]===":"){o.shift();a[f]=C(o,v)}else{fe(e,"htmx:syntax:error",{token:o.shift()})}C(o,w)}r.push(a)}}if(o.length===l){fe(e,"htmx:syntax:error",{token:o.shift()})}C(o,w)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function st(e){const t=te(e,"hx-trigger");let n=[];if(t){const r=Q.config.triggerSpecsCache;n=r&&r[t]||it(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,ot)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function lt(e){ie(e).cancelled=true}function ct(e,t,n){const r=ie(e);r.timeout=E().setTimeout(function(){if(le(e)&&r.cancelled!==true){if(!gt(n,e,Mt("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ct(e,t,n)}},n.pollInterval)}function ut(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function at(e){return g(e,Q.config.disableSelector)}function ft(t,n,e){if(t instanceof HTMLAnchorElement&&ut(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(ee(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=ee(t,"href")}else{const i=ee(t,"method");r=i?i.toLowerCase():"get";o=ee(t,"action");if(o==null||o===""){o=ne().location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){pt(t,function(e,t){const n=ue(e);if(at(n)){b(n);return}de(r,o,n,t)},n,e,true)})}}function ht(e,t){const n=ue(t);if(!n){return false}if(e.type==="submit"||e.type==="click"){if(n.tagName==="FORM"){return true}if(h(n,'input[type="submit"], button')&&(h(n,"[form]")||g(n,"form")!==null)){return true}if(n instanceof HTMLAnchorElement&&n.href&&(n.getAttribute("href")==="#"||n.getAttribute("href").indexOf("#")!==0)){return true}}return false}function dt(e,t){return ie(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function gt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;fe(ne().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function pt(l,c,e,u,a){const f=ie(l);let t;if(u.from){t=p(l,u.from)}else{t=[l]}if(u.changed){if(!("lastValue"in f)){f.lastValue=new WeakMap}t.forEach(function(e){if(!f.lastValue.has(u)){f.lastValue.set(u,new WeakMap)}f.lastValue.get(u).set(e,e.value)})}se(t,function(i){const s=function(e){if(!le(l)){i.removeEventListener(u.trigger,s);return}if(dt(l,e)){return}if(a||ht(e,l)){e.preventDefault()}if(gt(u,l,e)){return}const t=ie(e);t.triggerSpec=u;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(u.consume){e.stopPropagation()}if(u.target&&e.target){if(!h(ue(e.target),u.target)){return}}if(u.once){if(f.triggeredOnce){return}else{f.triggeredOnce=true}}if(u.changed){const n=event.target;const r=n.value;const o=f.lastValue.get(u);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(f.delayed){clearTimeout(f.delayed)}if(f.throttle){return}if(u.throttle>0){if(!f.throttle){he(l,"htmx:trigger");c(l,e);f.throttle=E().setTimeout(function(){f.throttle=null},u.throttle)}}else if(u.delay>0){f.delayed=E().setTimeout(function(){he(l,"htmx:trigger");c(l,e)},u.delay)}else{he(l,"htmx:trigger");c(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:u.trigger,listener:s,on:i});i.addEventListener(u.trigger,s)})}let mt=false;let xt=null;function yt(){if(!xt){xt=function(){mt=true};window.addEventListener("scroll",xt);window.addEventListener("resize",xt);setInterval(function(){if(mt){mt=false;se(ne().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){bt(e)})}},200)}}function bt(e){if(!s(e,"data-hx-revealed")&&X(e)){e.setAttribute("data-hx-revealed","true");const t=ie(e);if(t.initHash){he(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){he(e,"revealed")},{once:true})}}}function vt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;he(e,"htmx:trigger");t(e)}};if(r>0){E().setTimeout(o,r)}else{o()}}function wt(t,n,e){let i=false;se(r,function(r){if(s(t,"hx-"+r)){const o=te(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){St(t,e,n,function(e,t){const n=ue(e);if(g(n,Q.config.disableSelector)){b(n);return}de(r,o,n,t)})})}});return i}function St(r,e,t,n){if(e.trigger==="revealed"){yt();pt(r,n,t,e);bt(ue(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ae(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e0){t.polling=true;ct(ue(r),n,e)}else{pt(r,n,t,e)}}function Et(e){const t=ue(e);if(!t){return false}const n=t.attributes;for(let e=0;e", "+e).join(""));return o}else{return[]}}function Tt(e){const t=g(ue(e.target),"button, input[type='submit']");const n=Lt(e);if(n){n.lastButtonClicked=t}}function qt(e){const t=Lt(e);if(t){t.lastButtonClicked=null}}function Lt(e){const t=g(ue(e.target),"button, input[type='submit']");if(!t){return}const n=y("#"+ee(t,"form"),t.getRootNode())||g(t,"form");if(!n){return}return ie(n)}function At(e){e.addEventListener("click",Tt);e.addEventListener("focusin",Tt);e.addEventListener("focusout",qt)}function Nt(t,e,n){const r=ie(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){vn(t,function(){if(at(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function It(t){ke(t);for(let e=0;eQ.config.historyCacheSize){i.shift()}while(i.length>0){try{localStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(ne().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Vt(t){if(!B()){return null}t=U(t);const n=S(localStorage.getItem("htmx-history-cache"))||[];for(let e=0;e=200&&this.status<400){he(ne().body,"htmx:historyCacheMissLoad",i);const e=P(this.response);const t=e.querySelector("[hx-history-elt],[data-hx-history-elt]")||e;const n=Ut();const r=xn(n);kn(e.title);qe(e);Ve(n,t,r);Te();Kt(r.tasks);Bt=o;he(ne().body,"htmx:historyRestore",{path:o,cacheMiss:true,serverResponse:this.response})}else{fe(ne().body,"htmx:historyCacheMissLoadError",i)}};e.send()}function Wt(e){zt();e=e||location.pathname+location.search;const t=Vt(e);if(t){const n=P(t.content);const r=Ut();const o=xn(r);kn(t.title);qe(n);Ve(r,n,o);Te();Kt(o.tasks);E().setTimeout(function(){window.scrollTo(0,t.scroll)},0);Bt=e;he(ne().body,"htmx:historyRestore",{path:e,item:t})}else{if(Q.config.refreshOnHistoryMiss){window.location.reload(true)}else{Gt(e)}}}function Zt(e){let t=we(e,"hx-indicator");if(t==null){t=[e]}se(t,function(e){const t=ie(e);t.requestCount=(t.requestCount||0)+1;e.classList.add.call(e.classList,Q.config.requestClass)});return t}function Yt(e){let t=we(e,"hx-disabled-elt");if(t==null){t=[]}se(t,function(e){const t=ie(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")});return t}function Qt(e,t){se(e.concat(t),function(e){const t=ie(e);t.requestCount=(t.requestCount||1)-1});se(e,function(e){const t=ie(e);if(t.requestCount===0){e.classList.remove.call(e.classList,Q.config.requestClass)}});se(t,function(e){const t=ie(e);if(t.requestCount===0){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function en(t,n){for(let e=0;en.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);se(e,e=>r.append(t,e))}}function on(t,n,r,o,i){if(o==null||en(t,o)){return}else{t.push(o)}if(tn(o)){const s=ee(o,"name");let e=o.value;if(o instanceof HTMLSelectElement&&o.multiple){e=M(o.querySelectorAll("option:checked")).map(function(e){return e.value})}if(o instanceof HTMLInputElement&&o.files){e=M(o.files)}nn(s,e,n);if(i){sn(o,r)}}if(o instanceof HTMLFormElement){se(o.elements,function(e){if(t.indexOf(e)>=0){rn(e.name,e.value,n)}else{t.push(e)}if(i){sn(e,r)}});new FormData(o).forEach(function(e,t){if(e instanceof File&&e.name===""){return}nn(t,e,n)})}}function sn(e,t){const n=e;if(n.willValidate){he(n,"htmx:validation:validate");if(!n.checkValidity()){t.push({elt:n,message:n.validationMessage,validity:n.validity});he(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})}}}function ln(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function cn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=ie(e);if(s.lastButtonClicked&&!le(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||te(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){on(n,o,i,g(e,"form"),l)}on(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&ee(e,"type")==="submit"){const u=s.lastButtonClicked||e;const a=ee(u,"name");nn(a,u.value,o)}const c=we(e,"hx-include");se(c,function(e){on(n,r,i,ue(e),l);if(!h(e,"form")){se(f(e).querySelectorAll(ot),function(e){on(n,r,i,e,l)})}});ln(r,o);return{errors:i,formData:r,values:An(r)}}function un(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function an(e){e=qn(e);let n="";e.forEach(function(e,t){n=un(n,t,e)});return n}function fn(e,t,n){const r={"HX-Request":"true","HX-Trigger":ee(e,"id"),"HX-Trigger-Name":ee(e,"name"),"HX-Target":te(t,"id"),"HX-Current-URL":ne().location.href};bn(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(ie(e).boosted){r["HX-Boosted"]="true"}return r}function hn(n,e){const t=re(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){se(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;se(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function dn(e){return!!ee(e,"href")&&ee(e,"href").indexOf("#")>=0}function gn(e,t){const n=t||re(e,"hx-swap");const r={swapStyle:ie(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&ie(e).boosted&&!dn(e)){r.show="top"}if(n){const s=F(n);if(s.length>0){for(let e=0;e0?o.join(":"):null;r.scroll=u;r.scrollTarget=i}else if(l.indexOf("show:")===0){const a=l.slice(5);var o=a.split(":");const f=o.pop();var i=o.length>0?o.join(":"):null;r.show=f;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{O("Unknown modifier in hx-swap: "+l)}}}}return r}function pn(e){return re(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function mn(t,n,r){let o=null;Ft(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(pn(n)){return ln(new FormData,qn(r))}else{return an(r)}}}function xn(e){return{tasks:[],elts:[e]}}function yn(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=ue(ae(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=ue(ae(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function bn(r,e,o,i){if(i==null){i={}}if(r==null){return i}const s=te(r,e);if(s){let e=s.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=vn(r,function(){return Function("return ("+e+")")()},{})}else{n=S(e)}for(const l in n){if(n.hasOwnProperty(l)){if(i[l]==null){i[l]=n[l]}}}}return bn(ue(c(r)),e,o,i)}function vn(e,t,n){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return n}}function wn(e,t){return bn(e,"hx-vars",true,t)}function Sn(e,t){return bn(e,"hx-vals",false,t)}function En(e){return ce(wn(e),Sn(e))}function Cn(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function On(t){if(t.responseURL&&typeof URL!=="undefined"){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(ne().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function R(e,t){return t.test(e.getAllResponseHeaders())}function Rn(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return de(t,n,null,null,{targetOverride:y(r)||ve,returnPromise:true})}else{let e=y(r.target);if(r.target&&!e||r.source&&!e&&!y(r.source)){e=ve}return de(t,n,y(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true})}}else{return de(t,n,null,null,{returnPromise:true})}}function Hn(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function Tn(e,t,n){let r;let o;if(typeof URL==="function"){o=new URL(t,document.location.href);const i=document.location.origin;r=i===o.origin}else{o=t;r=l(t,document.location.origin)}if(Q.config.selfRequestsOnly){if(!r){return false}}return he(e,"htmx:validateUrl",ce({url:o,sameHost:r},n))}function qn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n in e){if(e.hasOwnProperty(n)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}}return t}function Ln(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function An(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}else{return e[t]}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Ln(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function de(t,n,r,o,i,D){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=ne().body}const M=i.handler||Dn;const X=i.select||null;if(!le(r)){oe(s);return e}const c=i.targetOverride||ue(Ee(r));if(c==null||c==ve){fe(r,"htmx:targetError",{target:te(r,"hx-target")});oe(l);return e}let u=ie(r);const a=u.lastButtonClicked;if(a){const L=ee(a,"formaction");if(L!=null){n=L}const A=ee(a,"formmethod");if(A!=null){if(A.toLowerCase()!=="dialog"){t=A}}}const f=re(r,"hx-confirm");if(D===undefined){const K=function(e){return de(t,n,r,o,i,!!e)};const G={target:c,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:f};if(he(r,"htmx:confirm",G)===false){oe(s);return e}}let h=r;let d=re(r,"hx-sync");let g=null;let F=false;if(d){const N=d.split(":");const I=N[0].trim();if(I==="this"){h=Se(r,"hx-sync")}else{h=ue(ae(r,I))}d=(N[1]||"drop").trim();u=ie(h);if(d==="drop"&&u.xhr&&u.abortable!==true){oe(s);return e}else if(d==="abort"){if(u.xhr){oe(s);return e}else{F=true}}else if(d==="replace"){he(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");g=(W[1]||"last").trim()}}if(u.xhr){if(u.abortable){he(h,"htmx:abort")}else{if(g==null){if(o){const P=ie(o);if(P&&P.triggerSpec&&P.triggerSpec.queue){g=P.triggerSpec.queue}}if(g==null){g="last"}}if(u.queuedRequests==null){u.queuedRequests=[]}if(g==="first"&&u.queuedRequests.length===0){u.queuedRequests.push(function(){de(t,n,r,o,i)})}else if(g==="all"){u.queuedRequests.push(function(){de(t,n,r,o,i)})}else if(g==="last"){u.queuedRequests=[];u.queuedRequests.push(function(){de(t,n,r,o,i)})}oe(s);return e}}const p=new XMLHttpRequest;u.xhr=p;u.abortable=F;const m=function(){u.xhr=null;u.abortable=false;if(u.queuedRequests!=null&&u.queuedRequests.length>0){const e=u.queuedRequests.shift();e()}};const B=re(r,"hx-prompt");if(B){var x=prompt(B);if(x===null||!he(r,"htmx:prompt",{prompt:x,target:c})){oe(s);m();return e}}if(f&&!D){if(!confirm(f)){oe(s);m();return e}}let y=fn(r,c,x);if(t!=="get"&&!pn(r)){y["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){y=ce(y,i.headers)}const U=cn(r,t);let b=U.errors;const j=U.formData;if(i.values){ln(j,qn(i.values))}const V=qn(En(r));const v=ln(j,V);let w=hn(v,r);if(Q.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",ee(c,"id")||"true")}if(n==null||n===""){n=ne().location.href}const S=bn(r,"hx-request");const _=ie(r).boosted;let E=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:_,useUrlParams:E,formData:w,parameters:An(w),unfilteredFormData:v,unfilteredParameters:An(v),headers:y,target:c,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Q.config.withCredentials,timeout:i.timeout||S.timeout||Q.config.timeout,path:n,triggeringEvent:o};if(!he(r,"htmx:configRequest",C)){oe(s);m();return e}n=C.path;t=C.verb;y=C.headers;w=qn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){he(r,"htmx:validation:halted",C);oe(s);m();return e}const z=n.split("#");const $=z[0];const O=z[1];let R=n;if(E){R=$;const Z=!w.keys().next().done;if(Z){if(R.indexOf("?")<0){R+="?"}else{R+="&"}R+=an(w);if(O){R+="#"+O}}}if(!Tn(r,R,C)){fe(r,"htmx:invalidPath",C);oe(l);return e}p.open(t.toUpperCase(),R,true);p.overrideMimeType("text/html");p.withCredentials=C.withCredentials;p.timeout=C.timeout;if(S.noHeaders){}else{for(const k in y){if(y.hasOwnProperty(k)){const Y=y[k];Cn(p,k,Y)}}}const H={xhr:p,target:c,requestConfig:C,etc:i,boosted:_,select:X,pathInfo:{requestPath:n,finalRequestPath:R,responsePath:null,anchor:O}};p.onload=function(){try{const t=Hn(r);H.pathInfo.responsePath=On(p);M(r,H);if(H.keepIndicators!==true){Qt(T,q)}he(r,"htmx:afterRequest",H);he(r,"htmx:afterOnLoad",H);if(!le(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(le(n)){e=n}}if(e){he(e,"htmx:afterRequest",H);he(e,"htmx:afterOnLoad",H)}}oe(s);m()}catch(e){fe(r,"htmx:onLoadError",ce({error:e},H));throw e}};p.onerror=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:sendError",H);oe(l);m()};p.onabort=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:sendAbort",H);oe(l);m()};p.ontimeout=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:timeout",H);oe(l);m()};if(!he(r,"htmx:beforeRequest",H)){oe(s);m();return e}var T=Zt(r);var q=Yt(r);se(["loadstart","loadend","progress","abort"],function(t){se([p,p.upload],function(e){e.addEventListener(t,function(e){he(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});he(r,"htmx:beforeSend",H);const J=E?null:mn(p,r,w);p.send(J);return e}function Nn(e,t){const n=t.xhr;let r=null;let o=null;if(R(n,/HX-Push:/i)){r=n.getResponseHeader("HX-Push");o="push"}else if(R(n,/HX-Push-Url:/i)){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(R(n,/HX-Replace-Url:/i)){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;const l=re(e,"hx-push-url");const c=re(e,"hx-replace-url");const u=ie(e).boosted;let a=null;let f=null;if(l){a="push";f=l}else if(c){a="replace";f=c}else if(u){a="push";f=s||i}if(f){if(f==="false"){return{}}if(f==="true"){f=s||i}if(t.pathInfo.anchor&&f.indexOf("#")===-1){f=f+"#"+t.pathInfo.anchor}return{type:a,path:f}}else{return{}}}function In(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Pn(e){for(var t=0;t0){E().setTimeout(e,x.swapDelay)}else{e()}}if(f){fe(o,"htmx:responseError",ce({error:"Response Status Error Code "+s.status+" from "+i.pathInfo.requestPath},i))}}const Mn={};function Xn(){return{init:function(e){return null},getSelectors:function(){return null},onEvent:function(e,t){return true},transformResponse:function(e,t,n){return e},isInlineSwap:function(e){return false},handleSwap:function(e,t,n,r){return false},encodeParameters:function(e,t,n){return null}}}function Fn(e,t){if(t.init){t.init(n)}Mn[e]=ce(Xn(),t)}function Bn(e){delete Mn[e]}function Un(e,n,r){if(n==undefined){n=[]}if(e==undefined){return n}if(r==undefined){r=[]}const t=te(e,"hx-ext");if(t){se(t.split(","),function(e){e=e.replace(/ /g,"");if(e.slice(0,7)=="ignore:"){r.push(e.slice(7));return}if(r.indexOf(e)<0){const t=Mn[e];if(t&&n.indexOf(t)<0){n.push(t)}}})}return Un(ue(c(e)),n,r)}var jn=false;ne().addEventListener("DOMContentLoaded",function(){jn=true});function Vn(e){if(jn||ne().readyState==="complete"){e()}else{ne().addEventListener("DOMContentLoaded",e)}}function _n(){if(Q.config.includeIndicatorStyles!==false){const e=Q.config.inlineStyleNonce?` nonce="${Q.config.inlineStyleNonce}"`:"";ne().head.insertAdjacentHTML("beforeend"," ."+Q.config.indicatorClass+"{opacity:0} ."+Q.config.requestClass+" ."+Q.config.indicatorClass+"{opacity:1; transition: opacity 200ms ease-in;} ."+Q.config.requestClass+"."+Q.config.indicatorClass+"{opacity:1; transition: opacity 200ms ease-in;} ")}}function zn(){const e=ne().querySelector('meta[name="htmx-config"]');if(e){return S(e.content)}else{return null}}function $n(){const e=zn();if(e){Q.config=ce(Q.config,e)}}Vn(function(){$n();_n();let e=ne().body;kt(e);const t=ne().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.target;const n=ie(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){Wt();se(t,function(e){he(e,"htmx:restored",{document:ne(),triggerEvent:he})})}else{if(n){n(e)}}};E().setTimeout(function(){he(e,"htmx:load",{});e=null},0)});return Q}(); \ No newline at end of file diff --git a/static/samey.css b/static/samey.css new file mode 100644 index 0000000..e69de29 diff --git a/static/sortable.js b/static/sortable.js new file mode 100644 index 0000000..95423a6 --- /dev/null +++ b/static/sortable.js @@ -0,0 +1,2 @@ +/*! Sortable 1.15.6 - MIT | git://github.com/SortableJS/Sortable.git */ +!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function e(e,t){var n,o=Object.keys(e);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(e),t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,n)),o}function I(o){for(var t=1;tt.length)&&(e=t.length);for(var n=0,o=new Array(e);n"===e[0]&&(e=e.substring(1)),t))try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return}}function g(t){return t.host&&t!==document&&t.host.nodeType?t.host:t.parentNode}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"!==e[0]||t.parentNode===n)&&f(t,e)||o&&t===n)return t}while(t!==n&&(t=g(t)))}return null}var m,v=/\s+/g;function k(t,e,n){var o;t&&e&&(t.classList?t.classList[n?"add":"remove"](e):(o=(" "+t.className+" ").replace(v," ").replace(" "+e+" "," "),t.className=(o+(n?" "+e:"")).replace(v," ")))}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];o[e=!(e in o||-1!==e.indexOf("webkit"))?"-webkit-"+e:e]=n+("string"==typeof n?"":"px")}}function b(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform")}while(o&&"none"!==o&&(n=o+" "+n),!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function D(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i=n.left-e&&i<=n.right+e,e=r>=n.top-e&&r<=n.bottom+e;return o&&e?a=t:void 0}}),a);if(e){var n,o={};for(n in t)t.hasOwnProperty(n)&&(o[n]=t[n]);o.target=o.rootEl=e,o.preventDefault=void 0,o.stopPropagation=void 0,e[K]._onDragOver(o)}}var i,r,a}function Ft(t){Z&&Z.parentNode[K]._isOutsideThisEl(t.target)}function jt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[K]=this;var n,o,i={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return kt(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==jt.supportPointer&&"PointerEvent"in window&&(!u||c),emptyInsertThreshold:5};for(n in z.initializePlugins(this,t,i),i)n in e||(e[n]=i[n]);for(o in Rt(e),this)"_"===o.charAt(0)&&"function"==typeof this[o]&&(this[o]=this[o].bind(this));this.nativeDraggable=!e.forceFallback&&It,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?h(t,"pointerdown",this._onTapStart):(h(t,"mousedown",this._onTapStart),h(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(h(t,"dragover",this),h(t,"dragenter",this)),St.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,A())}function Ht(t,e,n,o,i,r,a,l){var s,c,u=t[K],d=u.options.onMove;return!window.CustomEvent||y||w?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),c=d?d.call(u,s,a):c}function Lt(t){t.draggable=!1}function Kt(){xt=!1}function Wt(t){return setTimeout(t,0)}function zt(t){return clearTimeout(t)}jt.prototype={constructor:jt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(vt=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,Z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(!function(t){Ot.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&Ot.push(o)}}(o),!Z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled)&&!s.isContentEditable&&(this.nativeDraggable||!u||!l||"SELECT"!==l.tagName.toUpperCase())&&!((l=P(l,t.draggable,o,!1))&&l.animated||et===l)){if(it=j(l),at=j(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return V({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),U("filter",n,{evt:e}),void(i&&e.preventDefault())}else if(c=c&&c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return V({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),U("filter",n,{evt:e}),!0}))return void(i&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;n&&!Z&&n.parentNode===r&&(o=X(n),J=r,$=(Z=n).parentNode,tt=Z.nextSibling,et=n,st=a.group,ut={target:jt.dragged=Z,clientX:(e||t).clientX,clientY:(e||t).clientY},ft=ut.clientX-o.left,gt=ut.clientY-o.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,Z.style["will-change"]="all",o=function(){U("delayEnded",i,{evt:t}),jt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!s&&i.nativeDraggable&&(Z.draggable=!0),i._triggerDragStart(t,e),V({sortable:i,name:"choose",originalEvent:t}),k(Z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){D(Z,t.trim(),Lt)}),h(l,"dragover",Bt),h(l,"mousemove",Bt),h(l,"touchmove",Bt),a.supportPointer?(h(l,"pointerup",i._onDrop),this.nativeDraggable||h(l,"pointercancel",i._onDrop)):(h(l,"mouseup",i._onDrop),h(l,"touchend",i._onDrop),h(l,"touchcancel",i._onDrop)),s&&this.nativeDraggable&&(this.options.touchStartThreshold=4,Z.draggable=!0),U("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(w||y)?o():jt.eventCanceled?this._onDrop():(a.supportPointer?(h(l,"pointerup",i._disableDelayedDrag),h(l,"pointercancel",i._disableDelayedDrag)):(h(l,"mouseup",i._disableDelayedDrag),h(l,"touchend",i._disableDelayedDrag),h(l,"touchcancel",i._disableDelayedDrag)),h(l,"mousemove",i._delayedDragTouchMoveHandler),h(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&h(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)))},_delayedDragTouchMoveHandler:function(t){t=t.touches?t.touches[0]:t;Math.max(Math.abs(t.clientX-this._lastX),Math.abs(t.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){Z&&Lt(Z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;p(t,"mouseup",this._disableDelayedDrag),p(t,"touchend",this._disableDelayedDrag),p(t,"touchcancel",this._disableDelayedDrag),p(t,"pointerup",this._disableDelayedDrag),p(t,"pointercancel",this._disableDelayedDrag),p(t,"mousemove",this._delayedDragTouchMoveHandler),p(t,"touchmove",this._delayedDragTouchMoveHandler),p(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?h(document,"pointermove",this._onTouchMove):h(document,e?"touchmove":"mousemove",this._onTouchMove):(h(Z,"dragend",this),h(J,"dragstart",this._onDragStart));try{document.selection?Wt(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){var n;Dt=!1,J&&Z?(U("dragStarted",this,{evt:e}),this.nativeDraggable&&h(document,"dragover",Ft),n=this.options,t||k(Z,n.dragClass,!1),k(Z,n.ghostClass,!0),jt.active=this,t&&this._appendGhost(),V({sortable:this,name:"start",originalEvent:e})):this._nulling()},_emulateDragOver:function(){if(dt){this._lastX=dt.clientX,this._lastY=dt.clientY,Xt();for(var t=document.elementFromPoint(dt.clientX,dt.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(dt.clientX,dt.clientY))!==e;)e=t;if(Z.parentNode[K]._isOutsideThisEl(t),e)do{if(e[K])if(e[K]._onDragOver({clientX:dt.clientX,clientY:dt.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}while(e=g(t=e));Yt()}},_onTouchMove:function(t){if(ut){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=Q&&b(Q,!0),a=Q&&r&&r.a,l=Q&&r&&r.d,e=At&&wt&&E(wt),a=(i.clientX-ut.clientX+o.x)/(a||1)+(e?e[0]-Tt[0]:0)/(a||1),l=(i.clientY-ut.clientY+o.y)/(l||1)+(e?e[1]-Tt[1]:0)/(l||1);if(!jt.active&&!Dt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))E.right+10||S.clientY>x.bottom&&S.clientX>x.left:S.clientY>E.bottom+10||S.clientX>x.right&&S.clientY>x.top)||m.animated)){if(m&&(t=n,e=r,C=X(B((_=this).el,0,_.options,!0)),_=L(_.el,_.options,Q),e?t.clientX<_.left-10||t.clientYfooter{font-style:normal;border:0}address,blockquote cite{font-style:normal}a[href^=mailto\:]:before{content:"📧 "}a[href^=tel\:]:before{content:"📞 "}a[href^=sms\:]:before{content:"💬 "}mark{background-color:#efdb43;background-color:var(--highlight);border-radius:2px;padding:0 2px;color:#000}a>code,a>strong{color:inherit}button,input[type=button],input[type=checkbox],input[type=radio],input[type=range],input[type=reset],input[type=submit],select{cursor:pointer}input,select{display:block}[type=checkbox],[type=radio]{display:initial}button,input,select,textarea{color:#fff;color:var(--form-text);background-color:#161f27;background-color:var(--background);font-family:inherit;font-size:inherit;margin-right:6px;margin-bottom:6px;padding:10px;border:none;border-radius:6px;outline:none}button,input[type=button],input[type=reset],input[type=submit]{background-color:#0c151c;background-color:var(--button-base);padding-right:30px;padding-left:30px}button:hover,input[type=button]:hover,input[type=reset]:hover,input[type=submit]:hover{background:#040a0f;background:var(--button-hover)}input[type=color]{min-height:2rem;padding:8px;cursor:pointer}input[type=checkbox],input[type=radio]{height:1em;width:1em}input[type=radio]{border-radius:100%}input{vertical-align:top}label{vertical-align:middle;margin-bottom:4px;display:inline-block}button,input:not([type=checkbox]):not([type=radio]),input[type=range],select,textarea{-webkit-appearance:none}textarea{display:block;margin-right:0;box-sizing:border-box;resize:vertical}textarea:not([cols]){width:100%}textarea:not([rows]){min-height:40px;height:140px}select{background:#161f27 url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' height='63' width='117' fill='%23efefef'%3E%3Cpath d='M115 2c-1-2-4-2-5 0L59 53 7 2a4 4 0 00-5 5l54 54 2 2 3-2 54-54c2-1 2-4 0-5z'/%3E%3C/svg%3E") calc(100% - 12px) 50%/12px no-repeat;background:var(--background) var(--select-arrow) calc(100% - 12px) 50%/12px no-repeat;padding-right:35px}select::-ms-expand{display:none}select[multiple]{padding-right:10px;background-image:none;overflow-y:auto}button:focus,input:focus,select:focus,textarea:focus{box-shadow:0 0 0 2px rgba(0,150,191,.67);box-shadow:0 0 0 2px var(--focus)}button:active,input[type=button]:active,input[type=checkbox]:active,input[type=radio]:active,input[type=range]:active,input[type=reset]:active,input[type=submit]:active{transform:translateY(2px)}button:disabled,input:disabled,select:disabled,textarea:disabled{cursor:not-allowed;opacity:.5}::-moz-placeholder{color:#a9a9a9;color:var(--form-placeholder)}:-ms-input-placeholder{color:#a9a9a9;color:var(--form-placeholder)}::-ms-input-placeholder{color:#a9a9a9;color:var(--form-placeholder)}::placeholder{color:#a9a9a9;color:var(--form-placeholder)}fieldset{border:1px solid rgba(0,150,191,.67);border:1px solid var(--focus);border-radius:6px;margin:0 0 12px;padding:10px}legend{font-size:.9em;font-weight:600}input[type=range]{margin:10px 0;padding:10px 0;background:transparent}input[type=range]:focus{outline:none}input[type=range]::-webkit-slider-runnable-track{width:100%;height:9.5px;-webkit-transition:.2s;transition:.2s;background:#161f27;background:var(--background);border-radius:3px}input[type=range]::-webkit-slider-thumb{box-shadow:0 1px 1px #000,0 0 1px #0d0d0d;height:20px;width:20px;border-radius:50%;background:#526980;background:var(--border);-webkit-appearance:none;margin-top:-7px}input[type=range]:focus::-webkit-slider-runnable-track{background:#161f27;background:var(--background)}input[type=range]::-moz-range-track{width:100%;height:9.5px;-moz-transition:.2s;transition:.2s;background:#161f27;background:var(--background);border-radius:3px}input[type=range]::-moz-range-thumb{box-shadow:1px 1px 1px #000,0 0 1px #0d0d0d;height:20px;width:20px;border-radius:50%;background:#526980;background:var(--border)}input[type=range]::-ms-track{width:100%;height:9.5px;background:transparent;border-color:transparent;border-width:16px 0;color:transparent}input[type=range]::-ms-fill-lower,input[type=range]::-ms-fill-upper{background:#161f27;background:var(--background);border:.2px solid #010101;border-radius:3px;box-shadow:1px 1px 1px #000,0 0 1px #0d0d0d}input[type=range]::-ms-thumb{box-shadow:1px 1px 1px #000,0 0 1px #0d0d0d;border:1px solid #000;height:20px;width:20px;border-radius:50%;background:#526980;background:var(--border)}input[type=range]:focus::-ms-fill-lower,input[type=range]:focus::-ms-fill-upper{background:#161f27;background:var(--background)}a{text-decoration:none;color:#41adff;color:var(--links)}a:hover{text-decoration:underline}code,samp,time{background:#161f27;background:var(--background);color:#ffbe85;color:var(--code);padding:2.5px 5px;border-radius:6px;font-size:1em}pre>code{padding:10px;display:block;overflow-x:auto}var{color:#d941e2;color:var(--variable);font-style:normal;font-family:monospace}kbd{background:#161f27;background:var(--background);border:1px solid #526980;border:1px solid var(--border);border-radius:2px;color:#dbdbdb;color:var(--text-main);padding:2px 4px}img,video{max-width:100%;height:auto}hr{border:none;border-top:1px solid #526980;border-top:1px solid var(--border)}table{border-collapse:collapse;margin-bottom:10px;width:100%;table-layout:fixed}table caption,td,th{text-align:left}td,th{padding:6px;vertical-align:top;word-wrap:break-word}thead{border-bottom:1px solid #526980;border-bottom:1px solid var(--border)}tfoot{border-top:1px solid #526980;border-top:1px solid var(--border)}tbody tr:nth-child(2n){background-color:#161f27;background-color:var(--background)}tbody tr:nth-child(2n) button{background-color:#1a242f;background-color:var(--background-alt)}tbody tr:nth-child(2n) button:hover{background-color:#202b38;background-color:var(--background-body)}::-webkit-scrollbar{height:10px;width:10px}::-webkit-scrollbar-track{background:#161f27;background:var(--background);border-radius:6px}::-webkit-scrollbar-thumb{background:#040a0f;background:var(--scrollbar-thumb);border-radius:6px}::-webkit-scrollbar-thumb:hover{background:#000;background:var(--scrollbar-thumb-hover)}::-moz-selection{background-color:#1c76c5;background-color:var(--selection);color:#fff;color:var(--text-bright)}::selection{background-color:#1c76c5;background-color:var(--selection);color:#fff;color:var(--text-bright)}details{display:flex;flex-direction:column;align-items:flex-start;background-color:#1a242f;background-color:var(--background-alt);padding:10px 10px 0;margin:1em 0;border-radius:6px;overflow:hidden}details[open]{padding:10px}details>:last-child{margin-bottom:0}details[open] summary{margin-bottom:10px}summary{display:list-item;background-color:#161f27;background-color:var(--background);padding:10px;margin:-10px -10px 0;cursor:pointer;outline:none}summary:focus,summary:hover{text-decoration:underline}details>:not(summary){margin-top:0}summary::-webkit-details-marker{color:#dbdbdb;color:var(--text-main)}dialog{background-color:#1a242f;background-color:var(--background-alt);color:#dbdbdb;color:var(--text-main);border-radius:6px;border:#526980;border-color:var(--border);padding:10px 30px}dialog>header:first-child{background-color:#161f27;background-color:var(--background);border-radius:6px 6px 0 0;margin:-10px -30px 10px;padding:10px;text-align:center}dialog::-webkit-backdrop{background:rgba(0,0,0,.61);-webkit-backdrop-filter:blur(4px);backdrop-filter:blur(4px)}dialog::backdrop{background:rgba(0,0,0,.61);-webkit-backdrop-filter:blur(4px);backdrop-filter:blur(4px)}footer{border-top:1px solid #526980;border-top:1px solid var(--border);padding-top:10px;color:#a9b1ba;color:var(--text-muted)}body>footer{margin-top:40px}@media print{body,button,code,details,input,pre,summary,textarea{background-color:#fff}button,input,textarea{border:1px solid #000}body,button,code,footer,h1,h2,h3,h4,h5,h6,input,pre,strong,summary,textarea{color:#000}summary::marker{color:#000}summary::-webkit-details-marker{color:#000}tbody tr:nth-child(2n){background-color:#f2f2f2}a{color:#00f;text-decoration:underline}} \ No newline at end of file diff --git a/templates/add_post_to_pool.html b/templates/fragments/add_post_to_pool.html similarity index 73% rename from templates/add_post_to_pool.html rename to templates/fragments/add_post_to_pool.html index de4f838..e3b4ed5 100644 --- a/templates/add_post_to_pool.html +++ b/templates/fragments/add_post_to_pool.html @@ -1,4 +1,4 @@ -{% include "pool_posts.html" %} +{% include "fragments/pool_posts.html" %} + + + + + diff --git a/templates/edit_post_details.html b/templates/fragments/edit_post_details.html similarity index 71% rename from templates/edit_post_details.html rename to templates/fragments/edit_post_details.html index 8a9988c..39ba21b 100644 --- a/templates/edit_post_details.html +++ b/templates/fragments/edit_post_details.html @@ -1,28 +1,16 @@
- + {% let tags_value = tags %} {% include "fragments/tags_input.html" %}
    - +
    - +
    @@ -41,7 +29,7 @@
      {% for source in sources %} - {% include "post_source.html" %} + {% include "fragments/post_source.html" %} {% endfor %}
    diff --git a/templates/get_full_image_media.html b/templates/fragments/get_full_image_media.html similarity index 100% rename from templates/get_full_image_media.html rename to templates/fragments/get_full_image_media.html diff --git a/templates/get_image_media.html b/templates/fragments/get_image_media.html similarity index 100% rename from templates/get_image_media.html rename to templates/fragments/get_image_media.html diff --git a/templates/get_video_media.html b/templates/fragments/get_video_media.html similarity index 100% rename from templates/get_video_media.html rename to templates/fragments/get_video_media.html diff --git a/templates/pool_posts.html b/templates/fragments/pool_posts.html similarity index 95% rename from templates/pool_posts.html rename to templates/fragments/pool_posts.html index c58746e..395b97b 100644 --- a/templates/pool_posts.html +++ b/templates/fragments/pool_posts.html @@ -15,6 +15,7 @@
    {{ post.rating | upper }}
    +
    {{ post.media_type }}
     {% if can_edit %} - - - - {% if let Some(user) = user %} -
    -

    Upload media

    -
    - -
      - - -
      -
      -
      -

      Create pool

      -
      - - -
      -
      - - {% else %} -
      -

      Log in

      -
      -
      - - -
      -
      - - -
      - -
      -
      - {% endif %} - - - diff --git a/templates/pages/create_pool.html b/templates/pages/create_pool.html new file mode 100644 index 0000000..c9bf8f8 --- /dev/null +++ b/templates/pages/create_pool.html @@ -0,0 +1,25 @@ + + + + Create pool - {{ application_name }} + {% include "fragments/common_headers.html" %} + + + +
      +

      Create pool

      +
      + + +
      +
      + + diff --git a/templates/pages/index.html b/templates/pages/index.html new file mode 100644 index 0000000..dc29f04 --- /dev/null +++ b/templates/pages/index.html @@ -0,0 +1,50 @@ + + + + {{ application_name }} + {% include "fragments/common_headers.html" %} + + +
      +

      {{ application_name }}

      +
      +

      Search

      +
      + {% let tags_value = "" %} {% include "fragments/tags_input.html" %} +
        + +
        +
        + +
        + + diff --git a/templates/pages/login.html b/templates/pages/login.html new file mode 100644 index 0000000..0bae60d --- /dev/null +++ b/templates/pages/login.html @@ -0,0 +1,24 @@ + + + + Login - {{ application_name }} + {% include "fragments/common_headers.html" %} + + + +
        +

        Login

        +
        +
        + + +
        +
        + + +
        + +
        +
        + + diff --git a/templates/pages/not_found.html b/templates/pages/not_found.html new file mode 100644 index 0000000..f96da0c --- /dev/null +++ b/templates/pages/not_found.html @@ -0,0 +1,14 @@ + + + + Not found + {% include "fragments/common_headers.html" %} + + + +
        +

        Not found

        +

        The requested resource could not be found.

        +
        + + diff --git a/templates/pool.html b/templates/pages/pool.html similarity index 87% rename from templates/pool.html rename to templates/pages/pool.html index 4b688eb..a033474 100644 --- a/templates/pool.html +++ b/templates/pages/pool.html @@ -1,12 +1,9 @@ - - - - Pool - {{ pool.name }} - {{ application_name }} - + {% include "fragments/common_headers.html" %} + @@ -50,12 +47,13 @@ {% endif %} +

        Pool - {{ pool.name }}

        Posts

        - {% include "pool_posts.html" %} + {% include "fragments/pool_posts.html" %}
        {% if can_edit %}
        @@ -68,8 +66,9 @@ diff --git a/templates/pages/pools.html b/templates/pages/pools.html new file mode 100644 index 0000000..77ffbaa --- /dev/null +++ b/templates/pages/pools.html @@ -0,0 +1,37 @@ + + + + Pools - {{ application_name }} + {% include "fragments/common_headers.html" %} + + + +
        +

        Pools

        + {% if pools.is_empty() %} +
        No pools found!
        + {% else %} + +
        +
          + {% for i in 1..=page_count %} +
        • + {% if i == page as u64 %} + {{ i }} + {% else %} + {{ i }} + {% endif %} +
          • + {% endfor %} +
        +
        + {% endif %} +
        + + diff --git a/templates/pages/posts.html b/templates/pages/posts.html new file mode 100644 index 0000000..6c7561b --- /dev/null +++ b/templates/pages/posts.html @@ -0,0 +1,79 @@ + + + + Posts - {{ application_name }} + {% include "fragments/common_headers.html" %} + + + +
        +

        Search

        +
        + +
          + +
          +
          + {% if let Some(tags) = tags %} + {% if !tags.is_empty() %} +
          +

          Tags

          +
            + {% for tag in tags %} +
          • {{ tag }}
            • + {% endfor %} +
          +
          + {% endif %} + {% endif %} +
          +

          Posts

          + {% if posts.is_empty() %} +
          No posts found!
          + {% else %} +
          + +
          +
          +
            + {% for i in 1..=page_count %} +
          • + {% if i == page as u64 %} + {{ i }} + {% else %} + {{ i }} + {% endif %} +
            • + {% endfor %} +
          +
          + {% endif %} +
          + + diff --git a/templates/settings.html b/templates/pages/settings.html similarity index 63% rename from templates/settings.html rename to templates/pages/settings.html index 3dcf2da..bc5f9de 100644 --- a/templates/settings.html +++ b/templates/pages/settings.html @@ -1,13 +1,11 @@ - - - Settings - {{ application_name }} - + {% include "fragments/common_headers.html" %} +

          Settings

          diff --git a/templates/pages/upload.html b/templates/pages/upload.html new file mode 100644 index 0000000..2c9858e --- /dev/null +++ b/templates/pages/upload.html @@ -0,0 +1,24 @@ + + + + Upload media - {{ application_name }} + {% include "fragments/common_headers.html" %} + + + +
          +

          Upload media

          + + {% let tags_value = "" %} {% include "fragments/tags_input.html" %} +
            + + + +
            + + diff --git a/templates/view_post.html b/templates/pages/view_post.html similarity index 64% rename from templates/view_post.html rename to templates/pages/view_post.html index fbb4f84..f99da2d 100644 --- a/templates/view_post.html +++ b/templates/pages/view_post.html @@ -1,11 +1,8 @@ - - - Post #{{ post.id }} - {{ application_name }} - + {% include "fragments/common_headers.html" %} - + {% when "video" %} - + @@ -40,22 +37,57 @@ {% else %} {% endmatch %} + +
            +

            Search

            +
            + +
              + +
              +
              +
              +

              Tags

              + {% if tags.is_empty() %} +

              No tags in post. Consider adding some!

              + {% else %} + + {% endif %} +

              View post #{{ post.id }}

              {% match post.media_type.as_ref() %}{% when "image" %}{% include - "get_image_media.html" %}{% when "video" %}{% include - "get_video_media.html" %}{% else %}{% endmatch %} + "fragments/get_image_media.html" %}{% when "video" %}{% include + "fragments/get_video_media.html" %}{% else %}{% endmatch %}

              Details

              - {% include "post_details.html" %} + {% include "fragments/post_details.html" %}
              {% if let Some(parent_post) = parent_post %} {% endif %} - diff --git a/templates/pools.html b/templates/pools.html deleted file mode 100644 index 3a4dd46..0000000 --- a/templates/pools.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - Pools - {{ application_name }} - - - -
              -

              Viewing pools

              - {% if pools.is_empty() %} -
              No pools found!
              - {% else %} - -
              Page {{ page }} of {{ page_count }}
              - {% endif %} -
              - - diff --git a/templates/posts.html b/templates/posts.html deleted file mode 100644 index 639c389..0000000 --- a/templates/posts.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - Posts - {{ application_name }} - - - -
              -

              Search

              -
              - -
                - -
                -
                -
                -

                Tags

                -
                  - {% if let Some(tags) = tags %} {% for tag in tags %} -
                • {{ tag }}
                  • - {% endfor %} {% endif %} -
                -
                -
                -

                Viewing posts

                - {% if posts.is_empty() %} -
                No posts found!
                - {% else %} - -
                Page {{ page }} of {{ page_count }}
                - {% endif %} -
                - -