Added basic layout for login

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

Cargo.toml

@@ -4,21 +4,22 @@ version = "0.2.2"
 authors = ["Tuan-Dat Tran <tuan-dat.tran@tudattr.dev>"]
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-serde = { version = "1.0.197", features = ["derive"] }
 dioxus = { version = "0.5", features = ["fullstack", "router"] }
-
-# Debug
-tracing = "0.1.40"
-dioxus-logger = "0.5.0"
-manganis = "0.2.2"
-dioxus-free-icons = { version = "0.8", features = ["font-awesome-brands"] }
 dioxus-sdk = { version = "0.5.0", features = ["i18n"] }
+dioxus-logger = "0.5.0"
+dioxus-free-icons = { version = "0.8", features = ["font-awesome-brands"] }
+
+tokio = { version = "1", features = ["full"], optional = true }
+tracing = "0.1.40"
+serde = { version = "1.0.197", features = ["derive"] }
+
 lazy_static = "1.4.0"
+manganis = "0.2.2"
+simple_logger = { version = "4.2.0", optional = true }
+axum-login = "0.16.0"
 
 [features]
 default = []
-server = ["dioxus/axum"]
+server = ["dioxus/fullstack"]
 web = ["dioxus/web"]

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.79.0 AS dioxus
+FROM rust:1.80.1 AS dioxus
 RUN cargo install dioxus-cli@^0.5
 
 FROM dioxus AS builder

README.md

@@ -2,6 +2,16 @@
 
 My personal website.
 
+## Usage
+
+```sh
+npx tailwindcss -i ./input.css -o ./assets/tailwind.css --watch
+```
+
+```sh
+ dx serve --platform fullstack
+```
+
 ## Screenshot
 
 [[./resources/screenshot.webp]]

assets/tailwind.css

@@ -608,21 +608,11 @@ video {
   inset-inline-start: -0.375rem;
 }
 
-.mx-16 {
-  margin-left: 4rem;
-  margin-right: 4rem;
-}
-
 .mx-auto {
   margin-left: auto;
   margin-right: auto;
 }
 
-.my-4 {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
-}
-
 .my-8 {
   margin-top: 2rem;
   margin-bottom: 2rem;
@@ -676,10 +666,6 @@ video {
   display: flex;
 }
 
-.h-16 {
-  height: 4rem;
-}
-
 .h-24 {
   height: 6rem;
 }
@@ -700,18 +686,34 @@ video {
   height: 1px;
 }
 
-.h-32 {
+.h-screen {
-  height: 8rem;
+  height: 100vh;
+}
+
+.h-5\/6 {
+  height: 83.333333%;
+}
+
+.h-1\/6 {
+  height: 16.666667%;
+}
+
+.h-2\/3 {
+  height: 66.666667%;
+}
+
+.h-4\/6 {
+  height: 66.666667%;
+}
+
+.h-full {
+  height: 100%;
 }
 
 .min-h-screen {
   min-height: 100vh;
 }
 
-.w-16 {
-  width: 4rem;
-}
-
 .w-24 {
   width: 6rem;
 }
@@ -724,6 +726,10 @@ video {
   width: 100%;
 }
 
+.w-screen {
+  width: 100vw;
+}
+
 .min-w-fit {
   min-width: -moz-fit-content;
   min-width: fit-content;
@@ -765,6 +771,10 @@ video {
   flex-wrap: wrap;
 }
 
+.content-center {
+  align-content: center;
+}
+
 .items-center {
   align-items: center;
 }
@@ -781,30 +791,30 @@ video {
   justify-content: space-between;
 }
 
+.gap-2 {
+  gap: 0.5rem;
+}
+
 .gap-4 {
   gap: 1rem;
 }
 
-.space-x-8 > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(2rem * var(--tw-space-x-reverse));
-  margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse)));
-}
-
-.space-y-2 > :not([hidden]) ~ :not([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));
-}
-
 .space-x-4 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
   margin-right: calc(1rem * var(--tw-space-x-reverse));
   margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
 }
 
