diff --git a/src/content.config.ts b/src/content.config.ts index 54af0ca..044fe0d 100644 --- a/src/content.config.ts +++ b/src/content.config.ts @@ -24,6 +24,7 @@ export const heroSchema = (image: ImageFunction) => export const coaches = defineCollection({ schema: ({ image }) => z.object({ + order: z.number().optional(), name: z.string(), description: z.string().optional(), cover: image(), diff --git a/src/content/coaches/anna.md b/src/content/coaches/anna-dmitrienko.md similarity index 91% rename from src/content/coaches/anna.md rename to src/content/coaches/anna-dmitrienko.md index 3f27e40..62384b9 100644 --- a/src/content/coaches/anna.md +++ b/src/content/coaches/anna-dmitrienko.md @@ -1,11 +1,12 @@ --- -cover: './assets/anna-cover.jpeg' -coverAlt: 'anna' -name: 'Анна' +order: 2 +cover: './assets/anna-dmitrienko-cover.jpeg' +coverAlt: 'anna-dmitrienko-cover' +name: 'Анна Дмитриенко' description: 'Спортсмен и тренер. Опыт работы в фитнес индустрии более 10 лет' gallery: - - './assets/anna-slide-1.jpeg' - - './assets/anna-slide-2.jpeg' + - './assets/anna-dmitrienko-slide-1.jpeg' + - './assets/anna-dmitrienko-slide-2.jpeg' socialMediaLinks: - icon: 'instagram' href: 'https://www.instagram.com/dmitrienko_a_fit_4you?igsh=MXBpZTVlNHkxOWl6dA==' diff --git a/src/content/coaches/anna-suleimanova.md b/src/content/coaches/anna-suleimanova.md index 6866cee..0655e63 100644 --- a/src/content/coaches/anna-suleimanova.md +++ b/src/content/coaches/anna-suleimanova.md @@ -1,6 +1,7 @@ --- +order: 1 cover: './assets/anna-suleimanova-cover.jpeg' -coverAlt: 'anna-suleimanova' +coverAlt: 'anna-suleimanova-cover' name: 'Александра Сулейманова' description: 'Спортсмен и тренер. Опыт работы в фитнес индустрии 9 лет' gallery: diff --git a/src/content/coaches/assets/anna-cover.jpeg b/src/content/coaches/assets/anna-dmitrienko-cover.jpeg similarity index 100% rename from src/content/coaches/assets/anna-cover.jpeg rename to src/content/coaches/assets/anna-dmitrienko-cover.jpeg diff --git a/src/content/coaches/assets/anna-slide-1.jpeg b/src/content/coaches/assets/anna-dmitrienko-slide-1.jpeg similarity index 100% rename from src/content/coaches/assets/anna-slide-1.jpeg rename to src/content/coaches/assets/anna-dmitrienko-slide-1.jpeg diff --git a/src/content/coaches/assets/anna-slide-2.jpeg b/src/content/coaches/assets/anna-dmitrienko-slide-2.jpeg similarity index 100% rename from src/content/coaches/assets/anna-slide-2.jpeg rename to src/content/coaches/assets/anna-dmitrienko-slide-2.jpeg diff --git a/src/content/coaches/assets/batyr-slide-1.JPG b/src/content/coaches/assets/batyr-slide-1.JPG index 6fcaa3d..970808d 100644 Binary files a/src/content/coaches/assets/batyr-slide-1.JPG and b/src/content/coaches/assets/batyr-slide-1.JPG differ diff --git a/src/content/coaches/assets/batyr-slide-2.JPG b/src/content/coaches/assets/batyr-slide-2.JPG new file mode 100644 index 0000000..ef70714 Binary files /dev/null and b/src/content/coaches/assets/batyr-slide-2.JPG differ diff --git a/src/content/coaches/assets/batyr-slide-3.JPG b/src/content/coaches/assets/batyr-slide-3.JPG new file mode 100644 index 0000000..c0139ab Binary files /dev/null and b/src/content/coaches/assets/batyr-slide-3.JPG differ diff --git a/src/content/coaches/assets/batyr-slide-4.JPG b/src/content/coaches/assets/batyr-slide-4.JPG new file mode 100644 index 0000000..44d6267 Binary files /dev/null and b/src/content/coaches/assets/batyr-slide-4.JPG differ diff --git a/src/content/coaches/assets/batyr-slide-5.JPG b/src/content/coaches/assets/batyr-slide-5.JPG new file mode 100644 index 0000000..f0114d9 Binary files /dev/null and b/src/content/coaches/assets/batyr-slide-5.JPG differ diff --git a/src/content/coaches/batyr-suleimanov.md b/src/content/coaches/batyr-suleimanov.md index 82e4ed2..909ed5f 100644 --- a/src/content/coaches/batyr-suleimanov.md +++ b/src/content/coaches/batyr-suleimanov.md @@ -1,10 +1,15 @@ --- +order: 0, cover: './assets/batyr-cover.jpeg' -coverAlt: 'batyr-suleimanov' +coverAlt: 'batyr-suleimanov-cover' name: 'Батыр Сулейманов' description: 'Профессиональный выступающий спортсмен и тренер. Опыт работы в фитнес индустрии более 12 лет' gallery: - './assets/batyr-slide-1.JPG' + - './assets/batyr-slide-2.JPG' + - './assets/batyr-slide-3.JPG' + - './assets/batyr-slide-4.JPG' + - './assets/batyr-slide-5.JPG' socialMediaLinks: - icon: 'instagram' href: 'https://www.instagram.com/therealbatyr?igsh=MXZkMHdsMDgxM3c4bA%3D%3D&utm_source=qr' diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index c15fca7..30e92d9 100644 --- a/src/layouts/BaseLayout.astro +++ b/src/layouts/BaseLayout.astro @@ -2,19 +2,21 @@ import { useTranslations } from '@/i18n/utils' import { cn } from '@/libs/cn' import '@/styles/global.css' +import type { TransitionAnimationValue } from 'astro' import { ClientRouter, slide } from 'astro:transitions' type Props = { title: string bodyClass?: string + transition?: TransitionAnimationValue } -const { title, bodyClass } = Astro.props +const { title, bodyClass, transition } = Astro.props const t = useTranslations(Astro.currentLocale) --- - + diff --git a/src/pages/coaches/[...slug].astro b/src/pages/coaches/[...slug].astro index ac7c11a..8514e5c 100644 --- a/src/pages/coaches/[...slug].astro +++ b/src/pages/coaches/[...slug].astro @@ -8,7 +8,7 @@ import Header from '@/components/header/Header.astro' import './styles.css' import { SocialMediaIcon } from '@/components/SocialMediaIcon' import { useTranslations } from '@/i18n/utils' -import {slide, ViewTransitions} from 'astro:transitions' +import { slide, ViewTransitions } from 'astro:transitions' export const getStaticPaths = async () => { const coaches = await getCollection('coaches') @@ -32,7 +32,7 @@ const [thumbs, optimizedGallery] = galleryWithCover : [undefined, undefined] --- - +
{ optimizedGallery && ( @@ -46,7 +46,7 @@ const [thumbs, optimizedGallery] = galleryWithCover imageClassName="aspect-3/4 w-[400px] lg:w-auto object-top mx-auto h-auto" />
-

{data.name}

+

{data.name}

{data.description && {data.description}} {data.socialMediaLinks && ( diff --git a/src/pages/index.astro b/src/pages/index.astro index 1f87e27..56bafc2 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -20,7 +20,12 @@ import { Coaches } from '@/components/coaches/Coaches' type Props = CollectionEntry<'pages'>['data'] const { lang } = Astro.params -const [page, coaches] = await Promise.all([getEntry('pages', 'main'), getCollection('coaches')]) +const [page, coaches] = await Promise.all([ + getEntry('pages', 'main'), + getCollection('coaches').then((coaches) => + coaches.sort((a, b) => (a.data.order ?? -1) - (b.data.order ?? -1)) + ), +]) const { slider, services, hero, marquee, reviews, footer } = page?.data || {} const optimizedSlider = slider ? await optimizeSliderImages(slider.map(({ image, imageAlt }) => ({ src: image, alt: imageAlt })))