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
5 changed files with 22 additions and 25 deletions
Showing only changes of commit 9427810026 - Show all commits

No files matched your search

+1 -3
View File
@@ -12,7 +12,5 @@ pub fn AdminLoginContext(
"/providers/callback" "/providers/callback"
); );
view! { view! { {children()} }
{children()}
}
} }
+7 -8
View File
@@ -18,10 +18,12 @@ fn SidebarTab(
}); });
view! { view! {
<A href={move || path.get()}> <A href=move || path.get()>
<div class="p-3 transition-all font-bold" <div
class="p-3 transition-all font-bold"
class=(["bg-transparent", "text-white"], move || !selected.get()) class=(["bg-transparent", "text-white"], move || !selected.get())
class=(["bg-white", "text-black"], move || selected.get())> class=(["bg-white", "text-black"], move || selected.get())
>
{name} {name}
</div> </div>
</A> </A>
@@ -40,12 +42,9 @@ pub fn TabSidebarList(
<For <For
each=move || tabs.get() each=move || tabs.get()
key=|info| info.name.clone() key=|info| info.name.clone()
let(TabInfo {name, path}) let(TabInfo { name, path })
> >
<SidebarTab <SidebarTab name=name path=path />
name=name
path=path
/>
</For> </For>
</nav> </nav>
+10 -12
View File
@@ -14,18 +14,16 @@ pub fn AdminShell() -> impl IntoView {
<AdminLoginContext> <AdminLoginContext>
<Banner title="R15 Scholarships Admin" logo="/PHS_Stacked_Acronym.png" /> <Banner title="R15 Scholarships Admin" logo="/PHS_Stacked_Acronym.png" />
// We'll put the tabs here. // We'll put the tabs here.
<TabSidebarList <TabSidebarList tabs=vec![
tabs=vec![ TabInfo {
TabInfo { name: "Home".to_string(),
name: "Home".to_string(), path: "/admin/home".to_string(),
path: "/admin/home".to_string(), },
}, TabInfo {
TabInfo { name: "Test".to_string(),
name: "Test".to_string(), path: "/admin/testing".to_string(),
path: "/admin/testing".to_string(), },
} ] />
]
/>
</AdminLoginContext> </AdminLoginContext>
} }
} }
+3 -1
View File
@@ -8,7 +8,9 @@ pub fn ApplicantsPageFallback() -> impl IntoView {
<div class="flex flex-col gap-4 mt-3 items-center justify-center"> <div class="flex flex-col gap-4 mt-3 items-center justify-center">
<h1 class="text-3xl font-bold">"Applicants Page"</h1> <h1 class="text-3xl font-bold">"Applicants Page"</h1>
<p>"This page is under construction! It will show all the students that are eligible for your scholarship(s)."</p> <p>
"This page is under construction! It will show all the students that are eligible for your scholarship(s)."
</p>
<p>"Come back soon!"</p> <p>"Come back soon!"</p>
</div> </div>
} }
+1 -1
View File
@@ -639,7 +639,7 @@ fn ScholarshipForm(
<Header <Header
title="Eligibility Requirements" title="Eligibility Requirements"
description="Choose any requirements that this scholarship may have. If there are no extra requirements, description="Choose any requirements that this scholarship may have. If there are no extra requirements,
leave all options blank, however please note that this will apply all students to your scholarship." leave all options blank, however please note that this will apply all students to your scholarship."
/> />
<Row> <Row>
<ChipsList <ChipsList