From 9c36052e8a9fa97b06119bb034a8f504fb03275a Mon Sep 17 00:00:00 2001 From: HItesh Joshi Date: Fri, 21 Feb 2025 22:01:46 +0800 Subject: [PATCH 1/3] not found page --- app.config.ts | 4 ++-- app/+not-found.tsx | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 app/+not-found.tsx diff --git a/app.config.ts b/app.config.ts index 6152194..4864364 100644 --- a/app.config.ts +++ b/app.config.ts @@ -31,8 +31,8 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ autoVerify: true, data: [ { - scheme: "com.hiteshjoshi.tracker", - host: "oauth2redirect" + scheme: "tracker", + host: "*" } ], category: ["BROWSABLE", "DEFAULT"] diff --git a/app/+not-found.tsx b/app/+not-found.tsx new file mode 100644 index 0000000..be4ce89 --- /dev/null +++ b/app/+not-found.tsx @@ -0,0 +1,33 @@ +import { useEffect } from 'react'; +import { View, Text, StyleSheet } from 'react-native'; +import { router } from 'expo-router'; + +export default function NotFound() { + useEffect(() => { + // Redirect to login after a short delay + const timer = setTimeout(() => { + router.replace('/login'); + }, 100); + + return () => clearTimeout(timer); + }, []); + + return ( + + Redirecting... + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + justifyContent: 'center', + alignItems: 'center', + backgroundColor: '#4a90e2', + }, + text: { + color: 'white', + fontSize: 18, + }, +}); \ No newline at end of file From ec5b60969fd7ac6b160cd08abff8d7557ea2610f Mon Sep 17 00:00:00 2001 From: HItesh Joshi Date: Sat, 22 Feb 2025 09:32:31 +0800 Subject: [PATCH 2/3] ui changes --- app/(tabs)/habits.tsx | 10 +- app/(tabs)/index.tsx | 752 +++++++++++++----------------------- components/DateHeader.tsx | 373 +++++++++++++++--- models/types.ts | 48 +-- package-lock.json | 11 + package.json | 5 +- services/firebaseService.ts | 89 ++++- styles/TodayScreenStyles.ts | 286 ++++++++++++++ 8 files changed, 1008 insertions(+), 566 deletions(-) create mode 100644 styles/TodayScreenStyles.ts diff --git a/app/(tabs)/habits.tsx b/app/(tabs)/habits.tsx index 3928dbd..8cd3dd6 100644 --- a/app/(tabs)/habits.tsx +++ b/app/(tabs)/habits.tsx @@ -1,3 +1,4 @@ +//app/(tabs)/habits.tsx import React, { useState } from 'react'; import { View, @@ -254,15 +255,17 @@ const styles = StyleSheet.create({ container: { flex: 1, backgroundColor: '#fff', - padding: 16, + padding: 0, }, addButton: { backgroundColor: '#2c3e50', padding: 16, borderRadius: 12, alignItems: 'center', + marginHorizontal: 16, // Added horizontal margin + marginTop: 16, // Added top margin to create space after DateHeader marginBottom: 16, - }, +}, addButtonText: { color: '#fff', fontSize: 16, @@ -323,7 +326,8 @@ const styles = StyleSheet.create({ }, habitsList: { gap: 12, - }, + paddingHorizontal: 16, // Added horizontal padding +}, habitCard: { backgroundColor: '#f8f9fa', padding: 16, diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx index 96a2a4a..c3bd148 100644 --- a/app/(tabs)/index.tsx +++ b/app/(tabs)/index.tsx @@ -1,8 +1,8 @@ -import React, { useState, useEffect } from 'react'; +//app/(tabs)/index.tsx +import React, { useState, useEffect, useCallback, useRef } from 'react'; import { View, Text, - StyleSheet, ScrollView, TouchableOpacity, Platform, @@ -11,135 +11,181 @@ import { TextInput, } from 'react-native'; import DateHeader from '../../components/DateHeader'; -import { LinearGradient } from 'expo-linear-gradient'; +import { isToday, isBefore, isSameDay } from 'date-fns'; import { goalService, goodDeedService, reflectionService } from '../../services/firebaseService'; import { auth } from '../../config/firebase'; +import styles from '../../styles/TodayScreenStyles'; - -// Types remain the same +// Types interface Goal { id: string; text: string; completed: boolean; + date?: Date; + isExpired?: boolean; } -// Add this interface interface ModalConfig { isVisible: boolean; initialText: string; editId: string | null; } + interface GoodnessItem { id: string; text: string; timestamp: Date; + date?: Date; } +interface ReflectionItem { + id: string; + text: string; + timestamp: Date; + date?: Date; +} const TodayScreen: React.FC = () => { - - // goals + // State for selected date + const [selectedDate, setSelectedDate] = useState(new Date()); + + // Data states const [goals, setGoals] = useState([]); + const [goodnessItems, setGoodnessItems] = useState([]); + const [reflectionItems, setReflectionItems] = useState([]); + + // Modal states const [goalModalVisible, setGoalModalVisible] = useState({ isVisible: false, initialText: '', editId: null }); - const [newGoalText, setNewGoalText] = useState(''); - - - //goodness - const [goodnessText, setGoodnessText] = useState(''); - const [goodnessItems, setGoodnessItems] = useState([]); - const [goodnessModalVisible, setGoodnessModalVisible] = useState({ isVisible: false, initialText: '', - editId: null, // Add this to track which item is being edited + editId: null, }); - - // reflection - interface ReflectionItem { - id: string; - text: string; - timestamp: Date; - } - - // Update the state to handle an array of items - const [reflectionItems, setReflectionItems] = useState([]); const [reflectionModalVisible, setReflectionModalVisible] = useState({ isVisible: false, initialText: '', editId: null, }); + + // Input states + const [newGoalText, setNewGoalText] = useState(''); + const [goodnessText, setGoodnessText] = useState(''); const [reflectionText, setReflectionText] = useState(''); + + // Track if component is mounted to prevent state updates after unmount + const isMounted = useRef(true); + + // Track active user + const [userId, setUserId] = useState(null); + + // Set up authentication listener only once + useEffect(() => { + // Set mounted flag + isMounted.current = true; + + // Check if user is logged in + const unsubscribeAuth = auth.onAuthStateChanged((user) => { + if (isMounted.current) { + if (user) { + setUserId(user.uid); + } else { + setUserId(null); + } + } + }); + + // Cleanup + return () => { + isMounted.current = false; + unsubscribeAuth(); + }; + }, []); - + // Fetch data when user or date changes useEffect(() => { - const userId = auth.currentUser?.uid; - if (!userId) { - console.log('No user logged in'); - return; + if (!userId) return; + + // Fetch data for the selected date + fetchDataForDate(selectedDate); + }, [userId, selectedDate]); + + // Function to fetch all data for a specific date + const fetchDataForDate = useCallback(async (date: Date) => { + if (!userId || !isMounted.current) return; + + try { + // Fetch goals + const goalsForDate = await goalService.getItemsByDate(userId, date); + + // Mark expired goals + if (isBefore(date, new Date()) && !isToday(date)) { + if (isMounted.current) { + setGoals(goalsForDate.map(goal => ({ + ...goal, + isExpired: !goal.completed + }))); + } + } else { + if (isMounted.current) { + setGoals(goalsForDate); + } + } + + // Fetch good deeds + const deedsForDate = await goodDeedService.getItemsByDate(userId, date); + if (isMounted.current) { + setGoodnessItems(deedsForDate); + } + + // Fetch reflections + const reflectionsForDate = await reflectionService.getItemsByDate(userId, date); + if (isMounted.current) { + setReflectionItems(reflectionsForDate); + } + } catch (error) { + console.error('Error fetching data for date:', error); } + }, [userId]); - // Subscribe to real-time updates - const unsubscribe = goalService.subscribeToUserItems(userId, (updatedGoals) => { - setGoals(updatedGoals); - }); - - // Cleanup subscription on unmount - return () => unsubscribe(); + // Handle date change from the DateHeader component + const handleDateChange = useCallback((date: Date) => { + setSelectedDate(date); }, []); + // Calculate progress percentage + const getProgressPercentage = useCallback(() => { + if (goals.length === 0) return 0; + const completedGoals = goals.filter(goal => goal.completed).length; + return (completedGoals / goals.length) * 100; + }, [goals]); - - // Functions remain the same + // Goal functions const toggleGoal = async (id: string) => { + if (!userId) return; + try { const goal = goals.find(g => g.id === id); if (goal) { await goalService.toggleCompletion(id, !goal.completed); + + // Update local state + setGoals(prevGoals => + prevGoals.map(g => + g.id === id ? { ...g, completed: !goal.completed } : g + ) + ); } } catch (error) { console.error('Error toggling goal:', error); - // You might want to show an error message to the user here } }; - - const getProgressPercentage = () => { - if (goals.length === 0) return 0; - const completedGoals = goals.filter(goal => goal.completed).length; - return (completedGoals / goals.length) * 100; - }; - - - // goal functions - // const handleAddGoal = () => { - // if (newGoalText.trim()) { - // if (goalModalVisible.editId) { - // // Editing existing goal - // setGoals(goals.map(goal => - // goal.id === goalModalVisible.editId - // ? { ...goal, text: newGoalText.trim() } - // : goal - // )); - // } else { - // // Adding new goal - // const newGoal: Goal = { - // id: Date.now().toString(), - // text: newGoalText.trim(), - // completed: false, - // }; - // setGoals([...goals, newGoal]); - // } - // handleCloseGoalModal(); - // } - // }; - const handleAddGoal = async () => { - const userId = auth.currentUser?.uid; if (!userId || !newGoalText.trim()) return; try { @@ -148,21 +194,38 @@ const TodayScreen: React.FC = () => { await goalService.updateItem(goalModalVisible.editId, { text: newGoalText.trim() }); + + // Update local state + setGoals(prevGoals => + prevGoals.map(goal => + goal.id === goalModalVisible.editId + ? { ...goal, text: newGoalText.trim() } + : goal + ) + ); } else { - // Adding new goal - await goalService.addItem(userId, { + // Adding new goal for the selected date + const newGoalId = await goalService.addItem(userId, { text: newGoalText.trim(), completed: false - }); + }, selectedDate); + + // Add to local state + setGoals(prevGoals => [...prevGoals, { + id: newGoalId, + text: newGoalText.trim(), + completed: false, + date: selectedDate + }]); } + + // Close modal and clear text handleCloseGoalModal(); } catch (error) { console.error('Error managing goal:', error); - // Handle error appropriately (show error message to user) } }; - const handleOpenGoalModal = (itemId?: string) => { if (itemId) { const goalToEdit = goals.find(goal => goal.id === itemId); @@ -187,7 +250,49 @@ const TodayScreen: React.FC = () => { setNewGoalText(''); }; - // goodness function + // Goodness functions + const handleAddGoodness = async () => { + if (!userId || !goodnessText.trim()) return; + + try { + if (goodnessModalVisible.editId) { + // Editing existing item + await goodDeedService.updateItem(goodnessModalVisible.editId, { + text: goodnessText.trim() + }); + + // Update local state + setGoodnessItems(prevItems => + prevItems.map(item => + item.id === goodnessModalVisible.editId + ? { ...item, text: goodnessText.trim() } + : item + ) + ); + } else { + // Adding new item for the selected date + const now = new Date(); + const newItemId = await goodDeedService.addItem(userId, { + text: goodnessText.trim(), + timestamp: now + }, selectedDate); + + // Add to local state + setGoodnessItems(prevItems => [...prevItems, { + id: newItemId, + text: goodnessText.trim(), + timestamp: now, + date: selectedDate + }]); + } + + // Close modal and clear text + handleCloseGoodnessModal(); + } catch (error) { + console.error('Error managing good deed:', error); + } + }; + const handleOpenGoodnessModal = (itemId?: string) => { if (itemId) { const itemToEdit = goodnessItems.find(item => item.id === itemId); @@ -212,52 +317,46 @@ const TodayScreen: React.FC = () => { setGoodnessText(''); }; - const handleAddGoodness = () => { - if (goodnessText.trim()) { - if (goodnessModalVisible.editId) { - // Editing existing item - setGoodnessItems(prevItems => - prevItems.map(item => - item.id === goodnessModalVisible.editId - ? { ...item, text: goodnessText.trim() } - : item - ) - ); - } else { - // Adding new item - const newItem = { - id: Date.now().toString(), - text: goodnessText.trim(), - timestamp: new Date(), - }; - setGoodnessItems(prevItems => [...prevItems, newItem]); - } - handleCloseGoodnessModal(); - } - }; + // Reflection functions + const handleAddReflection = async () => { + if (!userId || !reflectionText.trim()) return; - //reflection functions - const handleAddReflection = () => { - if (reflectionText.trim()) { + try { if (reflectionModalVisible.editId) { // Editing existing item - setReflectionItems(prevItems => - prevItems.map(item => + await reflectionService.updateItem(reflectionModalVisible.editId, { + text: reflectionText.trim() + }); + + // Update local state + setReflectionItems(prevItems => + prevItems.map(item => item.id === reflectionModalVisible.editId ? { ...item, text: reflectionText.trim() } : item ) ); } else { - // Adding new item - const newItem: ReflectionItem = { - id: Date.now().toString(), + // Adding new item for the selected date + const now = new Date(); + const newItemId = await reflectionService.addItem(userId, { + text: reflectionText.trim(), + timestamp: now + }, selectedDate); + + // Add to local state + setReflectionItems(prevItems => [...prevItems, { + id: newItemId, text: reflectionText.trim(), - timestamp: new Date(), - }; - setReflectionItems(prevItems => [...prevItems, newItem]); + timestamp: now, + date: selectedDate + }]); } + + // Close modal and clear text handleCloseReflectionModal(); + } catch (error) { + console.error('Error managing reflection:', error); } }; @@ -285,39 +384,20 @@ const TodayScreen: React.FC = () => { setReflectionText(''); }; - - - return ( - - - - - - - - {Math.round(getProgressPercentage())}% of daily goals completed - - - - + - {/* Goals Section start */} - {/* What good shall I do today Section */} - + {/* Goals Section */} - Today's Goals + + {isToday(selectedDate) ? "Today's Goals" : `Goals for ${selectedDate.toLocaleDateString()}`} + handleOpenGoalModal()} @@ -327,7 +407,13 @@ const TodayScreen: React.FC = () => { {goals.length > 0 ? ( goals.map(goal => ( - + { {goal.text} @@ -355,18 +442,21 @@ const TodayScreen: React.FC = () => { )) ) : ( - No goals yet - Tap + to add your first goal + No goals for this date + Tap + to add a goal )} - {/* Goals Section end */} - {/* Goodness Section */} - What good shall I do today? + + {isToday(selectedDate) + ? "What good shall I do today?" + : `Good deeds for ${selectedDate.toLocaleDateString()}` + } + handleOpenGoodnessModal()} @@ -381,7 +471,7 @@ const TodayScreen: React.FC = () => { {item.text} - {new Date(item.timestamp).toLocaleTimeString([], { + {item.timestamp && new Date(item.timestamp).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} @@ -398,17 +488,26 @@ const TodayScreen: React.FC = () => { ) : ( - What good will you do today? - Tap + to add your first good deed + + {isToday(selectedDate) + ? "What good will you do today?" + : "No good deeds recorded for this date" + } + + Tap + to add a good deed )} - {/* Goodness Section end */} {/* Reflection Section */} - Today's Reflections + + {isToday(selectedDate) + ? "Today's Reflections" + : `Reflections for ${selectedDate.toLocaleDateString()}` + } + handleOpenReflectionModal()} @@ -423,7 +522,7 @@ const TodayScreen: React.FC = () => { {item.text} - {new Date(item.timestamp).toLocaleTimeString([], { + {item.timestamp && new Date(item.timestamp).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} @@ -440,19 +539,25 @@ const TodayScreen: React.FC = () => { ) : ( - No reflections yet - Take a moment to reflect on your day + + {isToday(selectedDate) + ? "No reflections yet" + : "No reflections recorded for this date" + } + + + {isToday(selectedDate) + ? "Take a moment to reflect on your day" + : "Tap + to add a reflection" + } + )} - {/* Reflection Section end */} - - - - {/* Modals start here */} - {/* Goal Modal start here */} + {/* Modals */} + {/* Goal Modal */} { - {/* Goal Modal end here */} - - {/* Goodness modal */} + {/* Goodness Modal */} { style={styles.modalInput} value={goodnessText} onChangeText={setGoodnessText} - placeholder="What good will you do today?" + placeholder={isToday(selectedDate) + ? "What good will you do today?" + : "What good deed did you do on this day?" + } multiline autoFocus placeholderTextColor="#95a5a6" @@ -556,9 +662,8 @@ const TodayScreen: React.FC = () => { - {/* Goodness modal end */} - {/* reflection modal */} + {/* Reflection Modal */} { style={[styles.modalInput, { minHeight: 100 }]} value={reflectionText} onChangeText={setReflectionText} - placeholder="Write your reflection..." + placeholder={isToday(selectedDate) + ? "Write your reflection..." + : `Write your reflection for ${selectedDate.toLocaleDateString()}...` + } multiline autoFocus /> @@ -598,314 +706,8 @@ const TodayScreen: React.FC = () => { - ); }; -const styles = StyleSheet.create({ - container: { - flex: 1, - backgroundColor: '#f5f6fa', - }, - header: { - padding: 20, - paddingTop: Platform.OS === 'ios' ? 60 : 20, - borderBottomLeftRadius: 24, - borderBottomRightRadius: 24, - ...Platform.select({ - ios: { - shadowColor: '#000', - shadowOffset: { width: 0, height: 4 }, - shadowOpacity: 0.2, - shadowRadius: 8, - }, - android: { - elevation: 8, - }, - }), - }, - progressContainer: { - marginTop: 16, - }, - progressBar: { - height: 6, - backgroundColor: 'rgba(255,255,255,0.3)', - borderRadius: 3, - overflow: 'hidden', - }, - progressFill: { - height: '100%', - backgroundColor: '#fff', - borderRadius: 3, - }, - progressText: { - color: '#fff', - fontSize: 14, - marginTop: 8, - textAlign: 'center', - }, - content: { - padding: 20, - }, - section: { - backgroundColor: '#fff', - borderRadius: 16, - marginBottom: 20, - ...Platform.select({ - ios: { - shadowColor: '#000', - shadowOffset: { width: 0, height: 2 }, - shadowOpacity: 0.1, - shadowRadius: 4, - }, - android: { - elevation: 4, - }, - }), - }, - sectionHeader: { - flexDirection: 'row', - justifyContent: 'space-between', - alignItems: 'center', - padding: 16, - borderBottomWidth: 1, - borderBottomColor: '#f0f0f0', - }, - sectionTitle: { - fontSize: 18, - fontWeight: '600', - color: '#1a1a1a', - }, - addButton: { - width: 28, - height: 28, - borderRadius: 14, - backgroundColor: '#4a90e2', - justifyContent: 'center', - alignItems: 'center', - }, - addButtonText: { - color: '#fff', - fontSize: 20, - fontWeight: '600', - marginTop: -2, - }, - editButton: { - paddingHorizontal: 12, - paddingVertical: 6, - borderRadius: 12, - backgroundColor: '#f0f0f0', - }, - editButtonText: { - color: '#4a90e2', - fontSize: 14, - fontWeight: '500', - }, - goalItem: { - flexDirection: 'row', - alignItems: 'center', - padding: 16, - borderBottomWidth: 1, - borderBottomColor: '#f0f0f0', - }, - checkboxContainer: { - width: 24, - height: 24, - borderRadius: 12, - borderWidth: 2, - borderColor: '#4a90e2', - marginRight: 12, - justifyContent: 'center', - alignItems: 'center', - }, - checkboxContainerChecked: { - backgroundColor: '#4a90e2', - borderColor: '#4a90e2', - }, - checkmark: { - color: '#fff', - fontSize: 16, - fontWeight: 'bold', - }, - goalText: { - fontSize: 16, - color: '#1a1a1a', - flex: 1, - }, - completedGoal: { - textDecorationLine: 'line-through', - color: '#95a5a6', - }, - cardContent: { - padding: 16, - }, - contentText: { - fontSize: 16, - color: '#1a1a1a', - lineHeight: 24, - }, - quoteIcon: { - fontSize: 40, - color: '#4a90e2', - opacity: 0.2, - position: 'absolute', - top: -5, - left: 10, - }, - emptyContainer: { - padding: 24, - alignItems: 'center', - }, - emptyText: { - fontSize: 16, - color: '#95a5a6', - marginBottom: 4, - }, - emptySubtext: { - fontSize: 14, - color: '#bdc3c7', - }, - reflectionSection: { - backgroundColor: '#fff', - }, - modalContainer: { - flex: 1, - justifyContent: 'flex-end', - backgroundColor: 'rgba(0,0,0,0.5)', - }, - modalContent: { - backgroundColor: '#fff', - borderTopLeftRadius: 20, - borderTopRightRadius: 20, - padding: 20, - ...Platform.select({ - ios: { - shadowColor: '#000', - shadowOffset: { width: 0, height: -2 }, - shadowOpacity: 0.1, - shadowRadius: 4, - }, - android: { - elevation: 4, - }, - }), - }, - modalTitle: { - fontSize: 18, - fontWeight: '600', - marginBottom: 16, - color: '#1a1a1a', - }, - modalInput: { - borderWidth: 1, - borderColor: '#e0e0e0', - borderRadius: 8, - padding: 12, - fontSize: 16, - minHeight: 40, - }, - modalButtons: { - flexDirection: 'row', - justifyContent: 'flex-end', - marginTop: 16, - gap: 12, - }, - modalButton: { - paddingHorizontal: 20, - paddingVertical: 10, - borderRadius: 8, - minWidth: 80, - alignItems: 'center', - }, - cancelButton: { - backgroundColor: '#f0f0f0', - }, - saveButton: { - backgroundColor: '#4a90e2', - }, - cancelButtonText: { - color: '#4a90e2', - fontWeight: '600', - }, - saveButtonText: { - color: '#fff', - fontWeight: '600', - }, - goodnessList: { - padding: 16, - }, - goodnessItem: { - flexDirection: 'row', - justifyContent: 'space-between', - alignItems: 'flex-start', - paddingVertical: 12, - borderBottomWidth: 1, - borderBottomColor: '#f0f0f0', - }, - goodnessContent: { - flex: 1, - marginRight: 12, - }, - editItemButton: { - paddingHorizontal: 12, - paddingVertical: 6, - borderRadius: 12, - backgroundColor: '#f0f0f0', - }, - timestampText: { - fontSize: 12, - color: '#95a5a6', - marginTop: 4, - }, reflectionList: { - padding: 16, - }, - reflectionItem: { - flexDirection: 'row', - justifyContent: 'space-between', - alignItems: 'flex-start', - paddingVertical: 12, - borderBottomWidth: 1, - borderBottomColor: '#f0f0f0', - }, - reflectionContent: { - flex: 1, - marginRight: 12, - }, - goodnessItemHeader: { - flexDirection: 'row', - justifyContent: 'space-between', - alignItems: 'center', - padding: 12, - backgroundColor: '#f8f9fa', - borderBottomWidth: 1, - borderBottomColor: '#e0e0e0', - }, - modalOverlay: { - flex: 1, - backgroundColor: 'rgba(0, 0, 0, 0.5)', - justifyContent: 'flex-end', - }, - modalFooter: { - flexDirection: 'row', - justifyContent: 'flex-end', - gap: 12, - }, - closeButton: { - padding: 8, - }, - closeButtonText: { - fontSize: 20, - color: '#95a5a6', - fontWeight: '500', - }, - modalHeader: { - flexDirection: 'row', - justifyContent: 'space-between', - alignItems: 'center', - marginBottom: 20, - } - -}); - -export default TodayScreen; +export default TodayScreen; \ No newline at end of file diff --git a/components/DateHeader.tsx b/components/DateHeader.tsx index 394039b..805efcc 100644 --- a/components/DateHeader.tsx +++ b/components/DateHeader.tsx @@ -1,91 +1,348 @@ -import React from 'react'; -import { View, Text, StyleSheet } from 'react-native'; +import React, { useState, useEffect } from 'react'; +import { + View, + Text, + StyleSheet, + TouchableOpacity, + Platform +} from 'react-native'; +import { format, addDays, subDays, isToday, isSameDay, startOfWeek } from 'date-fns'; +import { LinearGradient } from 'expo-linear-gradient'; -interface WeekDay { - date: number; - day: string; - isToday: boolean; +interface DateHeaderProps { + onDateChange?: (date: Date) => void; + customStyle?: any; + progressPercentage?: number; // Optional progress percentage for the progress bar } -export const DateHeader: React.FC = () => { - const generateWeekDays = (): WeekDay[] => { - const today = new Date(); - const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']; - const weekDays: WeekDay[] = []; - +const DateHeader: React.FC = ({ + onDateChange, + customStyle, + progressPercentage +}) => { + const [selectedDate, setSelectedDate] = useState(new Date()); + const [weekDates, setWeekDates] = useState([]); + + // Update week dates when selected date changes + useEffect(() => { + const start = startOfWeek(selectedDate); + const days = []; for (let i = 0; i < 7; i++) { - const date = new Date(today); - date.setDate(today.getDate() - today.getDay() + i); - - weekDays.push({ - date: date.getDate(), - day: days[i], - isToday: date.toDateString() === today.toDateString() - }); + days.push(addDays(start, i)); } + setWeekDates(days); - return weekDays; + if (onDateChange) { + onDateChange(selectedDate); + } + }, [selectedDate, onDateChange]); + + const handlePreviousDay = () => { + setSelectedDate(subDays(selectedDate, 1)); + }; + + const handleNextDay = () => { + setSelectedDate(addDays(selectedDate, 1)); + }; + + const handlePreviousWeek = () => { + setSelectedDate(subDays(selectedDate, 7)); + }; + + const handleSelectDay = (date: Date) => { + setSelectedDate(date); + }; + + // Format date for display + const getFormattedDate = () => { + return format(selectedDate, 'MMMM d, yyyy'); + }; + + // Format day of week + const getDayOfWeek = () => { + return format(selectedDate, 'EEEE'); + }; + + // Get day number + const getDayNumber = (date: Date) => { + return format(date, 'd'); + }; + + // Get day name (3 letters) + const getDayName = (date: Date) => { + return format(date, 'EEE'); + }; + + // Check if a date is selected + const isSelected = (date: Date) => { + return isSameDay(date, selectedDate); + }; + + // Check if a date is today + const isCurrentDay = (date: Date) => { + return isToday(date); }; return ( - - {generateWeekDays().map((day, index) => ( - - - {day.day} - - - {day.date} + + + {/* Date header with navigation */} + + + {'<'} + + + + {getFormattedDate()} + {getDayOfWeek()} + + + + {'>'} + + + + {/* Week day selector */} + + + {'<'} + + + + {weekDates.map((date, index) => ( + + {getDayName(date)} + handleSelectDay(date)} + style={[ + styles.dayNumberContainer, + isSelected(date) && styles.selectedDayContainer, + isCurrentDay(date) && !isSelected(date) && styles.todayContainer + ]} + > + + {getDayNumber(date)} + + + + ))} + + + setSelectedDate(addDays(selectedDate, 7))} + style={styles.weekNavButton} + > + {'>'} + + + + + {/* Progress bar (conditionally rendered) */} + {progressPercentage !== undefined && ( + + + + + + {Math.round(progressPercentage)}% of daily goals completed - ))} - + )} + ); }; const styles = StyleSheet.create({ - weekContainer: { + gradientContainer: { + paddingTop: 40, + paddingBottom: 20, + borderBottomLeftRadius: 25, // Slightly increased radius + borderBottomRightRadius: 25, // Slightly increased radius + marginBottom: 0, + }, + container: { + backgroundColor: '#fff', + borderRadius: 20, + padding: 16, + marginHorizontal: 20, + marginVertical: 4, // Added small vertical margin for better spacing + ...Platform.select({ + ios: { + shadowColor: '#000', + shadowOffset: { width: 0, height: 2 }, + shadowOpacity: 0.1, + shadowRadius: 4, + }, + android: { + elevation: 3, + }, + }), + }, + dateNavigator: { flexDirection: 'row', justifyContent: 'space-between', - marginBottom: 24, - backgroundColor: '#f8f9fa', - padding: 12, - borderRadius: 12, + alignItems: 'center', + marginBottom: 20, }, - dayContainer: { + navButton: { + width: 48, + height: 48, + borderRadius: 24, + backgroundColor: '#f0f4f8', + justifyContent: 'center', alignItems: 'center', - padding: 8, - borderRadius: 8, - minWidth: 40, + zIndex: 1, + // Add slight shadow for better definition + ...Platform.select({ + ios: { + shadowColor: '#000', + shadowOffset: { width: 0, height: 1 }, + shadowOpacity: 0.1, + shadowRadius: 2, + }, + android: { + elevation: 2, + }, + }), }, - todayContainer: { - backgroundColor: '#2c3e50', + navButtonText: { + fontSize: 22, + fontWeight: '600', + color: '#2c3e50', + }, + dateTextContainer: { + alignItems: 'center', + position: 'absolute', + left: 0, + right: 0, + zIndex: 0, + }, + dateText: { + fontSize: 20, + fontWeight: 'bold', + color: '#2c3e50', + textAlign: 'center', }, dayText: { + fontSize: 16, + color: '#2c3e50', + textAlign: 'center', + marginTop: 4, + }, + weekContainer: { + flexDirection: 'row', + alignItems: 'center', + }, + weekNavButton: { + width: 36, + height: 36, + borderRadius: 18, + backgroundColor: '#f0f4f8', + justifyContent: 'center', + alignItems: 'center', + }, + weekNavButtonText: { + fontSize: 18, + fontWeight: '600', + color: '#2c3e50', + }, + daysContainer: { + flex: 1, + flexDirection: 'row', + justifyContent: 'space-between', + paddingHorizontal: 8, + }, + dayColumn: { + alignItems: 'center', + }, + dayNameText: { fontSize: 14, color: '#2c3e50', - fontWeight: '500', + marginBottom: 6, }, - dateText: { + dayNumberContainer: { + width: 32, + height: 32, + justifyContent: 'center', + alignItems: 'center', + borderRadius: 16, + }, + selectedDayContainer: { + backgroundColor: '#4a90e2', + // Add slight shadow for better prominence + ...Platform.select({ + ios: { + shadowColor: '#000', + shadowOffset: { width: 0, height: 1 }, + shadowOpacity: 0.2, + shadowRadius: 2, + }, + android: { + elevation: 2, + }, + }), + }, + todayContainer: { + borderWidth: 1, + borderColor: '#4a90e2', + }, + dayNumberText: { fontSize: 16, - color: '#2c3e50', fontWeight: 'bold', - marginTop: 4, + color: '#2c3e50', + }, + selectedDayText: { + color: '#fff', }, todayText: { + color: '#4a90e2', + }, + // Progress bar styles + progressContainer: { + paddingHorizontal: 20, + marginTop: 12, // Slightly increased from 10 + marginBottom: 4, // Added small bottom margin + }, + progressBar: { + height: 6, + backgroundColor: 'rgba(255, 255, 255, 0.3)', + borderRadius: 3, + overflow: 'hidden', + marginHorizontal: 2, // Added slight horizontal margin + }, + progressFill: { + height: '100%', + backgroundColor: '#fff', + borderRadius: 3, + }, + progressText: { color: '#fff', + textAlign: 'center', + marginTop: 5, + fontSize: 14, }, }); diff --git a/models/types.ts b/models/types.ts index 2fb6125..8164ab6 100644 --- a/models/types.ts +++ b/models/types.ts @@ -1,24 +1,26 @@ +// models/types.ts +export type CollectionType = 'goals' | 'goodDeeds' | 'reflections'; + export interface BaseItem { - id: string; - userId: string; - createdAt: Date; - updatedAt: Date; - } - - export interface Goal extends BaseItem { - text: string; - completed: boolean; - } - - export interface GoodDeed extends BaseItem { - text: string; - timestamp: Date; - } - - export interface Reflection extends BaseItem { - text: string; - timestamp: Date; - } - - export type CollectionType = 'goals' | 'goodDeeds' | 'reflections'; - \ No newline at end of file + id: string; + userId: string; + date: Date; + createdAt: Date; + updatedAt: Date; +} + +export interface Goal extends BaseItem { + text: string; + completed: boolean; + isExpired?: boolean; // Flag for expired goals +} + +export interface GoodDeed extends BaseItem { + text: string; + timestamp: Date; +} + +export interface Reflection extends BaseItem { + text: string; + timestamp: Date; +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a3a27b0..f03cff0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@expo/vector-icons": "^14.0.2", "@react-native-async-storage/async-storage": "^1.23.1", + "date-fns": "^4.1.0", "expo": "~52.0.33", "expo-auth-session": "~6.0.3", "expo-constants": "~17.0.5", @@ -6866,6 +6867,16 @@ "node": ">=12" } }, + "node_modules/date-fns": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz", + "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } + }, "node_modules/debug": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", diff --git a/package.json b/package.json index b79375d..17f0ee4 100644 --- a/package.json +++ b/package.json @@ -17,10 +17,12 @@ "dependencies": { "@expo/vector-icons": "^14.0.2", "@react-native-async-storage/async-storage": "^1.23.1", + "date-fns": "^4.1.0", "expo": "~52.0.33", "expo-auth-session": "~6.0.3", "expo-constants": "~17.0.5", "expo-crypto": "~14.0.2", + "expo-dev-client": "~5.0.12", "expo-font": "~13.0.3", "expo-linear-gradient": "~14.0.2", "expo-linking": "~7.0.5", @@ -37,8 +39,7 @@ "react-native-gesture-handler": "~2.20.2", "react-native-reanimated": "~3.16.1", "react-native-safe-area-context": "4.12.0", - "react-native-screens": "~4.4.0", - "expo-dev-client": "~5.0.12" + "react-native-screens": "~4.4.0" }, "devDependencies": { "@babel/core": "^7.25.2", diff --git a/services/firebaseService.ts b/services/firebaseService.ts index 08171a6..fe50a74 100644 --- a/services/firebaseService.ts +++ b/services/firebaseService.ts @@ -1,3 +1,4 @@ +//services/firebaseService.ts import { db } from '../config/firebase'; import { collection, @@ -11,9 +12,10 @@ import { onSnapshot, serverTimestamp, Timestamp, - QueryConstraint + QueryConstraint, } from 'firebase/firestore'; import { BaseItem, Goal, GoodDeed, Reflection, CollectionType } from '../models/types'; +import { startOfDay, endOfDay } from 'date-fns'; export class FirebaseService { private collectionRef; @@ -22,11 +24,12 @@ export class FirebaseService { this.collectionRef = collection(db, collectionName); } - // Generic add item method - async addItem(userId: string, data: Partial): Promise { + // Generic add item method with date support + async addItem(userId: string, data: Partial, date: Date = new Date()): Promise { const docRef = await addDoc(this.collectionRef, { ...data, userId, + date: Timestamp.fromDate(date), // Store the specific date for the item createdAt: serverTimestamp(), updatedAt: serverTimestamp() }); @@ -48,6 +51,28 @@ export class FirebaseService { await deleteDoc(docRef); } + // Get items for a specific date + async getItemsByDate(userId: string, date: Date, additionalQueries: QueryConstraint[] = []): Promise { + // Create Firestore timestamps for start and end of the selected day + const dayStart = Timestamp.fromDate(startOfDay(date)); + const dayEnd = Timestamp.fromDate(endOfDay(date)); + + // Query for items on the specific date + const baseQuery = [ + where("userId", "==", userId), + where("date", ">=", dayStart), + where("date", "<=", dayEnd) + ]; + + const q = query(this.collectionRef, ...baseQuery, ...additionalQueries); + + const querySnapshot = await getDocs(q); + return querySnapshot.docs.map(doc => ({ + id: doc.id, + ...this.convertTimestamps(doc.data()) + } as T)); + } + // Generic get items method with optional additional queries async getUserItems(userId: string, additionalQueries: QueryConstraint[] = []): Promise { const baseQuery = where("userId", "==", userId); @@ -60,6 +85,35 @@ export class FirebaseService { } as T)); } + // Real-time subscription for a specific date + subscribeToItemsByDate( + userId: string, + date: Date, + onUpdate: (items: T[]) => void, + additionalQueries: QueryConstraint[] = [] + ): () => void { + // Create Firestore timestamps for start and end of the selected day + const dayStart = Timestamp.fromDate(startOfDay(date)); + const dayEnd = Timestamp.fromDate(endOfDay(date)); + + // Query for items on the specific date + const baseQuery = [ + where("userId", "==", userId), + where("date", ">=", dayStart), + where("date", "<=", dayEnd) + ]; + + const q = query(this.collectionRef, ...baseQuery, ...additionalQueries); + + return onSnapshot(q, (snapshot) => { + const items = snapshot.docs.map(doc => ({ + id: doc.id, + ...this.convertTimestamps(doc.data()) + } as T)); + onUpdate(items); + }); + } + // Generic real-time subscription subscribeToUserItems( userId: string, @@ -79,7 +133,7 @@ export class FirebaseService { } // Helper method to convert Firestore Timestamps to Dates - private convertTimestamps(data: any): any { + protected convertTimestamps(data: any): any { const converted = { ...data }; Object.keys(converted).forEach(key => { if (converted[key] instanceof Timestamp) { @@ -100,6 +154,31 @@ export class GoalService extends FirebaseService { async toggleCompletion(goalId: string, completed: boolean): Promise { await this.updateItem(goalId, { completed }); } + + // Get expired incomplete goals (for highlighting in red) + async getExpiredGoals(userId: string, currentDate: Date): Promise { + // Get all goals that are: + // 1. Not completed + // 2. Have a date earlier than the current date + const yesterday = new Date(currentDate); + yesterday.setDate(yesterday.getDate() - 1); + yesterday.setHours(23, 59, 59, 999); + + const expiredTimestamp = Timestamp.fromDate(yesterday); + + const q = query( + this.collectionRef, + where("userId", "==", userId), + where("completed", "==", false), + where("date", "<", expiredTimestamp) + ); + + const querySnapshot = await getDocs(q); + return querySnapshot.docs.map(doc => ({ + id: doc.id, + ...this.convertTimestamps(doc.data()) + } as Goal)); + } } export class GoodDeedService extends FirebaseService { @@ -117,4 +196,4 @@ export class ReflectionService extends FirebaseService { // Service instances export const goalService = new GoalService(); export const goodDeedService = new GoodDeedService(); -export const reflectionService = new ReflectionService(); +export const reflectionService = new ReflectionService(); \ No newline at end of file diff --git a/styles/TodayScreenStyles.ts b/styles/TodayScreenStyles.ts new file mode 100644 index 0000000..9838f30 --- /dev/null +++ b/styles/TodayScreenStyles.ts @@ -0,0 +1,286 @@ +import { StyleSheet, Platform } from 'react-native'; + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: '#f5f6fa', + }, + progressText: { + color: '#fff', + fontSize: 14, + marginTop: 8, + textAlign: 'center', + }, + content: { + paddingTop: 16, + padding: 20, + }, + section: { + marginBottom: 20, + backgroundColor: '#fff', + borderRadius: 20, + padding: 16, + ...Platform.select({ + ios: { + shadowColor: '#000', + shadowOffset: { width: 0, height: 2 }, + shadowOpacity: 0.1, + shadowRadius: 4, + }, + android: { + elevation: 3, + }, + }), + }, + sectionHeader: { + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'center', + padding: 16, + borderBottomWidth: 1, + borderBottomColor: '#f0f0f0', + }, + sectionTitle: { + fontSize: 18, + fontWeight: '600', + color: '#1a1a1a', + }, + addButton: { + width: 28, + height: 28, + borderRadius: 14, + backgroundColor: '#4a90e2', + justifyContent: 'center', + alignItems: 'center', + }, + addButtonText: { + color: '#fff', + fontSize: 20, + fontWeight: '600', + marginTop: -2, + }, + editButton: { + paddingHorizontal: 12, + paddingVertical: 6, + borderRadius: 12, + backgroundColor: '#f0f0f0', + }, + editButtonText: { + color: '#4a90e2', + fontSize: 14, + fontWeight: '500', + }, + goalItem: { + flexDirection: 'row', + alignItems: 'center', + padding: 16, + borderBottomWidth: 1, + borderBottomColor: '#f0f0f0', + }, + expiredGoalItem: { + backgroundColor: 'rgba(231, 76, 60, 0.05)', // Light red background for expired goals + }, + checkboxContainer: { + width: 24, + height: 24, + borderRadius: 12, + borderWidth: 2, + borderColor: '#4a90e2', + marginRight: 12, + justifyContent: 'center', + alignItems: 'center', + }, + checkboxContainerChecked: { + backgroundColor: '#4a90e2', + borderColor: '#4a90e2', + }, + checkmark: { + color: '#fff', + fontSize: 16, + fontWeight: 'bold', + }, + goalText: { + fontSize: 16, + color: '#1a1a1a', + flex: 1, + }, + completedGoal: { + textDecorationLine: 'line-through', + color: '#95a5a6', + }, + expiredGoalText: { + color: '#e74c3c', // Red text for expired goals + }, + cardContent: { + padding: 16, + }, + contentText: { + fontSize: 16, + color: '#1a1a1a', + lineHeight: 24, + }, + quoteIcon: { + fontSize: 40, + color: '#4a90e2', + opacity: 0.2, + position: 'absolute', + top: -5, + left: 10, + }, + emptyContainer: { + padding: 24, + alignItems: 'center', + }, + emptyText: { + fontSize: 16, + color: '#95a5a6', + marginBottom: 4, + }, + emptySubtext: { + fontSize: 14, + color: '#bdc3c7', + }, + reflectionSection: { + backgroundColor: '#fff', + }, + modalContainer: { + flex: 1, + justifyContent: 'flex-end', + backgroundColor: 'rgba(0,0,0,0.5)', + }, + modalContent: { + backgroundColor: '#fff', + borderTopLeftRadius: 20, + borderTopRightRadius: 20, + padding: 20, + ...Platform.select({ + ios: { + shadowColor: '#000', + shadowOffset: { width: 0, height: -2 }, + shadowOpacity: 0.1, + shadowRadius: 4, + }, + android: { + elevation: 4, + }, + }), + }, + modalTitle: { + fontSize: 18, + fontWeight: '600', + marginBottom: 16, + color: '#1a1a1a', + }, + modalInput: { + borderWidth: 1, + borderColor: '#e0e0e0', + borderRadius: 8, + padding: 12, + fontSize: 16, + minHeight: 40, + }, + modalButtons: { + flexDirection: 'row', + justifyContent: 'flex-end', + marginTop: 16, + gap: 12, + }, + modalButton: { + paddingHorizontal: 20, + paddingVertical: 10, + borderRadius: 8, + minWidth: 80, + alignItems: 'center', + }, + cancelButton: { + backgroundColor: '#f0f0f0', + }, + saveButton: { + backgroundColor: '#4a90e2', + }, + cancelButtonText: { + color: '#4a90e2', + fontWeight: '600', + }, + saveButtonText: { + color: '#fff', + fontWeight: '600', + }, + goodnessList: { + padding: 16, + }, + goodnessItem: { + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'flex-start', + paddingVertical: 12, + borderBottomWidth: 1, + borderBottomColor: '#f0f0f0', + }, + goodnessContent: { + flex: 1, + marginRight: 12, + }, + editItemButton: { + paddingHorizontal: 12, + paddingVertical: 6, + borderRadius: 12, + backgroundColor: '#f0f0f0', + }, + timestampText: { + fontSize: 12, + color: '#95a5a6', + marginTop: 4, + }, + reflectionList: { + padding: 16, + }, + reflectionItem: { + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'flex-start', + paddingVertical: 12, + borderBottomWidth: 1, + borderBottomColor: '#f0f0f0', + }, + reflectionContent: { + flex: 1, + marginRight: 12, + }, + goodnessItemHeader: { + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'center', + padding: 12, + backgroundColor: '#f8f9fa', + borderBottomWidth: 1, + borderBottomColor: '#e0e0e0', + }, + modalOverlay: { + flex: 1, + backgroundColor: 'rgba(0, 0, 0, 0.5)', + justifyContent: 'flex-end', + }, + modalFooter: { + flexDirection: 'row', + justifyContent: 'flex-end', + marginTop: 16, + gap: 12, + }, + closeButton: { + padding: 8, + }, + closeButtonText: { + fontSize: 20, + color: '#95a5a6', + fontWeight: '500', + }, + modalHeader: { + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'center', + marginBottom: 20, + } +}); + +export default styles; \ No newline at end of file From 81ef96f60360abfbc51e064ea31e7836f3e9d0ef Mon Sep 17 00:00:00 2001 From: HItesh Joshi Date: Tue, 4 Mar 2025 18:56:34 +0800 Subject: [PATCH 3/3] minor changes to config --- README.md | 57 ++++++++++--------------------------- config/firebase.ts | 26 +++++++++++------ eas.json | 14 +++++++-- services/firebaseService.ts | 2 +- 4 files changed, 45 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index cd4feb8..1717834 100644 --- a/README.md +++ b/README.md @@ -1,50 +1,23 @@ -# Welcome to your Expo app 👋 +Tracker app -This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app). +1. react-native +2. Firebase +3. Google Auth -## Get started +Build locally and test -1. Install dependencies - ```bash - npm install - ``` -2. Start the app +Build for device (apk) +- expo always has googleservices.json issue for local as well as remote +cd android - ```bash - npx expo start - ``` +# Create debug APK +./gradlew assembleRelease -In the output, you'll find options to open the app in a +APK file will be in +android/app/build/outputs/apk/debug/app-debug.apk -- [development build](https://docs.expo.dev/develop/development-builds/introduction/) -- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/) -- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/) -- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo - -You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction). - -## Get a fresh project - -When you're ready, run: - -```bash -npm run reset-project -``` - -This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing. - -## Learn more - -To learn more about developing your project with Expo, look at the following resources: - -- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides). -- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web. - -## Join the community - -Join our community of developers creating universal apps. - -- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute. -- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions. +Pair mac with Android and then use +Bluetooth File Exchange +app to transfer the apk to phone \ No newline at end of file diff --git a/config/firebase.ts b/config/firebase.ts index c316985..bc2a832 100644 --- a/config/firebase.ts +++ b/config/firebase.ts @@ -2,7 +2,7 @@ // app/config/firebase.ts import { initializeApp, getApps, getApp } from 'firebase/app'; -import { initializeFirestore, persistentLocalCache, persistentSingleTabManager } from 'firebase/firestore'; +import { initializeFirestore,memoryLocalCache, persistentLocalCache, persistentSingleTabManager } from 'firebase/firestore'; import { Platform } from 'react-native'; import Constants from 'expo-constants'; import { @@ -26,13 +26,23 @@ const firebaseConfig = { // Initialize Firebase const app = getApps().length === 0 ? initializeApp(firebaseConfig) : getApp(); -// Initialize Firestore -const db = initializeFirestore(app, { - experimentalForceLongPolling: Platform.OS === 'android', - localCache: persistentLocalCache({ - tabManager: persistentSingleTabManager({ forceOwnership: true }) - }) -}); +let cacheConfig; +try { + cacheConfig = { + experimentalForceLongPolling: Platform.OS === 'android', + localCache: persistentLocalCache({ + tabManager: persistentSingleTabManager({ forceOwnership: true }) + }) + }; +} catch (e) { + console.log('Falling back to memory cache for Firestore'); + cacheConfig = { + experimentalForceLongPolling: Platform.OS === 'android', + localCache: memoryLocalCache() + }; +} + +const db = initializeFirestore(app, cacheConfig); // Initialize Auth based on platform const auth = Platform.OS === 'web' diff --git a/eas.json b/eas.json index 44f6dff..21a79d5 100644 --- a/eas.json +++ b/eas.json @@ -1,8 +1,13 @@ { "build": { "preview": { + "distribution": "internal", "android": { - "buildType": "apk" + "gradleCommand": ":app:assembleDebug", + "buildType": "apk", + "env": { + "GOOGLE_SERVICES_JSON_PATH": "./android/app/google-services.json" + } } }, "development": { @@ -10,14 +15,17 @@ "distribution": "internal", "android": { "gradleCommand": ":app:assembleDebug", - "buildType": "apk" + "buildType": "apk", + "env": { + "GOOGLE_SERVICES_JSON_PATH": "./android/app/google-services.json" + } } }, "production": { "distribution": "store", "android": { "buildType": "apk", - "withoutCredentials": false + "gradleCommand": ":app:assembleDebug" }, "prebuildCommand": "./node_modules/.bin/expo prebuild" } diff --git a/services/firebaseService.ts b/services/firebaseService.ts index fe50a74..93841cd 100644 --- a/services/firebaseService.ts +++ b/services/firebaseService.ts @@ -18,7 +18,7 @@ import { BaseItem, Goal, GoodDeed, Reflection, CollectionType } from '../models/ import { startOfDay, endOfDay } from 'date-fns'; export class FirebaseService { - private collectionRef; + protected collectionRef; constructor(collectionName: CollectionType) { this.collectionRef = collection(db, collectionName);