diff --git a/src/app/(main)/blog/[articleId]/layout.tsx b/src/app/(main)/blog/[articleId]/layout.tsx index 0ba204b4..99d3a574 100644 --- a/src/app/(main)/blog/[articleId]/layout.tsx +++ b/src/app/(main)/blog/[articleId]/layout.tsx @@ -1,6 +1,11 @@ +'use client'; + import dynamic from 'next/dynamic'; +import { usePathname } from 'next/navigation'; export default function Layout({ children }: { children: React.ReactNode }) { + const pathname = usePathname(); + const DynamicRelevantSlider = dynamic( () => import('@/components/pages/BlogPage/RelevantSlider').then( @@ -12,7 +17,7 @@ export default function Layout({ children }: { children: React.ReactNode }) { return (
{children} - + {!pathname.endsWith('edit') && }
); } diff --git a/src/app/(main)/blog/page.tsx b/src/app/(main)/blog/page.tsx index b7b9be18..40ca4a7b 100644 --- a/src/app/(main)/blog/page.tsx +++ b/src/app/(main)/blog/page.tsx @@ -44,7 +44,7 @@ export default function BlogPage() { input: { blocks: '[]', cardImage: '', - createdAt: new Date().toISOString().split('T')[0], + createdAt: new Date().toISOString(), description: '', posterImage: '', tags: [], diff --git a/src/app/(main)/projects/page.tsx b/src/app/(main)/projects/page.tsx index 4028283d..ce0e6e0e 100644 --- a/src/app/(main)/projects/page.tsx +++ b/src/app/(main)/projects/page.tsx @@ -34,32 +34,34 @@ export default function ProjectsPage() { }); return ( -
-
- Проекты - {data?.checkAuth.__typename === 'CheckAuthResponse' && - data.checkAuth.isAuth && ( - - )} -
-
- - +
+
+
+ Проекты + {data?.checkAuth.__typename === 'CheckAuthResponse' && + data.checkAuth.isAuth && ( + + )} +
+
+ + +
diff --git a/src/app/globals.css b/src/app/globals.css index 0c8c75f2..a92c950b 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -125,7 +125,7 @@ body { } .s-text { - @apply text-base; + @apply text-base leading-[17.5px]; } .l-caption { diff --git a/src/components/Layout/Feedback.tsx b/src/components/Layout/Feedback.tsx index f95c2eb4..6de889fe 100644 --- a/src/components/Layout/Feedback.tsx +++ b/src/components/Layout/Feedback.tsx @@ -17,7 +17,7 @@ export function Feedback() { return (

Хотите увеличить конверсию?
@@ -26,14 +26,14 @@ export function Feedback() {
-

Свяжитесь с нами

+

Свяжитесь с нами

-
+
RU
@@ -34,7 +34,7 @@ export function Footer() {

-
+
UAE
diff --git a/src/components/Layout/ModalContainer.tsx b/src/components/Layout/ModalContainer.tsx index 9b7baf07..9d10b39a 100644 --- a/src/components/Layout/ModalContainer.tsx +++ b/src/components/Layout/ModalContainer.tsx @@ -23,7 +23,7 @@ export function ModalContainer() { (name === 'video' || name === 'form' ? ' bg-black bg-opacity-90 [backdrop-filter:blur(10px);]' : '') + - (name === 'menu' ? ' lg:top-16 top-14' : ' top-0') + (name === 'menu' ? ' lg:top-16 top-12' : ' top-0') } > {modal} diff --git a/src/components/Layout/SelectPhoneCode.tsx b/src/components/Layout/SelectPhoneCode.tsx index f9a17f1f..f0990432 100644 --- a/src/components/Layout/SelectPhoneCode.tsx +++ b/src/components/Layout/SelectPhoneCode.tsx @@ -40,7 +40,7 @@ export function SelectPhoneCode({ className="!relative w-4 sm:w-6" alt={currentCountry} /> -

{currentPhoneCode}

+

{currentPhoneCode}

: } @@ -70,7 +70,7 @@ export function SelectPhoneCode({ width={16} height={8} /> -

{phoneCode}

+

{phoneCode}

))}
diff --git a/src/components/modals/MenuModal.tsx b/src/components/modals/MenuModal.tsx index ab724f3d..59bd32c8 100644 --- a/src/components/modals/MenuModal.tsx +++ b/src/components/modals/MenuModal.tsx @@ -82,7 +82,7 @@ export function MenuModal() { - в аквапарке реально... + в аквапарке реально офигенно
diff --git a/src/components/modals/ModalWithForm.tsx b/src/components/modals/ModalWithForm.tsx index 3c32e55d..54378f20 100644 --- a/src/components/modals/ModalWithForm.tsx +++ b/src/components/modals/ModalWithForm.tsx @@ -104,10 +104,9 @@ export function ModalWithForm() {

-
diff --git a/src/components/pages/BlogPage/ArticleCard.tsx b/src/components/pages/BlogPage/ArticleCard.tsx index c2bc3444..3fbc6ae4 100644 --- a/src/components/pages/BlogPage/ArticleCard.tsx +++ b/src/components/pages/BlogPage/ArticleCard.tsx @@ -17,7 +17,7 @@ export function ArticleCard({ }: IArticle & { draft?: boolean }) { const { id, title, cardImage, createdAt, tags, description } = article; - const [year, month, date] = createdAt.split('-'); + const [year, month, date] = createdAt.split('T')[0].split('-'); const params = useSearchParams(); diff --git a/src/components/pages/BlogPage/ArticlesList.tsx b/src/components/pages/BlogPage/ArticlesList.tsx index 7071848f..5dd84c7f 100644 --- a/src/components/pages/BlogPage/ArticlesList.tsx +++ b/src/components/pages/BlogPage/ArticlesList.tsx @@ -1,7 +1,7 @@ 'use client'; import { useGetArticlesQuery } from '@/queries/articles/getArticles'; -import { Block } from '@/types/IArticl'; +import { Block } from '@/types/IArticle'; import { useSearchParams } from 'next/navigation'; import { useEffect, useState } from 'react'; import { ArticleCard } from './ArticleCard'; diff --git a/src/components/pages/MainPage/Availables/AvailableItem.tsx b/src/components/pages/MainPage/Availables/AvailableItem.tsx index c738390d..db5707dc 100644 --- a/src/components/pages/MainPage/Availables/AvailableItem.tsx +++ b/src/components/pages/MainPage/Availables/AvailableItem.tsx @@ -38,8 +38,8 @@ export const AvailableItem = forwardRef( transition={{ duration: 0.5 }} className="absolute bottom-6 left-6 space-y-4" > -

{title}

-

{text}

+

{title}

+

{text}

)}
diff --git a/src/components/pages/MainPage/Calculator/Calculator.tsx b/src/components/pages/MainPage/Calculator/Calculator.tsx index 9e047c4d..3c195e57 100644 --- a/src/components/pages/MainPage/Calculator/Calculator.tsx +++ b/src/components/pages/MainPage/Calculator/Calculator.tsx @@ -168,7 +168,7 @@ export function Calculator() { калькулятор эффективности продукта

-
+
{selectedRegion && ( @@ -190,10 +190,12 @@ export function Calculator() { )}
-

+

Консультаций в месяц

-

{consultations}

+

+ {consultations} +

-
+
-

Усредненные параметры ЖК

+

+ Усредненные параметры ЖК +


-

+

Площадь жилья

-

+

{selectedRegion?.areaInComplex || 1500} м2

-

+

Площадь квартиры

{selectedRegion?.areaApartment || 100} м2

-

+

Стоимость одного м2

-

+

{selectedRegion?.costPerSquare || 100} тыс. руб.

@@ -242,21 +246,21 @@ export function Calculator() {

Расчет

-
-

+

+

Консультаций

-

+

Забронировано

-

+

Продано

-

+

Срок реализации

-

+

Месячный доход

@@ -271,7 +275,7 @@ export function Calculator() {

- Срок реализации + Месячный доход

- {calculated ? monthlyIncome : oldMonthlyIncome}{' '} - млн. руб. + {calculated ? monthlyIncome : oldMonthlyIncome} + млн. руб.
@@ -362,22 +377,28 @@ export function Calculator() {

-

+

{consultations}

-

100%

+

+ 100% +

-

+

{oldReservation}

-

30%

+

+ 30% +

-

+

{oldSales}

-

30%

+

+ 30% +

diff --git a/src/components/pages/MainPage/Calculator/RegionSelector.tsx b/src/components/pages/MainPage/Calculator/RegionSelector.tsx index 112c3af4..e9ce2e03 100644 --- a/src/components/pages/MainPage/Calculator/RegionSelector.tsx +++ b/src/components/pages/MainPage/Calculator/RegionSelector.tsx @@ -42,7 +42,7 @@ export function RegionSelector({ >
-