Unverified Commit 8c6afc23 authored by David Zagi's avatar David Zagi Committed by GitHub

Merge branch 'master' into remixd_terminal

parents e03258a1 37a2071a
...@@ -362,6 +362,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org ...@@ -362,6 +362,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
settings settings
]) ])
const queryParams = new QueryParams()
const params = queryParams.get()
const onAcceptMatomo = () => { const onAcceptMatomo = () => {
_paq.push(['forgetUserOptOut']) _paq.push(['forgetUserOptOut'])
// @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used // @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used
...@@ -369,12 +372,21 @@ Please make a backup of your contracts and start using http://remix.ethereum.org ...@@ -369,12 +372,21 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
settings.updateMatomoAnalyticsChoice(true) settings.updateMatomoAnalyticsChoice(true)
const el = document.getElementById('modal-dialog') const el = document.getElementById('modal-dialog')
el.parentElement.removeChild(el) el.parentElement.removeChild(el)
startWalkthroughService()
} }
const onDeclineMatomo = () => { const onDeclineMatomo = () => {
settings.updateMatomoAnalyticsChoice(false) settings.updateMatomoAnalyticsChoice(false)
_paq.push(['optUserOut']) _paq.push(['optUserOut'])
const el = document.getElementById('modal-dialog') const el = document.getElementById('modal-dialog')
el.parentElement.removeChild(el) el.parentElement.removeChild(el)
startWalkthroughService()
}
const startWalkthroughService = () => {
const walkthroughService = new WalkthroughService(localStorage)
if (!params.code && !params.url && !params.minimizeterminal && !params.gist && !params.minimizesidepanel) {
walkthroughService.start()
}
} }
// Ask to opt in to Matomo for remix, remix-alpha and remix-beta // Ask to opt in to Matomo for remix, remix-alpha and remix-beta
...@@ -470,9 +482,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org ...@@ -470,9 +482,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
await appManager.activatePlugin(['settings']) await appManager.activatePlugin(['settings'])
await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport']) await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport'])
const queryParams = new QueryParams()
const params = queryParams.get()
// Set workspace after initial activation // Set workspace after initial activation
if (Array.isArray(workspace)) { if (Array.isArray(workspace)) {
appManager.activatePlugin(workspace).then(async () => { appManager.activatePlugin(workspace).then(async () => {
...@@ -507,8 +516,5 @@ Please make a backup of your contracts and start using http://remix.ethereum.org ...@@ -507,8 +516,5 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
if (params.embed) framingService.embed() if (params.embed) framingService.embed()
framingService.start(params) framingService.start(params)
const walkthroughService = new WalkthroughService(localStorage) startWalkthroughService()
if (!params.code) {
walkthroughService.start()
}
} }
...@@ -50,9 +50,7 @@ class AnalysisTab extends ViewPlugin { ...@@ -50,9 +50,7 @@ class AnalysisTab extends ViewPlugin {
renderComponent () { renderComponent () {
ReactDOM.render( ReactDOM.render(
<RemixUiStaticAnalyser <RemixUiStaticAnalyser
analysisRunner={this.runner}
registry={this.registry} registry={this.registry}
staticanalysis={this.staticanalysis}
analysisModule={this} analysisModule={this}
event={this.event} event={this.event}
/>, />,
......
import IpfsClient from 'ipfs-mini' import IpfsClient from 'ipfs-mini'
const ipfsNodes = [ const ipfsNodes = [
new IpfsClient({ host: 'ipfs.komputing.org', port: 443, protocol: 'https' }), new IpfsClient({ host: 'ipfs.remixproject.org', port: 443, protocol: 'https' }),
new IpfsClient({ host: 'ipfs.infura.io', port: 5001, protocol: 'https' }), new IpfsClient({ host: 'ipfs.infura.io', port: 5001, protocol: 'https' }),
new IpfsClient({ host: '127.0.0.1', port: 5001, protocol: 'http' }) new IpfsClient({ host: '127.0.0.1', port: 5001, protocol: 'http' })
] ]
......
...@@ -65,7 +65,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { ...@@ -65,7 +65,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
useEffect(() => { useEffect(() => {
compilation(props.analysisModule, dispatch) compilation(props.analysisModule, dispatch)
}, []) }, [props])
useEffect(() => { useEffect(() => {
setWarningState({}) setWarningState({})
...@@ -91,7 +91,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { ...@@ -91,7 +91,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither('visible') if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither('visible')
}) })
return () => { } return () => { }
}, [props.analysisModule]) }, [props])
const message = (name, warning, more, fileName, locationString) : string => { const message = (name, warning, more, fileName, locationString) : string => {
return (` return (`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment