diff --git a/app/navigation/EditUserNavigation.js b/app/navigation/EditUserNavigation.js index ac72102..93b306f 100644 --- a/app/navigation/EditUserNavigation.js +++ b/app/navigation/EditUserNavigation.js @@ -4,6 +4,7 @@ import PropTypes from 'prop-types'; import ChangeLoginScreen from '../screens/EditUser/ChangeLoginScreen.js'; import UserScreen from '../screens/EditUser/UserScreen.js'; +import HelpScreen from '../screens/EditUser/HelpScreen.js'; const Stack = createStackNavigator(); const navbarHeight = 65; @@ -27,6 +28,11 @@ export default class EditUserNavigation extends React.Component {props => this.props.logout()} token={this.props.token} url={this.props.url} />} + + {props => this.props.logout()} + token={this.props.token} url={this.props.url} />} + ); } diff --git a/app/navigation/MainNavigator.js b/app/navigation/MainNavigator.js index d9c945e..902140c 100644 --- a/app/navigation/MainNavigator.js +++ b/app/navigation/MainNavigator.js @@ -8,7 +8,6 @@ import BottomTabBar from './BottomTabBar.js'; import EditUserNavigation from './EditUserNavigation.js'; import NotifNavigator from './NotifNavigator.js'; import CodeScreen from '../screens/CodeScreen.js'; -import HelpScreen from '../screens/HelpScreen.js'; const Tab = createBottomTabNavigator(); diff --git a/app/screens/EditUser/ChangeLoginScreen.js b/app/screens/EditUser/ChangeLoginScreen.js index 15fe96d..3076c6c 100644 --- a/app/screens/EditUser/ChangeLoginScreen.js +++ b/app/screens/EditUser/ChangeLoginScreen.js @@ -114,6 +114,7 @@ const styles = StyleSheet.create({ fontSize: 25, fontWeight: 'bold', color: '#fff', + width: '100%', paddingLeft: 5, paddingRight: 10, marginBottom: 15, diff --git a/app/screens/HelpScreen.js b/app/screens/EditUser/HelpScreen.js similarity index 97% rename from app/screens/HelpScreen.js rename to app/screens/EditUser/HelpScreen.js index 0edeef6..b0d987b 100644 --- a/app/screens/HelpScreen.js +++ b/app/screens/EditUser/HelpScreen.js @@ -2,16 +2,16 @@ import React from 'react'; import { Text, Linking, Button, StyleSheet, Image, View, ScrollView } from 'react-native'; import PropTypes from 'prop-types'; -import SplashScreen from './SplashScreen'; +import SplashScreen from '../SplashScreen'; -const logo = '../assets/icon.png'; +const logo = '../../assets/icon.png'; const githubURL = "https://github.com/p4p1/xss_bomb"; const wikiURL= "https://github.com/p4p1/xss_bomb/wiki"; const trelloURL= "https://github.com/p4p1/xss_bomb/projects"; const playURL = "https://play.google.com/store/apps/details?id=com.p4p1.xss_bomb"; const meURL = "https://leosmith.xyz"; -const version = "V0.1.0"; +const version = "V0.1.1"; export default class HelpScreen extends React.Component { @@ -45,13 +45,11 @@ export default class HelpScreen extends React.Component 'Content-Type': 'application/json', } }).then((response) => response.json()).then((json) => { - console.log(json); this.setState({gh_version_name: json.tag_name}); this.setState({newVerURL: json.assets[0].browser_download_url}); }).catch((err) => { console.error(err); - alert("Error: Could not connect"); - this.props.logout(); + alert("Error: Could not get latest version from github"); }); }