9 Commits

8 changed files with 44 additions and 30 deletions

@ -5,5 +5,8 @@
/node_modules/ /node_modules/
/static/ /static/
/target/ /target/
/docker-compose-dev.yaml .dockerignore
/docker-compose-prod.yaml /docker-compose-dev.yml
/docker-compose-prod.yml
/docker/dev/app/Dockerfile
/docker/prod/app/Dockerfile

@ -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 LANGUAGE_CODE=en-US

@ -0,0 +1 @@
${PullRequestTitle} (${PullRequestReference})

11
Cargo.lock generated

@ -3677,6 +3677,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" 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]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.9.104" version = "0.9.104"
@ -3685,6 +3694,7 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
"openssl-src",
"pkg-config", "pkg-config",
"vcpkg", "vcpkg",
] ]
@ -5133,6 +5143,7 @@ dependencies = [
"dioxus-query", "dioxus-query",
"dotenvy", "dotenvy",
"feruca", "feruca",
"openssl",
"serde", "serde",
"serde_json", "serde_json",
"serde_with", "serde_with",

@ -22,21 +22,22 @@ diesel_migrations = { version = "2.2.0", features = ["postgres"], optional = tru
dotenvy = { version = "0.15.7", optional = true } dotenvy = { version = "0.15.7", optional = true }
time = { version = "0.3.36", optional = true } time = { version = "0.3.36", optional = true }
async-std = { version = "1.12.0", optional = true } async-std = { version = "1.12.0" }
dioxus-i18n = { version = "0.3.0", optional = true } dioxus-i18n = { version = "0.3.0" }
dioxus-query = { version = "0.6.0", optional = true } dioxus-query = { version = "0.6.0" }
voca_rs = { version = "1.15.2", optional = true } voca_rs = { version = "1.15.2" }
[target.'cfg(target_os = "android")'.dependencies]
openssl = { version = "0.10", features = ["vendored"] }
[features] [features]
default = ["web"] default = ["mobile"]
desktop = ["dioxus/desktop"] desktop = ["dioxus/desktop"]
mobile = ["dioxus/mobile"] mobile = [
"dioxus/mobile",
]
web = [ web = [
"dioxus/web", "dioxus/web",
"dep:async-std",
"dep:dioxus-query",
"dep:dioxus-i18n",
"dep:voca_rs"
] ]
server = [ server = [
"dioxus/server", "dioxus/server",

@ -13,11 +13,11 @@ stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
redirect_stderr=true redirect_stderr=true
[program:dx] # [program:dx]
command=dx serve --addr 0.0.0.0 --port 8000 # command=dx serve --addr 0.0.0.0 --port 8000
directory=/srv/app # directory=/srv/app
autostart=true # autostart=true
autorestart=true # autorestart=true
stdout_logfile=/dev/fd/1 # stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0 # stdout_logfile_maxbytes=0
redirect_stderr=true # redirect_stderr=true

@ -1,11 +1,9 @@
FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b AS builder FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b AS builder
RUN rustup target add wasm32-unknown-unknown \ RUN cargo install dioxus-cli diesel_cli \
&& cargo install dioxus-cli diesel_cli \
&& apt-get update && apt-get install -y --no-install-recommends \ && apt-get update && apt-get install -y --no-install-recommends \
nodejs=18.19.0+dfsg-6~deb12u2 \ nodejs=18.19.0+dfsg-6~deb12u2 \
npm=9.2.0~ds1-1 \ npm=9.2.0~ds1-1 \
supervisor=4.2.5-1 \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

12
package-lock.json generated

@ -5,14 +5,14 @@
"packages": { "packages": {
"": { "": {
"dependencies": { "dependencies": {
"tailwindcss": "^3.4.10" "tailwindcss": "3.4.10"
}, },
"devDependencies": { "devDependencies": {
"htmlhint": "^1.1.4", "htmlhint": "1.1.4",
"markdownlint-cli": "^0.43.0", "markdownlint-cli": "0.43.0",
"prettier": "^3.4.2", "prettier": "3.4.2",
"stylelint": "^16.12.0", "stylelint": "16.12.0",
"stylelint-config-standard": "^36.0.1" "stylelint-config-standard": "36.0.1"
} }
}, },
"node_modules/@alloc/quick-lru": { "node_modules/@alloc/quick-lru": {