Fixed some UI issues and routing issues
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
import { supabase } from "@/lib/supabase";
|
||||
import { Session } from "@supabase/supabase-js";
|
||||
import { Tabs } from "expo-router";
|
||||
import { Redirect, Tabs } from "expo-router";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
|
||||
export default function TabLayout() {
|
||||
const [session, SetSession] = useState<Session | null>(null)
|
||||
const [loading, SetLoading] = useState(true);
|
||||
@@ -28,9 +27,9 @@ export default function TabLayout() {
|
||||
return null;
|
||||
}
|
||||
|
||||
// if (!session) {
|
||||
// return <Redirect href="/createUser" />;
|
||||
// }
|
||||
if (!session) {
|
||||
return <Redirect href="/createUser" />;
|
||||
}
|
||||
|
||||
return (
|
||||
<Tabs>
|
||||
@@ -38,6 +37,19 @@ export default function TabLayout() {
|
||||
<Tabs.Screen name="tasks" options={{title: "Tasks"}} />
|
||||
<Tabs.Screen name="assignments" options={{title: "Assignments"}} />
|
||||
<Tabs.Screen name="subjects" options={{title: "Subjects"}} />
|
||||
<Tabs.Screen name="timer" options={{title: "Timer"}} />
|
||||
|
||||
<Tabs.Screen name="subject/createSubject" options={{ href: null }} />
|
||||
<Tabs.Screen name="subject/editSubject" options={{ href: null }} />
|
||||
<Tabs.Screen name="subject/viewDetailsSubject" options={{ href: null }} />
|
||||
|
||||
<Tabs.Screen name="assignment/createAssignment" options={{ href: null }} />
|
||||
<Tabs.Screen name="assignment/editAssignment" options={{ href: null }} />
|
||||
<Tabs.Screen name="assignment/viewDetailsAssignment" options={{ href: null }} />
|
||||
|
||||
<Tabs.Screen name="task/createTask" options={{ href: null }} />
|
||||
<Tabs.Screen name="task/editTask" options={{ href: null }} />
|
||||
<Tabs.Screen name="task/viewDetailsTask" options={{ href: null }} />
|
||||
</Tabs>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user