From 8af8c416f5934c908242dcbcef002f62639bd5ea Mon Sep 17 00:00:00 2001 From: koziavin Date: Wed, 11 Jun 2025 21:37:07 +0400 Subject: [PATCH] fix commit --- .gitea/workflows/deploy.yml | 10 +++++----- deploy-api.sh | 8 ++++---- src/style.css | 20 +++++++++++++++++++- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7c15257..300810b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -25,10 +25,10 @@ jobs: env: GITEA_API: "https://gitea.miduway.space/api/v1/repos/levis/ebook/raw/main" GITEA_TOKEN: "0406afe7de6547e850dd62c84976c6def23a5193" - SERVER_API: "https://ebook.miduway.space/" # API вашего сервера для деплоя + SERVER_API: "https://ebook.miduway.space/" run: | - # Устанавливаем зависимости - sudo apt-get update && sudo apt-get install -y curl + # Устанавливаем зависимости без sudo + apt-get update && apt-get install -y curl # Загружаем конфигурационные файлы for file in docker-compose.yml nginx.conf ebook.conf; do @@ -39,9 +39,9 @@ jobs: "$GITEA_API/$file" done - # Выполняем деплой на сервер + # Выполняем деплой на сервер с игнорированием SSL echo "Deploying to server..." - curl -X POST \ + curl -k -X POST \ -H "Authorization: token $GITEA_TOKEN" \ -H "Content-Type: application/json" \ -d '{ diff --git a/deploy-api.sh b/deploy-api.sh index 04297e7..b340677 100644 --- a/deploy-api.sh +++ b/deploy-api.sh @@ -1,7 +1,7 @@ #!/bin/bash # Директория для деплоя -DEPLOY_DIR="/path/to/your/app" +DEPLOY_DIR="/miduway/www/ebook.miduway.space" GITEA_URL="https://gitea.miduway.space" GITEA_TOKEN="0406afe7de6547e850dd62c84976c6def23a5193" @@ -10,15 +10,15 @@ TEMP_DIR=$(mktemp -d) cd $TEMP_DIR # Получаем файлы из репозитория -curl -H "Authorization: token $GITEA_TOKEN" \ +curl -k -H "Authorization: token $GITEA_TOKEN" \ -o docker-compose.yml \ "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/docker-compose.yml" -curl -H "Authorization: token $GITEA_TOKEN" \ +curl -k -H "Authorization: token $GITEA_TOKEN" \ -o nginx.conf \ "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/nginx.conf" -curl -H "Authorization: token $GITEA_TOKEN" \ +curl -k -H "Authorization: token $GITEA_TOKEN" \ -o ebook.conf \ "$GITEA_URL/api/v1/repos/levis/ebook/raw/main/ebook.conf" diff --git a/src/style.css b/src/style.css index f1d8c73..4bd5189 100644 --- a/src/style.css +++ b/src/style.css @@ -1 +1,19 @@ -@import "tailwindcss"; +@import 'tailwindcss'; + +@theme { + --color-primary: #ffffff; + --color-secondary: #f54b7e; + --color-three: #e20c66; + + --color-accent-50: #f54378; + --color-accent-100: #e51e7d; + --color-accent-150: #c4035f; + + /*system colors*/ + --color-error: oklch(57.7% 0.245 27.325); + --color-warning: oklch(76.9% 0.188 70.08); + + /*disabled*/ + --color-text-disabled: oklch(55.1% 0.027 264.364); + --color-bg-disabled: oklch(92.8% 0.006 264.531); +}