feat(client): iOS install → prompt notification permission; phone input + localStorage fallback on /client (no token)
This commit is contained in:
parent
15132f56e8
commit
b2bd855de3
|
|
@ -1,10 +1,12 @@
|
|||
import React, { useState, useEffect, useRef } from "react";
|
||||
import React, { useState, useEffect } from "react";
|
||||
|
||||
const VAPID_PUBLIC_KEY = "BDLNGyVp7hDzRujZBncNQ0qyz4zVFAhAWX1nsCMRC2tagmer46Sy6exZOymsGVk-TDb1bhkkXXth9Jkzdv4SdJg";
|
||||
|
||||
const SUPABASE_URL = import.meta.env.VITE_SUPABASE_URL || "";
|
||||
const SUPABASE_ANON_KEY = import.meta.env.VITE_SUPABASE_ANON_KEY || "";
|
||||
|
||||
const PHONE_STORAGE_KEY = "supersam_phone";
|
||||
|
||||
const getEndpoint = (action) => `${SUPABASE_URL}/functions/v1/${action}`;
|
||||
const apiHeaders = {
|
||||
"Content-Type": "application/json",
|
||||
|
|
@ -19,6 +21,14 @@ const normalizePhone = (phone) => {
|
|||
return clean;
|
||||
};
|
||||
|
||||
const readStoredPhone = () => {
|
||||
try {
|
||||
return window.localStorage.getItem(PHONE_STORAGE_KEY) || "";
|
||||
} catch {
|
||||
return "";
|
||||
}
|
||||
};
|
||||
|
||||
const urlBase64ToUint8Array = (base64String) => {
|
||||
const padding = "=".repeat((4 - base64String.length % 4) % 4);
|
||||
const base64 = (base64String + padding).replace(/-/g, "+").replace(/_/g, "/");
|
||||
|
|
@ -33,7 +43,25 @@ const urlBase64ToUint8Array = (base64String) => {
|
|||
export const PushSubscriptionBanner = ({ phone, orderGroupId }) => {
|
||||
const [status, setStatus] = useState("idle"); // idle | prompting | subscribed | denied | unsupported
|
||||
const [dismissed, setDismissed] = useState(false);
|
||||
const phoneNorm = normalizePhone(phone);
|
||||
const [phoneInput, setPhoneInput] = useState("");
|
||||
|
||||
// Persist a known phone so the installed app (which opens without a token)
|
||||
// can still subscribe. Prefer prop, fall back to stored value.
|
||||
const propPhone = normalizePhone(phone);
|
||||
const storedPhone = propPhone || readStoredPhone();
|
||||
|
||||
useEffect(() => {
|
||||
if (propPhone) {
|
||||
try {
|
||||
window.localStorage.setItem(PHONE_STORAGE_KEY, propPhone);
|
||||
} catch (e) {
|
||||
// localStorage unavailable (private mode) — ignore
|
||||
void e;
|
||||
}
|
||||
}
|
||||
}, [propPhone]);
|
||||
|
||||
const phoneNorm = storedPhone || normalizePhone(phoneInput);
|
||||
|
||||
// Detect iOS Safari (not in standalone mode = not added to Home Screen)
|
||||
const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
|
||||
|
|
@ -57,10 +85,23 @@ export const PushSubscriptionBanner = ({ phone, orderGroupId }) => {
|
|||
if (existing) {
|
||||
setStatus("subscribed");
|
||||
}
|
||||
}).catch(() => {});
|
||||
}).catch(() => undefined);
|
||||
}, []);
|
||||
|
||||
const subscribe = async () => {
|
||||
const resolvedPhone = normalizePhone(phoneInput) || storedPhone;
|
||||
if (!resolvedPhone) {
|
||||
setStatus("need_phone");
|
||||
return;
|
||||
}
|
||||
if (resolvedPhone !== storedPhone) {
|
||||
try {
|
||||
window.localStorage.setItem(PHONE_STORAGE_KEY, resolvedPhone);
|
||||
} catch (e) {
|
||||
// localStorage unavailable — ignore
|
||||
void e;
|
||||
}
|
||||
}
|
||||
try {
|
||||
setStatus("prompting");
|
||||
const reg = await navigator.serviceWorker.ready;
|
||||
|
|
@ -78,7 +119,7 @@ export const PushSubscriptionBanner = ({ phone, orderGroupId }) => {
|
|||
method: "POST",
|
||||
headers: apiHeaders,
|
||||
body: JSON.stringify({
|
||||
phone_normalized: phoneNorm,
|
||||
phone_normalized: resolvedPhone,
|
||||
endpoint: sub.endpoint,
|
||||
p256dh: sub.keys?.p256dh || "",
|
||||
auth: sub.keys?.auth || "",
|
||||
|
|
@ -126,7 +167,7 @@ export const PushSubscriptionBanner = ({ phone, orderGroupId }) => {
|
|||
};
|
||||
|
||||
// Don't render if unsupported, dismissed, or no phone
|
||||
if (status === "unsupported" || !phoneNorm) return null;
|
||||
if (status === "unsupported") return null;
|
||||
if (dismissed && status !== "subscribed" && status !== "denied") return null;
|
||||
|
||||
// iOS not installed — show instruction to add to Home Screen
|
||||
|
|
@ -209,6 +250,42 @@ export const PushSubscriptionBanner = ({ phone, orderGroupId }) => {
|
|||
);
|
||||
}
|
||||
|
||||
// Need a phone number to subscribe (opened the installed app without a token)
|
||||
if (status === "need_phone" || (!phoneNorm && !isIOSNotInstalled)) {
|
||||
return (
|
||||
<div className="rounded-xl border border-[rgba(18,128,92,0.2)] bg-[var(--color-accent-soft)] px-4 py-3">
|
||||
<div className="flex items-start gap-2.5">
|
||||
<span className="text-base flex-shrink-0 mt-0.5">🔔</span>
|
||||
<div className="flex-1">
|
||||
<p className="text-sm font-semibold text-[var(--color-text)]">
|
||||
Включить уведомления о доставке
|
||||
</p>
|
||||
<p className="text-xs text-[var(--color-text-muted)] mt-1 leading-5">
|
||||
Введите номер телефона, чтобы получать push-уведомления о заказе.
|
||||
</p>
|
||||
<div className="mt-2 flex items-center gap-2">
|
||||
<input
|
||||
type="tel"
|
||||
inputMode="tel"
|
||||
placeholder="+7 (___) ___-__-__"
|
||||
value={phoneInput}
|
||||
onChange={(e) => setPhoneInput(e.target.value)}
|
||||
className="min-w-0 flex-1 rounded-xl border border-[var(--color-border)] bg-[var(--color-bg)] px-3 py-2 text-sm text-[var(--color-text)] outline-none transition focus:border-[var(--color-accent)]"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
onClick={subscribe}
|
||||
className="flex-shrink-0 rounded-xl bg-[var(--color-accent)] px-4 py-2 text-sm font-semibold text-white transition hover:opacity-90"
|
||||
>
|
||||
Разрешить
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Idle — show subscription banner
|
||||
return (
|
||||
<div className="rounded-xl border border-[rgba(18,128,92,0.2)] bg-[var(--color-accent-soft)] px-4 py-3">
|
||||
|
|
|
|||
|
|
@ -362,6 +362,10 @@ export const ClientDeliveryPage = () => {
|
|||
Она приходит в сообщении от «СуперСам». Данные заказа без персональной ссылки не отображаются.
|
||||
</p>
|
||||
</div>
|
||||
<PushSubscriptionBanner
|
||||
phone=""
|
||||
orderGroupId={null}
|
||||
/>
|
||||
</Panel>
|
||||
</div>
|
||||
</main>
|
||||
|
|
|
|||
Loading…
Reference in New Issue