added card on post and feed

This commit is contained in:
SlimusMinus
2026-06-04 00:34:02 +03:00
parent 8ac20a074c
commit ee6d281eec
5 changed files with 205 additions and 47 deletions

View File

@@ -10,6 +10,8 @@
content="Web site created using create-react-app" content="Web site created using create-react-app"
/> />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<script src="https://api-maps.yandex.ru/2.1/?apikey=d4696cc8-6a1f-4356-9219-108ac474093b&lang=ru_RU" type="text/javascript"></script>
<!-- <!--
manifest.json provides metadata used when your web app is installed on a manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

View File

@@ -1,4 +1,4 @@
import { useCallback, useState } from "react"; import {useCallback, useEffect, useState} from "react";
import PinIcon from "./icons/PinIcon"; import PinIcon from "./icons/PinIcon";
import CloseIcon from "./icons/CloseIcon"; import CloseIcon from "./icons/CloseIcon";
import { EMPTY_FORM, CATEGORIES } from "../config/feedConstants"; import { EMPTY_FORM, CATEGORIES } from "../config/feedConstants";
@@ -6,6 +6,7 @@ import { usePostMutation } from "../hooks/usePostMutation";
import { useImageUpload, ACCEPT } from "../hooks/useImageUpload"; import { useImageUpload, ACCEPT } from "../hooks/useImageUpload";
import { validatePostForm } from "../utils/validatePostForm"; import { validatePostForm } from "../utils/validatePostForm";
import { formatPhone } from "../utils/formatPhone"; import { formatPhone } from "../utils/formatPhone";
import { useYandexMap } from "../hooks/useYandexMap";
import { API_URL } from "../config/authConstants"; import { API_URL } from "../config/authConstants";
const MAX_SIZE_MB = 5; const MAX_SIZE_MB = 5;
@@ -31,6 +32,7 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
category: initialData.category || "", category: initialData.category || "",
date: initialData.date || "", date: initialData.date || "",
phone: initialData.phone || "", phone: initialData.phone || "",
address: initialData.city || ""
} }
: EMPTY_FORM : EMPTY_FORM
); );
@@ -57,6 +59,24 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
// Единый хук для создания и обновления // Единый хук для создания и обновления
const { save, loading: saving, error: apiError } = usePostMutation(); const { save, loading: saving, error: apiError } = usePostMutation();
// Внутри компонента, рядом с другими хуками
const initialCoords = isEdit && initialData.latitude && initialData.longitude
? { latitude: initialData.latitude, longitude: initialData.longitude }
: null;
// CreateUpdatePost.jsx
const { mapRef, coords, address, addressRef } = useYandexMap(
true,
initialCoords,
isEdit ? (initialData.location || "") : ""
);
// После объявления хука useYandexMap:
useEffect(() => {
if (address) {
setForm(prev => ({ ...prev, address }));
setErrors(prev => ({ ...prev, address: "" }));
}
}, [address]);
// Единый флаг загрузки — блокирует кнопку отправки // Единый флаг загрузки — блокирует кнопку отправки
const loading = saving || compressing; const loading = saving || compressing;
@@ -74,6 +94,11 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
return; return;
} }
if (coords && !addressRef.current) {
setErrors(prev => ({ ...prev, map: "Подождите, адрес загружается..." }));
return;
}
const data = new FormData(); const data = new FormData();
data.append("type", form.type); data.append("type", form.type);
data.append("title", form.title.trim()); data.append("title", form.title.trim());
@@ -83,6 +108,17 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
if (form.date) data.append("date", form.date); if (form.date) data.append("date", form.date);
if (imageFile) data.append("image", imageFile); if (imageFile) data.append("image", imageFile);
if (coords) {
data.append("latitude", coords.latitude);
data.append("longitude", coords.longitude);
data.append("address", form.address.trim()); // ← из поля формы
}
// Адрес без координат тоже отправляем:
if (!coords && form.address.trim()) {
data.append("address", form.address.trim());
}
// save(id, data): id = null → POST (создание), id = string → PUT (обновление) // save(id, data): id = null → POST (создание), id = string → PUT (обновление)
const result = await save(isEdit ? initialData.id : null, data); const result = await save(isEdit ? initialData.id : null, data);
if (result) { if (result) {
@@ -102,7 +138,7 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
{isEdit ? "Редактировать объявление" : "Новое объявление"} {isEdit ? "Редактировать объявление" : "Новое объявление"}
</span> </span>
<button className="f-close-btn" onClick={onClose}> <button className="f-close-btn" onClick={onClose}>
<CloseIcon /> <CloseIcon/>
</button> </button>
</div> </div>
@@ -117,7 +153,8 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
Потеря Потеря
</button> </button>
<button <button
className={`f-type-opt${form.type === "found" ? " found" : ""}`} className={`f-type-opt${form.type === "found" ? " found"
: ""}`}
onClick={() => set("type", "found")} onClick={() => set("type", "found")}
> >
Находка Находка
@@ -148,7 +185,8 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
value={form.description} value={form.description}
onChange={e => set("description", e.target.value)} onChange={e => set("description", e.target.value)}
/> />
{errors.description && <p className="f-err-msg">{errors.description}</p>} {errors.description && <p
className="f-err-msg">{errors.description}</p>}
</div> </div>
{/* Фотография: превью + удаление или загрузчик */} {/* Фотография: превью + удаление или загрузчик */}
@@ -156,24 +194,27 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
<label className="f-m-label">Фотография</label> <label className="f-m-label">Фотография</label>
{displayImage ? ( {displayImage ? (
<div className="f-img-preview-wrap"> <div className="f-img-preview-wrap">
<img src={displayImage} alt="preview" className="f-img-preview" /> <img src={displayImage} alt="preview"
className="f-img-preview"/>
<button <button
className="f-img-remove" className="f-img-remove"
onClick={removeImage} onClick={removeImage}
type="button" type="button"
aria-label="Удалить фото" aria-label="Удалить фото"
> >
<CloseIcon /> <CloseIcon/>
</button> </button>
</div> </div>
) : ( ) : (
<label className="f-img-upload-label" aria-disabled={compressing}> <label className="f-img-upload-label"
aria-disabled={compressing}>
<input <input
ref={fileInputRef} ref={fileInputRef}
type="file" type="file"
accept={ACCEPT} accept={ACCEPT}
// На мобильных открываем камеру напрямую // На мобильных открываем камеру напрямую
capture={/Mobi|Android|iPhone/i.test(navigator.userAgent) ? "environment" : undefined} capture={/Mobi|Android|iPhone/i.test(navigator.userAgent)
? "environment" : undefined}
onChange={handleFileChange} onChange={handleFileChange}
className="f-img-input" className="f-img-input"
disabled={compressing} disabled={compressing}
@@ -197,18 +238,38 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
<option value="">Выбрать...</option> <option value="">Выбрать...</option>
{CATEGORIES.map(c => <option key={c} value={c}>{c}</option>)} {CATEGORIES.map(c => <option key={c} value={c}>{c}</option>)}
</select> </select>
{errors.category && <p className="f-err-msg">{errors.category}</p>} {errors.category && <p
className="f-err-msg">{errors.category}</p>}
</div> </div>
</div> </div>
{/* Карта — заглушка, будет в следующей версии */} {/* Карта */}
<div className="f-m-group"> <div className="f-m-group">
<label className="f-m-label">Место на карте</label> <label className="f-m-label">Место на карте</label>
<div className="f-map-pick"> <div style={{
<PinIcon size={14} /> width: "100%",
Нажмите, чтобы отметить место height: 260,
borderRadius: 8,
overflow: "hidden"
}}>
<div ref={mapRef} style={{width: "100%", height: "100%"}}/>
</div> </div>
<p className="f-hint">Карта будет добавлена в следующей версии</p>
{!coords && <p className="f-hint">Нажмите на карту, чтобы отметить
место</p>}
{errors.map && <p className="f-err-msg">{errors.map}</p>}
</div>
<div className="f-m-group">
<label className="f-m-label">Адрес</label>
<input
className={`f-m-field${errors.address ? " err" : ""}`}
type="text"
placeholder="Например: Москва, ул. Ленина, 5"
value={form.address}
onChange={e => set("address", e.target.value)}
/>
{errors.address && <p className="f-err-msg">{errors.address}</p>}
</div> </div>
{/* Телефон с автоматической маской */} {/* Телефон с автоматической маской */}
@@ -227,9 +288,10 @@ export default function CreateUpdatePost({ onClose, onSuccess, initialData }) {
{/* Глобальная ошибка API (не связана с конкретным полем) */} {/* Глобальная ошибка API (не связана с конкретным полем) */}
{apiError && <p className="f-err-msg">{apiError}</p>} {apiError && <p className="f-err-msg">{apiError}</p>}
<button className="f-m-submit" onClick={handleSubmit} disabled={loading}> <button className="f-m-submit" onClick={handleSubmit}
disabled={loading}>
<div className="f-m-submit-row"> <div className="f-m-submit-row">
{loading && <div className="f-m-spinner" />} {loading && <div className="f-m-spinner"/>}
{isEdit ? "Сохранить изменения" : "Разместить объявление"} {isEdit ? "Сохранить изменения" : "Разместить объявление"}
</div> </div>
</button> </button>

View File

@@ -8,39 +8,39 @@ import { API_URL } from "../config/authConstants";
export default function PostOnFeed({ ad, liked, onLike, onEdit }) { export default function PostOnFeed({ ad, liked, onLike, onEdit }) {
const imageUrl = ad.images?.[0] ? `${API_URL}${ad.images[0]}` : null; const imageUrl = ad.images?.[0] ? `${API_URL}${ad.images[0]}` : null;
// ✅ Формируем строку адреса из city + district
const address = [ad.city, ad.district].filter(Boolean).join(", ");
const createdAt = ad.createdAt
? new Date(ad.createdAt).toLocaleDateString("ru-RU")
: null;
return ( return (
<div className="f-card"> <div className="f-card">
<div className="f-card-inner"> <div className="f-card-inner">
{/* Левая колонка — картинка */}
<div className="f-card-img"> <div className="f-card-img">
{imageUrl {imageUrl
? <img src={imageUrl} alt={ad.title} /> ? <img src={imageUrl} alt={ad.title} />
: <span className="f-card-emoji">{ad.emoji || "📋"}</span> : <span className="f-card-emoji">{ad.emoji || "📋"}</span>
} }
</div> </div>
{/* Правая колонка — контент */}
<div className="f-card-body"> <div className="f-card-body">
<div className="f-card-badges"> <div className="f-card-badges">
{ad.category && <div className="f-cat-badge">{ad.category}</div>} {ad.category && <div className="f-cat-badge">{ad.category}</div>}
<div className={`f-type-badge ${ad.type === "loss" ? "f-type-loss" <div className={`f-type-badge ${ad.type === "loss" ? "f-type-loss" : "f-type-found"}`}>
: "f-type-found"}`}>
{ad.type === "loss" ? "Потеря" : "Находка"} {ad.type === "loss" ? "Потеря" : "Находка"}
</div> </div>
</div> </div>
<div className="f-card-title">{ad.title}</div> <div className="f-card-title">{ad.title}</div>
<div className="f-card-desc">{ad.description}</div> <div className="f-card-desc">{ad.description}</div>
<div className="f-card-meta"> <div className="f-card-meta">
{ad.location && <div className="f-meta-pill"> {/* ✅ address вместо ad.location */}
<PinIcon/> {ad.location}</div>} {address && <div className="f-meta-pill"><PinIcon /> {address}</div>}
{ad.date && <div className="f-meta-pill"><CalendarIcon/> {ad.date} {/* ✅ createdAt вместо ad.date */}
</div>} {createdAt && <div className="f-meta-pill"><CalendarIcon /> {createdAt}</div>}
</div> </div>
{ad.location && ( {address && (
<button className="f-card-map" <button className="f-card-map" onClick={e => e.stopPropagation()}>
onClick={e => e.stopPropagation()}> <MapIcon /> Показать на карте — {address}
<MapIcon/> Показать на карте — {ad.location}
</button> </button>
)} )}
<div className="f-card-foot"> <div className="f-card-foot">
@@ -48,34 +48,25 @@ export default function PostOnFeed({ ad, liked, onLike, onEdit }) {
{ad.phone && ( {ad.phone && (
<a className="f-card-phone" href={`tel:${ad.phone}`} <a className="f-card-phone" href={`tel:${ad.phone}`}
onClick={e => e.stopPropagation()}> onClick={e => e.stopPropagation()}>
<PhoneIcon/> {ad.phone} <PhoneIcon /> {ad.phone}
</a> </a>
)} )}
</div> </div>
<div className="f-card-foot-right"> <div className="f-card-foot-right">
{onEdit && ( {onEdit && (
<button <button className="f-like-btn"
className="f-like-btn" onClick={e => { e.stopPropagation(); onEdit(ad); }}>
onClick={e => { ✏️
e.stopPropagation(); </button>
onEdit(ad);
}}
>✏️</button>
)} )}
<button <button className={`f-like-btn${liked ? " liked" : ""}`}
className={`f-like-btn${liked ? " liked" : ""}`} onClick={e => { e.stopPropagation(); onLike(ad.id); }}>
onClick={e => { <HeartIcon filled={liked} />
e.stopPropagation();
onLike(ad.id);
}}
>
<HeartIcon filled={liked}/>
{liked ? (ad.likes || 0) + 1 : (ad.likes || 0)} {liked ? (ad.likes || 0) + 1 : (ad.likes || 0)}
</button> </button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
); );

View File

@@ -26,4 +26,5 @@ export const EMPTY_FORM = {
location: "", location: "",
phone: "", phone: "",
date: "", date: "",
address: ""
}; };

102
src/hooks/useYandexMap.js Normal file
View File

@@ -0,0 +1,102 @@
import { useEffect, useRef, useState } from "react";
export function useYandexMap(enabled, initialCoords = null, initialAddress = "") {
const mapRef = useRef(null);
const ymapRef = useRef(null);
const placemarkRef = useRef(null);
const initializedRef = useRef(false); // защита от двойного вызова StrictMode
const [coords, setCoords] = useState(initialCoords);
const [address, setAddress] = useState(initialAddress ?? "");
const addressRef = useRef(initialAddress ?? ""); // ← добавьте
const resolveAddress = (lat, lng) => {
fetch(
`https://geocode-maps.yandex.ru/1.x/?apikey=c2d3c717-a109-4494-8863-7edbc32044e3&geocode=${lng},${lat}&format=json&lang=ru_RU`
)
.then(r => r.json())
.then(data => {
const found =
data?.response?.GeoObjectCollection?.featureMember?.[0]
?.GeoObject?.metaDataProperty?.GeocoderMetaData?.text;
const resolved = found || `${lat.toFixed(5)}, ${lng.toFixed(5)}`;
setAddress(resolved);
addressRef.current = resolved;
})
.catch(() => {
const fallback = `${lat.toFixed(5)}, ${lng.toFixed(5)}`;
setAddress(fallback);
addressRef.current = fallback;
});
};
useEffect(() => {
if (!enabled || !mapRef.current) return;
if (initializedRef.current) return; // уже инициализировали
initializedRef.current = true;
const init = () => {
// Если карта уже создана — не создаём снова
if (ymapRef.current) return;
const center = initialCoords
? [initialCoords.latitude, initialCoords.longitude]
: [55.751574, 37.573856];
const map = new window.ymaps.Map(mapRef.current, {
center,
zoom: 14,
controls: ["zoomControl", "geolocationControl"],
});
ymapRef.current = map;
if (initialCoords) {
const pm = new window.ymaps.Placemark(center, {}, { draggable: true });
map.geoObjects.add(pm);
placemarkRef.current = pm;
resolveAddress(initialCoords.latitude, initialCoords.longitude);
pm.events.add("dragend", () => {
const [lat, lng] = pm.geometry.getCoordinates();
setCoords({ latitude: lat, longitude: lng });
resolveAddress(lat, lng);
});
}
map.events.add("click", e => {
const [lat, lng] = e.get("coords");
setCoords({ latitude: lat, longitude: lng });
resolveAddress(lat, lng);
if (placemarkRef.current) {
placemarkRef.current.geometry.setCoordinates([lat, lng]);
} else {
const pm = new window.ymaps.Placemark([lat, lng], {}, { draggable: true });
map.geoObjects.add(pm);
placemarkRef.current = pm;
pm.events.add("dragend", () => {
const [la, ln] = pm.geometry.getCoordinates();
setCoords({ latitude: la, longitude: ln });
resolveAddress(la, ln);
});
}
});
};
if (window.ymaps?.ready) {
window.ymaps.ready(init);
}
return () => {
// Уничтожаем карту только при размонтировании компонента
ymapRef.current?.destroy();
ymapRef.current = null;
placemarkRef.current = null;
initializedRef.current = false;
};
}, [enabled]);
return { mapRef, coords, address, addressRef };
}