From caec4fb017a83d1dada94e4c5d2cccc045713d73 Mon Sep 17 00:00:00 2001
From: Lucas Vas <lvas463@gmail.com>
Date: Sat, 7 Feb 2026 12:49:29 -0500
Subject: [PATCH] chore: add Show and fix small typing errors

---
 src/pages/student/demographics_page.rs     | 133 +++++++-------
 src/pages/student/extracurriculars_page.rs |  67 ++++----
 src/pages/student/family_info_page.rs      | 191 +++++++++++----------
 src/pages/student/university_page.rs       | 125 +++++++-------
 src/pages/student/work_experience_page.rs  |  48 +++---
 5 files changed, 295 insertions(+), 269 deletions(-)

diff --git a/src/pages/student/demographics_page.rs b/src/pages/student/demographics_page.rs
index 641f410..2452423 100644
--- a/src/pages/student/demographics_page.rs
+++ b/src/pages/student/demographics_page.rs
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use crate::components::{OutlinedTextField, Select, TextFieldType, ValidatedForm};
+use crate::components::{Loading, OutlinedTextField, Select, TextFieldType, ValidatedForm};
 use crate::pages::student::form_setup::use_student_form;
 
 #[component]
@@ -12,68 +12,73 @@ pub fn StudentDemographicsPage() -> impl IntoView {
     let controller = use_student_form("demographics");
     
     view! {
-        <div class="flex flex-1" />
-        <div class="flex flex-col flex-2 mt-6">
-            <ValidatedForm title="Student Demographic Form" on_submit=controller.submit_action>
-                // Inputs here.
-                <OutlinedTextField
-                    label="First Name:"
-                    data_map=controller.data_map
-                    data_member="first_name"
-                    placeholder="John"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                <OutlinedTextField
-                    label="Last Name:"
-                    data_map=controller.data_map
-                    data_member="last_name"
-                    placeholder="Smith"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                // There must be a date of birth selection field here.
-                <OutlinedTextField
-                    label="Student ID Number:"
-                    data_map=controller.data_map
-                    data_member="id_number"
-                    placeholder="Your 7 digit number..."
-                    input_type=TextFieldType::Number
-                    required=true
-                />
-                <OutlinedTextField
-                    label="Preferred Email:"
-                    data_map=controller.data_map
-                    data_member="email"
-                    placeholder="me@example.com"
-                    input_type=TextFieldType::Email(vec!["*".to_string()])
-                    required=true
-                />
-                <OutlinedTextField
-                    label="Preferred Phone Number:"
-                    data_map=controller.data_map
-                    data_member="phone_number"
-                    placeholder="000-000-0000"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                <OutlinedTextField
-                    label="Street Address:"
-                    data_map=controller.data_map
-                    data_member="street_address"
-                    placeholder="234 Judd Rd"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                <Select
-                    label="Town:"
-                    value_list=vec!["Southbury".to_string(), "Middlebury".to_string()]
-                    data_map=controller.data_map
-                    data_member="town"
-                    required=true
-                />
-            </ValidatedForm>
-        </div>
-        <div class="flex flex-1" />
+        <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="Student Demographic Form" on_submit=controller.submit_action>
+                    // Inputs here.
+                    <OutlinedTextField
+                        label="First Name:"
+                        data_map=controller.data_map
+                        data_member="first_name"
+                        placeholder="John"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="Last Name:"
+                        data_map=controller.data_map
+                        data_member="last_name"
+                        placeholder="Smith"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    // There must be a date of birth selection field here.
+                    <OutlinedTextField
+                        label="Student ID Number:"
+                        data_map=controller.data_map
+                        data_member="id_number"
+                        placeholder="Your 7 digit number..."
+                        input_type=TextFieldType::Number
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="Preferred Email:"
+                        data_map=controller.data_map
+                        data_member="email"
+                        placeholder="me@example.com"
+                        input_type=TextFieldType::Email(vec!["*".to_string()])
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="Preferred Phone Number:"
+                        data_map=controller.data_map
+                        data_member="phone_number"
+                        placeholder="000-000-0000"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="Street Address:"
+                        data_map=controller.data_map
+                        data_member="street_address"
+                        placeholder="234 Judd Rd"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    <Select
+                        label="Town:"
+                        value_list=vec!["Southbury".to_string(), "Middlebury".to_string()]
+                        data_map=controller.data_map
+                        data_member="town"
+                        required=true
+                    />
+                </ValidatedForm>
+            </div>
+            <div class="flex flex-1" />
+        </Show>
     }
 }
