Merge version_3 into main

Update src/app/page.tsx
2026-06-08 13:00:04 +00:00 · 2026-06-08 13:00:00 +00:00 · 2026-06-08 12:51:38 +00:00 · 2026-06-08 12:51:35 +00:00 · 2026-06-08 12:51:34 +00:00 · 2026-06-08 12:51:03 +00:00
3 changed files with 125 additions and 41 deletions
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -21,8 +21,8 @@ export default function LandingPage() {
        borderRadius="pill"
        contentWidth="medium"
        sizing="largeSmallSizeMediumTitles"
-        background="blurBottom"
-        cardStyle="glass-elevated"
+        background="none"
+        cardStyle="solid"
        primaryButtonStyle="double-inset"
        secondaryButtonStyle="layered"
        headingFontWeight="normal"
@@ -31,16 +31,12 @@ export default function LandingPage() {
  <div id="nav" data-section="nav">
      <NavbarLayoutFloatingOverlay
      navItems={[
-        {
-          name: "Home",          id: "#home"},
-        {
-          name: "About Us",          id: "#about"},
-        {
-          name: "Menu",          id: "#menu"},
-        {
-          name: "Testimonials",          id: "#testimonials"},
-        {
-          name: "Contact",          id: "#contact"},
+        { name: "Home", id: "/" },
+        { name: "About Us", id: "/#about" },
+        { name: "Products", id: "/products" },
+        { name: "Menu", id: "/#menu" },
+        { name: "Testimonials", id: "/#testimonials" },
+        { name: "Contact", id: "/#contact" }
      ]}
      brandName="The Daily Grind"
    />
@@ -50,13 +46,13 @@ export default function LandingPage() {
      <HeroLogoBillboard
      background={{
        variant: "radial-gradient"}}
-      logoText="The Daily Grind"
+      logoText="The Sturbucks"
      description="Ваша ежедневная порция исключительного кофе и восхитительных моментов."
      buttons={[
        {
-          text: "Посмотреть меню",          href: "#menu"},
+          text: "Посмотреть меню",          href: "/#menu"},
        {
-          text: "Найти нас",          href: "#contact"},
+          text: "Найти нас",          href: "/#contact"},
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/front-view-cup-coffee-with-muffins_23-2148251619.jpg"
      imageAlt="Cozy coffee shop interior with bar and seating"
@@ -107,11 +103,11 @@ export default function LandingPage() {
      carouselMode="buttons"
      products={[
        {
-          id: "espresso",          name: "Эспрессо",          price: "2.50$",          variant: "Классический",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-beans-wooden-table_23-2148464789.jpg",          imageAlt: "Rich espresso shot"},
+          id: "espresso",          name: "Эспрессо",          price: "2.50$",          variant: "Классический",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-beans-wooden-table_23-2148464789.jpg?_wi=2",          imageAlt: "Rich espresso shot"},
        {
-          id: "cappuccino",          name: "Капучино",          price: "4.00$",          variant: "Пышная пенка",          imageSrc: "http://img.b2bpic.net/free-photo/cup-creamy-coffee-cutlery_250224-109.jpg",          imageAlt: "Classic cappuccino with latte art"},
+          id: "cappuccino",          name: "Капучино",          price: "4.00$",          variant: "Пышная пенка",          imageSrc: "http://img.b2bpic.net/free-photo/cup-creamy-coffee-cutlery_250224-109.jpg?_wi=2",          imageAlt: "Classic cappuccino with latte art"},
        {
-          id: "americano",          name: "Американо",          price: "3.50$",          variant: "Бодрящий",          imageSrc: "http://img.b2bpic.net/free-photo/black-coffee-cup_74190-6281.jpg",          imageAlt: "Hot Americano coffee"},
+          id: "americano",          name: "Американо",          price: "3.50$",          variant: "Бодрящий",          imageSrc: "http://img.b2bpic.net/free-photo/black-coffee-cup_74190-6281.jpg?_wi=2",          imageAlt: "Hot Americano coffee"},
        {
          id: "croissant",          name: "Круассан",          price: "3.00$",          variant: "Свежий",          imageSrc: "http://img.b2bpic.net/free-photo/top-view-delicious-baked-pastries-with-cup-tea-jam-dark-space_140725-79744.jpg",          imageAlt: "Flaky golden croissant"},
        {
@@ -189,12 +185,7 @@ export default function LandingPage() {
        variant: "plain"}}
      tag="Посетите нас"
      title="Свяжитесь с нами"
-      description="Мы будем рады услышать от вас. Загляните на чашечку или отправьте нам сообщение. 
-
-Часы работы: Пн-Пт: 7:00 - 19:00, Сб-Вс: 8:00 - 18:00
-Адрес: ул. Главная, 10, Город, Страна
-Телефон: +123 456 7890
-Электронная почта: info@thedailygrind.com"
+      description="Мы будем рады услышать от вас. Загляните на чашечку или отправьте нам сообщение. \n\nЧасы работы: Пн-Пт: 7:00 - 19:00, Сб-Вс: 8:00 - 18:00\nАдрес: ул. Главная, 10, Город, Страна\nТелефон: +123 456 7890\nЭлектронная почта: info@thedailygrind.com"
      imageSrc="http://img.b2bpic.net/free-photo/african-woman-checkered-cape-eyeglasses-posed-outdoor_627829-5811.jpg"
      imageAlt="Exterior view of a charming coffee shop"
      mediaAnimation="slide-up"
@@ -211,31 +202,31 @@ export default function LandingPage() {
        {
          title: "Меню",          items: [
            {
-              label: "Кофе",              href: "#menu"},
+              label: "Кофе",              href: "/#menu"},
            {
-              label: "Выпечка",              href: "#menu"},
+              label: "Выпечка",              href: "/#menu"},
            {
-              label: "Холодные напитки",              href: "#menu"},
+              label: "Холодные напитки",              href: "/#menu"},
            {
-              label: "Специальные предложения",              href: "#features"},
+              label: "Специальные предложения",              href: "/#features"},
          ],
        },
        {
          title: "О нас",          items: [
            {
-              label: "Наша история",              href: "#about"},
+              label: "Наша история",              href: "/#about"},
            {
-              label: "Отзывы",              href: "#testimonials"},
+              label: "Отзывы",              href: "/#testimonials"},
            {
-              label: "Партнеры",              href: "#social-proof"},
+              label: "Партнеры",              href: "/#social-proof"},
          ],
        },
        {
          title: "Поддержка",          items: [
            {
-              label: "FAQ",              href: "#faq"},
+              label: "FAQ",              href: "/#faq"},
            {
-              label: "Контакты",              href: "#contact"},
+              label: "Контакты",              href: "/#contact"},
            {
              label: "Конфиденциальность",              href: "#"},
          ],
