From dcd39a94df4bacd884f94474568070cb1203203e Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 12 Aug 2020 11:18:05 +0200 Subject: [PATCH 1/8] added icons to homepage items --- .../src/app/ui/landing-page/landing-page.js | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index 4e4967e2d3..bc6b00c906 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -249,9 +249,13 @@ export class LandingPage extends ViewPlugin {

File

-

createNewFile()}>New File

-

+ + createNewFile()}>New File +

+

+ + Open Files -

+ +

+

+ + connectToLocalhost()}>Connect to Localhost

-

connectToLocalhost()}>Connect to Localhost

@@ -287,10 +294,18 @@ export class LandingPage extends ViewPlugin {

Resources

-

Documentation

-

Gitter channel

-

Medium Posts

-

Tutorials

+

+ + Documentation +

+

+ + Gitter channel +

+

+ + Medium Posts +

From 618d6c3f95f96c2131ee3c44ae74edca8f6435cb Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 13 Aug 2020 09:43:07 +0200 Subject: [PATCH 2/8] added last tweets from EthereumRemix --- .../src/app/ui/landing-page/landing-page.js | 194 +++++++++--------- 1 file changed, 100 insertions(+), 94 deletions(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index bc6b00c906..f74a8177ca 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -20,7 +20,11 @@ let css = csjs` text-decoration: underline; } .homeContainer { - user-select:none; + user-select: none; + overflow-y: hidden; + } + .mainContent { + flex-grow: 3; } .thisJumboton { padding: 2.5rem 0rem; @@ -32,14 +36,13 @@ let css = csjs` margin:30px; padding-right: 90px; } - .jumboBtnContainer { - } - .headlineContainer { - margin: 0 50px 0 70px; - } .hpSections { min-width: 640px; } + .remixHomeTwitter { + overflow-x: hidden; + overflow-y: auto; + } .labelIt { margin-bottom: 0; } @@ -123,8 +126,6 @@ export class LandingPage extends ViewPlugin { }) } - const learnMore = () => { window.open('https://remix-ide.readthedocs.io/en/latest/layout.html', '_blank') } - const startSolidity = () => { this.appManager.ensureActivated('solidity') this.appManager.ensureActivated('udapp') @@ -211,7 +212,8 @@ export class LandingPage extends ViewPlugin { const sourceVerifyEnv = createEnvButton('assets/img/sourceVerifyLogo.webp', 'sourceVerifyLogo', 'Sourcify', startSourceVerify) const moreEnv = createEnvButton('assets/img/moreLogo.webp', 'moreLogo', 'More', startPluginManager) - const invertNum = (globalRegistry.get('themeModule').api.currentTheme().quality === 'dark') ? 1 : 0 + const themeQuality = globalRegistry.get('themeModule').api.currentTheme().quality + const invertNum = (themeQuality === 'dark') ? 1 : 0 solEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})` vyperEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})` pipelineEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})` @@ -226,91 +228,95 @@ export class LandingPage extends ViewPlugin { document.location.reload() } const img = yo`` - const container = yo`
-
-
-
-
${img}
-
-
- - -
-
-
-
-
-
-

Environments

-
- ${solEnv} - ${vyperEnv} -
-
-
-

File

-

- - createNewFile()}>New File -

-

- - - Open Files - - -

-

- - connectToLocalhost()}>Connect to Localhost -

-

-
- - - - - - -
-
-
-
-
-

Featured Plugins

-
- ${pipelineEnv} - ${mythXEnv} - ${sourceVerifyEnv} - ${debuggerEnv} - ${moreEnv} -
-
-
-

Resources

-

- - Documentation -

-

- - Gitter channel -

-

- - Medium Posts -

-
-
-
-
` - + const container = yo` +
+
+
+ switchToPreviousVersion()}>Previous version +
+
${img}
+
+
+
+
+
+

Environments

+
+ ${solEnv} + ${vyperEnv} +
+
+
+

File

+

+ + createNewFile()}>New File +

+

+ + + Open Files + + +

+

+ + connectToLocalhost()}>Connect to Localhost +

+

+
+ + + + + + +
+
+
+
+
+

Featured Plugins

+
+ ${pipelineEnv} + ${mythXEnv} + ${sourceVerifyEnv} + ${debuggerEnv} + ${moreEnv} +
+
+
+

Resources

+

+ + Documentation +

+

+ + Gitter channel +

+

+ + Medium Posts +

