Merge remote-tracking branch 'origin/feature/ui-updates-v1' into new-one

2026-09-26 23:04:15 +03:30
parent d25db9367c 853ad67db5
commit 0628344dcf
82 changed files with 10310 additions and 504 deletions
@@ -1,9 +1,9 @@
 import React from 'react';
 import { Link, useParams } from 'react-router-dom';
-import { ArrowLeftIcon, ChevronLeftIcon, ChevronRightIcon } from 'lucide-react';
+import { ChevronLeftIcon, ChevronRightIcon } from 'lucide-react';
 import { renderToHTMLString } from '@tiptap/static-renderer';
 import { Reveal } from '../components/Reveal';
-import { ButtonLink } from '../components/Button';
+import { PremiumButton } from '../components/PremiumButton';
 import { ArticleCard } from '../components/ArticleCard';
 import { ArticleMeta } from '../components/ArticleMeta';
 import { ArticleFaq } from '../components/ArticleFaq';
@@ -94,10 +94,9 @@ export function ArticleDetail() {
      <section className="flex min-h-[70vh] flex-col items-center justify-center px-6 text-center">
        <h1 className="text-section font-bold text-ivory">{t('articleNotFound')}</h1>
        <p className="mt-4 text-sm font-light text-ivory/60">{t('articleNotFoundText')}</p>
-        <ButtonLink to={href('/blog')} variant="copper" className="mt-8">
+        <PremiumButton to={href('/blog')} className="mt-8">
          {t('backToBlog')}
-          <ArrowLeftIcon className="h-4 w-4 ltr:-scale-x-100" />
-        </ButtonLink>
+        </PremiumButton>
      </section>);

  }
