From f28ccf833c4c5866b22d10b0d82872eacfd7265a Mon Sep 17 00:00:00 2001
From: MrNaif2018 <chuff184@gmail.com>
Date: Tue, 19 Mar 2024 01:17:51 +0300
Subject: [PATCH] Add BITCART_STORE_HOST to admin

---
 .gitignore                            |  1 +
 .pre-commit-config.yaml               | 18 ++++++++++--------
 generator/docker-components/admin.yml |  2 ++
 generator/rules/03_root_path.py       |  1 +
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4679221..c129b01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ htmlcov/
 venv/
 compose/plugins/*
 !compose/plugins/.gitkeep
+.prettiercache
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 76b6ee7..1c5ac73 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-merge-conflict
   - repo: https://github.com/asottile/yesqa
@@ -8,24 +8,24 @@ repos:
     hooks:
       - id: yesqa
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 24.3.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
-        args: ["--py38-plus"]
+        args: ["--py39-plus"]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -45,9 +45,11 @@ repos:
         args: ["--remove"]
       - id: detect-private-key
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.1
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
+        require_serial: true
+        args: ["--cache-location=.prettiercache"]
   - repo: local
     hooks:
       - id: docker-shell-shfmt
diff --git a/generator/docker-components/admin.yml b/generator/docker-components/admin.yml
index 8162547..1a80384 100644
--- a/generator/docker-components/admin.yml
+++ b/generator/docker-components/admin.yml
@@ -15,3 +15,5 @@ services:
       LETSENCRYPT_HOST: ${BITCART_ADMIN_HOST}
       LETSENCRYPT_EMAIL: ${BITCART_LETSENCRYPT_EMAIL}
       BITCART_ADMIN_ROOTPATH: ${BITCART_ADMIN_ROOTPATH:-/}
+      BITCART_STORE_HOST: ${BITCART_STORE_HOST}
+      BITCART_STORE_ROOTPATH: ${BITCART_STORE_ROOTPATH:-/}
diff --git a/generator/rules/03_root_path.py b/generator/rules/03_root_path.py
index 83ddbae..0af4be1 100644
--- a/generator/rules/03_root_path.py
+++ b/generator/rules/03_root_path.py
@@ -18,6 +18,7 @@ def rule(services, settings):
             with modify_key(services, "admin", "environment") as environment:
                 environment["BITCART_ADMIN_ROOTPATH"] = environment["BITCART_ADMIN_ROOTPATH"].replace("/", "/admin")
                 environment["BITCART_ADMIN_API_URL"] = API_URL
+                environment["BITCART_STORE_HOST"] = settings.HOST or ""
             with modify_key(services, "store", "environment") as environment:
                 environment["BITCART_ADMIN_HOST"] = urljoin(settings.HOST or "", "admin")
                 environment["BITCART_ADMIN_ROOTPATH"] = environment["BITCART_ADMIN_ROOTPATH"].replace("/", "/admin")