--- a/src/app/products/page.tsx
+++ b/src/app/products/page.tsx
@@ -0,0 +1,93 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import ProductCardFour from '@/components/sections/product/ProductCardFour';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+
+export default function ProductsPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="entrance-slide"
+        borderRadius="pill"
+        contentWidth="medium"
+        sizing="largeSmallSizeMediumTitles"
+        background="none"
+        cardStyle="solid"
+        primaryButtonStyle="double-inset"
+        secondaryButtonStyle="layered"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About Us", id: "/#about" },
+              { name: "Products", id: "/products" },
+              { name: "Menu", id: "/#menu" },
+              { name: "Testimonials", id: "/#testimonials" },
+              { name: "Contact", id: "/#contact" }
+            ]}
+            brandName="The Daily Grind"
+          />
+        </div>
+
+        <div id="products-list" data-section="products-list">
+          <ProductCardFour
+            animationType="slide-up"
+            textboxLayout="default"
+            gridVariant="four-items-2x2-equal-grid"
+            useInvertedBackground={false}
+            carouselMode="buttons"
+            products={[
+              { id: "espresso", name: "Эспрессо", price: "2.50$", variant: "Классический", imageSrc: "http://img.b2bpic.net/free-photo/top-view-coffee-beans-wooden-table_23-2148464789.jpg?_wi=1", imageAlt: "Rich espresso shot" },
+              { id: "cappuccino", name: "Капучино", price: "4.00$", variant: "Пышная пенка", imageSrc: "http://img.b2bpic.net/free-photo/cup-creamy-coffee-cutlery_250224-109.jpg?_wi=1", imageAlt: "Classic cappuccino with latte art" },
+              { id: "americano", name: "Американо", price: "3.50$", variant: "Бодрящий", imageSrc: "http://img.b2bpic.net/free-photo/black-coffee-cup_74190-6281.jpg?_wi=1", imageAlt: "Hot Americano coffee" },
+              { id: "latte", name: "Латте", price: "4.25$", variant: "Молочный", imageSrc: "http://img.b2bpic.net/free-photo/gourmet-latte-art-being-poured-by-a-barista_627829-5811.jpg?_wi=1", imageAlt: "Gourmet latte" },
+              { id: "mocha", name: "Мокко", price: "4.75$", variant: "Шоколадный", imageSrc: "http://img.b2bpic.net/free-photo/coffee-cup-table_140725-79744.jpg?_wi=1", imageAlt: "Chocolate mocha" },
+              { id: "cold-brew", name: "Колд-Брю", price: "4.50$", variant: "Освежающий", imageSrc: "http://img.b2bpic.net/free-photo/cold-brew-coffee-glass_84443-83665.jpg?_wi=1", imageAlt: "Cold brew coffee" },
+              { id: "matcha-latte", name: "Матча Латте", price: "5.00$", variant: "Зеленый", imageSrc: "http://img.b2bpic.net/free-photo/green-matcha-latte_23-2148143777.jpg?_wi=1", imageAlt: "Matcha latte" },
+              { id: "iced-coffee", name: "Айс-Кофе", price: "4.00$", variant: "Со льдом", imageSrc: "http://img.b2bpic.net/free-photo/iced-coffee-with-milk_23-2148718751.jpg?_wi=1", imageAlt: "Iced coffee" }
+            ]}
+            title="Все Наши Продукты"
+            description="Погрузитесь в наш полный ассортимент высококачественного кофе и напитков."
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterSimple
+            columns={[
+              {
+                title: "Меню",                items: [
+                  { label: "Кофе", href: "/#menu" },
+                  { label: "Выпечка", href: "/#menu" },
+                  { label: "Холодные напитки", href: "/#menu" },
+                  { label: "Специальные предложения", href: "/#features" }
+                ]
+              },
+              {
+                title: "О нас",                items: [
+                  { label: "Наша история", href: "/#about" },
+                  { label: "Отзывы", href: "/#testimonials" },
+                  { label: "Партнеры", href: "/#social-proof" }
+                ]
+              },
+              {
+                title: "Поддержка",                items: [
+                  { label: "FAQ", href: "/#faq" },
+                  { label: "Контакты", href: "/#contact" },
+                  { label: "Конфиденциальность", href: "#" }
+                ]
+              }
+            ]}
+            bottomLeftText="© 2024 The Daily Grind. Все права защищены."
+            bottomRightText="Сделано с любовью и кофе."
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #ffffff;
-  --card: #f9f9f9;
-  --foreground: #120006e6;
-  --primary-cta: #e63946;
+  --background: #000000;
+  --card: #0c0c0c;
+  --foreground: #ffffff;
+  --primary-cta: #106EFB;
  --primary-cta-text: #ffffff;
