Skip to content

Commit 19684df

Browse files
auserauser
committed
Updates
1 parent 6b8b095 commit 19684df

File tree

101 files changed

+249
-9266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+249
-9266
lines changed

‎.babelrc‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
{
2-
"presets": ["es2015", "react-native"],
3-
"plugins": ["syntax-async-functions", "transform-regenerator"],
4-
"env": {
5-
"test": {
6-
"presets": ["es2015", "react-native"]
7-
}
8-
}
2+
"presets": ["react-native"]
93
}

‎.flowconfig‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
11
[ignore]
2-
3-
# We fork some components by platform.
2+
; We fork some components by platform
43
.*/*[.]android.js
54

6-
# Ignore templates with `@flow` in header
7-
.*/local-cli/generator.*
8-
9-
# Ignore malformed json
10-
.*/node_modules/y18n/test/.*\.json
11-
12-
# Ignore the website subdir
13-
<PROJECT_ROOT>/website/.*
14-
15-
# Ignore BUCK generated dirs
5+
; Ignore "BUCK" generated dirs
166
<PROJECT_ROOT>/\.buckd/
177

18-
# Ignore unexpected extra @providesModule
19-
.*/node_modules/commoner/test/source/widget/share.js
8+
; Ignore unexpected extra "@providesModule"
9+
.*/node_modules/.*/node_modules/fbjs/.*
2010

21-
# Ignore duplicate module providers
22-
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
11+
; Ignore duplicate module providers
12+
; For RN Apps installed via npm, "Libraries" folder is inside
13+
; "node_modules/react-native" but in the source repo it is in the root
2314
.*/Libraries/react-native/React.js
2415
.*/Libraries/react-native/ReactNative.js
25-
.*/node_modules/jest-runtime/build/__tests__/.*
2616

2717
[include]
2818

@@ -34,9 +24,6 @@ flow/
3424
[options]
3525
module.system=haste
3626

37-
esproposal.class_static_fields=enable
38-
esproposal.class_instance_fields=enable
39-
4027
experimental.strict_type_args=true
4128

4229
munge_underscores=true
@@ -48,11 +35,11 @@ suppress_type=$FlowIssue
4835
suppress_type=$FlowFixMe
4936
suppress_type=$FixMe
5037

51-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
38+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-5]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
39+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-5]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
5340
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
5441

5542
unsafe.enable_getters_and_setters=true
5643

5744
[version]
58-
^0.30.0
45+
^0.35.0

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pbxproj -text

‎.gitignore‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ DerivedData
2222
*.xcuserstate
2323
project.xcworkspace
2424

25-
# Android/IJ
25+
# Android/IntelliJ
2626
#
27-
*.iml
27+
build/
2828
.idea
2929
.gradle
3030
local.properties
31+
*.iml
3132

3233
# node.js
3334
#
@@ -38,12 +39,15 @@ npm-debug.log
3839
buck-out/
3940
\.buckd/
4041
android/app/libs
41-
android/keystores/debug.keystore
42+
*.keystore
43+
ios/Pods
44+
testbuild/
45+
ios/main.jsbundle.meta
46+
ios/main.jsbundle
4247
Releases/
43-
coverage/
44-
ios/Pods/
4548
Release-iphonesimulator/
4649
ios/FirestackApp/FirestackApp.entitlements
47-
ios/main.jsbundle
48-
ios/main.jsbundle.meta
49-
testbuild/
50+
coverage/
51+
ios/Pods
52+
config/development.js
53+
config/development.android.js

‎android/app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ android {
126126
}
127127

128128
dependencies {
129+
compile project(':react-native-oauth')
129130
compile project(':react-native-fs')
130131
compile project(':react-native-firestack')
131132
compile project(':react-native-vector-icons')

‎android/app/src/main/java/com/firestackapp/MainApplication.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.util.Log;
55

66
import com.facebook.react.ReactApplication;
7+
import io.fullstack.oauth.OAuthManagerPackage;
78
import com.rnfs.RNFSPackage;
89
import io.fullstack.firestack.FirestackPackage;
910
import com.oblador.vectoricons.VectorIconsPackage;
@@ -27,6 +28,7 @@ protected boolean getUseDeveloperSupport() {
2728
protected List<ReactPackage> getPackages() {
2829
return Arrays.<ReactPackage>asList(
2930
new MainReactPackage(),
31+
new OAuthManagerPackage(),
3032
new RNFSPackage(),
3133
new FirestackPackage(),
3234
new VectorIconsPackage()

‎android/app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44

55

6-
76
<string name="app_name">FirestackApp</string>
87
</resources>

‎android/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ allprojects {
1717
repositories {
1818
mavenLocal()
1919
jcenter()
20+
maven { url "https://jitpack.io" }
2021
maven {
2122
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2223
url "$rootDir/../node_modules/react-native/android"

‎android/settings.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
rootProject.name = 'FirestackApp'
2+
include ':react-native-oauth'
3+
project(':react-native-oauth').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-oauth/android')
24

35
include ':app'
46
include ':react-native-fs'

‎app/views/Authentication/Demos/Email.js‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import {
88

99
import env from '../../../../config/environment';
1010

11-
import { Container, Header, Title, Content, List, ListItem,
12-
InputGroup, Input, Icon
13-
} from 'native-base';
11+
import { Container, Header, Title, Content, List, ListItem, InputGroup, Input, Icon, Button } from 'native-base';
1412

1513
import SignedIn from '../components/SignedIn';
1614
import appStyles from '../../../styles/app';
@@ -30,7 +28,7 @@ export class Email extends React.Component {
3028
componentWillMount() {
3129
const {firestack} = this.props;
3230

33-
this.unsubscribe = firebase.auth().onAuthStateChanged(function(user) {
31+
this.unsubscribe = firestack.auth().onAuthStateChanged(function(user) {
3432
console.log('auth state changed', user);
3533
});
3634
// firestack.auth.listenForAuth((u) => {
@@ -115,10 +113,21 @@ export class Email extends React.Component {
115113
</ListItem>
116114

117115
<ListItem>
118-
116+
<Button
117+
block
118+
info
119+
onPress={this.loginWithEmail.bind(this)}>
120+
<Text>Sign in</Text>
121+
</Button>
119122
</ListItem>
120123

121124
<ListItem>
125+
<Button
126+
block
127+
info
128+
onPress={this.fillInFields.bind(this)}>
129+
<Text>Fill forms with demo user info</Text>
130+
</Button>
122131
</ListItem>
123132
</List>
124133
</View>

0 commit comments

Comments
 (0)