Merge pull request #1 from husni-zuhdi/finalize-blog-format

Finalize blog format

internal/src/model/data.rs

@@ -1,4 +1,4 @@
-use crate::utils::md_to_html;
+use crate::utils::{capitalize, md_to_html};
 use log::{debug, info};
 use serde::Deserialize;
 use std::fs;
@@ -55,9 +55,14 @@ impl BlogsData {
         let blogs: Vec<BlogData> = blogs_paths
             .iter()
             .map(|blog_path| {
-                let (id, name) = blog_path
+                let (id, name_init) = blog_path
                     .split_once("-")
                     .expect("Failed to split filename into id and name");
+                let name_formated = name_init.replace("_", " ");
+                let (name_lower, _) = name_formated
+                    .split_once(".")
+                    .expect("Failed to remove file extension");
+                let name = capitalize(name_lower);
                 let fullpath = format!("{}{}", directory, blog_path);
 
                 info!("markdown loaded: {}", fullpath);
@@ -89,11 +94,11 @@ mod test {
     fn test_blogs_data_from_dir() {
         // Preparation
         let test_id = "999";
-        let test_name = "test-blog.md";
+        let test_name = "Test blog";
         let test_body = "# Testing Blog for Unit Test";
         let test_body_html = "<h1>Testing Blog for Unit Test</h1>";
-        let test_filename = "999-test-blog.md";
-        let test_path = "../statics/blogs/999-test-blog.md";
+        let test_filename = "999-test_blog.md";
+        let test_path = "../statics/blogs/999-test_blog.md";
 
         // Get current directory
         debug!(

internal/src/router.rs

@@ -8,7 +8,8 @@ use askama::Template;
 use log::info;
 
 pub async fn styles() -> Result<NamedFile> {
-    Ok(NamedFile::open("./statics/styles.css")?)
+    let styles = NamedFile::open("./statics/styles.css").expect("Failed to render styles.css");
+    Ok(styles)
 }
 
 pub async fn profile() -> Result<impl Responder> {

internal/src/utils.rs

@@ -23,3 +23,12 @@ pub fn read_version_manifest() -> Result<VersionData, String> {
     let json: VersionData = serde_json::from_reader(reader).expect("Failed to parse version.json");
     Ok(json)
 }
+
+/// Capitalizes the first character in s.
+pub fn capitalize(s: &str) -> String {
+    let mut c = s.chars();
+    match c.next() {
+        None => String::new(),
+        Some(f) => f.to_uppercase().collect::<String>() + c.as_str(),
+    }
+}

internal/templates/base.html

@@ -42,7 +42,7 @@
                 LinkedIn
                 </a>
 
-                <a href="https://github.com/Hazunanafaru" target="_blank">
+                <a href="https://github.com/husni-zuhdi" target="_blank">
                 GitHub
                 </a>
                 <br>

internal/templates/blog.html

@@ -4,8 +4,8 @@
 {% block description %}"Blog {{id}} - {{name}}"{% endblock %}
 
 {% block content %}
-    <h1>{{id}} - {{name}}</h1>
-    <h2>{{filename}}</h2>
+    <h1>{{id}} | {{name}}</h1>
+    <!-- <h2>{{filename}}</h2> -->
     <hr>
     <div>
         {{body|safe}}

internal/templates/blogs.html

@@ -5,10 +5,11 @@
 
 {% block content %}
 <h1>Blogs</h1>
-
+<hr>
 {% for blog in blogs %}
-    <h2><a href="/blogs/{{blog.id}}">Blog {{blog.id}}</a></h2>
-    <p>{{blog.name}}</p>
+    <h2>
+        {{blog.id}} | <a href="/blogs/{{blog.id}}">{{blog.name}}</a>
+    </h2>
 {% endfor %}
 
 {% endblock content %}

internal/templates/profile.html

@@ -8,6 +8,7 @@ <h1>Husni Naufal Zuhdi - Site Reliability Engineer</h1>
 
 <h2>Overview</h2>
 <p>Hi! I'm a Site Reliability Engineer by job and Software Engineer by passion. I'm comfortable writing code with python, golang, and rust.</p>
+<p>I love exploring several topics such as Cloud Computing, DevOps, Platform Engineering, Nuclear Science, and Physics Computation.</p>
 
 <h2>Work Experiences</h2>
 <hr>
@@ -59,7 +60,10 @@ <h3>Cloud Computing</h3>
     <div>
         <h3>Kubernetes</h3>
         <p class=paragraph>
-            Manage hundreds of Kubernetes clusters.
+            Manage hundreds of Kubernetes clusters and create my own cluster.
+        <ul>
+            <li><a href="https://www.credly.com/badges/a7ef8fab-b735-4c73-9fe2-39e14e2a458d/public_url" target="_blank">K8S Certified Kubernetes Administrator</a></li>
+        </ul>
         </p>
     </div>
     <div>
@@ -76,30 +80,32 @@ <h3>Linux</h3>
     </div>
 </div>
 
-<h2>Projects</h2>
-<hr>
-<div class="flex-container">
-    <div>
-        <h3>Sapa.AI</h3>
-        <ul>
-            <li>Design microservice architecture to serve simple CURD API and inference ML API</li>
-            <li>Develop CRUD and ML APIs with flask and tensorflow frameworks</li>
-            <li>Lead team of 6 people to deliver a violence reporting android app</li>
-        </ul>
-    </div>
-    <div>
-        <h3>Bachelor Thesis</h3>
-        <ul>
-            <li>Design a neutronic fusion reactor simulation with Paramak and OpenMC library</li>
-            <li>Optimize simulation workflow to run in Cloud-Native environment</li>
-            <li>Enable multi-cloud environments with GCP and AWS cloud providers to increase simulation efficiency</li>
-        </ul>
-    </div>
-</div>
+<!-- <h2>Projects</h2> -->
+<!-- <hr> -->
+<!---->
+<!-- <div class="flex-container"> -->
+<!--     <div> -->
+<!--         <h3>Sapa.AI</h3> -->
+<!--         <ul> -->
+<!--             <li>Design microservice architecture to serve simple CURD API and inference ML API</li> -->
+<!--             <li>Develop CRUD and ML APIs with flask and tensorflow frameworks</li> -->
+<!--             <li>Lead team of 6 people to deliver a violence reporting android app</li> -->
+<!--         </ul> -->
+<!--     </div> -->
+<!--     <div> -->
+<!--         <h3>Bachelor Thesis</h3> -->
+<!--         <ul> -->
+<!--             <li>Design a neutronic fusion reactor simulation with Paramak and OpenMC library</li> -->
+<!--             <li>Optimize simulation workflow to run in Cloud-Native environment</li> -->
+<!--             <li>Enable multi-cloud environments with GCP and AWS cloud providers to increase simulation efficiency</li> -->
+<!--         </ul> -->
+<!--     </div> -->
+<!-- </div> -->
 
 
 <h2>Personal Interests</h2>
 <hr>
+
 <p class="paragraph">
     <i>Running, Hard Sci-fi and Fantasy, Books, Climbing, Staring</i>
 </p>

internal/templates/version.html

@@ -1,13 +1,11 @@
-<h1></h1>
 {% extends "base.html" %}
 
 {% block title %}Husni Blog v{{version}}{% endblock %}
 {% block description %}"Husni Blog v{{version}}"{% endblock %}
 
 {% block content %}
-    <h1>Husni Blog v{{version}}</h1>
-    <hr>
-    <h2>Environment: {{environment}}</h2>
-    <h2>Githash: {{build_hash}}</h2>
-    <h2>Build Date: {{build_date}}</h2>
+    <p>Husni Blog v{{version}}</p>
+    <p>Environment: {{environment}}</p>
+    <p>Githash: {{build_hash}}</p>
+    <p>Build Date: {{build_date}}</p>
 {% endblock content %}

statics/styles.css

@@ -55,8 +55,8 @@
 }
 
 .paragraph {
-    padding-left: 5px;
-    padding-right: 5px;
+    padding-left: 0px;
+    padding-right: 0px;
 }
 
 .btn {