Merge branch 'main' of https://git.mixel.cloud/Turbo/peer-group-grading

.env.example

@@ -1,7 +1,14 @@
+# Postgres section
 DB_NAME=
 DB_USER=
 DB_PASSWORD=
 DB_HOST=
 DB_PORT=
 
-DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:{DB_PORT}/${DB_NAME}
+DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:{DB_PORT}/${DB_NAME}
+
+# Redis section
+REDIS_HOST=
+REDIS_PORT=
+SECRET_KEY=
+

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "rust-analyzer.check.features": "all",
+    "rust-analyzer.cargo.features": "all"
+}

crates/backend/Cargo.toml

@@ -19,3 +19,6 @@ serde = {version = "1", features = ["derive"]}
 sea-orm ={ version = "1.1", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"]}
 
 dotenvy = "0.15"
+
+[features]
+serve = []

crates/backend/src/main.rs

@@ -1,3 +1,4 @@
+use actix_files::NamedFile;
 use actix_session::{storage::RedisSessionStore, SessionMiddleware};
 use actix_web::{cookie::Key, middleware::Logger, web, App, HttpResponse, HttpServer};
 use db::Database;
@@ -17,16 +18,29 @@ async fn main() -> std::io::Result<()> {
 
     let redis_conn = connect_to_redis_database().await;
 
+    // use dotenvy here to get SECRET_KEY
+    let secret_key = Key::generate();
+    println!("Secret Key {:?}", secret_key.master());
+
     HttpServer::new(move || {
-        App::new()
+        let app = App::new()
             .app_data(web::Data::new(database.clone()))
             .wrap(Logger::default())
             .wrap(SessionMiddleware::new(
                 redis_conn.clone(),
-                // use dotenvy here to get SECRET_KEY (if we want to have the same on every startup)
+                secret_key.clone(),
-                Key::generate(),
             ))
-            .configure(controller::register_controllers)
+            .configure(controller::register_controllers);
+
+        #[cfg(feature = "serve")]
+        let app = {
+            println!("running serve");
+            app.default_service(
+                web::get().to(async || NamedFile::open_async("./web/index.html").await),
+            )
+        };
+
+        app
     })
     .bind(("0.0.0.0", 8080))?
     .run()
@@ -34,8 +48,11 @@ async fn main() -> std::io::Result<()> {
 }
 
 async fn connect_to_redis_database() -> RedisSessionStore {
-    // Build the redis Connection from the .env file Variables
+    let redis_host = dotenvy::var("REDIS_HOST").expect("REDIS_HOST must be set in .env");
-    let redis_connection_string = "redis://127.0.0.1:6379";
+    let redis_port = dotenvy::var("REDIS_PORT")
+        .map(|x| x.parse::<u16>().expect("REDIS_PORT is not a valid port"))
+        .unwrap_or(6379);
+    let redis_connection_string = format!("redis://{}:{}", redis_host, redis_port);
     let store = RedisSessionStore::new(redis_connection_string)
         .await
         .unwrap();
@@ -43,13 +60,17 @@ async fn connect_to_redis_database() -> RedisSessionStore {
     return store;
 }
 
-
 fn build_database_url() -> String {
     let db_user = dotenvy::var("DB_USER").unwrap_or("pgg".to_owned());
     let db_name = dotenvy::var("DB_NAME").unwrap_or("pgg".to_owned());
     let db_password = dotenvy::var("DB_PASSWORD").unwrap_or("pgg".to_owned());
-    let db_host = dotenvy::var("DB_HOST").expect("DB_HOST must be set");
+    let db_host = dotenvy::var("DB_HOST").expect("DB_HOST must be set in .env");
-    let db_port = dotenvy::var("DB_PORT").map(|x| x.parse::<u16>().expect("DB_PORT is not a valid port")).unwrap_or(5432);
+    let db_port = dotenvy::var("DB_PORT")
+        .map(|x| x.parse::<u16>().expect("DB_PORT is not a valid port"))
+        .unwrap_or(5432);
 
-    format!("postgresql://{}:{}@{}:{}/{}", db_user, db_password, db_host, db_port, db_name)
+    format!(
-}
+        "postgresql://{}:{}@{}:{}/{}",
+        db_user, db_password, db_host, db_port, db_name
+    )
+}