From 12dfe502f4e57de09fbc49f8efa11315d704ce0d Mon Sep 17 00:00:00 2001
From: Lucas Vas <lvas463@gmail.com>
Date: Tue, 10 Feb 2026 09:39:30 -0500
Subject: [PATCH] chore: rustfmt run

---
 src/app.rs                            |  10 +--
 src/common/form_schema.rs             |  84 ++++++++++++---------
 src/pages/admin/scholarship_page.rs   |   8 +-
 src/pages/student/academics_page.rs   |   5 +-
 src/pages/student/athletics_page.rs   |   5 +-
 src/pages/student/eligibility_page.rs | 103 ++++++++++++++++----------
 src/pages/student/shell.rs            |   4 +-
 7 files changed, 117 insertions(+), 102 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index bc50b33..a517025 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -136,14 +136,8 @@ fn StudentRoutes() -> impl MatchNestedRoutes + Clone {
                 path=path!("additional/work-experience")
                 view=student::StudentWorkExperiencePage
             />
-            <Route
-                path=path!("additional/university")
-                view=student::StudentUniversityPage
-            />
-            <Route
-                path=path!("additional/family-info")
-                view=student::StudentFamilyPage
-            />
+            <Route path=path!("additional/university") view=student::StudentUniversityPage />
+            <Route path=path!("additional/family-info") view=student::StudentFamilyPage />
         </ParentRoute>
     }
         .into_inner()
diff --git a/src/common/form_schema.rs b/src/common/form_schema.rs
index f7bca1e..dc1099f 100644
--- a/src/common/form_schema.rs
+++ b/src/common/form_schema.rs
@@ -36,60 +36,70 @@ impl InputType {
     ) -> impl IntoView {
         view! {
             {match self {
-                InputType::Text(member, label, placeholder, required) =>
+                InputType::Text(member, label, placeholder, required) => {
                     view! {
                         <Row>
                             <OutlinedTextField
-                                label = label.clone()
-                                placeholder = placeholder.clone()
-                                data_member = member.clone()
-                                data_map = data_map
-                                required = required
+                                label=label.clone()
+                                placeholder=placeholder.clone()
+                                data_member=member.clone()
+                                data_map=data_map
+                                required=required
                             />
                         </Row>
-                    }.into_any(),
-                InputType::Number(member, label, placeholder, required) =>
+                    }
+                        .into_any()
+                }
+                InputType::Number(member, label, placeholder, required) => {
                     view! {
                         <OutlinedTextField
-                            label = label.clone()
-                            placeholder = placeholder.clone()
-                            data_member = member.clone()
-                            data_map = data_map
-                            input_type = TextFieldType::Number
-                            required = required
+                            label=label.clone()
+                            placeholder=placeholder.clone()
+                            data_member=member.clone()
+                            data_map=data_map
+                            input_type=TextFieldType::Number
+                            required=required
                         />
-                    }.into_any(),
-                InputType::Checkbox(member, label, options, required) =>
+                    }
+                        .into_any()
+                }
+                InputType::Checkbox(member, label, options, required) => {
                     view! {
                         <CheckboxList
-                            label = label.clone()
-                            name = name.clone()
-                            items = options.clone()
-                            data_member = member.clone()
-                            data_map = data_map
-                            required = required
+                            label=label.clone()
+                            name=name.clone()
+                            items=options.clone()
+                            data_member=member.clone()
+                            data_map=data_map
+                            required=required
                         />
-                    }.into_any(),
-                InputType::Radio(member, label, options, required) =>
+                    }
+                        .into_any()
+                }
+                InputType::Radio(member, label, options, required) => {
                     view! {
                         <RadioList
-                            label = label.clone()
-                            data_member = member.clone()
-                            data_map = data_map
-                            items = options.clone()
-                            required = required
+                            label=label.clone()
+                            data_member=member.clone()
+                            data_map=data_map
+                            items=options.clone()
+                            required=required
                         />
-                    }.into_any(),
-                InputType::Select(member, label, options, required) =>
+                    }
+                        .into_any()
+                }
+                InputType::Select(member, label, options, required) => {
                     view! {
                         <Select
-                            label = label.clone()
-                            value_list = options.clone()
-                            data_member = member.clone()
-                            data_map = data_map
-                            required = required
+                            label=label.clone()
+                            value_list=options.clone()
+                            data_member=member.clone()
+                            data_map=data_map
+                            required=required
                         />
-                    }.into_any()
+                    }
+                        .into_any()
+                }
             }}
         }
     }