diff --git a/src/pages/student/extracurriculars_page.rs b/src/pages/student/extracurriculars_page.rs
index 7f16a2f..4c74f53 100644
--- a/src/pages/student/extracurriculars_page.rs
+++ b/src/pages/student/extracurriculars_page.rs
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use crate::components::{MultiEntry, OutlinedTextField, TextFieldType, ValidatedForm};
+use crate::components::{Loading, MultiEntry, OutlinedTextField, TextFieldType, ValidatedForm};
 use crate::input;
 use crate::pages::student::form_setup::use_student_form;
 
@@ -8,35 +8,40 @@ pub fn StudentExtracurricularsPage() -> impl IntoView {
     let controller = use_student_form("demographics");
 
     view! {
-        <div class="flex flex-1" />
-        <div class="flex flex-col flex-2 mt-6">
-            <ValidatedForm title="Extracurricular Information" on_submit=controller.submit_action>
-                // Inputs here.
-                <OutlinedTextField
-                    label="Total number of service hours:"
-                    data_map=controller.data_map
-                    data_member="service_hours"
-                    placeholder="Any number..."
-                    input_type=TextFieldType::Number
-                    required=true
-                />
-                <MultiEntry
-                    label="Extracurricular Activities:"
-                    description="Leave blank if not applicable."
-                    data_map=controller.data_map
-                    data_member="extracurricular"
-                    schema=vec![
-                        input!(Text, "activity_name", "Activity Name:", true, "Some activity..."),
-                        input!(Number, "num_hours", "Number of hours completed:", true, "40"),
-                        input!(Number, "num_weeks", "Number of weeks participated:", true, "3"),
-                        input!(Text, "special_involvement", "Any special involvement:", false, ""),
-                        input!(
-                            Checkbox, "grades", "Grades Participated:", true, ["9th", "10th", "11th", "12th"]
-                        ),
-                    ]
-                />
-            </ValidatedForm>
-        </div>
-        <div class="flex flex-1" />
+        <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="Extracurricular Information" on_submit=controller.submit_action>
+                    // Inputs here.
+                    <OutlinedTextField
+                        label="Total number of service hours:"
+                        data_map=controller.data_map
+                        data_member="service_hours"
+                        placeholder="Any number..."
+                        input_type=TextFieldType::Number
+                        required=true
+                    />
+                    <MultiEntry
+                        label="Extracurricular Activities:"
+                        description="Leave blank if not applicable."
+                        data_map=controller.data_map
+                        data_member="extracurricular"
+                        schema=vec![
+                            input!(Text, "activity_name", "Activity Name:", true, "Some activity..."),
+                            input!(Number, "num_hours", "Number of hours completed:", true, "40"),
+                            input!(Number, "num_weeks", "Number of weeks participated:", true, "3"),
+                            input!(Text, "special_involvement", "Any special involvement:", false, ""),
+                            input!(
+                                Checkbox, "grades", "Grades Participated:", true, ["9th", "10th", "11th", "12th"]
+                            ),
+                        ]
+                    />
+                </ValidatedForm>
+            </div>
+            <div class="flex flex-1" />
+        </Show>
     }
 }
\ No newline at end of file
diff --git a/src/pages/student/family_info_page.rs b/src/pages/student/family_info_page.rs
index 4fde2ac..0ce7e46 100644
--- a/src/pages/student/family_info_page.rs
+++ b/src/pages/student/family_info_page.rs
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use crate::components::{OutlinedTextField, TextFieldType, ValidatedForm};
+use crate::components::{Loading, OutlinedTextField, TextFieldType, ValidatedForm};
 use crate::pages::student::form_setup::use_student_form;
 
 #[component]
