Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Username148576/NCU-App into…
Browse files Browse the repository at this point in the history
… Username148576-main
  • Loading branch information
rorarola committed Sep 25, 2022
2 parents dd7e1ce + 4169024 commit 147190a
Show file tree
Hide file tree
Showing 27 changed files with 3,415 additions and 18 deletions.
11 changes: 10 additions & 1 deletion App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function MainApp() {
}

export default function App() {
if (!firebase.apps.length) {
/*if (!firebase.apps.length) {
firebase.initializeApp(firebaseConfig);
} else {
firebase.app();
Expand All @@ -158,5 +158,14 @@ export default function App() {
>
{ auth ? <MainApp /> : <AuthScreen />}
</PaperProvider>
);*/
return (
<PaperProvider
settings={{
icon: (props) => <AwesomeIcon {...props} />,
}}
>
<MainApp />
</PaperProvider>
);
}
390 changes: 390 additions & 0 deletions controller/Bus.js

Large diffs are not rendered by default.

147 changes: 147 additions & 0 deletions package-lock.json

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

13 changes: 9 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@react-navigation/native": "^6.0.6",
"@react-navigation/native-stack": "^6.2.5",
"@react-navigation/stack": "^6.3.1",
"axios": "^0.21.2",
"expo": "^46.0.9",
"expo-constants": "~13.2.3",
"expo-facebook": "~12.1.0",
Expand All @@ -29,6 +30,7 @@
"expo-status-bar": "~1.2.0",
"firebase": "^8.10.0",
"fuse.js": "^6.5.3",
"jssha": "^2.3.1",
"native-base": "^3.3.7",
"react": "18.0.0",
"react-dom": "18.0.0",
Expand All @@ -40,10 +42,13 @@
"react-native-linear-gradient": "^2.5.6",
"react-native-maps": "0.31.1",
"react-native-modal-datetime-picker": "^10.2.0",
"react-native-paper": "^4.12.0",
"react-native-popup-dialog": "^0.18.3",
"react-native-screens": "~3.15.0",
"react-native-web": "~0.18.7"
"react-native-paper": "^4.11.1",
"react-native-reanimated": "^2.4.0",
"react-native-safe-area-context": "3.3.2",
"react-native-screens": "~3.10.1",
"react-native-web": "0.17.1",
"expo-status-bar": "~1.2.0",
"url": "^0.11.0"
},
"devDependencies": {
"@babel/core": "^7.12.9",
Expand Down
10 changes: 0 additions & 10 deletions screens/Map/BusScreen.jsx

This file was deleted.

Loading

0 comments on commit 147190a

Please sign in to comment.