Skip to content

Commit

Permalink
fix conflicts with update react 17
Browse files Browse the repository at this point in the history
  • Loading branch information
CrisVega08 committed Jun 4, 2021
2 parents 637894b + b4590bc commit ccb62b6
Show file tree
Hide file tree
Showing 37 changed files with 10,598 additions and 11,014 deletions.
19 changes: 4 additions & 15 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,13 @@
"browsers": ["last 2 versions", "safari >= 7"]
}
}],
"@babel/preset-react",
["@babel/preset-react", {
"runtime": "automatic"
}],
"@babel/preset-typescript"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-object-rest-spread",
["module-resolver", {
"root": ["./src"],
"alias": {
"@config": "./src/config",
"@constants": "./src/constants.js",
"@assets": "./assets",
"@tests-mocks": "./mocks",
"@actions": "./src/store/actions",
"@utils": "./src/utils",
"@messagesComponents": "./src/components/Widget/components/Conversation/components/Messages/components",
"@quickButtonsComponents": "./src/components/Widget/components/Conversation/components/QuickButtons/components"
}
}]
"@babel/plugin-proposal-object-rest-spread"
]
}
4 changes: 3 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"extends": "wolox",
"rules": {
"import/order": "off"
"import/order": "off",
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off"
}
}
22 changes: 0 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,6 @@

[![FEArmy](./assets/FEA_open_source_sm.png)](https://github.com/orgs/Wolox/teams/front-end-army/members)

## Sponsors

<div>
<br/>
<p align="center">
<a href="https://getstream.io/chat/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">
<img src="https://i.imgur.com/oU7XYkk.png">
</a>
</p>
<br>
<div>
<p align="center">
A scalable <a href="https://getstream.io/chat/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">Chat API/Server</a> written in Go
</p>
</div>
<div>
<p align="center">
<a href="https://getstream.io/chat/get_started/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">API Tour</a> | <a href="https://github.com/getstream/stream-sdks?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">SDKs</a> | <a href="https://getstream.io/chat/docs/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">Docs</a>
</p>
</div>
</div>

## Features

- Plain text message UI
Expand Down
23 changes: 10 additions & 13 deletions dev/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component } from 'react';
import { Component } from 'react';

import { Widget, addResponseMessage, setQuickButtons, toggleMsgLoader, addLinkSnippet } from '../index';
import { addUserMessage } from '..';
Expand Down Expand Up @@ -38,18 +38,15 @@ export default class App extends Component {

render() {
return (
<div>
<button style={{position: 'absolute', right: 40, bottom: 150}}>test</button>
<Widget
title="Bienvenido"
subtitle="Asistente virtual"
senderPlaceHolder="Escribe aquí ..."
handleNewUserMessage={this.handleNewUserMessage}
handleQuickButtonClicked={this.handleQuickButtonClicked}
imagePreview
handleSubmit={this.handleSubmit}
/>
</div>
<Widget
title="Bienvenido"
subtitle="Asistente virtual"
senderPlaceHolder="Escribe aquí ..."
handleNewUserMessage={this.handleNewUserMessage}
handleQuickButtonClicked={this.handleQuickButtonClicked}
imagePreview
handleSubmit={this.handleSubmit}
/>
);
}
}
1 change: 0 additions & 1 deletion dev/main.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';

import App from './App';
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
setQuickButtons,
deleteMessages,
markAllAsRead,
setBadgeCount,
setBadgeCount
} from './src/store/dispatcher';

export {
Expand Down
Loading

0 comments on commit ccb62b6

Please sign in to comment.