Skip to content

Commit

Permalink
Merge branch 'main' into akintunde
Browse files Browse the repository at this point in the history
  • Loading branch information
oneboyfromife authored Sep 21, 2023
2 parents 2d3af72 + 7b10097 commit 28382ad
Show file tree
Hide file tree
Showing 16 changed files with 746 additions and 86 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# dependencies
node_modules/
android/

# Expo
.expo/
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
17 changes: 10 additions & 7 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,29 @@
import React, {useContext} from "react";
import {NavigationContainer} from "@react-navigation/native";
import TabNavigator from "./src/navigators/TabNavigator";
// This below is just for testing, will be removed eventually
import Home from "./src/screens/Home";
import Onboarding from "./src/screens/Onboarding";
import Comments from "./src/screens/Comment";
import AuthNavigator from "./src/navigators/AuthNavigator";

import {AuthContext} from "../context/AuthContext";

const App = () => {
// const {userInfo} = useContext(AuthContext);

return (
<NavigationContainer>
<TabNavigator />
{/*<Home />*/}
{/* <TabNavigator /> */}
<Home />
{/* <Onboarding /> */}
{/* <Comments /> */}

{/* <AuthNavigator/> */}
{/* {userInfo.token ? <TabNavigator /> : <AuthNavigator />} */}
{/*</Stack.Navigator> */}

{/* <Stack.Navigator>
{userInfo.token ? <TabNavigator /> : <AuthNavigator />}
</Stack.Navigator> */}
</NavigationContainer>
);
};

export default App;
export default App;
13 changes: 11 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,25 @@
},
"assetBundlePatterns": ["**/*"],
"ios": {
"supportsTablet": true
"supportsTablet": true,
"bundleIdentifier": "com.spitfire.events"
},

"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#ffffff"
}
},
"package": "com.spitfire.events"
},
"web": {
"favicon": "./assets/favicon.png"
},
"scheme": "myapp",
"extra": {
"eas": {
"projectId": "9db3085a-6348-4513-b36c-3ec14de944d6"
}
}
}
}
28 changes: 28 additions & 0 deletions eas.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"cli": {
"version": ">= 5.2.0"
},
"build": {
"development": {
"distribution": "internal",
"android": {
"gradleCommand": ":app:assembleDebug"
},
"ios": {
"buildConfiguration": "Debug"
}
},

"preview": {
"distribution": "internal",

"android": {
"buildType": "apk"
}
},
"production": {}
},
"submit": {
"production": {}
}
}
Loading

0 comments on commit 28382ad

Please sign in to comment.