feat(front): serving front and ci setup

Author: robertohuertasm

.env.example

@@ -1,3 +1,4 @@
 PORT=8080
 DATABASE_URL=postgres://posgres:[email protected]:5432/your-db
 RUST_LOG=info
+STATIC_FOLDER=./front/dist

.github/workflows/shuttle.yaml

@@ -9,6 +9,25 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+          override: true
+
+      - name: Getting cargo make
+        uses: davidB/rust-cargo-make@v1
+
+      - name: Install Dioxus CLI
+        run: cargo install dioxus-cli
+
+      - name: Build the front-end
+        run: cargo make front-build
+
       - name: deployment
         uses: shuttle-hq/deploy-action@main
         with:

.gitignore

@@ -4,4 +4,4 @@ Secrets.toml
 .env
 node_modules
 api.local.http
-
+static/

Cargo.lock

@@ -13,6 +13,7 @@ shared = { version = "0.1.0", path = "./shared" }
 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" ] }
 # serde
 serde = { version = "1.0.164", features = ["derive"] }

Cargo.toml

@@ -18,19 +18,16 @@ install_crate = "dioxus-cli"
 command = "dioxus"
 args = ["serve"]
 
-# [tasks.front]
-# workspace = false
-# script_runner = "@shell"
-# script = '''
-# rm -rf static
-# mkdir static
-# cd front
-# dioxus build --release
-# mkdir -p dist/assets/images
-# cp -a src/images/* dist/assets/images/
-# cp -r dist/* ../static
-# rm -rf dist
-# '''
+[tasks.front-build]
+workspace = false
+script_runner = "@shell"
+script = '''
+rm -rf api/shuttle/static
+mkdir api/shuttle/static
+cd front
+dioxus build --release
+cp -r dist/* ../api/shuttle/static
+'''
 
 # local db
 [tasks.db-start]

Makefile.toml

@@ -11,6 +11,7 @@ api-lib = { workspace = true }
 sqlx = { workspace = true }
 # actix
 actix-web = { workspace = true }
+actix-files = { workspace = true }
 actix-cors = "0.6.4"
 # utils
 dotenv = "0.15"

api/actix/Cargo.toml

@@ -28,18 +28,28 @@ async fn main() -> std::io::Result<()> {
     // starting the server
     tracing::info!("🚀🚀🚀 Starting Actix server at {}", address);
 
+    // static files
+    let static_folder = std::env::var("STATIC_FOLDER").unwrap_or("./front/dist".to_string());
+
     HttpServer::new(move || {
         // CORS
         let cors = Cors::permissive();
 
-        App::new().wrap(cors).service(
-            web::scope("/api")
-                .app_data(repo.clone())
-                .configure(api_lib::health::service)
-                .configure(
-                    api_lib::v1::service::<api_lib::film_repository::PostgresFilmRepository>,
-                ),
-        )
+        App::new()
+            .wrap(cors)
+            .service(
+                web::scope("/api")
+                    .app_data(repo.clone())
+                    .configure(api_lib::health::service)
+                    .configure(
+                        api_lib::v1::service::<api_lib::film_repository::PostgresFilmRepository>,
+                    ),
+            )
+            .service(
+                actix_files::Files::new("/", &static_folder)
+                    .show_files_listing()
+                    .index_file("index.html"),
+            )
     })
     .bind(&address)
     .unwrap_or_else(|err| {

api/actix/src/main.rs

@@ -16,9 +16,9 @@ shuttle-actix-web = "0.19.0"
 # shuttle-aws-rds = { version = "0.18.0", features = ["postgres"] }
 shuttle-shared-db = { version = "0.19.0", features = ["postgres"] }
 sqlx = { workspace = true }
-
 # static files
 shuttle-static-folder = "0.19.0"
 # actix
 actix-web = { workspace = true }
+actix-files = { workspace = true }
 tokio = "1.28.2"

api/shuttle/Cargo.toml

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use actix_web::web::{self, ServiceConfig};
 use shuttle_actix_web::ShuttleActixWeb;
 use shuttle_runtime::CustomError;
@@ -6,6 +8,7 @@ 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"))
@@ -25,6 +28,11 @@ async fn actix_web(
                 .configure(
                     api_lib::v1::service::<api_lib::film_repository::PostgresFilmRepository>,
                 ),
+        )
+        .service(
+            actix_files::Files::new("/", static_folder)
+                .show_files_listing()
+                .index_file("index.html"),
         );
     };