diff --git a/src/app.rs b/src/app.rs index 4a643f5..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() @@ -137,7 +137,6 @@ fn StudentRoutes() -> impl MatchNestedRoutes + Clone { - impl MatchNestedRoutes + Clone { + } .into_inner() diff --git a/src/components/dashboard_button.rs b/src/components/dashboard_button.rs index 6bbd8ba..895f9a0 100644 --- a/src/components/dashboard_button.rs +++ b/src/components/dashboard_button.rs @@ -27,7 +27,7 @@ pub fn DashboardButton( #[prop(into)] description: String, /// The file path or URL of the icon displayed at the top of the button. - #[prop(into)] + #[prop(optional, into)] icon: String, /// The route that the user is navigated to when clicking the button. #[prop(into)] @@ -37,22 +37,26 @@ pub fn DashboardButton( let on_click = move |_| navigate(&path, Default::default()); + let icon = StoredValue::new(icon); + view! { - }.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/academics_page.rs b/src/pages/student/academics_page.rs index ed5241f..5111a92 100644 --- a/src/pages/student/academics_page.rs +++ b/src/pages/student/academics_page.rs @@ -18,6 +18,7 @@ pub fn StudentAcademicsPage() -> impl IntoView {
impl IntoView { label="Academic Honors:" data_map=controller.data_map data_member="academic_honors" - placeholder="TBD" + placeholder="High Honors, etc." required=false input_type=TextFieldType::Text /> diff --git a/src/pages/student/additional_page.rs b/src/pages/student/additional_page.rs index 5796d1a..e79a374 100644 --- a/src/pages/student/additional_page.rs +++ b/src/pages/student/additional_page.rs @@ -1,13 +1,65 @@ use leptos::prelude::*; +use crate::components::DashboardButton; #[component] pub fn AdditionalPage() -> impl IntoView { view! { -
-
"Student Additional Forms"
+
+
+
"Student Additional Information Forms"
- "This is just a placeholder for now. We'll show redirect buttons to each form." + "All forms listed under this tab are for additional eligibility factors that some scholarships require."
+
+ "None of these forms are required, but they may increase the total number of scholarships that you are eligible to be applied to." +
+ + + + + + + + +
+
} } diff --git a/src/pages/student/athletics_page.rs b/src/pages/student/athletics_page.rs index 61fb12b..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,11 @@ 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 0ba7a41..52af2e9 100644 --- a/src/pages/student/demographics_page.rs +++ b/src/pages/student/demographics_page.rs @@ -1,22 +1,25 @@ -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! {
- - // Inputs here. + impl IntoView { input_type=TextFieldType::Text required=true /> - // There must be a date of birth selection field here. + +