correction request
This commit is contained in:
@@ -70,9 +70,7 @@ export default function CalendarScreen() {
|
||||
year: now.getFullYear(),
|
||||
month: now.getMonth() + 1,
|
||||
});
|
||||
const [selectedDay, setSelectedDay] = useState<string | null>(
|
||||
formatDate(now)
|
||||
);
|
||||
const [selectedDay, setSelectedDay] = useState<string | null>(formatDate(now));
|
||||
|
||||
const startDate = useMemo(() => {
|
||||
const d = new Date(currentMonth.year, currentMonth.month - 1, 1);
|
||||
@@ -85,16 +83,17 @@ export default function CalendarScreen() {
|
||||
}, [currentMonth]);
|
||||
|
||||
const { data: posts, isLoading, error, refetch } = useQuery<PostizPost[]>({
|
||||
queryKey: ["posts", startDate, endDate],
|
||||
queryKey: ["posts", startDate, endDate, !!client],
|
||||
queryFn: async () => {
|
||||
if (!client) return [];
|
||||
const res = await client.get("/posts", {
|
||||
const res = await client.get("posts", {
|
||||
params: { startDate, endDate },
|
||||
});
|
||||
return Array.isArray(res.data) ? res.data : res.data?.posts ?? [];
|
||||
},
|
||||
enabled: !!client,
|
||||
retry: 1,
|
||||
staleTime: 0,
|
||||
});
|
||||
|
||||
const markedDates = useMemo(() => {
|
||||
@@ -108,9 +107,9 @@ export default function CalendarScreen() {
|
||||
const key = toDateKey(post.publishDate);
|
||||
if (!marks[key]) marks[key] = { dots: [] };
|
||||
const dotColor =
|
||||
post.status === "PUBLISHED"
|
||||
post.state === "PUBLISHED"
|
||||
? colors.success
|
||||
: post.status === "ERROR"
|
||||
: post.state === "ERROR"
|
||||
? colors.error
|
||||
: colors.primary;
|
||||
marks[key].dots = [...(marks[key].dots ?? []), { color: dotColor }];
|
||||
@@ -254,10 +253,7 @@ export default function CalendarScreen() {
|
||||
}
|
||||
renderItem={({ item }) => (
|
||||
<TouchableOpacity
|
||||
style={[
|
||||
styles.dayPost,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
style={[styles.dayPost, { borderBottomColor: colors.border }]}
|
||||
activeOpacity={0.7}
|
||||
>
|
||||
<View style={styles.dayPostLeft}>
|
||||
@@ -271,7 +267,7 @@ export default function CalendarScreen() {
|
||||
{item.content}
|
||||
</Text>
|
||||
</View>
|
||||
<StatusBadge status={item.status} />
|
||||
<StatusBadge status={item.state} />
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
scrollEnabled={dayPosts.length > 0}
|
||||
@@ -283,9 +279,7 @@ export default function CalendarScreen() {
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
},
|
||||
container: { flex: 1 },
|
||||
centered: {
|
||||
flex: 1,
|
||||
alignItems: "center",
|
||||
@@ -293,28 +287,11 @@ const styles = StyleSheet.create({
|
||||
gap: 10,
|
||||
paddingHorizontal: 32,
|
||||
},
|
||||
emptyTitle: {
|
||||
fontSize: 18,
|
||||
fontFamily: "Inter_600SemiBold",
|
||||
},
|
||||
emptyText: {
|
||||
fontSize: 14,
|
||||
fontFamily: "Inter_400Regular",
|
||||
textAlign: "center",
|
||||
},
|
||||
btn: {
|
||||
marginTop: 8,
|
||||
paddingHorizontal: 20,
|
||||
paddingVertical: 10,
|
||||
borderRadius: 10,
|
||||
},
|
||||
btnText: {
|
||||
fontSize: 14,
|
||||
fontFamily: "Inter_600SemiBold",
|
||||
},
|
||||
divider: {
|
||||
height: StyleSheet.hairlineWidth,
|
||||
},
|
||||
emptyTitle: { fontSize: 18, fontFamily: "Inter_600SemiBold" },
|
||||
emptyText: { fontSize: 14, fontFamily: "Inter_400Regular", textAlign: "center" },
|
||||
btn: { marginTop: 8, paddingHorizontal: 20, paddingVertical: 10, borderRadius: 10 },
|
||||
btnText: { fontSize: 14, fontFamily: "Inter_600SemiBold" },
|
||||
divider: { height: StyleSheet.hairlineWidth },
|
||||
dayHeader: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
@@ -322,14 +299,8 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: 20,
|
||||
paddingVertical: 12,
|
||||
},
|
||||
dayHeaderText: {
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_500Medium",
|
||||
},
|
||||
countText: {
|
||||
fontSize: 12,
|
||||
fontFamily: "Inter_400Regular",
|
||||
},
|
||||
dayHeaderText: { fontSize: 13, fontFamily: "Inter_500Medium" },
|
||||
countText: { fontSize: 12, fontFamily: "Inter_400Regular" },
|
||||
dayPost: {
|
||||
flexDirection: "row",
|
||||
alignItems: "flex-start",
|
||||
@@ -338,42 +309,13 @@ const styles = StyleSheet.create({
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
gap: 12,
|
||||
},
|
||||
dayPostLeft: {
|
||||
flex: 1,
|
||||
gap: 4,
|
||||
},
|
||||
timeText: {
|
||||
fontSize: 12,
|
||||
fontFamily: "Inter_600SemiBold",
|
||||
},
|
||||
postContent: {
|
||||
fontSize: 13,
|
||||
fontFamily: "Inter_400Regular",
|
||||
lineHeight: 18,
|
||||
},
|
||||
emptyDay: {
|
||||
alignItems: "center",
|
||||
paddingTop: 32,
|
||||
gap: 10,
|
||||
},
|
||||
emptyDayText: {
|
||||
fontSize: 14,
|
||||
fontFamily: "Inter_400Regular",
|
||||
},
|
||||
composeHint: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 6,
|
||||
},
|
||||
composeHintText: {
|
||||
fontSize: 14,
|
||||
fontFamily: "Inter_500Medium",
|
||||
},
|
||||
retryBtn: {
|
||||
marginTop: 4,
|
||||
},
|
||||
retryText: {
|
||||
fontSize: 14,
|
||||
fontFamily: "Inter_500Medium",
|
||||
},
|
||||
dayPostLeft: { flex: 1, gap: 4 },
|
||||
timeText: { fontSize: 12, fontFamily: "Inter_600SemiBold" },
|
||||
postContent: { fontSize: 13, fontFamily: "Inter_400Regular", lineHeight: 18 },
|
||||
emptyDay: { alignItems: "center", paddingTop: 32, gap: 10 },
|
||||
emptyDayText: { fontSize: 14, fontFamily: "Inter_400Regular" },
|
||||
composeHint: { flexDirection: "row", alignItems: "center", gap: 6 },
|
||||
composeHintText: { fontSize: 14, fontFamily: "Inter_500Medium" },
|
||||
retryBtn: { marginTop: 4 },
|
||||
retryText: { fontSize: 14, fontFamily: "Inter_500Medium" },
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user