manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Retoca formato pendiente del código vía cargo fmt

Browse source
This commit is contained in:
Manuel Cillero 2022-07-30 07:00:16 +02:00
parent 592cd9ccda
commit 0e974d6d59
9 changed files with 36 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pagetop-node/src/migration/m20220316_000001_create_table_node_type.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum NodeType {
Table, // node_type: Stores information about all defined Node types.

1
pagetop-node/src/migration/m20220316_000002_create_table_node.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum Node {
Table, // node: The base table for nodes.

1
pagetop-node/src/migration/m20220316_000003_create_table_node_access.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum NodeAccess {
Table, // node_access: Identifies which realm/grant pairs a user must possess in

1
pagetop-node/src/migration/m20220316_000004_create_table_node_revision.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum NodeRevision {
Table, // node_revision: Stores information about each saved version of a Node.

1
pagetop-user/src/migration/m20220312_000001_create_table_role.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum Role {
Table, // role: Store user roles.

1
pagetop-user/src/migration/m20220312_000002_create_table_role_permission.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum RolePermission {
Table, // role_permission: Stores the permissions assigned to user roles.

1
pagetop-user/src/migration/m20220312_000003_create_table_user.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum User {
Table, // user: Stores user data.

1
pagetop-user/src/migration/m20220312_000004_create_table_user_role.rs
View file

@ -1,5 +1,6 @@
use pagetop::prelude::*;
#[rustfmt::skip]
#[derive(Iden)]
enum UserRole {
Table, // user_role: Maps users to roles.

59
website/src/mdbook.rs
View file

@ -7,9 +7,7 @@ use std::collections::HashMap;
include!(concat!(env!("OUT_DIR"), "/mdbook.rs"));
static MDBOOK: LazyStatic<HashMap<&'static str, Resource>> = LazyStatic::new(||
generate()
);
static MDBOOK: LazyStatic<HashMap<&'static str, Resource>> = LazyStatic::new(|| generate());
pub_const_handler!(MODULE_MDBOOK);
@ -24,7 +22,7 @@ impl ModuleTrait for MdBook {
cfg.service(
app::web::scope("/doc")
.route("{tail:.*html$}", app::web::get().to(mdbook_page))
.route("{tail:.*$}", app::web::get().to(mdbook_resource))
.route("{tail:.*$}", app::web::get().to(mdbook_resource)),
);
}
}
@ -35,7 +33,6 @@ async fn mdbook_page(request: app::HttpRequest) -> ResultPage<Markup, FatalError
if let Some(content) = MDBOOK.get(path) {
if let Ok(html) = std::str::from_utf8(content.data) {
let _lang = extract("Lang", html);
let title = match extract("Title", html) {
Some(title) => title,
@ -60,38 +57,38 @@ async fn mdbook_page(request: app::HttpRequest) -> ResultPage<Markup, FatalError
Page::new()
.with_title(title)
.with_context(PageOp::AddMetadata("theme-color", "#ffffff"))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/css/variables.css",
)))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/css/general.css",
)))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/css/chrome.css",
)))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/css/variables.css")
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/css/general.css")
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/css/chrome.css")
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/css/print.css").for_media(TargetMedia::Print)
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/FontAwesome/css/font-awesome.css")
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/fonts/fonts.css")
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/highlight.css")
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/tomorrow-night.css")
))
.with_context(PageOp::AddStyleSheet(
StyleSheet::located("/doc/ayu-highlight.css")
StyleSheet::located("/doc/css/print.css").for_media(TargetMedia::Print),
))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/FontAwesome/css/font-awesome.css",
)))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/fonts/fonts.css",
)))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/highlight.css",
)))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/tomorrow-night.css",
)))
.with_context(PageOp::AddStyleSheet(StyleSheet::located(
"/doc/ayu-highlight.css",
)))
.add_to(
"region-content",
Container::new()
.with_id("mdbook")
.with_component(Html::with(html! { (PreEscaped(&html[beginning..])) }))
.with_component(Html::with(html! { (PreEscaped(&html[beginning..])) })),
)
.render()
} else {