From d24fdadad6470e1ab037d33597fa25780b3e5ef8 Mon Sep 17 00:00:00 2001 From: Prashanth Rajaram Date: Tue, 20 Nov 2018 17:38:38 -0800 Subject: [PATCH 1/3] fix(chat): Fixed chat hyperlinks (#44) --- src/client/ui-components/chat/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/ui-components/chat/index.js b/src/client/ui-components/chat/index.js index b332633..fa83f00 100644 --- a/src/client/ui-components/chat/index.js +++ b/src/client/ui-components/chat/index.js @@ -46,7 +46,7 @@ class Chat extends Component { {isValidUrl(message) - ? ({message}) + ? ({message}) : (message) } From fe0b2c5d1614a49d0986f36804470272d78071fe Mon Sep 17 00:00:00 2001 From: Prashanth Rajaram Date: Wed, 21 Nov 2018 11:47:39 -0800 Subject: [PATCH 2/3] feat(chat): Upgrade chat using react-chat-window (#45) * feat(chat): Upgrade chat using modern component * fixed z-index --- package.json | 1 + src/client/redux/ducks/chat.js | 17 +- src/client/ui-components/chat/index.css | 23 +-- src/client/ui-components/chat/index.js | 96 +++-------- .../ui-components/toolbar/toolbar-wrapper.js | 9 +- src/client/utils/theme.js | 5 +- src/client/views/home/index.js | 13 +- src/client/views/room/chat-menu.js | 24 +-- src/client/views/room/index.js | 2 - yarn.lock | 149 +++++++++++++++++- 10 files changed, 208 insertions(+), 131 deletions(-) diff --git a/package.json b/package.json index c430679..5d59550 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "react": "^16.2.0", "react-bootstrap": "^0.32.1", "react-burger-menu": "^2.5.4", + "react-chat-window": "^1.0.8", "react-dom": "^16.2.0", "react-redux": "^5.0.6", "react-router": "^4.2.0", diff --git a/src/client/redux/ducks/chat.js b/src/client/redux/ducks/chat.js index 3e05ea0..89fe370 100644 --- a/src/client/redux/ducks/chat.js +++ b/src/client/redux/ducks/chat.js @@ -1,5 +1,5 @@ -import { SOCKET_CHAT, SOCKET_CHAT_SEND } from './socket' +import { SOCKET_CHAT, SOCKET_CHAT_SEND, SOCKET_INITIALIZE_SUCCESS } from './socket' export const TOGGLE_CHAT = 'TOGGLE_CHAT' @@ -17,13 +17,26 @@ const initialState = { showChat: false, messages: [], lastMessageId: null, + hostId: null } const chatReducer = (state = initialState, action) => { switch (action.type) { + case SOCKET_INITIALIZE_SUCCESS: + return { + ...state, + hostId: action.socket.id + } case SOCKET_CHAT: + console.log('action', action) return { ...state, - messages: [...state.messages, action.message], + messages: [ + ...state.messages, { + author: action.peerId === state.hostId ? 'me' : 'them', + type: 'text', + data: { text: action.message } + } + ], showChat: true } case TOGGLE_CHAT: diff --git a/src/client/ui-components/chat/index.css b/src/client/ui-components/chat/index.css index 550ea87..a131796 100644 --- a/src/client/ui-components/chat/index.css +++ b/src/client/ui-components/chat/index.css @@ -1,22 +1,3 @@ -.chat-form { - position: fixed; - bottom: 0; - left: 0; - right: 0; - text-align: center; - padding-bottom: 20px; - z-index: 999; -} - -.chat-message-list { - padding-bottom: 20px; - color: white; - max-height: 80vh; - overflow-y: auto; - white-space: wrap; - font-size: 16px; -} - -.chat-message { - line-height: 1.5; +.sc-chat-window { + z-index: 1001 !important; /* just above video container so chat overlays */ } diff --git a/src/client/ui-components/chat/index.js b/src/client/ui-components/chat/index.js index fa83f00..c4188b7 100644 --- a/src/client/ui-components/chat/index.js +++ b/src/client/ui-components/chat/index.js @@ -1,84 +1,28 @@ -import React, { Component, Fragment } from 'react' -import ReactDOM from 'react-dom' +import React from 'react' import PropTypes from 'prop-types' -import { Button, Form, FormGroup, FormControl, Glyphicon } from 'react-bootstrap' -import isValidUrl from '../../utils/is-valid-url' +import { Launcher } from 'react-chat-window' import './index.css' -class Chat extends Component { - constructor (props) { - super(props) - this.state = { - message: null - } - this.chatForm = null - this.onSendChat = this.onSendChat.bind(this) - this.onChatMessageChange = this.onChatMessageChange.bind(this) - this.clearInput = this.clearInput.bind(this) - } - clearInput (ref) { - const el = ReactDOM.findDOMNode(ref) - if (el) { - el.value = '' - } - } - onSendChat (event) { - event.preventDefault() - this.clearInput(this.chatForm) - this.props.onSendChat(this.state.message) - this.setState({ - message: null - }) - } - onChatMessageChange (event) { - event.preventDefault() - if (event.target && event.target.value) { - this.setState({ - message: event.target.value - }) - } - } - render () { - return ( -
-
- {this.props.messages.map((message, index) => { - return ( - - - {isValidUrl(message) - ? ({message}) - : (message) - } - -
-
- ) - })} -
-
- - { this.chatForm = el }} type='text' size={30} placeholder={'Message...'} onChange={this.onChatMessageChange} /> - {' '} - -
-
- ) - } -} + +const Chat = ({ header, showChat, messages, onSendChat, onToggleChat }) => ( + onSendChat(message.data.text || message.data.emoji)} + messageList={messages} + showEmoji + /> +) Chat.propTypes = { + header: PropTypes.string, + showChat: PropTypes.bool, messages: PropTypes.array, - onSendChat: PropTypes.func + onSendChat: PropTypes.func, + onToggleChat: PropTypes.func } export default Chat diff --git a/src/client/ui-components/toolbar/toolbar-wrapper.js b/src/client/ui-components/toolbar/toolbar-wrapper.js index d0995c4..a459fea 100644 --- a/src/client/ui-components/toolbar/toolbar-wrapper.js +++ b/src/client/ui-components/toolbar/toolbar-wrapper.js @@ -38,7 +38,7 @@ class ToolbarWrapper extends Component { if (force) { this.props.onLeaveRoom() // @todo: Move to router history - goToUrl('/', 'Talk to Me') + goToUrl(`/welcome?next=${encodeURIComponent(`/room/${this.props.roomId}`)}`, 'Talk to Me') } } @@ -93,11 +93,6 @@ class ToolbarWrapper extends Component { label: 'Settings', icon: 'cog', onClick: this.onSettingsClick - }, { - key: 'chat', - label: this.props.chatLabel, - icon: 'comment', - onClick: this.props.onToggleChat }] return (
@@ -123,8 +118,6 @@ class ToolbarWrapper extends Component { ToolbarWrapper.propTypes = { roomId: PropTypes.string, onLeaveRoom: PropTypes.func, - chatLabel: PropTypes.string, - onToggleChat: PropTypes.func, history: PropTypes.any } diff --git a/src/client/utils/theme.js b/src/client/utils/theme.js index 053c0c4..3dcec42 100644 --- a/src/client/utils/theme.js +++ b/src/client/utils/theme.js @@ -47,5 +47,8 @@ const getRandomThemeColors = () => { // get CSS For Random Theme export function getThemeCSS () { const themeColors = getRandomThemeColors() - return getBackgroundCSS(themeColors) + return { + body: getBackgroundCSS(themeColors), + primaryColor: themeColors.color1 + } } diff --git a/src/client/views/home/index.js b/src/client/views/home/index.js index 79906de..c58672e 100644 --- a/src/client/views/home/index.js +++ b/src/client/views/home/index.js @@ -9,10 +9,21 @@ import { getThemeCSS } from '../../utils/theme' import analytics from '../../third-party/google/analytics' import sentry from '../../third-party/sentry' import './index.css' + +const themeCSS = getThemeCSS() // eslint-disable-next-line injectGlobal` body { - ${getThemeCSS()} + ${themeCSS.body} +} +.sc-launcher { + background-color: ${themeCSS.primaryColor} !important; +} +.sc-header { + background: ${themeCSS.primaryColor} !important; +} +.sc-header--close-button:hover { + background: ${themeCSS.primaryColor} !important; } ` class Home extends Component { diff --git a/src/client/views/room/chat-menu.js b/src/client/views/room/chat-menu.js index 968c60c..d26b2b3 100644 --- a/src/client/views/room/chat-menu.js +++ b/src/client/views/room/chat-menu.js @@ -1,28 +1,18 @@ import React, { Component } from 'react' import { onSendChat, onToggleChat } from '../../redux/ducks/chat' -import SidebarMenu from '../../ui-components/sidebar-menu' import Chat from '../../ui-components/chat' import { connect } from 'react-redux' class ChatMenu extends Component { render () { return ( - { if (state.isOpen !== this.props.showChat) { this.props.onToggleChat() } }} - > - - + ) } } diff --git a/src/client/views/room/index.js b/src/client/views/room/index.js index 1919b7a..8c5ba5d 100644 --- a/src/client/views/room/index.js +++ b/src/client/views/room/index.js @@ -28,8 +28,6 @@ class Room extends Component {
diff --git a/yarn.lock b/yarn.lock index 66aa1af..2f9790f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -340,6 +340,12 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" +async@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" + dependencies: + lodash "^4.17.10" + async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -2186,7 +2192,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.15.x, commander@^2.11.0, commander@~2.15.0: +commander@2.15.1, commander@2.15.x, commander@^2.11.0, commander@~2.15.0: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" @@ -3149,6 +3155,16 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emoji-datasource@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-3.0.0.tgz#3c46c5aa4c39bb7a0c8e6877ae02cc94dbc1b12f" + +emoji-js@3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/emoji-js/-/emoji-js-3.2.2.tgz#9f371f4bbd04f18dce08429925620b66f49af6a5" + dependencies: + emoji-datasource "3.0.0" + emoji-regex@^6.1.0: version "6.4.1" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.4.1.tgz#77486fe9cd45421d260a6238b88d721e2fad2050" @@ -3762,6 +3778,18 @@ fbjs@^0.8.16, fbjs@^0.8.5: setimmediate "^1.0.5" ua-parser-js "^0.7.9" +fbjs@^0.8.9: + version "0.8.17" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" + dependencies: + core-js "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + fd-slicer@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" @@ -3811,10 +3839,29 @@ filename-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775" +filename-reserved-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4" + filename-reserved-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" +filenamify-url@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/filenamify-url/-/filenamify-url-1.0.0.tgz#b32bd81319ef5863b73078bed50f46a4f7975f50" + dependencies: + filenamify "^1.0.0" + humanize-url "^1.0.0" + +filenamify@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5" + dependencies: + filename-reserved-regex "^1.0.0" + strip-outer "^1.0.0" + trim-repeated "^1.0.0" + filenamify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.0.0.tgz#bd162262c0b6e94bfbcdcf19a3bbb3764f785695" @@ -3977,6 +4024,14 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" +fs-extra@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" @@ -4096,6 +4151,18 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +gh-pages@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-1.2.0.tgz#1acb92801078f7c038a167f447221d1496ccfbee" + dependencies: + async "2.6.1" + commander "2.15.1" + filenamify-url "^1.0.0" + fs-extra "^5.0.0" + globby "^6.1.0" + graceful-fs "4.1.11" + rimraf "^2.6.2" + git-latest-semver-tag@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/git-latest-semver-tag/-/git-latest-semver-tag-1.0.2.tgz#061130cbf4274111cc6be4612b3ff3a6d93e2660" @@ -4248,7 +4315,7 @@ got@^6.3.0, got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@4.1.11, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -4404,6 +4471,10 @@ he@1.1.x: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" +highlight.js@^9.3.0: + version "9.13.1" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e" + history@^4.7.2: version "4.7.2" resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" @@ -4555,6 +4626,13 @@ https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" +humanize-url@^1.0.0: + version "1.0.1" + resolved "http://registry.npmjs.org/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff" + dependencies: + normalize-url "^1.0.0" + strip-url-auth "^1.0.0" + iconv-lite@0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" @@ -5466,6 +5544,12 @@ jsonfile@^3.0.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + optionalDependencies: + graceful-fs "^4.1.6" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -5723,6 +5807,10 @@ lodash.uniq@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" +lodash@^4.17.10: + version "4.17.11" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" + lodash@^4.17.3, lodash@^4.17.4: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -6200,7 +6288,7 @@ normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" -normalize-url@^1.4.0: +normalize-url@^1.0.0, normalize-url@^1.4.0: version "1.9.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" dependencies: @@ -7029,6 +7117,13 @@ prop-types-extra@^1.0.1: dependencies: warning "^3.0.0" +prop-types@15.5.10: + version "15.5.10" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.3.1" + prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" @@ -7233,6 +7328,16 @@ react-burger-menu@^2.5.4: prop-types "^15.6.1" snapsvg-cjs "0.0.6" +react-chat-window@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/react-chat-window/-/react-chat-window-1.0.8.tgz#68d8335a9ae4e8a85418c3a164f5ea017c42faca" + dependencies: + emoji-js "3.2.2" + gh-pages "^1.0.0" + prop-types "15.5.10" + react-highlight.js "1.0.5" + socket.io-client "2.0.3" + react-dev-utils@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.1.tgz#1f396e161fe44b595db1b186a40067289bf06613" @@ -7269,6 +7374,12 @@ react-error-overlay@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4" +react-highlight.js@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/react-highlight.js/-/react-highlight.js-1.0.5.tgz#c8b319dfeb6f67a83658596948eff7123aeeabdd" + dependencies: + highlight.js "^9.3.0" + react-is@^16.3.1: version "16.3.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22" @@ -7759,6 +7870,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.1: dependencies: glob "^7.0.5" +rimraf@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -8050,6 +8167,24 @@ socket.io-adapter@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b" +socket.io-client@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.3.tgz#6caf4aff9f85b19fd91b6ce13d69adb564f8873b" + dependencies: + backo2 "1.0.2" + base64-arraybuffer "0.1.5" + component-bind "1.0.0" + component-emitter "1.2.1" + debug "~2.6.4" + engine.io-client "~3.1.0" + has-cors "1.1.0" + indexof "0.0.1" + object-component "0.0.3" + parseqs "0.0.5" + parseuri "0.0.5" + socket.io-parser "~3.1.1" + to-array "0.1.4" + socket.io-client@2.0.4, socket.io-client@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e" @@ -8390,6 +8525,10 @@ strip-outer@^1.0.0: dependencies: escape-string-regexp "^1.0.2" +strip-url-auth@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-url-auth/-/strip-url-auth-1.0.1.tgz#22b0fa3a41385b33be3f331551bbb837fa0cd7ae" + style-loader@0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759" @@ -8738,6 +8877,10 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" +ua-parser-js@^0.7.18: + version "0.7.19" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b" + ua-parser-js@^0.7.9: version "0.7.12" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" From 3dd6b5f015cb6868c698c08772c25be283dee4d9 Mon Sep 17 00:00:00 2001 From: Prash Date: Wed, 21 Nov 2018 11:47:55 -0800 Subject: [PATCH 3/3] chore(release): 1.11.0 --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efe29b7..174a763 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [1.11.0](https://github.com/prashanthr/talk-to-me/compare/v1.10.0...v1.11.0) (2018-11-21) + + +### Bug Fixes + +* **chat:** Fixed chat hyperlinks ([#44](https://github.com/prashanthr/talk-to-me/issues/44)) ([d24fdad](https://github.com/prashanthr/talk-to-me/commit/d24fdad)) + + +### Features + +* **chat:** Upgrade chat using react-chat-window ([#45](https://github.com/prashanthr/talk-to-me/issues/45)) ([fe0b2c5](https://github.com/prashanthr/talk-to-me/commit/fe0b2c5)) + + + # [1.10.0](https://github.com/prashanthr/talk-to-me/compare/v1.9.3...v1.10.0) (2018-11-10) diff --git a/package.json b/package.json index 5d59550..ca20eb8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "talk-to-me", - "version": "1.10.0", + "version": "1.11.0", "description": "Chat using Web RTC", "main": "index.js", "private": true,