@@ -14,25 +14,8 @@ export function ContactPage() {
    <>
      <PageHero pageKey="contact" />

-      <section className="bg-ink py-24" aria-label={t('officesAria')}>
-        <div className="mx-auto grid max-w-site gap-6 px-6 md:grid-cols-3 lg:px-10">
-          {offices.map((office, i) => (
-            <Reveal key={office.id} delay={0.06 * i} className="h-full">
-              <EditableItem resource="offices" item={office} className="h-full">
-              <article className="flex h-full flex-col border border-ivory/10 bg-char px-8 py-12 text-center transition-all duration-300 ease-out hover:-translate-y-2 hover:border-copper/40 hover:shadow-lift transform-gpu will-change-transform">
-                <h2 className="text-2xl font-bold text-copper">{office.city}</h2>
-                <p className="mt-6 text-sm font-light leading-9 text-ivory/70">{office.address}</p>
-                <div className="mt-auto pt-10">
-                  <p className="border-t border-ivory/10 pt-6 text-xs font-light text-ivory/50">
-                    {office.hours}
-                  </p>
-                </div>
-              </article>
-              </EditableItem>
-            </Reveal>
-          ))}
-          <AddItemButton resource="offices" />
-        </div>
+      <section className="bg-ink py-2" aria-label={t('officesAria')}>
+      
      </section>

      <ContactSection />
@@ -19,8 +19,8 @@ export function Home() {
  return (
    <>
      <Hero />
-      <Story />
      <Stats />
+      <Story />
      <Services />
      <BeforeAfter />
      <FeaturedProjects />
@@ -1,74 +1,98 @@
-import React, { useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { Link, useParams } from 'react-router-dom'
-import { ArrowLeftIcon, ChevronLeftIcon } from 'lucide-react'
+import { ChevronLeftIcon } from 'lucide-react'
 import { Reveal } from '../components/Reveal'
-import { ButtonLink } from '../components/Button'
+import { PremiumButton } from '../components/PremiumButton'
 import { ProjectCard } from '../components/ProjectCard'
 import { ContactSection } from '../components/ContactSection'
 import { Lightbox } from '../components/Lightbox'
-import { useEffect } from 'react';
+import { LazyProjectsMapSingle } from '../map/LazyMaps';
+import { createPlaceholderProject, findMapProjectByName } from '../data/mapProjects'
 import { useSite, useStatusLabel } from '../api';
 import { useLang } from '../i18n/lang';
 import { applySeo } from '../seo';
+import { projectsData } from '../data/projectsData';

 export function ProjectDetail() {
  const { slug } = useParams<{ slug: string }>()
  const { projects, brand } = useSite()
  const { t, href, lang } = useLang()
-  const project = projects.find((p) => p.slug === slug)
-  const statusLabel = useStatusLabel(project?.status ?? '')
+  
+  const currentProject = projectsData.find((p) => p.slug === slug)
+  
  const [lightbox, setLightbox] = useState<number | null>(null)

-  // عنوان تب، توضیح متا و OG از خود پروژه
-  useEffect(() => {
-    if (!project) return;
-    applySeo({
-      title: `${project.title} | ${brand.name}`,
-      description: project.summary,
-      path: href(`/projects/${project.slug}`),
-      image: project.image,
-      lang,
-    });
-  }, [project?.id, lang, href]);
-
-  if (!project) {
-    return (
-      <section className="flex min-h-[70vh] flex-col items-center justify-center px-6 text-center">
-        <h1 className="text-section font-bold text-ivory">{t('projectNotFound')}</h1>
-        <p className="mt-4 text-sm font-light text-ivory/60">
-          {t('projectNotFoundText')}
-        </p>
-        <ButtonLink to={href('/projects')} variant="copper" className="mt-8">
-          {t('backToProjects')}
-          <ArrowLeftIcon className="h-4 w-4 ltr:-scale-x-100" />
-        </ButtonLink>
-      </section>
-    )
+  if (!currentProject) {
+    return <div className="text-center py-20 text-ivory">Project not found</div>
  }

-  const related = projects.filter((p) => p.slug !== project.slug).slice(0, 3)
+  const backendProject = projects.find((p) => p.slug === slug)
+
+  // Dynamic bilingual text from projectsData
+  const displayTitle = currentProject.name[lang as 'en' | 'fa'] || currentProject.name.en;
+  const displayLocation = currentProject.location[lang as 'en' | 'fa'] || currentProject.location.en;
+  const displayArea = currentProject.area[lang as 'en' | 'fa'] || currentProject.area.en;
+  const displayStatus = currentProject.status;
+
+  const statusLabel = useStatusLabel(displayStatus)
+
+  // Fallbacks for layout structure fields missing in projectsData
+  const summary = backendProject?.summary || (lang === 'en' ? 'A modern and luxurious architectural project built with high-quality materials and smart design.' : 'لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ.');
+  const body = backendProject?.body || (lang === 'en' 
+    ? ['Located in the heart of the city, this project offers unparalleled access to major urban hubs.', 'It features state-of-the-art facilities, green spaces, and a sustainable approach to modern living.']
+    : ['لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و با استفاده از طراحان گرافیک است.', 'چاپگرها و متون بلکه روزنامه و مجله در ستون و سطرآنچنان که لازم است.']);
+  const gallery = backendProject?.gallery?.length ? backendProject.gallery : [
+    '/seed-media/2026/09/1.png',
+    '/seed-media/2026/09/2.png',
+    '/seed-media/2026/09/3.png',
+    '/seed-media/2026/09/4.png'
+  ];
+  const image = backendProject?.image || '/seed-media/2026/09/1.png';
+  const year = backendProject?.year || (lang === 'en' ? '2024' : '1402');
+  const floors = backendProject?.floors || '5';
+  const units = backendProject?.units || '20';
+  const client = backendProject?.client || (lang === 'en' ? 'Aramesh Group' : 'گروه آرامش');
+
+  // تصاویر پاپ‌آپ نقشه
+  const mapImages = useMemo(
+    () => [image, ...gallery].filter(Boolean),
+    [image, gallery]
+  )
+
+  // مختصات همین پروژه
+  const mapLocation = useMemo(
+    () => findMapProjectByName(displayTitle) ?? createPlaceholderProject(displayTitle, displayLocation),
+    [displayTitle, displayLocation]
+  )
+
+  // SEO
+  useEffect(() => {
+    applySeo({
+      title: `${displayTitle} | ${brand.name}`,
+      description: summary,
+      path: href(`/projects/${currentProject.slug}`),
+      image: image,
+      lang,
+    });
+  }, [currentProject.slug, lang, href, displayTitle, summary, image, brand.name]);
+
+  const related = projectsData.filter((p) => p.slug !== currentProject.slug).slice(0, 3)
  
  const facts = [
-    { label: t('specLocation'), value: project.location },
-    { label: t('specYear'), value: project.year },
-    { label: t('specArea'), value: project.area },
-    { label: t('specFloors'), value: project.floors },
-    { label: t('specUnits'), value: project.units },
-    { label: t('specClient'), value: project.client },
+    { label: t('specLocation'), value: displayLocation },
+    { label: t('specYear'), value: year },
+    { label: t('specArea'), value: displayArea },
+    { label: t('specFloors'), value: floors },
+    { label: t('specUnits'), value: units },
+    { label: t('specClient'), value: client },
  ]

  return (
    <>
-      <section className="relative flex h-[62vh] min-h-[440px] items-end overflow-hidden">
-        <img src={project.image} alt="" aria-hidden="true" className="absolute inset-0 h-full w-full object-cover" />
-        <div className="absolute inset-0 bg-ink/72" aria-hidden="true" />
-        <div
-          className="absolute inset-0"
-          style={{ background: 'linear-gradient(to top, #27221c 6%, rgba(39,34,28,0.15) 70%)' }}
-          aria-hidden="true"
-        />
-        <div className="relative mx-auto w-full max-w-site px-6 pb-16 lg:px-10">
-          <nav aria-label={t('breadcrumbAria')} className="flex items-center gap-2 text-xs font-light text-ivory/50">
+      <section className="bg-char pt-24 pb-12 lg:pt-32 lg:pb-16" aria-label={t('projectDetailsAria')}>
+        <div className="mx-auto max-w-site px-6 lg:px-10">
+          
+          <nav aria-label={t('breadcrumbAria')} className="mb-6 flex items-center gap-2 text-xs font-light text-ivory/50">
            <Link to={href('/')} className="transition-colors hover:text-copper">
              {t('home')}
            </Link>
@@ -77,75 +101,80 @@ export function ProjectDetail() {
              {t('projects')}
            </Link>
            <ChevronLeftIcon className="h-3.5 w-3.5 ltr:rotate-180" />
-            <span className="text-copper">{project.title}</span>
+            <span className="text-copper">{displayTitle}</span>
          </nav>
-          <h1 className="mt-5 max-w-[700px] text-hero font-bold text-ivory">{project.title}</h1>
-          <p className="mt-5 max-w-2xl text-base font-light leading-9 text-ivory/70">{project.summary}</p>
-        </div>
-      </section>

-      <section className="bg-char py-20 lg:py-28" aria-label={t('projectDetailsAria')}>
-        <div className="mx-auto grid max-w-site items-start gap-12 px-6 lg:grid-cols-2 lg:gap-16 lg:px-10">
-          
-          <Reveal className="order-1">
-            <span className="flex items-center gap-3 text-sm font-light text-copper">
-              <span aria-hidden="true" className="h-px w-8 bg-copper" />
-              {statusLabel}
-            </span>
-            <h2 className="mt-4 text-3xl font-bold text-ivory">{t('aboutProject')}</h2>
+          <div className="mb-8">
+            <h1 className="text-4xl lg:text-5xl font-bold text-ivory">{displayTitle}</h1>
+          </div>
+
+          {/* Gallery Desktop: Grid. Mobile: Grid */}
+          <div className="grid grid-cols-2 gap-2 md:gap-3 rounded-xl lg:rounded-2xl overflow-hidden lg:h-[500px] xl:h-[600px]">
            
-            {project.body.map((para) => (
-              <p key={para} className="mt-5 text-base font-light leading-9 text-ivory/70">
-                {para}
-              </p>
-            ))}
-
-            <dl className="mt-10 grid grid-cols-2 gap-px border border-ivory/10 bg-ivory/10">
-              {facts.map((f) => (
-                <div key={f.label} className="bg-ink p-6 md:p-8 ltr:text-left rtl:text-right">
-                  <dt className="text-xs font-light text-ivory/50">{f.label}</dt>
-                  <dd className="mt-3 text-sm font-bold text-ivory">{f.value}</dd>
-                </div>
-              ))}
-            </dl>
-
-            <div className="mt-10">
-              <ButtonLink to={href('/contact')} variant="outline" className="font-light">
-                {t('similarProjectCta')}
-              </ButtonLink>
-            </div>
-          </Reveal>
-
-          <Reveal delay={0.1} className="order-2">
-            <button
+            {/* Main large image */}
+            <button 
              type="button"
+              className="col-span-2 lg:col-span-1 h-[250px] md:h-[400px] lg:h-full relative overflow-hidden cursor-pointer focus:outline-none focus-visible:ring-2 focus-visible:ring-copper group block" 
              onClick={() => setLightbox(0)}
-              className="group block w-full overflow-hidden focus:outline-none focus-visible:ring-2 focus-visible:ring-copper"
            >
-              <img
-                src={project.gallery[0] || project.image}
-                alt=""
-                className="aspect-[4/3] w-full object-cover transition-transform duration-500 ease-lux group-hover:scale-105"
-              />
+              <img src={mapImages[0]} alt="" className="h-full w-full object-cover transition-transform duration-500 ease-lux group-hover:scale-105" />
            </button>
-            <div className="mt-4 grid grid-cols-3 gap-4">
-              {project.gallery.slice(1).map((img, i) => (
-                <button
-                  key={img}
+
+            {/* 2x2 Small images */}
+            <div className="col-span-2 lg:col-span-1 grid grid-cols-2 gap-2 md:gap-3 lg:grid-rows-2 lg:h-full">
+              {mapImages.slice(1, 5).map((img, i) => (
+                <button 
+                  key={img} 
                  type="button"
+                  className={`relative overflow-hidden cursor-pointer focus:outline-none focus-visible:ring-2 focus-visible:ring-copper group block h-[120px] md:h-[200px] lg:h-full ${i >= 2 ? 'hidden md:block' : ''}`} 
                  onClick={() => setLightbox(i + 1)}
-                  className="group block overflow-hidden focus:outline-none focus-visible:ring-2 focus-visible:ring-copper"
                >
-                  <img
-                    src={img}
-                    alt=""
-                    className="aspect-square w-full object-cover transition-transform duration-500 ease-lux group-hover:scale-105"
-                  />
+                   <img src={img} alt="" className="h-full w-full object-cover transition-transform duration-500 ease-lux group-hover:scale-105" />
                </button>
              ))}
            </div>
-          </Reveal>

+          </div>
+
+          {/* Smart Content Layout */}
+          <div className="max-w-4xl mx-auto mt-16 lg:mt-24 flex flex-col gap-16 lg:gap-20">
+            
+            {/* Description */}
+            <Reveal>
+              <span className="flex items-center gap-3 text-sm font-light text-copper mb-6">
+                <span aria-hidden="true" className="h-px w-8 bg-copper" />
+                {statusLabel}
+              </span>
+              <h2 className="text-3xl font-bold text-ivory">{t('aboutProject')}</h2>
+              
+              <p className="mt-8 text-xl font-medium leading-9 text-ivory/90">{summary}</p>
+              {body.map((para) => (
+                <p key={para} className="mt-6 text-base font-light leading-9 text-ivory/70">
+                  {para}
+                </p>
+              ))}
+            </Reveal>
+
+            {/* Specifications Table - Perfectly center-aligned */}
+            <Reveal>
+              <dl className="grid grid-cols-2 md:grid-cols-3 gap-px border border-ivory/10 bg-ivory/10 rounded-xl overflow-hidden">
+                {facts.map((f) => (
+                  <div key={f.label} className="bg-ink p-6 md:p-8 flex flex-col items-center justify-center text-center">
+                    <dt className="text-xs font-light text-ivory/50 mb-2">{f.label}</dt>
+                    <dd className="text-base font-bold text-ivory">{f.value}</dd>
+                  </div>
+                ))}
+              </dl>
+            </Reveal>
+
+            {/* Map (بدون Reveal) */}
+            {mapLocation && (
+              <div className="h-80 md:h-[400px] rounded-xl overflow-hidden border border-white/10 shadow-2xl">
+                <LazyProjectsMapSingle location={mapLocation} images={mapImages} className="h-full w-full" />
+              </div>
+            )}
+            
+          </div>
        </div>
      </section>

@@ -154,17 +183,24 @@ export function ProjectDetail() {
          <h2 className="text-section font-bold text-ivory">{t('otherProjects')}</h2>
          <div className="mt-6 h-px w-24 bg-copper/70" />
          <div className="mt-12 grid gap-6 lg:grid-cols-3">
-            {related.map((item, i) => (
-              <Reveal key={item.slug} delay={0.06 * i} className="h-full">
-                <ProjectCard project={item} />
-              </Reveal>
-            ))}
+            {related.map((item, i) => {
+              const dummyImageName = `${(i % 6) + 1}.png`;
+              return (
+                <Reveal key={item.slug} delay={0.06 * i} className="h-full">
+                  <ProjectCard 
+                    project={item} 
+                    imageUrl={`/seed-media/2026/09/${dummyImageName}`}
+                    detailHref={href(`/projects/${item.slug}`)} 
+                  />
+                </Reveal>
+              );
+            })}
          </div>
        </div>
      </section>

      <Lightbox
-        images={project.gallery}
+        images={gallery}
        index={lightbox}
        onClose={() => setLightbox(null)}
        onChange={setLightbox}
@@ -1,18 +1,20 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { PageHero } from '../components/PageHero';
 import { Reveal } from '../components/Reveal';
 import { ProjectCard } from '../components/ProjectCard';
+import { PremiumButton } from '../components/PremiumButton';
 import { Gallery } from '../components/home/Gallery';
 import { ContactSection } from '../components/ContactSection';
-import type { ProjectStatus } from '../data/site';
 import { useSite, useStatusLabel } from '../api';
 import { useLang } from '../i18n/lang';
 import { useFieldSaver } from '../admin/AdminContext';
 import { InlineEdit } from '../components/admin/InlineEdit';
-import { AddItemButton, EditableItem } from '../admin/Editable';
+import { projectsData } from '../data/projectsData';
+import { LazyProjectsMapAll } from '../map/LazyMaps';
+import { MAP_PROJECTS, type MapProject } from '../data/mapProjects';

 export function Projects() {
-  const { projects, status_labels } = useSite();
+  const { status_labels } = useSite();
  const { t } = useLang();
  const save = useFieldSaver();

@@ -27,27 +29,79 @@ export function Projects() {

  const doneLabel = useStatusLabel('done');
  const progressLabel = useStatusLabel('progress');
-  const FILTERS: {key: ProjectStatus;label: string;}[] = [
+  const FILTERS: { key: 'done' | 'progress'; label: string; }[] = [
    { key: 'done', label: doneLabel },
    { key: 'progress', label: progressLabel }
  ];
-  const [status, setStatus] = useState<ProjectStatus>('done');
-  const list = projects.filter((p) => p.status === status);
+  const [status, setStatus] = useState<'done' | 'progress'>('done');
+  
+  // Filtering and Pagination State
+  const [page, setPage] = useState(1);
+  const [isLoading, setIsLoading] = useState(false);
+  const itemsPerPage = 12;
+
+  // Filter projects by status
+  const filteredProjects = useMemo(() => {
+    return projectsData.filter((p) => p.status === status);
+  }, [status]);
+
+  // Currently displayed projects
+  const displayedProjects = useMemo(() => {
+    return filteredProjects.slice(0, page * itemsPerPage);
+  }, [filteredProjects, page]);
+
+  // Handle Tab Switch
+  const handleTabSwitch = (newStatus: 'done' | 'progress') => {
+    setStatus(newStatus);
+    setPage(1); // Reset pagination on tab switch
+  };
+
+  // Handle Load More
+  const handleLoadMore = () => {
+    setIsLoading(true);
+    // Brief loading state
+    setTimeout(() => {
+      setPage((prev) => prev + 1);
+      setIsLoading(false);
+    }, 400);
+  };
+
+  const BASE_IMG_URL = "/seed-media/2026/09/";
+
+  // Resolve a project href from a MapProject entry by matching against projectsData slugs
+  const resolveProjectHref = (mapProject: MapProject): string | undefined => {
+    const match = projectsData.find(
+      (p) => p.name.fa === mapProject.name || p.name.en === mapProject.name
+    );
+    return match ? `/projects/${match.slug}` : undefined;
+  };

  return (
    <>
      <PageHero pageKey="projects" />
-      
+
+      {/* نقشهٔ محدود‌شده — همهٔ پروژه‌ها با سنجاق مسی */}
+      <section className="bg-char py-10" aria-label={t('mapAria')}>
+        <div className="mx-auto max-w-site px-6 lg:px-10">
+          <div className="w-full max-w-full overflow-hidden rounded-2xl border border-white/10">
+            <LazyProjectsMapAll
+              projects={MAP_PROJECTS}
+              resolveProjectHref={resolveProjectHref}
+              className="h-[350px] md:h-[450px] lg:h-[55vh] max-h-[600px] w-full"
+            />
+          </div>
+        </div>
+      </section>
+
      <section className="bg-ink py-24 lg:py-32" aria-label={t('projectsListAria')}>
        <div className="mx-auto max-w-site px-6 lg:px-10">
          
-          {/* دکمه‌های فیلتر مینیمال و شیشه‌ای (وسط‌چین و بدون کادر) */}
+          {/* دکمه‌های فیلتر */}
          <div className="flex items-center justify-center gap-4 md:gap-6" role="tablist" aria-label={t('projectFilterAria')}>
            {FILTERS.map((filter, index) => {
              const isSelected = status === filter.key;
              return (
                <React.Fragment key={filter.key}>
-                  {/* خط جداکننده بین دکمه‌ها */}
                  {index > 0 && (
                    <span className="h-6 w-[2px] rounded-full bg-ivory/10" aria-hidden="true" />
                  )}
@@ -56,7 +110,7 @@ export function Projects() {
                    type="button"
                    role="tab"
                    aria-selected={isSelected}
-                    onClick={() => setStatus(filter.key)}
+                    onClick={() => handleTabSwitch(filter.key)}
                    className={`group relative rounded-lg px-6 py-2.5 text-sm font-medium transition-all duration-300 ease-lux active:scale-95 cursor-pointer select-none backdrop-blur-md ${
                      isSelected
                        ? 'bg-copper/15 text-copper shadow-[0_4px_15px_rgba(197,143,92,0.1)]'
@@ -76,15 +130,34 @@ export function Projects() {
          </div>

          <div className="mt-12 grid gap-6 lg:grid-cols-3">
-            {list.map((project, i) => (
-              <Reveal key={project.id} delay={0.05 * i} className="h-full">
-                <EditableItem resource="projects" item={project} className="h-full">
-                  <ProjectCard project={project} imageClass="h-80" />
-                </EditableItem>
-              </Reveal>
-            ))}
-            <AddItemButton resource="projects" />
+            {displayedProjects.map((project, index) => {
+              const dummyImageName = `${(index % 6) + 1}.png`;
+              const imageUrl = `${BASE_IMG_URL}${dummyImageName}`;
+              
+              return (
+                <Reveal key={project.id} delay={0.05 * (index % itemsPerPage)} className="h-full">
+                  <ProjectCard 
+                    project={project}
+                    imageUrl={imageUrl}
+                    detailHref={`/projects/${project.slug}`}
+                  />
+                </Reveal>
+              );
+            })}
          </div>
+          
+          {/* Load More Button */}
+          {displayedProjects.length < filteredProjects.length && (
+            <div className="mt-16 flex justify-center">
+              <PremiumButton
+                onClick={handleLoadMore}
+                disabled={isLoading}
+                className="px-10 py-4 w-48"
+              >
+                {isLoading ? 'در حال بارگذاری...' : 'مشاهده بیشتر'}
+              </PremiumButton>
+            </div>
+          )}
        </div>
      </section>

@@ -92,4 +165,4 @@ export function Projects() {
      <ContactSection />
    </>
  );
-}
+}