Merge branch 'tailwind'

2026-04-25 15:57:26 +02:00
parent cfa3b151df da8a92b8c2
commit 9b3069153d
19 changed files with 589 additions and 124 deletions
--- a/app/(tabs)/assignments.tsx
+++ b/app/(tabs)/assignments.tsx
@@ -1,5 +1,7 @@
 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';
@@ -12,19 +14,9 @@ import {
  View,
 } from 'react-native';

-type Assignment = {
-  aId: string;
-  title: string;
-  description: string;
-  deadline: string;
-  isCompleted: boolean;
-  lastChanged: string;
-  uId: string;
-  sId: string;
-};
-
 export default function Assignments() {
  const [assignments, SetAssignments] = useState<Assignment[]>([]);
+  const [tasksByAssignment, SetTasksByAssignment] = useState<Record<string, Task[]>>({});
  const [session, SetSession] = useState<Session | null>(null);

  const assignmentSections = [
@@ -55,17 +47,47 @@ export default function Assignments() {
  }, []);

  const GetAssignments = async () => {
-    const { data, error } = await supabase
+    const { data: assignmentsData, error: assignmentsError } = await supabase
      .from('assignments')
      .select('*')
      .order('deadline', { ascending: false });

-    if (error) {
+    if (assignmentsError) {
      Alert.alert('Assignments could not be fetched, please try again');
      return;
    }

-    SetAssignments(data ?? []);
+    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<string, Task[]> = {};
+
+    for (const task of tasksData ?? []) {
+      if (!groupedTasks[task.aId]) {
+        groupedTasks[task.aId] = [];
+      }
+      groupedTasks[task.aId].push(task);
+    }
+
+    SetTasksByAssignment(groupedTasks);
  };

  useFocusEffect(
@@ -76,7 +98,7 @@ export default function Assignments() {
    }, [session])
  );

-  const DeleteAssignment = async (aId: string) => {
+  const DeleteAssignment = async (aId: string, sId: string) => {
    Alert.alert(
      'Delete Assignment',
      'Are you sure you want to delete this assignment?',
@@ -100,6 +122,13 @@ export default function Assignments() {
            }

            Alert.alert('Assignment deleted successfully!');
+
+            try {
+              await CheckSubjectCompletion(sId);
+            } catch {
+              Alert.alert("Failed to update subject status");
+            }
+
            GetAssignments();
          },
        },
@@ -178,6 +207,9 @@ export default function Assignments() {
          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 (
              <View className="mb-4 rounded-3xl border border-app-border bg-app-surface p-4 shadow-sm">
                <Pressable
@@ -228,6 +260,28 @@ export default function Assignments() {
                          Deadline: {item.deadline || 'No deadline'}
                        </Text>
                      </View>
+
+                      <View style={{ marginTop: 10 }}>
+                        <Text style={{ marginBottom: 4 }}>{progress}%</Text>
+
+                        <View
+                          style={{
+                            width: "100%",
+                            height: 12,
+                            backgroundColor: "#D9D9D9",
+                            borderRadius: 999,
+                            overflow: "hidden",
+                          }}
+                        >
+                          <View
+                            style={{
+                              width: `${progress}%`,
+                              height: "100%",
+                              backgroundColor: "#4CAF50",
+                            }}
+                          />
+                        </View>
+                      </View>
                    </View>
                  </View>
                </Pressable>
@@ -250,7 +304,7 @@ export default function Assignments() {

                    <Pressable
                      className="flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-surface py-3"
-                      onPress={() => DeleteAssignment(item.aId)}
+                      onPress={() => DeleteAssignment(item.aId, item.sId)}
                    >
                      <Text className="text-sm font-bold text-status-danger">
                        Delete
--- a/app/(tabs)/subjects.tsx
+++ b/app/(tabs)/subjects.tsx
@@ -1,5 +1,6 @@
 import { defaultStyles } from '@/constants/defaultStyles';
 import { supabase } from '@/lib/supabase';
+import type { Assignment, Subject } from '@/lib/types';
 import { Ionicons } from '@expo/vector-icons';
 import { Session } from '@supabase/supabase-js';
 import { router, Stack, useFocusEffect } from 'expo-router';
@@ -12,17 +13,9 @@ import {
  View,
 } from 'react-native';

-type Subject = {
-  sId: string;
-  title: string;
-  description: string;
-  isActive: boolean;
-  lastChanged: string;
-  uId: string;
-};
-
 export default function Subjects() {
  const [subjects, SetSubjects] = useState<Subject[]>([]);
+  const [assignmentsBySubject, SetAssignmentsBySubject] = useState<Record<string, Assignment[]>>({});
  const [session, SetSession] = useState<Session | null>(null);

  const subjectSections = [
@@ -53,17 +46,47 @@ export default function Subjects() {
  }, []);

  const GetSubjects = async () => {
-    const { data, error } = await supabase
+    const { data: subjectsData, error: subjectsError } = await supabase
      .from('subjects')
      .select('*')
      .order('lastChanged', { ascending: false });

-    if (error) {
+    if (subjectsError) {
      Alert.alert('Subjects could not be fetched, please try again');
      return;
    }

-    SetSubjects(data ?? []);
+    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<string, Assignment[]> = {};
+    
+    for (const assignment of assignmentsData ?? []) {
+      if (!groupedAssignments[assignment.sId]) {
+        groupedAssignments[assignment.sId] = [];
+      }
+      groupedAssignments[assignment.sId].push(assignment);
+    }
+    
+    SetAssignmentsBySubject(groupedAssignments);
  };

  useFocusEffect(
@@ -177,6 +200,9 @@ export default function Subjects() {
          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 (
              <View className="mb-4 rounded-3xl border border-app-border bg-app-surface p-4 shadow-sm">
                <Pressable
@@ -227,6 +253,27 @@ export default function Subjects() {
                          {item.isActive ? 'Active' : 'Inactive'}
                        </Text>
                      </View>
+                      <View style={{ marginTop: 10 }}>
+                        <Text style={{ marginBottom: 4 }}>{progress}%</Text>
+                        
+                        <View
+                          style={{
+                            width: "100%",
+                            height: 12,
+                            backgroundColor: "#D9D9D9",
+                            borderRadius: 999,
+                            overflow: "hidden",
+                          }}
+                        >
+                          <View
+                            style={{
+                              width: `${progress}%`,
+                              height: "100%",
+                              backgroundColor: "#4CAF50",
+                            }}
+                          />
+                        </View>
+                      </View>
                    </View>
                  </View>
                </Pressable>
--- a/app/(tabs)/tasks.tsx
+++ b/app/(tabs)/tasks.tsx
@@ -1,5 +1,7 @@
 import { defaultStyles } from '@/constants/defaultStyles';
+import { CheckAssignmentCompletion } from '@/lib/progress';
 import { supabase } from '@/lib/supabase';
+import type { Task } from '@/lib/types';
 import { Ionicons } from '@expo/vector-icons';
 import { Session } from '@supabase/supabase-js';
 import { router, Stack, useFocusEffect } from 'expo-router';
@@ -12,16 +14,6 @@ import {
  View,
 } from 'react-native';

-type Task = {
-  tId: string;
-  title: string;
-  description: string;
-  isCompleted: boolean;
-  lastChanged: string;
-  uId: string;
-  aId: string;
-};
-
 export default function Tasks() {
  const [tasks, SetTasks] = useState<Task[]>([]);
  const [session, SetSession] = useState<Session | null>(null);
@@ -72,7 +64,7 @@ export default function Tasks() {
    }, [session])
  );

-  const DeleteTask = async (tId: string) => {
+  const DeleteTask = async (tId: string, aId: string) => {
    Alert.alert(
      'Delete Task',
      'Are you sure you want to delete this task?',
@@ -96,6 +88,13 @@ export default function Tasks() {
            }

            Alert.alert('Task deleted successfully!');
+
+            try {
+              await CheckAssignmentCompletion(aId);
+            } catch {
+              Alert.alert("Failed to update assignment completion state");
+            }
+
            GetTasks();
          },
        },
@@ -246,7 +245,7 @@ export default function Tasks() {

                    <Pressable
                      className="flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-surface py-3"
-                      onPress={() => DeleteTask(item.tId)}
+                      onPress={() => DeleteTask(item.tId, item.aId)}
                    >
                      <Text className="text-sm font-bold text-status-danger">
                        Delete