diff --git a/client/public/images/angry.png b/client/public/images/angry.png new file mode 100644 index 0000000..cb3c2ab Binary files /dev/null and b/client/public/images/angry.png differ diff --git a/client/public/images/bored.png b/client/public/images/bored.png new file mode 100644 index 0000000..557aa15 Binary files /dev/null and b/client/public/images/bored.png differ diff --git a/client/public/images/disappointed.png b/client/public/images/disappointed.png new file mode 100644 index 0000000..4418ad7 Binary files /dev/null and b/client/public/images/disappointed.png differ diff --git a/client/public/images/excited.jpg b/client/public/images/excited.jpg new file mode 100644 index 0000000..e2c36e8 Binary files /dev/null and b/client/public/images/excited.jpg differ diff --git a/client/public/images/excited.png b/client/public/images/excited.png new file mode 100644 index 0000000..6869310 Binary files /dev/null and b/client/public/images/excited.png differ diff --git a/client/public/images/happy.jpg b/client/public/images/happy.jpg new file mode 100644 index 0000000..52b2a9f Binary files /dev/null and b/client/public/images/happy.jpg differ diff --git a/client/public/images/love.png b/client/public/images/love.png new file mode 100644 index 0000000..f83d52d Binary files /dev/null and b/client/public/images/love.png differ diff --git a/client/public/images/low.jpg b/client/public/images/low.jpg new file mode 100644 index 0000000..16d95cc Binary files /dev/null and b/client/public/images/low.jpg differ diff --git a/client/public/images/naughty.png b/client/public/images/naughty.png new file mode 100644 index 0000000..ae203b5 Binary files /dev/null and b/client/public/images/naughty.png differ diff --git a/client/public/images/sad.jpg b/client/public/images/sad.jpg new file mode 100644 index 0000000..a81bb2c Binary files /dev/null and b/client/public/images/sad.jpg differ diff --git a/client/public/images/scared.png b/client/public/images/scared.png new file mode 100644 index 0000000..b9d37a6 Binary files /dev/null and b/client/public/images/scared.png differ diff --git a/client/public/images/sleepy.png b/client/public/images/sleepy.png new file mode 100644 index 0000000..9ad1bf6 Binary files /dev/null and b/client/public/images/sleepy.png differ diff --git a/client/src/app/components/index.js b/client/src/app/components/index.js index 84b3bd5..0b576b6 100644 --- a/client/src/app/components/index.js +++ b/client/src/app/components/index.js @@ -1,4 +1,8 @@ /* PLOP_INJECT_IMPORT */ +import ChatCard from './ChatCard'; +import ChatView from './ChatView'; +import MoodSelector from './MoodSelector'; +import MoodCard from './MoodCard'; import Progress from './Progress'; import Uploader from './Uploader'; import Dropzone from './Dropzone'; @@ -27,6 +31,10 @@ import PageLoader from './molecules/PageLoader'; export { /* PLOP_INJECT_EXPORT */ + ChatCard, + ChatView, + MoodSelector, + MoodCard, Progress, Uploader, Dropzone, diff --git a/client/src/app/components/molecules/ChatCard/ChatCard.component.scss b/client/src/app/components/molecules/ChatCard/ChatCard.component.scss new file mode 100644 index 0000000..924a1fd --- /dev/null +++ b/client/src/app/components/molecules/ChatCard/ChatCard.component.scss @@ -0,0 +1,17 @@ +.c-ChatCard { + border: 1px solid rgb(221, 152, 23); + border-radius: 10px; + margin-bottom: 20px; + padding: 8px; + width: 65%; + display: flex; + + &.rightFloater { + align-self: flex-end; + justify-content: flex-end; + } + + p { + margin: unset; + } +} diff --git a/client/src/app/components/molecules/ChatCard/ChatCard.js b/client/src/app/components/molecules/ChatCard/ChatCard.js new file mode 100644 index 0000000..4222d6d --- /dev/null +++ b/client/src/app/components/molecules/ChatCard/ChatCard.js @@ -0,0 +1,22 @@ +import React from 'react'; +import PropTypes from 'prop-types'; + +const ChatCard = ({chat}) => { + + const classes = ['c-ChatCard', chat.isUser ? 'rightFloater' : ''].join(' ') + return ( +
{chat.text}
+