chris
/
jean-marie
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add current fire rating to dashboard

This commit is contained in:
Chris Jean-Marie 2024-12-09 14:34:08 +00:00
parent 8b1cb60ef1
commit e3e7e4442b
2 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
backend/src/routes.rs
View File

@ -63,6 +63,7 @@ struct DashboardTemplate {
logged_in: bool,
user: UserData,
user_roles: Vec<crate::user::UserRolesDisplay>,
fire_rating: String,
}
pub async fn index(
@ -75,7 +76,7 @@ pub async fn index(
if logged_in {
// Extract the user data.
let user = user_data.as_ref().unwrap().clone();
if is_authorized("/dashboard", user_data, db_pool).await {
Redirect::to("/dashboard").into_response()
} else {
@ -83,7 +84,10 @@ pub async fn index(
HtmlTemplate(template).into_response()
}
} else {
let template = IndexTemplate { logged_in, user: UserData::default() };
let template = IndexTemplate {
logged_in,
user: UserData::default(),
};
HtmlTemplate(template).into_response()
}
}
@ -104,10 +108,13 @@ pub async fn dashboard(
// Get user roles
let user_roles = get_user_roles_display(userid, &db_pool.clone()).await;
let fire_rating = get_seguin_fire_rating().await;
let template = DashboardTemplate {
logged_in,
user,
user_roles,
fire_rating,
};
HtmlTemplate(template).into_response()
} else {
@ -219,10 +226,9 @@ pub async fn useradmin(
let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
let users = sqlx::query_as::<_, UserData>("SELECT * FROM users")
.fetch_all(&db_pool)
.await
.unwrap();
.fetch_all(&db_pool)
.await
.unwrap();
if is_authorized("/useradmin", user_data, db_pool.clone()).await {
// Get user roles
@ -308,3 +314,29 @@ pub async fn contact(Extension(user_data): Extension<Option<UserData>>) -> impl
let template = ContactTemplate { logged_in, user };
HtmlTemplate(template)
}
pub async fn get_seguin_fire_rating() -> String {
let response = reqwest::get("https://www.seguin.ca/en/explore-play/firerating.aspx")
.await
.unwrap();
let fire_rating: String;
let body = response.text().await.unwrap();
let result = body.find(r#"<img title="#);
if let Some(result) = result {
let link = body[result..].to_string();
let link_end = link.find(r#">"#);
if let Some(link_end) = link_end {
fire_rating = link[..link_end +1].to_string();
} else {
println!("not found");
fire_rating = "0".to_string();
}
} else {
fire_rating = "0".to_string();
}
fire_rating
}

21
backend/templates/dashboard.html
View File

@ -1,11 +1,21 @@
{% extends "authorized.html" %}
{% block center %}
<div class="row align-items-stretch">
<div class="col-md-6">
<h2>Points of Interest</h2>
<a href="https://www.tlccreations.ca" target="_blank" rel="noopener noreferrer"><img title="TLC Creations"
src="https://www.tlccreations.ca/assets/images/banner.png" class="img-fluid" alt="TLC Creations"></a>
<a href="https://www.seguin.ca" target="_blank" rel="noopener noreferrer"><img title="Seguin"
src="https://www.seguin.ca/en/images/structure/badge.svg" class="img-fluid" alt="Seguin Township"></a>
</div>
</div>
<div class="row align-items-stretch" id="firerating">
<a href="https://www.seguin.ca/en/explore-play/firerating.aspx" target="_blank" rel="noopener noreferrer"><img
title="Fire Rating: MODERATE" src="https://www.seguin.ca/en/resources/firemodseguin.jpg"
class="img-fluid" alt="Fire Rating: MODERATE"></a>
</div>
<div>
<h2>Web links</h2>
<h3>TLC Creations</h3>
<ul>
<li><a href="https://www.tlccreations.ca" target="_blank" rel="noopener noreferrer">TLC Creations</a></li>
</ul>
<h3>Fonts</h3>
<ul>
<li><a href="https://fonts.google.com" target="_blank" rel="noopener noreferrer">Google fonts</a></li>
@ -15,7 +25,8 @@
<ul>
<li><a href="https://www.ancestry.ca" target="_blank" rel="noopener noreferrer">Ancestry</a></li>
<li><a href="https://www.geni.com" target="_blank" rel="noopener noreferrer">Geni</a></li>
<li><a href="http://www.tracingroots.ca/" target="_blank" rel="noopener noreferrer">Tracing Roots - Forth Family Tree</a></li>
<li><a href="http://www.tracingroots.ca/" target="_blank" rel="noopener noreferrer">Tracing Roots - Forth Family
Tree</a></li>
</ul>
</div>
{% endblock center %}