diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx index 5876d15..d9a261e 100644 --- a/app/(tabs)/_layout.tsx +++ b/app/(tabs)/_layout.tsx @@ -56,14 +56,15 @@ export default function TabLayout() { } if (!session) { - return ; + return ; } return ( - - - - + + diff --git a/app/(tabs)/assignments.tsx b/app/(tabs)/assignments.tsx deleted file mode 100644 index 8fb9f77..0000000 --- a/app/(tabs)/assignments.tsx +++ /dev/null @@ -1,336 +0,0 @@ -import { defaultStyles } from '@/constants/defaultStyles'; -import { CheckSubjectCompletion } from '@/lib/progress'; -import { supabase } from '@/lib/supabase'; -import type { Assignment, Task } from '@/lib/types'; -import { Ionicons } from '@expo/vector-icons'; -import { Session } from '@supabase/supabase-js'; -import { router, Stack, useFocusEffect } from 'expo-router'; -import { useCallback, useEffect, useState } from 'react'; -import { - Alert, - Pressable, - SectionList, - Text, - View, -} from 'react-native'; - -export default function Assignments() { - const [assignments, SetAssignments] = useState([]); - const [tasksByAssignment, SetTasksByAssignment] = useState>({}); - const [session, SetSession] = useState(null); - - const assignmentSections = [ - { - title: 'Upcoming Assignments', - data: assignments.filter((assignment) => !assignment.isCompleted), - emptyMessage: 'No upcoming assignments', - }, - { - title: 'Completed Assignments', - data: assignments.filter((assignment) => assignment.isCompleted), - emptyMessage: 'No completed assignments', - }, - ]; - - useEffect(() => { - supabase.auth - .getSession() - .then(({ data }) => SetSession(data.session ?? null)); - - const { data: sub } = supabase.auth.onAuthStateChange( - (_event, newSession) => { - SetSession(newSession); - } - ); - - return () => sub.subscription.unsubscribe(); - }, []); - - const GetAssignments = async () => { - const { data: assignmentsData, error: assignmentsError } = await supabase - .from('assignments') - .select('*') - .order('deadline', { ascending: false }); - - if (assignmentsError) { - Alert.alert('Assignments could not be fetched, please try again'); - return; - } - - const assignmentRows = assignmentsData ?? []; - SetAssignments(assignmentRows); - - if (assignmentRows.length === 0) { - SetTasksByAssignment({}); - return; - } - - const aIds = assignmentRows.map((assignment) => assignment.aId); - - const { data: tasksData, error: tasksError } = await supabase - .from('tasks') - .select('*') - .in('aId', aIds); - - if (tasksError) { - Alert.alert('Assignment tasks could not be fetched, please try again'); - SetTasksByAssignment({}); - return; - } - - const groupedTasks: Record = {}; - - for (const task of tasksData ?? []) { - if (!groupedTasks[task.aId]) { - groupedTasks[task.aId] = []; - } - groupedTasks[task.aId].push(task); - } - - SetTasksByAssignment(groupedTasks); - }; - - useFocusEffect( - useCallback(() => { - if (session) { - GetAssignments(); - } - }, [session]) - ); - - const DeleteAssignment = async (aId: string, sId: string) => { - Alert.alert( - 'Delete Assignment', - 'Are you sure you want to delete this assignment?', - [ - { - text: 'Cancel', - style: 'cancel', - }, - { - text: 'Delete', - style: 'destructive', - onPress: async () => { - const { error } = await supabase - .from('assignments') - .delete() - .eq('aId', aId); - - if (error) { - Alert.alert('Assignment could not be deleted, please try again'); - return; - } - - Alert.alert('Assignment deleted successfully!'); - - try { - await CheckSubjectCompletion(sId); - } catch { - Alert.alert("Failed to update subject status"); - } - - GetAssignments(); - }, - }, - ] - ); - }; - - return ( - - ( - - - - - - await supabase.auth.signOut()} - > - - Logout - - - - ), - }} - /> - - - - - Assignments - - - Track what is coming up and what you have already finished. - - - - router.push('/assignment/createAssignment')} - > - - Create Assignment - - - - item.aId} - showsVerticalScrollIndicator={false} - stickySectionHeadersEnabled={false} - contentContainerStyle={{ - paddingBottom: 32, - }} - renderSectionHeader={({ section: { title, data } }) => ( - - - {title} - - - - - {data.length} - - - - )} - renderItem={({ item }) => { - const isOwner = session?.user.id === item.uId; - - const assignmentTasks = tasksByAssignment[item.aId] ?? []; - const progress = assignmentTasks.length === 0 ? 0 : Math.round((assignmentTasks.filter(task => task.isCompleted).length / assignmentTasks.length) * 100); - - return ( - - - router.push({ - pathname: '/assignment/viewDetailsAssignment', - params: { aId: item.aId }, - }) - } - > - - - {item.isCompleted && ( - - ✓ - - )} - - - - - {item.title} - - - {item.description ? ( - - {item.description} - - ) : null} - - - - Deadline: {item.deadline || 'No deadline'} - - - - - {progress}% - - - - - - - - - - {isOwner && ( - - - router.push({ - pathname: '/assignment/editAssignment', - params: { aId: item.aId }, - }) - } - > - - Edit - - - - DeleteAssignment(item.aId, item.sId)} - > - - Delete - - - - )} - - ); - }} - renderSectionFooter={({ section }) => - section.data.length === 0 ? ( - - - {section.emptyMessage} - - - New assignments will show up here. - - - ) : ( - - ) - } - /> - - - ); -} \ No newline at end of file diff --git a/app/(tabs)/subjects.tsx b/app/(tabs)/subjects.tsx index f5f5f79..86564b8 100644 --- a/app/(tabs)/subjects.tsx +++ b/app/(tabs)/subjects.tsx @@ -1,40 +1,21 @@ -import { defaultStyles } from '@/constants/defaultStyles'; +import { SUBJECT_COLORS } from '@/lib/subjectColors'; import { supabase } from '@/lib/supabase'; -import type { Assignment, Subject } from '@/lib/types'; -import { Ionicons } from '@expo/vector-icons'; +import { Subject } from '@/lib/types'; import { Session } from '@supabase/supabase-js'; import { router, Stack, useFocusEffect } from 'expo-router'; import { useCallback, useEffect, useState } from 'react'; -import { - Alert, - Pressable, - SectionList, - Text, - View, -} from 'react-native'; +import { Alert, Pressable, ScrollView, Text, View } from 'react-native'; + +import type { SubjectColor } from '@/lib/subjectColors'; export default function Subjects() { const [subjects, SetSubjects] = useState([]); - const [assignmentsBySubject, SetAssignmentsBySubject] = useState>({}); const [session, SetSession] = useState(null); - const subjectSections = [ - { - title: 'Active Subjects', - data: subjects.filter((subject) => subject.isActive), - emptyMessage: 'No active subjects', - }, - { - title: 'Inactive Subjects', - data: subjects.filter((subject) => !subject.isActive), - emptyMessage: 'No inactive subjects', - }, - ]; - useEffect(() => { - supabase.auth - .getSession() - .then(({ data }) => SetSession(data.session ?? null)); + supabase.auth.getSession().then(({ data }) => { + SetSession(data.session ?? null); + }); const { data: sub } = supabase.auth.onAuthStateChange( (_event, newSession) => { @@ -46,47 +27,20 @@ export default function Subjects() { }, []); const GetSubjects = async () => { - const { data: subjectsData, error: subjectsError } = await supabase + if (!session?.user.id) return; + + const { data, error } = await supabase .from('subjects') .select('*') + .eq('uId', session.user.id) .order('lastChanged', { ascending: false }); - if (subjectsError) { + if (error) { Alert.alert('Subjects could not be fetched, please try again'); return; } - const subjectRows = subjectsData ?? []; - SetSubjects(subjectsData ?? []); - - if (subjectRows.length === 0) { - SetAssignmentsBySubject({}); - return; - } - - const sIds = subjectRows.map((subject) => subject.sId); - - const { data: assignmentsData, error: assignmentsError } = await supabase - .from('assignments') - .select('*') - .in('sId', sIds); - - if (assignmentsError) { - Alert.alert('Subject assignments could not be fetched, please try again'); - SetAssignmentsBySubject({}); - return; - } - - const groupedAssignments: Record = {}; - - for (const assignment of assignmentsData ?? []) { - if (!groupedAssignments[assignment.sId]) { - groupedAssignments[assignment.sId] = []; - } - groupedAssignments[assignment.sId].push(assignment); - } - - SetAssignmentsBySubject(groupedAssignments); + SetSubjects((data as Subject[]) ?? []); }; useFocusEffect( @@ -97,232 +51,131 @@ export default function Subjects() { }, [session]) ); - const DeleteSubject = async (sId: string) => { - Alert.alert( - 'Delete Subject', - 'Are you sure you want to delete this subject?', - [ - { - text: 'Cancel', - style: 'cancel', - }, - { - text: 'Delete', - style: 'destructive', - onPress: async () => { - const { error } = await supabase - .from('subjects') - .delete() - .eq('sId', sId); - - if (error) { - Alert.alert('Subject could not be deleted, please try again'); - return; - } - - Alert.alert('Subject deleted successfully!'); - GetSubjects(); - }, - }, - ] - ); - }; - return ( ( - - - - - - await supabase.auth.signOut()} - > - - Logout - - - + await supabase.auth.signOut()} + > + + Logout + + ), }} /> - + - - Subjects - + Subjects - Organize your study work by subject, then break it into assignments - and tasks. + Pick a subject to manage assignments and tasks. + {subjects.length === 0 ? ( + + + No subjects yet + + + Create your first subject to get started. + + + ) : ( + + {subjects.map((subject) => { + const colorKey: SubjectColor = subject.color ?? 'slate'; + const colorSet = SUBJECT_COLORS[colorKey]; + + const firstLetter = + subject.title?.trim().charAt(0).toUpperCase() || '?'; + + return ( + + router.push({ + pathname: '/subject/viewDetailsSubject', + params: { sId: subject.sId }, + }) + } + > + + + + {firstLetter} + + + + + + {subject.title} + + + + {subject.description || 'No description added.'} + + + + + + + {subject.isActive ? 'Active' : 'Inactive'} + + + + + + ); + })} + + )} + router.push('/subject/createSubject')} + className="mt-2 h-14 items-center justify-center rounded-2xl bg-accent" + onPress={() => router.push('/subject/upsertSubject')} > Create Subject - - item.sId} - showsVerticalScrollIndicator={false} - stickySectionHeadersEnabled={false} - contentContainerStyle={{ - paddingBottom: 32, - }} - renderSectionHeader={({ section: { title, data } }) => ( - - - {title} - - - - - {data.length} - - - - )} - renderItem={({ item }) => { - const isOwner = session?.user.id === item.uId; - - const subjectAssignments = assignmentsBySubject[item.sId] ?? []; - const progress = subjectAssignments.length === 0 ? 0 : Math.round((subjectAssignments.filter(assignment => assignment.isCompleted).length / subjectAssignments.length) * 100); - - return ( - - - router.push({ - pathname: '/subject/viewDetailsSubject', - params: { sId: item.sId }, - }) - } - > - - - {item.isActive && ( - - ✓ - - )} - - - - - {item.title} - - - {item.description ? ( - - {item.description} - - ) : null} - - - - {item.isActive ? 'Active' : 'Inactive'} - - - - {progress}% - - - - - - - - - - {isOwner && ( - - - router.push({ - pathname: '/subject/editSubject', - params: { sId: item.sId }, - }) - } - > - - Edit - - - - DeleteSubject(item.sId)} - > - - Delete - - - - )} - - ); - }} - renderSectionFooter={({ section }) => - section.data.length === 0 ? ( - - - {section.emptyMessage} - - - Subjects you create will show up here. - - - ) : ( - - ) - } - /> - + ); } \ No newline at end of file diff --git a/app/assignment/_layout.tsx b/app/assignment/_layout.tsx index 380a294..7fb96ef 100644 --- a/app/assignment/_layout.tsx +++ b/app/assignment/_layout.tsx @@ -3,8 +3,7 @@ import { Stack } from "expo-router"; export default function AssignmentLayout() { return ( - - + ); diff --git a/app/assignment/editAssignment.tsx b/app/assignment/editAssignment.tsx deleted file mode 100644 index 7115942..0000000 --- a/app/assignment/editAssignment.tsx +++ /dev/null @@ -1,192 +0,0 @@ -import { defaultStyles } from '@/constants/defaultStyles'; -import { GetAssignmentNotificationId, RemoveAssignmentNotificationId, SaveAssignmentNotificationId } from '@/lib/asyncStorage'; -import { CheckSubjectCompletion } from '@/lib/progress'; -import { supabase } from '@/lib/supabase'; -import type { Assignment } from '@/lib/types'; -import * as Notifications from 'expo-notifications'; -import { router, Stack, useFocusEffect, useLocalSearchParams } from 'expo-router'; -import { useCallback, useState } from 'react'; -import { ActivityIndicator, Alert, Button, Keyboard, KeyboardAvoidingView, Platform, Pressable, Text, TextInput, TouchableWithoutFeedback, View } from 'react-native'; - -export default function EditAssignment() { - const { aId } = useLocalSearchParams<{ aId: string }>(); - const [assignment, SetAssignment] = useState(null) - const [isSaving, SetIsSaving] = useState(false); - - const ScheduleDeadlineReminder = async (aId: string, title: string, deadline: string) => { - const dl = new Date(deadline); - - if (isNaN(dl.getTime())) return null; - - const deadlineReminder = new Date(dl.getTime() - 24 * 60 * 60 * 1000); - - if (deadlineReminder <= new Date()) return null; - - const nId = await Notifications.scheduleNotificationAsync({ - content: { - title: 'Assignment deadline coming up', - body: `${title} is due in 24 hours.`, - data: { aId }, - }, - trigger: { - type: Notifications.SchedulableTriggerInputTypes.DATE, - date: deadlineReminder, - }, - }); - - return nId; - } - - const CancelDeadlineReminder = async (aId: string) => { - const nId = await GetAssignmentNotificationId(aId); - - if (!nId) return; - - await Notifications.cancelScheduledNotificationAsync(nId); - await RemoveAssignmentNotificationId(aId); - } - - const GetAssignment = async (aId: string) => { - const { data, error } = await supabase.from("assignments").select("*").eq("aId", aId).single(); - - if (error) { - Alert.alert("Assignment could not be fetched, please try again"); - return; - } - - SetAssignment(data ?? null); - } - - useFocusEffect( - useCallback(() => { - if (aId) { - GetAssignment(aId); - } - }, [aId]) - ); - - const EditAssignment = async () => { - if (!assignment) return; - - if(assignment.title.trim() === '' || assignment.deadline.trim() === '') { - Alert.alert("Title and deadline are required!"); - return; - } - - const { data: userData, error: userError } = await supabase.auth.getUser(); - - if(userError || !userData.user) { - router.replace("../createUser"); - return; - } - - SetIsSaving(true); - - const { data: assignmentData, error: dbError } = await supabase.from("assignments").update({ - title: assignment.title, - description: assignment.description, - deadline: assignment.deadline, - isCompleted: assignment.isCompleted, - lastChanged: new Date().toISOString(), - uId: userData.user.id, - sId: assignment.sId, - }) - .eq("aId", aId) - .select() - .single(); - - SetIsSaving(false); - - if (dbError) { - Alert.alert("Assignment could not be edited, please try again"); - return; - } - - Alert.alert("Assignment successfully edited!"); - - if (assignmentData) { - await CancelDeadlineReminder(assignmentData.aId); - - if (!assignmentData.isCompleted) { - const nId = await ScheduleDeadlineReminder(assignmentData.aId, assignmentData.title, assignmentData.deadline); - - if (nId) { - await SaveAssignmentNotificationId(assignmentData.aId, nId); - } - } - } - - if (assignmentData.sId) { - try { - await CheckSubjectCompletion(assignmentData.sId); - } catch { - Alert.alert("Failed to update subject status"); - } - } - - router.back(); - } - - return ( - - - - {!assignment && ( - - Assignment not found - - )} - - {assignment && ( - - Edit Assignment - - - - SetAssignment(prev => prev ? { ...prev, title: text } : prev)} - /> - SetAssignment(prev => prev ? { ...prev, description: text } : prev)} - /> - SetAssignment(prev => prev ? { ...prev, deadline: text } : prev)} - /> - SetAssignment(prev => prev ? { ...prev, isCompleted: !prev.isCompleted } : prev)} - style={defaultStyles.checkboxContainer} - > - - {assignment.isCompleted && ✓} - - {assignment.isCompleted ? 'Completed' : 'Not Completed'} - - -