+
+
+
+
+
+ + +
+
+ ` return container } } From c84249b2092ce735ad66801b158619b48c2f009c Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 13 Aug 2020 10:08:17 +0200 Subject: [PATCH 3/8] bg-color for tweeter bar --- apps/remix-ide/src/app/ui/landing-page/landing-page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index f74a8177ca..4e231e016b 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -309,7 +309,7 @@ export class LandingPage extends ViewPlugin { -
+
From 3709e0691b87a4f85ac9fbbcef6545a03603352d Mon Sep 17 00:00:00 2001 From: LianaHus Date: Mon, 31 Aug 2020 15:51:39 +0200 Subject: [PATCH 4/8] updateing tweeter panel with theme --- .../src/app/ui/landing-page/landing-page.js | 96 ++++++++++++++++--- workspace.json | 9 +- 2 files changed, 93 insertions(+), 12 deletions(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index 4e231e016b..d7b88b4b24 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -1,3 +1,6 @@ +import * as packageJson from '../../../../../../package.json' +import { ViewPlugin } from '@remixproject/engine' + let yo = require('yo-yo') let csjs = require('csjs-inject') let globalRegistry = require('../../../global/registry') @@ -6,8 +9,6 @@ var modalDialogCustom = require('../modal-dialog-custom') var tooltip = require('../tooltip') var GistHandler = require('../../../lib/gist-handler') var QueryParams = require('../../../lib/query-params.js') -import * as packageJson from '../../../../../../package.json' -import { ViewPlugin } from '@remixproject/engine' let css = csjs` .text { @@ -39,7 +40,7 @@ let css = csjs` .hpSections { min-width: 640px; } - .remixHomeTwitter { + .remixHomeMedia { overflow-x: hidden; overflow-y: auto; } @@ -66,13 +67,27 @@ let css = csjs` .envLogo { height: 16px; } - .envLabel { + .cursorStyle { cursor: pointer; } .envButton { width: 120px; height: 70px; } + .block input[type='radio']:checked ~ .media{ + width: auto; + display: block; + transition: .5s ease-in; + } + .media{ + width: 0; + display: none; + overflow: hidden; + transition: .5s ease-out; + } + .mediumPanel { + width: 400px; + } } ` @@ -95,6 +110,42 @@ export class LandingPage extends ViewPlugin { this.appManager = appManager this.verticalIcons = verticalIcons this.gistHandler = new GistHandler() + const themeQuality = globalRegistry.get('themeModule').api.currentTheme().quality + this.twitterFrame = yo` +
+ + +
+ ` + globalRegistry.get('themeModule').api.events.on('themeChanged', (theme) => { + console.log("theme is ", theme.quality) + this.onThemeChanged(theme.quality) + }) + } + + onThemeChanged (themeQuality) { + console.log("themes in listener is", themeQuality) + let twitterFrame = yo` +
+ + +
+ ` + yo.update(this.twitterFrame, twitterFrame) } render () { @@ -184,7 +235,7 @@ export class LandingPage extends ViewPlugin { this.verticalIcons.select('fileExplorers') } - globalRegistry.get('themeModule').api.events.on('themeChanged', () => { + globalRegistry.get('themeModule').api.events.on('themeChanged', (theme) => { globalRegistry.get('themeModule').api.fixInvert(document.getElementById('remixLogo')) globalRegistry.get('themeModule').api.fixInvert(document.getElementById('solidityLogo')) globalRegistry.get('themeModule').api.fixInvert(document.getElementById('vyperLogo')) @@ -198,10 +249,11 @@ export class LandingPage extends ViewPlugin { return yo` ` } + // main const solEnv = createEnvButton('assets/img/solidityLogo.webp', 'solidityLogo', 'Solidity', startSolidity) const vyperEnv = createEnvButton('assets/img/vyperLogo.webp', 'vyperLogo', 'Vyper', startVyper) @@ -228,6 +280,9 @@ export class LandingPage extends ViewPlugin { document.location.reload() } const img = yo`` + + // to retrieve medium posts + document.body.appendChild(yo``) const container = yo`
@@ -309,11 +364,30 @@ export class LandingPage extends ViewPlugin {
-
- - +
+
+ + + ${this.twitterFrame} +
+
+ + +
+
+
+
+
+
+
` diff --git a/workspace.json b/workspace.json index d81084a528..41a7fb24b2 100644 --- a/workspace.json +++ b/workspace.json @@ -54,7 +54,14 @@ "builder": "@nrwl/web:dev-server", "options": { "buildTarget": "remix-ide:build", - "port": 8080 + "port": 8080, + "exclude": ["**/node_modules/**", + "apps/remix-ide/build/**/*.js", + "apps/remix-ide/src/app/editor/mode-solidity.js", + "apps/remix-ide/soljson.js", + "apps/remix-ide/js/**/*.js", + "apps/remix-ide/src/assets/js/**/*.js" + ] }, "configurations": { "production": { From 842a8a239532d6d1788ef4d335f2c412484cfba0 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Mon, 17 Aug 2020 11:22:26 +0200 Subject: [PATCH 5/8] better bg colors --- apps/remix-ide/src/app/ui/landing-page/landing-page.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index d7b88b4b24..a9734e51a2 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -284,8 +284,8 @@ export class LandingPage extends ViewPlugin { // to retrieve medium posts document.body.appendChild(yo``) const container = yo` -
-
+
+
switchToPreviousVersion()}>Previous version
@@ -365,12 +365,12 @@ export class LandingPage extends ViewPlugin {
-
+
${this.twitterFrame}
-
+
From 9f542e53f9a8b3b0527ad348df513c015a95c48b Mon Sep 17 00:00:00 2001 From: LianaHus Date: Mon, 17 Aug 2020 13:17:24 +0200 Subject: [PATCH 6/8] moved Previouse version --- .../src/app/ui/landing-page/landing-page.js | 162 ++++++++---------- 1 file changed, 73 insertions(+), 89 deletions(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index a9734e51a2..549e406b66 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -61,9 +61,6 @@ let css = csjs` height: 150px; opacity: 0.7; } - .enviroments { - display: flex; - } .envLogo { height: 16px; } @@ -184,11 +181,6 @@ export class LandingPage extends ViewPlugin { this.appManager.ensureActivated('solidityUnitTesting') this.verticalIcons.select('solidity') } - const startVyper = () => { - this.appManager.ensureActivated('vyper') - this.appManager.ensureActivated('udapp') - this.verticalIcons.select('vyper') - } /* const startWorkshop = () => { this.appManager.ensureActivated('box') @@ -238,14 +230,13 @@ export class LandingPage extends ViewPlugin { globalRegistry.get('themeModule').api.events.on('themeChanged', (theme) => { globalRegistry.get('themeModule').api.fixInvert(document.getElementById('remixLogo')) globalRegistry.get('themeModule').api.fixInvert(document.getElementById('solidityLogo')) - globalRegistry.get('themeModule').api.fixInvert(document.getElementById('vyperLogo')) globalRegistry.get('themeModule').api.fixInvert(document.getElementById('pipelineLogo')) globalRegistry.get('themeModule').api.fixInvert(document.getElementById('debuggerLogo')) globalRegistry.get('themeModule').api.fixInvert(document.getElementById('workshopLogo')) globalRegistry.get('themeModule').api.fixInvert(document.getElementById('moreLogo')) }) - const createEnvButton = (imgPath, envID, envText, callback) => { + const createLargeButton = (imgPath, envID, envText, callback) => { return yo` - - - - - -
-
-
-
+
-

Featured Plugins

-
- ${pipelineEnv} - ${mythXEnv} - ${sourceVerifyEnv} - ${debuggerEnv} - ${moreEnv} -
+

Featured Plugins

+
+ ${solEnv} + ${pipelineEnv} + ${mythXEnv} + ${sourceVerifyEnv} + ${debuggerEnv} + ${moreEnv}
-
-

Resources

-

- - Documentation -

-

- - Gitter channel +

+
+
+

File

+

+ + createNewFile()}>New File +

+

+ + + Open Files + + +

+

+ + connectToLocalhost()}>Connect to Localhost +

+

+
+ + + + + + +
+
+
+

Resources

+

+ + Documentation

-

- - Medium Posts -

+

+ + Gitter channel +

+

+ + Medium Posts +

+

+ + switchToPreviousVersion()}>Old experience +

+
-
+
From eb737215f3856cbe31f02db1fbfbd00572f74288 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Mon, 17 Aug 2020 14:20:13 +0200 Subject: [PATCH 7/8] layout fix --- apps/remix-ide/src/app/ui/landing-page/landing-page.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index 549e406b66..9f3070de53 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -351,12 +351,12 @@ export class LandingPage extends ViewPlugin {
- + ${this.twitterFrame}
- +
Date: Mon, 24 Aug 2020 11:37:33 +0200 Subject: [PATCH 8/8] fixed scroll --- apps/remix-ide/src/app/ui/landing-page/landing-page.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index 9f3070de53..0fdf657bfc 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js @@ -25,14 +25,9 @@ let css = csjs` overflow-y: hidden; } .mainContent { + overflow-y: auto; flex-grow: 3; } - .thisJumboton { - padding: 2.5rem 0rem; - margin-bottom: 4rem; - display: flex; - align-items: center; - } .hpLogoContainer { margin:30px; padding-right: 90px; @@ -275,7 +270,7 @@ export class LandingPage extends ViewPlugin { const container = yo`
-
+
${img}