-  --secondary-cta: #f9f9f9;
-  --secondary-cta-text: #120006e6;
-  --accent: #e2e2e2;
-  --background-accent: #c4c4c4;
+  --secondary-cta: #000000;
+  --secondary-cta-text: #ffffff;
+  --accent: #535353;
+  --background-accent: #106EFB;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	6f2664cc84	Merge version_3 into main Merge version_3 into main	2026-06-08 13:00:04 +00:00
bender	92fad5ec38	Update src/app/page.tsx	2026-06-08 13:00:00 +00:00
bender	3fbf7dd8d0	Merge version_3 into main Merge version_3 into main	2026-06-08 12:51:38 +00:00
bender	fad8f5395c	Update src/app/products/page.tsx	2026-06-08 12:51:35 +00:00
bender	07809e26ea	Update src/app/page.tsx	2026-06-08 12:51:34 +00:00
bender	aa413f993f	Merge version_3 into main Merge version_3 into main	2026-06-08 12:51:03 +00:00
bender	c3574cce5b	Add src/app/products/page.tsx	2026-06-08 12:51:00 +00:00
bender	db2d9318b6	Update src/app/page.tsx	2026-06-08 12:50:59 +00:00
bender	bbc0525b2d	Merge version_2 into main Merge version_2 into main	2026-06-08 12:47:59 +00:00
bender	558e97a7d2	Update src/app/styles/variables.css	2026-06-08 12:47:56 +00:00
bender	a919fa1e6a	Update src/app/page.tsx	2026-06-08 12:47:55 +00:00
bender	3858dd41de	Merge version_1 into main Merge version_1 into main	2026-06-08 12:46:51 +00:00
bender	6f605288b4	Merge version_1 into main Merge version_1 into main	2026-06-08 12:43:10 +00:00
bender	ac538692ae	Merge version_1 into main Merge version_1 into main	2026-06-08 12:42:17 +00:00
bender	8a69155190	Merge version_1 into main Merge version_1 into main	2026-06-08 12:41:30 +00:00
bender	c52ef90485	Merge version_1 into main Merge version_1 into main	2026-06-08 12:40:35 +00:00
bender	073ee5a777	Merge version_1 into main Merge version_1 into main	2026-06-08 12:38:38 +00:00