-.overflow-x-auto {
+.space-y-2 > :not([hidden]) ~ :not([hidden]) {
-  overflow-x: auto;
+  --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));
+}
+
+.space-y-8 > :not([hidden]) ~ :not([hidden]) {
+  --tw-space-y-reverse: 0;
+  margin-top: calc(2rem * calc(1 - var(--tw-space-y-reverse)));
+  margin-bottom: calc(2rem * var(--tw-space-y-reverse));
 }
 
 .rounded {
@@ -823,6 +833,10 @@ video {
   border-radius: 0.375rem;
 }
 
+.rounded-xl {
+  border-radius: 0.75rem;
+}
+
 .rounded-e-lg {
   border-start-end-radius: 0.5rem;
   border-end-end-radius: 0.5rem;
@@ -833,6 +847,11 @@ video {
   border-end-start-radius: 0.5rem;
 }
 
+.rounded-l {
+  border-top-left-radius: 0.25rem;
+  border-bottom-left-radius: 0.25rem;
+}
+
 .border {
   border-width: 1px;
 }
@@ -849,6 +868,10 @@ video {
   border-inline-start-width: 1px;
 }
 
+.border-none {
+  border-style: none;
+}
+
 .border-gray-200 {
   --tw-border-opacity: 1;
   border-color: rgb(229 231 235 / var(--tw-border-opacity));
@@ -914,6 +937,21 @@ video {
   background-color: rgb(254 249 195 / var(--tw-bg-opacity));
 }
 
+.bg-gray-900 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(17 24 39 / var(--tw-bg-opacity));
+}
+
+.bg-gray-700 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(55 65 81 / var(--tw-bg-opacity));
+}
+
+.bg-gray-800 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
+}
+
 .bg-gradient-to-br {
   background-image: linear-gradient(to bottom right, var(--tw-gradient-stops));
 }
@@ -940,6 +978,12 @@ video {
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
 
+.from-blue-600 {
+  --tw-gradient-from: #2563eb var(--tw-gradient-from-position);
+  --tw-gradient-to: rgb(37 99 235 / 0) var(--tw-gradient-to-position);
+  --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
+}
+
 .to-blue-500 {
   --tw-gradient-to: #3b82f6 var(--tw-gradient-to-position);
 }
@@ -952,15 +996,15 @@ video {
   --tw-gradient-to: #059669 var(--tw-gradient-to-position);
 }
 
+.to-cyan-300 {
+  --tw-gradient-to: #67e8f9 var(--tw-gradient-to-position);
+}
+
 .bg-clip-text {
   -webkit-background-clip: text;
           background-clip: text;
 }
 
-.p-3 {
-  padding: 0.75rem;
-}
-
 .p-4 {
   padding: 1rem;
 }
@@ -1019,10 +1063,28 @@ video {
   padding-bottom: 1rem;
 }
 
+.px-10 {
+  padding-left: 2.5rem;
+  padding-right: 2.5rem;
+}
+
+.py-8 {
+  padding-top: 2rem;
+  padding-bottom: 2rem;
+}
+
 .pb-4 {
   padding-bottom: 1rem;
 }
 
+.pl-2 {
+  padding-left: 0.5rem;
+}
+
+.pb-2 {
+  padding-bottom: 0.5rem;
+}
+
 .text-2xl {
   font-size: 1.5rem;
   line-height: 2rem;
@@ -1167,6 +1229,11 @@ video {
   color: rgb(133 77 14 / var(--tw-text-opacity));
 }
 
+.text-black {
+  --tw-text-opacity: 1;
+  color: rgb(0 0 0 / var(--tw-text-opacity));
+}
+
 .shadow {
   --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
   --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
@@ -1185,6 +1252,17 @@ video {
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
+.shadow-xl {
+  --tw-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color), 0 8px 10px -6px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
+.outline-none {
+  outline: 2px solid transparent;
+  outline-offset: 2px;
+}
+
 .grayscale {
   --tw-grayscale: grayscale(100%);
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
@@ -1287,6 +1365,12 @@ video {
     flex-direction: row;
   }
 
+  .sm\:space-x-8 > :not([hidden]) ~ :not([hidden]) {
+    --tw-space-x-reverse: 0;
+    margin-right: calc(2rem * var(--tw-space-x-reverse));
+    margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse)));
+  }
+
   .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) {
     --tw-space-y-reverse: 0;
     margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse)));

src/components/mod.rs

