Merge branch 'master' of http://192.168.1.163:3000/mikhail_lanskikh/graff.estate-nextjs-updated
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
|
||||
# production
|
||||
/build
|
||||
/dist
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
|
||||
+11
-2
@@ -18,9 +18,18 @@ server {
|
||||
|
||||
# index.html fallback
|
||||
location / {
|
||||
# try_files $uri $uri/ /index.html;
|
||||
try_files $uri $uri.html $uri/ /index.html;
|
||||
# Убираем trailing slash и редиректим
|
||||
rewrite ^/(.*)/$ /$1 permanent;
|
||||
|
||||
# Пробуем найти файл, затем с .html, затем 404
|
||||
try_files $uri $uri.html /404.html;
|
||||
}
|
||||
|
||||
# Явная обработка 404
|
||||
# error_page 404 /404.html;
|
||||
# location = /404.html {
|
||||
# internal;
|
||||
# }
|
||||
|
||||
|
||||
location /api {
|
||||
|
||||
@@ -9,6 +9,9 @@ import ResultsPopup from "@/components/modals/ResultsPopup";
|
||||
import dynamic from "next/dynamic";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
verification: {
|
||||
yandex: "2d8545f95b05412c",
|
||||
},
|
||||
title: "Интерактивные решения для застройщиков",
|
||||
description:
|
||||
"Помогаем девелоперам эффективно демонстрировать свой объект. Продавать больше и быстрее.",
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import { redirect, RedirectType } from "next/navigation";
|
||||
import MainLayout from "./(main)/layout";
|
||||
import { NotFoundPage } from "@/components/pages/NotFoundPage";
|
||||
|
||||
export default function Page() {
|
||||
export default function NotFound() {
|
||||
return (
|
||||
<MainLayout>
|
||||
<NotFoundPage />
|
||||
|
||||
@@ -201,8 +201,7 @@ export function Slider({ mapPoint }: { mapPoint?: IMapProject[] }) {
|
||||
<button
|
||||
className="p-[0.556vw] absolute cursor-pointer disabled:hidden right-0 top-0 translate-y-[calc(3.889vw/2+1.667vw-50%)]"
|
||||
disabled={
|
||||
sliderOffset ===
|
||||
(3.889 + 0.278) * Math.trunc(mapPoint.length / 5) * 5
|
||||
sliderOffset >= (3.889 + 0.278) * ((mapPoint?.length ?? 5) - 5)
|
||||
}
|
||||
onClick={() =>
|
||||
setSliderOffset((prev) => prev + 5 * (3.889 + 0.278))
|
||||
|
||||
@@ -17,7 +17,7 @@ export function StoriesButton() {
|
||||
return (
|
||||
<div className="flex items-center mx-auto">
|
||||
<div className="flex items-center">
|
||||
{stories?.slice(-3).map(({ id, text, preview }, index) => (
|
||||
{stories?.slice(0,3).map(({ id, text, preview }, index) => (
|
||||
<button
|
||||
onClick={() => setModal(<StoriesModal startIndex={index} />)}
|
||||
className="aspect-square first:translate-x-2 last:-translate-x-2 w-full rounded-full cursor-pointer outline-none"
|
||||
|
||||
Reference in New Issue
Block a user