} variant="light" radius="full" isIconOnly />
} variant="light" radius="full" isIconOnly />
{mainButton}
diff --git a/pcomparator/src/core/pwa/Install.tsx b/pcomparator/src/core/pwa/Install.tsx
new file mode 100644
index 0000000..c1d0172
--- /dev/null
+++ b/pcomparator/src/core/pwa/Install.tsx
@@ -0,0 +1,164 @@
+"use client";
+
+import { Trans } from "@lingui/macro";
+import {
+ Button,
+ Card,
+ CardBody,
+ Checkbox,
+ Modal,
+ ModalBody,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+ useDisclosure
+} from "@nextui-org/react";
+import { ExternalLink, Info } from "lucide-react";
+import dynamic from "next/dynamic";
+import { useEffect } from "react";
+import useIosInstallPrompt from "~/core/pwa/useIos";
+import useWebInstallPrompt from "~/core/pwa/useWebInstall";
+
+const InstallPrompt = () => {
+ const [iosInstallPrompt, handleIOSInstallDeclined] = useIosInstallPrompt();
+ const [webInstallPrompt, handleWebInstallDeclined, handleWebInstallAccepted] = useWebInstallPrompt();
+ const { isOpen, onClose, onOpen, onOpenChange } = useDisclosure();
+
+ useEffect(() => {
+ if (!iosInstallPrompt && !webInstallPrompt) return;
+ setTimeout(onOpen, 3000);
+ }, [webInstallPrompt, iosInstallPrompt]);
+
+ if (!iosInstallPrompt && !webInstallPrompt) return null;
+
+ return (
+
+
+ {iosInstallPrompt ? (
+ <>
+
+ Install Our App for a Better Experience!
+
+
+
+ Get faster access, work offline, and enjoy a smoother experience.
+
+
+
+
+
+
+ App can not be automatically installed on Ios
+
+
+ Tap
+
+ then "Add to Home Screen"
+
+
+
+
+
+ -
+
+ Instant access with one tap
+
+
+ -
+
+ No need for app store downloads
+
+
+ -
+
+ Works offline and loads faster
+
+
+ -
+
+ Stay updated with notifications
+
+
+
+
+
+
+
+
+
+ ) : webInstallPrompt ? (
+ <>
+
+ Install Our App for a Better Experience!
+
+
+
+ Get faster access, work offline, and enjoy a smoother experience.
+
+
+ -
+
+ Instant access with one tap
+
+
+ -
+
+ No need for app store downloads
+
+
+ -
+
+ Works offline and loads faster
+
+
+ -
+
+ Stay updated with notifications
+
+
+
+
+
+
+
+
+
+ ) : null}
+
+
+ );
+};
+
+export const InstallPWA = dynamic(() => Promise.resolve(InstallPrompt), {
+ ssr: false
+});
diff --git a/pcomparator/src/core/pwa/useIos.ts b/pcomparator/src/core/pwa/useIos.ts
new file mode 100644
index 0000000..b01bd83
--- /dev/null
+++ b/pcomparator/src/core/pwa/useIos.ts
@@ -0,0 +1,23 @@
+import useShouldShowPrompt from "~/core/pwa/useShouldShow";
+
+const iosInstallPromptedAt = "iosInstallPromptedAt";
+
+const isIOS = (): boolean => {
+ // @ts-ignore
+ if (navigator.standalone) {
+ //user has already installed the app
+ return false;
+ }
+ const ua = window.navigator.userAgent;
+ const isIPad = !!ua.match(/iPad/i);
+ const isIPhone = !!ua.match(/iPhone/i);
+ return isIPad || isIPhone;
+};
+
+const useIosInstallPrompt = (): [boolean, () => void] => {
+ const [userShouldBePromptedToInstall, handleUserSeeingInstallPrompt] =
+ useShouldShowPrompt(iosInstallPromptedAt);
+
+ return [isIOS() && userShouldBePromptedToInstall, handleUserSeeingInstallPrompt];
+};
+export default useIosInstallPrompt;
diff --git a/pcomparator/src/core/pwa/useShouldShow.ts b/pcomparator/src/core/pwa/useShouldShow.ts
new file mode 100644
index 0000000..3809b4d
--- /dev/null
+++ b/pcomparator/src/core/pwa/useShouldShow.ts
@@ -0,0 +1,35 @@
+import moment from "moment";
+import { useState } from "react";
+
+const getInstallPromptLastSeenAt = (promptName: string): string => localStorage.getItem(promptName)!;
+
+const setInstallPromptSeenToday = (promptName: string): void => {
+ const today = moment().toISOString();
+ localStorage.setItem(promptName, today);
+};
+
+function getUserShouldBePromptedToInstall(
+ promptName: string,
+ daysToWaitBeforePromptingAgain: number
+): boolean {
+ const lastPrompt = moment(getInstallPromptLastSeenAt(promptName));
+ const daysSinceLastPrompt = moment().diff(lastPrompt, "days");
+ return Number.isNaN(daysSinceLastPrompt) || daysSinceLastPrompt > daysToWaitBeforePromptingAgain;
+}
+
+const useShouldShowPrompt = (
+ promptName: string,
+ daysToWaitBeforePromptingAgain = 30
+): [boolean, () => void] => {
+ const [userShouldBePromptedToInstall, setUserShouldBePromptedToInstall] = useState(
+ getUserShouldBePromptedToInstall(promptName, daysToWaitBeforePromptingAgain)
+ );
+
+ const handleUserSeeingInstallPrompt = () => {
+ setUserShouldBePromptedToInstall(false);
+ setInstallPromptSeenToday(promptName);
+ };
+
+ return [userShouldBePromptedToInstall, handleUserSeeingInstallPrompt];
+};
+export default useShouldShowPrompt;
diff --git a/pcomparator/src/core/pwa/useWebInstall.ts b/pcomparator/src/core/pwa/useWebInstall.ts
new file mode 100644
index 0000000..c5d38b5
--- /dev/null
+++ b/pcomparator/src/core/pwa/useWebInstall.ts
@@ -0,0 +1,42 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import useShouldShowPrompt from "~/core/pwa/useShouldShow";
+
+const webInstallPromptedAt = "webInstallPromptedAt";
+
+const useWebInstallPrompt = (): [any, () => void, () => void] => {
+ const [installPromptEvent, setInstallPromptEvent] = useState
(null);
+ const [userShouldBePromptedToInstall, handleUserSeeingInstallPrompt] =
+ useShouldShowPrompt(webInstallPromptedAt);
+
+ useEffect(() => {
+ const beforeInstallPromptHandler = (event: any) => {
+ event.preventDefault();
+
+ if (userShouldBePromptedToInstall) {
+ setInstallPromptEvent(event);
+ }
+ };
+ window.addEventListener("beforeinstallprompt", beforeInstallPromptHandler);
+ return () => window.removeEventListener("beforeinstallprompt", beforeInstallPromptHandler);
+ }, [userShouldBePromptedToInstall]);
+
+ const handleInstallDeclined = () => {
+ handleUserSeeingInstallPrompt();
+ setInstallPromptEvent(null);
+ };
+
+ const handleInstallAccepted = () => {
+ installPromptEvent.prompt();
+
+ installPromptEvent.userChoice.then((choice: any) => {
+ if (choice.outcome !== "accepted") {
+ handleUserSeeingInstallPrompt();
+ }
+ setInstallPromptEvent(null);
+ });
+ };
+ return [installPromptEvent, handleInstallDeclined, handleInstallAccepted];
+};
+export default useWebInstallPrompt;
diff --git a/pcomparator/src/middleware.ts b/pcomparator/src/middleware.ts
index bdbc6c4..28c1972 100644
--- a/pcomparator/src/middleware.ts
+++ b/pcomparator/src/middleware.ts
@@ -36,5 +36,5 @@ export default async (request: NextRequest) => {
};
export const config = {
- matcher: ["/((?!api|_next/static|_next/image|favicon.ico|manifest|static/*).*)"]
+ matcher: ["/((?!api|_next/static|_next/image|favicon.ico|manifest|static/*|robots|sw|workbox-*).*)"]
};
diff --git a/pcomparator/src/translations/messages/en.po b/pcomparator/src/translations/messages/en.po
index ff03ac9..f17022d 100644
--- a/pcomparator/src/translations/messages/en.po
+++ b/pcomparator/src/translations/messages/en.po
@@ -79,6 +79,7 @@ msgstr "Click on the avatar to upload a custom one from your files."
msgid "Close"
msgstr "Close"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
msgid "Custom location"
msgstr "Custom location"
@@ -141,6 +142,11 @@ msgstr "Environment"
msgid "Fullname updated"
msgstr "Fullname updated"
+#: src/core/pwa/Install.tsx
+#: src/core/pwa/Install.tsx
+msgid "Get faster access, work offline, and enjoy a smoother experience."
+msgstr "Get faster access, work offline, and enjoy a smoother experience."
+
#: src/applications/Prices/Ui/ListPrices/CardPrice/SeeMoreModal.tsx
msgid "Health"
msgstr "Health"
@@ -153,6 +159,11 @@ msgstr "Hello {0}"
msgid "I understand, delete my account"
msgstr "I understand, delete my account"
+#: src/core/pwa/Install.tsx
+#: src/core/pwa/Install.tsx
+msgid "Install Our App for a Better Experience!"
+msgstr "Install Our App for a Better Experience!"
+
#: src/applications/Profile/Ui/Settings/DisplayName.tsx
msgid "Invalid display name."
msgstr "Invalid display name."
@@ -169,7 +180,8 @@ msgstr "Light"
msgid "Location"
msgstr "Location"
-#: src/applications/Products/Ui/NewProduct/NewProduct.tsx
+#: src/core/pwa/Install.tsx
+#: src/core/pwa/Install.tsx
msgid "Maybe later"
msgstr "Maybe later"
@@ -177,7 +189,12 @@ msgstr "Maybe later"
msgid "My Prices"
msgstr "My Prices"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step1/TypeBarcode.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step2/Price.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step3/Proof.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
+#: src/components/Form/FormActions.tsx
msgid "Next"
msgstr "Next"
@@ -214,10 +231,15 @@ msgstr "Please enter your full name, or a display name you are comfortable with.
msgid "Please use 32 characters at maximum."
msgstr "Please use 32 characters at maximum."
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step2/Price.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step3/Proof.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
msgid "Previous"
msgstr "Previous"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step2/Price.tsx
+#: src/applications/Prices/Ui/NewPrice/NewPiceModal.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Price.tsx
msgid "Price"
msgstr "Price"
@@ -267,6 +289,7 @@ msgstr "Save"
msgid "Scan barcode"
msgstr "Scan barcode"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
msgid "Search"
msgstr "Search"
diff --git a/pcomparator/src/translations/messages/fr.po b/pcomparator/src/translations/messages/fr.po
index 8cb05f3..7d809ae 100644
--- a/pcomparator/src/translations/messages/fr.po
+++ b/pcomparator/src/translations/messages/fr.po
@@ -79,6 +79,7 @@ msgstr "Cliquer sur avatar pour ajouter un depuis vos fichier."
msgid "Close"
msgstr "Fermer"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
msgid "Custom location"
msgstr "Localisation personsalisée"
@@ -141,6 +142,11 @@ msgstr "Environnement"
msgid "Fullname updated"
msgstr "Nom complet mis à jour."
+#: src/core/pwa/Install.tsx
+#: src/core/pwa/Install.tsx
+msgid "Get faster access, work offline, and enjoy a smoother experience."
+msgstr "Accédez plus rapidement, travaillez hors ligne et profitez d'une expérience plus fluide."
+
#: src/applications/Prices/Ui/ListPrices/CardPrice/SeeMoreModal.tsx
msgid "Health"
msgstr "Santé"
@@ -153,6 +159,11 @@ msgstr "Bonjour {0}"
msgid "I understand, delete my account"
msgstr "Je comprends, supprimez mon compte."
+#: src/core/pwa/Install.tsx
+#: src/core/pwa/Install.tsx
+msgid "Install Our App for a Better Experience!"
+msgstr "Installez notre application pour une meilleure expérience !"
+
#: src/applications/Profile/Ui/Settings/DisplayName.tsx
msgid "Invalid display name."
msgstr "Nom d'affichage invalide."
@@ -169,7 +180,8 @@ msgstr "Clair"
msgid "Location"
msgstr "Localisation"
-#: src/applications/Products/Ui/NewProduct/NewProduct.tsx
+#: src/core/pwa/Install.tsx
+#: src/core/pwa/Install.tsx
msgid "Maybe later"
msgstr "Peut-être plus tard"
@@ -177,7 +189,12 @@ msgstr "Peut-être plus tard"
msgid "My Prices"
msgstr "Mes prix"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step1/TypeBarcode.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step2/Price.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step3/Proof.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
+#: src/components/Form/FormActions.tsx
msgid "Next"
msgstr "Suivant"
@@ -214,10 +231,15 @@ msgstr "Veuillez entrer votre nom complet, ou un nom d'affichage avec lequel vou
msgid "Please use 32 characters at maximum."
msgstr "Veuillez utiliser 32 caractères maximum."
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step2/Price.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step3/Proof.tsx
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
msgid "Previous"
msgstr "Précédent"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step2/Price.tsx
+#: src/applications/Prices/Ui/NewPrice/NewPiceModal.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Price.tsx
msgid "Price"
msgstr "Prix"
@@ -267,6 +289,7 @@ msgstr "Sauvegarder"
msgid "Scan barcode"
msgstr "Scanner code-barre"
+#: src/applications/Prices/Ui/NewPrice/FormSteps/Step4/Location.tsx
#: src/applications/Prices/Ui/NewQuickPrice/FormSteps/Location.tsx
msgid "Search"
msgstr "Recherche"
diff --git a/pcomparator/yarn.lock b/pcomparator/yarn.lock
index a3f6e83..7bc28d4 100644
--- a/pcomparator/yarn.lock
+++ b/pcomparator/yarn.lock
@@ -1669,6 +1669,13 @@ __metadata:
languageName: node
linkType: hard
+"@dotmind/react-use-pwa@npm:^1.0.4":
+ version: 1.0.4
+ resolution: "@dotmind/react-use-pwa@npm:1.0.4"
+ checksum: e040cd4ed3d50f05d8c416234f21ea208480c1ee3cdff2e1a4edde6d42a2dc3e87d250bea1628d3a50ed787d7669f61c663526b9e0111fb7641d6368978395de
+ languageName: node
+ linkType: hard
+
"@ducanh2912/next-pwa@npm:^10.2.9":
version: 10.2.9
resolution: "@ducanh2912/next-pwa@npm:10.2.9"
@@ -15710,6 +15717,13 @@ __metadata:
languageName: node
linkType: hard
+"moment@npm:^2.30.1":
+ version: 2.30.1
+ resolution: "moment@npm:2.30.1"
+ checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6
+ languageName: node
+ linkType: hard
+
"moo-color@npm:^1.0.2":
version: 1.0.3
resolution: "moo-color@npm:1.0.3"
@@ -16971,6 +16985,7 @@ __metadata:
"@babel/core": ^7.24.4
"@babel/preset-react": ^7.24.1
"@babel/preset-typescript": ^7.24.1
+ "@dotmind/react-use-pwa": ^1.0.4
"@ducanh2912/next-pwa": ^10.2.9
"@imbios/next-pwa": ^1.1.1
"@lingui/cli": ^4.11.0
@@ -17027,6 +17042,7 @@ __metadata:
lint-staged: ^15.2.10
lodash: ^4.17.21
lucide-react: ^0.453.0
+ moment: ^2.30.1
next: 15.0.0
next-auth: beta
next-themes: ^0.3.0