Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrated Navigation to React Navigation #210

Merged
merged 5 commits into from
Apr 10, 2024
Merged

Migrated Navigation to React Navigation #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
358cc9a
Started migrating nav! (#209)
AlexanderWangY Apr 4, 2024
1b12310
changing folder structure
AlexanderWangY Apr 4, 2024
4ab6cec
finished up frontend button routes
AlexanderWangY Apr 5, 2024
4710fff
added contexts to app nav
AlexanderWangY Apr 5, 2024
6c15433
finished migrating navigation
AlexanderWangY Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions client/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
import React from "react";
import { StyleSheet, View, Text } from "react-native";
import { StyleSheet, Text } from "react-native";
import { AuthStore } from "./src/services/AuthStore";
import { NavigationContainer } from "@react-navigation/native";
import AppNavigator from "./src/navigation/AppNavigator";
import AuthNavigator from "./src/navigation/AuthNavigator";


const App = () => {
const { initialized, isLoggedin } = AuthStore.useState();

if (!initialized) return <Text>Loading...</Text>;

export default function App() {
return (
<View>
<Text>This Componenet is DEPRECATED.</Text>
<Text>DO NOT TOUCH. THE NEW ENTRY POINT IS AT 'app/index.tsx'</Text>
</View>
<NavigationContainer>
{isLoggedin ? (
<AppNavigator />
) : (
<AuthNavigator />
)}
</NavigationContainer>
);
}
};

const styles = StyleSheet.create({
container: {
Expand All @@ -18,3 +30,5 @@ const styles = StyleSheet.create({
justifyContent: "center",
},
});

export default App;
185 changes: 119 additions & 66 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading