Add current page field to some templates (#71)

Signed-off-by: Sergio Castaño Arteaga <[email protected]>

Author: tegioz

gitjobs-server/src/handlers/auth.rs

@@ -24,7 +24,7 @@ use crate::{
         error::HandlerError,
         extractors::{JobBoardId, OAuth2},
     },
-    templates,
+    templates::{self, CurrentPage},
 };
 
 /// Log in URL.
@@ -51,6 +51,7 @@ pub(crate) async fn log_in_page(
     Query(query): Query<HashMap<String, String>>,
 ) -> Result<impl IntoResponse, HandlerError> {
     let template = templates::auth::LogInPage {
+        current_page: CurrentPage::LogIn,
         logged_in: false,
         messages: messages.into_iter().collect(),
         name: None,
@@ -67,6 +68,7 @@ pub(crate) async fn sign_up_page(
     Query(query): Query<HashMap<String, String>>,
 ) -> Result<impl IntoResponse, HandlerError> {
     let template = templates::auth::SignUpPage {
+        current_page: CurrentPage::SignUp,
         logged_in: false,
         name: None,
         next_url: query.get("next_url").cloned(),

gitjobs-server/src/handlers/dashboard/employer/home.rs

@@ -22,6 +22,7 @@ use crate::{
             home::{self, Content, Tab},
             jobs,
         },
+        CurrentPage,
     },
 };
 
@@ -65,6 +66,7 @@ pub(crate) async fn page(
     let employers = db.list_employers(&user.user_id).await?;
     let template = home::Page {
         content,
+        current_page: CurrentPage::EmployerDashboard,
         employers,
         logged_in: true,
         name: Some(user.name),

gitjobs-server/src/handlers/dashboard/job_seeker/home.rs

@@ -22,6 +22,7 @@ use crate::{
             home::{self, Content, Tab},
             profile,
         },
+        CurrentPage,
     },
 };
 
@@ -60,6 +61,7 @@ pub(crate) async fn page(
     // Prepare template
     let template = home::Page {
         content,
+        current_page: CurrentPage::JobSeekerDashboard,
         logged_in: true,
         name: Some(user.name),
         username: Some(user.username),

gitjobs-server/src/handlers/jobboard/jobs.rs renamed to gitjobs-server/src/handlers/jobboard/home.rs

@@ -1,4 +1,4 @@
-//! This module defines the HTTP handlers for the jobs page.
+//! This module defines the HTTP handlers for the job board home page.
 
 use anyhow::Result;
 use axum::{
@@ -11,14 +11,19 @@ use tracing::instrument;
 use crate::{
     db::DynDB,
     handlers::{error::HandlerError, extractors::JobBoardId},
-    templates::jobboard::jobs::Page,
+    templates::{jobboard::home::Page, CurrentPage},
 };
 
-/// Handler that returns the jobs page.
+/// Handler that returns the home page.
 #[instrument(skip_all, err)]
 pub(crate) async fn page(
     State(_db): State<DynDB>,
     JobBoardId(_job_board_id): JobBoardId,
 ) -> Result<impl IntoResponse, HandlerError> {
-    Ok(Html(Page {}.render()?))
+    Ok(Html(
+        Page {
+            current_page: CurrentPage::JobBoard,
+        }
+        .render()?,
+    ))
 }

gitjobs-server/src/handlers/jobboard/mod.rs

@@ -1,4 +1,4 @@
 //! This module defines the HTTP handlers for the job board site.
 
 pub(crate) mod about;
-pub(crate) mod jobs;
+pub(crate) mod home;

gitjobs-server/src/router.rs

@@ -86,10 +86,10 @@ pub(crate) fn setup(cfg: &HttpServerConfig, db: DynDB, image_store: DynImageStor
             login_url = LOG_IN_URL,
             redirect_field = "next_url"
         ))
-        .route("/", get(jobboard::jobs::page))
+        .route("/", get(jobboard::home::page))
         .route("/about", get(jobboard::about::page))
         .route("/health-check", get(health_check))
-        .route("/jobs", get(jobboard::jobs::page))
+        .route("/jobs", get(jobboard::home::page))
         .route("/log-in", get(auth::log_in_page).post(auth::log_in))
         .route("/log-in/oauth2/{:provider}", get(auth::oauth2_redirect))
         .route("/log-in/oauth2/{:provider}/callback", get(auth::oauth2_callback))

gitjobs-server/src/templates/auth.rs

@@ -4,12 +4,16 @@ use axum_messages::Message;
 use rinja::Template;
 use serde::{Deserialize, Serialize};
 
-use crate::{auth::UserSummary, templates::filters};
+use crate::{
+    auth::UserSummary,
+    templates::{filters, CurrentPage},
+};
 
 /// Log in page.
 #[derive(Debug, Clone, Template, Serialize, Deserialize)]
 #[template(path = "auth/log_in.html")]
 pub(crate) struct LogInPage {
+    pub current_page: CurrentPage,
     pub logged_in: bool,
     pub messages: Vec<Message>,
 
@@ -22,6 +26,7 @@ pub(crate) struct LogInPage {
 #[derive(Debug, Clone, Template, Serialize, Deserialize)]
 #[template(path = "auth/sign_up.html")]
 pub(crate) struct SignUpPage {
+    pub current_page: CurrentPage,
     pub logged_in: bool,
 
     pub name: Option<String>,

gitjobs-server/src/templates/dashboard/employer/home.rs

@@ -10,13 +10,17 @@ use crate::templates::{
     dashboard::employer,
     filters,
     helpers::{build_image_url, find_employer},
+    CurrentPage,
 };
 
 /// Home page template.
 #[derive(Debug, Clone, Template)]
 #[template(path = "dashboard/employer/home.html")]
+#[allow(clippy::struct_field_names)]
 pub(crate) struct Page {
     pub content: Content,
+    #[allow(dead_code)]
+    pub current_page: CurrentPage,
     pub employers: Vec<employer::employers::EmployerSummary>,
     pub logged_in: bool,
 

gitjobs-server/src/templates/dashboard/job_seeker/home.rs

@@ -4,13 +4,16 @@
 use rinja::Template;
 use serde::{Deserialize, Serialize};
 
-use crate::templates::{auth, dashboard::job_seeker, filters};
+use crate::templates::{auth, dashboard::job_seeker, filters, CurrentPage};
 
 /// Home page template.
 #[derive(Debug, Clone, Template)]
 #[template(path = "dashboard/job_seeker/home.html")]
+#[allow(clippy::struct_field_names)]
 pub(crate) struct Page {
     pub content: Content,
+    #[allow(dead_code)]
+    pub current_page: CurrentPage,
     pub logged_in: bool,
 
     pub name: Option<String>,

gitjobs-server/src/templates/jobboard/jobs.rs renamed to gitjobs-server/src/templates/jobboard/home.rs

@@ -3,7 +3,11 @@
 use rinja::Template;
 use serde::{Deserialize, Serialize};
 
-/// Jobs page template.
+use crate::templates::CurrentPage;
+
+/// Home page template.
 #[derive(Debug, Clone, Template, Serialize, Deserialize)]
-#[template(path = "jobboard/jobs/page.html")]
-pub(crate) struct Page {}
+#[template(path = "jobboard/home.html")]
+pub(crate) struct Page {
+    pub current_page: CurrentPage,
+}