Merge branch 'main' into feat/date-component

# Conflicts:
#	src/app.rs
#	src/common/mod.rs

src/app.rs

@@ -1,10 +1,13 @@
-use crate::pages::{AboutPage, ComparisonTestPage, HomePage, LoanerPage, ProviderPortal, TestPage};
-use leptos::logging::log;
+use crate::pages::{
+    AboutPage, ComparisonTestPage, HomePage, LoanerPage, ProviderPortal, ScholarshipInfoPage,
+    TestPage,
+};
+use leptos::leptos_dom::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},
+    components::{ParentRoute, Route, Router, Routes},
     path,
 };
 
@@ -106,12 +109,18 @@ pub fn AppWithRoutes() -> impl IntoView {
             // 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!("comparison") view=ComparisonTestPage />
-                <Route path=path!("providers") view=ProviderPortal />
-                <Route path=path!("loaners") view=LoanerPage />
-                <Route path=path!("loaners/:form_name") view=LoanerPage />
+                <Route path=path!("/about") view=AboutPage/>
+                <Route path=path!("/test_page") view=TestPage/>
+                <Route path=path!("/comparison") view=ComparisonTestPage />
+                <Route path=path!("/providers") view=ProviderPortal/>
+                <ParentRoute path=path!("/providers/scholarships") view=ScholarshipInfoPage>
+                    <Route path=path!(":id") view=ScholarshipInfoPage/>
+                    <Route path=path!("") view=ScholarshipInfoPage/>
+                </ParentRoute>
+                <ParentRoute path=path!("loaners") view=LoanerPage>
+                    <Route path=path!("") view=LoanerPage />
+                    <Route path=path!(":form_name") view=LoanerPage />
+                </ParentRoute>
             </Routes>
         </main>
     }