diff --git a/public/videos/composition_c.mp4 b/public/videos/composition_c.mp4 new file mode 100644 index 0000000..fadf38c Binary files /dev/null and b/public/videos/composition_c.mp4 differ diff --git a/src/App.tsx b/src/App.tsx index b564d1b..9151fe9 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,12 +2,17 @@ import { Footer } from "@/components/Layout/Footer"; import { LanguageSwitcher } from "@/components/Layout/LanguageSwitcher"; import { LocaleSync } from "@/components/Layout/LocaleSync"; import StreamDemo from "@/features/stream-demo/StreamDemo"; +import Header from "@/components/Layout/Header"; export default function App() { return (
+<<<<<<< HEAD +======= +
+>>>>>>> 258568050cbcb3e46cc31416fc9a0ba7a21ac066 {/* Без overflow-clip: иначе flex-1 + clip часто даёт пустой/обрезанный экран */}
diff --git a/src/components/Layout/Feedback.tsx b/src/components/Layout/Feedback.tsx index c6802da..d9105f0 100644 --- a/src/components/Layout/Feedback.tsx +++ b/src/components/Layout/Feedback.tsx @@ -6,6 +6,11 @@ import { useModalStore } from "@/stores/useModalStore"; import FeedbackModal from "@/components/modals/FeedbackFormModal"; import { LeadForm } from "@/features/lead-form/LeadForm"; +<<<<<<< HEAD +======= +const DEFAULT_STREAM_DEMO_PRODUCTS = ["Удаленная демонстрация"] as Product[]; + +>>>>>>> 258568050cbcb3e46cc31416fc9a0ba7a21ac066 export function Feedback() { useAddReferer(); const { t } = useTranslation(); diff --git a/src/components/Layout/Footer.tsx b/src/components/Layout/Footer.tsx index 3023a25..8b181ab 100644 --- a/src/components/Layout/Footer.tsx +++ b/src/components/Layout/Footer.tsx @@ -93,7 +93,16 @@ export function Footer() { className=" lg:hidden md:size-[6.25vw] size-[13.333vw] max-md:absolute max-md:right-0 max-md:bottom-6" />
+<<<<<<< HEAD ) : null} +======= + Сколково +
+>>>>>>> 258568050cbcb3e46cc31416fc9a0ba7a21ac066
+ + + ); +} diff --git a/src/components/Layout/LanguageSwitchButton.tsx b/src/components/Layout/LanguageSwitchButton.tsx new file mode 100644 index 0000000..4ddabaf --- /dev/null +++ b/src/components/Layout/LanguageSwitchButton.tsx @@ -0,0 +1,27 @@ +import { useState } from "react"; + +export default function LanguageSwitchButton({ + className, +}: { + className?: string; +}) { + const [locale, setLocale] = useState<"ru" | "en">("ru"); + + function handleClick() { + return setLocale(locale === "ru" ? "en" : "ru"); + } + + return ( + + ); +} diff --git a/src/components/Layout/ModalContainer.tsx b/src/components/Layout/ModalContainer.tsx index 407de14..e0a079c 100644 --- a/src/components/Layout/ModalContainer.tsx +++ b/src/components/Layout/ModalContainer.tsx @@ -17,7 +17,7 @@ export function ModalContainer() { }, [setModal]); const jsx = modal ? ( -
+
{modal}
diff --git a/src/components/icons/LogoHorIcon.tsx b/src/components/icons/LogoHorIcon.tsx new file mode 100644 index 0000000..d8f5487 --- /dev/null +++ b/src/components/icons/LogoHorIcon.tsx @@ -0,0 +1,221 @@ +function LogoHorIcon() { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} + +export default LogoHorIcon; diff --git a/src/features/lead-form/LeadForm.tsx b/src/features/lead-form/LeadForm.tsx index 192339c..a742f94 100644 --- a/src/features/lead-form/LeadForm.tsx +++ b/src/features/lead-form/LeadForm.tsx @@ -17,6 +17,11 @@ import type { LeadFormValues } from "./types"; export type { LeadFormValues } from "./types"; +<<<<<<< HEAD +======= +const GENERIC_SUBMIT_ERROR = "Не удалось отправить заявку. Попробуйте позже."; + +>>>>>>> 258568050cbcb3e46cc31416fc9a0ba7a21ac066 export function LeadForm({ defaultProducts, idPrefix = "", @@ -115,7 +120,7 @@ export function LeadForm({ />
-
+
); } diff --git a/src/features/stream-demo/RequestForDemo.tsx b/src/features/stream-demo/RequestForDemo.tsx index 15852ab..842c7da 100644 --- a/src/features/stream-demo/RequestForDemo.tsx +++ b/src/features/stream-demo/RequestForDemo.tsx @@ -12,7 +12,8 @@ export default function RequestForDemo() {
@@ -38,10 +39,14 @@ export default function RequestForDemo() {
-
); diff --git a/src/features/stream-demo/StreamingProject.tsx b/src/features/stream-demo/StreamingProject.tsx index 956d8db..4a66fbe 100644 --- a/src/features/stream-demo/StreamingProject.tsx +++ b/src/features/stream-demo/StreamingProject.tsx @@ -48,6 +48,7 @@ export function StreamingProject({ loading="lazy" decoding="async" className="absolute inset-0 z-0 size-full object-cover object-bottom" + draggable={false} />