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.

Sign up for GitHub

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

Jump to bottom

validator-socialname #4691

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

validator-socialname #4691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af25896
validator-socialname
mia0115 Dec 10, 2023
95cd6aa
url fixed
mia0115 Dec 10, 2023
4d51425
regex
mia0115 Dec 10, 2023
1035a8e
regex
mia0115 Dec 10, 2023
a51419a
fix bug
mia0115 Dec 10, 2023
84b4da1
empty fixed
mia0115 Dec 10, 2023
84b2b86
yarn lint fix
mia0115 Dec 10, 2023
b3a9209
Merge branch 'Joystream:dev' into validator-social-name
mia0115 Dec 11, 2023
2614cfb
isURL
mia0115 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ui/src/memberships/components/MemberProfile/MemberDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const MemberDetails = React.memo(({ member }: Props) => {
TELEGRAM: 'https://web.telegram.org/k/#@',
TWITTER: 'https://twitter.com/',
FACEBOOK: 'https://facebook.com/',
YOUTUBE: 'https://youtube.com/user/',
YOUTUBE: 'https://youtube.com/@',
LINKEDIN: 'https://www.linkedin.com/in/',
GITHUB: 'https://github.com/',
}
Expand Down
58 changes: 57 additions & 1 deletion packages/ui/src/memberships/modals/UpdateMembershipModal/UpdateMembershipModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ import { updateMembershipMachine } from './machine'
import { UpdateMembershipFormModal } from './UpdateMembershipFormModal'
import { UpdateMembershipSuccessModal } from './UpdateMembershipSuccessModal'

export const isURL = (str: string) => {
try {
const newUrl = new URL(str)
return newUrl.protocol === 'http:' || newUrl.protocol === 'https:'
} catch (err) {
return false
}
}

export const UpdateMembershipModal = () => {
const { api } = useApi()
const { active } = useMyMemberships()
Expand All @@ -27,7 +36,54 @@ export const UpdateMembershipModal = () => {
return (
<UpdateMembershipFormModal
onClose={hideModal}
onSubmit={(params) => send('DONE', { form: params })}
onSubmit={(params) => {
if (params.externalResources?.TWITTER && params.externalResources?.TWITTER) {
params.externalResources?.TWITTER.match(/@/g)
? (params.externalResources.TWITTER = params.externalResources.TWITTER.split('@')[1])
: params.externalResources.TWITTER
isURL(params.externalResources?.TWITTER)
? (params.externalResources.TWITTER = params.externalResources.TWITTER.split('twitter.com/')[1])
: params.externalResources?.TWITTER
}
if (params.externalResources?.GITHUB && params.externalResources?.GITHUB) {
params.externalResources?.GITHUB.match(/@/g)
? (params.externalResources.GITHUB = params.externalResources.GITHUB.split('@')[1])
: params.externalResources.GITHUB
isURL(params.externalResources?.GITHUB)
? (params.externalResources.GITHUB = params.externalResources.GITHUB.split('github.com/')[1])
: params.externalResources?.GITHUB
}
if (params.externalResources?.TELEGRAM && params.externalResources?.TELEGRAM) {
params.externalResources?.TELEGRAM.match(/@/g)
? (params.externalResources.TELEGRAM = params.externalResources.TELEGRAM.split('@')[1])
: params.externalResources.TELEGRAM
}

if (params.externalResources?.YOUTUBE && params.externalResources?.YOUTUBE) {
params.externalResources?.YOUTUBE.match(/@/g)
? (params.externalResources.YOUTUBE = params.externalResources.YOUTUBE.split('@')[1])
: params.externalResources.YOUTUBE
}

if (params.externalResources?.FACEBOOK && params.externalResources?.FACEBOOK) {
params.externalResources?.FACEBOOK.match(/@/g)
? (params.externalResources.FACEBOOK = params.externalResources.FACEBOOK.split('@')[1])
: params.externalResources.FACEBOOK
isURL(params.externalResources?.FACEBOOK)
? (params.externalResources.FACEBOOK = params.externalResources.FACEBOOK.split('facebook.com/')[1])
: params.externalResources?.FACEBOOK
}

if (params.externalResources?.LINKEDIN && params.externalResources?.LINKEDIN) {
params.externalResources?.LINKEDIN.match(/@/g)
? (params.externalResources.LINKEDIN = params.externalResources.LINKEDIN.split('@')[1])
: params.externalResources.LINKEDIN
isURL(params.externalResources?.LINKEDIN)
? (params.externalResources.LINKEDIN = params.externalResources?.LINKEDIN.split('/in/')[1])
: params.externalResources?.LINKEDIN
}
send('DONE', { form: params })
}}
member={member}
/>
)
Expand Down