From 5dc99bd5259a313be977d97098c8eb72c104455e Mon Sep 17 00:00:00 2001 From: aeddi Date: Thu, 25 Oct 2018 15:53:51 +0200 Subject: [PATCH] chore(rn): refactor MyAccount files and folders --- .../Settings/{ => MyAccount}/MyAccount.js | 16 ++++++---------- .../Settings/{ => MyAccount}/MyPublicKey.js | 12 +++++++++--- .../Screens/Settings/{ => MyAccount}/MyQRCode.js | 10 +++++----- .../Screens/Settings/MyAccount/index.js | 15 +++++++++++++++ .../common/components/Screens/Settings/index.js | 8 +------- 5 files changed, 36 insertions(+), 25 deletions(-) rename client/react-native/common/components/Screens/Settings/{ => MyAccount}/MyAccount.js (90%) rename client/react-native/common/components/Screens/Settings/{ => MyAccount}/MyPublicKey.js (92%) rename client/react-native/common/components/Screens/Settings/{ => MyAccount}/MyQRCode.js (85%) create mode 100644 client/react-native/common/components/Screens/Settings/MyAccount/index.js diff --git a/client/react-native/common/components/Screens/Settings/MyAccount.js b/client/react-native/common/components/Screens/Settings/MyAccount/MyAccount.js similarity index 90% rename from client/react-native/common/components/Screens/Settings/MyAccount.js rename to client/react-native/common/components/Screens/Settings/MyAccount/MyAccount.js index c045f74359..08f5aa994f 100644 --- a/client/react-native/common/components/Screens/Settings/MyAccount.js +++ b/client/react-native/common/components/Screens/Settings/MyAccount/MyAccount.js @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react' import { Image, ActivityIndicator } from 'react-native' -import { Screen, Menu, Header, Text, Badge, Flex } from '../../Library' -import { colors } from '../../../constants' -import { QueryReducer } from '../../../relay' -import { choosePicture } from '../../../helpers/react-native-image-picker' +import { Screen, Menu, Header, Text, Badge, Flex } from '../../../Library' +import { colors } from '../../../../constants' +import { QueryReducer } from '../../../../relay' +import { choosePicture } from '../../../../helpers/react-native-image-picker' import { graphql } from 'react-relay' export default class MyAccount extends PureComponent { @@ -78,16 +78,12 @@ export default class MyAccount extends PureComponent { - navigation.push('settings/my-account/my-qr-code', { data }) - } + onPress={() => navigation.push('my-account/my-qrcode', { data })} /> - navigation.push('settings/my-account/my-public-key', { data }) - } + onPress={() => navigation.push('my-account/my-publickey', { data })} /> diff --git a/client/react-native/common/components/Screens/Settings/MyPublicKey.js b/client/react-native/common/components/Screens/Settings/MyAccount/MyPublicKey.js similarity index 92% rename from client/react-native/common/components/Screens/Settings/MyPublicKey.js rename to client/react-native/common/components/Screens/Settings/MyAccount/MyPublicKey.js index ac65111956..a35a634270 100644 --- a/client/react-native/common/components/Screens/Settings/MyPublicKey.js +++ b/client/react-native/common/components/Screens/Settings/MyAccount/MyPublicKey.js @@ -1,14 +1,20 @@ import React, { PureComponent } from 'react' import { Clipboard } from 'react-native' -import { colors } from '../../../constants' -import { Flex, Screen, Header, Button, TextInputMultilineFix } from '../../Library' +import { colors } from '../../../../constants' +import { + Flex, + Screen, + Header, + Button, + TextInputMultilineFix, +} from '../../../Library' import { padding, paddingVertical, textTiny, marginTop, rounded, -} from '../../../styles' +} from '../../../../styles' import { atob } from 'b64-lite' export default class MyPublicKey extends PureComponent { diff --git a/client/react-native/common/components/Screens/Settings/MyQRCode.js b/client/react-native/common/components/Screens/Settings/MyAccount/MyQRCode.js similarity index 85% rename from client/react-native/common/components/Screens/Settings/MyQRCode.js rename to client/react-native/common/components/Screens/Settings/MyAccount/MyQRCode.js index bc42ebbf06..61cd4ce549 100644 --- a/client/react-native/common/components/Screens/Settings/MyQRCode.js +++ b/client/react-native/common/components/Screens/Settings/MyAccount/MyQRCode.js @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react' import { Clipboard } from 'react-native' -import { colors } from '../../../constants' -import { Flex, Screen, Button, Header } from '../../Library' -import { padding, paddingVertical } from '../../../styles' -import QRGenerator from '../../Library/QRGenerator/QRGenerator' +import { colors } from '../../../../constants' +import { Flex, Screen, Button, Header } from '../../../Library' +import { padding, paddingVertical } from '../../../../styles' +import QRGenerator from '../../../Library/QRGenerator/QRGenerator' import { atob } from 'b64-lite' export default class MyQRCode extends PureComponent { @@ -15,7 +15,7 @@ export default class MyQRCode extends PureComponent { state = { myID: 'MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQMDMgAE+Y+qPqI3geo2hQH8eK7Rn+YWG09TejZ5QFoj9fmxFrUyYhFap6XmTdJtEi8myBmW', - logo: require('../../../static/img/logo-border.png'), + logo: require('../../../../static/img/logo-border.png'), } share = () => { diff --git a/client/react-native/common/components/Screens/Settings/MyAccount/index.js b/client/react-native/common/components/Screens/Settings/MyAccount/index.js new file mode 100644 index 0000000000..a726edacd3 --- /dev/null +++ b/client/react-native/common/components/Screens/Settings/MyAccount/index.js @@ -0,0 +1,15 @@ +import { createSubStackNavigator } from '../../../../helpers/react-navigation' +import MyAccount from './MyAccount' +import MyPublicKey from './MyPublicKey' +import MyQRCode from './MyQRCode' + +export default createSubStackNavigator( + { + 'my-account/list': MyAccount, + 'my-account/my-qrcode': MyPublicKey, + 'my-account/my-publickey': MyQRCode, + }, + { + initialRouteName: 'my-account/list', + } +) diff --git a/client/react-native/common/components/Screens/Settings/index.js b/client/react-native/common/components/Screens/Settings/index.js index 4cb0fac6dd..e0e84ef736 100644 --- a/client/react-native/common/components/Screens/Settings/index.js +++ b/client/react-native/common/components/Screens/Settings/index.js @@ -2,9 +2,7 @@ import React from 'react' import { createSubStackNavigator } from '../../../helpers/react-navigation' import { Header } from '../../Library' import List from './List' -import MyAccount from './MyAccount' -import MyPublicKey from './MyPublicKey' -import MyQRCode from './MyQRCode' +import MyAccount from './MyAccount/index.js' import About from './About/index.js' import Help from './Help/index.js' import Legal from './Legal/index.js' @@ -13,11 +11,7 @@ import Devtools from './Devtools/index.js' export default createSubStackNavigator( { 'settings/list': List, - // Should be better to put MyAccount related files in a subfolder 'settings/my-account': MyAccount, - 'settings/my-account/my-public-key': MyPublicKey, - 'settings/my-account/my-qr-code': MyQRCode, - // //////////////////////////////////// 'settings/about': About, 'settings/help': Help, 'settings/legal': Legal,