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

Buttons for video dialog editing now say Edit Video #101

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Buttons for video dialog editing now say Edit Video #101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6990ab
Buttons for video dialog editing now say Edit Video, preventing any l…
ejmudrak Feb 11, 2018
05ca005
Merge branch 'master' into hotfix-video-button
ejmudrak Mar 4, 2018
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
3 changes: 2 additions & 1 deletion package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/presentation/locationProfile/EditLocationProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ class EditLocationProfile extends React.Component {
labelColor="#fff"
labelPosition="before"
icon={<EditIcon />}
label={video.title}
label='Edit Video'
buttonStyle={{ borderRadius: 5 }}
style={{ marginRight: 5 }}
key={video.title}
Expand Down
4 changes: 2 additions & 2 deletions src/presentation/profile/EditProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class EditProfile extends React.Component {
const isPublic = get(profile, 'public', false)
const video = get(userProfile, 'video', '')[0]
let videoType = 0
if (video) videoType = video.url.indexOf('youtube') > -1 ? 1 : 2 // 1 for Youtube, 2 for Vimeo
if (video) videoType = video.url.indexOf('youtube') > -1 ? 1 : 2 // 1 for Youtube, 2 for Vimeo

const addYoutubeActions = [
<FlatButton
Expand Down Expand Up @@ -569,7 +569,7 @@ class EditProfile extends React.Component {
labelColor="#fff"
labelPosition="before"
icon={<EditIcon />}
label={video.title}
label='Edit Video'
buttonStyle={{ borderRadius: 5 }}
style={{ marginRight: 5 }}
key={video.title}
Expand Down
7 changes: 3 additions & 4 deletions src/presentation/vendorProfile/EditVendorProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class EditVendorProfile extends React.Component {
const isPublic = get(vendorProfile, 'public', false)
const video = get(vendorProfile, 'video', '')[0]
let videoType = 0
if(video) videoType = video.url.indexOf("youtube") > -1 ? 1 : 2 // 1 for Youtube, 2 for Vimeo
if(video) videoType = video.url.indexOf("youtube") > -1 ? 1 : 2 // 1 for Youtube, 2 for Vimeo

const profileImageUrl = get(vendorProfile, 'profileImage', 'https://images.vexels.com/media/users/3/144866/isolated/preview/927c4907bbd0598c70fb79de7af6a35c-business-building-silhouette-by-vexels.png')
const addLinkActions = [
Expand Down Expand Up @@ -555,7 +555,7 @@ class EditVendorProfile extends React.Component {
labelColor="#fff"
labelPosition="before"
icon={<EditIcon />}
label={video.title}
label='Edit Video'
buttonStyle={{ borderRadius: 5 }}
style={{ marginRight: 5 }}
key={video.title}
Expand Down Expand Up @@ -637,7 +637,7 @@ class EditVendorProfile extends React.Component {
}
</Card>
</div>

</div>
)
}
Expand Down Expand Up @@ -681,4 +681,3 @@ const EditVendorProfileFormEnriched = reduxForm({
})(EditVendorProfile)

export default EditVendorProfileFormEnriched