mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Update naming convention for unique identifiers

Browse Source
pull/5370/head
ioedeveloper 5 years ago
parent 8ae81de7f0
commit 0ce667f962
7 changed files with 32 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/components/side-panel.js
  2. 6
      src/app/components/vertical-icons.js
  3. 2
      src/app/panels/file-panel.js
  4. 10
      src/app/panels/terminal.js
  5. 2
      src/app/ui/TreeView.js
  6. 4
      src/app/ui/landing-page/landing-page.js
  7. 38
      test-browser/tests/homepage.js

2
src/app/components/side-panel.js
Unescape View File

@ -132,7 +132,7 @@ export class SidePanel extends AbstractPanel {
return yo` return yo`
<header class="${css.swapitHeader} px-3"> <header class="${css.swapitHeader} px-3">
<h6 class="${css.swapitTitle}" data-id="sidePanelFileExplorerTitle">${name}</h6> <h6 class="${css.swapitTitle}" data-id="sidePanelSwapitTitle">${name}</h6>
${docLink} ${docLink}
${versionWarning} ${versionWarning}
</header> </header>

6
src/app/components/vertical-icons.js
Unescape View File

@ -227,7 +227,7 @@ export class VerticalIcons extends Plugin {
this.appManager.ensureActivated('home') this.appManager.ensureActivated('home')
}}" }}"
plugin="home" title="Home" plugin="home" title="Home"
data-id="iconPanelHomeIcon" data-id="verticalIconsHomeIcon"
> >
<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 105 100"> <svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 105 100">
<title>remix_logo1</title> <title>remix_logo1</title>
@ -239,7 +239,7 @@ export class VerticalIcons extends Plugin {
</div>` </div>`
this.iconKind['fileexplorer'] = yo` this.iconKind['fileexplorer'] = yo`
<div id='fileExplorerIcons' data-id="fileExplorerIcons"> <div id='fileExplorerIcons' data-id="verticalIconsFileExplorerIcons">
</div> </div>
` `
@ -274,7 +274,7 @@ export class VerticalIcons extends Plugin {
` `
this.iconKind['settings'] = yo` this.iconKind['settings'] = yo`
<div id='settingsIcons' data-id="settingsIcons"> <div id='settingsIcons' data-id="verticalIconsSettingsIcons">
</div> </div>
` `

2
src/app/panels/file-panel.js
Unescape View File

@ -64,7 +64,7 @@ module.exports = class Filepanel extends ViewPlugin {
const explorers = yo` const explorers = yo`
<div> <div>
<div class=${css.treeview} data-id="sidePanelFileExplorerTree">${fileExplorer.init()}</div> <div class=${css.treeview} data-id="filePanelFileExplorerTree">${fileExplorer.init()}</div>
<div class="filesystemexplorer ${css.treeview}">${fileSystemExplorer.init()}</div> <div class="filesystemexplorer ${css.treeview}">${fileSystemExplorer.init()}</div>
</div> </div>
` `

10
src/app/panels/terminal.js
Unescape View File

@ -123,14 +123,14 @@ class Terminal extends Plugin {
self._view.input.innerText = '\n' self._view.input.innerText = '\n'
self._view.cli = yo` self._view.cli = yo`
<div id="terminalCli" data-id="mainPanelTerminalCli" class="${css.cli}"> <div id="terminalCli" data-id="terminalCli" class="${css.cli}">
<span class=${css.prompt}>${'>'}</span> <span class=${css.prompt}>${'>'}</span>
${self._view.input} ${self._view.input}
</div> </div>
` `
self._view.icon = yo` self._view.icon = yo`
<i onmouseenter=${hover} onmouseleave=${hover} onmousedown=${minimize} <i onmouseenter=${hover} onmouseleave=${hover} onmousedown=${minimize}
class="btn btn-secondary btn-sm align-items-center ${css.toggleTerminal} fas fa-angle-double-down" data-id="mainPanelToggleTerminal"></i>` class="btn btn-secondary btn-sm align-items-center ${css.toggleTerminal} fas fa-angle-double-down" data-id="terminalToggleIcon"></i>`
self._view.dragbar = yo` self._view.dragbar = yo`
<div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>` <div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>`
@ -146,7 +146,7 @@ class Terminal extends Plugin {
self._view.bar = yo` self._view.bar = yo`
<div class="${css.bar}"> <div class="${css.bar}">
${self._view.dragbar} ${self._view.dragbar}
<div class="${css.menu} border-top border-dark bg-light" data-id="mainPanelToggleTerminalMenu"> <div class="${css.menu} border-top border-dark bg-light" data-id="terminalToggleMenu">
${self._view.icon} ${self._view.icon}
<div class=${css.clear} id="clearConsole" onclick=${clear}> <div class=${css.clear} id="clearConsole" onclick=${clear}>
<i class="fas fa-ban" aria-hidden="true" title="Clear console" <i class="fas fa-ban" aria-hidden="true" title="Clear console"
@ -177,9 +177,9 @@ class Terminal extends Plugin {
</div> </div>
` `
self._view.term = yo` self._view.term = yo`
<div class="${css.terminal_container}" data-id="mainPanelTerminalContainer" onscroll=${throttle(reattach, 10)} onclick=${focusinput}> <div class="${css.terminal_container}" data-id="terminalContainer" onscroll=${throttle(reattach, 10)} onclick=${focusinput}>
${self._components.autoCompletePopup.render()} ${self._components.autoCompletePopup.render()}
<div class="bg-secondary" data-id="mainPanelTerminalContainer" style=" <div class="bg-secondary" data-id="terminalContainerDisplay" style="
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;

2
src/app/ui/TreeView.js
Unescape View File

@ -91,7 +91,7 @@ class TreeView {
var list = yo`<ul key=${keyPath} class=${css.ul_tv}>${children}</ul>` var list = yo`<ul key=${keyPath} class=${css.ul_tv}>${children}</ul>`
list.style.display = 'none' list.style.display = 'none'
caret.className = list.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}` caret.className = list.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}`
caret.setAttribute('data-id', `sidePanelToggle${keyPath}`) caret.setAttribute('data-id', `treeViewToggle${keyPath}`)
label.onclick = function () { label.onclick = function () {
self.expand(keyPath) self.expand(keyPath)
} }

4
src/app/ui/landing-page/landing-page.js
Unescape View File

@ -177,7 +177,7 @@ export class LandingPage extends ViewPlugin {
document.location.reload() document.location.reload()
} }
const img = yo`<img src="assets/img/hexagon-remix-greengrey-texture.png"></img>` const img = yo`<img src="assets/img/hexagon-remix-greengrey-texture.png"></img>`
let container = yo`<div class="${css.homeContainer} bg-light" data-id="mainPanelHomeContainer"> let container = yo`<div class="${css.homeContainer} bg-light" data-id="landingPageHomeContainer">
<div> <div>
<div class="alert alert-info clearfix ${css.thisJumboton}"> <div class="alert alert-info clearfix ${css.thisJumboton}">
<div class="${css.headlineContainer}"> <div class="${css.headlineContainer}">
@ -189,7 +189,7 @@ export class LandingPage extends ViewPlugin {
</div> </div>
</div><!-- end of jumbotron --> </div><!-- end of jumbotron -->
</div><!-- end of jumbotron container --> </div><!-- end of jumbotron container -->
<div class="row ${css.hpSections}" data-id="mainPanelHpSections"> <div class="row ${css.hpSections}" data-id="landingPageHpSections">
<div id="col1" class="col-sm-7"> <div id="col1" class="col-sm-7">
<div class="mb-5"> <div class="mb-5">
<h4>Environments</h4> <h4>Environments</h4>

38
test-browser/tests/homepage.js
Unescape View File

@ -8,7 +8,7 @@ module.exports = {
}, },
'Loads Icon\'s Panel': function (browser) { 'Loads Icon\'s Panel': function (browser) {
browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000) browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000)
.waitForElementVisible('div[data-id="iconPanelHomeIcon"]') .waitForElementVisible('div[data-id="verticalIconsHomeIcon"]')
.waitForElementVisible('div[plugin="fileExplorers"]') .waitForElementVisible('div[plugin="fileExplorers"]')
.waitForElementVisible('div[plugin="pluginManager"]') .waitForElementVisible('div[plugin="pluginManager"]')
.waitForElementVisible('div[plugin="settings"]') .waitForElementVisible('div[plugin="settings"]')
@ -16,56 +16,56 @@ module.exports = {
'Loads Side Panel': function (browser) { 'Loads Side Panel': function (browser) {
browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]') browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
.assert.containsText('h6[data-id="sidePanelFileExplorerTitle"]', 'FILE EXPLORERS') .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
.waitForElementVisible('div[data-id="sidePanelFileExplorerTree"]') .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
.waitForElementVisible('li[key="browser/4_Ballot_test.sol"]') .waitForElementVisible('li[key="browser/4_Ballot_test.sol"]')
}, },
'Loads Main View': function (browser) { 'Loads Main View': function (browser) {
browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]') browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]')
.waitForElementVisible('div[data-id="mainPanelHomeContainer"]') .waitForElementVisible('div[data-id="landingPageHomeContainer"]')
.waitForElementVisible('div[data-id="mainPanelHpSections"]') .waitForElementVisible('div[data-id="landingPageHpSections"]')
.waitForElementVisible('div[data-id="mainPanelTerminalContainer"]') .waitForElementVisible('div[data-id="terminalContainer"]')
}, },
'Loads terminal': function (browser) { 'Loads terminal': function (browser) {
browser browser
.waitForElementVisible('div[data-id="mainPanelTerminalCli"]', 10000) .waitForElementVisible('div[data-id="terminalCli"]', 10000)
.journalLastChildIncludes('Welcome to Remix') .journalLastChildIncludes('Welcome to Remix')
}, },
'Toggles Side Panel': function (browser) { 'Toggles Side Panel': function (browser) {
browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]') browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
.assert.containsText('h6[data-id="sidePanelFileExplorerTitle"]', 'FILE EXPLORERS') .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
.clickLaunchIcon('fileExplorers') .clickLaunchIcon('fileExplorers')
.assert.hidden('div[data-id="remixIdeSidePanel"]') .assert.hidden('div[data-id="remixIdeSidePanel"]')
.clickLaunchIcon('fileExplorers') .clickLaunchIcon('fileExplorers')
.assert.visible('div[data-id="remixIdeSidePanel"]') .assert.visible('div[data-id="remixIdeSidePanel"]')
.assert.containsText('h6[data-id="sidePanelFileExplorerTitle"]', 'FILE EXPLORERS') .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
}, },
'Toggles Terminal': function (browser) { 'Toggles Terminal': function (browser) {
browser.waitForElementVisible('div[data-id="mainPanelTerminalContainer"]') browser.waitForElementVisible('div[data-id="terminalContainer"]')
.assert.visible('div[data-id="mainPanelTerminalContainer"]') .assert.visible('div[data-id="terminalContainerDisplay"]')
.click('i[data-id="mainPanelToggleTerminal"]') .click('i[data-id="terminalToggleIcon"]')
.checkElementStyle('div[data-id="mainPanelToggleTerminalMenu"]', 'height', '35px') .checkElementStyle('div[data-id="terminalToggleMenu"]', 'height', '35px')
.click('i[data-id="mainPanelToggleTerminal"]') .click('i[data-id="terminalToggleIcon"]')
.assert.visible('div[data-id="mainPanelTerminalContainer"]') .assert.visible('div[data-id="terminalContainerDisplay"]')
}, },
'Toggles File Explorer Browser': function (browser) { 'Toggles File Explorer Browser': function (browser) {
browser browser
.waitForElementVisible('div[data-id="sidePanelFileExplorerTree"]') .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
.assert.visible('ul[key="browser"]') .assert.visible('ul[key="browser"]')
.click('div[data-id="sidePanelTogglebrowser"]') .click('div[data-id="treeViewTogglebrowser"]')
.assert.hidden('ul[key="browser"]') .assert.hidden('ul[key="browser"]')
.click('div[data-id="sidePanelTogglebrowser"]') .click('div[data-id="treeViewTogglebrowser"]')
.assert.visible('ul[key="browser"]') .assert.visible('ul[key="browser"]')
}, },
'Switch Tabs using tabs icon': function (browser) { 'Switch Tabs using tabs icon': function (browser) {
browser browser
.waitForElementVisible('div[data-id="sidePanelFileExplorerTree"]') .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
.switchFile('browser/3_Ballot.sol') .switchFile('browser/3_Ballot.sol')
.assert.containsText('div[title="browser/3_Ballot.sol"]', '3_Ballot.sol') .assert.containsText('div[title="browser/3_Ballot.sol"]', '3_Ballot.sol')
.click('span[class^=dropdownCaret]') .click('span[class^=dropdownCaret]')

Write Preview
Loading…
Cancel
Save