diff --git a/.env.example b/.env.example index 12a0d63..524f109 100644 --- a/.env.example +++ b/.env.example @@ -13,6 +13,7 @@ SITE_TITLE="Slavic Pulse" SITE_SHORT_NAME="Slavic Pulse" SITE_BASE_URL=https://slavic-pulse.com SITE_DESCRIPTION="Lokalne modele LLM, własny serwer AI (Proxmox, TrueNAS, Ubuntu), RAG, Ollama, Open WebUI, bezpieczny self-hosting i wdrożenia biznesowe lokalnej AI." +TWITTER_DESCRIPTION="Lokalne modele LLM, własny serwer AI (Proxmox, TrueNAS, Ubuntu), RAG, Ollama, Open WebUI, bezpieczny self-hosting i wdrożenia biznesowe lokalnej AI." SITE_OG_IMAGE_ALT="Slavic Pulse" THEME_COLOR=#000000 @@ -27,3 +28,5 @@ FAVICON_512=/assets/imgs/favico/512x512.png VIDEO_ID=kujXXtoHUbc # Adres docelowy po zakończeniu odtwarzania intro POST_VIDEO_REDIRECT_URL=https://www.youtube.com/watch?v=kujXXtoHUbc +# true = przekierowanie na POST_VIDEO_REDIRECT_URL; false = zostaje obraz tła i strona +POST_VIDEO_REDIRECT_ENABLED=true diff --git a/.gitignore b/.gitignore index ba6735d..f9292ee 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ *.env.local # Generated from .env at dev/build time -config.js index.html site.webmanifest diff --git a/dev.sh b/dev.sh index 12a0370..91e3115 100755 --- a/dev.sh +++ b/dev.sh @@ -39,7 +39,7 @@ case "${1:-up}" in ;; config) generate_from_env - echo "Wygenerowano index.html, site.webmanifest i config.js z .env." + echo "Wygenerowano index.html i site.webmanifest z .env." ;; reload-nginx) docker exec slavic-pulse-com-frontend nginx -s reload diff --git a/docker-compose-example/.env.example b/docker-compose-example/.env.example index 450ccce..8018195 100644 --- a/docker-compose-example/.env.example +++ b/docker-compose-example/.env.example @@ -10,6 +10,7 @@ SITE_TITLE="Slavic Pulse" SITE_SHORT_NAME="Slavic Pulse" SITE_BASE_URL=https://slavic-pulse.com SITE_DESCRIPTION="Lokalne modele LLM, własny serwer AI (Proxmox, TrueNAS, Ubuntu), RAG, Ollama, Open WebUI, bezpieczny self-hosting i wdrożenia biznesowe lokalnej AI." +TWITTER_DESCRIPTION="Lokalne modele LLM, własny serwer AI (Proxmox, TrueNAS, Ubuntu), RAG, Ollama, Open WebUI, bezpieczny self-hosting i wdrożenia biznesowe lokalnej AI." SITE_OG_IMAGE_ALT="Slavic Pulse" THEME_COLOR=#000000 @@ -22,3 +23,4 @@ FAVICON_512=/assets/imgs/favico/512x512.png # --- YouTube --- VIDEO_ID=kujXXtoHUbc POST_VIDEO_REDIRECT_URL=https://www.youtube.com/watch?v=kujXXtoHUbc +POST_VIDEO_REDIRECT_ENABLED=true diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3fa1a03..ad9779e 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -10,6 +10,5 @@ services: volumes: - ./index.html:/usr/share/nginx/html/index.html:ro - ./site.webmanifest:/usr/share/nginx/html/site.webmanifest:ro - - ./config.js:/usr/share/nginx/html/config.js:ro - ./assets:/usr/share/nginx/html/assets:ro - ./default.conf:/etc/nginx/conf.d/default.conf:ro diff --git a/generate-from-env.sh b/generate-from-env.sh index ffabe87..416c9f2 100755 --- a/generate-from-env.sh +++ b/generate-from-env.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Generuje index.html, site.webmanifest i config.js z zmiennych środowiskowych (.env). +# Generuje index.html i site.webmanifest z zmiennych środowiskowych (.env). set -eu SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)" @@ -19,6 +19,7 @@ SITE_TITLE="${SITE_TITLE:-Slavic Pulse}" SITE_SHORT_NAME="${SITE_SHORT_NAME:-Slavic Pulse}" SITE_BASE_URL="${SITE_BASE_URL:-https://slavic-pulse.com}" SITE_DESCRIPTION="${SITE_DESCRIPTION:-Lokalne modele LLM, własny serwer AI (Proxmox, TrueNAS, Ubuntu), RAG, Ollama, Open WebUI, bezpieczny self-hosting i wdrożenia biznesowe lokalnej AI.}" +TWITTER_DESCRIPTION="${TWITTER_DESCRIPTION:-$SITE_DESCRIPTION}" SITE_OG_IMAGE_ALT="${SITE_OG_IMAGE_ALT:-Slavic Pulse}" THEME_COLOR="${THEME_COLOR:-#000000}" @@ -29,27 +30,30 @@ FAVICON_512="${FAVICON_512:-/assets/imgs/favico/512x512.png}" VIDEO_ID="${VIDEO_ID:-kujXXtoHUbc}" POST_VIDEO_REDIRECT_URL="${POST_VIDEO_REDIRECT_URL:-https://www.youtube.com/watch?v=kujXXtoHUbc}" +POST_VIDEO_REDIRECT_ENABLED="${POST_VIDEO_REDIRECT_ENABLED:-true}" OG_IMAGE_URL="${SITE_BASE_URL}${BG_IMAGE}" -export SITE_TITLE SITE_SHORT_NAME SITE_BASE_URL SITE_DESCRIPTION SITE_OG_IMAGE_ALT -export THEME_COLOR BG_IMAGE FAVICON_48 FAVICON_180 FAVICON_512 OG_IMAGE_URL - -TEMPLATE_VARS='${SITE_TITLE} ${SITE_SHORT_NAME} ${SITE_BASE_URL} ${SITE_DESCRIPTION} ${SITE_OG_IMAGE_ALT} ${THEME_COLOR} ${BG_IMAGE} ${FAVICON_48} ${FAVICON_180} ${FAVICON_512} ${OG_IMAGE_URL}' - escape_js() { printf '%s' "$1" | sed "s/'/\\\\'/g" } +VIDEO_ID_JS="$(escape_js "$VIDEO_ID")" +POST_VIDEO_REDIRECT_URL_JS="$(escape_js "$POST_VIDEO_REDIRECT_URL")" +BG_IMAGE_JS="$(escape_js "$BG_IMAGE")" + +case "$(printf '%s' "$POST_VIDEO_REDIRECT_ENABLED" | tr '[:upper:]' '[:lower:]')" in + true|1|yes|on) POST_VIDEO_REDIRECT_ENABLED_JS=true ;; + *) POST_VIDEO_REDIRECT_ENABLED_JS=false ;; +esac + +export SITE_TITLE SITE_SHORT_NAME SITE_BASE_URL SITE_DESCRIPTION TWITTER_DESCRIPTION SITE_OG_IMAGE_ALT +export THEME_COLOR BG_IMAGE FAVICON_48 FAVICON_180 FAVICON_512 OG_IMAGE_URL +export VIDEO_ID_JS POST_VIDEO_REDIRECT_URL_JS BG_IMAGE_JS POST_VIDEO_REDIRECT_ENABLED_JS + +TEMPLATE_VARS='${SITE_TITLE} ${SITE_SHORT_NAME} ${SITE_BASE_URL} ${SITE_DESCRIPTION} ${TWITTER_DESCRIPTION} ${SITE_OG_IMAGE_ALT} ${THEME_COLOR} ${BG_IMAGE} ${FAVICON_48} ${FAVICON_180} ${FAVICON_512} ${OG_IMAGE_URL} ${VIDEO_ID_JS} ${POST_VIDEO_REDIRECT_URL_JS} ${BG_IMAGE_JS} ${POST_VIDEO_REDIRECT_ENABLED_JS}' + mkdir -p "$OUTPUT_DIR" envsubst "$TEMPLATE_VARS" < "$TEMPLATE_DIR/index.html.template" > "$OUTPUT_DIR/index.html" envsubst "$TEMPLATE_VARS" < "$TEMPLATE_DIR/site.webmanifest.template" > "$OUTPUT_DIR/site.webmanifest" - -cat > "$OUTPUT_DIR/config.js" < - + @@ -153,12 +153,11 @@ -