Beter zo
This commit is contained in:
17 files changed
+253
-237
No files matched your search
+2
-2
@@ -13,7 +13,7 @@ mod db;
|
||||
mod paste;
|
||||
mod routes;
|
||||
use crate::routes::{
|
||||
delete_note, get_note, get_redirect, gui_page, home_page, list_notes, post_note, post_once,
|
||||
delete_note, docs_page, get_note, get_redirect, home_page, list_notes, post_note, post_once,
|
||||
post_redirect, put_note, put_redirect,
|
||||
};
|
||||
|
||||
@@ -26,7 +26,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
|
||||
let app = Router::new()
|
||||
.route("/", get(home_page).post(post_note))
|
||||
.route("/gui", get(gui_page))
|
||||
.route("/docs", get(docs_page))
|
||||
.route("/once", post(post_once))
|
||||
.route("/once/{id}", post(post_once))
|
||||
.route("/to", post(post_redirect))
|
||||
|
||||
+2
-2
@@ -2,9 +2,9 @@ use axum::http::{HeaderMap, header::ACCEPT};
|
||||
|
||||
mod create;
|
||||
mod delete_note;
|
||||
mod docs;
|
||||
mod get_note;
|
||||
mod get_redirect;
|
||||
mod gui;
|
||||
mod home;
|
||||
mod input;
|
||||
mod list_notes;
|
||||
@@ -17,9 +17,9 @@ mod put_redirect;
|
||||
mod update;
|
||||
|
||||
pub use delete_note::delete_note;
|
||||
pub use docs::docs_page;
|
||||
pub use get_note::get_note;
|
||||
pub use get_redirect::get_redirect;
|
||||
pub use gui::gui_page;
|
||||
pub use home::home_page;
|
||||
pub use list_notes::list_notes;
|
||||
pub use post_note::post_note;
|
||||
|
||||
@@ -14,7 +14,7 @@ pub async fn create(
|
||||
paste_type: PasteType,
|
||||
) -> Result<String, StatusCode> {
|
||||
let mut id = id.map(|Path(id)| id).filter(|id| {
|
||||
!matches!(id.as_str(), "gui" | "list" | "once" | "to" | "static") && !id.contains('/')
|
||||
!matches!(id.as_str(), "docs" | "list" | "once" | "to" | "static") && !id.contains('/')
|
||||
});
|
||||
|
||||
if matches!(paste_type, PasteType::TextV1) && input.language.is_none() {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use askama::Template;
|
||||
use askama_web::WebTemplate;
|
||||
use axum::{
|
||||
http::{HeaderMap, header::CONTENT_TYPE},
|
||||
response::{IntoResponse, Response},
|
||||
};
|
||||
use pulldown_cmark::{Options, Parser, html};
|
||||
|
||||
use super::return_html;
|
||||
|
||||
static README_MD: &str = include_str!("../../README.md");
|
||||
|
||||
static README_HTML: LazyLock<String> = LazyLock::new(|| {
|
||||
let parser = Parser::new_ext(
|
||||
README_MD,
|
||||
Options::ENABLE_TABLES | Options::ENABLE_STRIKETHROUGH | Options::ENABLE_TASKLISTS,
|
||||
);
|
||||
let mut rendered = String::new();
|
||||
html::push_html(&mut rendered, parser);
|
||||
rendered
|
||||
});
|
||||
|
||||
#[derive(Template, WebTemplate)]
|
||||
#[template(path = "docs.html")]
|
||||
pub struct DocsPage {
|
||||
readme: &'static str,
|
||||
}
|
||||
|
||||
pub async fn docs_page(headers: HeaderMap) -> Response {
|
||||
if return_html(&headers) {
|
||||
DocsPage {
|
||||
readme: &README_HTML,
|
||||
}
|
||||
.into_response()
|
||||
} else {
|
||||
([(CONTENT_TYPE, "text/markdown; charset=utf-8")], README_MD).into_response()
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
use askama::Template;
|
||||
use askama_web::WebTemplate;
|
||||
use axum::http::StatusCode;
|
||||
use irosashi::Highlighter;
|
||||
|
||||
#[derive(Template, WebTemplate)]
|
||||
#[template(path = "gui.html")]
|
||||
pub struct GuiPage {
|
||||
languages: Vec<String>,
|
||||
}
|
||||
|
||||
pub async fn gui_page() -> Result<GuiPage, StatusCode> {
|
||||
let highlighter = Highlighter::new().map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
Ok(GuiPage {
|
||||
languages: highlighter.languages(),
|
||||
})
|
||||
}
|
||||
+17
-39
@@ -1,50 +1,28 @@
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use askama::Template;
|
||||
use askama_web::WebTemplate;
|
||||
use pulldown_cmark::{Event, Options, Parser, Tag, html};
|
||||
use axum::{
|
||||
http::{HeaderMap, StatusCode},
|
||||
response::{IntoResponse, Response},
|
||||
};
|
||||
use irosashi::Highlighter;
|
||||
|
||||
static README_HTML: LazyLock<String> = LazyLock::new(|| {
|
||||
let events: Vec<_> = Parser::new_ext(
|
||||
include_str!("../../README.md"),
|
||||
Options::ENABLE_TABLES | Options::ENABLE_STRIKETHROUGH | Options::ENABLE_TASKLISTS,
|
||||
)
|
||||
.collect();
|
||||
let anchored = events.iter().enumerate().map(|(index, event)| {
|
||||
if let Event::Start(Tag::Heading(level, None, _)) = event {
|
||||
let title: String = events[index + 1..]
|
||||
.iter()
|
||||
.take_while(|event| !matches!(event, Event::End(Tag::Heading(..))))
|
||||
.filter_map(|event| match event {
|
||||
Event::Text(text) | Event::Code(text) => Some(text.as_ref()),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
let slug: String = title
|
||||
.to_lowercase()
|
||||
.chars()
|
||||
.filter(|character| {
|
||||
character.is_alphanumeric() || *character == '-' || character.is_whitespace()
|
||||
})
|
||||
.collect();
|
||||
let slug = slug.split_whitespace().collect::<Vec<_>>().join("-");
|
||||
return Event::Html(format!("<{level} id=\"{slug}\">").into());
|
||||
}
|
||||
event.clone()
|
||||
});
|
||||
let mut rendered = String::new();
|
||||
html::push_html(&mut rendered, anchored);
|
||||
rendered
|
||||
});
|
||||
use super::return_html;
|
||||
|
||||
#[derive(Template, WebTemplate)]
|
||||
#[template(path = "home.html")]
|
||||
pub struct HomePage {
|
||||
readme: &'static str,
|
||||
languages: Vec<String>,
|
||||
}
|
||||
|
||||
pub async fn home_page() -> HomePage {
|
||||
HomePage {
|
||||
readme: &README_HTML,
|
||||
pub async fn home_page(headers: HeaderMap) -> Result<Response, StatusCode> {
|
||||
if !return_html(&headers) {
|
||||
return Ok("Welcome @ Pastabble!\n\nShare text, code, short links, and one-time secrets.\nDocumentation: /docs\n".into_response());
|
||||
}
|
||||
|
||||
let highlighter = Highlighter::new().map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
Ok(HomePage {
|
||||
languages: highlighter.languages(),
|
||||
}
|
||||
.into_response())
|
||||
}
|
||||
Reference in new issue
Block a user