@@ -142,3 +142,105 @@ pub fn HR() -> Element {
         hr { class:"h-px my-8 bg-gray-200 border-0 dark:bg-gray-700"}
     }
 }
+
+#[derive(Clone, PartialEq, Props)]
+pub struct BoldingProp {
+    authors: String,
+    patterns: Vec<String>,
+}
+
+pub fn Bolding(prop: BoldingProp) -> Element {
+    let mut elements = vec![];
+    let mut last_index = 0;
+    let authors_text = &prop.authors;
+
+    let mut matches: Vec<(usize, usize, &str)> = vec![];
+
+    for pattern in &prop.patterns {
+        for (start, _) in authors_text.match_indices(pattern) {
+            matches.push((start, start + pattern.len(), pattern));
+        }
+    }
+
+    matches.sort_by_key(|(start, _, _)| *start);
+
+    for (start, end, matched_pattern) in matches {
+        if last_index < start {
+            elements.push(rsx! { "{&authors_text[last_index..start]}" });
+        }
+
+        elements.push(rsx! { b { "{matched_pattern}" } });
+        last_index = end;
+    }
+
+    if last_index < authors_text.len() {
+        elements.push(rsx! { "{&authors_text[last_index..]}" });
+    }
+
+    rsx! {
+        div {
+            P {
+                for i in elements {
+                    {i}
+                }
+            }
+        }
+    }
+}
+
+#[derive(Clone, PartialEq, Props)]
+pub struct UrlingProp {
+    #[props(default = "".to_string())]
+    class: String,
+    text: String,
+    patterns: Vec<String>,
+    url: String,
+    #[props(default = true)]
+    new_tab: bool,
+}
+
+pub fn Urling(prop: UrlingProp) -> Element {
+    let mut elements = vec![];
+    let mut last_index = 0;
+    let text = &prop.text;
+
+    let mut matches: Vec<(usize, usize, &str)> = vec![];
+
+    for pattern in &prop.patterns {
+        for (start, _) in text.match_indices(pattern) {
+            matches.push((start, start + pattern.len(), pattern));
+        }
+    }
+
+    matches.sort_by_key(|(start, _, _)| *start);
+
+    for (start, end, matched_pattern) in matches {
+        if last_index < start {
+            elements.push(rsx! { "{&text[last_index..start]}" });
+        }
+
+        elements.push(rsx! {
+                Link {
+                class: "{prop.class}",
+                to: "{prop.url}",
+                new_tab: prop.new_tab,
+                "{matched_pattern}"
+            }
+        });
+        last_index = end;
+    }
+
+    if last_index < text.len() {
+        elements.push(rsx! { "{&text[last_index..]}" });
+    }
+
+    rsx! {
+        div {
+            P {
+                for i in elements {
+                    {i}
+                }
+            }
+        }
+    }
+}

src/consulting.rs

@@ -1,10 +0,0 @@
-use dioxus::prelude::*;
-
-use crate::components::UnderConstruction;
-
-#[component]
-pub fn Consulting() -> Element {
-    rsx! {
-        UnderConstruction { },
-    }
-}

src/cv.rs

