Merge branch 'rolling' into CHORE/461_display-the-user-provided-settings-from-the-config-or-the-ui-in-the-settings-page

src/server/router.rs

@@ -12,14 +12,16 @@ use std::fs::read_to_string;
 /// Handles the route of index page or main page of the `websurfx` meta search engine website.
 #[get("/")]
 pub async fn index(config: web::Data<Config>) -> Result<HttpResponse, Box<dyn std::error::Error>> {
-    Ok(HttpResponse::Ok().body(
-        crate::templates::views::index::index(
-            &config.style.colorscheme,
-            &config.style.theme,
-            &config.style.animation,
-        )
-        .0,
-    ))
+    Ok(HttpResponse::Ok()
+        .content_type("text/html; charset=utf-8")
+        .body(
+            crate::templates::views::index::index(
+                &config.style.colorscheme,
+                &config.style.theme,
+                &config.style.animation,
+            )
+            .0,
+        ))
 }
 
 /// Handles the route of any other accessed route/page which is not provided by the
@@ -52,14 +54,16 @@ pub async fn robots_data(_req: HttpRequest) -> Result<HttpResponse, Box<dyn std:
 /// Handles the route of about page of the `websurfx` meta search engine website.
 #[get("/about")]
 pub async fn about(config: web::Data<Config>) -> Result<HttpResponse, Box<dyn std::error::Error>> {
-    Ok(HttpResponse::Ok().body(
-        crate::templates::views::about::about(
-            &config.style.colorscheme,
-            &config.style.theme,
-            &config.style.animation,
-        )
-        .0,
-    ))
+    Ok(HttpResponse::Ok()
+        .content_type("text/html; charset=utf-8")
+        .body(
+            crate::templates::views::about::about(
+                &config.style.colorscheme,
+                &config.style.theme,
+                &config.style.animation,
+            )
+            .0,
+        ))
 }
 
 /// Handles the route of settings page of the `websurfx` meta search engine website.
@@ -67,7 +71,9 @@ pub async fn about(config: web::Data<Config>) -> Result<HttpResponse, Box<dyn st
 pub async fn settings(
     config: web::Data<Config>,
 ) -> Result<HttpResponse, Box<dyn std::error::Error>> {
-    Ok(HttpResponse::Ok().body(
+    Ok(HttpResponse::Ok()
+      .content_type("text/html; charset=utf-8")
+      .body(
         crate::templates::views::settings::settings(
             config.safe_search,
             &config.style.colorscheme,

src/server/routes/search.rs

@@ -68,16 +68,18 @@ pub async fn search(
                 get_results(page + 1)
             );
 
-            Ok(HttpResponse::Ok().body(
-                crate::templates::views::search::search(
-                    &config.style.colorscheme,
-                    &config.style.theme,
-                    &config.style.animation,
-                    query,
-                    &results?,
-                )
-                .0,
-            ))
+            Ok(HttpResponse::Ok()
+                .content_type("text/html; charset=utf-8")
+                .body(
+                    crate::templates::views::search::search(
+                        &config.style.colorscheme,
+                        &config.style.theme,
+                        &config.style.animation,
+                        query,
+                        &results?,
+                    )
+                    .0,
+                ))
         }
         None => Ok(HttpResponse::TemporaryRedirect()
             .insert_header(("location", "/"))