self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Various changes

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-07 23:25:03 +01:00
parent e0664167eb
commit 38c9d49cdb
29 changed files with 108 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/components/screen-header.js
View File

@@ -94,9 +94,7 @@ ScreenHeaderComponent.defaultProps = {
};
const ScreenHeader = connect(
(state) => {
return { user: state.user };
}
//(state) => {}
)(ScreenHeaderComponent)
export { ScreenHeader };

91
ReactNativeClient/lib/components/screens/login.js
View File

@@ -1,91 +0,0 @@
import React, { Component } from 'react';
import { View, Button, TextInput, Text } from 'react-native';
import { connect } from 'react-redux'
import { Log } from 'lib/log.js'
import { Setting } from 'lib/models/setting.js';
import { ScreenHeader } from 'lib/components/screen-header.js';
import { _ } from 'lib/locale.js';
class LoginScreenComponent extends React.Component {
static navigationOptions(options) {
return { header: null };
}
constructor() {
super();
this.state = {
email: '',
password: '',
errorMessage: null,
};
}
componentWillMount() {
this.setState({ email: this.props.user.email });
}
email_changeText(text) {
this.setState({ email: text });
}
password_changeText(text) {
this.setState({ password: text });
}
loginButton_press() {
this.setState({ errorMessage: null });
// return Registry.api().post('sessions', null, {
// 'email': this.state.email,
// 'password': this.state.password,
// 'client_id': Setting.value('clientId'),
// }).then((session) => {
// Log.info('Got session', session);
// let user = {
// email: this.state.email,
// session: session.id,
// };
// Setting.setObject('user', user);
// this.props.dispatch({
// type: 'USER_SET',
// user: user,
// });
// this.props.dispatch({
// type: 'Navigation/BACK',
// });
// Registry.api().setSession(session.id);
// //Registry.synchronizer().start();
// }).catch((error) => {
// this.setState({ errorMessage: _('Could not login: %s)', error.message) });
// });
}
render() {
return (
<View style={{flex: 1}}>
<ScreenHeader navState={this.props.navigation.state} />
<TextInput value={this.state.email} onChangeText={(text) => this.email_changeText(text)} keyboardType="email-address" />
<TextInput value={this.state.password} onChangeText={(text) => this.password_changeText(text)} secureTextEntry={true} />
{ this.state.errorMessage && <Text style={{color:'#ff0000'}}>{this.state.errorMessage}</Text> }
<Button title="Login" onPress={() => this.loginButton_press()} />
</View>
);
}
}
const LoginScreen = connect(
(state) => {
return {
user: state.user,
};
}
)(LoginScreenComponent)
export { LoginScreen };

7
ReactNativeClient/lib/components/side-menu-content.js
View File

@@ -48,9 +48,7 @@ class SideMenuContentComponent extends Component {
}
folder_press(folder) {
this.props.dispatch({
type: 'SIDE_MENU_CLOSE',
});
this.props.dispatch({ type: 'SIDE_MENU_CLOSE' });
NotesScreenUtils.openNoteList(folder.id);
}
@@ -64,6 +62,7 @@ class SideMenuContentComponent extends Component {
line.push(_('Remote items to delete: %d/%d.', report.deleteRemote, report.remotesToDelete));
line.push(_('Items to download: %d/%d.', report.createLocal + report.updateLocal, report.localsToUdpate));
line.push(_('Local items to delete: %d/%d.', report.deleteLocal, report.localsToDelete));
line.push(_('Sync state: %s.', report.state));
this.setState({ syncReportText: line.join("\n") });
},
};
@@ -75,6 +74,8 @@ class SideMenuContentComponent extends Component {
Log.error(error);
}
} else {
this.props.dispatch({ type: 'SIDE_MENU_CLOSE' });
this.props.dispatch({
type: 'Navigation/NAVIGATE',
routeName: 'OneDriveLogin',