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

Jump to bottom

chore: upgrade expo and restructure app #82

Merged
merged 2 commits into from
May 5, 2021
Merged

chore: upgrade expo and restructure app #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28056fd
chore: upgrade expo
salmanm May 5, 2021
73459af
chore: restructure the app
salmanm May 5, 2021
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
9 changes: 5 additions & 4 deletions app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"slug": "optic-expo",
"owner": "nearform",
"scheme": "optic-expo",
"entryPoint": "./src/index.js",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"icon": "./src/assets/icon.png",
"splash": {
"image": "./assets/splash.png",
"image": "./src/assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
Expand All @@ -21,12 +22,12 @@
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"foregroundImage": "./src/assets/adaptive-icon.png",
"backgroundColor": "#FFFFFF"
}
},
"web": {
"favicon": "./assets/favicon.png"
"favicon": "./src/assets/favicon.png"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the changes in this file stuff that the expo upgrade did?

}
}
}
39 changes: 20 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"main": "node_modules/expo/AppEntry.js",
"main": "./src/index.js",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this also the expo upgrade?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I wanted to keep all the app related files under /src and other stuff outside. So had to do this.

"private": true,
"scripts": {
"start": "expo start",
Expand All @@ -14,41 +14,42 @@
"dependencies": {
"@expo-google-fonts/didact-gothic": "^0.1.0",
"@expo-google-fonts/poppins": "^0.1.0",
"@react-native-async-storage/async-storage": "1.15.1",
"@react-native-async-storage/async-storage": "^1.13.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expo cli did this downgrade

"@react-native-community/masked-view": "0.1.10",
"@react-navigation/native": "5.9.4",
"@react-navigation/stack": "5.14.4",
"aes-js": "3.1.2",
"color": "^3.1.3",
"expo": "~40.0.0",
"expo": "^41.0.0",
"expo-app-loading": "^1.0.1",
"expo-auth-session": "~3.0.0",
"expo-barcode-scanner": "~9.1.0",
"expo-random": "~10.0.0",
"expo-secure-store": "~9.3.0",
"expo-status-bar": "~1.0.3",
"expo-web-browser": "~8.6.0",
"firebase": "^7.9.0",
"expo-auth-session": "~3.2.3",
"expo-barcode-scanner": "~10.1.2",
"expo-random": "~11.1.2",
"expo-secure-store": "~10.1.0",
"expo-status-bar": "~1.0.4",
"expo-web-browser": "~9.1.0",
"firebase": "8.2.3",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had 8.4.1 (before I made it 7.9.0) and expo upgrade util automatically made it 8.2.3 so I kept it to avoid firebase warning.

"react": "16.13.1",
"react-dom": "16.13.1",
"react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
"react-native-gesture-handler": "~1.8.0",
"react-native-get-random-values": "1.7.0",
"react-native": "https://github.com/expo/react-native/archive/sdk-41.0.0.tar.gz",
"react-native-gesture-handler": "~1.10.2",
"react-native-get-random-values": "~1.7.0",
"react-native-paper": "^4.7.2",
"react-native-reanimated": "~1.13.0",
"react-native-safe-area-context": "3.1.9",
"react-native-screens": "~2.15.2",
"react-native-svg": "^12.1.0",
"react-native-reanimated": "~2.1.0",
"react-native-safe-area-context": "3.2.0",
"react-native-screens": "~3.0.0",
"react-native-svg": "12.1.0",
"react-native-web": "~0.13.12",
"url-otpauth": "^2.0.0",
"uuid": "8.3.2"
},
"devDependencies": {
"@babel/core": "~7.13.15",
"@babel/core": "~7.9.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same, expo upgrade util downgraded it. We could up it back, but may be it downgraded for some reason!?

"@commitlint/cli": "^12.1.1",
"@commitlint/config-conventional": "^12.1.1",
"@react-native-community/eslint-config": "^2.0.0",
"@testing-library/jest-native": "^4.0.1",
"@testing-library/react-hooks": "^5.1.2",
"@testing-library/react-native": "^7.2.0",
"eslint": "^7.24.0",
"eslint-config-prettier": "^8.2.0",
Expand All @@ -57,7 +58,7 @@
"eslint-plugin-react-hooks": "^4.2.0",
"husky": "4",
"jest": "^26.6.3",
"jest-expo": "^40.0.2",
"jest-expo": "^41.0.0",
"lint-staged": ">=10",
"prettier": "^2.2.1"
},
Expand Down
0 App.js → src/App.js
View file
Open in desktop
File renamed without changes.
0 assets/adaptive-icon.png → src/assets/adaptive-icon.png
View file
Open in desktop
File renamed without changes
0 assets/favicon.png → src/assets/favicon.png
View file
Open in desktop
File renamed without changes
0 assets/google.png → src/assets/google.png
View file
Open in desktop
File renamed without changes
0 assets/icon.png → src/assets/icon.png
View file
Open in desktop
File renamed without changes
0 assets/splash.png → src/assets/splash.png
View file
Open in desktop
File renamed without changes
0 components/Actions.js → src/components/Actions.js
View file
Open in desktop
File renamed without changes.
0 components/Auth.js → src/components/Auth.js
View file
Open in desktop
File renamed without changes.
0 components/DefaultHeaderLeft.js → src/components/DefaultHeaderLeft.js
View file
Open in desktop
File renamed without changes.
0 components/EmptyTokensText.js → src/components/EmptyTokensText.js
View file
Open in desktop
File renamed without changes.
0 components/HomeHeaderRight.js → src/components/HomeHeaderRight.js
View file
Open in desktop
File renamed without changes.
0 components/IconButtonWithLabel.js → src/components/IconButtonWithLabel.js
View file
Open in desktop
File renamed without changes.
0 components/Logo.js → src/components/Logo.js
View file
Open in desktop
File renamed without changes.
0 components/Main.js → src/components/Main.js
View file
Open in desktop
File renamed without changes.
0 components/Secret.js → src/components/Secret.js
View file
Open in desktop
File renamed without changes.
0 components/Spacer.js → src/components/Spacer.js
View file
Open in desktop
File renamed without changes.
0 components/screens/Home.js → src/components/screens/Home.js
View file
Open in desktop
File renamed without changes.
0 components/screens/ScanNewSecretScreen.js → ...components/screens/ScanNewSecretScreen.js
View file
Open in desktop
File renamed without changes.
0 components/screens/TypeNewSecretScreen.js → ...components/screens/TypeNewSecretScreen.js
View file
Open in desktop
File renamed without changes.
0 components/screens/UploadNewSecretScreen.js → ...mponents/screens/UploadNewSecretScreen.js
View file
Open in desktop
File renamed without changes.
0 components/typography.js → src/components/typography.js
View file
Open in desktop
File renamed without changes.
0 context/authentication.js → src/context/authentication.js
View file
Open in desktop
File renamed without changes.
0 context/secrets.js → src/context/secrets.js
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { registerRootComponent } from 'expo'

import App from './App'

registerRootComponent(App)
0 lib/defaultTheme.js → src/lib/defaultTheme.js
View file
Open in desktop
File renamed without changes.
0 lib/qrParser.js → src/lib/qrParser.js
View file
Open in desktop
File renamed without changes.
0 lib/routeDefinitions.js → src/lib/routeDefinitions.js
View file
Open in desktop
File renamed without changes.
0 lib/secretsManager.js → src/lib/secretsManager.js
View file
Open in desktop
File renamed without changes.
0 lib/secretsService.js → src/lib/secretsService.js
View file
Open in desktop
File renamed without changes.
0 tests/Main.test.js → src/tests/Main.test.js
View file
Open in desktop
File renamed without changes.
0 tests/secretsManager.test.js → src/tests/secretsManager.test.js
View file
Open in desktop
File renamed without changes.
0 tests/utils.js → src/tests/utils.js
View file
Open in desktop
File renamed without changes.
Loading