feat: create docker dependencies for cloud deployment

Dockerfile

@@ -1,7 +1,7 @@
-FROM rust:1.86 AS builder
+FROM rust:1.90 AS builder
 
 # Install node for tailwind capability
-RUN apt-get update -y && apt-get install -y --no-install-recommends clang libc6
+RUN apt-get update -y && apt-get install -y --no-install-recommends clang libc6 mold
 RUN wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz
 RUN tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
@@ -15,6 +15,7 @@ WORKDIR /app
 COPY . .
 
 # Setup fnm and build with leptos
+# If this doesn't work, we should use nvm as this is a proven solution.
 RUN cargo binstall fnm -y \
     && fnm --version \
     && eval "$(fnm env)" \
@@ -26,7 +27,7 @@ RUN cargo binstall fnm -y \
 
 # Start second phase of build - install ca-certs and copy all build outputs from previous step into a
 # Debian image in the /app directory.
-FROM debian:bookworm-slim AS runtime
+FROM debian:trixie-slim AS runtime
 WORKDIR /app
 RUN apt-get update -y \
     && apt-get install -y --no-install-recommends openssl ca-certificates \
@@ -46,6 +47,8 @@ COPY --from=builder /app/Cargo.toml /app/
 ENV RUST_LOG="info"
 ENV LEPTOS_SITE_ADDR="0.0.0.0:8080"
 ENV LEPTOS_SITE_ROOT="site"
+# Staging URL for server.
+ENV LP_SITE_ORIGIN="http://testing-url.com"
 EXPOSE 8080
 
 # Don't forget about project_name

docker-compose.yml

@@ -1,9 +1,6 @@
-
-services:
-  leptos-watch:
-    image: rust:1.86
+services:
+  scholarships-rs:
+    build: .
+    image: scholarships-rs-runner:latest
     ports:
-      - '3000:3000'
-    volumes:
-      - .:/app
-    command: cargo leptos watch
+      - '8080:8080'

src/app.rs

@@ -1,9 +1,8 @@
+use leptos::logging::log;
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, Stylesheet, Title, provide_meta_context};
 use leptos_oidc::{Auth, AuthParameters, AuthSignal, Challenge};
 use leptos_router::{components::{Route, Router, Routes}, path};
-use url::Url;
-
 use crate::pages::{AboutPage, HomePage, LoanerPage, TestPage};
 
 pub fn shell(options: LeptosOptions) -> impl IntoView {
@@ -29,12 +28,53 @@ pub fn App() -> impl IntoView {
     // Provides context that manages stylesheets, titles, meta tags, etc.
     provide_meta_context();
 
+    view! {
+        // injects a stylesheet into the document <head>
+        // id=leptos means cargo-leptos will hot-reload this stylesheet
+        <Stylesheet id="leptos" href="/pkg/scholarships-rs-wasm.css"/>
+        
+        // sets the document title
+        <Title text="R15 Scholarship App DEV"/>
+
+        // content for this welcome page
+        <Router>
+            <AppWithRoutes />
+        </Router>
+    }
+}
+
+fn use_origin() -> String {
+    #[cfg(target_arch = "wasm32")] {
+        use leptos::web_sys;
+        // Just get the current URL origin.
+        web_sys::window()
+            .unwrap()
+            .location()
+            .origin()
+            .unwrap_or("http://localhost:3000/".to_string())
+    }
+    
+    #[cfg(not(target_arch = "wasm32"))] {
+        // Read the expected origin out of an environment variable.
+        std::env::var("LP_SITE_ORIGIN").unwrap_or("http://localhost:3000/".to_string())
+    }
+}
+
+#[component]
+pub fn AppWithRoutes() -> impl IntoView {
+    provide_meta_context();
+    
+    let current_origin = use_origin();
+    log!("Current origin: {}", current_origin);
+
     // Authentication setup
     let parameters = AuthParameters {
         issuer: "https://cognito-idp.us-east-1.amazonaws.com/us-east-1_Lfjuy5zaM".into(),
         client_id: "10jr2h3vtpu9n7gj46pvg5qo2q".into(),
-        redirect_uri: Url::parse("http://localhost:3000").unwrap().to_string(),
-        post_logout_redirect_uri: Url::parse("http://localhost:3000").unwrap().to_string(),
+        redirect_uri: format!("{}/", use_origin()),
+        // redirect_uri: Url::parse(format!("{}", current_origin).as_str()).unwrap().to_string(),
+        // redirect_uri: Url::parse("http://localhost:3000").unwrap().to_string(),
+        post_logout_redirect_uri: current_origin,
         scope: Some("openid%20profile%20email".into()),
         audience: None,
         challenge: Challenge::None,
@@ -47,29 +87,16 @@ pub fn App() -> impl IntoView {
     let _ = Auth::init(parameters);
 
     view! {
-        // injects a stylesheet into the document <head>
-        // id=leptos means cargo-leptos will hot-reload this stylesheet
-        <Stylesheet id="leptos" href="/pkg/scholarships-rs-wasm.css"/>
-
-        // <AuthLoading><p>"Authentication is loading"</p></AuthLoading>
-        // <AuthErrorContext><AuthErrorView/></AuthErrorContext>
-
-        // sets the document title
-        <Title text="R15 Scholarship App DEV"/>
-
-        // content for this welcome page
-        <Router>
-            <main>
-                // TODO Create a 404 page
-                <Routes fallback=|| "Page not found.".into_view()>
-                    <Route path=path!("") view=HomePage/>
-                    <Route path=path!("about") view=AboutPage/>
-                    <Route path=path!("test_page") view=TestPage/>
-                    <Route path=path!("loaners") view=LoanerPage />
-                    <Route path=path!("loaners/:form_name") view=LoanerPage />
-                </Routes>
-            </main>
-        </Router>
+        <main>
+            // TODO Create a 404 page
+            <Routes fallback=|| "Page not found.".into_view()>
+                <Route path=path!("") view=HomePage/>
+                <Route path=path!("about") view=AboutPage/>
+                <Route path=path!("test_page") view=TestPage/>
+                <Route path=path!("loaners") view=LoanerPage />
+                <Route path=path!("loaners/:form_name") view=LoanerPage />
+            </Routes>
+        </main>
     }
 }
 

src/pages/unauthenticated_page.rs

@@ -1,3 +1,4 @@
+use leptos::logging::log;
 use crate::components::ActionButton;
 use leptos::prelude::*;
 use leptos_oidc::AuthSignal;
@@ -11,6 +12,8 @@ pub fn UnauthenticatedPage() -> impl IntoView {
                 .map(|unauthenticated| unauthenticated.login_url())
         })
     };
+    
+    Effect::new(move || log!("Generated login url: {:?}", login_url()));
 
     let navigate = leptos_router::hooks::use_navigate();