Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Identity Verification #4

Open
wants to merge 26 commits into
base: dOrg
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b6ab634
brand icons
xiphiness Aug 29, 2019
a88c2ab
package.json
xiphiness Aug 29, 2019
624941f
package-lock.json
xiphiness Aug 29, 2019
7e7b0b1
more identity
xiphiness Aug 29, 2019
4aea185
Merge remote-tracking branch 'upstream/master' into dorg-id-verify
sethfork Aug 29, 2019
dc4d014
item menu
xiphiness Aug 29, 2019
22cdb4c
style additemmenu
xiphiness Aug 30, 2019
f6f0239
style additemmenu
xiphiness Aug 30, 2019
a8fa5f2
Merge branch 'dorg-id-verify' of github.com:dOrgTech/GoodDAPP into do…
xiphiness Aug 30, 2019
2ddd48a
addidentity views
xiphiness Aug 31, 2019
873f28a
editprofile state for identity
xiphiness Sep 1, 2019
9c8c0d0
update add identity menu
xiphiness Sep 1, 2019
47d3344
fix identitydatatable
xiphiness Sep 1, 2019
4fb0e5a
remove logging
xiphiness Sep 1, 2019
70c9454
photo, human verification
xiphiness Sep 3, 2019
3c463c6
semisemisemifinal views
xiphiness Sep 3, 2019
0ed6063
Merge remote-tracking branch 'upstream/master' into dorg-id-verify
sethfork Sep 4, 2019
eedb09e
update profile
xiphiness Sep 13, 2019
ca50e8e
add identity
xiphiness Sep 13, 2019
c34f149
Working through the GenericSocial Component as well as the ShareButto…
zakhap Sep 19, 2019
5cb151b
straighten out generic social
xiphiness Sep 19, 2019
2d8aa76
misc cleanup
dOrgJelli Sep 28, 2019
1c94a0c
Merge pull request #3 from dOrgTech/dorg-id-verify-pr
xiphiness Sep 30, 2019
6484bbb
Pushing Roughly 30% of the style updates. More coming in the next hou…
zakhap Oct 1, 2019
fa4eb25
AddIdentityMenu + GenericSocial Styled
zakhap Oct 2, 2019
431fefb
Styled AddPhotoID and AddHumanVerification
zakhap Oct 2, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 68 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
"homepage": "https://gooddollar.org",
"dependencies": {
"@babel/preset-flow": "^7.0.0",
"@fortawesome/fontawesome-svg-core": "^1.2.22",
"@fortawesome/free-brands-svg-icons": "^5.10.2",
"@fortawesome/react-native-fontawesome": "^0.1.0",
"@gooddollar/goodcontracts": "0.0.18",
"@gooddollar/gun-appendonly": "^1.0.1",
"@react-navigation/core": "^3.1.1",
Expand Down Expand Up @@ -94,6 +97,7 @@
"react-native-qrcode-scanner": "^1.1.2",
"react-native-recaptcha-v3": "0.0.16",
"react-native-side-menu-gooddapp": "^2.0.2",
"react-native-svg": "^9.7.1",
"react-native-vector-icons": "^6.6.0",
"react-native-web": "^0.11.4",
"react-native-web-webview": "^0.2.8",
Expand Down
22 changes: 16 additions & 6 deletions src/components/common/form/InputRounded.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { TextInput, View } from 'react-native'
import normalize from '../../../lib/utils/normalizeText'
import { withStyles } from '../../../lib/styles'
import Icon from '../view/Icon'
import BrandIcon from '../view/BrandIcon'
import ErrorText from './ErrorText'

/**
Expand All @@ -13,7 +14,7 @@ import ErrorText from './ErrorText'
* @param {React.Node} props.children
* @returns {React.Node}
*/
const InputRounded = ({ styles, theme, icon, iconSize, iconColor, error, onChange, ...inputProps }) => {
const InputRounded = ({ styles, theme, brand, icon, iconSize, iconColor, error, onChange, ...inputProps }) => {
const handleChange = event => {
onChange(event.target.value)
}
Expand All @@ -30,11 +31,20 @@ const InputRounded = ({ styles, theme, icon, iconSize, iconColor, error, onChang
{...inputProps}
/>
<View style={styles.suffixIcon}>
<Icon
color={error ? theme.colors.red : iconColor || theme.colors.gray50Percent}
name={icon}
size={iconSize}
/>
{icon && !brand && (
<Icon
color={error ? theme.colors.red : iconColor || theme.colors.gray50Percent}
name={icon}
size={iconSize}
/>
)}
{!icon && brand && (
<BrandIcon
color={error ? theme.colors.red : iconColor || theme.colors.gray50Percent}
name={brand}
size={iconSize}
/>
)}
</View>
</View>
{!inputProps.disabled && <ErrorText error={error} style={styles.errorMargin} />}
Expand Down
14 changes: 14 additions & 0 deletions src/components/common/view/BrandIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react'
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome'
import { faFacebookSquare, faGithubSquare, faLinkedin, faTwitterSquare } from '@fortawesome/free-brands-svg-icons'

const icons = {
twitter: faTwitterSquare,
facebook: faFacebookSquare,
github: faGithubSquare,
linkedin: faLinkedin,
}

const BrandIcon = ({ name, ...props }) => <FontAwesomeIcon icon={icons[name]} {...props} />

export default BrandIcon
20 changes: 19 additions & 1 deletion src/components/common/view/Icon/config.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,24 @@
"search": [
"icons---settings---terms-of-use-–-1"
]
},
{
"uid": "4743b088aa95d6f3b6b990e770d3b647",
"css": "facebook",
"code": 62216,
"src": "fontawesome"
},
{
"uid": "0f6a2573a7b6df911ed199bb63717e27",
"css": "github",
"code": 61595,
"src": "fontawesome"
},
{
"uid": "906348dc798a0d42715cc97c875e3ac6",
"css": "twitter",
"code": 62212,
"src": "fontawesome"
}
]
}
}
Loading