From c5ffe3fab98e6dddec3c5e4db3c1a52dfe686aa3 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Mon, 6 Sep 2021 19:50:12 +0200 Subject: [PATCH] icons --- apps/remix-ide/src/app/files/dgitProvider.js | 15 ++++- apps/remix-ide/src/remixAppManager.js | 20 +++++- package-lock.json | 70 ++++++++++---------- package.json | 1 + replacemodules.sh | 4 ++ 5 files changed, 71 insertions(+), 39 deletions(-) create mode 100644 replacemodules.sh diff --git a/apps/remix-ide/src/app/files/dgitProvider.js b/apps/remix-ide/src/app/files/dgitProvider.js index 82e92b9925..d1a071f273 100644 --- a/apps/remix-ide/src/app/files/dgitProvider.js +++ b/apps/remix-ide/src/app/files/dgitProvider.js @@ -21,7 +21,7 @@ const profile = { description: '', icon: 'assets/img/fileManager.webp', version: '0.0.1', - methods: ['init', 'localStorageUsed', 'addremote', 'delremote', 'remotes', 'fetch', 'clone', 'export', 'import', 'status', 'log', 'commit', 'add', 'remove', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branches', 'branch', 'checkout', 'currentbranch', 'push', 'pin', 'pull', 'pinList', 'unPin', 'setIpfsConfig', 'zip', 'setItem', 'getItem'], + methods: ['delay', 'init', 'localStorageUsed', 'addremote', 'delremote', 'remotes', 'fetch', 'clone', 'export', 'import', 'status', 'log', 'commit', 'add', 'remove', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branches', 'branch', 'checkout', 'currentbranch', 'push', 'pin', 'pull', 'pinList', 'unPin', 'setIpfsConfig', 'zip', 'setItem', 'getItem'], kind: 'file-system' } class DGitProvider extends Plugin { @@ -34,7 +34,7 @@ class DGitProvider extends Plugin { ipfsurl: 'https://ipfs.remixproject.org/ipfs/' } this.globalIPFSConfig = { - host: 'ipfs2.io', + host: 'ipfs.io', port: 443, protocol: 'https', ipfsurl: 'https://ipfs.io/ipfs/' @@ -70,6 +70,16 @@ class DGitProvider extends Plugin { } } + async delay (num) { + console.log('delay called', num) + return new Promise((resolve, reject) => { + setTimeout(() => { + console.log('delay resolved', num) + resolve(true) + }, 10000) + }) + } + async init (input) { await git.init({ ...await this.getGitConfig(), @@ -82,6 +92,7 @@ class DGitProvider extends Plugin { ...await this.getGitConfig(), ...cmd }) + console.log('dgitstatus', status) return status } diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js index f551b4aded..a6b595cbbf 100644 --- a/apps/remix-ide/src/remixAppManager.js +++ b/apps/remix-ide/src/remixAppManager.js @@ -125,6 +125,7 @@ export class RemixAppManager extends PluginManager { 'dGitProvider', 'gitdiff' ] profile.location = 'sidePanel' + profile.icon = 'https://raw.githubusercontent.com/microsoft/vscode-icons/main/icons/light/source-control.svg' } } const diff = { @@ -135,13 +136,28 @@ export class RemixAppManager extends PluginManager { documentation: 'https://github.com/bunsenstraat/remix-storage-plugin', url: 'https://dgit3remix.web.app/?diff', description: 'Manage workspaces in a git repository.', - icon: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iOTdweCIgaGVpZ2h0PSI5N3B4IiB2aWV3Qm94PSIwIDAgOTcgOTciIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDk3IDk3IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KCTxwYXRoIGZpbGw9IiNGMDUxMzMiIGQ9Ik05Mi43MSw0NC40MDhMNTIuNTkxLDQuMjkxYy0yLjMxLTIuMzExLTYuMDU3LTIuMzExLTguMzY5LDBsLTguMzMsOC4zMzJMNDYuNDU5LDIzLjE5DQoJCWMyLjQ1Ni0wLjgzLDUuMjcyLTAuMjczLDcuMjI5LDEuNjg1YzEuOTY5LDEuOTcsMi41MjEsNC44MSwxLjY3LDcuMjc1bDEwLjE4NiwxMC4xODVjMi40NjUtMC44NSw1LjMwNy0wLjMsNy4yNzUsMS42NzENCgkJYzIuNzUsMi43NSwyLjc1LDcuMjA2LDAsOS45NThjLTIuNzUyLDIuNzUxLTcuMjA4LDIuNzUxLTkuOTYxLDBjLTIuMDY4LTIuMDctMi41OC01LjExLTEuNTMxLTcuNjU4bC05LjUtOS40OTl2MjQuOTk3DQoJCWMwLjY3LDAuMzMyLDEuMzAzLDAuNzc0LDEuODYxLDEuMzMyYzIuNzUsMi43NSwyLjc1LDcuMjA2LDAsOS45NTljLTIuNzUsMi43NDktNy4yMDksMi43NDktOS45NTcsMGMtMi43NS0yLjc1NC0yLjc1LTcuMjEsMC05Ljk1OQ0KCQljMC42OC0wLjY3OSwxLjQ2Ny0xLjE5MywyLjMwNy0xLjUzN1YzNi4zNjljLTAuODQtMC4zNDQtMS42MjUtMC44NTMtMi4zMDctMS41MzdjLTIuMDgzLTIuMDgyLTIuNTg0LTUuMTQtMS41MTYtNy42OTgNCgkJTDMxLjc5OCwxNi43MTVMNC4yODgsNDQuMjIyYy0yLjMxMSwyLjMxMy0yLjMxMSw2LjA2LDAsOC4zNzFsNDAuMTIxLDQwLjExOGMyLjMxLDIuMzExLDYuMDU2LDIuMzExLDguMzY5LDBMOTIuNzEsNTIuNzc5DQoJCUM5NS4wMjEsNTAuNDY4LDk1LjAyMSw0Ni43MTksOTIuNzEsNDQuNDA4eiIvPg0KPC9nPg0KPC9zdmc+DQo=', + icon: 'https://raw.githubusercontent.com/microsoft/vscode-icons/main/icons/light/source-control.svg', location: 'mainPanel', canActivate: [ 'dGitProvider' ] } - plugins.push(diff) + + const tester = { + name: '11111', + displayName: '1111', + methods: ['diff'], + version: '0.0.1', + documentation: 'https://github.com/bunsenstraat/remix-storage-plugin', + url: 'http://localhost:3000', + description: 'Manage workspaces in a git repository.', + icon: 'https://raw.githubusercontent.com/microsoft/vscode-icons/main/icons/light/source-control.svg', + location: 'sidePanel', + canActivate: [ + 'dGitProvider' + ] + } + plugins.push(diff, tester) localStorage.setItem('plugins-directory', JSON.stringify(plugins)) } catch (e) { console.log('getting plugins list from localstorage...') diff --git a/package-lock.json b/package-lock.json index bd9a57b5fb..01659e2f93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7250,31 +7250,31 @@ "integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA==" }, "@remixproject/engine": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.17.tgz", - "integrity": "sha512-mKpGZohw/rF/1CE/kr84DsPk5GVgFJKsd+U+H3PyMy35bhkfHuEthUC0pi+fFM1SjpC1UDyQQ1z4gk+3lmrDZg==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.19.tgz", + "integrity": "sha512-ZUF/KJp/4sULJXKGqRN5e033RGpzI6zknaWR6jEK5cBJi4aoveOpfKvKUBUhUgb3ugYKQoe3d+EGjYPvafjucQ==", "requires": { - "@remixproject/plugin-api": "0.3.17", - "@remixproject/plugin-utils": "0.3.17" + "@remixproject/plugin-api": "0.3.19", + "@remixproject/plugin-utils": "0.3.19" } }, "@remixproject/engine-web": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.17.tgz", - "integrity": "sha512-PNIYTUfwAS5WC/mzyX5HCTFMGvHj+1tUbvTNgYKbAe/tyWZY0lutbwiOB4Y23ImOAsfejSSdLlVKMEwtdcUhWA==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.19.tgz", + "integrity": "sha512-1wJNwnNYuW7PzcnOHxXd+3UH49AuLcfwtbD5BClU4TGnveWeOmiMIiOMMgoxzyml42NSwPA7oUJinMPJXPBCEA==", "requires": { - "@remixproject/engine": "0.3.17", - "@remixproject/plugin-api": "0.3.17", - "@remixproject/plugin-utils": "0.3.17" + "@remixproject/engine": "0.3.19", + "@remixproject/plugin-api": "0.3.19", + "@remixproject/plugin-utils": "0.3.19" } }, "@remixproject/plugin": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.17.tgz", - "integrity": "sha512-mSg9OiFwAvaKfqV9UL8zLjxxBiypSeiUkW8K4w0TqiEt5MUDNK+mPngEpP43WLfCe4OO9aH4fxNe+A1TyOfRAQ==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.19.tgz", + "integrity": "sha512-jEG0ge0ku1TfFU/46ckvzB0Q7WyeUEQhvatv1oMrVTHUj2o8B0u500V92AcI0YNcxXjn5UNNrHGQBgLcNvYG6Q==", "requires": { - "@remixproject/plugin-api": "0.3.17", - "@remixproject/plugin-utils": "0.3.17", + "@remixproject/plugin-api": "0.3.19", + "@remixproject/plugin-utils": "0.3.19", "events": "3.2.0" }, "dependencies": { @@ -7286,17 +7286,17 @@ } }, "@remixproject/plugin-api": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.17.tgz", - "integrity": "sha512-RHTo4ypiBfSiK963L5Hgjm1QzjhOVfjczAdS124JqZx1IckcCHTXyzxT509j+6ofCw39uAUrh+/AqaHPU2hzMQ==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.19.tgz", + "integrity": "sha512-MDCiGYA++5ydncSJUSNe5Fg0qh2fADbMdlCDP8BGsvUfhPEDBRIm8Iw6gYYGu9d5S4xDCs0EBMcExqvdweOGEw==", "requires": { - "@remixproject/plugin-utils": "0.3.17" + "@remixproject/plugin-utils": "0.3.19" } }, "@remixproject/plugin-utils": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.17.tgz", - "integrity": "sha512-h01pjk8RvSRTCIcmoPq8bBXQGyIBlD4LWQ++5B9y3U2olgN+Mq7OZU4CkKS2IhFmj3IvCKn07DgJhMzMYnxGKg==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.19.tgz", + "integrity": "sha512-++L83MmSeV4Hri4uldOB0iNqwOAN/3eAnYorpiSCpKJbeQzT08KyorQ6B3FAiG/EM0pF/o+sPZbNtSJuHCUfIw==", "requires": { "tslib": "2.0.1" }, @@ -7309,24 +7309,24 @@ } }, "@remixproject/plugin-webview": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.17.tgz", - "integrity": "sha512-6nvf1Q+NTn2N1rgkYGhM+hN1ZcjPWlin0rleUeu/n7+so5KtdJmfSxsROW6+4ORPWAX3Ry6lKCtdlMZ5fIGjFQ==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.19.tgz", + "integrity": "sha512-TQiw0Zzm5ZDNmRR7sT9PzF6QmnhBlnTKmJ4X9DpV8ir1en8iG5Uopc5h8RnHc/YFiCVZyQyrjWi2bpSVmAFRuA==", "requires": { - "@remixproject/plugin": "0.3.17", - "@remixproject/plugin-api": "0.3.17", - "@remixproject/plugin-utils": "0.3.17", + "@remixproject/plugin": "0.3.19", + "@remixproject/plugin-api": "0.3.19", + "@remixproject/plugin-utils": "0.3.19", "axios": "^0.21.1" } }, "@remixproject/plugin-ws": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.17.tgz", - "integrity": "sha512-hK1IaDhS77VP9Be8SdKeeJgxsGz6cG96P/f3+7hvNvDDuVONKkCwPusLguUmcQhcwOGrTz+7bSbeW/fht1gOHg==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.19.tgz", + "integrity": "sha512-6c7CwkjKLzXZJ+/GkExOOHcyXYw0Zlo3JisEniEcNqQ8epSIZ7tZIW23ATiNsEnsGBR5GiB0IyQFWSWjSKxBRA==", "requires": { - "@remixproject/plugin": "0.3.17", - "@remixproject/plugin-api": "0.3.17", - "@remixproject/plugin-utils": "0.3.17" + "@remixproject/plugin": "0.3.19", + "@remixproject/plugin-api": "0.3.19", + "@remixproject/plugin-utils": "0.3.19" } }, "@restart/context": { diff --git a/package.json b/package.json index d58eb3aff5..01f8e98915 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,7 @@ "nightwatch_local_runAndDeploy": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/runAndDeploy.js --env=chrome-runAndDeploy", "nightwatch_local_url": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/url.spec.js --env=chrome", "nightwatch_local_verticalIconscontextmenu": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/verticalIconsPanel.spec.js --env=chrome", + "nightwatch_local_dgitprovider": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/dgitprovider.test.js --env=chrome", "onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint", "remixd": "nx build remixd && nx serve remixd --folder=./apps/remix-ide/contracts --remixide=http://127.0.0.1:8080", "selenium": "selenium-standalone start", diff --git a/replacemodules.sh b/replacemodules.sh new file mode 100644 index 0000000000..ddd90c0ed3 --- /dev/null +++ b/replacemodules.sh @@ -0,0 +1,4 @@ +cp -R /Volumes/butbut/code/testp/remix-plugin/dist/packages/engine/core/lib/* ./node_modules/@remixproject/engine/lib/ +cp -R /Volumes/butbut/code/testp/remix-plugin/dist/packages/utils/lib/* ./node_modules/@remixproject/plugin-utils/lib/ +cp -R /Volumes/butbut/code/testp/remix-plugin/dist/packages/utils/index* ./node_modules/@remixproject/plugin-utils/ +cp -R /Volumes/butbut/code/testp/remix-plugin/dist/packages/plugin/core/lib/* ./node_modules/@remixproject/plugin/lib/ \ No newline at end of file