-
-
+
+
+ }
+}
\ No newline at end of file
diff --git a/src/pages/student/family_info_page.rs b/src/pages/student/family_info_page.rs
new file mode 100644
index 0000000..49926af
--- /dev/null
+++ b/src/pages/student/family_info_page.rs
@@ -0,0 +1,105 @@
+use leptos::prelude::*;
+use crate::components::{Loading, OutlinedTextField, TextFieldType, ValidatedForm};
+use crate::pages::student::form_setup::use_student_form;
+
+#[component]
+pub fn StudentFamilyPage() -> impl IntoView {
+ let controller = use_student_form("family");
+
+ view! {
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/src/pages/student/form_setup.rs b/src/pages/student/form_setup.rs
new file mode 100644
index 0000000..db1f166
--- /dev/null
+++ b/src/pages/student/form_setup.rs
@@ -0,0 +1,63 @@
+use std::collections::HashMap;
+use leptos::prelude::*;
+use crate::common::ValueType;
+use crate::pages::api::students::{get_student_data, PutStudentData};
+use crate::utils::get_user_claims;
+
+pub struct StudentFormInfo {
+ pub data_map: RwSignal>,
+ pub user_id: Memo>,
+ pub submit_action: Callback<()>,
+ pub refresh_trigger: Trigger,
+ pub data_resource: Resource, ServerFnError>>
+}
+
+pub fn use_student_form(
+ form_type: impl Into>
+) -> StudentFormInfo {
+ let form_type = form_type.into();
+
+ let user_claims = get_user_claims();
+ let user_id = Memo::new(move |_| {
+ user_claims.get()
+ .map(|info| info.claims.subject.clone())
+ });
+
+ let data_map = RwSignal::new(HashMap::new());
+
+ let refresh_trigger = Trigger::new();
+ let data_resource = Resource::new(
+ move || (user_id.get().unwrap_or_default(), form_type.get(), refresh_trigger.track()),
+ async move |(id, form_type, _)| get_student_data(
+ id,
+ form_type,
+ ).await
+ );
+
+ Effect::new(move || {
+ data_resource.with(|map_opt| {
+ let Some(Ok(map)) = map_opt else {
+ return;
+ };
+
+ data_map.set(map.to_owned());
+ });
+ });
+
+ let submit_action = ServerAction::::new();
+ let on_submit = move || {
+ submit_action.dispatch(PutStudentData {
+ subject: user_id.get().unwrap_or_default(),
+ data_type: form_type.get(),
+ data_map: data_map.get()
+ });
+ };
+
+ StudentFormInfo {
+ data_map,
+ refresh_trigger,
+ data_resource,
+ user_id,
+ submit_action: on_submit.into(),
+ }
+}
\ No newline at end of file
diff --git a/src/pages/student/home_page.rs b/src/pages/student/home_page.rs
new file mode 100644
index 0000000..f370932
--- /dev/null
+++ b/src/pages/student/home_page.rs
@@ -0,0 +1,55 @@
+use std::collections::HashMap;
+use leptos::logging::log;
+use leptos::prelude::*;
+use crate::common::ValueType;
+use crate::components::ActionButton;
+use crate::pages::api::students::{GetStudentData, PutStudentData};
+use crate::utils::get_user_claims;
+
+#[component]
+pub fn StudentHomePage() -> impl IntoView {
+ let user_claims = get_user_claims();
+ let user_id = Memo::new(move |_| {
+ user_claims.get()
+ .map(|info| info.claims.subject.clone())
+ });
+
+ let create_student_data = ServerAction::::new();
+ let get_student_data = ServerAction::::new();
+
+ let on_click_student_test = move |_| {
+ create_student_data.dispatch(PutStudentData {
+ subject: user_id.get().unwrap_or_default(),
+ data_type: "TESTING".into(),
+ data_map: HashMap::from([
+ ("testing_info".into(), ValueType::String(Some("hello!".to_string())))
+ ]),
+ });
+ };
+
+ let on_click_get_student = move |_| {
+ get_student_data.dispatch(GetStudentData {
+ subject: user_id.get().unwrap_or_default(),
+ data_type: "TESTING".into()
+ });
+ };
+
+ Effect::new(move || {
+ let Some(value) = get_student_data.value().get() else {
+ return;
+ };
+
+ log!("{:?}", value);
+ });
+
+ view! {
+
+
+ }
+}
diff --git a/src/pages/student/university_page.rs b/src/pages/student/university_page.rs
new file mode 100644
index 0000000..01c6962
--- /dev/null
+++ b/src/pages/student/university_page.rs
@@ -0,0 +1,72 @@
+use leptos::prelude::*;
+use crate::components::{Loading, OutlinedTextField, Select, TextFieldType, ValidatedForm};
+use crate::pages::student::form_setup::use_student_form;
+
+#[component]
+pub fn StudentUniversityPage() -> impl IntoView {
+ let controller = use_student_form("university");
+
+ // college name, state, city, zip
+ // major, study field, intended career, college_acceptance
+
+ view! {
+
+
+
+ }
+}
diff --git a/src/pages/student/work_experience_page.rs b/src/pages/student/work_experience_page.rs
new file mode 100644
index 0000000..deb0ef4
--- /dev/null
+++ b/src/pages/student/work_experience_page.rs
@@ -0,0 +1,35 @@
+use leptos::prelude::*;
+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 controller = use_student_form("workexp");
+
+ view! {
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/src/pages/test_page.rs b/src/pages/test_page.rs
deleted file mode 100644
index 37918d3..0000000
--- a/src/pages/test_page.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use chrono::DateTime;
-use crate::components::ActionButton;
-use leptos::prelude::*;
-use crate::common::{DateInfo, DateRange};
-use crate::pages::api::{CreateDates, CreateTestComparisons};
-
-fn get_important_dates() -> Vec {
- vec! [
- DateInfo {
- id: uuid::Uuid::new_v4().to_string(),
- title: "Provider Forms Open".to_string(),
- date: DateRange::Range(
- DateTime::parse_from_rfc3339("2026-01-20T07:15:00-05:00").unwrap(),
- DateTime::parse_from_rfc3339("2026-03-03T23:59:00-05:00").unwrap()
- ),
- description: "".to_string(),
- },
- DateInfo {
- id: uuid::Uuid::new_v4().to_string(),
- title: "Student Forms Open".to_string(),
- date: DateRange::Range(
- DateTime::parse_from_rfc3339("2026-03-03T07:15:00-05:00").unwrap(),
- DateTime::parse_from_rfc3339("2026-03-27T14:05:00-05:00").unwrap()
- ),
- description: "".to_string(),
- },
- DateInfo {
- id: uuid::Uuid::new_v4().to_string(),
- title: "Scholarship Decision Window".to_string(),
- date: DateRange::Range(
- DateTime::parse_from_rfc3339("2026-04-10T07:15:00-05:00").unwrap(),
- DateTime::parse_from_rfc3339("2026-05-01T23:59:00-05:00").unwrap()
- ),
- description: "Start date may change if available sooner.".to_string(),
- },
- DateInfo {
- id: uuid::Uuid::new_v4().to_string(),
- title: "PHS Scholarship Committee".to_string(),
- date: DateRange::Single(
- DateTime::parse_from_rfc3339("2026-05-18T00:00:00-05:00").unwrap(),
- ),
- description: "Time TBD".to_string(),
- },
- DateInfo {
- id: uuid::Uuid::new_v4().to_string(),
- title: "Scholarship and Awards Night".to_string(),
- date: DateRange::Single(
- DateTime::parse_from_rfc3339("2026-06-09T00:00:00-05:00").unwrap(),
- ),
- description: "Time TBD".to_string(),
- },
- ]
-}
-
-#[component]
-pub fn TestPage() -> impl IntoView {
- let create_comparisons = ServerAction::::new();
- let create_dates = ServerAction::::new();
-
- let on_click_comparisons = move |_| {
- create_comparisons.dispatch(CreateTestComparisons{});
- };
-
- let on_click_dates = move |_| {
- create_dates.dispatch(CreateDates{dates: get_important_dates()});
- };
-
- view! {
-
- >,
+ #[prop()] data_map: RwSignal>,
/// The schema of this entry. Should contain all information about what inputs to use and what
/// data members those inputs modify.
- #[prop()]
- schema: Vec,
+ #[prop(into)] schema: Signal>,
+ /// The unique ID for this entry.
+ #[prop(into)] id: Signal,
+ /// The function to run when the delete button is clicked.
+ #[prop(into)] on_delete: Callback<()>,
) -> impl IntoView {
view! {
-
+
+ }
+}
diff --git a/src/pages/student/extracurriculars_page.rs b/src/pages/student/extracurriculars_page.rs
new file mode 100644
index 0000000..b9ca521
--- /dev/null
+++ b/src/pages/student/extracurriculars_page.rs
@@ -0,0 +1,51 @@
+use leptos::prelude::*;
+use crate::components::{Loading, MultiEntry, OutlinedTextField, TextFieldType, ValidatedForm};
+use crate::input;
+use crate::pages::student::form_setup::use_student_form;
+
+#[component]
+pub fn StudentExtracurricularsPage() -> impl IntoView {
+ let controller = use_student_form("demographics");
+
+ view! {
+
- )
-
-
-
+ {title.clone()}
-
+
}
}
diff --git a/src/components/lists/multi/checkbox.rs b/src/components/lists/multi/checkbox.rs
index 252402d..a5de034 100644
--- a/src/components/lists/multi/checkbox.rs
+++ b/src/components/lists/multi/checkbox.rs
@@ -103,6 +103,10 @@ pub fn Checkbox(
/// ```
#[component]
pub fn CheckboxList(
+ /// The name that this list should use. This doesn't need to be specified all the time, but is
+ /// for use in elements that may treat this list as a sub-input (components like the [`MultiEntry`]
+ /// do this)
+ #[prop(optional, into)] name: Signal,
/// The data member that this list should edit/display from the `data_map`.
#[prop(into)] data_member: Signal,
/// A [`Signal`] allowing access to a data store.
@@ -160,7 +164,7 @@ pub fn CheckboxList(
on_change=on_change
// The actual selected values are tracked by this element, not by the checkboxes themselves.
value=item
- name=data_member
+ name=move || format!("{}_{}", name.get(), data_member.get())
disabled=disabled
/>
}
diff --git a/src/components/lists/multi/mod.rs b/src/components/lists/multi/mod.rs
index c3fcbbc..717cb89 100644
--- a/src/components/lists/multi/mod.rs
+++ b/src/components/lists/multi/mod.rs
@@ -1,6 +1,8 @@
mod utils;
mod checkbox;
mod chips;
+mod select_nav_list;
pub use checkbox::*;
-pub use chips::*;
\ No newline at end of file
+pub use chips::*;
+pub use select_nav_list::*;
\ No newline at end of file
diff --git a/src/components/lists/multi/select_nav_list.rs b/src/components/lists/multi/select_nav_list.rs
new file mode 100644
index 0000000..3ce9677
--- /dev/null
+++ b/src/components/lists/multi/select_nav_list.rs
@@ -0,0 +1,179 @@
+use leptos::logging::log;
+use leptos::prelude::*;
+use leptos_router::components::A;
+use crate::components::utils;
+
+#[derive(Debug, Clone)]
+pub struct NavListInfo {
+ pub text: Vec,
+ pub id: String,
+ pub slug: String,
+}
+
+#[component]
+fn NavListItem(
+ #[prop(into)] name: Signal,
+ #[prop(into)] value: Signal,
+ #[prop(into)] text: Signal>,
+ #[prop(into)] slug: Signal,
+ #[prop(into)] selected: Signal,
+ #[prop(into)] on_change: Callback<()>,
+) -> impl IntoView {
+ let linked_info = Signal::derive(move ||
+ text.get()
+ .get(0)
+ .cloned()
+ .unwrap_or_default()
+ );
+ let other_info = Signal::derive(move ||
+ text.get()
+ .iter()
+ .cloned()
+ .skip(1)
+ .collect::>()
+ );
+
+ view! {
+
+ }
+}
+
+#[component]
+fn NavListCheckbox(
+ #[prop(into)] selected: Signal,
+ #[prop(into)] on_change: Callback<()>,
+ #[prop(into)] name: Signal,
+ #[prop(into)] value: Signal,
+) -> impl IntoView {
+ let id = Memo::new(move |_| utils::create_unique_id(&name.get(), &value.get()));
+
+ view! {
+
+ }
+}
+
+/// # Selectable Nav-List Component
+///
+/// This component takes a `Vec` to show a list. The list contains links that append
+/// the `NavListItem::slug` to the current path, and each item is selectable. The list of selected
+/// items is usable in this component's parent.
+#[component]
+pub fn SelectableNavList(
+ #[prop(into)] selected: RwSignal>,
+ #[prop(into)] items: Signal>,
+ #[prop(into)] headers: Signal>,
+ #[prop(into)] name: Signal,
+) -> impl IntoView {
+ let all_selected = RwSignal::new(false);
+ let all_selected_change = move || {
+ if all_selected.get() {
+ log!("Unchecking all values.");
+ all_selected.set(false);
+ selected.set(Vec::new());
+ } else {
+ log!("Checking all values.");
+ all_selected.set(true);
+ selected.set(
+ items
+ .get()
+ .iter()
+ .map(|info| info.id.clone())
+ .collect::>()
+ );
+ }
+ };
+
+ view! {
+ ,
#[prop(optional, into)] other_prompt: Signal,
+ #[prop(optional, into)] name: Signal
) -> impl IntoView {
//#region Value Logic
@@ -262,7 +263,7 @@ pub fn RadioList(
on_change=on_change
// The actual selected values are tracked by this element, not by the checkboxes themselves.
value=item
- name=data_member
+ name=move || format!("{}_{}", name.get(), data_member.get())
disabled=disabled
/>
}
diff --git a/src/components/lists/single/select.rs b/src/components/lists/single/select.rs
index b20cddc..cd08b81 100644
--- a/src/components/lists/single/select.rs
+++ b/src/components/lists/single/select.rs
@@ -3,7 +3,6 @@ use leptos::ev::{Event, Targeted};
use leptos::prelude::*;
use leptos::web_sys::HtmlSelectElement;
use std::collections::HashMap;
-use leptos::logging::{log, warn};
use crate::components::{use_validation_context, InputState, ValidationState};
fn validate(required: bool, value: String) -> ValidationState {
@@ -20,7 +19,7 @@ fn validate(required: bool, value: String) -> ValidationState {
/// by the `value` prop of the component.
#[component]
pub fn Select(
- #[prop()] value_list: Vec,
+ #[prop(into)] value_list: Signal>,
#[prop(into)] data_member: Signal,
#[prop()] data_map: RwSignal>,
#[prop(optional, into)] label: String,
@@ -28,28 +27,19 @@ pub fn Select(
#[prop(optional, into)] required: Signal
) -> impl IntoView {
//#region Value Logic
-
- let default_raw_value = data_map.get_untracked()
- .get(&data_member.get_untracked())
- .cloned()
- .unwrap_or_default()
- .as_string().unwrap_or_default().unwrap_or_default();
-
- let raw_value = RwSignal::new(default_raw_value);
-
- Effect::new(move || {
- data_map.update(|map| {
- map.insert(data_member.get(), ValueType::String(Some(raw_value.get())));
- });
+
+ let value = Memo::new(move |_| {
+ data_map.with(|map| {
+ map.get(&data_member.get_untracked())
+ .and_then(|v| v.as_string().ok().flatten())
+ .unwrap_or_default()
+ })
});
//#endregion
//#region Validation Logic
- let error = RwSignal::new(
- validate(required.get_untracked(), raw_value.get_untracked())
- );
- warn!("Current error state: {:?}", error.get_untracked());
+ let error = Memo::new(move |_| validate(required.get(), value.get()));
let dirty = RwSignal::new(false);
let show_errors = Signal::derive(move || dirty.get() && matches!(error.get(), ValidationState::Invalid(_)));
@@ -68,19 +58,12 @@ pub fn Select(
//#endregion
//#region Event Logic
-
+
let on_change = move |e: Targeted| {
let value = e.target().value();
- log!("Found value {}", value);
- raw_value.set(value.clone());
- error.set(validate(required.get(), raw_value.get()));
dirty.set(true);
data_map.update(|map| {
- if let Some(val) = map.get_mut(&data_member.get()) {
- *val = ValueType::String(Some(value.clone()));
- } else {
- map.insert(data_member.get(), ValueType::String(Some(value)));
- }
+ map.insert(data_member.get(), ValueType::String(Some(value)));
});
};
@@ -96,27 +79,21 @@ pub fn Select(
transition-border duration-150
border-red-700 bg-transparent
disabled:border-gray-600 disabled:pointer-events-none disabled:bg-gray-600/33"
+ prop:value=move || value.get()
on:change:target=on_change
disabled=disabled
>
// This closure handles the display of the options.
-
- {move || {
- value_list
- .iter()
- .map(move |value| {
- let display = value.to_owned();
- view! { }
- })
- .collect::>()
- }}
+
+ // We can reasonably assume that the options in the list will be distinct.
+ {val.clone()} }
+ />
diff --git a/src/components/loading.rs b/src/components/loading.rs
index ee11ded..8c8a18c 100644
--- a/src/components/loading.rs
+++ b/src/components/loading.rs
@@ -3,7 +3,7 @@ use leptos::prelude::*;
#[component]
pub fn Loading() -> impl IntoView {
view! {
-
+ // Header block - contains evenly spaced headers and the "select all" checkbox.
+ // Include a checkbox here that's got the same style as the items. This maintains spacing.
+ // All headers *must* be evenly spaced, otherwise the list starts getting confusing.
+
+ }
+}
diff --git a/src/components/lists/single/radio.rs b/src/components/lists/single/radio.rs
index e5a61b7..e28c0f0 100644
--- a/src/components/lists/single/radio.rs
+++ b/src/components/lists/single/radio.rs
@@ -151,6 +151,7 @@ pub fn RadioList(
#[prop(optional, into)] label: String,
#[prop(optional, into)] required: Signal
+
+
+
+ // Items block - contains constructed items. These are selectable.
+ {header_text}
+
+
}
diff --git a/src/components/login/admin.rs b/src/components/login/admin.rs
new file mode 100644
index 0000000..0510f31
--- /dev/null
+++ b/src/components/login/admin.rs
@@ -0,0 +1,16 @@
+use leptos::prelude::*;
+use crate::components::login::setup::provide_auth_context;
+
+#[component]
+pub fn AdminLoginContext(
+ children: Children
+) -> impl IntoView {
+ provide_auth_context(
+ crate::utils::use_origin(),
+ "https://cognito-idp.us-east-1.amazonaws.com/us-east-1_Lfjuy5zaM",
+ "56c2bqvl021rv8d5mq36blt7jv",
+ "/providers/callback"
+ );
+
+ view! { {children()} }
+}
\ No newline at end of file
diff --git a/src/components/login/mod.rs b/src/components/login/mod.rs
index fae50eb..c9911f2 100644
--- a/src/components/login/mod.rs
+++ b/src/components/login/mod.rs
@@ -1,5 +1,7 @@
+pub(crate) mod setup;
mod provider;
pub use provider::*;
mod student;
pub use student::*;
-pub(crate) mod setup;
\ No newline at end of file
+mod admin;
+pub use admin::*;
\ No newline at end of file
diff --git a/src/components/login/student.rs b/src/components/login/student.rs
index 14becf8..d5c7c54 100644
--- a/src/components/login/student.rs
+++ b/src/components/login/student.rs
@@ -1,5 +1,4 @@
use leptos::prelude::*;
-use leptos_router::components::Outlet;
use super::setup::provide_auth_context;
///# Student Login Context Component
@@ -16,7 +15,9 @@ use super::setup::provide_auth_context;
///
/// }
#[component]
-pub fn StudentLoginContext() -> impl IntoView {
+pub fn StudentLoginContext(
+ children: Children,
+) -> impl IntoView {
provide_auth_context(
crate::utils::use_origin(),
"https://cognito-idp.us-east-1.amazonaws.com/us-east-1_Lfjuy5zaM",
@@ -24,5 +25,5 @@ pub fn StudentLoginContext() -> impl IntoView {
"/students/callback"
);
- view! { ) -> Option {
map.get("uuid")?.as_string().unwrap_or(None)
}
+/// Does the same as [`get_uuid_from_map`], but starts from a [`ValueType`] enum.
+fn get_uuid(vt: ValueType) -> Option {
+ vt.as_map().ok().flatten().unwrap_or_default()
+ .get("uuid")?
+ .as_string()
+ .ok().flatten()
+}
+
/// Updates an Entry within the given `Vec`.
fn update_entry_list(list: &mut Vec, data: &HashMap) {
if let Some(uuid) = get_uuid_from_map(&data) {
@@ -66,81 +75,103 @@ fn new_entry() -> ValueType {
/// `first_name` and `last_name` keys within that `Entry`.
#[component]
pub fn MultiEntry(
+ #[prop(into)] label: Signal,
+ #[prop(optional, into)] description: Signal,
/// The data member that contains the list of entries within the `data_map`.
#[prop(into)]
- data_member: String,
+ data_member: Signal,
/// The data map that contains all the information. Data is found within this map using the
/// component's `data_member` input.
#[prop()]
data_map: RwSignal>,
/// The type and order of the inputs for each `Entry` component within this `MultiEntry` component.
- #[prop(optional)]
- schema: Vec,
+ #[prop(optional, into)]
+ schema: Signal>,
) -> impl IntoView {
// Make the values within the list reactive. Each of these values should be a ValueType::Map,
// so we can pass these directly to the application.
- let data_reactive = RwSignal::new(
- data_map
- .get_untracked()
- .get(&data_member)
- .unwrap_or(&ValueType::List(None))
- .as_list()
- .unwrap_or(Some(Vec::::new()))
- .unwrap_or(Vec::new()),
- );
-
- // This effect updates the data_map with any new values from the data_reactive list, every time
- // the data_reactive list is changed. This allows changes from within the Entry component to
- // bubble up to the data_map effectively.
- Effect::new(move |_| {
- let entry_list = data_reactive.get();
- data_map.update(|map| {
- map.insert(data_member.clone(), ValueType::List(Some(entry_list)));
- });
+ let data_list = Memo::new(move |_| {
+ data_map.with(|map| {
+ map.get(&data_member.get())
+ .and_then(|v| v.as_list().ok().flatten())
+ .unwrap_or_default()
+ })
});
+
+ // This effect updates the data_map with any new values from the data_list, every time
+ // the data_list is changed. This allows changes from within the Entry component to
+ // bubble up to the data_map effectively.
+ let update_parent_list = move |list| {
+ log!("Updating parent list using child list {:?}", list);
+ data_map.update(|map| {
+ map.insert(data_member.get(), ValueType::List(Some(list)));
+ });
+ };
- let add_entry = move |_| data_reactive.update(|list| list.push(new_entry()));
+ let add_entry = move |_| data_map.update(|map| {
+ log!("Adding new entry.");
+ let mut list = data_list.get_untracked();
+
+ list.push(new_entry());
+ map.insert(data_member.get(), ValueType::List(Some(list)));
+ });
view! {
"Add entry"
- "Print Info"
+ "Add entry"
}
}
@@ -176,20 +207,35 @@ fn Entry(
/// The data map that contains all information. Data is found within this map using the `member`
/// props. This map should be unique to this entry; in other words, it should be contained and
/// passed down from within the entry list in the parent `MultiEntry` component.
- #[prop()]
- data_map: RwSignal
+ {label}
+
+ {description}
+
+
+
// Render the entries
- "You haven't added any entries yet."
}
}
- />
+ >
+
- {schema.iter()
- .map(|input_type| {
- input_type.clone().into_view(data_map.clone())
- }).collect_view()
- }
+ `.
+/// There are a few things to note:
+///
+/// - This component defines an [`Outlet`], meaning that it is designed to display the route
+/// information on its own. If you intend to use this on a page, the page should not also contain
+/// an `Outlet` component unless it needs to render its own nested children.
+/// - The "selected" appearance for the individual tabs work best when their paths are at the same
+/// depth. For example:
+/// ```
+/// let good_list = vec! [
+/// TabInfo {
+/// ...,
+/// path: "/default/path"
+/// },
+/// TabInfo {
+/// ...,
+/// path: "/good/path"
+/// }
+/// ];
+///
+/// let bad_list = vec! [
+/// TabInfo {
+/// ...,
+/// path: "/default/path"
+/// },
+/// TabInfo {
+/// ...,
+/// path: "/bad/path/here"
+/// }
+/// ]
+/// ```
+///
+/// Example usage in a view (assuming the good list from above):
+/// ```
+/// view! {
+/// ,
+ #[prop(into)] tabs: Signal>,
+) -> impl IntoView {
+ // Create a series of tabs based on a given list of names and paths.
+
+ view! {
+ ,
+ #[prop(into)] text: Signal,
+ #[prop(into)] path: Signal,
+ #[prop(into)] sub_paths: Signal>,
+) -> impl IntoView {
+ let location = use_location();
+
+ let full_path = Memo::new(move |_| {
+ format!("/{}/{}", base_path.get(), path.get())
+ });
+
+ let selected = Memo::new(move |_| {
+ let current_path = location.pathname.get();
+
+ // There's extra logic here as well, but for now this works.
+ current_path.starts_with(&full_path.get())
+ });
+
+ view! {
+ ,
+ #[prop(into)] text: Signal,
+ #[prop(into)] path: Signal,
+) -> impl IntoView {
+ let full_path = Memo::new(move |_| {
+ format!("{}/{}", parent_path.get(), path.get())
+ });
+
+ view! {
+
+ {text}
+
+ }
+}
diff --git a/src/components/validated_form.rs b/src/components/validated_form.rs
index 8da4b19..4420ccb 100644
--- a/src/components/validated_form.rs
+++ b/src/components/validated_form.rs
@@ -5,6 +5,7 @@ use crate::components::{ActionButton, Header};
/// Indicates the current state of an input.
#[derive(Default, Debug, Clone)]
+#[derive(PartialEq)]
pub enum ValidationState {
/// A valid input.
#[default]
@@ -149,15 +150,8 @@ pub fn ValidatedForm(
};
view! {
-
+ }
+ }
+ />
+ }.into_any()
+ }}
+
+
+ // Delete button
+
}
}
diff --git a/src/components/tabs/mod.rs b/src/components/tabs/mod.rs
new file mode 100644
index 0000000..2c727dc
--- /dev/null
+++ b/src/components/tabs/mod.rs
@@ -0,0 +1,2 @@
+mod sidebar;
+pub use sidebar::*;
\ No newline at end of file
diff --git a/src/components/tabs/sidebar.rs b/src/components/tabs/sidebar.rs
new file mode 100644
index 0000000..4a2b7f0
--- /dev/null
+++ b/src/components/tabs/sidebar.rs
@@ -0,0 +1,141 @@
+use leptos::prelude::*;
+use leptos_router::components::{Outlet, A};
+use leptos_router::hooks::use_location;
+use crate::common::{SubTabInfo, TabInfo};
+
+/// # Tab Sidebar Component
+///
+/// This component creates a list of tabs that correspond to the given `Vec
+
+
+ // Input section
+
+ {move || {
+ schema
+ .get()
+ .iter()
+ .map(|input_type| input_type.clone().into_view(data_map.clone(), id.get()))
+ .collect_view()
+ }}
+
+
+
+
+ }
+}
+
+#[component]
+fn SidebarTab(
+ #[prop(into)] base_path: Signal
+
+
+
+
+ }
+}
+
+#[component]
+fn SidebarSubTab(
+ #[prop(into)] parent_path: Signal{text}
+
+
+
+
+
+
+
+
+
+ // Inputs here.
+
+
+
+
+
+ // Inputs here.
+
+
+
+
+ "Test Put Student Function"
+ "Test Get Student Function"
+
+ }
+}
diff --git a/src/pages/student/mod.rs b/src/pages/student/mod.rs
new file mode 100644
index 0000000..5c3e5fa
--- /dev/null
+++ b/src/pages/student/mod.rs
@@ -0,0 +1,24 @@
+mod shell;
+mod home_page;
+mod demographics_page;
+mod additional_page;
+mod athletics_page;
+mod academics_page;
+mod extracurriculars_page;
+mod work_experience_page;
+mod university_page;
+mod family_info_page;
+mod form_setup;
+mod eligibility_page;
+
+pub use shell::*;
+pub use home_page::*;
+pub use demographics_page::*;
+pub use additional_page::*;
+pub use athletics_page::*;
+pub use academics_page::*;
+pub use extracurriculars_page::*;
+pub use work_experience_page::*;
+pub use university_page::*;
+pub use family_info_page::*;
+pub use eligibility_page::*;
\ No newline at end of file
diff --git a/src/pages/student/shell.rs b/src/pages/student/shell.rs
new file mode 100644
index 0000000..ba0c9d6
--- /dev/null
+++ b/src/pages/student/shell.rs
@@ -0,0 +1,50 @@
+use leptos::prelude::*;
+use leptos_oidc::{AuthLoaded, Authenticated};
+use crate::common::{SubTabInfo, TabInfo};
+use crate::components::{Banner, Loading, TabSidebarList};
+use crate::components::login::StudentLoginContext;
+use crate::pages::UnauthenticatedPage;
+
+#[component]
+pub fn StudentShell() -> impl IntoView {
+ // Create login context
+ view! {
+ "Student Home Page"
+
+ "This is just a placeholder for now. We'll show some redirect buttons."
+
+
+
+
+
+
+
+
+
+
+
+ // Inputs here.
+
+
+
+
+
+
+
+
+
-
- }.into_any()
-}
diff --git a/src/pages/unauthenticated_page.rs b/src/pages/unauthenticated_page.rs
index e2d6857..f5317a3 100644
--- a/src/pages/unauthenticated_page.rs
+++ b/src/pages/unauthenticated_page.rs
@@ -32,9 +32,9 @@ pub fn UnauthenticatedPage() -> impl IntoView {
};
view! {
-
- "Create Comparisons"
- "Create Dates"
-
-
+
-
"Sign in"
diff --git a/src/utils/common.rs b/src/utils/common.rs
index a80584d..6a6038d 100644
--- a/src/utils/common.rs
+++ b/src/utils/common.rs
@@ -22,7 +22,7 @@ pub fn use_origin() -> String {
/// Gets the current user claims. This function should only be used in an area that has
/// access to an AuthSignal, or it will result in a total failure.
pub fn get_user_claims() -> Signal>> {
- let auth = use_context::().expect("Couldn't find AuthSignal.");
+ let auth = expect_context::();
Signal::derive(move || {
auth.with(|auth| {
auth.authenticated().and_then(|data| {