diff --git a/src/pages/admin/scholarship_page.rs b/src/pages/admin/scholarship_page.rs
index c3b13ab..4b08b96 100644
--- a/src/pages/admin/scholarship_page.rs
+++ b/src/pages/admin/scholarship_page.rs
@@ -4,12 +4,8 @@ use leptos::prelude::*;
 pub fn AdminScholarshipPage() -> impl IntoView {
     view! {
         <div class="flex flex-1 flex-col gap-4">
-            <div class="font-bold text-3xl">
-                "Scholarships View"
-            </div>
-            <div>
-                "This is a placeholder for now. It will show a list of all scholarships."
-            </div>
+            <div class="font-bold text-3xl">"Scholarships View"</div>
+            <div>"This is a placeholder for now. It will show a list of all scholarships."</div>
         </div>
     }
 }
\ No newline at end of file
diff --git a/src/pages/student/academics_page.rs b/src/pages/student/academics_page.rs
index f254903..09b00fb 100644
--- a/src/pages/student/academics_page.rs
+++ b/src/pages/student/academics_page.rs
@@ -7,10 +7,7 @@ pub fn StudentAcademicsPage() -> impl IntoView {
     let controller = use_student_form("academics");
 
     view! {
-        <Show 
-            when=move || controller.data_resource.get().is_some()
-            fallback=Loading
-        >
+        <Show when=move || controller.data_resource.get().is_some() fallback=Loading>
             <div class="flex flex-1" />
             <div class="flex flex-col flex-2 mt-6">
                 <ValidatedForm title="Academic Information" on_submit=controller.submit_action>
diff --git a/src/pages/student/athletics_page.rs b/src/pages/student/athletics_page.rs
index 3c74f87..61fb12b 100644
--- a/src/pages/student/athletics_page.rs
+++ b/src/pages/student/athletics_page.rs
@@ -8,10 +8,7 @@ pub fn StudentAthleticsPage() -> impl IntoView {
     let controller = use_student_form("athletics");
 
     view! {
-        <Show 
-            when=move || controller.data_resource.get().is_some()
-            fallback=Loading
-        >
+        <Show when=move || controller.data_resource.get().is_some() fallback=Loading>
             <div class="flex flex-1" />
             <div class="flex flex-col flex-2 mt-6">
                 <ValidatedForm title="Athletics Information" on_submit=controller.submit_action>
diff --git a/src/pages/student/eligibility_page.rs b/src/pages/student/eligibility_page.rs
index e472472..9f761dc 100644
--- a/src/pages/student/eligibility_page.rs
+++ b/src/pages/student/eligibility_page.rs
@@ -60,53 +60,69 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                     let Some(Ok(student_info)) = student_resource.get() else {
                         return view! {}.into_any();
                     };
-                    
-                    let valid_list = scholarships_list.iter()
+                    let valid_list = scholarships_list
+                        .iter()
                         .filter_map(|scholarship| {
-                            let scholarship_name = scholarship.data.get("name")
-                                    .unwrap_or(&ValueType::String(None))
-                                    .as_string().ok().flatten().unwrap_or_default();
+                            let scholarship_name = scholarship
+                                .data
+                                .get("name")
+                                .unwrap_or(&ValueType::String(None))
+                                .as_string()
+                                .ok()
+                                .flatten()
+                                .unwrap_or_default();
                             debug_log!("Checking scholarship: {}", scholarship_name);
-                        
-                            // Each scholarship will return Some(itself), or None. This is will be automatically
-                            // filtered based on the information. Invalid scholarships are None, along with those
-                            // that fail validation for any reason. Scholarships that are valid or did not choose
-                            // any requirements are Some(scholarship).
-                            let requirements_map = scholarship.data.get("requirements")
+                            let requirements_map = scholarship
+                                .data
+                                .get("requirements")
                                 .unwrap_or(&ValueType::Map(None))
-                                .as_map().ok().flatten()
+                                .as_map()
+                                .ok()
+                                .flatten()
                                 .unwrap_or_default()
-                                .values().cloned()
+                                .values()
+                                .cloned()
                                 .collect::<Vec<ValueType>>();
-                        
                             let resolved_requirements = requirements_map
                                 .iter()
                                 .map(|list_val| {
-                                    // We want to cast to a list, and then map the list to a new
-                                    // one that contains the correct ComparisonData.
-                                    let list = list_val.as_list().ok().flatten().unwrap_or_default();
-                                    list.iter().filter_map(|v| {
-                                        let id_string = v.as_string().ok().flatten().unwrap_or_default();
-                                        relations_list.iter()
-                                            .find(|relation| relation.id == id_string)
-                                    })
-                                    .cloned()
-                                    .collect::<Vec<ComparisonData>>()
+                                    let list = list_val
+                                        .as_list()
+                                        .ok()
+                                        .flatten()
+                                        .unwrap_or_default();
+                                    list.iter()
+                                        .filter_map(|v| {
+                                            let id_string = v
+                                                .as_string()
+                                                .ok()
+                                                .flatten()
+                                                .unwrap_or_default();
+                                            relations_list
+                                                .iter()
+                                                .find(|relation| relation.id == id_string)
+                                        })
+                                        .cloned()
+                                        .collect::<Vec<ComparisonData>>()
                                 })
                                 .collect::<Vec<Vec<ComparisonData>>>();
-                        
-                            debug_log!("Resolved requirements: {:?}", resolved_requirements.iter().flatten().map(|rel| rel.display_text.clone()).collect::<Vec<String>>());
-                            
-                            let valid = resolved_requirements.iter()
+                            debug_log!(
+                                "Resolved requirements: {:?}", resolved_requirements.iter().flatten().map(|rel| rel.display_text.clone()).collect::<Vec<String>>()
+                            );
+                            let valid = resolved_requirements
+                                .iter()
                                 .all(|list| {
-                                    list.iter().fold(false, |prev, requirement| {
-                                        let result = requirement.compare(&student_info)
-                                            .unwrap_or(false);
-                                
-                                        if prev { prev } else { result }
-                                    })
+                                    list.iter()
+                                        .fold(
+                                            false,
+                                            |prev, requirement| {
+                                                let result = requirement
+                                                    .compare(&student_info)
+                                                    .unwrap_or(false);
+                                                if prev { prev } else { result }
+                                            },
+                                        )
                                 });
-                            
                             if valid {
                                 debug_log!("Scholarship is valid.");
                                 Some(scholarship.clone())
@@ -116,15 +132,19 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                         })
                         .collect::<Vec<ExpandableInfo>>();
 
+                    // Each scholarship will return Some(itself), or None. This is will be automatically
+                    // filtered based on the information. Invalid scholarships are None, along with those
+                    // that fail validation for any reason. Scholarships that are valid or did not choose
+                    // any requirements are Some(scholarship).
+
+                    // We want to cast to a list, and then map the list to a new
+                    // one that contains the correct ComparisonData.
+
                     view! {
                         <div>{format!("Valid scholarships: {}", valid_list.len())}</div>
                         <For
                             each=move || valid_list.clone()
-                            key=|scholarship| {
-                                scholarship
-                                    .subject
-                                    .clone()
-                            }
+                            key=|scholarship| { scholarship.subject.clone() }
                             children=move |scholarship| {
                                 let scholarship = StoredValue::new(scholarship);
                                 let scholarship_name = Memo::new(move |_| {
@@ -163,7 +183,8 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                                 }
                             }
                         />
-                    }.into_any()
+                    }
+                        .into_any()
                 }}
             </Suspense>
         </div>
diff --git a/src/pages/student/shell.rs b/src/pages/student/shell.rs
index ba0c9d6..fe958d3 100644
--- a/src/pages/student/shell.rs
+++ b/src/pages/student/shell.rs
@@ -15,7 +15,7 @@ pub fn StudentShell() -> impl IntoView {
                     title="R15 Student Scholarship Application"
                     logo="/PHS_Stacked_Acronym.png"
                 />
-            
+
                 <div class="flex flex-1 min-h-0">
                     <AuthLoaded fallback=Loading>
                         <Authenticated unauthenticated=UnauthenticatedPage>
@@ -38,7 +38,7 @@ pub fn StudentShell() -> impl IntoView {
                                             ],
                                         ),
                                     ),
-                                    TabInfo::new("Eligible Scholarships", "eligibility", None)
+                                    TabInfo::new("Eligible Scholarships", "eligibility", None),
                                 ]
                             />
                         </Authenticated>