diff --git a/index.html b/index.html index 9cf2e13472..c694a541c4 100644 --- a/index.html +++ b/index.html @@ -28,7 +28,6 @@ --> Remix - Ethereum IDE - diff --git a/src/app.js b/src/app.js index dc61a21b26..f76731f4c8 100644 --- a/src/app.js +++ b/src/app.js @@ -36,6 +36,8 @@ const TestTab = require('./app/tabs/test-tab') const FilePanel = require('./app/panels/file-panel') const Editor = require('./app/editor/editor') +import { basicLogo } from './app/ui/svgLogo' + import { RunTab, makeUdapp } from './app/udapp' import PanelsResize from './lib/panels-resize' @@ -98,12 +100,34 @@ var css = csjs` background-color : var(--info); opacity : 0.5; } + .centered { + position : fixed; + top : 20%; + left : 45%; + width : 200px; + height : 200px; + } + .centered svg path { + fill: var(--secondary); + } + .centered svg polygon { + fill: var(--secondary); + } ` class App { constructor (api = {}, events = {}, opts = {}) { var self = this self._components = {} + self._view = {} + self._view.splashScreen = yo`
+ ${basicLogo()} +
+ REMIX IDE +
+
` + document.body.appendChild(self._view.splashScreen) + // setup storage var configStorage = new Storage('config-v0.8:') @@ -126,8 +150,6 @@ class App { registry.put({api: self._components.filesProviders['localhost'], name: 'fileproviders/localhost'}) registry.put({api: self._components.filesProviders, name: 'fileproviders'}) - self._view = {} - migrateFileSystem(self._components.filesProviders['browser']) } @@ -163,7 +185,7 @@ class App { self._components.resizeFeature = new PanelsResize(self._view.sidepanel) self._view.el = yo` -
+ ` diff --git a/src/app/tabs/theme-module.js b/src/app/tabs/theme-module.js index 3d5929a98b..b13355f97d 100644 --- a/src/app/tabs/theme-module.js +++ b/src/app/tabs/theme-module.js @@ -1,6 +1,7 @@ import { Plugin } from '@remixproject/engine' import { EventEmitter } from 'events' import * as packageJson from '../../../package.json' +import yo from 'yo-yo' const themes = [ {name: 'Dark', quality: 'dark', url: 'https://res.cloudinary.com/dvtmp0niu/raw/upload/v1578991867/remix-dark-theme.css'}, @@ -52,6 +53,21 @@ export class ThemeModule extends Plugin { return Object.keys(this.themes).map(key => this.themes[key]) } + /** + * Init the theme + */ + initTheme (callback) { + if (this.active) { + const nextTheme = this.themes[this.active] // Theme + document.documentElement.style.setProperty('--theme', nextTheme.quality) + const theme = yo`` + theme.addEventListener('load', () => { + if (callback) callback() + }) + document.head.appendChild(theme) + } + } + /** * Change the current theme * @param {string} [themeName] - The name of the theme diff --git a/src/app/ui/svgLogo.js b/src/app/ui/svgLogo.js new file mode 100644 index 0000000000..ccce67bfef --- /dev/null +++ b/src/app/ui/svgLogo.js @@ -0,0 +1,9 @@ +import yo from 'yo-yo' +export function basicLogo () { + return yo` +remix_logo1 + + + +` +} diff --git a/src/blockchain/pluginUDapp.js b/src/blockchain/pluginUDapp.js index dec4b51d1d..93c2f9e369 100644 --- a/src/blockchain/pluginUDapp.js +++ b/src/blockchain/pluginUDapp.js @@ -9,8 +9,8 @@ class PluginUdapp { } setupEvents () { - this.blockchain.event.register('newTransaction', (tx, receipt) => { - this.events.trigger('newTransaction', [tx, receipt]) + this.blockchain.events.on('newTransaction', (tx, receipt) => { + this.events.emit('newTransaction', tx, receipt) }) } diff --git a/test-browser/tests/remixd.js b/test-browser/tests/remixd.js index e4878526eb..5c12b1bf25 100644 --- a/test-browser/tests/remixd.js +++ b/test-browser/tests/remixd.js @@ -65,6 +65,7 @@ module.exports = { .clickLaunchIcon('fileExplorers') .addFile('test_import_node_modules_with_github_import.sol', sources[4]['browser/test_import_node_modules_with_github_import.sol']) .clickLaunchIcon('solidity') + .setSolidityCompilerVersion('soljson-v0.6.2+commit.bacdbe57.js') // open-zeppelin moved to pragma ^0.6.0 .testContracts('test_import_node_modules_with_github_import.sol', sources[4]['browser/test_import_node_modules_with_github_import.sol'], ['ERC20', 'test11']) .clickLaunchIcon('pluginManager') .scrollAndClick('#pluginManager article[id="remixPluginManagerListItem_remixd"] button') diff --git a/test-browser/tests/solidityImport.js b/test-browser/tests/solidityImport.js index 1ebb429396..ad871dde8e 100644 --- a/test-browser/tests/solidityImport.js +++ b/test-browser/tests/solidityImport.js @@ -27,7 +27,7 @@ module.exports = { 'Test Github Import - from master branch': function (browser) { browser - .setSolidityCompilerVersion('soljson-v0.5.0+commit.1d4f565a.js') + .setSolidityCompilerVersion('soljson-v0.6.2+commit.bacdbe57.js') // open-zeppelin moved to pragma ^0.6.0 (master branch) .addFile('Untitled4.sol', sources[3]['browser/Untitled4.sol']) .clickLaunchIcon('fileExplorers') .verifyContracts(['test7', 'ERC20', 'SafeMath'], {wait: 10000}) @@ -35,6 +35,7 @@ module.exports = { 'Test Github Import - from other branch': function (browser) { browser + .setSolidityCompilerVersion('soljson-v0.5.0+commit.1d4f565a.js') // switch back to 0.5.0 : release-v2.3.0 branch is not solidity 0.6 compliant .addFile('Untitled5.sol', sources[4]['browser/Untitled5.sol']) .clickLaunchIcon('fileExplorers') .verifyContracts(['test8', 'ERC20', 'SafeMath'], {wait: 10000}) @@ -42,6 +43,7 @@ module.exports = { 'Test Github Import - no branch specified': function (browser) { browser + .setSolidityCompilerVersion('soljson-v0.6.2+commit.bacdbe57.js') // open-zeppelin moved to pragma ^0.6.0 (master branch) .addFile('Untitled6.sol', sources[5]['browser/Untitled6.sol']) .clickLaunchIcon('fileExplorers') .verifyContracts(['test10', 'ERC20', 'SafeMath'], {wait: 10000})