From 17718648a8702ec3037451f39d176fe5c578dabe Mon Sep 17 00:00:00 2001 From: yann300 Date: Fri, 17 Aug 2018 10:44:11 +0200 Subject: [PATCH] move remix, remixd info to setttings tab --- src/app/tabs/settings-tab.js | 34 +------------------- src/app/tabs/support-tab.js | 60 ++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 35 deletions(-) diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js index 8101bc72c6..fbb1557774 100644 --- a/src/app/tabs/settings-tab.js +++ b/src/app/tabs/settings-tab.js @@ -32,7 +32,7 @@ module.exports = class SettingsTab { theme: { dark: null, light: null }, config: { general: null, themes: null, - plugin: null, remixd: null, localremixd: null + plugin: null } } /* eslint-enable */ self.data = {} @@ -120,39 +120,12 @@ module.exports = class SettingsTab { ` - self._view.config.remixd = yo` -
-
Remixd
-
- Remixd is a tool which allow Remix IDE to access files located in your local computer. - it can also be used to setup a development environment. -
-
More infos:
- - -
Installation:
npm install remixd -g
-
` - self._view.config.localremixd = yo` -
-
Running Remix locally
-
- as a NPM module: -
- https://www.npmjs.com/package/remix-ide -
npm install remix-ide -g
-
- as an electron app: -
- https://github.com/horizon-games/remix-app -
` self._view.el = yo`
${self._view.config.general} ${self._view.config.plugin} ${self._view.gistToken} ${self._view.config.themes} - ${self._view.config.remixd} - ${self._view.config.localremixd}
` function onchangeOption (event) { self._deps.config.set('settings/always-use-vm', !self._deps.config.get('settings/always-use-vm')) @@ -251,11 +224,6 @@ const css = csjs` .icon { margin-right: .5em; } - .remixdinstallation { - padding: 3px; - border-radius: 2px; - margin-left: 5px; - } .savegisttoken { margin-left: 5px; } diff --git a/src/app/tabs/support-tab.js b/src/app/tabs/support-tab.js index 042f94f29c..e98edbe56d 100644 --- a/src/app/tabs/support-tab.js +++ b/src/app/tabs/support-tab.js @@ -11,7 +11,7 @@ module.exports = class SupportTab { constructor (localRegistry) { const self = this self.event = new EventManager() - self._view = { el: null, gitterIframe: '' } + self._view = { el: null, gitterIframe: '', config: {} } self.data = { gitterIsLoaded: false } self._components = {} self._components.registry = localRegistry || globalRegistry @@ -33,6 +33,31 @@ module.exports = class SupportTab { const self = this if (self._view.el) return self._view.el self._view.gitterIframe = yo`
` + self._view.config.remixd = yo` +
+
Accessing local files
+
+ Remixd is a tool which allow Remix IDE to access files located in your local computer. + it can also be used to setup a development environment. +
+
More infos:
+ + +
Installation:
npm install remixd -g
+
` + self._view.config.localremixd = yo` +
+
Running Remix locally
+
+ as a NPM module: +
+ https://www.npmjs.com/package/remix-ide +
npm install remix-ide -g
+
+ as an electron app: +
+ https://github.com/horizon-games/remix-app +
` self._view.el = yo`
@@ -47,6 +72,8 @@ module.exports = class SupportTab {
${self._view.gitterIframe}
+ ${self._view.config.remixd} + ${self._view.config.localremixd} ` return self._view.el function openLink () { window.open('https://gitter.im/ethereum/remix') } @@ -55,12 +82,13 @@ module.exports = class SupportTab { const css = csjs` .supportTabView { - height: 100vh; + height: 100%; padding: 2%; padding-bottom: 3em; display: flex; flex-direction: column; overflow: hidden; + overflow-y: auto; } .chat { ${styles.rightPanel.supportTab.box_IframeContainer} @@ -102,4 +130,32 @@ const css = csjs` .infoBox { ${styles.rightPanel.supportTab.box_SupportInfo} } + .remixdinstallation { + padding: 3px; + border-radius: 2px; + margin-left: 5px; + } + .info { + ${styles.rightPanel.settingsTab.box_SolidityVersionInfo}; + margin-top: 1em; + word-break: break-word; + } + .title { + font-size: 1.1em; + font-weight: bold; + margin-bottom: 1em; + } + .crow { + display: flex; + overflow: auto; + clear: both; + padding: .2em; + } + .crow label { + cursor:pointer; + } + .crowNoFlex { + overflow: auto; + clear: both; + } `