diff --git a/src/app.rs b/src/app.rs index 65c9333..c601b99 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,11 +1,11 @@ use crate::components::ToastList; use crate::components::login::ProviderLoginContext; -use crate::pages::{student, FormClosedPage}; use crate::pages::{ AdminHomePage, AdminProviderPage, AdminScholarshipPage, AdminShell, AdminUtilsPage, ApplicantsPageFallback, AuthCallbackPage, LoanerBorrowForm, LoanerFallback, LoanerReturnForm, LoanerShell, ProviderContactPage, ProviderPortal, }; +use crate::pages::{FormClosedPage, student}; use leptos::prelude::*; use leptos_meta::{MetaTags, Stylesheet, Title, provide_meta_context}; use leptos_oidc::AuthSignal; @@ -90,10 +90,10 @@ fn ProviderRoutes() -> impl MatchNestedRoutes + Clone { - // - // - // - // + // + // + // + // } .into_inner() @@ -150,7 +150,10 @@ fn StudentRoutes() -> impl MatchNestedRoutes + Clone { - + } .into_inner() diff --git a/src/components/dashboard_button.rs b/src/components/dashboard_button.rs index 358140a..895f9a0 100644 --- a/src/components/dashboard_button.rs +++ b/src/components/dashboard_button.rs @@ -43,8 +43,8 @@ pub fn DashboardButton( - }.into_any() + } + .into_any() } diff --git a/src/pages/form_closed_page.rs b/src/pages/form_closed_page.rs index fcbfadc..f11b5e9 100644 --- a/src/pages/form_closed_page.rs +++ b/src/pages/form_closed_page.rs @@ -1,5 +1,5 @@ -use leptos::prelude::*; -use crate::components::Banner; +use crate::components::Banner; +use leptos::prelude::*; #[component] pub fn FormClosedPage() -> impl IntoView { @@ -7,14 +7,13 @@ pub fn FormClosedPage() -> impl IntoView { // about which form is closed right now. view! { - +
"This form has been closed!"
-
"If you believe this is an error, please contact Sara Smith at ""ssmith@region15.org"
+
+ "If you believe this is an error, please contact Sara Smith at " + "ssmith@region15.org" +
} } diff --git a/src/pages/student/athletics_page.rs b/src/pages/student/athletics_page.rs index c2022fd..61ef1f0 100644 --- a/src/pages/student/athletics_page.rs +++ b/src/pages/student/athletics_page.rs @@ -1,7 +1,7 @@ -use leptos::prelude::*; -use crate::components::{Loading, MultiEntry, ValidatedForm}; +use crate::components::{Loading, MultiEntry, ValidatedForm}; use crate::input; use crate::pages::student::form_setup::use_student_form; +use leptos::prelude::*; #[component] pub fn StudentAthleticsPage() -> impl IntoView { @@ -11,7 +11,7 @@ pub fn StudentAthleticsPage() -> impl IntoView {
- impl IntoView {
} -} \ No newline at end of file +} diff --git a/src/pages/student/demographics_page.rs b/src/pages/student/demographics_page.rs index f0c8a91..52af2e9 100644 --- a/src/pages/student/demographics_page.rs +++ b/src/pages/student/demographics_page.rs @@ -1,16 +1,16 @@ -use leptos::prelude::*; use crate::components::{Loading, OutlinedTextField, Select, TextFieldType, ValidatedForm}; use crate::pages::student::form_setup::use_student_form; +use leptos::prelude::*; #[component] pub fn StudentDemographicsPage() -> impl IntoView { // This page should show a form that the students need to fill out. // It's a simple form, really nothing more than a contact form. - // I'm going to test out creating this form without using a panel - we'll just use the page as + // I'm going to test out creating this form without using a panel - we'll just use the page as // it is with a specially spaced invisible div instead of a shaded container. let controller = use_student_form("demographics"); - + view! {
@@ -49,7 +49,11 @@ pub fn StudentDemographicsPage() -> impl IntoView { data_map=controller.data_map data_member="dob" required=true - value_list=vec!["Male".to_string(), "Female".to_string(), "Prefer not to answer/Other".to_string()] + value_list=vec![ + "Male".to_string(), + "Female".to_string(), + "Prefer not to answer/Other".to_string(), + ] /> impl IntoView {
impl IntoView { @@ -9,7 +9,9 @@ pub fn StudentHomePage() -> impl IntoView {
"Region 15 Scholarship Application"
"Welcome to the R15 general scholarship application! If you have any questions, please direct them to Sara Smith at " - "ssmith@region15.org""." + + "ssmith@region15.org" + "."
"Here are some links to get you started:"
impl IntoView { @@ -8,71 +8,76 @@ pub fn StudentSpecificRequirementsPage() -> impl IntoView { view! { - {move || controller.data_resource.get() - .map(move |_| { - view! { -
-
- - - - - - - - - -
-
- }.into_any() - }).collect_view() - } + {move || { + controller + .data_resource + .get() + .map(move |_| { + view! { +
+
+ + + + + + + + + +
+
+ } + .into_any() + }) + .collect_view() + }} } -} \ No newline at end of file +} diff --git a/src/pages/student/work_experience_page.rs b/src/pages/student/work_experience_page.rs index 0d01a4d..61c70ed 100644 --- a/src/pages/student/work_experience_page.rs +++ b/src/pages/student/work_experience_page.rs @@ -1,7 +1,7 @@ -use leptos::prelude::*; -use crate::components::{Loading, MultiEntry, ValidatedForm}; +use crate::components::{Loading, MultiEntry, ValidatedForm}; use crate::input; use crate::pages::student::form_setup::use_student_form; +use leptos::prelude::*; #[component] pub fn StudentWorkExperiencePage() -> impl IntoView { @@ -26,9 +26,15 @@ pub fn StudentWorkExperiencePage() -> impl IntoView { Text, "job_title", "Job Title:", true, "Waiter, Cashier, etc..." ), input!(Text, "employer", "Employer:", true, "Your employer's name..."), - input!(Text, "start_date", "Approximate start date:", true, "01/01/2000"), - input!(Text, "end_date", "End date:", true, "01/01/2026, or current if not applicable"), - input!(Number, "num_hours", "Approximate number of hours per week:", true, "25") + input!( + Text, "start_date", "Approximate start date:", true, "01/01/2000" + ), + input!( + Text, "end_date", "End date:", true, "01/01/2026, or current if not applicable" + ), + input!( + Number, "num_hours", "Approximate number of hours per week:", true, "25" + ), ] /> @@ -36,4 +42,4 @@ pub fn StudentWorkExperiencePage() -> impl IntoView {
} -} \ No newline at end of file +}