From 686ec924d1cdf6fb592778b28e82e4c80a4484e0 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Tue, 19 Jul 2022 19:24:56 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1ade=20nuevo=20proyecto=20para=20el=20sit?= =?UTF-8?q?io=20web=20de=20PageTop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +++-- Cargo.toml | 1 + {config => drust/config}/default.toml | 0 drust/src/main.rs | 7 ------- pagetop/src/app/application.rs | 5 +++++ pagetop/src/app/definition.rs | 5 +---- pagetop/src/base/module.rs | 2 +- .../base/module/{demopage.rs => homepage.rs} | 12 +++++------ .../locales/en-US/homepage.ftl} | 0 .../locales/es-ES/homepage.ftl} | 0 .../module/{demopage => homepage}/styles.css | 0 website/Cargo.toml | 20 +++++++++++++++++++ website/config/default.toml | 9 +++++++++ website/src/main.rs | 11 ++++++++++ 14 files changed, 57 insertions(+), 20 deletions(-) rename {config => drust/config}/default.toml (100%) rename pagetop/src/base/module/{demopage.rs => homepage.rs} (95%) rename pagetop/src/base/module/{demopage/locales/en-US/demopage.ftl => homepage/locales/en-US/homepage.ftl} (100%) rename pagetop/src/base/module/{demopage/locales/es-ES/demopage.ftl => homepage/locales/es-ES/homepage.ftl} (100%) rename pagetop/static/theme/module/{demopage => homepage}/styles.css (100%) create mode 100644 website/Cargo.toml create mode 100644 website/config/default.toml create mode 100644 website/src/main.rs diff --git a/.gitignore b/.gitignore index 3e04751d..0c5ec392 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -workdir **/target -**/log/*.log +**/log/*.log* +**/update.sh Cargo.lock +workdir diff --git a/Cargo.toml b/Cargo.toml index 00ab4e13..75cd1c81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,4 +5,5 @@ members = [ "pagetop-admin", "pagetop-user", "pagetop-node", + "website", ] \ No newline at end of file diff --git a/config/default.toml b/drust/config/default.toml similarity index 100% rename from config/default.toml rename to drust/config/default.toml diff --git a/drust/src/main.rs b/drust/src/main.rs index 4c210191..576d4bdb 100644 --- a/drust/src/main.rs +++ b/drust/src/main.rs @@ -8,13 +8,6 @@ impl AppTrait for Drust { &pagetop_admin::Admin, &pagetop_user::User, &pagetop_node::Node, - &pagetop::base::module::demopage::Demopage, - ] - } - - fn themes(&self) -> Vec<&'static dyn ThemeTrait> { - vec![ - &pagetop::base::theme::bulmix::Bulmix, ] } } diff --git a/pagetop/src/app/application.rs b/pagetop/src/app/application.rs index 6f175555..8acfaf7f 100644 --- a/pagetop/src/app/application.rs +++ b/pagetop/src/app/application.rs @@ -25,6 +25,10 @@ impl Application { #[cfg(any(feature = "mysql", feature = "postgres", feature = "sqlite"))] Lazy::force(&super::db::DBCONN); + // Habilita los módulos predeterminados. + module::all::enable_modules(vec![ + &base::module::homepage::DefaultHomePage, + ]); // Habilita los módulos de la aplicación. module::all::enable_modules(app.enable_modules()); @@ -33,6 +37,7 @@ impl Application { &base::theme::aliner::Aliner, &base::theme::minimal::Minimal, &base::theme::bootsier::Bootsier, + &base::theme::bulmix::Bulmix, ]); // Registra los temas de la aplicación. theme::all::register_themes(app.themes()); diff --git a/pagetop/src/app/definition.rs b/pagetop/src/app/definition.rs index 4740d223..2c68e6cf 100644 --- a/pagetop/src/app/definition.rs +++ b/pagetop/src/app/definition.rs @@ -1,4 +1,3 @@ -use crate::base::module::demopage; use crate::core::module::ModuleTrait; use crate::core::theme::ThemeTrait; @@ -7,9 +6,7 @@ pub trait AppTrait: Send + Sync { } fn enable_modules(&self) -> Vec<&'static dyn ModuleTrait> { - vec![ - &demopage::Demopage, - ] + vec![] } fn disable_modules(&self) -> Vec<&'static dyn ModuleTrait> { diff --git a/pagetop/src/base/module.rs b/pagetop/src/base/module.rs index 7107d180..070e5b82 100644 --- a/pagetop/src/base/module.rs +++ b/pagetop/src/base/module.rs @@ -1 +1 @@ -pub mod demopage; +pub mod homepage; diff --git a/pagetop/src/base/module/demopage.rs b/pagetop/src/base/module/homepage.rs similarity index 95% rename from pagetop/src/base/module/demopage.rs rename to pagetop/src/base/module/homepage.rs index f7940dfe..c43f7003 100644 --- a/pagetop/src/base/module/demopage.rs +++ b/pagetop/src/base/module/homepage.rs @@ -1,14 +1,14 @@ use crate::prelude::*; -pub const MODULE_DEMOPAGE: &str = "pagetop::module::demopage"; +pub const MODULE_DEFAULT_HOMEPAGE: &str = "pagetop::module::homepage::default"; -localize!("src/base/module/demopage/locales"); +localize!("src/base/module/homepage/locales"); -pub struct Demopage; +pub struct DefaultHomePage; -impl ModuleTrait for Demopage { +impl ModuleTrait for DefaultHomePage { fn handler(&self) -> &'static str { - MODULE_DEMOPAGE + MODULE_DEFAULT_HOMEPAGE } fn name(&self) -> String { @@ -28,7 +28,7 @@ async fn demo() -> app::Result { Page::new() .with_title(l("page_title").as_str()) .with_context(InContextOp::StyleSheet(AssetsOp::Add( - StyleSheet::located("/theme/module/demopage/styles.css") + StyleSheet::located("/theme/module/homepage/styles.css") ))) .add_to("content", hello_world()) .add_to("content", welcome()) diff --git a/pagetop/src/base/module/demopage/locales/en-US/demopage.ftl b/pagetop/src/base/module/homepage/locales/en-US/homepage.ftl similarity index 100% rename from pagetop/src/base/module/demopage/locales/en-US/demopage.ftl rename to pagetop/src/base/module/homepage/locales/en-US/homepage.ftl diff --git a/pagetop/src/base/module/demopage/locales/es-ES/demopage.ftl b/pagetop/src/base/module/homepage/locales/es-ES/homepage.ftl similarity index 100% rename from pagetop/src/base/module/demopage/locales/es-ES/demopage.ftl rename to pagetop/src/base/module/homepage/locales/es-ES/homepage.ftl diff --git a/pagetop/static/theme/module/demopage/styles.css b/pagetop/static/theme/module/homepage/styles.css similarity index 100% rename from pagetop/static/theme/module/demopage/styles.css rename to pagetop/static/theme/module/homepage/styles.css diff --git a/website/Cargo.toml b/website/Cargo.toml new file mode 100644 index 00000000..3ca2163a --- /dev/null +++ b/website/Cargo.toml @@ -0,0 +1,20 @@ +[package] +name = "pagetop-website" +version = "0.0.1" +edition = "2021" + +authors = [ + "Manuel Cillero " +] +description = """\ + PageTop and Drust website.\ +""" +homepage = "https://pagetop.cillero.es" +repository = "https://gitlab.com/manuelcillero/pagetop/website" +license = "Apache-2.0 or MIT" + +[dependencies.pagetop] +path = "../pagetop" + +[dependencies] +actix-web = "4.1.0" diff --git a/website/config/default.toml b/website/config/default.toml new file mode 100644 index 00000000..3216329d --- /dev/null +++ b/website/config/default.toml @@ -0,0 +1,9 @@ +[app] +name = "PageTop WebSite" +description = """\ + The definitive PageTop Guide for PageTop Users.\ +""" +language = "es-ES" + +[log] +rolling = "Daily" diff --git a/website/src/main.rs b/website/src/main.rs new file mode 100644 index 00000000..fad7b05d --- /dev/null +++ b/website/src/main.rs @@ -0,0 +1,11 @@ +use pagetop::prelude::*; + +struct PageTopWebSite; + +impl AppTrait for PageTopWebSite { +} + +#[actix_web::main] +async fn main() -> std::io::Result<()> { + Application::prepare(PageTopWebSite).await?.run()?.await +}