@@ -7,97 +7,102 @@ pub fn StudentFamilyPage() -> impl IntoView {
     let controller = use_student_form("family");
     
     view! {
-        <div class="flex flex-1" />
-        <div class="flex flex-col flex-2 mt-6">
-            <ValidatedForm title="Family Information" on_submit=controller.submit_action>
-                // Inputs here.
-                <OutlinedTextField
-                    label="Total number of children in family:"
-                    data_map=controller.data_map
-                    data_member="num_children"
-                    placeholder="Any number..."
-                    input_type=TextFieldType::Number
-                    required=true
-                />
-                <OutlinedTextField
-                    label="Total number of children currently attending college:"
-                    data_map=controller.data_map
-                    data_member="num_children_college"
-                    placeholder="Any number..."
-                    input_type=TextFieldType::Number
-                    required=true
-                />
-                <OutlinedTextField
-                    label="Parent/Guardian 1 Name:"
-                    data_map=controller.data_map
-                    data_member="parent_one_name"
-                    placeholder="John Smith"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                // TODO Could this be a select dropdown?
-                <OutlinedTextField
-                    label="Parent/Guardian 1 Relationship:"
-                    data_map=controller.data_map
-                    data_member="parent_one_relationship"
-                    placeholder="Mother/Father"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                // TODO Get a better example
-                <OutlinedTextField
-                    label="Parent/Guardian 1 Occupation:"
-                    data_map=controller.data_map
-                    data_member="parent_one_occupation"
-                    placeholder="Milkman"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                <OutlinedTextField
-                    label="Parent/Guardian 1 Employer:"
-                    data_map=controller.data_map
-                    data_member="parent_one_employer"
-                    placeholder="Example Employer"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-        
-                <OutlinedTextField
-                    label="Parent/Guardian 2 Name:"
-                    data_map=controller.data_map
-                    data_member="parent_one_name"
-                    placeholder="John Smith"
-                    input_type=TextFieldType::Text
-                    required=false
-                />
-                // TODO Could this be a select dropdown?
-                <OutlinedTextField
-                    label="Parent/Guardian 2 Relationship:"
-                    data_map=controller.data_map
-                    data_member="parent_one_relationship"
-                    placeholder="Mother/Father"
-                    input_type=TextFieldType::Text
-                    required=false
-                />
-                // TODO Get a better example
-                <OutlinedTextField
-                    label="Parent/Guardian 2 Occupation:"
-                    data_map=controller.data_map
-                    data_member="parent_one_occupation"
-                    placeholder="Milkman"
-                    input_type=TextFieldType::Text
-                    required=false
-                />
-                <OutlinedTextField
-                    label="Parent/Guardian 2 Employer:"
-                    data_map=controller.data_map
-                    data_member="parent_one_employer"
-                    placeholder="Example Employer"
-                    input_type=TextFieldType::Text
-                    required=false
-                />
-            </ValidatedForm>
-        </div>
-        <div class="flex flex-1" />
+        <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="Family Information" on_submit=controller.submit_action>
+                    // Inputs here.
+                    <OutlinedTextField
+                        label="Total number of children in family:"
+                        data_map=controller.data_map
+                        data_member="num_children"
+                        placeholder="Any number..."
+                        input_type=TextFieldType::Number
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="Total number of children currently attending college:"
+                        data_map=controller.data_map
+                        data_member="num_children_college"
+                        placeholder="Any number..."
+                        input_type=TextFieldType::Number
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="Parent/Guardian 1 Name:"
+                        data_map=controller.data_map
+                        data_member="parent_one_name"
+                        placeholder="John Smith"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    // TODO Could this be a select dropdown?
+                    <OutlinedTextField
+                        label="Parent/Guardian 1 Relationship:"
+                        data_map=controller.data_map
+                        data_member="parent_one_relationship"
+                        placeholder="Mother/Father"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    // TODO Get a better example
+                    <OutlinedTextField
+                        label="Parent/Guardian 1 Occupation:"
+                        data_map=controller.data_map
+                        data_member="parent_one_occupation"
+                        placeholder="Milkman"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="Parent/Guardian 1 Employer:"
+                        data_map=controller.data_map
+                        data_member="parent_one_employer"
+                        placeholder="Example Employer"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+
+                    <OutlinedTextField
+                        label="Parent/Guardian 2 Name:"
+                        data_map=controller.data_map
+                        data_member="parent_two_name"
+                        placeholder="John Smith"
+                        input_type=TextFieldType::Text
+                        required=false
+                    />
+                    // TODO Could this be a select dropdown?
+                    <OutlinedTextField
+                        label="Parent/Guardian 2 Relationship:"
+                        data_map=controller.data_map
+                        data_member="parent_two_relationship"
+                        placeholder="Mother/Father"
+                        input_type=TextFieldType::Text
+                        required=false
+                    />
+                    // TODO Get a better example
+                    <OutlinedTextField
+                        label="Parent/Guardian 2 Occupation:"
+                        data_map=controller.data_map
+                        data_member="parent_two_occupation"
+                        placeholder="Milkman"
+                        input_type=TextFieldType::Text
+                        required=false
+                    />
+                    <OutlinedTextField
+                        label="Parent/Guardian 2 Employer:"
+                        data_map=controller.data_map
+                        data_member="parent_two_employer"
+                        placeholder="Example Employer"
+                        input_type=TextFieldType::Text
+                        required=false
+                    />
+                </ValidatedForm>
+            </div>
+            <div class="flex flex-1" />
+        </Show>
     }
 }
