From 73ba80eff7186800d1a6630763d47dd7603c5d4a Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Wed, 20 Nov 2024 00:15:39 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Restructure=20dirs/files?= =?UTF-8?q?=20to=20fix=20examples=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.toml | 8 ++++++-- packages/pagetop/src/locale/en-US/welcome.ftl | 20 ------------------- packages/pagetop/src/locale/es-ES/welcome.ftl | 20 ------------------- {packages/pagetop => pagetop}/Cargo.toml | 0 {config => pagetop/config}/common.toml | 0 .../config}/predefined-settings.toml | 0 {examples => pagetop/examples}/app-basic.rs | 0 {examples => pagetop/examples}/hello-name.rs | 0 {examples => pagetop/examples}/hello-world.rs | 0 {packages/pagetop => pagetop}/src/app.rs | 0 .../pagetop => pagetop}/src/app/figfont.rs | 0 .../pagetop => pagetop}/src/app/slant.flf | 0 .../pagetop => pagetop}/src/app/small.flf | 0 .../pagetop => pagetop}/src/app/speed.flf | 0 .../pagetop => pagetop}/src/app/starwars.flf | 0 {packages/pagetop => pagetop}/src/core.rs | 0 .../pagetop => pagetop}/src/core/action.rs | 0 .../src/core/action/all.rs | 0 .../src/core/action/definition.rs | 0 .../src/core/action/list.rs | 0 .../pagetop => pagetop}/src/core/package.rs | 0 .../src/core/package/all.rs | 0 .../src/core/package/definition.rs | 0 .../src/core/package/welcome.rs | 2 +- .../pagetop => pagetop}/src/core/theme.rs | 0 .../pagetop => pagetop}/src/core/theme/all.rs | 0 .../src/core/theme/definition.rs | 0 {packages/pagetop => pagetop}/src/global.rs | 0 {packages/pagetop => pagetop}/src/html.rs | 0 .../pagetop => pagetop}/src/html/maud.rs | 0 .../src/html/maud/escape.rs | 0 {packages/pagetop => pagetop}/src/lib.rs | 0 {packages/pagetop => pagetop}/src/locale.rs | 0 pagetop/src/locale/en-US/welcome.ftl | 20 +++++++++++++++++++ pagetop/src/locale/es-ES/welcome.ftl | 20 +++++++++++++++++++ {packages/pagetop => pagetop}/src/prelude.rs | 0 {packages/pagetop => pagetop}/src/response.rs | 0 .../pagetop => pagetop}/src/response/json.rs | 0 .../src/response/redirect.rs | 0 {packages/pagetop => pagetop}/src/service.rs | 0 {packages/pagetop => pagetop}/src/trace.rs | 0 {packages/pagetop => pagetop}/src/util.rs | 0 .../pagetop => pagetop}/src/util/config.rs | 0 .../src/util/config/data.rs | 0 .../pagetop => pagetop}/src/util/config/de.rs | 0 .../src/util/config/error.rs | 0 .../src/util/config/file.rs | 0 .../src/util/config/file/source.rs | 0 .../src/util/config/file/toml.rs | 0 .../src/util/config/path.rs | 0 .../src/util/config/path/parser.rs | 0 .../src/util/config/source.rs | 0 .../src/util/config/value.rs | 0 53 files changed, 47 insertions(+), 43 deletions(-) delete mode 100644 packages/pagetop/src/locale/en-US/welcome.ftl delete mode 100644 packages/pagetop/src/locale/es-ES/welcome.ftl rename {packages/pagetop => pagetop}/Cargo.toml (100%) rename {config => pagetop/config}/common.toml (100%) rename {config => pagetop/config}/predefined-settings.toml (100%) rename {examples => pagetop/examples}/app-basic.rs (100%) rename {examples => pagetop/examples}/hello-name.rs (100%) rename {examples => pagetop/examples}/hello-world.rs (100%) rename {packages/pagetop => pagetop}/src/app.rs (100%) rename {packages/pagetop => pagetop}/src/app/figfont.rs (100%) rename {packages/pagetop => pagetop}/src/app/slant.flf (100%) rename {packages/pagetop => pagetop}/src/app/small.flf (100%) rename {packages/pagetop => pagetop}/src/app/speed.flf (100%) rename {packages/pagetop => pagetop}/src/app/starwars.flf (100%) rename {packages/pagetop => pagetop}/src/core.rs (100%) rename {packages/pagetop => pagetop}/src/core/action.rs (100%) rename {packages/pagetop => pagetop}/src/core/action/all.rs (100%) rename {packages/pagetop => pagetop}/src/core/action/definition.rs (100%) rename {packages/pagetop => pagetop}/src/core/action/list.rs (100%) rename {packages/pagetop => pagetop}/src/core/package.rs (100%) rename {packages/pagetop => pagetop}/src/core/package/all.rs (100%) rename {packages/pagetop => pagetop}/src/core/package/definition.rs (100%) rename {packages/pagetop => pagetop}/src/core/package/welcome.rs (98%) rename {packages/pagetop => pagetop}/src/core/theme.rs (100%) rename {packages/pagetop => pagetop}/src/core/theme/all.rs (100%) rename {packages/pagetop => pagetop}/src/core/theme/definition.rs (100%) rename {packages/pagetop => pagetop}/src/global.rs (100%) rename {packages/pagetop => pagetop}/src/html.rs (100%) rename {packages/pagetop => pagetop}/src/html/maud.rs (100%) rename {packages/pagetop => pagetop}/src/html/maud/escape.rs (100%) rename {packages/pagetop => pagetop}/src/lib.rs (100%) rename {packages/pagetop => pagetop}/src/locale.rs (100%) create mode 100644 pagetop/src/locale/en-US/welcome.ftl create mode 100644 pagetop/src/locale/es-ES/welcome.ftl rename {packages/pagetop => pagetop}/src/prelude.rs (100%) rename {packages/pagetop => pagetop}/src/response.rs (100%) rename {packages/pagetop => pagetop}/src/response/json.rs (100%) rename {packages/pagetop => pagetop}/src/response/redirect.rs (100%) rename {packages/pagetop => pagetop}/src/service.rs (100%) rename {packages/pagetop => pagetop}/src/trace.rs (100%) rename {packages/pagetop => pagetop}/src/util.rs (100%) rename {packages/pagetop => pagetop}/src/util/config.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/data.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/de.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/error.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/file.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/file/source.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/file/toml.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/path.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/path/parser.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/source.rs (100%) rename {packages/pagetop => pagetop}/src/util/config/value.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 52cf1b92..e14b2c87 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,10 @@ members = [ "helpers/pagetop-build", "helpers/pagetop-macros", + # PageTop + "pagetop", + # Packages - "packages/pagetop", "packages/pagetop-aliner", "packages/pagetop-bootsier", @@ -29,7 +31,9 @@ static-files = "0.2.4" pagetop-build = { version = "0.0", path = "helpers/pagetop-build" } pagetop-macros = { version = "0.0", path = "helpers/pagetop-macros" } +# PageTop +pagetop = { version = "0.0", path = "pagetop" } + # Packages -pagetop = { version = "0.0", path = "packages/pagetop" } pagetop-aliner = { version = "0.0", path = "packages/pagetop-aliner" } pagetop-bootsier = { version = "0.0", path = "packages/pagetop-bootsier" } diff --git a/packages/pagetop/src/locale/en-US/welcome.ftl b/packages/pagetop/src/locale/en-US/welcome.ftl deleted file mode 100644 index 90e899bd..00000000 --- a/packages/pagetop/src/locale/en-US/welcome.ftl +++ /dev/null @@ -1,20 +0,0 @@ -welcome_title = Hello world! - -welcome_intro = Verifying the proper operation of your { $app } installation. -welcome_powered = A web solution powered by { $pagetop }. - -welcome_page = Welcome Page -welcome_subtitle = Are you a { $app } user? -welcome_text1 = If you don't know what this page is about, this probably means that the site is either experiencing problems or is undergoing routine maintenance. -welcome_text2 = If the issue persists, please contact your system administrator for assistance. - -welcome_pagetop_title = About PageTop -welcome_pagetop_text1 = If you can read this page, it means that the PageTop server is working properly, but has not yet been configured. -welcome_pagetop_text2 = PageTop is a Rust-based web development framework designed to create modular, extensible, and configurable web solutions. -welcome_pagetop_text3 = For detailed information, please visit the official technical documentation. - -welcome_issues_title = Reporting Issues -welcome_issues_text1 = To report any issues with PageTop, please use GitHub. However, check the existing error reports to avoid duplicates. -welcome_issues_text2 = For issues specific to { $app }, please refer to its official repository or support channel, rather than directly to PageTop. - -welcome_have_fun = Write code. Break nothing. Repeat. diff --git a/packages/pagetop/src/locale/es-ES/welcome.ftl b/packages/pagetop/src/locale/es-ES/welcome.ftl deleted file mode 100644 index a3462759..00000000 --- a/packages/pagetop/src/locale/es-ES/welcome.ftl +++ /dev/null @@ -1,20 +0,0 @@ -welcome_title = ¡Hola mundo! - -welcome_intro = Verificando el funcionamiento de tu instalación de { $app }. -welcome_powered = Una solución web con la potencia de { $pagetop }. - -welcome_page = Página de Bienvenida -welcome_subtitle = ¿Eres usuario de { $app }? -welcome_text1 = Si no sabes de qué trata esta página probablemente significa que el sitio está experimentando problemas o está pasando por un mantenimiento de rutina. -welcome_text2 = Si el problema persiste, por favor póngase en contacto con el administrador del sistema. - -welcome_pagetop_title = Sobre PageTop -welcome_pagetop_text1 = Si puedes leer esta página significa que el servidor PageTop funciona correctamente, pero aún no se ha configurado. -welcome_pagetop_text2 = PageTop es un entorno de desarrollo web basado en Rust, diseñado para crear soluciones web modulares, extensibles y configurables. -welcome_pagetop_text3 = Para más información visita la documentación técnica oficial. - -welcome_issues_title = Informando Problemas -welcome_issues_text1 = Para comunicar cualquier problema con PageTop utiliza GitHub. No obstante, comprueba los informes de errores ya existentes para evitar duplicados. -welcome_issues_text2 = Si son fallos específicos de { $app }, por favor acude a su repositorio oficial o canal de soporte, y no al de PageTop directamente. - -welcome_have_fun = Escribe código. No rompas nada. Repite. diff --git a/packages/pagetop/Cargo.toml b/pagetop/Cargo.toml similarity index 100% rename from packages/pagetop/Cargo.toml rename to pagetop/Cargo.toml diff --git a/config/common.toml b/pagetop/config/common.toml similarity index 100% rename from config/common.toml rename to pagetop/config/common.toml diff --git a/config/predefined-settings.toml b/pagetop/config/predefined-settings.toml similarity index 100% rename from config/predefined-settings.toml rename to pagetop/config/predefined-settings.toml diff --git a/examples/app-basic.rs b/pagetop/examples/app-basic.rs similarity index 100% rename from examples/app-basic.rs rename to pagetop/examples/app-basic.rs diff --git a/examples/hello-name.rs b/pagetop/examples/hello-name.rs similarity index 100% rename from examples/hello-name.rs rename to pagetop/examples/hello-name.rs diff --git a/examples/hello-world.rs b/pagetop/examples/hello-world.rs similarity index 100% rename from examples/hello-world.rs rename to pagetop/examples/hello-world.rs diff --git a/packages/pagetop/src/app.rs b/pagetop/src/app.rs similarity index 100% rename from packages/pagetop/src/app.rs rename to pagetop/src/app.rs diff --git a/packages/pagetop/src/app/figfont.rs b/pagetop/src/app/figfont.rs similarity index 100% rename from packages/pagetop/src/app/figfont.rs rename to pagetop/src/app/figfont.rs diff --git a/packages/pagetop/src/app/slant.flf b/pagetop/src/app/slant.flf similarity index 100% rename from packages/pagetop/src/app/slant.flf rename to pagetop/src/app/slant.flf diff --git a/packages/pagetop/src/app/small.flf b/pagetop/src/app/small.flf similarity index 100% rename from packages/pagetop/src/app/small.flf rename to pagetop/src/app/small.flf diff --git a/packages/pagetop/src/app/speed.flf b/pagetop/src/app/speed.flf similarity index 100% rename from packages/pagetop/src/app/speed.flf rename to pagetop/src/app/speed.flf diff --git a/packages/pagetop/src/app/starwars.flf b/pagetop/src/app/starwars.flf similarity index 100% rename from packages/pagetop/src/app/starwars.flf rename to pagetop/src/app/starwars.flf diff --git a/packages/pagetop/src/core.rs b/pagetop/src/core.rs similarity index 100% rename from packages/pagetop/src/core.rs rename to pagetop/src/core.rs diff --git a/packages/pagetop/src/core/action.rs b/pagetop/src/core/action.rs similarity index 100% rename from packages/pagetop/src/core/action.rs rename to pagetop/src/core/action.rs diff --git a/packages/pagetop/src/core/action/all.rs b/pagetop/src/core/action/all.rs similarity index 100% rename from packages/pagetop/src/core/action/all.rs rename to pagetop/src/core/action/all.rs diff --git a/packages/pagetop/src/core/action/definition.rs b/pagetop/src/core/action/definition.rs similarity index 100% rename from packages/pagetop/src/core/action/definition.rs rename to pagetop/src/core/action/definition.rs diff --git a/packages/pagetop/src/core/action/list.rs b/pagetop/src/core/action/list.rs similarity index 100% rename from packages/pagetop/src/core/action/list.rs rename to pagetop/src/core/action/list.rs diff --git a/packages/pagetop/src/core/package.rs b/pagetop/src/core/package.rs similarity index 100% rename from packages/pagetop/src/core/package.rs rename to pagetop/src/core/package.rs diff --git a/packages/pagetop/src/core/package/all.rs b/pagetop/src/core/package/all.rs similarity index 100% rename from packages/pagetop/src/core/package/all.rs rename to pagetop/src/core/package/all.rs diff --git a/packages/pagetop/src/core/package/definition.rs b/pagetop/src/core/package/definition.rs similarity index 100% rename from packages/pagetop/src/core/package/definition.rs rename to pagetop/src/core/package/definition.rs diff --git a/packages/pagetop/src/core/package/welcome.rs b/pagetop/src/core/package/welcome.rs similarity index 98% rename from packages/pagetop/src/core/package/welcome.rs rename to pagetop/src/core/package/welcome.rs index 0cc62ed2..2a939d8a 100644 --- a/packages/pagetop/src/core/package/welcome.rs +++ b/pagetop/src/core/package/welcome.rs @@ -112,7 +112,7 @@ pub async fn homepage() -> Markup { } } - footer { "[" (L10n::l("welcome_have_fun").markup()) "]" } + footer { "[ " (L10n::l("welcome_have_fun").markup()) " ]" } } } } diff --git a/packages/pagetop/src/core/theme.rs b/pagetop/src/core/theme.rs similarity index 100% rename from packages/pagetop/src/core/theme.rs rename to pagetop/src/core/theme.rs diff --git a/packages/pagetop/src/core/theme/all.rs b/pagetop/src/core/theme/all.rs similarity index 100% rename from packages/pagetop/src/core/theme/all.rs rename to pagetop/src/core/theme/all.rs diff --git a/packages/pagetop/src/core/theme/definition.rs b/pagetop/src/core/theme/definition.rs similarity index 100% rename from packages/pagetop/src/core/theme/definition.rs rename to pagetop/src/core/theme/definition.rs diff --git a/packages/pagetop/src/global.rs b/pagetop/src/global.rs similarity index 100% rename from packages/pagetop/src/global.rs rename to pagetop/src/global.rs diff --git a/packages/pagetop/src/html.rs b/pagetop/src/html.rs similarity index 100% rename from packages/pagetop/src/html.rs rename to pagetop/src/html.rs diff --git a/packages/pagetop/src/html/maud.rs b/pagetop/src/html/maud.rs similarity index 100% rename from packages/pagetop/src/html/maud.rs rename to pagetop/src/html/maud.rs diff --git a/packages/pagetop/src/html/maud/escape.rs b/pagetop/src/html/maud/escape.rs similarity index 100% rename from packages/pagetop/src/html/maud/escape.rs rename to pagetop/src/html/maud/escape.rs diff --git a/packages/pagetop/src/lib.rs b/pagetop/src/lib.rs similarity index 100% rename from packages/pagetop/src/lib.rs rename to pagetop/src/lib.rs diff --git a/packages/pagetop/src/locale.rs b/pagetop/src/locale.rs similarity index 100% rename from packages/pagetop/src/locale.rs rename to pagetop/src/locale.rs diff --git a/pagetop/src/locale/en-US/welcome.ftl b/pagetop/src/locale/en-US/welcome.ftl new file mode 100644 index 00000000..d117f462 --- /dev/null +++ b/pagetop/src/locale/en-US/welcome.ftl @@ -0,0 +1,20 @@ +welcome_title = Hello world! + +welcome_intro = Verifying the installation of { $app }. +welcome_powered = A web solution powered by { $pagetop }. + +welcome_page = Welcome Page +welcome_subtitle = Are you a { $app } user? +welcome_text1 = If you don't know what this page is about, this probably means that the site is either experiencing problems or is undergoing routine maintenance. +welcome_text2 = If the issue persists, please contact your system administrator for assistance. + +welcome_pagetop_title = About PageTop +welcome_pagetop_text1 = If you can read this page, it means that the PageTop server is working properly, but has not yet been configured. +welcome_pagetop_text2 = PageTop is a Rust-based web development framework designed to create modular, extensible, and configurable web solutions. +welcome_pagetop_text3 = For detailed information, please visit the official technical documentation. + +welcome_issues_title = Reporting Issues +welcome_issues_text1 = To report any issues with PageTop, please use GitHub. However, check the existing error reports to avoid duplicates. +welcome_issues_text2 = For issues specific to { $app }, please refer to its official repository or support channel, rather than directly to PageTop. + +welcome_have_fun = Coding is creating diff --git a/pagetop/src/locale/es-ES/welcome.ftl b/pagetop/src/locale/es-ES/welcome.ftl new file mode 100644 index 00000000..b351bfc9 --- /dev/null +++ b/pagetop/src/locale/es-ES/welcome.ftl @@ -0,0 +1,20 @@ +welcome_title = ¡Hola mundo! + +welcome_intro = Verificando la instalación de { $app }. +welcome_powered = Una solución web creada con { $pagetop }. + +welcome_page = Página de Bienvenida +welcome_subtitle = ¿Eres usuario de { $app }? +welcome_text1 = Si no sabes por qué se muestra esta página probablemente significa que el sitio está experimentando problemas o está pasando por un mantenimiento de rutina. +welcome_text2 = Si el problema persiste, por favor póngase en contacto con el administrador del sistema. + +welcome_pagetop_title = Sobre PageTop +welcome_pagetop_text1 = Si puedes leer esta página significa que el servidor PageTop funciona correctamente, pero aún no se ha configurado. +welcome_pagetop_text2 = PageTop es un entorno de desarrollo web basado en Rust, diseñado para crear soluciones web modulares, extensibles y configurables. +welcome_pagetop_text3 = Para más información visita la documentación técnica oficial. + +welcome_issues_title = Informando Problemas +welcome_issues_text1 = Para comunicar cualquier problema con PageTop utiliza GitHub. No obstante, comprueba los informes de errores ya existentes para evitar duplicados. +welcome_issues_text2 = Si son fallos específicos de { $app }, por favor acude a su repositorio oficial o canal de soporte, y no al de PageTop directamente. + +welcome_have_fun = Programar es crear diff --git a/packages/pagetop/src/prelude.rs b/pagetop/src/prelude.rs similarity index 100% rename from packages/pagetop/src/prelude.rs rename to pagetop/src/prelude.rs diff --git a/packages/pagetop/src/response.rs b/pagetop/src/response.rs similarity index 100% rename from packages/pagetop/src/response.rs rename to pagetop/src/response.rs diff --git a/packages/pagetop/src/response/json.rs b/pagetop/src/response/json.rs similarity index 100% rename from packages/pagetop/src/response/json.rs rename to pagetop/src/response/json.rs diff --git a/packages/pagetop/src/response/redirect.rs b/pagetop/src/response/redirect.rs similarity index 100% rename from packages/pagetop/src/response/redirect.rs rename to pagetop/src/response/redirect.rs diff --git a/packages/pagetop/src/service.rs b/pagetop/src/service.rs similarity index 100% rename from packages/pagetop/src/service.rs rename to pagetop/src/service.rs diff --git a/packages/pagetop/src/trace.rs b/pagetop/src/trace.rs similarity index 100% rename from packages/pagetop/src/trace.rs rename to pagetop/src/trace.rs diff --git a/packages/pagetop/src/util.rs b/pagetop/src/util.rs similarity index 100% rename from packages/pagetop/src/util.rs rename to pagetop/src/util.rs diff --git a/packages/pagetop/src/util/config.rs b/pagetop/src/util/config.rs similarity index 100% rename from packages/pagetop/src/util/config.rs rename to pagetop/src/util/config.rs diff --git a/packages/pagetop/src/util/config/data.rs b/pagetop/src/util/config/data.rs similarity index 100% rename from packages/pagetop/src/util/config/data.rs rename to pagetop/src/util/config/data.rs diff --git a/packages/pagetop/src/util/config/de.rs b/pagetop/src/util/config/de.rs similarity index 100% rename from packages/pagetop/src/util/config/de.rs rename to pagetop/src/util/config/de.rs diff --git a/packages/pagetop/src/util/config/error.rs b/pagetop/src/util/config/error.rs similarity index 100% rename from packages/pagetop/src/util/config/error.rs rename to pagetop/src/util/config/error.rs diff --git a/packages/pagetop/src/util/config/file.rs b/pagetop/src/util/config/file.rs similarity index 100% rename from packages/pagetop/src/util/config/file.rs rename to pagetop/src/util/config/file.rs diff --git a/packages/pagetop/src/util/config/file/source.rs b/pagetop/src/util/config/file/source.rs similarity index 100% rename from packages/pagetop/src/util/config/file/source.rs rename to pagetop/src/util/config/file/source.rs diff --git a/packages/pagetop/src/util/config/file/toml.rs b/pagetop/src/util/config/file/toml.rs similarity index 100% rename from packages/pagetop/src/util/config/file/toml.rs rename to pagetop/src/util/config/file/toml.rs diff --git a/packages/pagetop/src/util/config/path.rs b/pagetop/src/util/config/path.rs similarity index 100% rename from packages/pagetop/src/util/config/path.rs rename to pagetop/src/util/config/path.rs diff --git a/packages/pagetop/src/util/config/path/parser.rs b/pagetop/src/util/config/path/parser.rs similarity index 100% rename from packages/pagetop/src/util/config/path/parser.rs rename to pagetop/src/util/config/path/parser.rs diff --git a/packages/pagetop/src/util/config/source.rs b/pagetop/src/util/config/source.rs similarity index 100% rename from packages/pagetop/src/util/config/source.rs rename to pagetop/src/util/config/source.rs diff --git a/packages/pagetop/src/util/config/value.rs b/pagetop/src/util/config/value.rs similarity index 100% rename from packages/pagetop/src/util/config/value.rs rename to pagetop/src/util/config/value.rs