bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Use factory URL from config in garage list webpage

Browse Source
This commit is contained in:
NG (Graham)
2026-06-25 19:26:11 -04:00
parent 9aa8afc232
commit 833a094cea
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/templates/rc_society/garage_list.html.hbs
View File

@@ -63,7 +63,7 @@
</a> </a>
</div> </div>
<div class="access-box"> <div class="access-box">
<a href="http://127.0.0.1:8012"> <a href="{{form.factory}}">
<div class="access-box-banner"> <div class="access-box-banner">
Factory Factory
</div> </div>

5
rc_society/src/web/garage/list.rs
View File

@@ -10,6 +10,7 @@ const FORM_NAME: &str = "garage_list";
struct RenderData { struct RenderData {
display_name: String, display_name: String,
public_id: String, public_id: String,
factory: String,
garages: Vec<GarageData>, garages: Vec<GarageData>,
} }
@@ -25,7 +26,7 @@ struct GarageData {
} }
#[get("/garages/list")] #[get("/garages/list")]
pub async fn get(handlebars_ref: Data<handlebars::Handlebars<'_>>, auth: Data<Box<oj_rc_core::UserImpl>>, user_opt: Option<Identity>, req: HttpRequest) -> Result<impl Responder, actix_web::error::Error> { pub async fn get(handlebars_ref: Data<handlebars::Handlebars<'_>>, auth: Data<Box<oj_rc_core::UserImpl>>, server_config: Data<oj_rc_core::persist::config::ServerConfig>, user_opt: Option<Identity>, req: HttpRequest) -> Result<impl Responder, actix_web::error::Error> {
match try_auth_user(user_opt, auth.as_ref(), &req).await? { match try_auth_user(user_opt, auth.as_ref(), &req).await? {
LoginReturn::AuthFail(resp) => Ok(resp), LoginReturn::AuthFail(resp) => Ok(resp),
LoginReturn::Success(user) => { LoginReturn::Success(user) => {
@@ -36,6 +37,7 @@ pub async fn get(handlebars_ref: Data<handlebars::Handlebars<'_>>, auth: Data<Bo
RenderData { RenderData {
display_name: user.display_name().to_owned(), display_name: user.display_name().to_owned(),
public_id: user.public_id().to_owned(), public_id: user.public_id().to_owned(),
factory: server_config.factory_url.clone(),
garages: garage_infos.into_iter() garages: garage_infos.into_iter()
.map(|g| GarageData { .map(|g| GarageData {
garage_id: g.id, garage_id: g.id,
@@ -58,6 +60,7 @@ pub async fn get(handlebars_ref: Data<handlebars::Handlebars<'_>>, auth: Data<Bo
RenderData { RenderData {
display_name: user.display_name().to_owned(), display_name: user.display_name().to_owned(),
public_id: user.public_id().to_owned(), public_id: user.public_id().to_owned(),
factory: server_config.factory_url.clone(),
garages: Vec::new(), garages: Vec::new(),
}, },
e.to_string(), e.to_string(),