\ No newline at end of file
diff --git a/src/pages/student/university_page.rs b/src/pages/student/university_page.rs
index a7cb53e..8e2673e 100644
--- a/src/pages/student/university_page.rs
+++ b/src/pages/student/university_page.rs
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use crate::components::{OutlinedTextField, Select, TextFieldType, ValidatedForm};
+use crate::components::{Loading, OutlinedTextField, Select, TextFieldType, ValidatedForm};
 use crate::pages::student::form_setup::use_student_form;
 
 #[component]
@@ -10,64 +10,69 @@ pub fn StudentUniversityPage() -> impl IntoView {
     // major, study field, intended career, college_acceptance
     
     view! {
-        <div class="flex flex-1" />
-        <div class="flex flex-col flex-2 mt-6">
-            <ValidatedForm title="University Information" on_submit=controller.submit_action>
-                // Inputs here.
-                <OutlinedTextField
-                    label="University Name:"
-                    data_map=controller.data_map
-                    data_member="college_name"
-                    placeholder="University of Example"
-                    input_type=TextFieldType::Number
-                    required=true
-                />
-                <OutlinedTextField
-                    label="University Street Address:"
-                    data_map=controller.data_map
-                    data_member="college_city"
-                    placeholder="123 Example Rd"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                // TODO Make this a select dropdown.
-                <OutlinedTextField
-                    label="University State:"
-                    data_map=controller.data_map
-                    data_member="college_state"
-                    placeholder="The State of Panic"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-                <OutlinedTextField
-                    label="University ZIP:"
-                    data_map=controller.data_map
-                    data_member="college_zip"
-                    placeholder="12345"
-                    input_type=TextFieldType::Number
-                    required=true
-                />
-                <Select
-                    label="Have you been sent an acceptance to the university?"
-                    data_map=controller.data_map
-                    data_member="college_acceptance"
-                    required=true
-                    value_list=vec![
-                        "Yes".to_string(),
-                        "No".to_string()
-                    ]
-                />
-                // TODO Make this a select dropdown.
-                <OutlinedTextField
-                    label="Chosen Major:"
-                    data_map=controller.data_map
-                    data_member="major"
-                    placeholder="Computer Science"
-                    input_type=TextFieldType::Text
-                    required=true
-                />
-            </ValidatedForm>
-        </div>
-        <div class="flex flex-1" />
+        <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="University Information" on_submit=controller.submit_action>
+                    // Inputs here.
+                    <OutlinedTextField
+                        label="University Name:"
+                        data_map=controller.data_map
+                        data_member="college_name"
+                        placeholder="University of Example"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="University Street Address:"
+                        data_map=controller.data_map
+                        data_member="college_city"
+                        placeholder="123 Example Rd"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    // TODO Make this a select dropdown.
+                    <OutlinedTextField
+                        label="University State:"
+                        data_map=controller.data_map
+                        data_member="college_state"
+                        placeholder="The State of Panic"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    <OutlinedTextField
+                        label="University ZIP:"
+                        data_map=controller.data_map
+                        data_member="college_zip"
+                        placeholder="12345"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                    <Select
+                        label="Have you been sent an acceptance to the university?"
+                        data_map=controller.data_map
+                        data_member="college_acceptance"
+                        required=true
+                        value_list=vec![
+                            "Yes".to_string(),
+                            "No".to_string()
+                        ]
+                    />
+                    // TODO Make this a select dropdown.
+                    <OutlinedTextField
+                        label="Chosen Major:"
+                        data_map=controller.data_map
+                        data_member="major"
+                        placeholder="Computer Science"
+                        input_type=TextFieldType::Text
+                        required=true
+                    />
+                </ValidatedForm>
+            </div>
+            <div class="flex flex-1" />
+        </Show>
     }
 }
