diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 00077a5..643d8ab 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -33,11 +33,6 @@ jobs: echo "YCLIENTS_API_URL=${{ vars.YCLIENTS_API_URL }}" >>.env echo "YCLIENTS_TOKEN=${{ vars.YCLIENTS_TOKEN }}" >>.env - - name: Debug - Print .env file - run: | - echo "Contents of .env file:" - cat .env - - name: Log in to Docker registry uses: docker/login-action@v3 with: diff --git a/src/components/Drawer.tsx b/src/components/Drawer.tsx index 7d6e12f..8a87043 100644 --- a/src/components/Drawer.tsx +++ b/src/components/Drawer.tsx @@ -42,7 +42,7 @@ const Drawer: React.FC = ({ isOpen, onClose, loading = false, child
= ({ isOpen, onClose, loading = false, child > -
+
{loading ? (
diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 89731b6..9bc9dbd 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -27,6 +27,9 @@ const t = useTranslations(lang) © {new Date().getFullYear()} {t('footer.copyright')}

+

+ Сделано Mibu +

{ socialMediaLinks && (
diff --git a/src/components/services/CharachteristicCard.tsx b/src/components/services/CharachteristicCard.tsx index f555201..1734150 100644 --- a/src/components/services/CharachteristicCard.tsx +++ b/src/components/services/CharachteristicCard.tsx @@ -19,7 +19,7 @@ export const CharachteristicCard: React.FC = ({ title, description, price
{price && ( )} diff --git a/src/libs/api/yclients.ts b/src/libs/api/yclients.ts index 05cc972..199fc00 100644 --- a/src/libs/api/yclients.ts +++ b/src/libs/api/yclients.ts @@ -8,6 +8,7 @@ import { } from 'astro:env/server' type HTML = string +const currencyFormatter = Intl.NumberFormat('ru', { currency: 'rub' }) export type YclientsBookinRawResponse = { category: { @@ -69,7 +70,7 @@ export const yclientsClient = { res.data.loyalty_abonement_types.map((rawItem) => ({ title: rawItem.online_sale_title, description: rawItem.online_sale_description, - price: `${rawItem.online_sale_price} ₽`, + price: `${currencyFormatter.format(rawItem.online_sale_price)} ₽`, link: { title: 'Купить абонемент', href: `https://o9998.yclients.com/subscriptions/${rawItem.id}`, @@ -91,7 +92,7 @@ export const yclientsClient = { .filter((service) => service.category_id === 18760529) .map((service) => ({ title: service.title, - price: `${service.price_min} ₽`, + price: `${currencyFormatter.format(service.price_min)} ₽`, description: service.comment, link: { title: 'Записаться', diff --git a/src/styles/global.css b/src/styles/global.css index 23a88c0..997a7a1 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -76,7 +76,7 @@ @apply rounded-full border border-brand bg-transparent px-6 py-3 text-center text-white transition-colors duration-300 hover:bg-brand; } .tag-btn { - @apply hover:tag-btn-active rounded-full bg-light p-2 text-sm transition-colors duration-300; + @apply hover:tag-btn-active rounded-full bg-light px-4 py-2 text-sm transition-colors duration-300; } .tag-btn-active { @apply bg-brand text-white;