Skip to content
This repository was archived by the owner on May 25, 2021. It is now read-only.

Release/0.4.1 #139

Merged
james-martin-jd merged 2 commits into from
Apr 4, 2019
Merged

Release/0.4.1 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
847773f
Real time profile i18n implementation
pablo-rodriguez-jd Apr 3, 2019
806bd30
Exit editMode and success message translations
pablo-rodriguez-jd Apr 3, 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
13 changes: 9 additions & 4 deletions generators/app/templates/src/containers/Profile/components/Form/form.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { Fragment } from 'react';
import { Button, Form, FullGridSize, WebId } from "../../profile.style";
import { Input } from '@util-components';
import { useTranslation } from "react-i18next";

import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";


Expand All @@ -18,9 +20,10 @@ export const FormUi = ({ onSubmit, formFields, mode, onCancel, onInputChange, up
return item.value || '';
}

const {t} = useTranslation();
return(
<Fragment>
<Form onSubmit={onSubmit}>
<Form onSubmit={(e) => onSubmit(e, t('profile.updateSuccess'))}>
{formFields &&
formFields.map(item => (
<Input
Expand All @@ -37,6 +40,8 @@ export const FormUi = ({ onSubmit, formFields, mode, onCancel, onInputChange, up
data-label={item.label}
data-icon={item.icon}
type={'text'}
onInvalid={(e) => e.target.setCustomValidity(t('profile.nameRequired'))}
onInput={(e) => e.target.setCustomValidity('')}
/>
))}
<FullGridSize>
Expand All @@ -47,13 +52,13 @@ export const FormUi = ({ onSubmit, formFields, mode, onCancel, onInputChange, up
onClick={onCancel}
className='ids-link-stroke ids-link-stroke--primary'
>
Cancel
{t('profile.cancelBtn')}
</Button>
<Button
type='submit'
className='ids-link-filled ids-link-filled--primary'
>
Save
{t('profile.saveBtn')}
</Button>
</>
)}
Expand All @@ -69,4 +74,4 @@ export const FormUi = ({ onSubmit, formFields, mode, onCancel, onInputChange, up
)}
</Fragment>
);
}
};
7 changes: 3 additions & 4 deletions generators/app/templates/src/containers/Profile/components/Form/form.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export class ProfileForm extends Component {
* onSubmit will send all the updated fields to POD
* fields that was not updated will be not send it.
*/
onSubmit = async (e: Event) => {
onSubmit = async (e: Event, successMessage: String) => {
try {
e.preventDefault ();
let node;
Expand Down Expand Up @@ -137,11 +137,10 @@ export class ProfileForm extends Component {
this.setState ({
formFields: updatedFormField,
updatedFields: {},
formMode: true,
isLoading: false,
});

this.props.toastManager.add (['', 'Profile was updated successfully'], {
this.props.exitEditMode();
this.props.toastManager.add (['', successMessage], {
appearance: 'success',
});
} catch (error) {
Expand Down
3 changes: 2 additions & 1 deletion generators/app/templates/src/containers/Profile/components/Image/image.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ export const Image = ({ webId, toastManager, defaultProfilePhoto }: Props) => {
onComplete: uploadedFiles => {
updatePhoto(uploadedFiles[uploadedFiles.length - 1].uri)
},
render: props => <ImageProfile {...{ ...props, webId, photo: image || defaultProfilePhoto }} />
render: props => <ImageProfile {...{ ...props, webId, photo: image || defaultProfilePhoto, text: t('profile.upload'),
uploadingText: t('profile.uploadingText') }} />
}}
/>
);
Expand Down
10 changes: 8 additions & 2 deletions generators/app/templates/src/containers/Profile/profile.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React, { useState } from 'react';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { useTranslation } from "react-i18next";

import { withToastManager } from 'react-toast-notifications';
import { LiveUpdate, useWebId } from '@inrupt/solid-react-components';
import { Header, ProfileContainer, ProfileWrapper } from './profile.style';
Expand All @@ -23,6 +25,10 @@ const Profile = ({ toastManager }) => {
setMode(!mode);
};

const exitEditMode = () => {
setMode(true);
};
const { t } = useTranslation();
return (
<ProfileWrapper data-testid="profile-component">
<ProfileContainer>
Expand All @@ -36,7 +42,7 @@ const Profile = ({ toastManager }) => {
onClick={onCancel}
data-testid="edit-profile-button"
>
<FontAwesomeIcon icon="pencil-alt" /> EDIT
<FontAwesomeIcon icon="pencil-alt" /> {t('profile.edit')}
</button>
)}
<Image
Expand All @@ -47,7 +53,7 @@ const Profile = ({ toastManager }) => {
}}
/>
</Header>
<Form {...{ mode, toastManager, webId, onCancel }} />
<Form {...{ mode, toastManager, webId, onCancel, exitEditMode }} />
</LiveUpdate>
)}
</ProfileContainer>
Expand Down