From ab1335e692b2dcbfbd374ad91ea1abf631507455 Mon Sep 17 00:00:00 2001 From: Web-serfer Date: Wed, 1 Apr 2026 18:52:55 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .nvmrc | 1 + frontend/astro.config.mjs | 9 +++++++++ frontend/src/constants.ts | 1 + frontend/src/layouts/Layout.astro | 12 +++++++++++- frontend/src/pages/index.astro | 7 ++++++- frontend/tsconfig.json | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 .nvmrc create mode 100644 frontend/src/constants.ts diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..8fdd954 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +22 \ No newline at end of file diff --git a/frontend/astro.config.mjs b/frontend/astro.config.mjs index 15e67b3..a82f224 100644 --- a/frontend/astro.config.mjs +++ b/frontend/astro.config.mjs @@ -6,5 +6,14 @@ import tailwindcss from '@tailwindcss/vite'; export default defineConfig({ vite: { plugins: [tailwindcss()], + resolve: { + alias: { + '@': './src', + '@constants': './src/constants', + '@components': './src/components', + '@layouts': './src/layouts', + '@styles': './src/styles', + } + } } }); \ No newline at end of file diff --git a/frontend/src/constants.ts b/frontend/src/constants.ts new file mode 100644 index 0000000..1425fe4 --- /dev/null +++ b/frontend/src/constants.ts @@ -0,0 +1 @@ +export const SITE_URL = 'https://avtourist-surgut.ru/'; diff --git a/frontend/src/layouts/Layout.astro b/frontend/src/layouts/Layout.astro index 58d25fd..ff9240c 100644 --- a/frontend/src/layouts/Layout.astro +++ b/frontend/src/layouts/Layout.astro @@ -4,6 +4,14 @@ import '@styles/global.css'; import Header from "@components/layout/header/Header.astro"; import Footer from "@components/layout/footer/Footer.astro"; import ConsultationModal from "@components/base/ConsultationModal.astro"; + +interface Props { + title: string; + description: string; + canonicalLink?: string; +} + +const { title, description, canonicalLink } = Astro.props; --- @@ -13,9 +21,11 @@ import ConsultationModal from "@components/base/ConsultationModal.astro"; + {title} + + {canonicalLink && } - Автоюрист в Сургуте
diff --git a/frontend/src/pages/index.astro b/frontend/src/pages/index.astro index 327a345..b4d9a0e 100644 --- a/frontend/src/pages/index.astro +++ b/frontend/src/pages/index.astro @@ -1,11 +1,16 @@ --- import Layout from '@layouts/Layout.astro'; +import { SITE_URL } from '@constants'; import Hero from '@components/home/Hero.astro'; import Services from "@components/home/Services.astro"; import WhyUs from "@components/home/WhyUs.astro"; --- - + diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 6e4e024..ca64096 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -7,6 +7,7 @@ "paths": { "@styles/*": ["src/styles/*"], "@components/*": ["src/components/*"], + "@constants/*": ["src/constants/*"], "@layouts/*": ["src/layouts/*"], "@assets/*": ["src/assets/*"], "@pages/*": ["src/pages/*"]