diff --git a/.env.dev b/.env.dev index 5e21dd0..d49acbb 100644 --- a/.env.dev +++ b/.env.dev @@ -1,2 +1,2 @@ -DATABASE_URL=postgres://app:app@db/todo_baggins +DATABASE_URL=postgres://app:app@localhost:5432/todo_baggins LANGUAGE_CODE=en-US diff --git a/Cargo.lock b/Cargo.lock index 326274d..2947743 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3677,6 +3677,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.104" @@ -3685,6 +3694,7 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -5133,6 +5143,7 @@ dependencies = [ "dioxus-query", "dotenvy", "feruca", + "openssl", "serde", "serde_json", "serde_with", diff --git a/Cargo.toml b/Cargo.toml index aa1b68b..e20d7e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,21 +22,22 @@ diesel_migrations = { version = "2.2.0", features = ["postgres"], optional = tru dotenvy = { version = "0.15.7", optional = true } time = { version = "0.3.36", optional = true } -async-std = { version = "1.12.0", optional = true } -dioxus-i18n = { version = "0.3.0", optional = true } -dioxus-query = { version = "0.6.0", optional = true } -voca_rs = { version = "1.15.2", optional = true } +async-std = { version = "1.12.0" } +dioxus-i18n = { version = "0.3.0" } +dioxus-query = { version = "0.6.0" } +voca_rs = { version = "1.15.2" } + +[target.'cfg(target_os = "android")'.dependencies] +openssl = { version = "0.10", features = ["vendored"] } [features] -default = ["web"] +default = ["mobile"] desktop = ["dioxus/desktop"] -mobile = ["dioxus/mobile"] +mobile = [ + "dioxus/mobile", +] web = [ "dioxus/web", - "dep:async-std", - "dep:dioxus-query", - "dep:dioxus-i18n", - "dep:voca_rs" ] server = [ "dioxus/server", diff --git a/docker/dev/app/supervisord.conf b/docker/dev/app/supervisord.conf index 8c7b300..4a7cc5c 100644 --- a/docker/dev/app/supervisord.conf +++ b/docker/dev/app/supervisord.conf @@ -13,11 +13,11 @@ stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 redirect_stderr=true -[program:dx] -command=dx serve --addr 0.0.0.0 --port 8000 -directory=/srv/app -autostart=true -autorestart=true -stdout_logfile=/dev/fd/1 -stdout_logfile_maxbytes=0 -redirect_stderr=true +# [program:dx] +# command=dx serve --addr 0.0.0.0 --port 8000 +# directory=/srv/app +# autostart=true +# autorestart=true +# stdout_logfile=/dev/fd/1 +# stdout_logfile_maxbytes=0 +# redirect_stderr=true