✨ Añade página de bienvenida y de comprobación
- Añade nueva hoja de estilos (normalize.css) al tema básico. - Activa la extensión de la página de bienvenida por defecto en el registro de extensiones. - Añade traducciones en inglés y español para el contenido de la página de bienvenida. - Incluye estilos CSS y recursos gráficos para el diseño y disposición de la página de bienvenida.
This commit is contained in:
parent
7d7920237f
commit
3a3e3b810f
27 changed files with 1000 additions and 17 deletions
|
@ -1,7 +1,9 @@
|
|||
//! Reúne acciones, componentes y temas listos para usar.
|
||||
//! Reúne acciones, componentes, extensiones y temas predefinidos.
|
||||
|
||||
pub mod action;
|
||||
|
||||
pub mod component;
|
||||
|
||||
pub mod extension;
|
||||
|
||||
pub mod theme;
|
||||
|
|
4
src/base/extension.rs
Normal file
4
src/base/extension.rs
Normal file
|
@ -0,0 +1,4 @@
|
|||
//! Extensiones para funcionalidades avanzadas de `PageTop`.
|
||||
|
||||
mod welcome;
|
||||
pub use welcome::Welcome;
|
108
src/base/extension/welcome.rs
Normal file
108
src/base/extension/welcome.rs
Normal file
|
@ -0,0 +1,108 @@
|
|||
use crate::prelude::*;
|
||||
|
||||
/// Página de bienvenida predeterminada de `PageTop`.
|
||||
///
|
||||
/// Esta extensión se instala por defecto y muestra una página en la ruta raíz (`/`) cuando no se ha
|
||||
/// configurado ninguna página de inicio personalizada. Permite confirmar que el servidor está
|
||||
/// funcionando correctamente.
|
||||
pub struct Welcome;
|
||||
|
||||
impl ExtensionTrait for Welcome {
|
||||
fn name(&self) -> L10n {
|
||||
L10n::l("welcome_extension_name")
|
||||
}
|
||||
|
||||
fn description(&self) -> L10n {
|
||||
L10n::l("welcome_extension_description")
|
||||
}
|
||||
|
||||
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||
scfg.route("/", service::web::get().to(homepage));
|
||||
}
|
||||
}
|
||||
|
||||
async fn homepage(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
|
||||
let app = &global::SETTINGS.app.name;
|
||||
|
||||
Page::new(request)
|
||||
.with_title(L10n::l("welcome_page"))
|
||||
.with_theme("Basic")
|
||||
.with_assets(AssetsOp::AddStyleSheet(StyleSheet::from("/css/welcome.css")))
|
||||
.with_component(Html::with(html! {
|
||||
div id="main-header" {
|
||||
header {
|
||||
h1 id="header-title" aria-label=(L10n::l("welcome_aria").with_arg("app", app)) {
|
||||
span { (L10n::l("welcome_title")) }
|
||||
(L10n::l("welcome_intro").with_arg("app", app))
|
||||
}
|
||||
}
|
||||
aside id="header-image" aria-hidden="true" {
|
||||
div id="monster" {
|
||||
picture {
|
||||
source
|
||||
type="image/avif"
|
||||
src="/img/monster-pagetop_250.avif"
|
||||
srcset="/img/monster-pagetop_500.avif 1.5x";
|
||||
source
|
||||
type="image/webp"
|
||||
src="/img/monster-pagetop_250.webp"
|
||||
srcset="/img/monster-pagetop_500.webp 1.5x";
|
||||
img
|
||||
src="/img/monster-pagetop_250.png"
|
||||
srcset="/img/monster-pagetop_500.png 1.5x"
|
||||
alt="Monster PageTop";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
main id="main-content" {
|
||||
section class="content-body" {
|
||||
div id="poweredby-button" {
|
||||
a id="poweredby-link" href="https://pagetop.cillero.es" target="_blank" rel="noreferrer" {
|
||||
span {} span {} span {}
|
||||
div id="poweredby-text" { (L10n::l("welcome_powered")) }
|
||||
}
|
||||
}
|
||||
div class="content-text" {
|
||||
p { (L10n::l("welcome_text1")) }
|
||||
p { (L10n::l("welcome_text2")) }
|
||||
|
||||
div class="subcontent" {
|
||||
h1 { span { (L10n::l("welcome_about")) } }
|
||||
p { (L10n::l("welcome_pagetop")) }
|
||||
p { (L10n::l("welcome_issues1")) }
|
||||
p { (L10n::l("welcome_issues2").with_arg("app", app)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
footer id="footer" {
|
||||
section class="footer-inner" {
|
||||
div class="footer-logo" {
|
||||
svg
|
||||
viewBox="0 0 1614 1614"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
role="img"
|
||||
aria-label=(L10n::l("pagetop_logo"))
|
||||
preserveAspectRatio="xMidYMid slice"
|
||||
focusable="false"
|
||||
{
|
||||
path fill="rgb(255,255,255)" d="M 1573,357 L 1415,357 C 1400,357 1388,369 1388,383 L 1388,410 1335,410 1335,357 C 1335,167 1181,13 992,13 L 621,13 C 432,13 278,167 278,357 L 278,410 225,410 225,383 C 225,369 213,357 198,357 L 40,357 C 25,357 13,369 13,383 L 13,648 C 13,662 25,674 40,674 L 198,674 C 213,674 225,662 225,648 L 225,621 278,621 278,1256 C 278,1446 432,1600 621,1600 L 992,1600 C 1181,1600 1335,1446 1335,1256 L 1335,621 1388,621 1388,648 C 1388,662 1400,674 1415,674 L 1573,674 C 1588,674 1600,662 1600,648 L 1600,383 C 1600,369 1588,357 1573,357 L 1573,357 1573,357 Z M 66,410 L 172,410 172,621 66,621 66,410 66,410 Z M 1282,357 L 1282,488 C 1247,485 1213,477 1181,464 L 1196,437 C 1203,425 1199,409 1186,401 1174,394 1158,398 1150,411 L 1133,440 C 1105,423 1079,401 1056,376 L 1075,361 C 1087,352 1089,335 1079,324 1070,313 1054,311 1042,320 L 1023,335 C 1000,301 981,263 967,221 L 1011,196 C 1023,189 1028,172 1021,160 1013,147 997,143 984,150 L 953,168 C 945,136 941,102 940,66 L 992,66 C 1152,66 1282,197 1282,357 L 1282,357 1282,357 Z M 621,66 L 674,66 674,225 648,225 C 633,225 621,237 621,251 621,266 633,278 648,278 L 674,278 674,357 648,357 C 633,357 621,369 621,383 621,398 633,410 648,410 L 674,410 674,489 648,489 C 633,489 621,501 621,516 621,530 633,542 648,542 L 664,542 C 651,582 626,623 600,662 583,653 563,648 542,648 469,648 410,707 410,780 410,787 411,794 412,801 388,805 361,806 331,806 L 331,357 C 331,197 461,66 621,66 L 621,66 621,66 Z M 621,780 C 621,824 586,859 542,859 498,859 463,824 463,780 463,736 498,701 542,701 586,701 621,736 621,780 L 621,780 621,780 Z M 225,463 L 278,463 278,569 225,569 225,463 225,463 Z M 992,1547 L 621,1547 C 461,1547 331,1416 331,1256 L 331,859 C 367,859 400,858 431,851 454,888 495,912 542,912 615,912 674,853 674,780 674,747 662,718 642,695 675,645 706,594 720,542 L 780,542 C 795,542 807,530 807,516 807,501 795,489 780,489 L 727,489 727,410 780,410 C 795,410 807,398 807,383 807,369 795,357 780,357 L 727,357 727,278 780,278 C 795,278 807,266 807,251 807,237 795,225 780,225 L 727,225 727,66 887,66 C 889,111 895,155 905,196 L 869,217 C 856,224 852,240 859,253 864,261 873,266 882,266 887,266 891,265 895,263 L 921,248 C 937,291 958,331 983,367 L 938,403 C 926,412 925,429 934,440 939,447 947,450 954,450 960,450 966,448 971,444 L 1016,408 C 1043,438 1074,465 1108,485 L 1084,527 C 1076,539 1081,555 1093,563 1098,565 1102,566 1107,566 1116,566 1125,561 1129,553 L 1155,509 C 1194,527 1237,538 1282,541 L 1282,1256 C 1282,1416 1152,1547 992,1547 L 992,1547 992,1547 Z M 1335,463 L 1388,463 1388,569 1335,569 1335,463 1335,463 Z M 1441,410 L 1547,410 1547,621 1441,621 1441,410 1441,410 Z" {}
|
||||
path fill="rgb(255,255,255)" d="M 1150,1018 L 463,1018 C 448,1018 436,1030 436,1044 L 436,1177 C 436,1348 545,1468 701,1468 L 912,1468 C 1068,1468 1177,1348 1177,1177 L 1177,1044 C 1177,1030 1165,1018 1150,1018 L 1150,1018 1150,1018 Z M 912,1071 L 1018,1071 1018,1124 912,1124 912,1071 912,1071 Z M 489,1071 L 542,1071 542,1124 489,1124 489,1071 489,1071 Z M 701,1415 L 700,1415 C 701,1385 704,1352 718,1343 731,1335 759,1341 795,1359 802,1363 811,1363 818,1359 854,1341 882,1335 895,1343 909,1352 912,1385 913,1415 L 912,1415 701,1415 701,1415 701,1415 Z M 1124,1177 C 1124,1296 1061,1384 966,1408 964,1365 958,1320 922,1298 894,1281 856,1283 807,1306 757,1283 719,1281 691,1298 655,1320 649,1365 647,1408 552,1384 489,1296 489,1177 L 569,1177 C 583,1177 595,1165 595,1150 L 595,1071 859,1071 859,1150 C 859,1165 871,1177 886,1177 L 1044,1177 C 1059,1177 1071,1165 1071,1150 L 1071,1071 1124,1071 1124,1177 1124,1177 1124,1177 Z" {}
|
||||
path fill="rgb(255,255,255)" d="M 1071,648 C 998,648 939,707 939,780 939,853 998,912 1071,912 1144,912 1203,853 1203,780 1203,707 1144,648 1071,648 L 1071,648 1071,648 Z M 1071,859 C 1027,859 992,824 992,780 992,736 1027,701 1071,701 1115,701 1150,736 1150,780 1150,824 1115,859 1071,859 L 1071,859 1071,859 Z" {}
|
||||
}
|
||||
}
|
||||
div class="footer-links" {
|
||||
a href="https://crates.io/crates/pagetop" target="_blank" rel="noreferrer" { ("Crates.io") }
|
||||
a href="https://docs.rs/pagetop" target="_blank" rel="noreferrer" { ("Docs.rs") }
|
||||
a href="https://git.cillero.es/manuelcillero/pagetop" target="_blank" rel="noreferrer" { (L10n::l("welcome_code")) }
|
||||
em { (L10n::l("welcome_have_fun")) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}))
|
||||
.render()
|
||||
}
|
|
@ -11,4 +11,12 @@ impl ExtensionTrait for Basic {
|
|||
}
|
||||
}
|
||||
|
||||
impl ThemeTrait for Basic {}
|
||||
impl ThemeTrait for Basic {
|
||||
fn after_render_page_body(&self, page: &mut Page) {
|
||||
page.alter_assets(AssetsOp::AddStyleSheet(
|
||||
StyleSheet::from("/css/normalize.css")
|
||||
.with_version("8.0.1")
|
||||
.with_weight(-99),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,8 +29,8 @@ pub fn register_extensions(root_extension: Option<ExtensionRef>) {
|
|||
add_to_enabled(&mut enabled_list, extension);
|
||||
}
|
||||
|
||||
/* Añade la página de bienvenida por defecto a la lista de extensiones habilitadas.
|
||||
add_to_enabled(&mut enabled_list, &crate::base::extension::Welcome); */
|
||||
// Añade la página de bienvenida por defecto a la lista de extensiones habilitadas.
|
||||
add_to_enabled(&mut enabled_list, &crate::base::extension::Welcome);
|
||||
|
||||
// Guarda la lista final de extensiones habilitadas.
|
||||
ENABLED_EXTENSIONS.write().append(&mut enabled_list);
|
||||
|
@ -128,9 +128,18 @@ pub fn initialize_extensions() {
|
|||
include_files!(assets);
|
||||
|
||||
pub fn configure_services(scfg: &mut service::web::ServiceConfig) {
|
||||
// Sólo compila durante el desarrollo, para evitar errores 400 en la traza de eventos.
|
||||
#[cfg(debug_assertions)]
|
||||
scfg.route(
|
||||
// Ruta automática lanzada por Chrome DevTools.
|
||||
"/.well-known/appspecific/com.chrome.devtools.json",
|
||||
service::web::get().to(|| async { service::HttpResponse::NotFound().finish() }),
|
||||
);
|
||||
|
||||
for extension in ENABLED_EXTENSIONS.read().iter() {
|
||||
extension.configure_service(scfg);
|
||||
}
|
||||
|
||||
include_files_service!(
|
||||
scfg, assets => "/", [&global::SETTINGS.dev.pagetop_project_dir, "static"]
|
||||
);
|
||||
|
|
|
@ -6,7 +6,7 @@ use serde::Deserialize;
|
|||
|
||||
include_config!(SETTINGS: Settings => [
|
||||
// [app]
|
||||
"app.name" => "Sample",
|
||||
"app.name" => "PageTop App",
|
||||
"app.description" => "Developed with the amazing PageTop framework.",
|
||||
"app.theme" => "Basic",
|
||||
"app.language" => "en-US",
|
||||
|
|
|
@ -98,7 +98,7 @@ pub mod core;
|
|||
pub mod response;
|
||||
// Gestión del servidor y servicios web.
|
||||
pub mod service;
|
||||
// Reúne acciones, componentes y temas listos para usar.
|
||||
// Reúne acciones, componentes, extensiones y temas predefinidos.
|
||||
pub mod base;
|
||||
// Prepara y ejecuta la aplicación.
|
||||
pub mod app;
|
||||
|
|
|
@ -90,7 +90,7 @@
|
|||
//! Y *voilà*, sólo queda operar con los idiomas soportados por `PageTop` usando [`LangMatch`] y
|
||||
//! traducir textos con [`L10n`].
|
||||
|
||||
use crate::html::{Markup, PreEscaped};
|
||||
use crate::html::{Markup, PreEscaped, Render};
|
||||
use crate::{global, hm, AutoDefault};
|
||||
|
||||
pub use fluent_templates;
|
||||
|
@ -313,7 +313,7 @@ enum L10nOp {
|
|||
/// // Traducción simple con clave y argumentos.
|
||||
/// let hello = L10n::l("greeting")
|
||||
/// .with_arg("name", "Manuel")
|
||||
/// .markup();
|
||||
/// .get();
|
||||
/// ```
|
||||
///
|
||||
/// También para traducciones a idiomas concretos.
|
||||
|
@ -400,17 +400,19 @@ impl L10n {
|
|||
}
|
||||
}
|
||||
|
||||
/// Traduce y escapa con el idioma por defecto, devolviendo [`Markup`].
|
||||
pub fn markup(&self) -> Markup {
|
||||
PreEscaped(self.get().unwrap_or_default())
|
||||
}
|
||||
|
||||
/// Traduce y escapa con el [`LanguageIdentifier`] indicado, devolviendo [`Markup`].
|
||||
pub fn escaped(&self, langid: &LanguageIdentifier) -> Markup {
|
||||
PreEscaped(self.using(langid).unwrap_or_default())
|
||||
}
|
||||
}
|
||||
|
||||
impl Render for L10n {
|
||||
/// Traduce y escapa con el idioma por defecto, devolviendo [`Markup`].
|
||||
fn render(&self) -> Markup {
|
||||
PreEscaped(self.get().unwrap_or_default())
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Debug for L10n {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_struct("L10n")
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
content = Content
|
||||
pagetop_logo = PageTop Logo
|
||||
|
|
21
src/locale/en-US/welcome.ftl
Normal file
21
src/locale/en-US/welcome.ftl
Normal file
|
@ -0,0 +1,21 @@
|
|||
welcome_extension_name = Default homepage
|
||||
welcome_extension_description = Displays a landing page when none is configured.
|
||||
|
||||
welcome_page = Welcome Page
|
||||
welcome_title = Hello world!
|
||||
welcome_aria = Say hello to your { $app } installation
|
||||
|
||||
welcome_intro = Discover⚡{ $app }
|
||||
welcome_powered = A web solution powered by <strong>PageTop!</strong>
|
||||
|
||||
welcome_text1 = If you can read this page, it means that the <strong>PageTop</strong> server is running correctly but has not yet been fully configured. This usually means the site is either experiencing temporary issues or is undergoing routine maintenance.
|
||||
welcome_text2 = If the issue persists, please <strong>contact your system administrator</strong> for assistance.
|
||||
|
||||
welcome_about = About
|
||||
welcome_pagetop = <strong>PageTop</strong> is a <a href="https://www.rust-lang.org" target="_blank">Rust</a>-based web development framework for building modular, extensible, and configurable web solutions.
|
||||
|
||||
welcome_issues1 = To report issues related to the <strong>PageTop</strong> framework, please use <a href="https://git.cillero.es/manuelcillero/pagetop/issues" target="_blank">SoloGit</a>. Before opening a new issue, check existing reports to avoid duplicates.
|
||||
welcome_issues2 = For issues related specifically to <strong>{ $app }</strong>, please refer to its official repository or support channel, rather than directly to <strong>PageTop</strong>.
|
||||
|
||||
welcome_code = Code
|
||||
welcome_have_fun = Coding is creating
|
|
@ -1 +1,2 @@
|
|||
content = Contenido
|
||||
pagetop_logo = Logotipo de PageTop
|
||||
|
|
21
src/locale/es-ES/welcome.ftl
Normal file
21
src/locale/es-ES/welcome.ftl
Normal file
|
@ -0,0 +1,21 @@
|
|||
welcome_extension_name = Página de inicio predeterminada
|
||||
welcome_extension_description = Muestra una página de inicio predeterminada cuando no hay ninguna configurada.
|
||||
|
||||
welcome_page = Página de Bienvenida
|
||||
welcome_title = ¡Hola mundo!
|
||||
welcome_aria = Saluda a tu instalación { $app }
|
||||
|
||||
welcome_intro = Descubre⚡{ $app }
|
||||
welcome_powered = Una solución web creada con <strong>PageTop!</strong>
|
||||
|
||||
welcome_text1 = Si puedes leer esta página, significa que el servidor de <strong>PageTop</strong> funciona correctamente, pero aún no ha sido completamente configurado. Esto suele indicar que el sitio está experimentando problemas temporales o está pasando por un mantenimiento de rutina.
|
||||
welcome_text2 = Si el problema persiste, por favor <strong>contacta con el administrador del sistema</strong> para recibir asistencia técnica.
|
||||
|
||||
welcome_about = Acerca de
|
||||
welcome_pagetop = <strong>PageTop</strong> es un entorno de desarrollo web basado en <a href="https://www.rust-lang.org/es" target="_blank">Rust</a>, diseñado para crear soluciones web modulares, extensibles y configurables.
|
||||
|
||||
welcome_issues1 = Para comunicar cualquier problema con <strong>PageTop</strong>, utiliza <a href="https://git.cillero.es/manuelcillero/pagetop/issues" target="_blank">SoloGit</a>. Antes de informar de una incidencia, revisa los informes ya existentes para evitar duplicados.
|
||||
welcome_issues2 = Si se trata de fallos específicos de <strong>{ $app }</strong>, por favor acude a su repositorio oficial o canal de soporte, y no al de <strong>PageTop</strong> directamente.
|
||||
|
||||
welcome_code = Código
|
||||
welcome_have_fun = Programar es crear
|
Loading…
Add table
Add a link
Reference in a new issue