r15-software-dev/scholarships-rs
1
0 Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 20 Wiki Activity

Merge branch 'main' into feature/form-schema

Browse Source 
# Conflicts:
#	src/pages/home_page.rs
This commit is contained in:
alphafetus committed 2025-11-20 11:45:33 -05:00
2 parents 3bd9a7c6d5 c47ea1d86e
commit 298c897036
2 files changed
+38 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pages/home_page.rs
+27 -26
View File
@@ -1,6 +1,7 @@
// Server dependencies
#[cfg(feature = "ssr")]
use aws_sdk_dynamodb::{Client, error::ProvideErrorMetadata, types::AttributeValue};
#[cfg(feature = "ssr")]
use serde_dynamo::{from_item, to_item};
#[cfg(feature = "ssr")]
@@ -275,7 +276,7 @@ pub fn HomePage() -> impl IntoView {
.collect()
disabled=elements_disabled
data_member="town"
data_map=expandable_react.data
data_map = expandable_react.data
/>
</Row>
<Row>
@@ -308,24 +309,21 @@ pub fn HomePage() -> impl IntoView {
<ChipsList
data_member="athletic_requirements"
data_map=expandable_react.data
items=vec![
"Football",
"Soccer",
"Cross Country",
"Cheerleading",
"Swimming",
"Wrestling",
"Ski",
"Basketball",
"Lacrosse",
"Softball",
"Indoor/Outdoor Track",
"Golf",
"Tennis",
"Volleyball",
]
.into_iter()
.map(|s| s.to_owned())
displayed_text=vec!(
"Football", "Soccer", "Cross Country", "Cheerleading",
"Swimming", "Wrestling", "Ski", "Basketball",
"Lacrosse", "Softball", "Indoor/Outdoor Track",
"Golf", "Tennis", "Volleyball"
)
.into_iter().map(|s| s.to_owned())
.collect()
values=vec!(
"football", "soccer", "cross_country", "cheerleading",
"swimming", "wrestling", "ski", "basketball",
"lacrosse", "softball", "track",
"golf", "tennis", "volleyball"
)
.into_iter().map(|s| s.to_owned())
.collect()
disabled=elements_disabled
label="Sports/Athletic Requirements"
@@ -335,13 +333,16 @@ pub fn HomePage() -> impl IntoView {
<ChipsList
data_member="community_involvement"
data_map=expandable_react.data
items=vec![
"Lion's Club",
"Knights of Columbus",
"Community Service > 20hrs",
]
.into_iter()
.map(|s| s.to_owned())
displayed_text=vec!(
"Lion's Club", "Knights of Columbus",
"Community Service > 20hrs"
)
.into_iter().map(|s| s.to_owned())
.collect()
values=vec!(
"lions_club", "koc", "serv_20h"
)
.into_iter().map(|s| s.to_owned())
.collect()
disabled=elements_disabled
label="Required Community Involvement"