filipriec/universal_web_loco_rewrite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplified and removed terminal stuff

Browse Source
This commit is contained in:
Priec
2026-05-19 20:03:20 +02:00
parent 98a1c69582
commit c1db8358c4
20 changed files with 527 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/controllers/frontend.rs
View File

@@ -1,5 +1,5 @@
use crate::{
controllers::{admin, auth as auth_controller},
controllers::{admin, auth as auth_controller, i18n::current_lang},
models::{
_entities::{blog_articles, site_pages},
users::{self, LoginParams},
@@ -122,7 +122,11 @@ async fn home(
format::view(
&v,
"home/index.html",
json!({ "articles": articles, "logged_in_admin": logged_in_admin(&ctx, &jar).await }),
json!({
"articles": articles,
"logged_in_admin": logged_in_admin(&ctx, &jar).await,
"lang": current_lang(&jar),
}),
)
}
@@ -138,6 +142,7 @@ async fn about(
json!({
"page": about_page(&ctx).await?,
"logged_in_admin": logged_in_admin(&ctx, &jar).await,
"lang": current_lang(&jar),
}),
)
}
@@ -157,7 +162,11 @@ async fn blog_index(
format::view(
&v,
"blog/index.html",
json!({ "articles": articles, "logged_in_admin": logged_in_admin(&ctx, &jar).await }),
json!({
"articles": articles,
"logged_in_admin": logged_in_admin(&ctx, &jar).await,
"lang": current_lang(&jar),
}),
)
}
@@ -183,7 +192,11 @@ async fn blog_show(
format::view(
&v,
"blog/show.html",
json!({ "article": article, "logged_in_admin": logged_in_admin(&ctx, &jar).await }),
json!({
"article": article,
"logged_in_admin": logged_in_admin(&ctx, &jar).await,
"lang": current_lang(&jar),
}),
)
}
@@ -200,12 +213,17 @@ async fn admin_login_page(
format::view(
&v,
"admin/login.html",
json!({ "error": null, "logged_in_admin": false }),
json!({
"error": null,
"logged_in_admin": false,
"lang": current_lang(&jar),
}),
)
}
#[debug_handler]
async fn admin_login(
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
Form(params): Form<LoginParams>,
@@ -214,7 +232,11 @@ async fn admin_login(
return format::view(
&v,
"admin/login.html",
json!({ "error": "Invalid credentials", "logged_in_admin": false }),
json!({
"error": "Invalid credentials",
"logged_in_admin": false,
"lang": current_lang(&jar),
}),
);
};
@@ -222,7 +244,11 @@ async fn admin_login(
return format::view(
&v,
"admin/login.html",
json!({ "error": "Invalid credentials", "logged_in_admin": false }),
json!({
"error": "Invalid credentials",
"logged_in_admin": false,
"lang": current_lang(&jar),
}),
);
}
@@ -246,21 +272,31 @@ async fn admin_logout() -> Result<Response> {
#[debug_handler]
async fn admin_home(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
let admin_user = admin::current_admin(auth, &ctx).await?;
format::view(&v, "admin/index.html", json!({ "admin": admin_user }))
format::view(
&v,
"admin/index.html",
json!({ "admin": admin_user, "lang": current_lang(&jar) }),
)
}
#[debug_handler]
async fn admin_about(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
admin::current_admin(auth, &ctx).await?;
format::view(&v, "admin/about.html", json!({ "page": about_page(&ctx).await? }))
format::view(
&v,
"admin/about.html",
json!({ "page": about_page(&ctx).await?, "lang": current_lang(&jar) }),
)
}
#[debug_handler]
@@ -280,6 +316,7 @@ async fn admin_about_update(
#[debug_handler]
async fn admin_articles(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
@@ -288,17 +325,22 @@ async fn admin_articles(
.order_by_desc(blog_articles::Column::CreatedAt)
.all(&ctx.db)
.await?;
format::view(&v, "admin/blog/index.html", json!({ "articles": articles }))
format::view(
&v,
"admin/blog/index.html",
json!({ "articles": articles, "lang": current_lang(&jar) }),
)
}
#[debug_handler]
async fn admin_article_new(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
admin::current_admin(auth, &ctx).await?;
format::view(&v, "admin/blog/new.html", json!({}))
format::view(&v, "admin/blog/new.html", json!({ "lang": current_lang(&jar) }))
}
#[debug_handler]
@@ -332,6 +374,7 @@ async fn admin_article_create(
#[debug_handler]
async fn admin_article_edit(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
Path(id): Path<Uuid>,
State(ctx): State<AppContext>,
@@ -340,7 +383,7 @@ async fn admin_article_edit(
format::view(
&v,
"admin/blog/edit.html",
json!({ "article": article_by_id(&ctx, id).await? }),
json!({ "article": article_by_id(&ctx, id).await?, "lang": current_lang(&jar) }),
)
}