From abbcccc71b6fde286987b2fa2fc5a895159e5ef3 Mon Sep 17 00:00:00 2001 From: Ganesh R Date: Wed, 16 Oct 2019 22:59:33 +0530 Subject: [PATCH 1/2] Refactor /app/pages/common/Modals/NetlifyLogs/index.js to /app/pages/common/Modals/NetlifyLogs/index.tsx --- .all-contributorsrc | 9 ++++ README.md | 4 +- .../pages/common/Modals/NetlifyLogs/index.js | 53 ------------------- .../pages/common/Modals/NetlifyLogs/index.tsx | 53 +++++++++++++++++++ 4 files changed, 65 insertions(+), 54 deletions(-) delete mode 100644 packages/app/src/app/pages/common/Modals/NetlifyLogs/index.js create mode 100644 packages/app/src/app/pages/common/Modals/NetlifyLogs/index.tsx diff --git a/.all-contributorsrc b/.all-contributorsrc index 927d61efac7..ff0fbe82234 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1394,6 +1394,15 @@ "contributions": [ "code" ] + }, + { + "login": "ganes1410", + "name": "R.Ganesh", + "avatar_url": "https://avatars3.githubusercontent.com/u/16988745?v=4", + "profile": "https://github.com/ganes1410", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index e060383ce33..0c608d63fa0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [CodeSandbox](https://codesandbox.io) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/codesandbox) [![All Contributors](https://img.shields.io/badge/all_contributors-148-orange.svg?style=flat-square)](#contributors-) [![CircleCI](https://circleci.com/gh/codesandbox/codesandbox-client.svg?style=svg)](https://circleci.com/gh/codesandbox/codesandbox-client) [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf)](https://www.browserstack.com/automate/public-build/cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![first-timers-only Friendly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/) +# [CodeSandbox](https://codesandbox.io) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/codesandbox) [![All Contributors](https://img.shields.io/badge/all_contributors-149-orange.svg?style=flat-square)](#contributors-) [![CircleCI](https://circleci.com/gh/codesandbox/codesandbox-client.svg?style=svg)](https://circleci.com/gh/codesandbox/codesandbox-client) [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf)](https://www.browserstack.com/automate/public-build/cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![first-timers-only Friendly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/) [![Backers on Open Collective](https://opencollective.com/codesandbox/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/codesandbox/sponsors/badge.svg)](#sponsors) @@ -235,11 +235,13 @@ Thanks goes to these wonderful people Het Patel
Het Patel
💻 + R.Ganesh
R.Ganesh
💻 + ## Backers diff --git a/packages/app/src/app/pages/common/Modals/NetlifyLogs/index.js b/packages/app/src/app/pages/common/Modals/NetlifyLogs/index.js deleted file mode 100644 index 7d2ae652d0d..00000000000 --- a/packages/app/src/app/pages/common/Modals/NetlifyLogs/index.js +++ /dev/null @@ -1,53 +0,0 @@ -import React, { Component } from 'react'; -import { inject, observer } from 'app/componentConnectors'; - -import { Button } from '@codesandbox/common/lib/components/Button'; -import { Container } from '../LiveSessionEnded/elements'; -import { Heading, Explanation } from '../elements'; - -import { List, Item } from './elements'; - -class NetlifyLogs extends Component { - state = { logs: ['Contacting Netlify'] }; - - componentDidMount() { - this.interval = setInterval(this.getLogs, 2000); - } - - componentWillUnmount() { - clearInterval(this.interval); - } - - getLogs = async () => { - const url = this.props.store.deployment.netlifyLogs; - - const data = await fetch(url); - const { logs } = await data.json(); - - this.setState({ logs }); - }; - - render() { - const { signals } = this.props; - - return ( - - Sandbox Site Logs - - Builds typically take a minute or two to complete - - - {this.state.logs.map((log, i) => ( - // eslint-disable-next-line react/no-array-index-key - {log} - ))} - - - - ); - } -} - -export default inject('signals', 'store')(observer(NetlifyLogs)); diff --git a/packages/app/src/app/pages/common/Modals/NetlifyLogs/index.tsx b/packages/app/src/app/pages/common/Modals/NetlifyLogs/index.tsx new file mode 100644 index 00000000000..bbab9acde11 --- /dev/null +++ b/packages/app/src/app/pages/common/Modals/NetlifyLogs/index.tsx @@ -0,0 +1,53 @@ +import React, { useState, useEffect } from 'react'; +import { useOvermind } from 'app/overmind'; +import { Button } from '@codesandbox/common/lib/components/Button'; +import { Container } from '../LiveSessionEnded/elements'; +import { Heading, Explanation } from '../elements'; + +import { List, Item } from './elements'; + +export const NetlifyLogs = () => { + const [logs, setLogs] = useState(['Contacting Netlify']); + const { + state: { + deployment: { netlifyLogs }, + }, + actions: { modalClosed }, + } = useOvermind(); + + useEffect(() => { + const getLogs = async () => { + const url = netlifyLogs; + + const data = await fetch(url); + // eslint-disable-next-line no-shadow + const { logs } = await data.json(); + + setLogs(logs); + }; + + const interval = setInterval(getLogs, 2000); + + return () => { + clearInterval(interval); + }; + }, [netlifyLogs]); + + return ( + + Sandbox Site Logs + + Builds typically take a minute or two to complete + + + {logs.map((log, i) => ( + // eslint-disable-next-line react/no-array-index-key + {log} + ))} + + + + ); +}; From f449a1e3afe34c259edf6e9dd0e4b962521eb6a2 Mon Sep 17 00:00:00 2001 From: Christian Alfoni Date: Thu, 17 Oct 2019 13:55:29 +0200 Subject: [PATCH 2/2] fix bad import --- packages/app/src/app/pages/common/Modals/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/app/pages/common/Modals/index.js b/packages/app/src/app/pages/common/Modals/index.js index cd6cbf9f560..0ac650e361d 100644 --- a/packages/app/src/app/pages/common/Modals/index.js +++ b/packages/app/src/app/pages/common/Modals/index.js @@ -19,7 +19,7 @@ import { FeedbackModal } from './FeedbackModal'; import { ForkServerModal } from './ForkServerModal'; import LiveSessionEnded from './LiveSessionEnded'; import LiveSessionVersionMismatch from './LiveSessionVersionMismatch'; -import NetlifyLogs from './NetlifyLogs'; +import { NetlifyLogs } from './NetlifyLogs'; import NewSandbox from './NewSandbox'; import PickSandboxModal from './PickSandboxModal'; import PreferencesModal from './PreferencesModal';