Merge pull request 'dev' (#12) from dev into master

Reviewed-on: #12

.gitea/workflows/docker.yml

@@ -12,17 +12,7 @@ jobs:
     name: Build
     runs-on: [ubuntu-latest, aya01]
     steps:
-      - name: Set up QEMU
+      - uses: docker/setup-buildx-action@v3
-        uses: docker/setup-qemu-action@v3
+      - uses: docker/build-push-action@v5
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          tags: tudattr/athome:latest
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: user/app:latest

Cargo.toml

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.80.1 AS dioxus
+FROM rust:1.79.0 AS dioxus
 RUN cargo install dioxus-cli@^0.5
 
 FROM dioxus AS builder
@@ -11,8 +11,7 @@ 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
+RUN npx tailwindcss -i ./input.css -o ./assets/tailwind.css && dx build --platform fullstack --release
-RUN dx build --platform fullstack --release
 
 FROM dioxus AS runner
 WORKDIR /app/

assets/robots.txt

@@ -32,7 +32,7 @@ User-Agent: GPTBot
 Disallow: /
 
 User-agent: *
-Disallow: /impressum
+Disallow: /*
 Allow: /
 Allow: /resume
 Allow: /publications

assets/site.webmanifest

@@ -1 +0,0 @@
-{"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"}

src/components/mod.rs

@@ -21,19 +21,6 @@ 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! {
@@ -97,7 +84,7 @@ pub fn Card(prop: CardProp) -> Element {
                     Picture {src: "{prop.picture}"},
                 }
             }
-            Title { "{prop.name}", span { class: "text-grey-600 dark:text-grey-500 text-lg", " {prop.gender}" } },
+            H5 { "{prop.name}", span { class: "text-grey-600 dark:text-grey-500 text-lg", " {prop.gender}" } },
             { prop.children }
         }
     }

src/layout/mod.rs

@@ -1,7 +1,7 @@
 use dioxus::prelude::*;
 
-pub mod footer;
+mod footer;
-pub mod header;
+mod header;
 
 use crate::{Body, Route};
 use footer::Footer;
@@ -9,13 +9,17 @@ use header::Header;
 
 pub fn Layout() -> Element {
     rsx! {
+        meta {
+            name: "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.",
+        }
         div {
-            class: "flex flex-col min-h-screen",
+            class: "flex flex-col min-h-screen" ,
             Header {},
             Body {
                 Outlet::<Route> {},
-            Footer {},
             }
+            Footer {},
         }
     }
 }

src/main.rs

@@ -2,12 +2,9 @@
 
 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;
@@ -63,41 +60,6 @@ fn App() -> Element {
     });
 
     rsx! {
-        meta {
-            name: "description",
-            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> {},
@@ -109,16 +71,12 @@ fn App() -> Element {
 fn PageNotFound(route: Vec<String>) -> Element {
     rsx! {
         div {
-            class: "flex flex-col min-h-screen items",
+            class: "h-screen items-center justify-center",
-            Header {},
+            img {
-            div {
+                class: "size-auto",
-                class: "container mx-auto p-4 flex items-center justify-center max-w-md w-full",
+                src: "https://raw.githubusercontent.com/SAWARATSUKI/ServiceLogos/main/404Notfound/NotFound.png"
-                H1 {
-                    "Site not found (404)"
-                },
             }
-            Footer {}
+        }
-        },
     }
 }