Skip to content

Commit

Permalink
Merge branch 'main' into apawar/ocf-16-lo-fi-tree-information-screen
Browse files Browse the repository at this point in the history
  • Loading branch information
adityapawar1 authored Nov 14, 2024
2 parents 38dc2e8 + 2fb4108 commit eb73dd7
Show file tree
Hide file tree
Showing 21 changed files with 4,251 additions and 4,248 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ module.exports = {
extends: ['expo', 'prettier', 'eslint:recommended'],
plugins: ['prettier', '@typescript-eslint'],
parser: '@typescript-eslint/parser',
env: {
node: true,
},
rules: {
// add project-specific linting rules here
'prettier/prettier': 'error',
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ node_modules/
dist/
web-build/

# Platforms
ios/
android/

# Native
*.orig.*
*.jks
Expand Down
25 changes: 24 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,33 @@
"expo": {
"name": "Our City Forest",
"slug": "our-city-forest",
"owner": "calblueprint",
"owner": "ocfdev",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/bp-icon.png",
"userInterfaceStyle": "light",
"plugins": [
[
"expo-camera",
{
"cameraPermission": "Allow Our City Forest to access your camera to scan QR codes."
}
]
],
"splash": {
"image": "./assets/bp-splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"plugins": [
[
"expo-dev-launcher",
{
"launchMode": "most-recent"
}
]
],
"platforms": ["ios", "android", "web"],
"ios": {
"bundleIdentifier": "org.calblueprint.ourcityforest",
"supportsTablet": true,
Expand All @@ -29,6 +46,12 @@
},
"web": {
"favicon": "./assets/bp-favicon.png"
},
"scheme": "org.calblueprint.ourcityforest",
"extra": {
"eas": {
"projectId": "d04f2944-f495-4c9b-b330-6e13ce59c6ff"
}
}
}
}
21 changes: 21 additions & 0 deletions eas.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"cli": {
"version": ">= 12.6.1",
"appVersionSource": "remote"
},
"build": {
"development": {
"developmentClient": true,
"distribution": "internal"
},
"preview": {
"distribution": "internal"
},
"production": {
"autoIncrement": true
}
},
"submit": {
"production": {}
}
}
Loading

0 comments on commit eb73dd7

Please sign in to comment.