From df789a236f37f2baba25c48d8af1346643d9cce2 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 22 May 2019 22:03:01 +0200 Subject: [PATCH 01/14] fixed Swap/side header --- src/app/components/side-panel.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/components/side-panel.js b/src/app/components/side-panel.js index 8b1c848e42..ca3fbc980b 100644 --- a/src/app/components/side-panel.js +++ b/src/app/components/side-panel.js @@ -56,7 +56,7 @@ export class SidePanel extends AbstractPanel { yo.update(this.header, this.renderHeader()) } - /** The header of the swap panel */ + /** The header of the side panel */ renderHeader () { let name = ' - ' let docLink = '' @@ -68,10 +68,11 @@ export class SidePanel extends AbstractPanel { } return yo` -
-
${name}${docLink}
- -
` +
+
${name}
+ ${docLink} +
+ ` } render () { From ab8fcf9cf93c05a7a237b57e645a147e902bbf55 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 22 May 2019 22:20:29 +0200 Subject: [PATCH 02/14] side panel title --- src/app/components/side-panel.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/components/side-panel.js b/src/app/components/side-panel.js index ca3fbc980b..30c6dd3642 100644 --- a/src/app/components/side-panel.js +++ b/src/app/components/side-panel.js @@ -10,6 +10,8 @@ const css = csjs` .swapitTitle { text-transform: uppercase; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .swapitTitle i{ padding-left: 6px; @@ -21,6 +23,7 @@ const css = csjs` display: flex; justify-content: space-between; align-items: center; + justify-content: flex-start; } .swapitHeader h6 { margin: 0; @@ -33,6 +36,9 @@ const css = csjs` height: calc(100% - 35px); overflow: auto; } + .titleInfo { + padding-left: 10px; + } ` const options = { @@ -64,7 +70,7 @@ export class SidePanel extends AbstractPanel { const { profile } = this.store.getOne(this.active) name = profile.displayName ? profile.displayName : profile.name const docsRoot = 'https://remix.readthedocs.io/en/latest/' - docLink = profile.documentation ? yo`` : '' + docLink = profile.documentation ? yo`` : '' } return yo` From 1728974aa3928afa0de1bfc9f9a2189486312b2f Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 22 May 2019 22:54:11 +0200 Subject: [PATCH 03/14] home tab activation t Please enter the commit message for your changes. Lines starting --- src/app/components/vertical-icons.js | 39 ++++++++++++++++--------- src/app/ui/landing-page/landing-page.js | 9 ++++-- src/framingService.js | 2 +- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/app/components/vertical-icons.js b/src/app/components/vertical-icons.js index 8d7d4b068c..d27e8c2f79 100644 --- a/src/app/components/vertical-icons.js +++ b/src/app/components/vertical-icons.js @@ -196,11 +196,19 @@ export class VerticalIcons { * @param {string} name Name of profile of the module to activate */ select (name) { - this.removeActive() - this.addActive(name) + this.updateActivations(name) this.events.emit('showContent', name) } + updateActivations(name) { + if (name === "home") { + this.activateHome() + } else { + this.removeActive() + this.addActive(name) + } + } + onThemeChanged (themeType) { const invert = themeType === 'dark' ? 1 : 0 const active = this.view.querySelector(`.${css.active}`) @@ -211,17 +219,20 @@ export class VerticalIcons { } _iconClick (name) { - this.removeActive() - this.addActive(name) + this.updateActivations(name) this.events.emit('toggleContent', name) } + activateHome() { + globalRegistry.get('appmanager').api.ensureActivated('home') + } + render () { let home = yo`
@@ -345,15 +356,15 @@ export class VerticalIcons { this.view = yo`
- ${home} - ${this.iconKind['fileexplorer']} - ${this.iconKind['compile']} - ${this.iconKind['run']} - ${this.iconKind['testing']} - ${this.iconKind['analysis']} - ${this.iconKind['debugging']} - ${this.iconKind['other']} - ${this.iconKind['settings']} + ${home} + ${this.iconKind['fileexplorer']} + ${this.iconKind['compile']} + ${this.iconKind['run']} + ${this.iconKind['testing']} + ${this.iconKind['analysis']} + ${this.iconKind['debugging']} + ${this.iconKind['other']} + ${this.iconKind['settings']}
` return this.view diff --git a/src/app/ui/landing-page/landing-page.js b/src/app/ui/landing-page/landing-page.js index d9e16377a0..0ff5c6e798 100644 --- a/src/app/ui/landing-page/landing-page.js +++ b/src/app/ui/landing-page/landing-page.js @@ -96,9 +96,12 @@ export class LandingPage extends BaseApi { let load = function (service, item, examples, info) { let compilerImport = new CompilerImport() let fileProviders = globalRegistry.get('fileproviders').api - const msg = yo`
Enter the ${item} you would like to load. -
${info}
-
e.g ${examples.map((url) => { return yo`
${url}
` })}
` + const msg = yo` +
+ Enter the ${item} you would like to load. +
${info}
+
e.g ${examples.map((url) => { return yo`
${url}
` })}
+
` modalDialogCustom.prompt(`Import from ${service}`, msg, null, (target) => { if (target !== '') { diff --git a/src/framingService.js b/src/framingService.js index 94fcec38ff..f728003826 100644 --- a/src/framingService.js +++ b/src/framingService.js @@ -11,7 +11,7 @@ export default { }) verticalIcon.select('fileExplorers') - mainPanel.showContent('home') + verticalIcon.select('home') document.addEventListener('keypress', (e) => { if (e.shiftKey && e.ctrlKey) { From a441a3bd63b1d53b1218f0f31dee779979488f15 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 22 May 2019 23:05:25 +0200 Subject: [PATCH 04/14] fixed file explorer icons tyle inonsistentcy --- src/app/files/file-explorer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js index 007073f351..b4b24f2841 100644 --- a/src/app/files/file-explorer.js +++ b/src/app/files/file-explorer.js @@ -522,12 +522,12 @@ fileExplorer.prototype.renderMenuItems = function () { items = this.menuItems.map(({action, title, icon}) => { if (action === 'uploadFile') { return yo` - + ` } else { return yo` From 1aaf416fe037a1019e87916b04cc3ae712a4ce58 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 22 May 2019 23:10:08 +0200 Subject: [PATCH 05/14] standard --- src/app/components/vertical-icons.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/components/vertical-icons.js b/src/app/components/vertical-icons.js index d27e8c2f79..14700327a5 100644 --- a/src/app/components/vertical-icons.js +++ b/src/app/components/vertical-icons.js @@ -200,8 +200,8 @@ export class VerticalIcons { this.events.emit('showContent', name) } - updateActivations(name) { - if (name === "home") { + updateActivations (name) { + if (name === 'home') { this.activateHome() } else { this.removeActive() @@ -223,7 +223,7 @@ export class VerticalIcons { this.events.emit('toggleContent', name) } - activateHome() { + activateHome () { globalRegistry.get('appmanager').api.ensureActivated('home') } From 9485b676b542206c9d4943806ca94ad8d3aec7e1 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 23 May 2019 00:04:00 +0200 Subject: [PATCH 06/14] renamed toggle function in vertical icon panel --- src/app/components/vertical-icons.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/app/components/vertical-icons.js b/src/app/components/vertical-icons.js index 14700327a5..1553598285 100644 --- a/src/app/components/vertical-icons.js +++ b/src/app/components/vertical-icons.js @@ -78,7 +78,7 @@ export class VerticalIcons { this.icons[name] = yo`
${name} @@ -200,6 +200,15 @@ export class VerticalIcons { this.events.emit('showContent', name) } + /** + * Toggles the plugin/module + * @param {string} name Name of profile of the module to activate + */ + toggle (name) { + this.updateActivations(name) + this.events.emit('toggleContent', name) + } + updateActivations (name) { if (name === 'home') { this.activateHome() @@ -218,11 +227,6 @@ export class VerticalIcons { } } - _iconClick (name) { - this.updateActivations(name) - this.events.emit('toggleContent', name) - } - activateHome () { globalRegistry.get('appmanager').api.ensureActivated('home') } From e2d5c874ac45eb1ca10c3c378261b50d777c6460 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 29 May 2019 22:29:03 +0200 Subject: [PATCH 07/14] toaster --- src/app/ui/tooltip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/ui/tooltip.js b/src/app/ui/tooltip.js index aff0d478ed..b568326021 100644 --- a/src/app/ui/tooltip.js +++ b/src/app/ui/tooltip.js @@ -23,7 +23,7 @@ class Toaster { }, 2000) animation(this.tooltip, css.animateTop.className) } - render (tooltipText, action, opts) { + render (tooltipText, actionElement, opts) { opts = defaultOptions(opts) let canShorten = true if (tooltipText instanceof Element) { @@ -53,7 +53,7 @@ class Toaster { ${shortTooltipText} ${button} - ${action} + ${actionElement}
- +
diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index ef55fcbff9..98d4587156 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -18,7 +18,7 @@ import { BaseApi } from 'remix-plugin' const profile = { name: 'run', - displayName: 'Deploy and run transactions', + displayName: 'Deploy & run transactions', methods: [], events: [], icon: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzFfY29weSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4Ig0KCSB5PSIwcHgiIHdpZHRoPSI3NDIuNTQ1cHgiIGhlaWdodD0iNjc2Ljg4NnB4IiB2aWV3Qm94PSIwIC0wLjIwNCA3NDIuNTQ1IDY3Ni44ODYiDQoJIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAtMC4yMDQgNzQyLjU0NSA2NzYuODg2IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KCTxwb2x5Z29uIHN0cm9rZT0iI0ZGRkZGRiIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBwb2ludHM9IjI5NS45MTEsMC43MTEgNDg4LjkxMSwzMDQuMTg2IDQ4OC45MTEsMzk3LjE4MSAyOTMuOTExLDY3Ni41NTYgDQoJCTc0MS43ODYsMzQ5Ljk0MyAJIi8+DQoJPHBvbHlnb24gc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHBvaW50cz0iNDE3LjA4Myw0MDYuNTg5IDIwOS43OTEsNTE5LjQ5NCAxLjg0Niw0MDYuMjM0IDIwOS43OTEsNjc1Ljg2MyAJIi8+DQoJPHBvbHlnb24gc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHBvaW50cz0iNDE3LjA4MywzMTguNzA3IDIwOS43OTEsMC43MTEgMS44NDYsMzE4LjQyOCAyMDkuNzkxLDQzMS42ODkgCSIvPg0KPC9nPg0KPC9zdmc+DQo=', From a88187d798fcab8cfdfef954900cc8507da5f3ca Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 23 May 2019 11:50:57 +0200 Subject: [PATCH 09/14] tandard --- src/app/ui/tooltip.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/app/ui/tooltip.js b/src/app/ui/tooltip.js index b568326021..b49f70ae57 100644 --- a/src/app/ui/tooltip.js +++ b/src/app/ui/tooltip.js @@ -25,6 +25,7 @@ class Toaster { } render (tooltipText, actionElement, opts) { opts = defaultOptions(opts) +<<<<<<< HEAD let canShorten = true if (tooltipText instanceof Element) { canShorten = false @@ -37,6 +38,19 @@ class Toaster { tooltipText = JSON.stringify(tooltipText) } catch (e) { } +======= + if (typeof (tooltipText) === 'object' && tooltipText.message !== undefined) { + tooltipText = tooltipText.message + } + + if (typeof tooltipText === 'object') { + if (tooltipText.message) { + tooltipText = tooltipText.message + } else { + try { + tooltipText = JSON.stringify(tooltipText) + } catch (e) { +>>>>>>> c2943a2b... tandard } } } From b882a0e5c668ddb0e02d1d473ae52e4a530ba3d4 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 23 May 2019 11:53:54 +0200 Subject: [PATCH 10/14] removed double implementation --- src/app/ui/tooltip.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/ui/tooltip.js b/src/app/ui/tooltip.js index b49f70ae57..c9265ebb1b 100644 --- a/src/app/ui/tooltip.js +++ b/src/app/ui/tooltip.js @@ -25,6 +25,7 @@ class Toaster { } render (tooltipText, actionElement, opts) { opts = defaultOptions(opts) +<<<<<<< HEAD <<<<<<< HEAD let canShorten = true if (tooltipText instanceof Element) { @@ -42,6 +43,8 @@ class Toaster { if (typeof (tooltipText) === 'object' && tooltipText.message !== undefined) { tooltipText = tooltipText.message } +======= +>>>>>>> 9211c21f... removed double implementation if (typeof tooltipText === 'object') { if (tooltipText.message) { From d4bc3b3fdeaa4dfa7b0efe2237ff8cf47e86c757 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Tue, 28 May 2019 19:36:32 +0200 Subject: [PATCH 11/14] added showHome to vertical icon panel --- src/app/components/vertical-icons.js | 15 +++++++-------- src/framingService.js | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/app/components/vertical-icons.js b/src/app/components/vertical-icons.js index 1553598285..2f00396f57 100644 --- a/src/app/components/vertical-icons.js +++ b/src/app/components/vertical-icons.js @@ -210,12 +210,8 @@ export class VerticalIcons { } updateActivations (name) { - if (name === 'home') { - this.activateHome() - } else { - this.removeActive() - this.addActive(name) - } + this.removeActive() + this.addActive(name) } onThemeChanged (themeType) { @@ -227,7 +223,10 @@ export class VerticalIcons { } } - activateHome () { + /** + * Show the home page + */ + showHome () { globalRegistry.get('appmanager').api.ensureActivated('home') } @@ -236,7 +235,7 @@ export class VerticalIcons {
diff --git a/src/framingService.js b/src/framingService.js index f728003826..a8703ce336 100644 --- a/src/framingService.js +++ b/src/framingService.js @@ -11,7 +11,7 @@ export default { }) verticalIcon.select('fileExplorers') - verticalIcon.select('home') + verticalIcon.showHome() document.addEventListener('keypress', (e) => { if (e.shiftKey && e.ctrlKey) { From 66297c86cc6fa50cddd533a7687d9b503a09a612 Mon Sep 17 00:00:00 2001 From: Liana Husikyan Date: Wed, 29 May 2019 01:44:00 +0200 Subject: [PATCH 12/14] Update vertical-icons.js --- src/app/components/vertical-icons.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/vertical-icons.js b/src/app/components/vertical-icons.js index 2f00396f57..8b7e8be1ee 100644 --- a/src/app/components/vertical-icons.js +++ b/src/app/components/vertical-icons.js @@ -201,7 +201,7 @@ export class VerticalIcons { } /** - * Toggles the plugin/module + * Toggles the side panel for plugin * @param {string} name Name of profile of the module to activate */ toggle (name) { From c56bd9fd13fde9e3d818322f4afc46f87fb17f92 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 29 May 2019 23:09:28 +0200 Subject: [PATCH 13/14] removed conflict --- src/app/ui/tooltip.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/app/ui/tooltip.js b/src/app/ui/tooltip.js index c9265ebb1b..b568326021 100644 --- a/src/app/ui/tooltip.js +++ b/src/app/ui/tooltip.js @@ -25,8 +25,6 @@ class Toaster { } render (tooltipText, actionElement, opts) { opts = defaultOptions(opts) -<<<<<<< HEAD -<<<<<<< HEAD let canShorten = true if (tooltipText instanceof Element) { canShorten = false @@ -39,21 +37,6 @@ class Toaster { tooltipText = JSON.stringify(tooltipText) } catch (e) { } -======= - if (typeof (tooltipText) === 'object' && tooltipText.message !== undefined) { - tooltipText = tooltipText.message - } -======= ->>>>>>> 9211c21f... removed double implementation - - if (typeof tooltipText === 'object') { - if (tooltipText.message) { - tooltipText = tooltipText.message - } else { - try { - tooltipText = JSON.stringify(tooltipText) - } catch (e) { ->>>>>>> c2943a2b... tandard } } } From 71bd088288fba0c925ec0b87112aba7ebb354c94 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 5 Jun 2019 14:53:03 +0200 Subject: [PATCH 14/14] added miised '. added title to remove button --- src/app/debugger/debuggerUI/TxBrowser.js | 2 +- src/universal-dapp-ui.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/debugger/debuggerUI/TxBrowser.js b/src/app/debugger/debuggerUI/TxBrowser.js index cdc73dd6a8..f9c9f74bdd 100644 --- a/src/app/debugger/debuggerUI/TxBrowser.js +++ b/src/app/debugger/debuggerUI/TxBrowser.js @@ -94,7 +94,7 @@ TxBrowser.prototype.render = function () { />
- +
diff --git a/src/universal-dapp-ui.js b/src/universal-dapp-ui.js index 1e6ef10c9c..8150cc2178 100644 --- a/src/universal-dapp-ui.js +++ b/src/universal-dapp-ui.js @@ -73,12 +73,12 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address
${contractName} at ${shortAddress} (${context})
- +
` - var close = yo`` + var close = yo`` title.querySelector('.btn-group').appendChild(close) var contractActionsWrapper = yo`