fix: db dependencies + dependencies update (#23)

BcnRust · Jan 13, 2024 · 31e5123 · 31e5123
1 parent 3f3ba3b
commit 31e5123
Show file tree

Hide file tree

Showing 18 changed files with 899 additions and 767 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,6 @@
 [workspace]
-members = [
-    "api/lib",
-    "api/actix",
-    "api/shuttle",
-    "front",
-    "shared"
-]
+members = ["api/lib", "api/actix", "api/shuttle", "front", "shared"]
+resolver = "2"
 
 [workspace.dependencies]
 # internal
@@ -14,7 +9,14 @@ api-lib = { version = "0.1.0", path = "./api/lib" }
 # actix and sqlx
 actix-web = "4.3.1"
 actix-files = "0.6.2"
-sqlx = { version = "0.6.3", default-features = false, features = [ "runtime-actix-native-tls", "macros", "postgres", "uuid", "chrono", "json" ] }
+sqlx = { version = "0.7", default-features = false, features = [
+    "tls-native-tls",
+    "macros",
+    "postgres",
+    "uuid",
+    "chrono",
+    "json",
+] }
 # serde
 serde = { version = "1.0.164", features = ["derive"] }
 # utils

diff --git a/Makefile.toml b/Makefile.toml
@@ -1,7 +1,7 @@
 # project tasks
 [tasks.api-run]
 workspace = false
-env = { RUST_LOG="info" }
+env = { RUST_LOG = "info" }
 install_crate = "cargo-shuttle"
 command = "cargo"
 args = ["shuttle", "run"]
@@ -15,7 +15,7 @@ args = ["run", "--bin", "api-actix"]
 workspace = false
 cwd = "./front"
 install_crate = "dioxus-cli"
-command = "dioxus"
+command = "dx"
 args = ["serve", "--port", "8000"]
 
 [tasks.front-build]
@@ -28,8 +28,8 @@ rm -rf api/shuttle/static static
 mkdir api/shuttle/static
 mkdir static
 cd front
-dioxus build --release
-# local development 
+dx build --release
+# local development
 cp -r dist/* ../api/shuttle/static
 # production
 cp -r dist/* ../static
@@ -100,4 +100,3 @@ cwd = "./docs"
 install_crate = "mdbook"
 command = "mdbook"
 args = ["serve"]
-
diff --git a/api/lib/Cargo.toml b/api/lib/Cargo.toml
@@ -22,4 +22,4 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 actix-rt = "2"
-mockall = "0.11"
+mockall = "0.12.1"
diff --git a/api/shuttle/Cargo.toml b/api/shuttle/Cargo.toml
@@ -10,15 +10,13 @@ publish = false
 # internal
 api-lib = { workspace = true }
 # shuttle
-shuttle-runtime = "0.21.0"
-shuttle-actix-web = "0.21.0"
+shuttle-runtime = "0.36.0"
+shuttle-actix-web = "0.36.0"
 # db
 # shuttle-aws-rds = { version = "0.18.0", features = ["postgres"] }
-shuttle-shared-db = { version = "0.21.0", features = ["postgres"] }
+shuttle-shared-db = { version = "0.36.0", features = ["postgres"] }
 sqlx = { workspace = true }
-# static files
-shuttle-static-folder = "0.21.0"
-# actix
+# actixs
 actix-web = { workspace = true }
 actix-files = { workspace = true }
 tokio = "1.28.2"
diff --git a/api/shuttle/src/main.rs b/api/shuttle/src/main.rs
@@ -1,5 +1,4 @@
-use std::path::PathBuf;
-
+use actix_files::Files;
 use actix_web::web::{self, ServiceConfig};
 use shuttle_actix_web::ShuttleActixWeb;
 use shuttle_runtime::CustomError;
@@ -8,7 +7,6 @@ use sqlx::Executor;
 #[shuttle_runtime::main]
 async fn actix_web(
     #[shuttle_shared_db::Postgres()] pool: sqlx::PgPool,
-    #[shuttle_static_folder::StaticFolder(folder = "static")] static_folder: PathBuf,
 ) -> ShuttleActixWeb<impl FnOnce(&mut ServiceConfig) + Send + Clone + 'static> {
     // initialize the database if not already initialized
     pool.execute(include_str!("../../db/schema.sql"))
@@ -29,11 +27,7 @@ async fn actix_web(
                     api_lib::v1::service::<api_lib::film_repository::PostgresFilmRepository>,
                 ),
         )
-        .service(
-            actix_files::Files::new("/", static_folder)
-                .show_files_listing()
-                .index_file("index.html"),
-        );
+        .service(Files::new("/", "static").index_file("index.html"));
     };
 
     Ok(config.into())

diff --git a/docs/src/backend/01_workspace_setup.md b/docs/src/backend/01_workspace_setup.md
@@ -30,6 +30,7 @@ members = [
     "api/shuttle",
     "shared"
 ]
+resolver = "2"
 ```
 
 We will add the `front` crate later, don't worry.

diff --git a/docs/src/backend/05_working_with_a_database.md b/docs/src/backend/05_working_with_a_database.md
@@ -20,8 +20,15 @@ Go to the `Cargo.toml` file in the `api > shuttle` folder and add the following
 [dependencies]
 ...
 # database
-shuttle-shared-db = { version = "0.21.0", features = ["postgres"] }
-sqlx = { version = "0.6.3", default-features = false, features = [ "runtime-actix-native-tls", "macros", "postgres", "uuid", "chrono", "json" ] }
+shuttle-shared-db = { version = "0.36.0", features = ["postgres"] }
+sqlx = { version = "0.7", default-features = false, features = [
+    "tls-native-tls",
+    "macros",
+    "postgres",
+    "uuid",
+    "chrono",
+    "json",
+] }
 ```
 
 ```admonish  title="Cargo Dependencies"

diff --git a/docs/src/backend/12_library.md b/docs/src/backend/12_library.md
@@ -83,7 +83,14 @@ Now, if you compile, you should be getting errors from the compiler complaining
 # actix
 actix-web = "4.3.1"
 # database
-sqlx = { version = "0.6.3", default-features = false, features = [ "runtime-actix-native-tls", "macros", "postgres", "uuid", "chrono", "json" ] }
+sqlx = { version = "0.7", default-features = false, features = [
+    "tls-native-tls",
+    "macros",
+    "postgres",
+    "uuid",
+    "chrono",
+    "json",
+] }
 # tracing
 tracing = "0.1"
 ```

diff --git a/docs/src/backend/19_film_repository.md b/docs/src/backend/19_film_repository.md
@@ -58,8 +58,8 @@ Let's bring this dependency into our `api-lib` crate by adding it to the `Cargo.
 ```diff
 [dependencies]
 + # utils
-+ async-trait = "0.1"
-+ uuid = { version = "1.3", features = ["serde", "v4", "js"] }
++ async-trait = "0.1.68"
++ uuid = { version = "1.3.4", features = ["serde", "v4", "js"] }
 ```
 
 Now, let's mark our [trait](https://doc.rust-lang.org/book/ch10-02-traits.html) as `async` and add all the `use` statements we need:

diff --git a/docs/src/backend/20_implementing_trait.md b/docs/src/backend/20_implementing_trait.md
@@ -32,7 +32,7 @@ impl PostgresFilmRepository {
 }
 ```
 
-```admonish 
+```admonish
 This sort of constructor pattern is very common in Rust and the convention is to use `new` as the name of the associated function. 
 ```
 
@@ -154,7 +154,14 @@ Add the [SQLx](https://github.com/launchbadge/sqlx) dependency to the `Cargo.tom
 
 ```toml
 # database
-sqlx = { version = "0.6.3", default-features = false, features = [ "runtime-actix-native-tls", "macros", "postgres", "uuid", "chrono", "json" ] }
+sqlx = { version = "0.7", default-features = false, features = [
+    "tls-native-tls",
+    "macros",
+    "postgres",
+    "uuid",
+    "chrono",
+    "json",
+] }
 ```
 
 And then add the `sqlx::FromRow` trait into the `derive` attribute of the `Film` and `CreateFilm` structs.

diff --git a/docs/src/backend/24_serving_static_files.md b/docs/src/backend/24_serving_static_files.md
@@ -20,20 +20,14 @@ Let's add the `shuttle-static-folder` and the [actix-files](https://docs.rs/acti
 [dependencies]
 # static
 actix-files = "0.6.2"
-shuttle-static-folder = "0.21.0"
 ```
 
 ## Serving the static files
 
 Now, let's refactor our `main.rs` file to serve the static files.
 
-Add this parameter to the `actix_web` function:
 
-```rust
- #[shuttle_static_folder::StaticFolder(folder = "static")] static_folder: PathBuf,
-```
-
-And then, let's modify our `ServiceConfig` to serve static files in the `/` path and the API in the `/api` path:
+Let's modify our `ServiceConfig` to serve static files in the `/` path and the API in the `/api` path:
 
 ```diff
 - cfg.app_data(film_repository)
@@ -47,11 +41,7 @@ And then, let's modify our `ServiceConfig` to serve static files in the `/` path
 +             api_lib::films::service::<api_lib::film_repository::PostgresFilmRepo+ sitory>,
 +         ),
 + )
-+ .service(
-+     actix_files::Files::new("/", static_folder)
-+         .show_files_listing()
-+         .index_file("index.html"),
-+ );
++ .service(Files::new("/", "static").index_file("index.html"));
 ```
 
 ~~~admonish tip title="Final Code" collapsible=true
@@ -84,11 +74,7 @@ async fn actix_web(
                     api_lib::films::service::<api_lib::film_repository::PostgresFilmRepository>,
                 ),
         )
-        .service(
-            actix_files::Files::new("/", static_folder)
-                .show_files_listing()
-                .index_file("index.html"),
-        );
+        .service(Files::new("/", "static").index_file("index.html"));
     };
 
     Ok(config.into())

diff --git a/docs/src/frontend/03_01_setup.md b/docs/src/frontend/03_01_setup.md
@@ -54,8 +54,8 @@ Add Dioxus and the web renderer as dependencies to your project, modify your `Ca
 
 [dependencies]
 # dioxus
-dioxus = "0.3.2"
-dioxus-web = "0.3.2"
+dioxus = "0.4.3"
+dioxus-web = "0.4.3"
 ```
 
 ## Tailwind Configuration

diff --git a/docs/src/frontend/03_02_app_startup.md b/docs/src/frontend/03_02_app_startup.md
@@ -98,8 +98,8 @@ The first step towards this involves installing the `wasm-logger` crate. You can
 ...
 [dependencies]
 # dioxus
-dioxus = "0.3.2"
-dioxus-web = "0.3.2"
+dioxus = "0.4.3"
+dioxus-web = "0.4.3"
 +log = "0.4.19"
 +wasm-logger = "0.2.0"
 ```
@@ -123,4 +123,4 @@ With the logger initialized, you can now log messages to your browser's console.
 log::info!("Message on my console");
 ```
 
-By using this logging mechanism, you can make your debugging process more straightforward and efficient.
+By using this logging mechanism, you can make your debugging process more straightforward and efficient.
diff --git a/docs/src/frontend/03_04_02_local_state.md b/docs/src/frontend/03_04_02_local_state.md
@@ -277,8 +277,8 @@ Finally add `uuid` dependency to the `Cargo.toml` file.
 # shared
 shared = { path = "../shared" }
 # dioxus
-dioxus = "0.3.2"
-dioxus-web = "0.3.2"
+dioxus = "0.4.3"
+dioxus-web = "0.4.3"
 wasm-logger = "0.2.0"
 +uuid = { version = "1.3.4", features = ["serde", "v4", "js"] }
 ```
diff --git a/front/Cargo.toml b/front/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 # shared
 shared = { workspace = true }
 # dioxus
-dioxus = "0.3.2"
-dioxus-web = "0.3.2"
+dioxus = "0.4.3"
+dioxus-web = "0.4.3"
 reqwest = { version = "0.11.18", features = ["json"] }
 serde = { workspace = true }
 uuid = { workspace = true }

diff --git a/front/src/components/button.rs b/front/src/components/button.rs
@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 use crate::models::ButtonType;
 
-#[inline_props]
+#[component]
 pub fn Button<'a>(
     cx: Scope<'a>,
     button_type: ButtonType,

diff --git a/front/src/components/film_card.rs b/front/src/components/film_card.rs
@@ -2,7 +2,7 @@ use crate::{components::Button, models::ButtonType};
 use dioxus::prelude::*;
 use shared::models::Film;
 
-#[inline_props]
+#[component]
 pub fn FilmCard<'a>(
     cx: Scope<'a>,
     film: &'a Film,