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

PR with too many features #58

Merged
BobdaFett merged 56 commits from feat/admin-page into main 2026-02-10 14:31:49 +00:00
Conversation 0 Commits 56 Files Changed 56
+7 -7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 637f143ac1 - Show all commits
src/pages/scholarship_info.rs
+7 -7
View File
@@ -1,7 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use leptos::either::Either; use leptos::either::Either;
use leptos::html::Dialog; use leptos::html::Dialog;
use leptos::logging::log; use leptos::logging::{debug_log, log};
use leptos::prelude::*; use leptos::prelude::*;
use leptos_oidc::{AuthLoaded, Authenticated}; use leptos_oidc::{AuthLoaded, Authenticated};
use leptos_router::hooks::{use_navigate, use_params}; use leptos_router::hooks::{use_navigate, use_params};
@@ -111,7 +111,7 @@ fn ScholarshipList(
(refresh_token.get(), provider_id.get()) (refresh_token.get(), provider_id.get())
}, },
|(_, provider_id)| async move { |(_, provider_id)| async move {
log!("Fetching from scholarship API."); debug_log!("Fetching from scholarship API.");
let Some(provider_id) = provider_id else { let Some(provider_id) = provider_id else {
return Ok(Vec::new()); return Ok(Vec::new());
}; };
@@ -179,7 +179,7 @@ fn ScholarshipList(
.get() .get()
.map(|s| s.subject.clone()) .map(|s| s.subject.clone())
.unwrap_or_default(); .unwrap_or_default();
log!("Deleting scholarship with subject {}", subject); debug_log!("Deleting scholarship with subject {}", subject);
delete_action delete_action
.dispatch(DeleteProviderScholarship { .dispatch(DeleteProviderScholarship {
scholarship_id: subject, scholarship_id: subject,
@@ -385,10 +385,10 @@ fn ScholarshipForm(
if let Some(Ok(scholarship)) = scholarship_info.get() { if let Some(Ok(scholarship)) = scholarship_info.get() {
// Get the default chips data. // Get the default chips data.
let chips_default = if let Some(ValueType::Map(Some(map))) = scholarship.data.get("requirements") { let chips_default = if let Some(ValueType::Map(Some(map))) = scholarship.data.get("requirements") {
log!("Found requirements map: {:?}", map); debug_log!("Found requirements map: {:?}", map);
map.clone() map.clone()
} else { } else {
log!("Couldn't find requirements map in scholarship info. Using empty map."); debug_log!("Couldn't find requirements map in scholarship info. Using empty map.");
HashMap::new() HashMap::new()
}; };
@@ -496,7 +496,7 @@ fn ScholarshipForm(
info.data = form_data.get(); info.data = form_data.get();
info.data.insert("requirements".to_string(), ValueType::Map(Some(chips_data.get()))); info.data.insert("requirements".to_string(), ValueType::Map(Some(chips_data.get())));
log!("Map values: {:?}", info.data); debug_log!("Map values: {:?}", info.data);
submit_action.dispatch(CreateScholarshipInfo { submit_action.dispatch(CreateScholarshipInfo {
info info
}); });
@@ -505,7 +505,7 @@ fn ScholarshipForm(
Effect::watch( Effect::watch(
move || submit_action.value().get(), move || submit_action.value().get(),
move |value, _, _| { move |value, _, _| {
log!("Running submit_action effect"); debug_log!("Running submit_action effect");
let Some(result) = value else { let Some(result) = value else {
return; return;
}; };