Added some SEO and ran cargo update

Signed-off-by: Tuan-Dat Tran <tuan-dat.tran@tudattr.dev>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "athome"
-version = "0.1.0"
+version = "0.2.2"
 authors = ["Tuan-Dat Tran <tuan-dat.tran@tudattr.dev>"]
 edition = "2021"
 
@@ -8,7 +8,6 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.197", features = ["derive"] }
-
 dioxus = { version = "0.5", features = ["fullstack", "router"] }
 
 # Debug

Dockerfile

@@ -1,9 +1,9 @@
-FROM rust:1.77.2 as dioxus
+FROM rust:1.79.0 AS dioxus
 RUN cargo install dioxus-cli@^0.5
 
-FROM dioxus as builder
+FROM dioxus AS builder
 WORKDIR /athome/
-RUN apt-get update && apt-get install nodejs npm -y && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install nodejs npm libssl-dev musl-tools -y && rm -rf /var/lib/apt/lists/*
 RUN npm install -D tailwindcss
 COPY ./src/ ./src/
 COPY ./assets/ ./assets/
@@ -11,9 +11,10 @@ COPY ./Cargo.toml ./Cargo.toml
 COPY ./input.css ./input.css
 COPY ./Dioxus.toml ./Dioxus.toml
 COPY ./tailwind.config.js ./tailwind.config.js
-RUN npx tailwindcss -i ./input.css -o ./assets/tailwind.css && dx build --platform fullstack --release
+RUN npx tailwindcss -i ./input.css -o ./assets/tailwind.css
+RUN dx build --platform fullstack --release
 
-FROM dioxus as runner
+FROM dioxus AS runner
 WORKDIR /app/
 COPY --from=builder /athome/docs/ ./docs/
 CMD [ "./docs/athome" ]

assets/robots.txt

@@ -0,0 +1,41 @@
+User-agent: CCBot
+Disallow: /
+
+User-agent: img2dataset
+Disallow: /
+
+User-agent: Google-Extended
+Disallow: /
+
+User-agent: anthropic-ai
+Disallow: /
+
+User-agent: Claude-Web
+Disallow: /
+
+User-agent: Omgilibot
+Disallow: /
+
+User-agent: Omgili
+Disallow: /
+
+User-agent: FacebookBot
+Disallow: /
+
+User-agent: Bytespider
+Disallow: /
+
+User-agent: magpie-crawler
+Disallow: /
+
+User-Agent: GPTBot
+Disallow: /
+
+User-agent: *
+Disallow: /impressum
+Allow: /
+Allow: /resume
+Allow: /publications
+Allow: /consulting
+Sitemap: https://www.tudattr.dev/sitemap.xml
+

assets/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

assets/sitemap.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+   <url>
+      <loc>https://www.tudattr.dev/</loc>
+      <lastmod>2024-07-25</lastmod>
+      <changefreq>monthly</changefreq>
+      <priority>1.0</priority>
+   </url>
+   <url>
+      <loc>https://www.tudattr.dev/resume</loc>
+      <lastmod>2024-07-25</lastmod>
+      <changefreq>monthly</changefreq>
+      <priority>0.8</priority>
+   </url>
+   <url>
+      <loc>https://www.tudattr.dev/publications</loc>
+      <lastmod>2024-07-25</lastmod>
+      <changefreq>monthly</changefreq>
+      <priority>0.8</priority>
+   </url>
+   <url>
+      <loc>https://www.tudattr.dev/consulting</loc>
+      <lastmod>2024-07-25</lastmod>
+      <changefreq>monthly</changefreq>
+      <priority>0.8</priority>
+   </url>
+</urlset>

assets/tailwind.css

@@ -554,6 +554,40 @@ video {
   --tw-contain-style:  ;
 }
 
+.container {
+  width: 100%;
+}
+
+@media (min-width: 640px) {
+  .container {
+    max-width: 640px;
+  }
+}
+
+@media (min-width: 768px) {
+  .container {
+    max-width: 768px;
+  }
+}
+
+@media (min-width: 1024px) {
+  .container {
+    max-width: 1024px;
+  }
+}
+
+@media (min-width: 1280px) {
+  .container {
+    max-width: 1280px;
+  }
+}
+
+@media (min-width: 1536px) {
+  .container {
+    max-width: 1536px;
+  }
+}
+
 .static {
   position: static;
 }
@@ -642,10 +676,6 @@ video {
   display: flex;
 }
 
-.inline-flex {
-  display: inline-flex;
-}
-
 .size-auto {
   width: auto;
   height: auto;
@@ -695,11 +725,6 @@ video {
   width: 0.75rem;
 }
 
-.w-fit {
-  width: -moz-fit-content;
-  width: fit-content;
-}
-
 .w-full {
   width: 100%;
 }
@@ -717,8 +742,8 @@ video {
   max-width: 2rem;
 }
 
-.max-w-screen-xl {
+.max-w-md {
-  max-width: 1280px;
+  max-width: 28rem;
 }
 
 .max-w-sm {
@@ -729,6 +754,10 @@ video {
   max-width: 36rem;
 }
 
+.flex-grow {
+  flex-grow: 1;
+}
+
 .cursor-pointer {
   cursor: pointer;
 }
@@ -745,8 +774,8 @@ video {
   align-items: center;
 }
 
-.justify-start {
+.justify-end {
-  justify-content: flex-start;
+  justify-content: flex-end;
 }
 
 .justify-center {
@@ -767,8 +796,10 @@ video {
   margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse)));
 }
 
-.overflow-hidden {
+.space-y-2 > :not([hidden]) ~ :not([hidden]) {
-  overflow: hidden;
+  --tw-space-y-reverse: 0;
+  margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse)));
+  margin-bottom: calc(0.5rem * var(--tw-space-y-reverse));
 }
 
 .overflow-x-auto {
@@ -925,10 +956,6 @@ video {
           background-clip: text;
 }
 
-.p-1 {
-  padding: 0.25rem;
-}
-
 .p-3 {
   padding: 0.75rem;
 }
@@ -1049,6 +1076,10 @@ video {
   text-transform: uppercase;
 }
 
+.italic {
+  font-style: italic;
+}
+
 .leading-none {
   line-height: 1;
 }
@@ -1251,6 +1282,16 @@ video {
     margin-top: 0px;
   }
 
+  .sm\:flex-row {
+    flex-direction: row;
+  }
+
+  .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) {
+    --tw-space-y-reverse: 0;
+    margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse)));
+    margin-bottom: calc(0px * var(--tw-space-y-reverse));
+  }
+
   .sm\:text-center {
     text-align: center;
   }

scripts/docker-push.sh

@@ -1,9 +1,20 @@
 #!/bin/sh
 
-VERSION=0.1.1
+TAG=$(git branch | grep "*" | awk '{ print $2 }')
 LOCAL_IMAGE="athome"
+REGISTRY="mos4"
 REMOTE_IMAGE="athome"
+DOCKERFILE="./Dockerfile"
 
-docker build -t $LOCAL_IMAGE .
+echo "DOCKERFILE: $DOCKERFILE"
-docker tag $LOCAL_IMAGE:latest mos4/$REMOTE_IMAGE:$VERSION
+echo "TAG: $TAG"
-docker push mos4/$REMOTE_IMAGE:$VERSION
+echo "LOCAL_IMAGE: $LOCAL_IMAGE"
+echo "REGISTRY: $REGISTRY"
+echo "REMOTE_IMAGE: $REMOTE_IMAGE"
+
+#docker buildx build --platform linux/amd64,linux/arm64 -f ${DOCKERFILE} -t \
+#  ${REGISTRY}/${REMOTE_IMAGE}:${TAG} . --push
+
+docker buildx build --platform linux/amd64 -f ${DOCKERFILE} \
+  -t ${REGISTRY}/${REMOTE_IMAGE}:${TAG} \
+  -t ${REGISTRY}/${REMOTE_IMAGE}:latest . --push

src/components/mod.rs

@@ -21,6 +21,19 @@ pub fn P(props: PProps) -> Element {
     }
 }
 
+#[component]
+pub fn Title(props: PProps) -> Element {
+    rsx! {
+        div {
+            class: "{props.class}",
+            h1 {
+                class: "mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white",
+                {props.children}
+            }
+        }
+    }
+}
+
 #[component]
 pub fn H1(props: PProps) -> Element {
     rsx! {
@@ -80,11 +93,11 @@ pub fn Card(prop: CardProp) -> Element {
             div {
                 class: "pb-4",
                 div {
-                    class: "flex justify-between",
+                    class: "justify-between",
                     Picture {src: "{prop.picture}"},
                 }
             }
-            H5 { "{prop.name}", span { class: "text-grey-600 dark:text-grey-500 text-lg", " {prop.gender}" } },
+            Title { "{prop.name}", span { class: "text-grey-600 dark:text-grey-500 text-lg", " {prop.gender}" } },
             { prop.children }
         }
     }
@@ -112,11 +125,11 @@ pub fn UnderConstruction() -> Element {
 
     rsx! {
         div {
-            class:"rounded flex justify-between w-full p-4 border-b border-gray-200 bg-gray-50 dark:bg-gray-700 dark:border-gray-600 my-8",
+            class:"rounded justify-between w-full p-4 border-b border-gray-200 bg-gray-50 dark:bg-gray-700 dark:border-gray-600 my-8",
             div {
-                class:"flex items-center mx-auto",
+                class:"items-center mx-auto",
                 p {
-                    class:"flex items-center text-sm font-normal text-gray-500 dark:text-gray-400",
+                    class:"items-center text-sm font-normal text-gray-500 dark:text-gray-400",
                     span { { translate!(i18, "components.under_construction") } }
                 }
             }

src/cv.rs

@@ -29,7 +29,7 @@ fn Introduction() -> Element {
             class: "flex",
             img {
                 class: "rounded-full w-16 h-16 mx-16",
-                src: "/pictures/portrait.webp"
+                src: "/pictures/headshot.webp"
             }
             P { { translate!(i18, "cv.introduction") }}
         }

src/home.rs

@@ -6,34 +6,34 @@ use dioxus_sdk::{i18n::use_i18, translate};
 pub fn Home() -> Element {
     let i18 = use_i18();
     rsx! {
-        Card {
+        div {
-            name: translate!(i18, "home.card.name"),
+            class: "container mx-auto p-4 flex items-center justify-center max-w-md w-full",
-            gender: translate!(i18, "home.card.gender"),
+            Card {
-            picture: "/pictures/comfy.webp",
+                name: translate!(i18, "home.card.name"),
-            div {
+                gender: translate!(i18, "home.card.gender"),
-                class: "py-4",
+                picture: "/pictures/headshot.webp",
                 div {
-                    class: "mb-2",
+                    class: "py-4",
-                    P { { translate!(i18, "home.card.l1") }  },
+                    div {
-                    P { { translate!(i18, "home.card.l2") }  },
+                        class: "mb-2",
-                    P { { translate!(i18, "home.card.l3") },
+                        P { { translate!(i18, "home.card.l1") }  },
-                        Link {
+                        P { { translate!(i18, "home.card.l2") }  },
-                            to: "https://git.tudattr.dev/explore/repos",
+                        P { { translate!(i18, "home.card.l3") },
-                            new_tab: true,
+                            Link {
-                            class: "inline-flex items-center font-medium hover:underline",
+                                to: "https://git.tudattr.dev/explore/repos",
-                            "gitea"},
+                                new_tab: true,
-                        { translate!(i18, "home.card.l3_1") }
+                                class: "items-center font-medium hover:underline",
+                                "gitea"},
+                            { translate!(i18, "home.card.l3_1") }
+                        },
                     },
                 },
-            },
+                Link {
-            Link {
+                    to: "mailto:tuan-dat.tran@tudattr.dev",
-                to: "mailto:tuan-dat.tran@tudattr.dev",
+                    class: "text-gray-900 bg-gradient-to-br from-green-400 to-blue-600 group-hover:from-green-400 group-hover:to-blue-600 hover:text-white rounded-full shadow-lg py-4 px-4",
-                class: "w-fit relative inline-flex items-center justify-center p-1 mb-2 me-2 overflow-hidden text-sm font-medium text-gray-900 rounded-lg group bg-gradient-to-br from-green-400 to-blue-600 group-hover:from-green-400 group-hover:to-blue-600 hover:text-white dark:text-white w-fill",
-                p {
-                    class: "p-1",
                     { translate!(i18, "home.card.contact_button") }
                 }
-            }
+            },
-        },
+        }
     }
 }

src/layout/footer.rs

@@ -8,6 +8,7 @@ pub fn Footer() -> Element {
 
     rsx! {
         div {
+            class: "container mx-auto",
             // ToolsUsed {},
             footer {
                 class:"bg-white rounded-lg shadow dark:bg-gray-800",

src/layout/header.rs

@@ -9,21 +9,25 @@ pub fn Header() -> Element {
     rsx! {
         nav {
             div {
-                class: "flex items-center justify-between p-4 space-x-8",
+                // class: "justify-between p-4 space-x-8",
-                Link {
+                class: "container mx-auto p-4",
-                    to: Route::Home {},
+
-                    class: "justify-start",
-                    img { src:"/pictures/ClackCat_t.webp", class:"rounded-full h-8", alt:"TuDatTr Logo" },
-                },
                 ul {
-                    class:"flex space-x-8",
+                    class:"flex flex-col justify-between sm:flex-row justify-center space-y-2 sm:space-y-0 sm:space-s-4",
+                    li {
+                        Link {
+                            to: Route::Home {},
+                            class: "rounded-md shadow-sm",
+                            img { src:"/pictures/ClackCat_t.webp", class:"rounded-full h-8", alt:"TuDatTr Logo" },
+                        },
+                    },
                     li { HeaderLink { url: Route::Home {}, text: translate!(i18, "headers.home")}  },
                     li { HeaderLink { url: Route::CV {}, text: translate!(i18, "headers.cv") } },
                     li { HeaderLink { url: Route::PublicationsProjects {}, text: translate!(i18, "headers.publications_projects") } },
                     li { HeaderLink { url: Route::Consulting {}, text: translate!(i18, "headers.consulting") } },
                     li { HeaderLink { url: Route::Impressum {}, text: translate!(i18, "headers.about") } },
+                    li { LanguageButtonGroup {} },
                 },
-                LanguageButtonGroup { },
             }
         }
     }
@@ -38,7 +42,7 @@ fn LanguageButtonGroup() -> Element {
 
     rsx! {
       div {
-          class: "inline-flex rounded-md shadow-sm",
+          class: "rounded-md shadow-sm justify-end",
           button { class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-s-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", onclick: change_to_english, label { { translate!(i18, "headers.language_buttons.english") } } },
           button { class: "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-e-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white", onclick: change_to_german, label { { translate!(i18, "headers.language_buttons.german") } } }
       }

src/layout/mod.rs

@@ -1,7 +1,7 @@
 use dioxus::prelude::*;
 
-mod footer;
+pub mod footer;
-mod header;
+pub mod header;
 
 use crate::{Body, Route};
 use footer::Footer;
@@ -10,14 +10,11 @@ use header::Header;
 pub fn Layout() -> Element {
     rsx! {
         div {
-            class: "flex justify-center ",
+            class: "flex flex-col min-h-screen",
-            div {
+            Header {},
-                class: "max-w-screen-xl flex-col" ,
+            Body {
-                Header {},
+                Outlet::<Route> {},
-                Body {
+            Footer {},
-                    Outlet::<Route> {},
-                }
-                Footer {},
             }
         }
     }

src/main.rs

@@ -2,9 +2,12 @@
 
 use std::str::FromStr;
 
+use components::H1;
 use dioxus::prelude::*;
 use dioxus_sdk::i18n::*;
 
+use layout::footer::Footer;
+use layout::header::Header;
 use tracing::Level;
 
 pub mod components;
@@ -61,9 +64,40 @@ fn App() -> Element {
 
     rsx! {
         meta {
-            name: "robots",
+            name: "description",
-            content: "noindex",
+            content: "Visit Tuan-Dat Tran's website for his CV, publications, projects, and consulting services. Connect for collaboration.",
         },
+        script {
+            r#type: "application/ld+json",
+            "
+            {{
+                \"@context\": \"https://schema.org\",
+                \"@type\": \"ProfilePage\",
+                \"mainEntity\": {{
+                  \"@type\": \"Person\",
+                  \"name\": \"Tuan-Dat Tran\",
+                  \"alternateName\": \"TuDatTr\",
+                  \"image\": \"https://www.tudattr.dev/pictures/headshot.webp\",
+                }}
+            }}
+            "
+        }
+        // meta {
+        //     property: "og:title",
+        //     content: "Tuan-Dat Trans Personal Website",
+        // }
+        // meta {
+        //     property: "og:description",
+        //     content: "Explore Tuan-Dat Tran's personal website featuring his CV, publications, projects, and consulting services. Get insights into his professional journey and connect for collaboration opportunities.",
+        // }
+        // meta {
+        //     property: "og:image",
+        //     content: "https://www.tudattr.dev/pictures/headshot.webp",
+        // }
+        // meta {
+        //     property: "og:url",
+        //     content: "https://tudattr.dev",
+        // }
         div {
             class: "bg-white dark:bg-gray-900 min-h-screen",
             Router::<Route> {},
@@ -75,12 +109,16 @@ fn App() -> Element {
 fn PageNotFound(route: Vec<String>) -> Element {
     rsx! {
         div {
-            class: "h-screen flex items-center justify-center",
+            class: "flex flex-col min-h-screen items",
-            img {
+            Header {},
-                class: "size-auto",
+            div {
-                src: "https://raw.githubusercontent.com/SAWARATSUKI/ServiceLogos/main/404Notfound/NotFound.png"
+                class: "container mx-auto p-4 flex items-center justify-center max-w-md w-full",
+                H1 {
+                    "Site not found (404)"
+                },
             }
-        }
+            Footer {}
+        },
     }
 }
 
@@ -92,7 +130,7 @@ pub struct BodyProp {
 pub fn Body(prop: BodyProp) -> Element {
     rsx! {
         div {
-            class: "my-4 flex justify-center",
+            class: "flex-grow container mx-auto p-4",
             {prop.children}
         }
     }

src/publications.rs

@@ -60,6 +60,7 @@ fn Publications() -> Element {
     }
 }
 fn Publication(prop: PublicationProp) -> Element {
+    let pattern = "T.-D. Tran";
     rsx! {
         Link {
             class:"block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700",
@@ -71,8 +72,11 @@ fn Publication(prop: PublicationProp) -> Element {
             },
             span { class: "text-lg text-gray-900 dark:text-white", "{prop.conference}" },
             p {
-                class:"font-normal text-gray-700 dark:text-gray-400",
+                class:"font-normal text-gray-700 dark:text-gray-400 italic",
-                "{prop.authors}",
+                Authors {
+                    authors: "{prop.authors}",
+                    pattern: "{pattern}",
+                },
             }
             p {
                 class:"font-normal text-gray-700 dark:text-gray-400",
@@ -125,6 +129,8 @@ struct ProjectProp {
 }
 
 fn Project(prop: ProjectProp) -> Element {
+    let pattern = "T.-D. Tran";
+
     rsx! {
         Link {
             class:"block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700",
@@ -137,7 +143,10 @@ fn Project(prop: ProjectProp) -> Element {
             p { class: "text-lg text-gray-900 dark:text-white", "{prop.kind}" },
             p {
                 class:"font-normal text-gray-700 dark:text-gray-400",
-                "{prop.authors}",
+                Authors {
+                    authors: "{prop.authors}",
+                    pattern: "{pattern}",
+                },
             }
             p {
                 class:"font-normal text-gray-700 dark:text-gray-400",
@@ -146,3 +155,23 @@ fn Project(prop: ProjectProp) -> Element {
         }
     }
 }
+
+#[derive(Clone, PartialEq, Props)]
+struct AuthorProp {
+    authors: String,
+    pattern: String,
+}
+
+fn Authors(prop: AuthorProp) -> Element {
+    if let Some(start) = prop.authors.find(&prop.pattern) {
+        let end = start + prop.pattern.len();
+        let left = &prop.authors[..start];
+        let middle = &prop.authors[start..end];
+        let right = &prop.authors[end..];
+        rsx! {
+            "{left}" , b { "{middle}" }, "{right}",
+        }
+    } else {
+        rsx! { "{prop.authors}" }
+    }
+}