small improvements
This commit is contained in:
@@ -33,11 +33,6 @@ jobs:
|
|||||||
echo "YCLIENTS_API_URL=${{ vars.YCLIENTS_API_URL }}" >>.env
|
echo "YCLIENTS_API_URL=${{ vars.YCLIENTS_API_URL }}" >>.env
|
||||||
echo "YCLIENTS_TOKEN=${{ vars.YCLIENTS_TOKEN }}" >>.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
|
- name: Log in to Docker registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ const Drawer: React.FC<DrawerProps> = ({ isOpen, onClose, loading = false, child
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
'fixed bottom-0 left-0 right-0 w-full md:bottom-0 md:left-auto md:top-0 h-full md:w-[600px] md:rounded-t-none',
|
'fixed bottom-0 left-0 right-0 h-full w-full md:bottom-0 md:left-auto md:top-0 md:w-[600px] md:rounded-t-none',
|
||||||
'transition-transform duration-300 ease-out md:translate-x-full md:translate-y-0',
|
'transition-transform duration-300 ease-out md:translate-x-full md:translate-y-0',
|
||||||
'flex flex-col gap-4 md:flex-row',
|
'flex flex-col gap-4 md:flex-row',
|
||||||
isOpen ? 'translate-y-0 md:translate-x-0' : 'translate-y-full md:translate-x-full'
|
isOpen ? 'translate-y-0 md:translate-x-0' : 'translate-y-full md:translate-x-full'
|
||||||
@@ -51,7 +51,7 @@ const Drawer: React.FC<DrawerProps> = ({ isOpen, onClose, loading = false, child
|
|||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
className="ml-2 self-start rounded-full bg-light p-3 focus:outline-none md:ml-0 mt-2"
|
className="ml-2 mt-2 self-start rounded-full bg-light p-3 focus:outline-none md:ml-0"
|
||||||
aria-label="Close drawer"
|
aria-label="Close drawer"
|
||||||
>
|
>
|
||||||
<svg className="h-6 w-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg className="h-6 w-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
@@ -64,7 +64,13 @@ const Drawer: React.FC<DrawerProps> = ({ isOpen, onClose, loading = false, child
|
|||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div className="h-full w-full overflow-hidden rounded-t-3xl bg-light shadow-2xl md:rounded-none">
|
<div
|
||||||
|
className={cn(
|
||||||
|
'h-full w-full overflow-hidden rounded-t-3xl bg-light md:rounded-none',
|
||||||
|
'md:transition-shadow md:duration-500 md:ease-out',
|
||||||
|
isOpen ? 'md:shadow-[0_0_80px_rgba(198,15,211,0.4)]' : 'md:shadow-none'
|
||||||
|
)}
|
||||||
|
>
|
||||||
{loading ? (
|
{loading ? (
|
||||||
<div className="flex h-full w-full items-center justify-center">
|
<div className="flex h-full w-full items-center justify-center">
|
||||||
<Spinner />
|
<Spinner />
|
||||||
|
|||||||
@@ -27,6 +27,9 @@ const t = useTranslations(lang)
|
|||||||
© {new Date().getFullYear()}
|
© {new Date().getFullYear()}
|
||||||
{t('footer.copyright')}
|
{t('footer.copyright')}
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
Сделано <a href="https://telegram.me/killua_senpai" target="_blank" class="underline">Mibu</a>
|
||||||
|
</p>
|
||||||
{
|
{
|
||||||
socialMediaLinks && (
|
socialMediaLinks && (
|
||||||
<div class="flex gap-4 text-white">
|
<div class="flex gap-4 text-white">
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export const CharachteristicCard: React.FC<Props> = ({ title, description, price
|
|||||||
<div className="flex flex-col gap-4">
|
<div className="flex flex-col gap-4">
|
||||||
{price && (
|
{price && (
|
||||||
<span
|
<span
|
||||||
className="text-nowrap text-4xl font-bold text-brand"
|
className="text-nowrap text-4xl font-bold text-white"
|
||||||
dangerouslySetInnerHTML={{ __html: price }}
|
dangerouslySetInnerHTML={{ __html: price }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
} from 'astro:env/server'
|
} from 'astro:env/server'
|
||||||
|
|
||||||
type HTML = string
|
type HTML = string
|
||||||
|
const currencyFormatter = Intl.NumberFormat('ru', { currency: 'rub' })
|
||||||
|
|
||||||
export type YclientsBookinRawResponse = {
|
export type YclientsBookinRawResponse = {
|
||||||
category: {
|
category: {
|
||||||
@@ -69,7 +70,7 @@ export const yclientsClient = {
|
|||||||
res.data.loyalty_abonement_types.map((rawItem) => ({
|
res.data.loyalty_abonement_types.map((rawItem) => ({
|
||||||
title: rawItem.online_sale_title,
|
title: rawItem.online_sale_title,
|
||||||
description: rawItem.online_sale_description,
|
description: rawItem.online_sale_description,
|
||||||
price: `${rawItem.online_sale_price} ₽`,
|
price: `${currencyFormatter.format(rawItem.online_sale_price)} ₽`,
|
||||||
link: {
|
link: {
|
||||||
title: 'Купить абонемент',
|
title: 'Купить абонемент',
|
||||||
href: `https://o9998.yclients.com/subscriptions/${rawItem.id}`,
|
href: `https://o9998.yclients.com/subscriptions/${rawItem.id}`,
|
||||||
@@ -91,7 +92,7 @@ export const yclientsClient = {
|
|||||||
.filter((service) => service.category_id === 18760529)
|
.filter((service) => service.category_id === 18760529)
|
||||||
.map((service) => ({
|
.map((service) => ({
|
||||||
title: service.title,
|
title: service.title,
|
||||||
price: `${service.price_min} ₽`,
|
price: `${currencyFormatter.format(service.price_min)} ₽`,
|
||||||
description: service.comment,
|
description: service.comment,
|
||||||
link: {
|
link: {
|
||||||
title: 'Записаться',
|
title: 'Записаться',
|
||||||
|
|||||||
@@ -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;
|
@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 {
|
.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 {
|
.tag-btn-active {
|
||||||
@apply bg-brand text-white;
|
@apply bg-brand text-white;
|
||||||
|
|||||||
Reference in New Issue
Block a user