mirror of
https://github.com/ecency/ecency-mobile.git
synced 2024-12-30 17:14:22 +03:00
created profile upload without sc for now
This commit is contained in:
parent
cdd1df8f7d
commit
2b003fa90c
@ -1,5 +1,5 @@
|
||||
import React, { Fragment } from 'react';
|
||||
import { TouchableHighlight } from 'react-native';
|
||||
import { TouchableHighlight, ActivityIndicator } from 'react-native';
|
||||
import { Icon } from '../../icon';
|
||||
|
||||
import styles from './iconButtonStyles';
|
||||
@ -22,14 +22,16 @@ const IconButton = ({
|
||||
onPress,
|
||||
size,
|
||||
style,
|
||||
isLoading,
|
||||
}) => (
|
||||
<Fragment>
|
||||
<TouchableHighlight
|
||||
style={[styles.iconButton, style]}
|
||||
onPress={() => onPress && onPress()}
|
||||
onPress={() => !isLoading && onPress && onPress()}
|
||||
underlayColor={backgroundColor || 'white'}
|
||||
disabled={disabled}
|
||||
>
|
||||
{!isLoading ? (
|
||||
<Icon
|
||||
style={[
|
||||
color && { color },
|
||||
@ -44,6 +46,9 @@ const IconButton = ({
|
||||
iconType={iconType}
|
||||
badgeCount={badgeCount}
|
||||
/>
|
||||
) : (
|
||||
<ActivityIndicator color="white" style={styles.activityIndicator} />
|
||||
)}
|
||||
</TouchableHighlight>
|
||||
</Fragment>
|
||||
);
|
||||
|
@ -15,12 +15,15 @@ import { IconButton } from '../iconButton';
|
||||
import styles from './profileEditFormStyles';
|
||||
|
||||
const ProfileEditFormView = ({
|
||||
avatarUrl,
|
||||
coverUrl,
|
||||
isDarkTheme,
|
||||
formData,
|
||||
intl,
|
||||
handleOnItemChange,
|
||||
showImageUploadActions,
|
||||
isLoading,
|
||||
handleOnSubmit,
|
||||
...props
|
||||
}) => (
|
||||
<View style={styles.container}>
|
||||
@ -29,8 +32,9 @@ const ProfileEditFormView = ({
|
||||
style={styles.saveButton}
|
||||
iconType="MaterialIcons"
|
||||
name="save"
|
||||
onPress={() => alert('asd')}
|
||||
onPress={handleOnSubmit}
|
||||
size={30}
|
||||
isLoading={isLoading}
|
||||
/>
|
||||
<KeyboardAwareScrollView
|
||||
enableAutoAutomaticScroll={Platform.OS === 'ios'}
|
||||
|
@ -26,9 +26,12 @@ class UserAvatarView extends Component {
|
||||
|
||||
// Component Functions
|
||||
_handleOnAvatarPress = username => {
|
||||
const { dispatch, currentUsername } = this.props;
|
||||
const {
|
||||
dispatch,
|
||||
currentUsername: { name },
|
||||
} = this.props;
|
||||
|
||||
const routeName = currentUsername === username ? ROUTES.TABBAR.PROFILE : ROUTES.SCREENS.PROFILE;
|
||||
const routeName = name === username ? ROUTES.TABBAR.PROFILE : ROUTES.SCREENS.PROFILE;
|
||||
|
||||
const navigateAction = NavigationActions.navigate({
|
||||
routeName,
|
||||
@ -42,11 +45,24 @@ class UserAvatarView extends Component {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { username, size, style, disableSize, noAction, avatarUrl } = this.props;
|
||||
const {
|
||||
username,
|
||||
size,
|
||||
style,
|
||||
disableSize,
|
||||
noAction,
|
||||
avatarUrl,
|
||||
currentUsername: { name, avatar },
|
||||
} = this.props;
|
||||
const imageSize = size === 'xl' ? 'large' : 'small';
|
||||
let _size;
|
||||
const _avatar = username
|
||||
? { uri: avatarUrl || `https://steemitimages.com/u/${username}/avatar/${imageSize}` }
|
||||
? {
|
||||
uri:
|
||||
avatarUrl || name === username
|
||||
? avatar
|
||||
: `https://steemitimages.com/u/${username}/avatar/${imageSize}`,
|
||||
}
|
||||
: DEFAULT_IMAGE;
|
||||
|
||||
if (!disableSize) {
|
||||
@ -73,7 +89,7 @@ class UserAvatarView extends Component {
|
||||
}
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
currentUsername: state.account.currentAccount.name,
|
||||
currentUsername: state.account.currentAccount,
|
||||
});
|
||||
|
||||
export default connect(mapStateToProps)(UserAvatarView);
|
||||
|
@ -4,8 +4,14 @@ import { connect } from 'react-redux';
|
||||
import { injectIntl } from 'react-intl';
|
||||
import ImagePicker from 'react-native-image-crop-picker';
|
||||
import get from 'lodash/get';
|
||||
import { withNavigation } from 'react-navigation';
|
||||
|
||||
import { uploadImage } from '../providers/esteem/esteem';
|
||||
|
||||
import { profileUpdate, getUser } from '../providers/steem/dsteem';
|
||||
import { getUserDataWithUsername } from '../realm/realm';
|
||||
import { updateCurrentAccount } from '../redux/actions/accountAction';
|
||||
|
||||
// import ROUTES from '../constants/routeNames';
|
||||
|
||||
const FORM_DATA = [
|
||||
@ -44,7 +50,7 @@ class ProfileEditContainer extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
isUploading: false,
|
||||
isLoading: false,
|
||||
about: get(props.currentAccount, 'about.profile.about'),
|
||||
name: get(props.currentAccount, 'about.profile.name'),
|
||||
location: get(props.currentAccount, 'about.profile.location'),
|
||||
@ -61,15 +67,17 @@ class ProfileEditContainer extends Component {
|
||||
_handleOnSave = () => {};
|
||||
|
||||
_handleOnItemChange = (val, item) => {
|
||||
console.log(val, item);
|
||||
this.setState({ [item]: val });
|
||||
};
|
||||
|
||||
_uploadImage = (media, action) => {
|
||||
const { intl } = this.props;
|
||||
|
||||
this.setState({ isLoading: true });
|
||||
uploadImage(media)
|
||||
.then(res => {
|
||||
if (res.data && res.data.url) {
|
||||
this.setState({ [action]: res.data.url, isUploading: false });
|
||||
this.setState({ [action]: res.data.url, isLoading: false });
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
@ -81,7 +89,7 @@ class ProfileEditContainer extends Component {
|
||||
error.message || error.toString(),
|
||||
);
|
||||
}
|
||||
this.setState({ isUploading: false });
|
||||
this.setState({ isLoading: false });
|
||||
});
|
||||
};
|
||||
|
||||
@ -118,7 +126,7 @@ class ProfileEditContainer extends Component {
|
||||
};
|
||||
|
||||
_handleMediaOnSelected = (media, action) => {
|
||||
this.setState({ isUploading: true }, () => {
|
||||
this.setState({ isLoading: true }, () => {
|
||||
this._uploadImage(media, action);
|
||||
});
|
||||
};
|
||||
@ -138,25 +146,58 @@ class ProfileEditContainer extends Component {
|
||||
}
|
||||
};
|
||||
|
||||
_handleOnSubmit = async () => {
|
||||
const { currentAccount, pinCode, dispatch, navigation } = this.props;
|
||||
const { name, location, website, about, coverUrl, avatarUrl } = this.state;
|
||||
|
||||
await this.setState({ isLoading: true });
|
||||
|
||||
const params = {
|
||||
profile_image: avatarUrl,
|
||||
cover_image: coverUrl,
|
||||
name,
|
||||
website,
|
||||
about,
|
||||
location,
|
||||
};
|
||||
|
||||
await profileUpdate(params, pinCode, currentAccount)
|
||||
.then(async () => {
|
||||
const _currentAccount = { ...currentAccount };
|
||||
_currentAccount.about.profile = { ...params };
|
||||
_currentAccount.display_name = name;
|
||||
|
||||
dispatch(updateCurrentAccount(_currentAccount));
|
||||
|
||||
navigation.goBack();
|
||||
})
|
||||
.catch(error => {
|
||||
Alert.alert(error);
|
||||
});
|
||||
|
||||
this.setState({ isLoading: false });
|
||||
};
|
||||
|
||||
render() {
|
||||
const { children, currentAccount, isDarkTheme } = this.props;
|
||||
const { isUploading, name, location, website, about, coverUrl, avatarUrl } = this.state;
|
||||
const { isLoading, name, location, website, about, coverUrl, avatarUrl } = this.state;
|
||||
|
||||
return (
|
||||
children &&
|
||||
children({
|
||||
about,
|
||||
avatarUrl,
|
||||
coverUrl,
|
||||
currentAccount,
|
||||
isDarkTheme,
|
||||
formData: FORM_DATA,
|
||||
isUploading,
|
||||
handleMediaAction: this._handleMediaAction,
|
||||
handleOnItemChange: this._handleOnItemChange,
|
||||
name,
|
||||
handleOnSubmit: this._handleOnSubmit,
|
||||
isDarkTheme,
|
||||
isLoading,
|
||||
location,
|
||||
name,
|
||||
website,
|
||||
about,
|
||||
coverUrl,
|
||||
avatarUrl,
|
||||
})
|
||||
);
|
||||
}
|
||||
@ -165,6 +206,7 @@ class ProfileEditContainer extends Component {
|
||||
const mapStateToProps = state => ({
|
||||
currentAccount: state.account.currentAccount,
|
||||
isDarkTheme: state.application.isDarkTheme,
|
||||
pinCode: state.application.pin,
|
||||
});
|
||||
|
||||
export default connect(mapStateToProps)(injectIntl(ProfileEditContainer));
|
||||
export default connect(mapStateToProps)(injectIntl(withNavigation(ProfileEditContainer)));
|
||||
|
@ -1,3 +1,4 @@
|
||||
/* eslint-disable camelcase */
|
||||
import { Client, PrivateKey } from 'dsteem';
|
||||
import steemConnect from 'steemconnect';
|
||||
import Config from 'react-native-config';
|
||||
@ -231,7 +232,7 @@ export const ignoreUser = async (currentAccount, pin, data) => {
|
||||
const key = getAnyPrivateKey(currentAccount.local, digitPinCode);
|
||||
|
||||
if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) {
|
||||
const token = decryptKey(currentAccount.local.accessToken, digitPinCode);
|
||||
const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode);
|
||||
const api = steemConnect.Initialize({
|
||||
accessToken: token,
|
||||
});
|
||||
@ -373,7 +374,7 @@ export const deleteComment = (currentAccount, pin, permlink) => {
|
||||
const key = getAnyPrivateKey(currentAccount.local, digitPinCode);
|
||||
|
||||
if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) {
|
||||
const token = decryptKey(currentAccount.local.accessToken, digitPinCode);
|
||||
const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode);
|
||||
const api = steemConnect.Initialize({
|
||||
accessToken: token,
|
||||
});
|
||||
@ -453,7 +454,7 @@ const _vote = async (currentAccount, pin, author, permlink, weight) => {
|
||||
const key = getAnyPrivateKey(currentAccount.local, digitPinCode);
|
||||
|
||||
if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) {
|
||||
const token = decryptKey(currentAccount.local.accessToken, digitPinCode);
|
||||
const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode);
|
||||
const api = steemConnect.Initialize({
|
||||
accessToken: token,
|
||||
});
|
||||
@ -797,7 +798,7 @@ export const unfollowUser = async (currentAccount, pin, data) => {
|
||||
const key = getAnyPrivateKey(currentAccount.local, digitPinCode);
|
||||
|
||||
if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) {
|
||||
const token = decryptKey(currentAccount.local.accessToken, digitPinCode);
|
||||
const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode);
|
||||
const api = steemConnect.Initialize({
|
||||
accessToken: token,
|
||||
});
|
||||
@ -1163,6 +1164,61 @@ export const boost = (currentAccount, pinCode, point, permlink, author) => {
|
||||
return Promise.reject(new Error('Something went wrong!'));
|
||||
};
|
||||
|
||||
export const profileUpdate = async (params, pin, currentAccount) => {
|
||||
const digitPinCode = getDigitPinCode(pin);
|
||||
const key = getActiveKey(get(currentAccount, 'local'), digitPinCode);
|
||||
|
||||
if (get(currentAccount, 'local.authType') === AUTH_TYPE.STEEM_CONNECT) {
|
||||
// TODO: will do it
|
||||
const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode);
|
||||
const api = steemConnect.Initialize({
|
||||
accessToken: token,
|
||||
});
|
||||
|
||||
const _params = {
|
||||
account: get(currentAccount, 'name'),
|
||||
memo_key: get(currentAccount, 'memo_key'),
|
||||
json_metadata: jsonStringify({ profile: params }),
|
||||
};
|
||||
|
||||
const opArray = [['account_update', _params]];
|
||||
|
||||
return api.broadcast(opArray).then(resp => resp.result);
|
||||
}
|
||||
|
||||
if (key) {
|
||||
const opArray = [
|
||||
[
|
||||
'account_update',
|
||||
{
|
||||
account: get(currentAccount, 'name'),
|
||||
memo_key: get(currentAccount, 'memo_key'),
|
||||
json_metadata: jsonStringify({ profile: params }),
|
||||
},
|
||||
],
|
||||
];
|
||||
|
||||
const privateKey = PrivateKey.fromString(key);
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
client.broadcast
|
||||
.sendOperations(opArray, privateKey)
|
||||
.then(result => {
|
||||
resolve(result);
|
||||
})
|
||||
.catch(error => {
|
||||
if (get(error, 'jse_info.code') === 4030100) {
|
||||
error.message =
|
||||
'We noticed that your device has incorrect date or time. Please fix Date & Time or Set Automatically and try again.';
|
||||
}
|
||||
reject(error);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
return Promise.reject(new Error('You dont have permission!'));
|
||||
};
|
||||
|
||||
// HELPERS
|
||||
|
||||
const getAnyPrivateKey = (local, pin) => {
|
||||
|
@ -23,8 +23,6 @@ class HomeScreen extends PureComponent {
|
||||
render() {
|
||||
const { currentAccount, intl, isLoggedIn } = this.props;
|
||||
|
||||
let tag;
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<Header />
|
||||
@ -50,7 +48,7 @@ class HomeScreen extends PureComponent {
|
||||
<Posts
|
||||
filterOptions={PROFILE_FILTERS}
|
||||
getFor={PROFILE_FILTERS[1].toLowerCase()}
|
||||
tag={tag || currentAccount.name}
|
||||
tag={currentAccount.name}
|
||||
selectedOptionIndex={1}
|
||||
/>
|
||||
</View>
|
||||
|
@ -49,6 +49,8 @@ class ProfileEditScreen extends PureComponent {
|
||||
about,
|
||||
avatarUrl,
|
||||
coverUrl,
|
||||
isLoading,
|
||||
handleOnSubmit,
|
||||
}) => (
|
||||
<Fragment>
|
||||
<AvatarHeader
|
||||
@ -68,6 +70,8 @@ class ProfileEditScreen extends PureComponent {
|
||||
coverUrl={coverUrl}
|
||||
showImageUploadActions={() => this._showImageUploadActions('coverUrl')}
|
||||
handleOnItemChange={handleOnItemChange}
|
||||
isLoading={isLoading}
|
||||
handleOnSubmit={handleOnSubmit}
|
||||
/>
|
||||
<ActionSheet
|
||||
ref={this.galleryRef}
|
||||
|
Loading…
Reference in New Issue
Block a user