Merge branch 'main' into feat/applicants-page
This commit is contained in:
3 files changed
+34
-20
No files matched your search
+11
-20
@@ -138,26 +138,17 @@ fn StudentRoutes() -> impl MatchNestedRoutes + Clone {
|
|||||||
<ParentRoute path=path!("students") view=student::StudentShell>
|
<ParentRoute path=path!("students") view=student::StudentShell>
|
||||||
<Route path=path!("callback") view=AuthCallbackPage />
|
<Route path=path!("callback") view=AuthCallbackPage />
|
||||||
<Route path=path!("home") view=student::StudentHomePage />
|
<Route path=path!("home") view=student::StudentHomePage />
|
||||||
<Route path=path!("demographics") view=student::StudentDemographicsPage />
|
<Route path=path!("demographics") view=student::ClosedForm />
|
||||||
<Route path=path!("eligibility") view=student::StudentEligibilityPage />
|
<Route path=path!("eligibility") view=student::ClosedForm />
|
||||||
<Route path=path!("additional") view=student::AdditionalPage />
|
<Route path=path!("additional") view=student::ClosedForm />
|
||||||
<Route path=path!("additional/academics") view=student::StudentAcademicsPage />
|
<Route path=path!("additional/academics") view=student::ClosedForm />
|
||||||
<Route path=path!("additional/athletics") view=student::StudentAthleticsPage />
|
<Route path=path!("additional/athletics") view=student::ClosedForm />
|
||||||
<Route
|
<Route path=path!("additional/extracurriculars") view=student::ClosedForm />
|
||||||
path=path!("additional/extracurriculars")
|
<Route path=path!("additional/work-experience") view=student::ClosedForm />
|
||||||
view=student::StudentExtracurricularsPage
|
<Route path=path!("additional/university") view=student::ClosedForm />
|
||||||
/>
|
<Route path=path!("additional/family-info") view=student::ClosedForm />
|
||||||
<Route
|
<Route path=path!("additional/financials") view=student::ClosedForm />
|
||||||
path=path!("additional/work-experience")
|
<Route path=path!("additional/specifics") view=student::ClosedForm />
|
||||||
view=student::StudentWorkExperiencePage
|
|
||||||
/>
|
|
||||||
<Route path=path!("additional/university") view=student::StudentUniversityPage />
|
|
||||||
<Route path=path!("additional/family-info") view=student::StudentFamilyPage />
|
|
||||||
<Route path=path!("additional/financials") view=student::StudentFinancialPage />
|
|
||||||
<Route
|
|
||||||
path=path!("additional/specifics")
|
|
||||||
view=student::StudentSpecificRequirementsPage
|
|
||||||
/>
|
|
||||||
</ParentRoute>
|
</ParentRoute>
|
||||||
}
|
}
|
||||||
.into_inner()
|
.into_inner()
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
use leptos::prelude::*;
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn ClosedForm() -> impl IntoView {
|
||||||
|
view! {
|
||||||
|
<div class="flex flex-col items-center mx-auto mt-10">
|
||||||
|
<h1 class="text-2xl font-bold">"Form Closed"</h1>
|
||||||
|
<p class="text-lg">
|
||||||
|
"This form is now closed. If you believe this is an error, please contact the guidance office."
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
mod academics_page;
|
mod academics_page;
|
||||||
mod additional_page;
|
mod additional_page;
|
||||||
mod athletics_page;
|
mod athletics_page;
|
||||||
|
mod closed_form;
|
||||||
mod demographics_page;
|
mod demographics_page;
|
||||||
mod eligibility_page;
|
mod eligibility_page;
|
||||||
mod extracurriculars_page;
|
mod extracurriculars_page;
|
||||||
@@ -10,12 +11,17 @@ mod form_setup;
|
|||||||
mod home_page;
|
mod home_page;
|
||||||
mod shell;
|
mod shell;
|
||||||
mod specific_requirements_page;
|
mod specific_requirements_page;
|
||||||
|
<<<<<<< feat/applicants-page
|
||||||
|
=======
|
||||||
|
mod test_display;
|
||||||
|
>>>>>>> main
|
||||||
mod university_page;
|
mod university_page;
|
||||||
mod work_experience_page;
|
mod work_experience_page;
|
||||||
|
|
||||||
pub use academics_page::*;
|
pub use academics_page::*;
|
||||||
pub use additional_page::*;
|
pub use additional_page::*;
|
||||||
pub use athletics_page::*;
|
pub use athletics_page::*;
|
||||||
|
pub use closed_form::*;
|
||||||
pub use demographics_page::*;
|
pub use demographics_page::*;
|
||||||
pub use eligibility_page::*;
|
pub use eligibility_page::*;
|
||||||
pub use extracurriculars_page::*;
|
pub use extracurriculars_page::*;
|
||||||
@@ -24,5 +30,9 @@ pub use financial_page::*;
|
|||||||
pub use home_page::*;
|
pub use home_page::*;
|
||||||
pub use shell::*;
|
pub use shell::*;
|
||||||
pub use specific_requirements_page::*;
|
pub use specific_requirements_page::*;
|
||||||
|
<<<<<<< feat/applicants-page
|
||||||
|
=======
|
||||||
|
pub use test_display::*;
|
||||||
|
>>>>>>> main
|
||||||
pub use university_page::*;
|
pub use university_page::*;
|
||||||
pub use work_experience_page::*;
|
pub use work_experience_page::*;
|
||||||
Reference in new issue
Block a user