Skip to content

Level merging #1

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

Open
beastjk07 wants to merge 5 commits into
base: developer
Choose a base branch
from
Open

Level merging #1

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
bc6b587
Added state for Level information
beastjk07 Apr 19, 2022
5345b26
Removed console logs
beastjk07 Apr 19, 2022
82811b2
Resolving Conflict in Home.js
beastjk07 Apr 19, 2022
c03f282
Level 2 pages linked
beastjk07 Apr 26, 2022
aa27990
Updated Savings Dashboar
beastjk07 May 18, 2022
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
2 changes: 1 addition & 1 deletion .expo/packager-info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devToolsPort": 19002,
"expoServerPort": null,
"packagerPort": null,
"packagerPort": 19000,
"packagerPid": null,
"expoServerNgrokUrl": null,
"packagerNgrokUrl": null,
Expand Down
12 changes: 8 additions & 4 deletions App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,34 @@ import { StatusBar } from "expo-status-bar";
import { StyleSheet, Text, View } from "react-native";
import { NavigationContainer } from "@react-navigation/native";
import RenderLevelMap from "./components/RenderLevelMap";
import Level1 from "./components/Level1";
import Home from "./components/Home";
import { createNativeStackNavigator } from "@react-navigation/native-stack";
import CollectingCoins from "./components/Level1Game/CollectingCoins";
import LevelQuestions from "./components/LevelQuestions";
import Greetings from "./components/Greetings";
import Scenario from "./components/Scenario";
import LevelDefinition from "./components/LevelDefinition";
import SavingsDashboard from "./components/SavingsDashboard";

const Stack = createNativeStackNavigator();

export default function App() {



return (
<View style={styles.container}>
{/* <Text>Pocket Pig is ready for development! :)</Text> */}
<NavigationContainer>
<Stack.Navigator initialRouteName="Home">
<Stack.Screen name="Home" component={Home} />
<Stack.Screen name="RenderLevelMap" component={RenderLevelMap} />
<Stack.Screen name="Level1" component={Level1} />
<Stack.Screen name="Level1Questions" component={LevelQuestions} />
<Stack.Screen name="LevelDefinition" component={LevelDefinition} />
<Stack.Screen name="LevelQuestions" component={LevelQuestions} />
<Stack.Screen name="Greetings" component={Greetings} />
<Stack.Screen options={{headerShown: false}} name="CollectingCoins" component={CollectingCoins} />
<Stack.Screen name="Scenario" component={Scenario} />

<Stack.Screen name="SavingsDashboard" component={SavingsDashboard} />
</Stack.Navigator>
</NavigationContainer>
<StatusBar style="auto" />
Expand Down
35 changes: 34 additions & 1 deletion assets/LevelMap.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/bond.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 98 additions & 0 deletions assets/cafe.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions assets/longterm.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions assets/nextQue.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/oneNo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading