Skip to content

Commit

Permalink
Friend Chat Final Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
aryaminus committed Nov 10, 2017
1 parent e986e58 commit 6484095
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 187 deletions.
6 changes: 3 additions & 3 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ class Home extends Component<{}> {
componentDidMount() {
firebase.auth().onAuthStateChanged(user => {
if (user) {
firebase.messaging().requestPermissions();
firebase.messaging().subscribeToTopic("chat");
//firebase.messaging().requestPermissions();
//firebase.messaging().subscribeToTopic("chat");
this.setState({ loading: false, authenticated: true });
} else {
firebase.messaging().unsubscribeFromTopic("chat");
//firebase.messaging().unsubscribeFromTopic("chat");
this.setState({ loading: false, authenticated: false });
}
});
Expand Down
4 changes: 1 addition & 3 deletions app/components/Chat.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import { StackNavigator } from "react-navigation";
import { GiftedChat } from "react-native-gifted-chat";
import firebase from "react-native-firebase";

import md5 from "./md5";

var name, uid, email;

export default class Chat extends Component {
Expand Down Expand Up @@ -84,7 +82,7 @@ export default class Chat extends Component {
// messages: GiftedChat.append(this.state.messages, messages),
// });
messages.forEach(message => {
var message = message[0];
//var message = message[0];
var now = new Date().getTime();
this.chatRef.push({
_id: now,
Expand Down
6 changes: 2 additions & 4 deletions app/components/Friendlist.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { StackNavigator } from "react-navigation";
import firebase from "react-native-firebase";
import Spinner from "react-native-loading-spinner-overlay";

import md5 from "./md5";
import Chat from "./Chat";

var name, uid, email;
Expand Down Expand Up @@ -75,14 +74,13 @@ export default class FriendsList extends Component {
<Button
primary
title="Logout"
//style={styles.rightButton}
onPress={() => {
firebase
.auth()
.signOut()
.then(
() => {
//done
this.props.navigation.navigate("Login");
},
function(error) {
// An error happened.
Expand Down Expand Up @@ -112,7 +110,7 @@ export default class FriendsList extends Component {
<View style={styles.profileContainer}>
<Image
source={{
uri: "https://www.gravatar.com/avatar/" //+ md5(rowData.email)
uri: "https://www.gravatar.com/avatar/"
}}
style={styles.profileImage}
/>
Expand Down
2 changes: 1 addition & 1 deletion app/components/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default class Login extends Component {
};
firebase.auth().onAuthStateChanged(user => {
if (user) {
//this.props.navigation.navigate("Boiler");
this.props.navigation.navigate("Boiler");
this.setState({
loading: false
});
Expand Down
2 changes: 1 addition & 1 deletion app/components/Register.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default class Register extends Component {
uid: user.uid,
name: this.state.name
});
//this.props.navigation.navigate("Boiler");
this.props.navigation.navigate("Boiler");
this.setState({
loading: false
});
Expand Down
175 changes: 0 additions & 175 deletions app/components/md5.js

This file was deleted.

0 comments on commit 6484095

Please sign in to comment.