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

icons

Browse Source
pull/5370/head
filip mertens 3 years ago committed by davidzagi93@gmail.com
parent a015d80428
commit 0a05a38869
5 changed files with 102 additions and 4 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. 15
      apps/remix-ide/src/app/files/dgitProvider.js
  2. 20
      apps/remix-ide/src/remixAppManager.js
  3. 66
      package-lock.json
  4. 1
      package.json
  5. 4
      replacemodules.sh

15
apps/remix-ide/src/app/files/dgitProvider.js
Unescape View File

@ -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
}

20
apps/remix-ide/src/remixAppManager.js
Unescape View File

@ -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...')

66
package-lock.json generated
Unescape View File

@ -54075,6 +54075,7 @@
"integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA=="
},
"@remixproject/engine": {
<<<<<<< HEAD
"version": "0.3.20-alpha.2",
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.20-alpha.2.tgz",
"integrity": "sha512-fHHuh5uH99hRYDD3slpaeu36XXGyIau1Ewf6yQp0UrmUDXeuDjJI2XaOUxlxGp4rN55045TD4D8ojYAG0PTLOQ==",
@ -54100,6 +54101,33 @@
"requires": {
"@remixproject/plugin-api": "0.3.20-alpha.2",
"@remixproject/plugin-utils": "0.3.20-alpha.2",
=======
"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.19",
"@remixproject/plugin-utils": "0.3.19"
}
},
"@remixproject/engine-web": {
"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.19",
"@remixproject/plugin-api": "0.3.19",
"@remixproject/plugin-utils": "0.3.19"
}
},
"@remixproject/plugin": {
"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.19",
"@remixproject/plugin-utils": "0.3.19",
>>>>>>> 02d978945 (icons)
"events": "3.2.0"
},
"dependencies": {
@ -54111,6 +54139,7 @@
}
},
"@remixproject/plugin-api": {
<<<<<<< HEAD
"version": "0.3.20-alpha.2",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.20-alpha.2.tgz",
"integrity": "sha512-4YuTVgi3BhAOyuk3y/0kyxERsI6BwIo/bg/909GbvKbzKEelsLZqCX/vP9C62vEWc/Elh/QnT769Ld51SGAUTQ==",
@ -54122,6 +54151,19 @@
"version": "0.3.20-alpha.2",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.20-alpha.2.tgz",
"integrity": "sha512-U3eIpvFPomt9Iv7UXCav7yP9jA/GhQWJ5T1OQx6y3excdL32hOXdbODvb2Fs/B/41Xm33VDtOnwxop/2L793fg==",
=======
"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.19"
}
},
"@remixproject/plugin-utils": {
"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==",
>>>>>>> 02d978945 (icons)
"requires": {
"tslib": "2.0.1"
},
@ -54134,6 +54176,7 @@
}
},
"@remixproject/plugin-webview": {
<<<<<<< HEAD
"version": "0.3.20-alpha.2",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.20-alpha.2.tgz",
"integrity": "sha512-FgkyPtRvFBuFF7zfrIPGGnVa/sjfl8Xjf0vK6ZEGi0EHbgRBk2OloViU+nBWrgezKlvQBIsxM/7iUODmXjFd7g==",
@ -54141,10 +54184,20 @@
"@remixproject/plugin": "0.3.20-alpha.2",
"@remixproject/plugin-api": "0.3.20-alpha.2",
"@remixproject/plugin-utils": "0.3.20-alpha.2",
=======
"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.19",
"@remixproject/plugin-api": "0.3.19",
"@remixproject/plugin-utils": "0.3.19",
>>>>>>> 02d978945 (icons)
"axios": "^0.21.1"
}
},
"@remixproject/plugin-ws": {
<<<<<<< HEAD
"version": "0.3.20-alpha.2",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.20-alpha.2.tgz",
"integrity": "sha512-00K0tunbYy9DfskgwgUFL3ncZ0aT577gYk/7wOD6iPYnahpAKGzj+rO/FydWXlvQ7Rdw/j9QeuPGFs84mwxD+g==",
@ -54152,6 +54205,15 @@
"@remixproject/plugin": "0.3.20-alpha.2",
"@remixproject/plugin-api": "0.3.20-alpha.2",
"@remixproject/plugin-utils": "0.3.20-alpha.2"
=======
"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.19",
"@remixproject/plugin-api": "0.3.19",
"@remixproject/plugin-utils": "0.3.19"
>>>>>>> 02d978945 (icons)
}
},
"@restart/context": {
@ -54960,8 +55022,12 @@
"@types/yargs-parser": {
"version": "15.0.0",
"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
<<<<<<< HEAD
"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
"dev": true
=======
"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="
>>>>>>> 02d978945 (icons)
},
"@typescript-eslint/eslint-plugin": {
"version": "3.6.1",

1
package.json
Unescape View File

@ -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",

4
replacemodules.sh
Unescape View File

@ -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/
Write Preview
Loading…
Cancel
Save