@wasto/cms-components 1.5.10 → 1.5.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +47 -47
- package/dist/index.d.mts +103 -2
- package/dist/index.d.ts +103 -2
- package/dist/index.js +2861 -2442
- package/dist/index.mjs +3651 -3227
- package/package.json +2 -2
- package/src/components/announcement-modal/AnnouncementModal.tsx +183 -183
- package/src/components/article/Article.tsx +21 -21
- package/src/components/article/ArticleCard.tsx +81 -81
- package/src/components/article/ArticleExcerpts.tsx +80 -80
- package/src/components/article/ArticleList.tsx +114 -114
- package/src/components/article/ArticleMarkdown.tsx +170 -170
- package/src/components/article/ArticleReaderModal.tsx +93 -93
- package/src/components/article/ArticleSingle.tsx +57 -57
- package/src/components/bottom-tab/BottomTab.tsx +392 -392
- package/src/components/button/Button.tsx +154 -154
- package/src/components/challenge/Badges.tsx +84 -84
- package/src/components/challenge/BadgesModal.tsx +166 -166
- package/src/components/challenge/Challenge.tsx +380 -380
- package/src/components/challenge/ChallengeModal.tsx +231 -231
- package/src/components/challenge/ChallengeVignette.tsx +249 -249
- package/src/components/challenge/ChallengesModal.tsx +243 -243
- package/src/components/challenge/QuizModal.tsx +381 -381
- package/src/components/challenge/ResultModal.tsx +144 -144
- package/src/components/chat/Chat.tsx +928 -928
- package/src/components/collection-calendar/CollectionCalendar.tsx +274 -274
- package/src/components/columns/Columns.tsx +33 -33
- package/src/components/consignes-modal/ConsignesModal.tsx +267 -267
- package/src/components/content-inset/ContentInset.tsx +33 -33
- package/src/components/header/Header.tsx +391 -391
- package/src/components/image/Image.tsx +15 -15
- package/src/components/image/ImageFrame.tsx +102 -102
- package/src/components/image/ImageMedia.tsx +31 -31
- package/src/components/image/ImageUrl.tsx +30 -30
- package/src/components/locations-map/LocationSheet.tsx +417 -417
- package/src/components/locations-map/LocationsMap.native.tsx +260 -260
- package/src/components/locations-map/LocationsMap.tsx +13 -13
- package/src/components/locations-map/LocationsMap.web.tsx +10 -10
- package/src/components/locations-map/LocationsMapShell.tsx +527 -527
- package/src/components/locations-map/LocationsMapView.tsx +108 -108
- package/src/components/locations-map/LocationsMapView.web.tsx +331 -331
- package/src/components/nav-button/NavButton.tsx +59 -59
- package/src/components/next-collection/NextCollection.tsx +636 -621
- package/src/components/notifications/NotificationsScreen.tsx +247 -247
- package/src/components/page/Page.tsx +102 -64
- package/src/components/parapraph/Paragraph.tsx +67 -67
- package/src/components/profile/ProfileScreen.tsx +236 -236
- package/src/components/recycling-info/RecyclingInfo.tsx +189 -189
- package/src/components/safe-area/OptionalSafeAreaProvider.tsx +17 -17
- package/src/components/search/Search.tsx +320 -320
- package/src/components/select-street-modal/SelectStreetModal.tsx +475 -475
- package/src/components/title/Title.tsx +100 -100
- package/src/components/vision/Vision.tsx +447 -447
- package/src/components/vision/VisionActionCard.tsx +117 -117
- package/src/components/vision/VisionCapture.tsx +30 -30
- package/src/components/vision/VisionTapOverlay.tsx +122 -122
- package/src/contexts/AnnouncementsContext.tsx +171 -171
- package/src/contexts/AppDataContext.tsx +458 -0
- package/src/contexts/ChallengesContext.tsx +182 -182
- package/src/contexts/LocalContext.tsx +227 -227
- package/src/contexts/ThemeContext.tsx +37 -37
- package/src/contexts/WastoContext.tsx +130 -127
- package/src/helpers/blogPost.ts +72 -72
- package/src/helpers/generateQuizQuestions.ts +247 -247
- package/src/helpers/getContrastColor.ts +18 -18
- package/src/helpers/haptics.ts +20 -20
- package/src/helpers/hoursSchedule.ts +230 -230
- package/src/helpers/htmlContentToMarkdown.ts +114 -114
- package/src/helpers/layout.ts +54 -54
- package/src/helpers/loadLinearGradient.ts +22 -22
- package/src/helpers/mapLocations.ts +170 -0
- package/src/helpers/maquetteTheme.ts +76 -76
- package/src/helpers/markdownUnderlinePlugin.ts +32 -32
- package/src/helpers/nextCollection.ts +122 -0
- package/src/helpers/normalizeWasteTypeRecyclingInfo.ts +80 -80
- package/src/helpers/publicMediaUrl.ts +8 -8
- package/src/helpers/resolveApiAssetUrl.ts +21 -21
- package/src/helpers/systemRoutes.ts +7 -7
- package/src/helpers/themeStyles.ts +114 -114
- package/src/helpers/ttlCache.ts +41 -0
- package/src/helpers/useSafeAreaPadding.ts +14 -14
- package/src/hooks/useBadges.ts +100 -100
- package/src/hooks/useBlogPosts.ts +109 -105
- package/src/hooks/useChallenges.ts +110 -110
- package/src/hooks/useCities.ts +56 -56
- package/src/hooks/useCityAnnouncements.ts +118 -118
- package/src/hooks/useCollectionCalendar.ts +421 -421
- package/src/hooks/useColumns.ts +19 -19
- package/src/hooks/useConsignes.ts +62 -62
- package/src/hooks/useLocations.ts +120 -248
- package/src/hooks/useNextCollection.ts +163 -238
- package/src/hooks/useRecyclingInfo.ts +90 -90
- package/src/hooks/useWastoClient.ts +16 -16
- package/src/index.ts +149 -142
- package/src/navigation/NavigationContext.tsx +56 -56
- package/src/sentry/initSentry.ts +120 -120
- package/src/types/Theme.ts +72 -72
- package/src/types/css-modules.d.ts +1 -1
|
@@ -1,118 +1,118 @@
|
|
|
1
|
-
import { useCallback, useEffect, useState } from "react";
|
|
2
|
-
import AsyncStorage from "@react-native-async-storage/async-storage";
|
|
3
|
-
import { useLocal } from "../contexts/LocalContext";
|
|
4
|
-
import { useWasto } from "../contexts/WastoContext";
|
|
5
|
-
import { useWastoClient } from "./useWastoClient";
|
|
6
|
-
import type { PublicAnnouncement } from "../contexts/AnnouncementsContext";
|
|
7
|
-
import { useAnnouncements } from "../contexts/AnnouncementsContext";
|
|
8
|
-
|
|
9
|
-
const DISMISSED_KEY = "dismissed_announcements";
|
|
10
|
-
const PAGE_SIZE = 20;
|
|
11
|
-
|
|
12
|
-
export type CityAnnouncementItem = PublicAnnouncement & {
|
|
13
|
-
unread: boolean;
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
async function readDismissedIds(): Promise<Set<string>> {
|
|
17
|
-
try {
|
|
18
|
-
const raw = await AsyncStorage.getItem(DISMISSED_KEY);
|
|
19
|
-
if (!raw) return new Set();
|
|
20
|
-
const parsed = JSON.parse(raw) as string[];
|
|
21
|
-
return new Set(Array.isArray(parsed) ? parsed : []);
|
|
22
|
-
} catch {
|
|
23
|
-
return new Set();
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
function resolveImageUrl(apiUrl: string, url?: string | null): string | null {
|
|
28
|
-
if (!url) return null;
|
|
29
|
-
if (url.startsWith("http://") || url.startsWith("https://")) return url;
|
|
30
|
-
const base = apiUrl.replace(/\/$/, "");
|
|
31
|
-
const path = url.startsWith("/") ? url : `/${url}`;
|
|
32
|
-
return `${base}${path}`;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
export function useCityAnnouncements() {
|
|
36
|
-
const { apiUrl } = useWasto();
|
|
37
|
-
const { selectedCityId, hasPlaceSelected } = useLocal();
|
|
38
|
-
const client = useWastoClient();
|
|
39
|
-
const { markAsRead: contextMarkAsRead, openAnnouncement } = useAnnouncements();
|
|
40
|
-
|
|
41
|
-
const [all, setAll] = useState<CityAnnouncementItem[]>([]);
|
|
42
|
-
const [visibleCount, setVisibleCount] = useState(PAGE_SIZE);
|
|
43
|
-
const [loading, setLoading] = useState(true);
|
|
44
|
-
const [error, setError] = useState<string | null>(null);
|
|
45
|
-
|
|
46
|
-
const reload = useCallback(async () => {
|
|
47
|
-
if (!selectedCityId || !hasPlaceSelected) {
|
|
48
|
-
setAll([]);
|
|
49
|
-
setLoading(false);
|
|
50
|
-
setError(null);
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
setLoading(true);
|
|
54
|
-
setError(null);
|
|
55
|
-
try {
|
|
56
|
-
const [list, dismissed] = await Promise.all([
|
|
57
|
-
client.public.announcements.listForCity(selectedCityId),
|
|
58
|
-
readDismissedIds(),
|
|
59
|
-
]);
|
|
60
|
-
const items: CityAnnouncementItem[] = (list ?? [])
|
|
61
|
-
.filter((a) => a?.id)
|
|
62
|
-
.map((a) => ({
|
|
63
|
-
...a,
|
|
64
|
-
imageUrl: resolveImageUrl(apiUrl, a.imageUrl),
|
|
65
|
-
unread: !dismissed.has(a.id),
|
|
66
|
-
}))
|
|
67
|
-
.sort((a, b) => {
|
|
68
|
-
const ta = a.sentAt ? new Date(a.sentAt).getTime() : 0;
|
|
69
|
-
const tb = b.sentAt ? new Date(b.sentAt).getTime() : 0;
|
|
70
|
-
return tb - ta;
|
|
71
|
-
});
|
|
72
|
-
setAll(items);
|
|
73
|
-
setVisibleCount(PAGE_SIZE);
|
|
74
|
-
} catch (e) {
|
|
75
|
-
setError(e instanceof Error ? e.message : "Impossible de charger les notifications");
|
|
76
|
-
setAll([]);
|
|
77
|
-
} finally {
|
|
78
|
-
setLoading(false);
|
|
79
|
-
}
|
|
80
|
-
}, [apiUrl, client.public.announcements, hasPlaceSelected, selectedCityId]);
|
|
81
|
-
|
|
82
|
-
useEffect(() => {
|
|
83
|
-
void reload();
|
|
84
|
-
}, [reload]);
|
|
85
|
-
|
|
86
|
-
const items = all.slice(0, visibleCount);
|
|
87
|
-
const hasMore = visibleCount < all.length;
|
|
88
|
-
|
|
89
|
-
const loadMore = useCallback(() => {
|
|
90
|
-
if (!hasMore) return;
|
|
91
|
-
setVisibleCount((n) => Math.min(n + PAGE_SIZE, all.length));
|
|
92
|
-
}, [all.length, hasMore]);
|
|
93
|
-
|
|
94
|
-
const openItem = useCallback(
|
|
95
|
-
async (item: CityAnnouncementItem) => {
|
|
96
|
-
openAnnouncement(item);
|
|
97
|
-
if (item.unread) {
|
|
98
|
-
await contextMarkAsRead(item.id);
|
|
99
|
-
setAll((prev) =>
|
|
100
|
-
prev.map((a) => (a.id === item.id ? { ...a, unread: false } : a)),
|
|
101
|
-
);
|
|
102
|
-
}
|
|
103
|
-
},
|
|
104
|
-
[contextMarkAsRead, openAnnouncement],
|
|
105
|
-
);
|
|
106
|
-
|
|
107
|
-
return {
|
|
108
|
-
items,
|
|
109
|
-
loading,
|
|
110
|
-
error,
|
|
111
|
-
hasMore,
|
|
112
|
-
loadMore,
|
|
113
|
-
reload,
|
|
114
|
-
openItem,
|
|
115
|
-
hasPlaceSelected: !!hasPlaceSelected && !!selectedCityId,
|
|
116
|
-
totalCount: all.length,
|
|
117
|
-
};
|
|
118
|
-
}
|
|
1
|
+
import { useCallback, useEffect, useState } from "react";
|
|
2
|
+
import AsyncStorage from "@react-native-async-storage/async-storage";
|
|
3
|
+
import { useLocal } from "../contexts/LocalContext";
|
|
4
|
+
import { useWasto } from "../contexts/WastoContext";
|
|
5
|
+
import { useWastoClient } from "./useWastoClient";
|
|
6
|
+
import type { PublicAnnouncement } from "../contexts/AnnouncementsContext";
|
|
7
|
+
import { useAnnouncements } from "../contexts/AnnouncementsContext";
|
|
8
|
+
|
|
9
|
+
const DISMISSED_KEY = "dismissed_announcements";
|
|
10
|
+
const PAGE_SIZE = 20;
|
|
11
|
+
|
|
12
|
+
export type CityAnnouncementItem = PublicAnnouncement & {
|
|
13
|
+
unread: boolean;
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
async function readDismissedIds(): Promise<Set<string>> {
|
|
17
|
+
try {
|
|
18
|
+
const raw = await AsyncStorage.getItem(DISMISSED_KEY);
|
|
19
|
+
if (!raw) return new Set();
|
|
20
|
+
const parsed = JSON.parse(raw) as string[];
|
|
21
|
+
return new Set(Array.isArray(parsed) ? parsed : []);
|
|
22
|
+
} catch {
|
|
23
|
+
return new Set();
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function resolveImageUrl(apiUrl: string, url?: string | null): string | null {
|
|
28
|
+
if (!url) return null;
|
|
29
|
+
if (url.startsWith("http://") || url.startsWith("https://")) return url;
|
|
30
|
+
const base = apiUrl.replace(/\/$/, "");
|
|
31
|
+
const path = url.startsWith("/") ? url : `/${url}`;
|
|
32
|
+
return `${base}${path}`;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export function useCityAnnouncements() {
|
|
36
|
+
const { apiUrl } = useWasto();
|
|
37
|
+
const { selectedCityId, hasPlaceSelected } = useLocal();
|
|
38
|
+
const client = useWastoClient();
|
|
39
|
+
const { markAsRead: contextMarkAsRead, openAnnouncement } = useAnnouncements();
|
|
40
|
+
|
|
41
|
+
const [all, setAll] = useState<CityAnnouncementItem[]>([]);
|
|
42
|
+
const [visibleCount, setVisibleCount] = useState(PAGE_SIZE);
|
|
43
|
+
const [loading, setLoading] = useState(true);
|
|
44
|
+
const [error, setError] = useState<string | null>(null);
|
|
45
|
+
|
|
46
|
+
const reload = useCallback(async () => {
|
|
47
|
+
if (!selectedCityId || !hasPlaceSelected) {
|
|
48
|
+
setAll([]);
|
|
49
|
+
setLoading(false);
|
|
50
|
+
setError(null);
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
setLoading(true);
|
|
54
|
+
setError(null);
|
|
55
|
+
try {
|
|
56
|
+
const [list, dismissed] = await Promise.all([
|
|
57
|
+
client.public.announcements.listForCity(selectedCityId),
|
|
58
|
+
readDismissedIds(),
|
|
59
|
+
]);
|
|
60
|
+
const items: CityAnnouncementItem[] = (list ?? [])
|
|
61
|
+
.filter((a) => a?.id)
|
|
62
|
+
.map((a) => ({
|
|
63
|
+
...a,
|
|
64
|
+
imageUrl: resolveImageUrl(apiUrl, a.imageUrl),
|
|
65
|
+
unread: !dismissed.has(a.id),
|
|
66
|
+
}))
|
|
67
|
+
.sort((a, b) => {
|
|
68
|
+
const ta = a.sentAt ? new Date(a.sentAt).getTime() : 0;
|
|
69
|
+
const tb = b.sentAt ? new Date(b.sentAt).getTime() : 0;
|
|
70
|
+
return tb - ta;
|
|
71
|
+
});
|
|
72
|
+
setAll(items);
|
|
73
|
+
setVisibleCount(PAGE_SIZE);
|
|
74
|
+
} catch (e) {
|
|
75
|
+
setError(e instanceof Error ? e.message : "Impossible de charger les notifications");
|
|
76
|
+
setAll([]);
|
|
77
|
+
} finally {
|
|
78
|
+
setLoading(false);
|
|
79
|
+
}
|
|
80
|
+
}, [apiUrl, client.public.announcements, hasPlaceSelected, selectedCityId]);
|
|
81
|
+
|
|
82
|
+
useEffect(() => {
|
|
83
|
+
void reload();
|
|
84
|
+
}, [reload]);
|
|
85
|
+
|
|
86
|
+
const items = all.slice(0, visibleCount);
|
|
87
|
+
const hasMore = visibleCount < all.length;
|
|
88
|
+
|
|
89
|
+
const loadMore = useCallback(() => {
|
|
90
|
+
if (!hasMore) return;
|
|
91
|
+
setVisibleCount((n) => Math.min(n + PAGE_SIZE, all.length));
|
|
92
|
+
}, [all.length, hasMore]);
|
|
93
|
+
|
|
94
|
+
const openItem = useCallback(
|
|
95
|
+
async (item: CityAnnouncementItem) => {
|
|
96
|
+
openAnnouncement(item);
|
|
97
|
+
if (item.unread) {
|
|
98
|
+
await contextMarkAsRead(item.id);
|
|
99
|
+
setAll((prev) =>
|
|
100
|
+
prev.map((a) => (a.id === item.id ? { ...a, unread: false } : a)),
|
|
101
|
+
);
|
|
102
|
+
}
|
|
103
|
+
},
|
|
104
|
+
[contextMarkAsRead, openAnnouncement],
|
|
105
|
+
);
|
|
106
|
+
|
|
107
|
+
return {
|
|
108
|
+
items,
|
|
109
|
+
loading,
|
|
110
|
+
error,
|
|
111
|
+
hasMore,
|
|
112
|
+
loadMore,
|
|
113
|
+
reload,
|
|
114
|
+
openItem,
|
|
115
|
+
hasPlaceSelected: !!hasPlaceSelected && !!selectedCityId,
|
|
116
|
+
totalCount: all.length,
|
|
117
|
+
};
|
|
118
|
+
}
|