diff --git a/App.tsx b/App.tsx index 86b7055..f381c9b 100644 --- a/App.tsx +++ b/App.tsx @@ -23,6 +23,7 @@ import { StatusBar } from "expo-status-bar"; import UserInfoPage from "./src/routes/UserInfoPage/UserInfoPage"; import SubjectsPage from "./src/routes/SubjectsPage/SubjectsPage"; import Loading from "./src/routes/Loading/Loading"; +import StartStudying from "./src/routes/StartStudying/StartStudying"; const Drawer = createDrawerNavigator(); @@ -75,6 +76,7 @@ export default function App() { + diff --git a/src/interfaces/Interfaces.tsx b/src/interfaces/Interfaces.tsx index d613b7c..76c7c8c 100644 --- a/src/interfaces/Interfaces.tsx +++ b/src/interfaces/Interfaces.tsx @@ -1,3 +1,5 @@ +import * as Location from "expo-location"; + export interface IconProps { size: number; } @@ -133,7 +135,7 @@ export interface StudentData { course_shortname: string; year_level: string; yearlevel_shortname: string; - subjects: Subject[]; // To-do + subjects: string[]; // To-do username: string; } @@ -149,3 +151,5 @@ export interface StudentStatusParams { location?: Location; active?: boolean; } + +export type LocationType = Location.LocationObject; diff --git a/src/routes/Home/Home.tsx b/src/routes/Home/Home.tsx index 8672b7a..a213472 100644 --- a/src/routes/Home/Home.tsx +++ b/src/routes/Home/Home.tsx @@ -7,9 +7,15 @@ import * as Location from "expo-location"; import GetDistance from "../../components/GetDistance/GetDistance"; import Button from "../../components/Button/Button"; import { PostStudentStatus } from "../../components/Api/Api"; -import { StudentStatusParams } from "../../interfaces/Interfaces"; -type LocationType = Location.LocationObject; +import { + RootDrawerParamList, + StudentStatusParams, +} from "../../interfaces/Interfaces"; +import { LocationType } from "../../interfaces/Interfaces"; +import { useNavigation } from "@react-navigation/native"; + export default function Home() { + const navigation = useNavigation(); const [location, setLocation] = useState(null); const [dist, setDist] = useState(null); const [feedback, setFeedback] = useState( @@ -158,15 +164,7 @@ export default function Home() { + + {feedback} + + + + ); + } + return ; +}