From 838de394ab14e3b8dfd172827022abb7d1f59700 Mon Sep 17 00:00:00 2001 From: Priscila Oliveira Date: Sat, 13 Jan 2018 22:46:11 +0100 Subject: [PATCH] added Edit icon and messages. Next Step Edit Functions. WIP --- src/components/Icon/img/edit.svg | 39 +++++++++++++++ src/components/Icon/index.js | 3 +- src/containers/Preferences/Content.js | 54 +++++++++++++-------- src/containers/Preferences/ContentStyles.js | 11 ++++- src/containers/Preferences/Header.js | 7 ++- src/containers/Preferences/messages.js | 8 +++ 6 files changed, 98 insertions(+), 24 deletions(-) create mode 100644 src/components/Icon/img/edit.svg diff --git a/src/components/Icon/img/edit.svg b/src/components/Icon/img/edit.svg new file mode 100644 index 0000000..b57662b --- /dev/null +++ b/src/components/Icon/img/edit.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Icon/index.js b/src/components/Icon/index.js index 6a0d561..ceda4f7 100644 --- a/src/components/Icon/index.js +++ b/src/components/Icon/index.js @@ -9,7 +9,8 @@ const iconNames = [ 'heart-empty', 'add', 'loading', - 'image' + 'image', + 'edit' ] export const icons = iconNames.reduce((acc, curr) => ({ diff --git a/src/containers/Preferences/Content.js b/src/containers/Preferences/Content.js index dd3e866..954e1cc 100644 --- a/src/containers/Preferences/Content.js +++ b/src/containers/Preferences/Content.js @@ -13,7 +13,7 @@ import Img from 'components/Img' import EmptyState from 'components/EmptyState' import { grey400 } from 'material-ui/styles/colors' import messages from './messages' -import { LItem, PrimaryText } from './ContentStyles' +import { LItem, PrimaryText, BGItem } from './ContentStyles' const iconButtonElement = ( ) -const rightIconMenu = func => ( - - - - - -) - const getExtractQuoteContent = (onRemove, content) => ( content.length > 0 ? ( @@ -51,7 +43,16 @@ const getExtractQuoteContent = (onRemove, content) => ( /> } - rightIconButton={rightIconMenu(() => onRemove(quote.id))} + rightIconButton={ + + onRemove(quote.id)}> + + + onRemove(quote.id)}> + + + + } /> @@ -72,7 +73,7 @@ const getExtractBackgroundContent = (onRemove, content) => ( content.length > 0 ? ( {content.map(background => ( - ( /> } actionIcon={ - onRemove(background.id)} className='btn'> - - - - +
+ onRemove(background.id)} className='btn'> + + + + + onRemove(background.id)} className='btn'> + + + + +
} > -
+ ))}
) : ( diff --git a/src/containers/Preferences/ContentStyles.js b/src/containers/Preferences/ContentStyles.js index 09a4016..a92161a 100644 --- a/src/containers/Preferences/ContentStyles.js +++ b/src/containers/Preferences/ContentStyles.js @@ -1,6 +1,7 @@ import React from 'react' import glamorous from 'glamorous' import { ListItem } from 'material-ui/List' +import { GridTile } from 'material-ui/GridList' import { white, grey400 } from 'material-ui/styles/colors' const LItem = glamorous(props => ( @@ -20,8 +21,16 @@ const PrimaryText = glamorous.div({ } }) +const BGItem = glamorous(props => ( + +))() export { LItem, - PrimaryText + PrimaryText, + BGItem } diff --git a/src/containers/Preferences/Header.js b/src/containers/Preferences/Header.js index 6c0ff53..ff4e6b7 100644 --- a/src/containers/Preferences/Header.js +++ b/src/containers/Preferences/Header.js @@ -23,7 +23,7 @@ const Header = ({ }) => ( category === 'general' ? ( - + @@ -32,6 +32,11 @@ const Header = ({ + + + {intl.formatMessage(messages['randomQuotes.containers.preferences.editAccount'])} + + {intl.formatMessage(messages['randomQuotes.containers.preferences.logout'])} diff --git a/src/containers/Preferences/messages.js b/src/containers/Preferences/messages.js index 1a006e4..596d5d8 100644 --- a/src/containers/Preferences/messages.js +++ b/src/containers/Preferences/messages.js @@ -17,6 +17,14 @@ export default defineMessages({ id: 'randomQuotes.containers.preferences.delete', defaultMessage: 'Delete' }, + 'randomQuotes.containers.preferences.edit': { + id: 'randomQuotes.containers.preferences.edit', + defaultMessage: 'Edit' + }, + 'randomQuotes.containers.preferences.editAccount': { + id: 'randomQuotes.containers.preferences.editAccount', + defaultMessage: 'Edit account' + }, 'randomQuotes.containers.preferences.logout': { id: 'randomQuotes.containers.preferences.logout', defaultMessage: 'Logout'