From ab0ac11f65fe50fc65a9190094643ec50ae05949 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 13 Mar 2022 11:14:33 +0100 Subject: [PATCH] =?UTF-8?q?Modifica=20la=20estructura=20general=20del=20c?= =?UTF-8?q?=C3=B3digo=20fuente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Importante actualización que reorganiza el código fuente de PageTop. Usa Cargo para crear un espacio de trabajo con los diferentes proyectos que estructuran las funcionalidades de PageTop en módulos interdependientes que se integran en Drust para construir una solución web para la gestión de contenidos. --- Cargo.toml | 79 ++---------------- config/default.toml | 21 ++++- drust/Cargo.toml | 19 +++++ {src => drust/src}/main.rs | 4 - pagetop/Cargo.toml | 71 ++++++++++++++++ .../STARTER.Cargo.toml | 0 build.rs => pagetop/build.rs | 0 .../config}/settings.default.toml | 0 {src => pagetop/src}/base/component/block.rs | 0 {src => pagetop/src}/base/component/chunck.rs | 0 .../src}/base/component/container.rs | 0 .../src}/base/component/form/button.rs | 0 .../src}/base/component/form/date.rs | 0 .../src}/base/component/form/form.rs | 0 .../src}/base/component/form/hidden.rs | 0 .../src}/base/component/form/input.rs | 0 .../src}/base/component/form/mod.rs | 0 {src => pagetop/src}/base/component/menu.rs | 0 {src => pagetop/src}/base/component/mod.rs | 0 {src => pagetop/src}/base/mod.rs | 0 .../base/module/admin/locales/en-US/admin.ftl | 0 .../base/module/admin/locales/es-ES/admin.ftl | 0 {src => pagetop/src}/base/module/admin/mod.rs | 0 .../src}/base/module/admin/summary.rs | 0 .../homepage/locales/en-US/homepage.ftl | 0 .../homepage/locales/es-ES/homepage.ftl | 0 .../src}/base/module/homepage/mod.rs | 0 {src => pagetop/src}/base/module/mod.rs | 0 .../src}/base/module/user/entity/mod.rs | 0 .../src}/base/module/user/entity/user.rs | 0 .../module/user/locales/en-US/homepage.ftl | 0 .../module/user/locales/es-ES/homepage.ftl | 0 .../m20220312_000001_create_table_user.rs | 0 .../src}/base/module/user/migration/mod.rs | 0 {src => pagetop/src}/base/module/user/mod.rs | 0 {src => pagetop/src}/base/theme/aliner/mod.rs | 0 .../theme/bootsier/locales/en-US/bootsier.ftl | 0 .../theme/bootsier/locales/es-ES/bootsier.ftl | 0 .../src}/base/theme/bootsier/mod.rs | 0 .../src}/base/theme/minimal/mod.rs | 0 {src => pagetop/src}/base/theme/mod.rs | 0 {src => pagetop/src}/config.rs | 0 {src => pagetop/src}/core/global.rs | 0 {src => pagetop/src}/core/mod.rs | 0 .../src}/core/module/definition.rs | 0 {src => pagetop/src}/core/module/mod.rs | 0 {src => pagetop/src}/core/response/mod.rs | 0 .../src}/core/response/page/assets.rs | 0 .../src}/core/response/page/component.rs | 0 .../src}/core/response/page/container.rs | 0 .../src}/core/response/page/mod.rs | 0 .../src}/core/response/page/page.rs | 0 {src => pagetop/src}/core/server/app.rs | 2 +- .../src}/core/server/figfonts/slant.flf | 0 .../src}/core/server/figfonts/small.flf | 0 .../src}/core/server/figfonts/speed.flf | 0 .../src}/core/server/figfonts/starwars.flf | 0 {src => pagetop/src}/core/server/mod.rs | 0 {src => pagetop/src}/core/server/tracing.rs | 0 {src => pagetop/src}/core/theme/definition.rs | 0 {src => pagetop/src}/core/theme/mod.rs | 0 {src => pagetop/src}/db.rs | 0 {src => pagetop/src}/lib.rs | 0 {src => pagetop/src}/locale.rs | 0 {src => pagetop/src}/prelude.rs | 0 {src => pagetop/src}/trace.rs | 0 {src => pagetop/src}/util.rs | 0 .../static}/aliner/css/styles.css | 0 .../static}/bootsier/css/bootstrap.min.css | 0 .../bootsier/css/bootstrap.min.css.map | 0 .../static}/bootsier/images/caution.png | Bin .../bootsier/js/bootstrap.bundle.min.js | 0 .../bootsier/js/bootstrap.bundle.min.js.map | 0 .../static}/theme/js/jquery.min.js | 0 .../static}/theme/js/jquery.min.map | 0 .../static}/theme/menu/css/menu-blue.css | 0 .../static}/theme/menu/css/menu-clean.css | 0 .../static}/theme/menu/css/menu-mint.css | 0 .../static}/theme/menu/css/menu-simple.css | 0 .../static}/theme/menu/css/menu.css | 0 .../static}/theme/menu/js/menu.min.js | 0 {tests => pagetop/tests}/health_check.rs | 0 {tests => pagetop/tests}/main.rs | 0 83 files changed, 115 insertions(+), 81 deletions(-) create mode 100644 drust/Cargo.toml rename {src => drust/src}/main.rs (53%) create mode 100644 pagetop/Cargo.toml rename STARTER.Cargo.toml => pagetop/STARTER.Cargo.toml (100%) rename build.rs => pagetop/build.rs (100%) rename {config => pagetop/config}/settings.default.toml (100%) rename {src => pagetop/src}/base/component/block.rs (100%) rename {src => pagetop/src}/base/component/chunck.rs (100%) rename {src => pagetop/src}/base/component/container.rs (100%) rename {src => pagetop/src}/base/component/form/button.rs (100%) rename {src => pagetop/src}/base/component/form/date.rs (100%) rename {src => pagetop/src}/base/component/form/form.rs (100%) rename {src => pagetop/src}/base/component/form/hidden.rs (100%) rename {src => pagetop/src}/base/component/form/input.rs (100%) rename {src => pagetop/src}/base/component/form/mod.rs (100%) rename {src => pagetop/src}/base/component/menu.rs (100%) rename {src => pagetop/src}/base/component/mod.rs (100%) rename {src => pagetop/src}/base/mod.rs (100%) rename {src => pagetop/src}/base/module/admin/locales/en-US/admin.ftl (100%) rename {src => pagetop/src}/base/module/admin/locales/es-ES/admin.ftl (100%) rename {src => pagetop/src}/base/module/admin/mod.rs (100%) rename {src => pagetop/src}/base/module/admin/summary.rs (100%) rename {src => pagetop/src}/base/module/homepage/locales/en-US/homepage.ftl (100%) rename {src => pagetop/src}/base/module/homepage/locales/es-ES/homepage.ftl (100%) rename {src => pagetop/src}/base/module/homepage/mod.rs (100%) rename {src => pagetop/src}/base/module/mod.rs (100%) rename {src => pagetop/src}/base/module/user/entity/mod.rs (100%) rename {src => pagetop/src}/base/module/user/entity/user.rs (100%) rename {src => pagetop/src}/base/module/user/locales/en-US/homepage.ftl (100%) rename {src => pagetop/src}/base/module/user/locales/es-ES/homepage.ftl (100%) rename {src => pagetop/src}/base/module/user/migration/m20220312_000001_create_table_user.rs (100%) rename {src => pagetop/src}/base/module/user/migration/mod.rs (100%) rename {src => pagetop/src}/base/module/user/mod.rs (100%) rename {src => pagetop/src}/base/theme/aliner/mod.rs (100%) rename {src => pagetop/src}/base/theme/bootsier/locales/en-US/bootsier.ftl (100%) rename {src => pagetop/src}/base/theme/bootsier/locales/es-ES/bootsier.ftl (100%) rename {src => pagetop/src}/base/theme/bootsier/mod.rs (100%) rename {src => pagetop/src}/base/theme/minimal/mod.rs (100%) rename {src => pagetop/src}/base/theme/mod.rs (100%) rename {src => pagetop/src}/config.rs (100%) rename {src => pagetop/src}/core/global.rs (100%) rename {src => pagetop/src}/core/mod.rs (100%) rename {src => pagetop/src}/core/module/definition.rs (100%) rename {src => pagetop/src}/core/module/mod.rs (100%) rename {src => pagetop/src}/core/response/mod.rs (100%) rename {src => pagetop/src}/core/response/page/assets.rs (100%) rename {src => pagetop/src}/core/response/page/component.rs (100%) rename {src => pagetop/src}/core/response/page/container.rs (100%) rename {src => pagetop/src}/core/response/page/mod.rs (100%) rename {src => pagetop/src}/core/response/page/page.rs (100%) rename {src => pagetop/src}/core/server/app.rs (98%) rename {src => pagetop/src}/core/server/figfonts/slant.flf (100%) rename {src => pagetop/src}/core/server/figfonts/small.flf (100%) rename {src => pagetop/src}/core/server/figfonts/speed.flf (100%) rename {src => pagetop/src}/core/server/figfonts/starwars.flf (100%) rename {src => pagetop/src}/core/server/mod.rs (100%) rename {src => pagetop/src}/core/server/tracing.rs (100%) rename {src => pagetop/src}/core/theme/definition.rs (100%) rename {src => pagetop/src}/core/theme/mod.rs (100%) rename {src => pagetop/src}/db.rs (100%) rename {src => pagetop/src}/lib.rs (100%) rename {src => pagetop/src}/locale.rs (100%) rename {src => pagetop/src}/prelude.rs (100%) rename {src => pagetop/src}/trace.rs (100%) rename {src => pagetop/src}/util.rs (100%) rename {static => pagetop/static}/aliner/css/styles.css (100%) rename {static => pagetop/static}/bootsier/css/bootstrap.min.css (100%) rename {static => pagetop/static}/bootsier/css/bootstrap.min.css.map (100%) rename {static => pagetop/static}/bootsier/images/caution.png (100%) rename {static => pagetop/static}/bootsier/js/bootstrap.bundle.min.js (100%) rename {static => pagetop/static}/bootsier/js/bootstrap.bundle.min.js.map (100%) rename {static => pagetop/static}/theme/js/jquery.min.js (100%) rename {static => pagetop/static}/theme/js/jquery.min.map (100%) rename {static => pagetop/static}/theme/menu/css/menu-blue.css (100%) rename {static => pagetop/static}/theme/menu/css/menu-clean.css (100%) rename {static => pagetop/static}/theme/menu/css/menu-mint.css (100%) rename {static => pagetop/static}/theme/menu/css/menu-simple.css (100%) rename {static => pagetop/static}/theme/menu/css/menu.css (100%) rename {static => pagetop/static}/theme/menu/js/menu.min.js (100%) rename {tests => pagetop/tests}/health_check.rs (100%) rename {tests => pagetop/tests}/main.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 0c3a0a43..2369a8da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,74 +1,5 @@ -[package] -name = "pagetop" -version = "0.1.0" -edition = "2021" - -authors = [ - "Manuel Cillero " -] -description = """\ - PageTop es un proyecto personal para aprender Rust. Incluye algunos de los \ - crates más estables y populares para desarrollar soluciones web modulares, \ - extensibles y configurables. También es un sistema para la gestión de \ - contenidos web.\ -""" -homepage = "https://suitepro.cillero.es/projects/pagetop" -repository = "https://gitlab.com/manuelcillero/pagetop" -license = "MIT" - -keywords = [ - "web", "cms", "framework", "frontend", "ssr" -] -categories = [ - "web-programming", "development-tools", "gui" -] - -[dependencies] -doc-comment = "0.3.3" -downcast-rs = "1.2.0" -figlet-rs = "0.1.3" -futures = "0.3" -once_cell = "1.9.0" -url = "2.2.2" - -config_rs = { package = "config", version = "0.11.0", features = ["toml"] } - -tracing = "0.1" -tracing-appender = "0.2" -tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] } -tracing-actix-web = "0.2" - -fluent-templates = "0.6.1" -unic-langid = "0.9.0" - -actix-web = "3.3.3" -actix-web-static-files = "3.0.5" - -maud = { version = "0.23.0", features = ["actix-web"] } -sycamore = { version = "0.7.1", features = ["ssr"] } - -serde = { version = "1.0", features = ["derive"] } - -[dependencies.sea-orm] -version = "0.6" -features = ["debug-print", "macros", "runtime-async-std-native-tls"] -default-features = false - -[dependencies.sea-schema] -version = "0.5" -features = ["debug-print", "migration"] -default-features = false - -[features] -default = ["mysql"] -mysql = ["sea-orm/sqlx-mysql"] -postgres = ["sea-orm/sqlx-postgres"] - -[build-dependencies] -actix-web-static-files = "3.0.5" - -[lib] -name = "pagetop" - -[[bin]] -name = "pagetop" +[workspace] +members = [ + "drust", + "pagetop", +] \ No newline at end of file diff --git a/config/default.toml b/config/default.toml index 5f8778a3..26676acb 100644 --- a/config/default.toml +++ b/config/default.toml @@ -1,3 +1,20 @@ [app] -name = "PageTop Essence" -description = "A modern Content Management System for sharing the world." +name = "Drust" +description = """\ + A modern Content Management System for sharing the world.\ +""" +language = "es-ES" +#theme = "Aliner" +#theme = "Minimal" +theme = "Bootsier" + +[database] +db_name = "drust" +db_user = "drust" +db_pass = "DrU__#3T" + +[log] +tracing = "Info" +#Info,actix_server::builder=Error,tracing_actix_web=Warn" +rolling = "Stdout" +format = "Compact" diff --git a/drust/Cargo.toml b/drust/Cargo.toml new file mode 100644 index 00000000..0a579e5f --- /dev/null +++ b/drust/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "drust" +version = "0.1.0" +edition = "2021" + +authors = [ + "Manuel Cillero " +] +description = """\ + A modern Content Management System for sharing the world.\ +""" +homepage = "https://suitepro.cillero.es/projects/drust" +repository = "https://gitlab.com/manuelcillero/drust" + +[dependencies] +pagetop = { path = "../pagetop" } +actix-web = "3.3.3" +maud = { version = "0.23.0" } +serde = { version = "1.0", features = ["derive"] } diff --git a/src/main.rs b/drust/src/main.rs similarity index 53% rename from src/main.rs rename to drust/src/main.rs index 30df2f36..6916d3b1 100644 --- a/src/main.rs +++ b/drust/src/main.rs @@ -1,8 +1,4 @@ #[actix_web::main] async fn main() -> std::io::Result<()> { - // ``` - // let app = pagetop::Application::build(None).await?; - // app.run()?.await - // ``` pagetop::Application::build(None).await?.run()?.await } diff --git a/pagetop/Cargo.toml b/pagetop/Cargo.toml new file mode 100644 index 00000000..278b6ba0 --- /dev/null +++ b/pagetop/Cargo.toml @@ -0,0 +1,71 @@ +[package] +name = "pagetop" +version = "0.1.0" +edition = "2021" + +authors = [ + "Manuel Cillero " +] +description = """\ + PageTop es un proyecto personal para aprender Rust. Incluye algunos de los \ + crates más estables y populares para desarrollar soluciones web modulares, \ + extensibles y configurables. También es un sistema para la gestión de \ + contenidos web.\ +""" +homepage = "https://suitepro.cillero.es/projects/pagetop" +repository = "https://gitlab.com/manuelcillero/pagetop" +license = "MIT" + +keywords = [ + "web", "cms", "framework", "frontend", "ssr" +] +categories = [ + "web-programming", "development-tools", "gui" +] + +[dependencies] +doc-comment = "0.3.3" +downcast-rs = "1.2.0" +figlet-rs = "0.1.3" +futures = "0.3" +once_cell = "1.9.0" +url = "2.2.2" + +config_rs = { package = "config", version = "0.11.0", features = ["toml"] } + +tracing = "0.1" +tracing-appender = "0.2" +tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] } +tracing-actix-web = "0.2" + +fluent-templates = "0.6.1" +unic-langid = "0.9.0" + +actix-web = "3.3.3" +actix-web-static-files = "3.0.5" + +maud = { version = "0.23.0", features = ["actix-web"] } +sycamore = { version = "0.7.1", features = ["ssr"] } + +serde = { version = "1.0", features = ["derive"] } + +[dependencies.sea-orm] +version = "0.6" +features = ["debug-print", "macros", "runtime-async-std-native-tls"] +default-features = false + +[dependencies.sea-schema] +version = "0.5" +features = ["debug-print", "migration"] +default-features = false + +[features] +default = ["mysql"] +mysql = ["sea-orm/sqlx-mysql"] +postgres = ["sea-orm/sqlx-postgres"] + +[build-dependencies] +actix-web-static-files = "3.0.5" + +[lib] +name = "pagetop" diff --git a/STARTER.Cargo.toml b/pagetop/STARTER.Cargo.toml similarity index 100% rename from STARTER.Cargo.toml rename to pagetop/STARTER.Cargo.toml diff --git a/build.rs b/pagetop/build.rs similarity index 100% rename from build.rs rename to pagetop/build.rs diff --git a/config/settings.default.toml b/pagetop/config/settings.default.toml similarity index 100% rename from config/settings.default.toml rename to pagetop/config/settings.default.toml diff --git a/src/base/component/block.rs b/pagetop/src/base/component/block.rs similarity index 100% rename from src/base/component/block.rs rename to pagetop/src/base/component/block.rs diff --git a/src/base/component/chunck.rs b/pagetop/src/base/component/chunck.rs similarity index 100% rename from src/base/component/chunck.rs rename to pagetop/src/base/component/chunck.rs diff --git a/src/base/component/container.rs b/pagetop/src/base/component/container.rs similarity index 100% rename from src/base/component/container.rs rename to pagetop/src/base/component/container.rs diff --git a/src/base/component/form/button.rs b/pagetop/src/base/component/form/button.rs similarity index 100% rename from src/base/component/form/button.rs rename to pagetop/src/base/component/form/button.rs diff --git a/src/base/component/form/date.rs b/pagetop/src/base/component/form/date.rs similarity index 100% rename from src/base/component/form/date.rs rename to pagetop/src/base/component/form/date.rs diff --git a/src/base/component/form/form.rs b/pagetop/src/base/component/form/form.rs similarity index 100% rename from src/base/component/form/form.rs rename to pagetop/src/base/component/form/form.rs diff --git a/src/base/component/form/hidden.rs b/pagetop/src/base/component/form/hidden.rs similarity index 100% rename from src/base/component/form/hidden.rs rename to pagetop/src/base/component/form/hidden.rs diff --git a/src/base/component/form/input.rs b/pagetop/src/base/component/form/input.rs similarity index 100% rename from src/base/component/form/input.rs rename to pagetop/src/base/component/form/input.rs diff --git a/src/base/component/form/mod.rs b/pagetop/src/base/component/form/mod.rs similarity index 100% rename from src/base/component/form/mod.rs rename to pagetop/src/base/component/form/mod.rs diff --git a/src/base/component/menu.rs b/pagetop/src/base/component/menu.rs similarity index 100% rename from src/base/component/menu.rs rename to pagetop/src/base/component/menu.rs diff --git a/src/base/component/mod.rs b/pagetop/src/base/component/mod.rs similarity index 100% rename from src/base/component/mod.rs rename to pagetop/src/base/component/mod.rs diff --git a/src/base/mod.rs b/pagetop/src/base/mod.rs similarity index 100% rename from src/base/mod.rs rename to pagetop/src/base/mod.rs diff --git a/src/base/module/admin/locales/en-US/admin.ftl b/pagetop/src/base/module/admin/locales/en-US/admin.ftl similarity index 100% rename from src/base/module/admin/locales/en-US/admin.ftl rename to pagetop/src/base/module/admin/locales/en-US/admin.ftl diff --git a/src/base/module/admin/locales/es-ES/admin.ftl b/pagetop/src/base/module/admin/locales/es-ES/admin.ftl similarity index 100% rename from src/base/module/admin/locales/es-ES/admin.ftl rename to pagetop/src/base/module/admin/locales/es-ES/admin.ftl diff --git a/src/base/module/admin/mod.rs b/pagetop/src/base/module/admin/mod.rs similarity index 100% rename from src/base/module/admin/mod.rs rename to pagetop/src/base/module/admin/mod.rs diff --git a/src/base/module/admin/summary.rs b/pagetop/src/base/module/admin/summary.rs similarity index 100% rename from src/base/module/admin/summary.rs rename to pagetop/src/base/module/admin/summary.rs diff --git a/src/base/module/homepage/locales/en-US/homepage.ftl b/pagetop/src/base/module/homepage/locales/en-US/homepage.ftl similarity index 100% rename from src/base/module/homepage/locales/en-US/homepage.ftl rename to pagetop/src/base/module/homepage/locales/en-US/homepage.ftl diff --git a/src/base/module/homepage/locales/es-ES/homepage.ftl b/pagetop/src/base/module/homepage/locales/es-ES/homepage.ftl similarity index 100% rename from src/base/module/homepage/locales/es-ES/homepage.ftl rename to pagetop/src/base/module/homepage/locales/es-ES/homepage.ftl diff --git a/src/base/module/homepage/mod.rs b/pagetop/src/base/module/homepage/mod.rs similarity index 100% rename from src/base/module/homepage/mod.rs rename to pagetop/src/base/module/homepage/mod.rs diff --git a/src/base/module/mod.rs b/pagetop/src/base/module/mod.rs similarity index 100% rename from src/base/module/mod.rs rename to pagetop/src/base/module/mod.rs diff --git a/src/base/module/user/entity/mod.rs b/pagetop/src/base/module/user/entity/mod.rs similarity index 100% rename from src/base/module/user/entity/mod.rs rename to pagetop/src/base/module/user/entity/mod.rs diff --git a/src/base/module/user/entity/user.rs b/pagetop/src/base/module/user/entity/user.rs similarity index 100% rename from src/base/module/user/entity/user.rs rename to pagetop/src/base/module/user/entity/user.rs diff --git a/src/base/module/user/locales/en-US/homepage.ftl b/pagetop/src/base/module/user/locales/en-US/homepage.ftl similarity index 100% rename from src/base/module/user/locales/en-US/homepage.ftl rename to pagetop/src/base/module/user/locales/en-US/homepage.ftl diff --git a/src/base/module/user/locales/es-ES/homepage.ftl b/pagetop/src/base/module/user/locales/es-ES/homepage.ftl similarity index 100% rename from src/base/module/user/locales/es-ES/homepage.ftl rename to pagetop/src/base/module/user/locales/es-ES/homepage.ftl diff --git a/src/base/module/user/migration/m20220312_000001_create_table_user.rs b/pagetop/src/base/module/user/migration/m20220312_000001_create_table_user.rs similarity index 100% rename from src/base/module/user/migration/m20220312_000001_create_table_user.rs rename to pagetop/src/base/module/user/migration/m20220312_000001_create_table_user.rs diff --git a/src/base/module/user/migration/mod.rs b/pagetop/src/base/module/user/migration/mod.rs similarity index 100% rename from src/base/module/user/migration/mod.rs rename to pagetop/src/base/module/user/migration/mod.rs diff --git a/src/base/module/user/mod.rs b/pagetop/src/base/module/user/mod.rs similarity index 100% rename from src/base/module/user/mod.rs rename to pagetop/src/base/module/user/mod.rs diff --git a/src/base/theme/aliner/mod.rs b/pagetop/src/base/theme/aliner/mod.rs similarity index 100% rename from src/base/theme/aliner/mod.rs rename to pagetop/src/base/theme/aliner/mod.rs diff --git a/src/base/theme/bootsier/locales/en-US/bootsier.ftl b/pagetop/src/base/theme/bootsier/locales/en-US/bootsier.ftl similarity index 100% rename from src/base/theme/bootsier/locales/en-US/bootsier.ftl rename to pagetop/src/base/theme/bootsier/locales/en-US/bootsier.ftl diff --git a/src/base/theme/bootsier/locales/es-ES/bootsier.ftl b/pagetop/src/base/theme/bootsier/locales/es-ES/bootsier.ftl similarity index 100% rename from src/base/theme/bootsier/locales/es-ES/bootsier.ftl rename to pagetop/src/base/theme/bootsier/locales/es-ES/bootsier.ftl diff --git a/src/base/theme/bootsier/mod.rs b/pagetop/src/base/theme/bootsier/mod.rs similarity index 100% rename from src/base/theme/bootsier/mod.rs rename to pagetop/src/base/theme/bootsier/mod.rs diff --git a/src/base/theme/minimal/mod.rs b/pagetop/src/base/theme/minimal/mod.rs similarity index 100% rename from src/base/theme/minimal/mod.rs rename to pagetop/src/base/theme/minimal/mod.rs diff --git a/src/base/theme/mod.rs b/pagetop/src/base/theme/mod.rs similarity index 100% rename from src/base/theme/mod.rs rename to pagetop/src/base/theme/mod.rs diff --git a/src/config.rs b/pagetop/src/config.rs similarity index 100% rename from src/config.rs rename to pagetop/src/config.rs diff --git a/src/core/global.rs b/pagetop/src/core/global.rs similarity index 100% rename from src/core/global.rs rename to pagetop/src/core/global.rs diff --git a/src/core/mod.rs b/pagetop/src/core/mod.rs similarity index 100% rename from src/core/mod.rs rename to pagetop/src/core/mod.rs diff --git a/src/core/module/definition.rs b/pagetop/src/core/module/definition.rs similarity index 100% rename from src/core/module/definition.rs rename to pagetop/src/core/module/definition.rs diff --git a/src/core/module/mod.rs b/pagetop/src/core/module/mod.rs similarity index 100% rename from src/core/module/mod.rs rename to pagetop/src/core/module/mod.rs diff --git a/src/core/response/mod.rs b/pagetop/src/core/response/mod.rs similarity index 100% rename from src/core/response/mod.rs rename to pagetop/src/core/response/mod.rs diff --git a/src/core/response/page/assets.rs b/pagetop/src/core/response/page/assets.rs similarity index 100% rename from src/core/response/page/assets.rs rename to pagetop/src/core/response/page/assets.rs diff --git a/src/core/response/page/component.rs b/pagetop/src/core/response/page/component.rs similarity index 100% rename from src/core/response/page/component.rs rename to pagetop/src/core/response/page/component.rs diff --git a/src/core/response/page/container.rs b/pagetop/src/core/response/page/container.rs similarity index 100% rename from src/core/response/page/container.rs rename to pagetop/src/core/response/page/container.rs diff --git a/src/core/response/page/mod.rs b/pagetop/src/core/response/page/mod.rs similarity index 100% rename from src/core/response/page/mod.rs rename to pagetop/src/core/response/page/mod.rs diff --git a/src/core/response/page/page.rs b/pagetop/src/core/response/page/page.rs similarity index 100% rename from src/core/response/page/page.rs rename to pagetop/src/core/response/page/page.rs diff --git a/src/core/server/app.rs b/pagetop/src/core/server/app.rs similarity index 98% rename from src/core/server/app.rs rename to pagetop/src/core/server/app.rs index 1f2ec7f3..b23b38f2 100644 --- a/src/core/server/app.rs +++ b/pagetop/src/core/server/app.rs @@ -47,7 +47,7 @@ impl Application { // Inicializa la conexión con la base de datos. trace::info!( - "Connecting to database \"{}\" with a pool of {} connections.", + "Connecting to database \"{}\" using a pool of {} connections.", &SETTINGS.database.db_name, &SETTINGS.database.max_pool_size ); diff --git a/src/core/server/figfonts/slant.flf b/pagetop/src/core/server/figfonts/slant.flf similarity index 100% rename from src/core/server/figfonts/slant.flf rename to pagetop/src/core/server/figfonts/slant.flf diff --git a/src/core/server/figfonts/small.flf b/pagetop/src/core/server/figfonts/small.flf similarity index 100% rename from src/core/server/figfonts/small.flf rename to pagetop/src/core/server/figfonts/small.flf diff --git a/src/core/server/figfonts/speed.flf b/pagetop/src/core/server/figfonts/speed.flf similarity index 100% rename from src/core/server/figfonts/speed.flf rename to pagetop/src/core/server/figfonts/speed.flf diff --git a/src/core/server/figfonts/starwars.flf b/pagetop/src/core/server/figfonts/starwars.flf similarity index 100% rename from src/core/server/figfonts/starwars.flf rename to pagetop/src/core/server/figfonts/starwars.flf diff --git a/src/core/server/mod.rs b/pagetop/src/core/server/mod.rs similarity index 100% rename from src/core/server/mod.rs rename to pagetop/src/core/server/mod.rs diff --git a/src/core/server/tracing.rs b/pagetop/src/core/server/tracing.rs similarity index 100% rename from src/core/server/tracing.rs rename to pagetop/src/core/server/tracing.rs diff --git a/src/core/theme/definition.rs b/pagetop/src/core/theme/definition.rs similarity index 100% rename from src/core/theme/definition.rs rename to pagetop/src/core/theme/definition.rs diff --git a/src/core/theme/mod.rs b/pagetop/src/core/theme/mod.rs similarity index 100% rename from src/core/theme/mod.rs rename to pagetop/src/core/theme/mod.rs diff --git a/src/db.rs b/pagetop/src/db.rs similarity index 100% rename from src/db.rs rename to pagetop/src/db.rs diff --git a/src/lib.rs b/pagetop/src/lib.rs similarity index 100% rename from src/lib.rs rename to pagetop/src/lib.rs diff --git a/src/locale.rs b/pagetop/src/locale.rs similarity index 100% rename from src/locale.rs rename to pagetop/src/locale.rs diff --git a/src/prelude.rs b/pagetop/src/prelude.rs similarity index 100% rename from src/prelude.rs rename to pagetop/src/prelude.rs diff --git a/src/trace.rs b/pagetop/src/trace.rs similarity index 100% rename from src/trace.rs rename to pagetop/src/trace.rs diff --git a/src/util.rs b/pagetop/src/util.rs similarity index 100% rename from src/util.rs rename to pagetop/src/util.rs diff --git a/static/aliner/css/styles.css b/pagetop/static/aliner/css/styles.css similarity index 100% rename from static/aliner/css/styles.css rename to pagetop/static/aliner/css/styles.css diff --git a/static/bootsier/css/bootstrap.min.css b/pagetop/static/bootsier/css/bootstrap.min.css similarity index 100% rename from static/bootsier/css/bootstrap.min.css rename to pagetop/static/bootsier/css/bootstrap.min.css diff --git a/static/bootsier/css/bootstrap.min.css.map b/pagetop/static/bootsier/css/bootstrap.min.css.map similarity index 100% rename from static/bootsier/css/bootstrap.min.css.map rename to pagetop/static/bootsier/css/bootstrap.min.css.map diff --git a/static/bootsier/images/caution.png b/pagetop/static/bootsier/images/caution.png similarity index 100% rename from static/bootsier/images/caution.png rename to pagetop/static/bootsier/images/caution.png diff --git a/static/bootsier/js/bootstrap.bundle.min.js b/pagetop/static/bootsier/js/bootstrap.bundle.min.js similarity index 100% rename from static/bootsier/js/bootstrap.bundle.min.js rename to pagetop/static/bootsier/js/bootstrap.bundle.min.js diff --git a/static/bootsier/js/bootstrap.bundle.min.js.map b/pagetop/static/bootsier/js/bootstrap.bundle.min.js.map similarity index 100% rename from static/bootsier/js/bootstrap.bundle.min.js.map rename to pagetop/static/bootsier/js/bootstrap.bundle.min.js.map diff --git a/static/theme/js/jquery.min.js b/pagetop/static/theme/js/jquery.min.js similarity index 100% rename from static/theme/js/jquery.min.js rename to pagetop/static/theme/js/jquery.min.js diff --git a/static/theme/js/jquery.min.map b/pagetop/static/theme/js/jquery.min.map similarity index 100% rename from static/theme/js/jquery.min.map rename to pagetop/static/theme/js/jquery.min.map diff --git a/static/theme/menu/css/menu-blue.css b/pagetop/static/theme/menu/css/menu-blue.css similarity index 100% rename from static/theme/menu/css/menu-blue.css rename to pagetop/static/theme/menu/css/menu-blue.css diff --git a/static/theme/menu/css/menu-clean.css b/pagetop/static/theme/menu/css/menu-clean.css similarity index 100% rename from static/theme/menu/css/menu-clean.css rename to pagetop/static/theme/menu/css/menu-clean.css diff --git a/static/theme/menu/css/menu-mint.css b/pagetop/static/theme/menu/css/menu-mint.css similarity index 100% rename from static/theme/menu/css/menu-mint.css rename to pagetop/static/theme/menu/css/menu-mint.css diff --git a/static/theme/menu/css/menu-simple.css b/pagetop/static/theme/menu/css/menu-simple.css similarity index 100% rename from static/theme/menu/css/menu-simple.css rename to pagetop/static/theme/menu/css/menu-simple.css diff --git a/static/theme/menu/css/menu.css b/pagetop/static/theme/menu/css/menu.css similarity index 100% rename from static/theme/menu/css/menu.css rename to pagetop/static/theme/menu/css/menu.css diff --git a/static/theme/menu/js/menu.min.js b/pagetop/static/theme/menu/js/menu.min.js similarity index 100% rename from static/theme/menu/js/menu.min.js rename to pagetop/static/theme/menu/js/menu.min.js diff --git a/tests/health_check.rs b/pagetop/tests/health_check.rs similarity index 100% rename from tests/health_check.rs rename to pagetop/tests/health_check.rs diff --git a/tests/main.rs b/pagetop/tests/main.rs similarity index 100% rename from tests/main.rs rename to pagetop/tests/main.rs