diff --git a/src/pages/student/work_experience_page.rs b/src/pages/student/work_experience_page.rs
index d600b43..21d6392 100644
--- a/src/pages/student/work_experience_page.rs
+++ b/src/pages/student/work_experience_page.rs
@@ -1,31 +1,37 @@
 use std::collections::HashMap;
 use leptos::prelude::*;
-use crate::components::{MultiEntry, ValidatedForm};
+use crate::components::{Loading, MultiEntry, ValidatedForm};
 use crate::input;
+use crate::pages::student::form_setup::use_student_form;
 
 #[component]
 pub fn StudentWorkExperiencePage() -> impl IntoView {
-    let data_map = RwSignal::new(HashMap::new());
+    let controller = use_student_form("workexp");
 
     view! {
-        <div class="flex flex-1" />
-        <div class="flex flex-col flex-2 mt-6">
-            <ValidatedForm title="Student Work Experience" on_submit=move || {}>
-                <MultiEntry
-                    label="Work Experience:"
-                    description="Leave blank if not applicable."
-                    data_map=data_map
-                    data_member="extracurricular"
-                    schema=vec![
-                        input!(Text, "job_title", "Job Title:", true, "Waiter, Cashier, etc..."),
-                        input!(Text, "employer", "Employer:", true, "Your employer's name..."),
-                        input!(Number, "start_date", "Start date:", true, "40"),
-                        input!(Number, "end_date", "End date:", true, "3"),
-                        input!(Number, "num_hours", "Number of hours completed:", true, "120"),
-                    ]
-                />
-            </ValidatedForm>
-        </div>
-        <div class="flex flex-1" />
+        <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="Student Work Experience" on_submit=controller.submit_action>
+                    <MultiEntry
+                        label="Work Experience:"
+                        description="Leave blank if not applicable."
+                        data_map=controller.data_map
+                        data_member="extracurricular"
+                        schema=vec![
+                            input!(Text, "job_title", "Job Title:", true, "Waiter, Cashier, etc..."),
+                            input!(Text, "employer", "Employer:", true, "Your employer's name..."),
+                            input!(Number, "start_date", "Start date:", true, "40"),
+                            input!(Number, "end_date", "End date:", true, "3"),
+                            input!(Number, "num_hours", "Number of hours completed:", true, "120"),
+                        ]
+                    />
+                </ValidatedForm>
+            </div>
+            <div class="flex flex-1" />
+        </Show>
     }
 }
\ No newline at end of file