diff --git a/.env b/.env new file mode 100644 index 0000000..6ef9630 --- /dev/null +++ b/.env @@ -0,0 +1,11 @@ + +DATABASE_URL=postgresql+asyncpg://print3d:P3D_PASSWORD@31.59.58.220:5432/print3d +ANTHROPIC_API_KEY= +TELEGRAM_BOT_TOKEN=8730332716:AAFOZeGhWL99-3_s11cWo2GrpeUAMb6Qkw0 +TELEGRAM_CHAT_ID=-5185688679 +GOOGLE_API_KEY=AIzaSyAHzDYhgjOqZZnvOnOFRGaSkKu4OAN3kZE +MINIO_ENDPOINT=31.59.58.220:9000 +MINIO_ACCESS_KEY=admin +MINIO_SECRET_KEY=SuperSecretPassword123! +MINIO_BUCKET=filam3d +MINIO_SECURE=false \ No newline at end of file diff --git a/deploy-back.sh b/deploy-back.sh new file mode 100644 index 0000000..28b2971 --- /dev/null +++ b/deploy-back.sh @@ -0,0 +1,6 @@ + +ssh root@31.59.58.220 " + cd /root/filam3d && + git pull && + docker compose up -d --build +" \ No newline at end of file diff --git a/deploy-front.sh b/deploy-front.sh new file mode 100644 index 0000000..61fa69c --- /dev/null +++ b/deploy-front.sh @@ -0,0 +1,8 @@ + ssh root@31.59.58.220 " + cd /root/filam3d && + git pull && + cd frontend && + npm install && + npm run build && + cp -r dist/* /var/www/bambustore.ru/ + " \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8eab17c..e5822a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: build: ./backend network_mode: host environment: - DATABASE_URL: ${DATABASE_URL:-postgresql+asyncpg://print3d:print3d_secret@localhost:5432/print3d} + DATABASE_URL: ${DATABASE_URL:-postgresql+asyncpg://print3d:P3D_PASSWORD@localhost:5432/print3d} GOOGLE_API_KEY: ${GOOGLE_API_KEY:-} TELEGRAM_BOT_TOKEN: ${TELEGRAM_BOT_TOKEN:-} TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID:-} diff --git a/frontend/src/components/PriceResult.vue b/frontend/src/components/PriceResult.vue index a9b9051..d660b04 100644 --- a/frontend/src/components/PriceResult.vue +++ b/frontend/src/components/PriceResult.vue @@ -51,7 +51,7 @@
Итого
Срок: ~{{ result.calculation.estimated_days }} рабочих дней
-{{ fmt(result.calculation.total_rub) }} ₽
+~{{ fmt(result.calculation.total_rub) }} ₽
diff --git a/frontend/src/components/SiteFooter.vue b/frontend/src/components/SiteFooter.vue index 5e7873b..9badf86 100644 --- a/frontend/src/components/SiteFooter.vue +++ b/frontend/src/components/SiteFooter.vue @@ -42,13 +42,13 @@