fixed title

.gitignore

@@ -21,3 +21,4 @@ target/
 .env.production
 uploads/
 *.report.html
+favicon_io.zip

Caddyfile

@@ -1,17 +1,14 @@
-# Reverse-proxy config for temp.sk.
-#
-# This file is intended to be imported by the central Caddyfile on the server.
-# Caddy provisions and renews the HTTPS certificate automatically.
-
 gitara.farmeris.sk {
-    encode gzip
+	encode gzip
 
-    @static path /static/*
-    header @static Cache-Control "public, max-age=2592000"
+	@static path /static/*
+	header @static Cache-Control "public, max-age=2592000"
 
-    reverse_proxy universal-web:5150
+	rewrite /favicon.ico /static/favicon/favicon.ico
+
+	reverse_proxy gitara-web:5150
 }
 
 www.gitara.farmeris.sk {
-    redir https://temp.sk{uri} permanent
+	redir https://gitara.farmeris.sk{uri} permanent
 }

Cargo.lock

@@ -1523,6 +1523,36 @@ dependencies = [
  "wasip3",
 ]
 
+[[package]]
+name = "gitara_web"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "axum",
+ "axum-extra",
+ "bytes",
+ "chrono",
+ "dotenvy",
+ "fluent-templates",
+ "include_dir",
+ "insta",
+ "loco-rs",
+ "migration",
+ "regex",
+ "rstest",
+ "sea-orm",
+ "serde",
+ "serde_json",
+ "serial_test",
+ "time",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "unic-langid",
+ "uuid",
+ "validator",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.3"
@@ -5052,36 +5082,6 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
-[[package]]
-name = "universal_web"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "axum",
- "axum-extra",
- "bytes",
- "chrono",
- "dotenvy",
- "fluent-templates",
- "include_dir",
- "insta",
- "loco-rs",
- "migration",
- "regex",
- "rstest",
- "sea-orm",
- "serde",
- "serde_json",
- "serial_test",
- "time",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "unic-langid",
- "uuid",
- "validator",
-]
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"

Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
 
 [package]
-name = "universal_web"
+name = "gitara_web"
 version = "0.1.0"
 edition = "2021"
 publish = false
-default-run = "universal_web-cli"
+default-run = "gitara_web-cli"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -45,7 +45,7 @@ axum-extra = { version = "0.10", features = ["form"] }
 bytes = { version = "1" }
 
 [[bin]]
-name = "universal_web-cli"
+name = "gitara_web-cli"
 path = "src/bin/main.rs"
 required-features = []
 

Dockerfile

@@ -1,10 +1,11 @@
-FROM rust:1.87.0-slim-bookworm AS builder
+FROM rust:1-slim-bookworm AS builder
+
 
 WORKDIR /usr/src
 
 COPY . .
 
-RUN cargo build --release --bin universal_web-cli
+RUN cargo build --release --bin gitara_web-cli
 
 FROM debian:bookworm-slim
 
@@ -16,9 +17,9 @@ WORKDIR /usr/app
 
 COPY --from=builder /usr/src/assets assets
 COPY --from=builder /usr/src/config config
-COPY --from=builder /usr/src/target/release/universal_web-cli universal_web-cli
+COPY --from=builder /usr/src/target/release/gitara_web-cli gitara_web-cli
 
 ENV LOCO_ENV=production
 EXPOSE 5150
-ENTRYPOINT ["/usr/app/universal_web-cli"]
+ENTRYPOINT ["/usr/app/gitara_web-cli"]
 CMD ["start"]

assets/i18n/en-US/main.ftl

@@ -1,4 +1,4 @@
-brand = Universal Web
+brand = My guitar
 hello-world = Hello world!
 meta-description = A guitar player's personal site. News, blog posts, albums, and songs in one place.
 nav-home = Home

assets/i18n/en/main.ftl

@@ -1,4 +1,4 @@
-brand = Universal Web
+brand = My guitar
 hello-world = Hello world!
 meta-description = A guitar player's personal site. News, blog posts, albums, and songs in one place.
 nav-home = Home

assets/i18n/sk/main.ftl

@@ -1,4 +1,4 @@
-brand = Universal Web
+brand = Moja gitara
 hello-world = Ahoj svet!
 meta-description = Osobná stránka gitaristu. Novinky, blog, albumy a skladby na jednom mieste.
 nav-home = Domov

assets/static/css/theme.css

@@ -142,7 +142,7 @@ body {
 .t-green  { color: oklch(var(--su)); }
 .t-yellow { color: oklch(var(--wa)); }
 .t-red    { color: oklch(var(--er)); }
-.t-dim    { color: oklch(var(--bc) / 0.5); }
+.t-dim    { color: oklch(var(--bc) / 0.75); }
 
 /* --- window titlebar (the header) -------------------------- */
 .term-titlebar {
@@ -230,7 +230,7 @@ body {
   line-height: 1.15;
   color: oklch(var(--p));
 }
-.term-sub { margin-top: 0.2rem; font-size: 0.85rem; color: oklch(var(--bc) / 0.55); }
+.term-sub { margin-top: 0.2rem; font-size: 0.85rem; color: oklch(var(--bc) / 0.8); }
 .term-cmd-actions { display: flex; gap: 0.5rem; flex-wrap: wrap; }
 
 /* --- responsive card grid ---------------------------------- */

assets/static/favicon/site.webmanifest

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

assets/views/admin/base.html

@@ -4,6 +4,12 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{% block title %}{{ t(key="admin-title", lang=lang | default(value='sk')) }}{% endblock title %}</title>
+    <meta name="description" content="{% block meta_description %}{{ t(key="meta-description", lang=lang | default(value='sk')) }}{% endblock meta_description %}">
+    <link rel="icon" type="image/x-icon" href="/static/favicon/favicon.ico">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon/favicon-16x16.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/favicon/apple-touch-icon.png">
+    <link rel="manifest" href="/static/favicon/site.webmanifest">
     <script>
       function applyTheme(t) {
         var dark = t === 'dark'
@@ -39,7 +45,7 @@
     <link href="/static/css/app.css" rel="stylesheet" type="text/css">
     {% block head %}{% endblock head %}
     <link href="/static/css/theme.css" rel="stylesheet" type="text/css">
-    <script src="https://unpkg.com/htmx.org@1.9.12"></script>
+    <script src="/static/vendor/htmx/htmx-1.9.12.min.js"></script>
     <style>
       @media (min-width: 768px) {
         .nav-menu { flex-direction: row; }

assets/views/base.html

@@ -4,6 +4,12 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{% block title %}{{ t(key="brand", lang=lang | default(value='sk')) }}{% endblock title %}</title>
+    <meta name="description" content="{% block meta_description %}{{ t(key="meta-description", lang=lang | default(value='sk')) }}{% endblock meta_description %}">
+    <link rel="icon" type="image/x-icon" href="/static/favicon/favicon.ico">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon/favicon-16x16.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/favicon/apple-touch-icon.png">
+    <link rel="manifest" href="/static/favicon/site.webmanifest">
     <script>
       function applyTheme(t) {
         var dark = t === 'dark'
@@ -222,7 +228,7 @@
     </script>
     <link href="/static/css/app.css" rel="stylesheet" type="text/css">
     <link href="/static/css/theme.css" rel="stylesheet" type="text/css">
-    <script src="https://unpkg.com/htmx.org@1.9.12"></script>
+    <script src="/static/vendor/htmx/htmx-1.9.12.min.js"></script>
     <style>
       @media (min-width: 768px) {
         .nav-menu { flex-direction: row; }

config/development.yaml

@@ -71,7 +71,7 @@ mailer:
 # Database Configuration
 database:
   # Database connection URI
-  uri: {{ get_env(name="DATABASE_URL", default="postgres://uni_loco_web_user:3@localhost:5432/universal_web_development") }}
+  uri: {{ get_env(name="DATABASE_URL", default="postgres://uni_loco_web_user:3@localhost:5432/gitara_web_development") }}
   # When enabled, the sql query will be logged.
   enable_logging: false
   # Set the timeout duration when acquiring a connection.

config/test.yaml

@@ -68,7 +68,7 @@ mailer:
 # Database Configuration
 database:
   # Database connection URI
-  uri: {{ get_env(name="DATABASE_URL", default="postgres://uni_loco_web_user:3@localhost:5432/universal_web_test") }}
+  uri: {{ get_env(name="DATABASE_URL", default="postgres://uni_loco_web_user:3@localhost:5432/gitara_web_test") }}
   # When enabled, the sql query will be logged.
   enable_logging: false
   # Set the timeout duration when acquiring a connection.

docker-compose.prod.yml

@@ -1,28 +1,27 @@
 services:
   universal-web:
-    container_name: ${CONTAINER_NAME:?set CONTAINER_NAME}
+    container_name: gitara-web
     build:
       context: .
       dockerfile: Dockerfile
     env_file:
       - .env.production
     volumes:
-      - universal_web_uploads:/usr/app/data/uploads
+      - gitara_web_data:/usr/app/data
     networks:
-      - reverse-proxy
+      - gitara-net
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "curl -fsS http://localhost:$${PORT:-5150}/_ping"]
+      test: ["CMD-SHELL", "curl -fsS http://localhost:5150/_ping"]
       interval: 30s
       timeout: 5s
       retries: 3
       start_period: 20s
 
 networks:
-  reverse-proxy:
+  gitara-net:
     external: true
-    name: ${REVERSE_PROXY_NETWORK:?set REVERSE_PROXY_NETWORK}
 
 volumes:
-  universal_web_uploads:
-    name: ${UPLOADS_VOLUME_NAME:?set UPLOADS_VOLUME_NAME}
+  gitara_web_data:
+    name: gitara_web_data

examples/playground.rs

@@ -1,6 +1,6 @@
 #[allow(unused_imports)]
 use loco_rs::{cli::playground, prelude::*};
-use universal_web::app::App;
+use gitara_web::app::App;
 
 #[tokio::main]
 async fn main() -> loco_rs::Result<()> {

favicon/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"}

src/bin/main.rs

@@ -1,6 +1,6 @@
 use loco_rs::cli;
 use migration::Migrator;
-use universal_web::app::App;
+use gitara_web::app::App;
 
 #[tokio::main]
 async fn main() -> loco_rs::Result<()> {

tests/models/users.rs

@@ -3,7 +3,7 @@ use insta::assert_debug_snapshot;
 use loco_rs::testing::prelude::*;
 use sea_orm::{ActiveModelTrait, ActiveValue, IntoActiveModel};
 use serial_test::serial;
-use universal_web::{
+use gitara_web::{
     app::App,
     models::users::{self, Model, RegisterParams},
 };

tests/requests/auth.rs

@@ -2,7 +2,7 @@ use insta::{assert_debug_snapshot, with_settings};
 use loco_rs::testing::prelude::*;
 use rstest::rstest;
 use serial_test::serial;
-use universal_web::{app::App, models::users};
+use gitara_web::{app::App, models::users};
 
 use super::prepare_data;
 

tests/requests/prepare_data.rs

@@ -1,6 +1,6 @@
 use axum::http::{HeaderName, HeaderValue};
 use loco_rs::{app::AppContext, TestServer};
-use universal_web::{models::users, views::auth::LoginResponse};
+use gitara_web::{models::users, views::auth::LoginResponse};
 
 const USER_EMAIL: &str = "test@loco.com";
 const USER_PASSWORD: &str = "1234";