@@ -9,14 +9,19 @@ pub fn CV() -> Element {
         div {
             class: "flex flex-col",
             div {
-                class: "flex justify-between",
+                class: "flex flex-col sm:flex-row justify-center items-center sm:space-x-8 space-y-8 sm:space-y-0",
+                img {
+                    class: "rounded-full w-24 h-24",
+                    alt: "headshot",
+                    src: "/pictures/headshot.webp"
+                }
                 Introduction {},
                 Socials {}
             },
 
             HR {}
             div {
-                class: "flex justify-between",
+                class: "flex flex-col justify-between sm:flex-row",
                 WorkExperience {},
                 Miscellaneous {},
             },
@@ -31,11 +36,6 @@ fn Introduction() -> Element {
     rsx! {
         div {
             class: "flex",
-
-            img {
-                class: "rounded-full w-16 h-16 mx-16",
-                src: "/pictures/headshot.webp"
-            }
             P { { translate!(i18, "cv.introduction_0") } },
             P { { translate!(i18, "cv.introduction_1") } }
         },
@@ -195,7 +195,7 @@ fn CVEntry(props: CVEntryProps) -> Element {
             time { class:"mb-1 text-sm font-normal leading-none text-gray-400 dark:text-gray-500", "{props.time}"},
             h6 { class: "text-lg font-semibold text-gray-900 dark:text-white", "{props.title}"}
             ul {
-                class: "flex",
+                class: "flex flex-wrap gap-2",
                 for (index, value) in props.technologies.iter().enumerate() {
                     li { key: "{index}", RandomBadge { text: "{value}"} }
                 }

src/home.rs

@@ -1,10 +1,11 @@
-use crate::components::{Card, P};
+use crate::components::{Card, Urling, P};
 use dioxus::prelude::*;
 use dioxus_sdk::{i18n::use_i18, translate};
 
 #[component]
 pub fn Home() -> Element {
     let i18 = use_i18();
+
     rsx! {
         div {
             class: "container mx-auto p-4 flex items-center justify-center max-w-md w-full",
@@ -16,17 +17,16 @@ pub fn Home() -> Element {
                     class: "py-4",
                     div {
                         class: "mb-2",
-                        P { { translate!(i18, "home.card.l1") }  },
+                        for line in translate!(i18, "home.card.text").split("\n").into_iter() {
-                        P { { translate!(i18, "home.card.l2") }  },
+                            P {
-                        P { { translate!(i18, "home.card.l3") } },
+                                Urling {
-                        P { { translate!(i18, "home.card.l4") }
-                            Link {
-                                to: "https://git.tudattr.dev/explore/repos",
-                                new_tab: true,
                                     class: "items-center font-medium hover:underline",
-                                "gitea"},
+                                    text: line,
-                            { translate!(i18, "home.card.l4_1") }
+                                    patterns: vec!["Gitea".to_string()],
-                        },
+                                    url: "https://git.tudattr.dev/explore/repos"
+                                }
+                            }
+                        }
                     },
                 },
                 Link {

src/impressum.rs

@@ -1,48 +1,60 @@
 use dioxus::prelude::*;
 use dioxus_sdk::{i18n::use_i18, translate};
-use tracing::info;
 
 use crate::components::{H1, HR, P};
 
 #[component]
 pub fn Impressum() -> Element {
-    let mut show_impressum = use_signal(|| false);
     let i18 = use_i18();
+    let mut impressum = use_signal(Vec::<String>::new);
+    let mut contact = use_signal(Vec::<String>::new);
 
     rsx! {
-        if show_impressum() {
         div {
             div {
                 class: "flex flex-col items-center",
                 button {
-                        onclick: move |_| {
+                    onclick: move |_| async move {
-                            info!("Hide impressum.");
+                        if let Ok(data) = get_impressum().await {
+                            impressum.set(data.clone());
+                        }
+                        if let Ok(data) = get_contact().await {
+                            contact.set(data.clone());
+                        }
                     },
                     H1 { { translate!(i18, "impressum.on") } },
                 },
-                    P { "Tuan-Dat Tran" },
-                    P { "c/o AutorenServices.de" },
-                    P { "Birkenallee 24" },
-                    P { "36037 Fulda" },
             },
-                HR {}
             div {
                 class: "flex flex-col items-center",
-                    P { "tuan-dat.tran@tudattr.dev" },
+                for line in impressum() {
-                    P { "+49 176 83468388" },
+                    P { {line} }
                 }
             }
-        } else {
+            if !impressum.read().is_empty() { HR{} },
             div {
-                class: "flex flex-col items-center p-3",
+                class: "flex flex-col items-center",
-                button {
+                for line in contact() {
-                    onclick: move |_| async move {
+                    P { {line} }
-                        show_impressum.set(true);
+                }
-                    },
+            }
+        }
+    }
+}
 
-                H1 { { translate!(i18, "impressum.off") } },
+#[server(GetServerData)]
-                },
+async fn get_impressum() -> Result<Vec<String>, ServerFnError> {
-            }
+    Ok(vec![
-        }
+        "Tuan-Dat Tran".to_string(),
+        "c/o AutorenServices.de".to_string(),
+        "Birkenallee 24".to_string(),
+        "36037 Fulda".to_string(),
+    ])
 }
+
+async fn get_contact() -> Result<Vec<String>, ServerFnError> {
+    Ok(vec![
+        "tuan-dat.tran@tudattr.dev".to_string(),
+        "+49 176 83468388".to_string(),
+    ])
 }

src/languages/de-DE.json

@@ -16,11 +16,7 @@
       "card": {
         "name": "Tuan-Dat Tran",
         "gender": "",
-        "l1": "Hallihallo! 👋🏻👋🏼👋🏽👋🏾👋🏿",
+        "text": "Hallihallo! 👋🏻👋🏼👋🏽👋🏾👋🏿\nWillkommen auf meiner kleinen Webseite im World Wide Web.\nMein Name ist Tuan und ich bin Linux-Bastler, IT-Security Nerd und Automatisierer aus Leidenschaft.\nWährend du hier bist, schau dir doch meine Projekte auf Gitea an.\n",
-        "l2": "Willkommen auf meiner kleinen Webseite im World Wide Web.",
-        "l3": "Mein Name ist Tuan und ich bin Linux-Bastler, IT-Security Nerd und Automatisierer aus Leidenschaft.",
-        "l4": "Während du hier bist, schau dir doch meine Projekte auf ",
-        "l4_1": " an.",
         "contact_button": "Get in touch."
       }
     },
@@ -146,10 +142,13 @@
       "under_construction": "Diese Seite befindet sich gerade im Aufbau"
     },
     "footer": {
-      "year": "© 2024 ",
+      "year": " 2024 ",
       "name": "Tuan-Dat Tran",
       "rights": ". All Rights Reserved.",
       "contact": "Kontakt"
+    },
+    "login": {
+      "title": "Login"
     }
   }
 }

src/languages/en-GB.json

@@ -3,7 +3,7 @@
   "texts": {
     "headers": {
       "home": "Home",
-      "cv": "CV",
+      "cv": "Résumé",
       "publications_projects": "Publications/Projects",
       "consulting": "Consulting",
       "about": "About",
@@ -16,11 +16,7 @@
       "card": {
         "name": "Tuan-Dat Tran",
         "gender": "(He/Him)",
-        "l1": "Hey there! 👋🏻👋🏼👋🏽👋🏾👋🏿",
+        "text": "Hey there! 👋🏻👋🏼👋🏽👋🏾👋🏿\nWelcome to my little place on the internet\nMy name is Tuan and I'm passionate about Linux, system security, automation and all things tech.\nWhile you're here, why don't you check out my projects over on Gitea?",
-        "l2": "Welcome to my little place on the internet.",
-        "l3": "My name is Tuan and I'm passionate about Linux, system security, automation, network performance tweaking and all things tech.",
-        "l4": "While you're here, why don't you check out my projects over on ",
-        "l4_1": "?",
         "contact_button": "Get in touch."
       }
     },
@@ -146,10 +142,13 @@
       "under_construction": "This page is currently under construction"
     },
     "footer": {
-      "year": "© 2024 ",
+      "year": " 2024 ",
       "name": "Tuan-Dat Tran",
       "rights": ". All Rights Reserved.",
       "contact": "Contact"
+    },
+    "login": {
+      "title": "Login"
     }
   }
 }

src/layout/footer.rs

@@ -1,30 +1,29 @@
 use dioxus::prelude::*;
 use dioxus_sdk::{i18n::use_i18, translate};
 
-use crate::components::H1;
+use crate::Route;
 
 pub fn Footer() -> Element {
     let i18 = use_i18();
 
     rsx! {
         div {
-            class: "container mx-auto",
+            class: "container mx-auto pb-4",
-            // ToolsUsed {},
             footer {
                 class:"bg-white rounded-lg shadow dark:bg-gray-800",
                 div {
                     class:"w-full mx-auto p-4 flex items-center justify-between",
                     span {
                         class:"text-sm text-gray-500 sm:text-center dark:text-gray-400",
+                        Link {to: Route::Home {}, "©"},
                         { translate!(i18, "footer.year") },
-                        a { href: "#",  class: "hover:underline", { translate!(i18, "footer.name") }},
+                        Link { class: "hover:underline", to: "#", { translate!(i18, "footer.name") }},
                         { translate!(i18, "footer.rights") }
-                    }
-                    ul {
-                        class:"flex flex-wrap items-center mt-3 text-sm font-medium text-gray-500 dark:text-gray-400 sm:mt-0",
-                        li {
-                            Link { to:"mailto:tuan-dat.tran@tudattr.dev", class:"hover:underline", { translate!(i18, "footer.contact") } }
                     },
+                    Link {
+                        class:"text-sm text-gray-500 sm:text-center dark:text-gray-400 hover:underline",
+                        to:"mailto:tuan-dat.tran@tudattr.dev",
+                        { translate!(i18, "footer.contact") }
                     }
                 }
             }
@@ -32,42 +31,6 @@ pub fn Footer() -> Element {
     }
 }
 
-#[allow(dead_code)]
-fn ToolsUsed() -> Element {
-    rsx! {
-        div {
-            class:"items-center bg-white rounded-lg shadow dark:bg-gray-800 p-4 my-4",
-            div {
-                H1 {class: "justify-center", "Tools used" },
-            }
-            div {
-                class: "flex h-fill overflow-x-auto",
-                Logo {
-                    src: "https://raw.githubusercontent.com/SAWARATSUKI/Logogs/main/Rust/Rust.png",
-                    alt: "Rust"
-                },
-                Logo {
-                    src: "https://raw.githubusercontent.com/SAWARATSUKI/Logogs/main/Tailwindcss/Tailwindcss6.png",
-                    alt: "Tailwindcss"
-                },
-                Logo {
-                    src: "https://raw.githubusercontent.com/SAWARATSUKI/Logogs/main/Html/HTML.png",
-                    alt: "HTML"
-                },
-                Logo {
-                    src: "https://raw.githubusercontent.com/Aikoyori/ProgrammingVTuberLogos/main/Docker/DockerLogo.png",
-                    alt: "Docker"
-                },
-                Logo {
-                    src: "https://raw.githubusercontent.com/Aikoyori/ProgrammingVTuberLogos/main/Neovim/NeovimLogo.png",
-                    alt: "NeoVim"
-                },
-
-            }
-        }
-    }
-}
-
 #[component]
 fn Logo(src: String, alt: String) -> Element {
     rsx! {

src/layout/header.rs

@@ -9,11 +9,10 @@ pub fn Header() -> Element {
     rsx! {
         nav {
             div {
-                // class: "justify-between p-4 space-x-8",
+                class: "container mx-auto py-4",
-                class: "container mx-auto p-4",
 
                 ul {
-                    class:"flex flex-col justify-between sm:flex-row justify-center space-y-2 sm:space-y-0 sm:space-s-4",
+                    class:"flex flex-col justify-between items-center justify-center space-y-2 sm:flex-row sm:space-y-0 sm:space-s-4",
                     li {
                         Link {
                             to: Route::Home {},
@@ -24,7 +23,6 @@ pub fn Header() -> Element {
                     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 {} },
                 },
@@ -43,8 +41,14 @@ fn LanguageButtonGroup() -> Element {
     rsx! {
       div {
         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 {
-          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") } } }
+            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

@@ -14,8 +14,8 @@ pub fn Layout() -> Element {
             Header {},
             Body {
                 Outlet::<Route> {},
-            Footer {},
+            },
-            }
+            Footer {}
         }
     }
 }

src/login.rs

@@ -0,0 +1,80 @@
+use dioxus::prelude::*;
+use dioxus_sdk::{i18n::use_i18, translate};
+
+use crate::components::{H5, HR, P};
+
+#[component]
+pub fn Login() -> Element {
+    #[allow(unused_mut)]
+    let mut debug = use_signal(|| "".to_string());
+
+    let default_username = "Enter username here.";
+    let mut username = use_signal(|| default_username.to_string());
+    let mut password = use_signal(|| "".to_string());
+    let i18 = use_i18();
+
+    rsx! {
+            div {
+                class: "flex justify-center items-center w-full",
+                div {
+                    class: "text-black bg-gray-800 px-10 py-8 rounded-xl w-screen shadow-xl max-w-sm",
+                    div {
+                        H5 { { translate!(i18, "login.title") } },
+                    }
+                    HR {},
+                    div {
+                        P { "Username" },
+                        input {
+                            class: if username.read().to_string() == default_username {
+                                "pl-2 outline-none border-none w-full rounded-xl text-gray-400"
+                            } else {
+                                "pl-2 outline-none border-none w-full rounded-xl text-black"
+                            },
+                            value: "{username}",
+                            oninput: move |event| username.set(event.value()),
+                            onfocusin: move |_| {
+                                if username.read().to_string() == default_username {
+                                    username.set("".to_string());
+                                }
+                            },
+                            onfocusout: move |_| {
+                                if username.read().to_string().is_empty()  {
+                                    username.set(default_username.to_string());
+                                }
+                            },
+                            onkeypress: move |event| async move {
+                                if event.key() == Key::Enter {
+                                    let u = username.read().to_string();
+                                    let p = password.read().to_string();
+                                    login(u,p).await.unwrap();
+                            }
+                        },
+                    }
+                    div {
+                        class: "py-2",
+                        P { "Password" },
+                        input {
+                            class: "pl-2 outline-none border-none w-full rounded-xl text-gray-900",
+                            value: "{password}",
+                            oninput: move |event| password.set(event.value()),
+                            onkeypress: move |event| async move {
+                                if event.key() == Key::Enter {
+                                    let u = username.read().to_string();
+                                    let p = password.read().to_string();
+                                    login(u,p).await.unwrap();
+                            }
+                        }
+                        }
+                    }
+                }
+             },
+            "{debug}"
+        }
+    }
+}
+
+#[server(Login)]
+async fn login(username: String, password: String) -> Result<(), ServerFnError> {
+    println!("Username: {}, Password: {}", username, password);
+    Ok(())
+}

src/main.rs

@@ -10,22 +10,27 @@ use layout::footer::Footer;
 use layout::header::Header;
 use tracing::Level;
 
+use axum::routing::*;
+use axum_session::SessionConfig;
+use axum_session::SessionStore;
+use axum_session_auth::AuthConfig;
+
 pub mod components;
-mod consulting;
 mod cv;
 mod home;
 mod impressum;
 mod languages;
 mod layout;
+mod login;
 mod publications;
 
-use crate::consulting::Consulting;
 use crate::cv::CV;
 use crate::home::Home;
 use crate::impressum::Impressum;
 use crate::languages::DE_DE;
 use crate::languages::EN_GB;
 use crate::layout::Layout;
+use crate::login::Login;
 use crate::publications::PublicationsProjects;
 
 #[derive(Clone, Routable, Debug, PartialEq, serde::Serialize, serde::Deserialize)]
@@ -39,8 +44,8 @@ pub enum Route {
     PublicationsProjects {},
     #[route("/resume")]
     CV {},
-    #[route("/consulting")]
+    #[route("/login")]
-    Consulting {},
+    Login {},
     #[end_layout]
     #[route("/:..route")]
     PageNotFound { route: Vec<String> },

src/publications.rs

@@ -1,7 +1,7 @@
 use dioxus::prelude::*;
 use dioxus_sdk::{i18n::use_i18, translate};
 
-use crate::components::{UnderConstruction, H1, HR};
+use crate::components::{Bolding, UnderConstruction, H1, HR};
 
 #[component]
 pub fn PublicationsProjects() -> Element {
@@ -60,7 +60,7 @@ fn Publications() -> Element {
     }
 }
 fn Publication(prop: PublicationProp) -> Element {
-    let pattern = "T.-D. Tran";
+    let pattern = vec!["T.-D. Tran".to_string(), "Tuan-Dat Tran".to_string()];
     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",
@@ -73,9 +73,9 @@ 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 italic",
-                Authors {
+                Bolding {
                     authors: "{prop.authors}",
-                    pattern: "{pattern}",
+                    patterns: pattern,
                 },
             }
             p {
@@ -129,7 +129,7 @@ struct ProjectProp {
 }
 
 fn Project(prop: ProjectProp) -> Element {
-    let pattern = "T.-D. Tran";
+    let pattern = vec!["T.-D. Tran".to_string(), "Tuan-Dat Tran".to_string()];
 
     rsx! {
         Link {
@@ -143,9 +143,9 @@ 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",
-                Authors {
+                Bolding {
                     authors: "{prop.authors}",
-                    pattern: "{pattern}",
+                    patterns: pattern,
                 },
             }
             p {
@@ -155,23 +155,3 @@ 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}" }
-    }
-}