add template

DaviRain-Su · May 31, 2024 · cde44c9 · cde44c9
1 parent adfd014
commit cde44c9
Show file tree

Hide file tree

Showing 11 changed files with 229 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,6 +50,8 @@ reqwest = { version = "0.12", features = ["json"] }
 aion-types = { version = "0.1.0", path = "./crates/aion-types" }
 aion-parse = { version = "0.1.0", path = "./crates/parse" }
 is-url = "1.0.4"
+askama = "0.12.1"
+askama_actix = "0.14.0"
 
 [dependencies.sqlx]
 version = "0.7"

diff --git a/src/lib.rs b/src/lib.rs
@@ -2,3 +2,4 @@ pub mod configuration;
 pub mod routes;
 pub mod startup;
 pub mod telemetry;
+pub mod templates;
diff --git a/src/routes/rebase/query_all.rs b/src/routes/rebase/query_all.rs
@@ -1,6 +1,8 @@
+use crate::templates::all_news::AllNewsTemplate;
 use actix_web::web;
 use actix_web::HttpResponse;
 use aion_types::rebase::response::{ListAllItemsResponse, SimpleDisplay};
+use askama_actix::TemplateToResponse;
 use sqlx::query_as;
 use sqlx::PgPool;
 
@@ -56,7 +58,14 @@ pub async fn list_all(pool: web::Data<PgPool>) -> HttpResponse {
     .await;
 
     match result {
-        Ok(items) => HttpResponse::Ok().json(items),
+        Ok(items) => {
+            let items = items
+                .into_iter()
+                .map(SimpleDisplay::from)
+                .collect::<Vec<_>>();
+            let template = AllNewsTemplate { items };
+            template.to_response()
+        }
         Err(e) => {
             tracing::error!("Failed to execute query: {:?}", e);
             HttpResponse::InternalServerError().finish()

diff --git a/src/routes/rebase/query_latest_news.rs b/src/routes/rebase/query_latest_news.rs
@@ -1,6 +1,9 @@
+use crate::templates::latest_news::LatestNewsTemplate;
 use actix_web::web;
 use actix_web::HttpResponse;
 use aion_types::rebase::response::ListAllItemsResponse;
+use aion_types::rebase::response::SimpleDisplay;
+use askama_actix::TemplateToResponse;
 use sqlx::query_as;
 use sqlx::PgPool;
 
@@ -14,7 +17,14 @@ pub async fn list_latest_news(conn_pool: web::Data<PgPool>) -> HttpResponse {
        .await;
 
     match tags_result {
-        Ok(items) => HttpResponse::Ok().json(items),
+        Ok(items) => {
+            let items = items
+                .into_iter()
+                .map(SimpleDisplay::from)
+                .collect::<Vec<_>>();
+            let template = LatestNewsTemplate { items };
+            template.to_response()
+        }
         Err(e) => {
             tracing::error!("Failed to execute query: {:?}", e);
             HttpResponse::InternalServerError().finish()

diff --git a/src/templates/all_news.rs b/src/templates/all_news.rs
@@ -0,0 +1,9 @@
+use aion_types::rebase::response::SimpleDisplay;
+use askama_actix::Template;
+
+#[derive(Template)] // this will generate the code...
+#[template(path = "all_news.html")] // using the template in this path, relative
+                                    // to the `templates` dir in the crate root
+pub struct AllNewsTemplate {
+    pub items: Vec<SimpleDisplay>,
+}
diff --git a/src/templates/latest_news.rs b/src/templates/latest_news.rs
@@ -0,0 +1,10 @@
+use aion_types::rebase::response::SimpleDisplay;
+//use askama::Template;
+use askama_actix::Template;
+
+#[derive(Template)] // this will generate the code...
+#[template(path = "latest_news.html")] // using the template in this path, relative
+                                       // to the `templates` dir in the crate root
+pub struct LatestNewsTemplate {
+    pub items: Vec<SimpleDisplay>,
+}
diff --git a/src/templates/mod.rs b/src/templates/mod.rs
@@ -0,0 +1,2 @@
+pub mod all_news;
+pub mod latest_news;
diff --git a/templates/all_news.html b/templates/all_news.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>Rebase All News</title>
+        <style>
+            body {
+                font-family: Arial, sans-serif;
+                background-color: #f4f4f9;
+                color: #333;
+                margin: 0;
+                padding: 20px;
+            }
+            h1 {
+                color: #5a5a5a;
+            }
+            ul {
+                list-style-type: none;
+                padding: 0;
+            }
+            li {
+                background-color: #fff;
+                border: 1px solid #ddd;
+                padding: 10px;
+                margin-bottom: 10px;
+                border-radius: 8px;
+                box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+            }
+            a {
+                color: #0066cc;
+                text-decoration: none;
+            }
+            a:hover {
+                text-decoration: underline;
+            }
+            strong {
+                color: #333;
+            }
+        </style>
+    </head>
+    <body>
+        <h1>All News</h1>
+        <ul>
+            {% for item in items %}
+            <li>
+                <strong>Title:</strong> {{ item.title }}<br />
+                <strong>Introduce:</strong> {{ item.introduce }}<br />
+                <strong>URL:</strong>
+                <a href="{{ item.url }}">{{ item.url }}</a>
+            </li>
+            {% endfor %}
+        </ul>
+    </body>
+</html>
diff --git a/templates/hello.html b/templates/hello.html
@@ -0,0 +1 @@
+Hello, {{ name }}!
diff --git a/templates/latest_news.html b/templates/latest_news.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>Rebase Latest News</title>
+        <style>
+            body {
+                font-family: Arial, sans-serif;
+                background-color: #f4f4f9;
+                color: #333;
+                margin: 0;
+                padding: 20px;
+            }
+            h1 {
+                color: #5a5a5a;
+            }
+            ul {
+                list-style-type: none;
+                padding: 0;
+            }
+            li {
+                background-color: #fff;
+                border: 1px solid #ddd;
+                padding: 10px;
+                margin-bottom: 10px;
+                border-radius: 8px;
+                box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+            }
+            a {
+                color: #0066cc;
+                text-decoration: none;
+            }
+            a:hover {
+                text-decoration: underline;
+            }
+            strong {
+                color: #333;
+            }
+        </style>
+    </head>
+    <body>
+        <h1>Latest News</h1>
+        <ul>
+            {% for item in items %}
+            <li>
+                <strong>Title:</strong> {{ item.title }}<br />
+                <strong>Introduce:</strong> {{ item.introduce }}<br />
+                <strong>URL:</strong>
+                <a href="{{ item.url }}">{{ item.url }}</a>
+            </li>
+            {% endfor %}
+        </ul>
+    </body>
+</html>