From 8d312787c65e83f61c64b2c7b42ebd0b28360021 Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky <31819+loleg@users.noreply.github.com> Date: Fri, 22 Dec 2023 18:05:52 +0100 Subject: [PATCH] Merge Preprod for release 1.5 (#451) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Yarn update * Deployment doc update * Better enc key generation * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress * Quickstart docs * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * Cleaned up CircleCI, added version release * Yarn upgrade * Go update #316 * Go modules * Removed demo and staging from workflow * yarn lock conflicts resolve * Updated Go mods, downgrading x/exp due to go-ethereum/issues/27894 * Go fix, Yarn upgrade * Revert to Debian Slim in Dockerfile * Update Go modules (#323) * Yarn update * Deployment doc update * Better enc key generation * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress * Quickstart docs * Sepolia support merge preprod to main (#309) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky <31819+loleg@users.noreply.github.com> Co-authored-by: Oleg Lavrovsky * Docker setup for local builds (#314) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * Local Docker build support --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: Tatiana Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky * Cleaned up CircleCI, added version release * Yarn upgrade * Go update #316 * Go modules * Removed demo and staging from workflow * Bump word-wrap from 1.2.3 to 1.2.4 in /ui (#321) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump semver from 5.7.1 to 5.7.2 in /test/e2e (#320) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump semver from 5.7.1 to 5.7.2 in /ui (#319) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Preprod merge to main (#317) * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * yarn lock conflicts resolve --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: Tatiana Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky * Preprod merge to main (#322) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * yarn lock conflicts resolve --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky <31819+loleg@users.noreply.github.com> Co-authored-by: Oleg Lavrovsky * Updated Go mods, downgrading x/exp due to go-ethereum/issues/27894 * Go fix, Yarn upgrade * Revert to Debian Slim in Dockerfile --------- Signed-off-by: dependabot[bot] Co-authored-by: Oleg Lavrovsky Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Create dependabot.yml (#324) * Yarn update * Deployment doc update * Better enc key generation * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress * Quickstart docs * Cleaned up CircleCI, added version release * Yarn upgrade * Go update #316 * Go modules * Removed demo and staging from workflow * Create dependabot.yml * Update dependabot.yml * Preprod to Main (#325) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * yarn lock conflicts resolve * Update Go modules (#323) * Yarn update * Deployment doc update * Better enc key generation * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress * Quickstart docs * Sepolia support merge preprod to main (#309) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky <31819+loleg@users.noreply.github.com> Co-authored-by: Oleg Lavrovsky * Docker setup for local builds (#314) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * Local Docker build support --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: Tatiana Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky * Cleaned up CircleCI, added version release * Yarn upgrade * Go update #316 * Go modules * Removed demo and staging from workflow * Bump word-wrap from 1.2.3 to 1.2.4 in /ui (#321) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump semver from 5.7.1 to 5.7.2 in /test/e2e (#320) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump semver from 5.7.1 to 5.7.2 in /ui (#319) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Preprod merge to main (#317) * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * yarn lock conflicts resolve --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: Tatiana Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky * Preprod merge to main (#322) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * add more static js to Cache-Control * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * add configuration for polygon and update addresses * update configs atrribute for polygon * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * Documentation changes, Yarn update (#303) * Yarn update * Deployment doc update * Better enc key generation * Preprod (#302) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> * Fix preview document bug (#295) * add more static js to Cache-Control fixes #292 [add more static js to Cache-Control] --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin * The Watchtower service will never be used (#296) * fix open prevuew * Update docker-compose-cloud.override.yml --------- Co-authored-by: Tatiana Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin * Add polygon configs (#301) * Update README.md * add console logs on default accounts setup and on sign request * add more static js to Cache-Control * fix open prevuew * Update docker-compose-cloud.override.yml * Update docker-compose-cloud.override.yml * add configuration for polygon and update addresses * update configs atrribute for polygon --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana * Go 1.18 in CircleCI * Go 1.18 * Go update * Go update * Vue-cli pinned to 4.x * CircleCI builder * Add go-bindata install * Add gopath to CircleCI * CircleCI config, go install * Go update, go-ethereum Azimir * Go 1.20 * make fmt * Go-bindata again * README * Image based test-ui * Sync nodejs ver in test-ui * Add libxtst6 library for Cypress * Add full deps for Cypress --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: Oleg Lavrovsky * update support for sopelia network in the code and docs * update go mod * Light script for Docker * Network usage notes * Go modules updated * Feature/fix web3 method from ascii (#312) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update from ascii call in web3 (#313) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * Update CircleCI build config * yarn lock conflicts resolve --------- Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky <31819+loleg@users.noreply.github.com> Co-authored-by: Oleg Lavrovsky * Updated Go mods, downgrading x/exp due to go-ethereum/issues/27894 * Go fix, Yarn upgrade * Revert to Debian Slim in Dockerfile --------- Signed-off-by: dependabot[bot] Co-authored-by: Oleg Lavrovsky Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: epadalkin Co-authored-by: Tatiana Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: Tatiana Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Website content in docs * Website content --------- Signed-off-by: dependabot[bot] Co-authored-by: Oleg Lavrovsky Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: Tatiana Co-authored-by: epadalkin Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Database command * Added Handbook * Contributing and about * Handbook * Improve getting started for users (#340) * handbook link The handbook button displayed after the registration phase of the application and the link in the help/support section of the application have been updated. * architecture created and related images moved to this folder * nodes folder nodes folder created and related images moved to this folder * handbook images images renamed * Update handbook.md * hamdbook img moved to media folder There are some photos that I couldn't categorize, we can categorize them later if needed. * Img file location fixed * sidebar made more accessible * about and sidebar * Footer added Mail, address and github * Fixes from s-pro (#349) * fix radio and checkbox inputs for document builder flow * fix unnecessary requests for user data on frontend * fix login with metamask * add validation for the user session cookie * fix wrong formatting * Package updates * Refreshing the Docker Compose set up * Update quickstart.md (#365) Encryption secret key added * Fixed lint errors * Add extra to Makefile in tests * Oops mis-copied HTML code in SignatureRequest * Move forex-rates to cnode.override, Docs wording * Order of chapters in Handbook (#387) * Docker build local * Preprod merge to main (#353) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request * Update dependabot.yml * Revised Handbook, added Formulas * Added SECURITY doc * Updated notice as per docs * Handbook on first login #311 --------- Co-authored-by: Oleg Lavrovsky Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> * Bump sass from 1.68.0 to 1.69.4 in /ui (#390) Bumps [sass](https://github.com/sass/dart-sass) from 1.68.0 to 1.69.4. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.68.0...1.69.4) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump eslint-plugin-standard from 4.1.0 to 5.0.0 in /ui (#391) Bumps [eslint-plugin-standard](https://github.com/standard/eslint-plugin-standard) from 4.1.0 to 5.0.0. - [Commits](https://github.com/standard/eslint-plugin-standard/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: eslint-plugin-standard dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump async from 2.6.4 to 3.2.4 in /ui (#394) Bumps [async](https://github.com/caolan/async) from 2.6.4 to 3.2.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.4...v3.2.4) --- updated-dependencies: - dependency-name: async dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Installation guide (#396) * Docker build local * Preprod merge to main (#353) * Update README.md * Alternative chains support (#281) * add new smart contract addresses on goerli and mumbai networks, update settings * fix dependencies * update circle checks go version * update readme with chains list * test negative scenario * return goerli cobfig * remove console metamask error (#286) should fix #285 * Update README.md * add console logs on default accounts setup and on sign request * Test autodeploy flow (#290) * Update README.md * add console logs on default accounts setup and on sign request * Update dependabot.yml * Revised Handbook, added Formulas * Added SECURITY doc * Updated notice as per docs * Handbook on first login #311 * Update dependabot.yml (#378) * Update dependabot.yml * Update dependabot.yml * Installation docs --------- Co-authored-by: Oleg Lavrovsky Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> * Bump @vue/eslint-config-standard from 4.0.0 to 5.1.2 in /ui (#400) Bumps [@vue/eslint-config-standard](https://github.com/vuejs/eslint-config-standard/tree/HEAD/packages/eslint-config-standard) from 4.0.0 to 5.1.2. - [Release notes](https://github.com/vuejs/eslint-config-standard/releases) - [Changelog](https://github.com/vuejs/eslint-config-standard/blob/main/packages/eslint-config-standard/CHANGELOG.md) - [Commits](https://github.com/vuejs/eslint-config-standard/commits/v5.1.2/packages/eslint-config-standard) --- updated-dependencies: - dependency-name: "@vue/eslint-config-standard" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump tippy.js from 2.6.0 to 6.3.7 in /ui (#399) Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 2.6.0 to 6.3.7. - [Release notes](https://github.com/atomiks/tippyjs/releases) - [Commits](https://github.com/atomiks/tippyjs/compare/v2.6.0...v6.3.7) --- updated-dependencies: - dependency-name: tippy.js dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ethereumjs-util from 5.2.1 to 7.1.5 in /ui (#398) Bumps [ethereumjs-util](https://github.com/ethereumjs/ethereumjs-monorepo) from 5.2.1 to 7.1.5. - [Release notes](https://github.com/ethereumjs/ethereumjs-monorepo/releases) - [Commits](https://github.com/ethereumjs/ethereumjs-monorepo/compare/@ethereumjs/blockchain@5.2.1...ethereumjs-util@7.1.5) --- updated-dependencies: - dependency-name: ethereumjs-util dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump eslint-plugin-vue from 9.17.0 to 9.18.1 in /ui (#408) Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.17.0 to 9.18.1. - [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases) - [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v9.17.0...v9.18.1) --- updated-dependencies: - dependency-name: eslint-plugin-vue dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sass from 1.69.4 to 1.69.5 in /ui (#407) Bumps [sass](https://github.com/sass/dart-sass) from 1.69.4 to 1.69.5. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.69.4...1.69.5) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Server-side Verification of documents (#412) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * remove outdated methods of old smart contract * add public urls in case user doesnt have metamask * fix js frontend typos * use public url only if user doesnt have metamask installed * use public url only if user doesnt have metamask installed * add wrong metamask network selected issue handler * fix user validation network screen * remove unnecessary html code from VerificationFileEntry component --------- Co-authored-by: slavas490 * fix invalid character, updates in BN lib (#413) * fix invalid character, updates in BN lib * Bump @cypress/webpack-preprocessor from 3.0.1 to 4.1.5 in /ui (#417) Bumps [@cypress/webpack-preprocessor](https://github.com/cypress-io/cypress) from 3.0.1 to 4.1.5. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/commits) --- updated-dependencies: - dependency-name: "@cypress/webpack-preprocessor" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Go library updates (#427) * Bump async from 3.2.4 to 3.2.5 in /ui (#415) Bumps [async](https://github.com/caolan/async) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v3.2.4...v3.2.5) --- updated-dependencies: - dependency-name: async dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump vue-cropperjs from 3.0.0 to 4.2.0 in /ui (#416) Bumps [vue-cropperjs](https://github.com/Agontuk/vue-cropperjs) from 3.0.0 to 4.2.0. - [Changelog](https://github.com/Agontuk/vue-cropperjs/blob/master/CHANGELOG.md) - [Commits](https://github.com/Agontuk/vue-cropperjs/compare/v3.0.0...v4.2.0) --- updated-dependencies: - dependency-name: vue-cropperjs dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump core-js from 3.32.2 to 3.33.3 in /ui (#431) Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.2 to 3.33.3. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.33.3/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump vue-tour from 1.6.0 to 2.0.0 in /ui (#430) Bumps [vue-tour](https://github.com/pulsardev/vue-tour) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/pulsardev/vue-tour/releases) - [Changelog](https://github.com/pulsardev/vue-tour/blob/master/CHANGELOG.md) - [Commits](https://github.com/pulsardev/vue-tour/compare/v1.6.0...v2.0.0) --- updated-dependencies: - dependency-name: vue-tour dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Droplet support updates (#434) * fix web3.fromAscii to web3.utils.asciiToHex method in document floe * replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3 * remove outdated methods of old smart contract * add public urls in case user doesnt have metamask * fix js frontend typos * use public url only if user doesnt have metamask installed * use public url only if user doesnt have metamask installed * add wrong metamask network selected issue handler * fix user validation network screen * remove unnecessary html code from VerificationFileEntry component * fix invalid character, updates in BN lib * fix invalid character, updates in BN lib * fix invalid character, updates in BN lib, revert to string and numbers format * remove delete buttons for form inputs * remove skipValidateFor date entry * fix frontend error message for file not found * update digitalocean deployment script --------- Co-authored-by: slavas490 * Bump eslint-plugin-import from 2.28.1 to 2.29.0 in /ui (#437) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.1 to 2.29.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.1...v2.29.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang.org/x/net from 0.18.0 to 0.19.0 (#442) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.18.0 to 0.19.0. - [Commits](https://github.com/golang/net/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump go.mongodb.org/mongo-driver from 1.13.0 to 1.13.1 (#444) Bumps [go.mongodb.org/mongo-driver](https://github.com/mongodb/mongo-go-driver) from 1.13.0 to 1.13.1. - [Release notes](https://github.com/mongodb/mongo-go-driver/releases) - [Commits](https://github.com/mongodb/mongo-go-driver/compare/v1.13.0...v1.13.1) --- updated-dependencies: - dependency-name: go.mongodb.org/mongo-driver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump interactjs from 1.2.9 to 1.10.26 in /ui (#445) Bumps [interactjs](https://github.com/taye/interact.js) from 1.2.9 to 1.10.26. - [Changelog](https://github.com/taye/interact.js/blob/main/CHANGELOG.md) - [Commits](https://github.com/taye/interact.js/compare/v1.2.9...v1.10.26) --- updated-dependencies: - dependency-name: interactjs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump vue-multiselect from 2.1.7 to 2.1.8 in /ui (#448) Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.7 to 2.1.8. - [Release notes](https://github.com/shentao/vue-multiselect/releases) - [Commits](https://github.com/shentao/vue-multiselect/compare/v2.1.7...v2.1.8) --- updated-dependencies: - dependency-name: vue-multiselect dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump core-js from 3.33.3 to 3.34.0 in /ui (#446) Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.33.3 to 3.34.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.34.0/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump axios from 0.21.4 to 1.6.2 in /ui (#449) Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.4...v1.6.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump js-sha3 from 0.7.0 to 0.9.3 in /ui (#447) Bumps [js-sha3](https://github.com/emn178/js-sha3) from 0.7.0 to 0.9.3. - [Changelog](https://github.com/emn178/js-sha3/blob/master/CHANGELOG.md) - [Commits](https://github.com/emn178/js-sha3/compare/v0.7.0...v0.9.3) --- updated-dependencies: - dependency-name: js-sha3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump to Go 1.21 --------- Signed-off-by: dependabot[bot] Co-authored-by: s-pro <33251086+sprotest@users.noreply.github.com> Co-authored-by: Afonina Tatiana <99973342+tafonina@users.noreply.github.com> Co-authored-by: Tatiana Co-authored-by: epadalkin Co-authored-by: Oleg Lavrovsky Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ibrahim-Halil-Kuray <71791007+Ibrahim-Halil-Kuray@users.noreply.github.com> Co-authored-by: Viacheslav Okhmak --- Makefile | 9 +- deploy/digitalocean/README.md | 27 +- deploy/digitalocean/deploy.sh | 12 +- go.mod | 4 +- go.sum | 8 +- ui/core/package.json | 18 +- ui/core/src/libs/legacy/formbuilder.js | 1256 +++++++------ ui/wallet/package.json | 12 +- .../src/ProxeusEthereum/WalletInterface.js | 88 +- ui/yarn.lock | 1664 +++++++++-------- 10 files changed, 1678 insertions(+), 1420 deletions(-) diff --git a/Makefile b/Makefile index 0ded508ba..2dcfa58fc 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ SHELL:= /bin/bash DEBUG_FLAG?=false -GO_VERSION=1.20 +GO_VERSION=1.21 ifeq ($(DEBUG), "true") BINDATA_OPTS="-debug" endif ifdef BUILD_ID - GO_OPTS=-ldflags="-X main.ServerVersion=build-$(BUILD_ID)" + GO_OPTS=-ldflags="-X main.ServerVersion=build-$(BUILD_ID)" endif # Load dotenv configuration @@ -15,6 +15,11 @@ ifneq (,$(wildcard ./.env)) include .env export endif +ifndef $(PROXEUS_SPARKPOST_API_KEY) + PROXEUS_SPARKPOST_API_KEY=0 + PROXEUS_INFURA_API_KEY=0 + PROXEUS_BLOCKCHAIN_CONTRACT_ADDRESS=0x +endif # Default proxeus environment export PROXEUS_TEST_MODE?=false diff --git a/deploy/digitalocean/README.md b/deploy/digitalocean/README.md index 8d1f7f81f..31c7088bb 100644 --- a/deploy/digitalocean/README.md +++ b/deploy/digitalocean/README.md @@ -9,15 +9,28 @@ This script is maintained for the community by Proxeus Association ## Instructions -1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration -2. You will need to have your API keys for Infura and Sparkpost handy - see the root README for further details. -3. add executive permission for deploy.sh ( chmod +x deploy.sh ) -4. run $PWD/proxeus-core/deploy/digitalocean/deploy.sh -5. It takes a few minutes for the server to boot and install, then you should be able to open `http://:1323/init` -6. A configuration screen will be shown where you can set up an admin account and check settings. +1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration. [Here](https://docs.digitalocean.com/products/droplets/getting-started/recommended-droplet-setup) you can find some help how to set up a production-ready droplet. +2. Make sure your API keys for Infura and Sparkpost. +3. Get the deployment script and make it executable: +```bash +wget https://raw.githubusercontent.com/ProxeusApp/proxeus-core/main/deploy/digitalocean/deploy.sh && chmod +x deploy.sh +``` +4. Enter all the necessary variables, where **FQDN** - domain name for the future server, **INFURA** - your Infura API key, **SPARKPOST** - your SparkPost API key, **ADMINEMAIL** - admin email (in format like admin@proxeus.org). It can be done by editing the script file directly or by shell "export" command: +```bash +export FQDN=[value] +export INFURA=[value] +export SPARKPOST=[value] +export ADMINEMAIL=[value] +``` +5. Run deployment process (go through it carefully, it may ask you any additional confirmation): +```bash +./deploy.sh +``` +7. It takes a few minutes for the server to boot and install, then you should be able to open `http://:1323/init` +8. A configuration screen will be shown where you can set up an admin account and check settings. Once your server is running, visit the [User Handbook](https://doc.proxeus.org/#/handbook) to get started. To view the logs connect to your droplet using an SSH client program. Then paste this into the console to see the logs being updated in real time: -`cd /srv/proxeus && docker-compose logs -f` +`cd /srv/proxeus && docker-compose logs -f` \ No newline at end of file diff --git a/deploy/digitalocean/deploy.sh b/deploy/digitalocean/deploy.sh index b9c458831..b1161b03f 100644 --- a/deploy/digitalocean/deploy.sh +++ b/deploy/digitalocean/deploy.sh @@ -1,12 +1,18 @@ #!/bin/bash -#specify values for local variables +# Specify values for local variables #FQDN= #INFURA= #SPARKPOST= #ADMINEMAIL= +## Performing the installation +exec 1> >(tee -a "/var/log/stackscript.log") 2>&1 +function log { + echo "### $1 -- `date '+%D %T'`" +} + log "Configuring System Updates" apt-get -o Acquire::ForceIPv4=true update -y DEBIAN_FRONTEND=noninteractive apt-get -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" install grub-pc @@ -109,11 +115,11 @@ cd /srv/proxeus # make init server-docker log "Starting cloud deployment via docker-compose" -docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d & +docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d >/dev/null 2>&1 # Open http://$FQDN:1323/init to configure your server log "After a minute, open: http://$FQDN:1323/init" ## ---------------------------------------------- -echo "Installation complete!" +echo "Installation complete!" \ No newline at end of file diff --git a/go.mod b/go.mod index 0614d7c21..c3629aee2 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 // indirect go.etcd.io/bbolt v1.3.8 // indirect golang.org/x/crypto v0.17.0 - golang.org/x/net v0.18.0 + golang.org/x/net v0.19.0 gopkg.in/gavv/httpexpect.v2 v2.16.0 ) @@ -59,7 +59,7 @@ require ( google.golang.org/protobuf v1.31.0 // indirect ) -require go.mongodb.org/mongo-driver v1.13.0 +require go.mongodb.org/mongo-driver v1.13.1 require ( github.com/Microsoft/go-winio v0.6.1 // indirect diff --git a/go.sum b/go.sum index ca0c11458..a0821ff7c 100644 --- a/go.sum +++ b/go.sum @@ -295,8 +295,8 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/bbolt v1.3.0/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.mongodb.org/mongo-driver v1.13.0 h1:67DgFFjYOCMWdtTEmKFpV3ffWlFnh+CYZ8ZS/tXWUfY= -go.mongodb.org/mongo-driver v1.13.0/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ= +go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= +go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -324,8 +324,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/ui/core/package.json b/ui/core/package.json index 21d617a6e..277724d56 100644 --- a/ui/core/package.json +++ b/ui/core/package.json @@ -17,14 +17,14 @@ "@mdi/font": "^2.6.95", "@proxeus/wallet": "1.0.0", "ajv": "^6.5.2", - "async": "^3.2.4", - "axios": "^0.21.1", + "async": "^3.2.5", + "axios": "^1.6.2", "babel-runtime": "^6.26.0", "bootstrap": "^4.1.2", "bootstrap-vue": "2.0.0-rc.12", "brace": "^0.11.1", "codemirror": "^5.39.2", - "core-js": "^3.19.3", + "core-js": "^3.34.0", "ethereumjs-util": "^7.1.5", "flatpickr": "^4.5.1", "font-awesome": "^4.7.0", @@ -32,10 +32,10 @@ "he": "^1.2.0", "html-svg-connect": "^2.0.0", "human-standard-token-abi": "^2.0.0", - "interactjs": "1.2.9", + "interactjs": "1.10.26", "jquery": "^3.5.0", "jquery-ui": "^1.13.2", - "js-sha3": "^0.7.0", + "js-sha3": "^0.9.3", "moment": "^2.29.4", "popper.js": "^1.14.4", "sass": "^1.69.5", @@ -52,14 +52,14 @@ "vue-clipboard2": "^0.2.1", "vue-codemirror": "^4.0.5", "vue-cookie": "^1.1.4", - "vue-cropperjs": "^3.0.0", + "vue-cropperjs": "^4.2.0", "vue-draggable": "^2.0.6", "vue-dynamic": "0.2.1", "vue-error-page": "^1.1.5", "vue-flatpickr-component": "^7.0.2", "vue-headful": "^2.0.1", "vue-moment": "^4.0.0", - "vue-multiselect": "^2.1.0", + "vue-multiselect": "^2.1.8", "vue-notification": "^1.3.12", "vue-password-strength-meter": "^1.3.2", "vue-pdf": "^4.3.0", @@ -68,7 +68,7 @@ "vue-router": "^3.0.1", "vue-scrollto": "^2.11.0", "vue-select": "^2.4.0", - "vue-tour": "^1.0.1", + "vue-tour": "^2.0.0", "vuedraggable": "^2.16.0", "vuep": "^0.8.1", "vuex": "^3.0.1", @@ -88,7 +88,7 @@ "babel-eslint": "^10.1.0", "check-node-version": "^3.2.0", "eslint": "^6.8.0", - "eslint-plugin-import": "^2.20.2", + "eslint-plugin-import": "^2.29.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^5.0.0", diff --git a/ui/core/src/libs/legacy/formbuilder.js b/ui/core/src/libs/legacy/formbuilder.js index 147ce8341..994e918a7 100644 --- a/ui/core/src/libs/legacy/formbuilder.js +++ b/ui/core/src/libs/legacy/formbuilder.js @@ -29,20 +29,17 @@ var FT_FormBuilder = function (jqEl, options) { }) options = $.extend({ file: { - requestTypes: function (callback) { - } + requestTypes: function (callback) {} }, component: { - requestComp: function (id, callback) { - }, - searchComp: function (text, callback) { - }, - storeComp: function (comp, callback) { - }, - deleteComp: function (id, callback) { - } + requestComp: function (id, callback) {}, + searchComp: function (text, callback) {}, + storeComp: function (comp, callback) {}, + deleteComp: function (id, callback) {} + }, + componentsTab: { + components: {} }, - componentsTab: { components: {} }, vars: [] }, options) this.fbid = this.randomId() @@ -137,16 +134,21 @@ var FT_FormBuilder = function (jqEl, options) { if (e.keyCode == fb.ctrlKey || e.keyCode == fb.cmdKey){} });**/ } - this.adjustHeight = function (t, scrollOffset) { - } + this.adjustHeight = function (t, scrollOffset) {} this.calcContainerHeight = function (t, force) { if (t.el.is(':visible')) { if (force || !t.containerHeightWithoutInnerBody) { if (!t.innerBody || !t.innerBody.length) { t.innerBody = t.el.find('.fb-inner-body') - t.innerBody.css({ 'height': '0', 'min-height': '0' }) + t.innerBody.css({ + 'height': '0', + 'min-height': '0' + }) t.containerHeightWithoutInnerBody = t.el.children('.panel').outerHeight(true) - t.innerBody.css({ 'height': '', 'min-height': '' }) + t.innerBody.css({ + 'height': '', + 'min-height': '' + }) } this.adjustHeight(t, 0) } @@ -310,17 +312,35 @@ var FT_Workspace = function (fb, jqEl, comps) { workspaceTab.selectComponent(null, $trigger) if ($trigger.hasClass('fbc-grp-parent')) { items = { - 'paste': { name: 'Paste', icon: 'paste' }, - 'delete': { name: 'Delete', icon: 'delete' } + 'paste': { + name: 'Paste', + icon: 'paste' + }, + 'delete': { + name: 'Delete', + icon: 'delete' + } } } else { items = { - 'copy': { name: 'Copy', icon: 'copy' }, - 'paste': { name: 'Paste', icon: 'paste' }, - 'delete': { name: 'Delete', icon: 'delete' } + 'copy': { + name: 'Copy', + icon: 'copy' + }, + 'paste': { + name: 'Paste', + icon: 'paste' + }, + 'delete': { + name: 'Delete', + icon: 'delete' + } } if (workspaceTab.fb.options.userAllowedToEditComponents) { - items.copyToComp = { name: 'Copy to Components', icon: 'copy' } + items.copyToComp = { + name: 'Copy to Components', + icon: 'copy' + } } } if (!localStorage.getItem('ws-clipboard')) { @@ -403,7 +423,8 @@ var FT_Workspace = function (fb, jqEl, comps) { } } this.updateMetaData = function (compSettings, metaData, updateOrderOfAll) { - var c = this.fb.compiler; var compMain + var c = this.fb.compiler; + var compMain if (compSettings && metaData) { compMain = c.getCompMainObject(compSettings) if (metaData.compId) { @@ -414,11 +435,14 @@ var FT_Workspace = function (fb, jqEl, comps) { } } if (updateOrderOfAll) { - var ws = this; var $fbComp + var ws = this; + var $fbComp c.compsLoop(this.components, function (compId, comp) { compMain = c.getCompMainObject(comp) $fbComp = ws.getActiveBody().find('#' + compId) - ws.updateMetaData(ws.components[compId], { order: $fbComp.index() }, null) + ws.updateMetaData(ws.components[compId], { + order: $fbComp.index() + }, null) return true }) } @@ -436,33 +460,31 @@ var FT_Workspace = function (fb, jqEl, comps) { } if (jsonSettings && this.fb.compiler.sizeOf(jsonSettings) > 0) { // workspace.reInitDragAndDropEvent() - this.recompileWorkspace(htmlStr, jsonSettings - , function (compId) { - return workspace.fb.componentsTab.getComponentById(compId) - }, function (compiled) { - // workspace.compiledWorkspaceData = compiled; - workspace.fb.htmlRenderer(compiled, jsonSettings, function (renderedWorkspaceData) { - var $renderedWorkspace = $(renderedWorkspaceData) - workspace.beforeInserting($renderedWorkspace) - workspace.body.html($renderedWorkspace) - workspace.form = workspace.body.children('form:first') - workspace.form.addClass('fbc-dz fws-main') - workspace.fb.settingsTab.clearBody() - workspace.checkFormChilds() - workspace.form.find('.fb-component').each(function () { - this.addEventListener('click', function (e) { - return workspace.selectComponent(e, $(this)) - }, false) - }) - - setTimeout(function () { - workspace.setStuffWeDontNeedToStore(workspace.form) - }, 600) - workspace.reInitDragAndDropEvent() - workspace.afterInserting(workspace.body) + this.recompileWorkspace(htmlStr, jsonSettings, function (compId) { + return workspace.fb.componentsTab.getComponentById(compId) + }, function (compiled) { + // workspace.compiledWorkspaceData = compiled; + workspace.fb.htmlRenderer(compiled, jsonSettings, function (renderedWorkspaceData) { + var $renderedWorkspace = $(renderedWorkspaceData) + workspace.beforeInserting($renderedWorkspace) + workspace.body.html($renderedWorkspace) + workspace.form = workspace.body.children('form:first') + workspace.form.addClass('fbc-dz fws-main') + workspace.fb.settingsTab.clearBody() + workspace.checkFormChilds() + workspace.form.find('.fb-component').each(function () { + this.addEventListener('click', function (e) { + return workspace.selectComponent(e, $(this)) + }, false) }) - } - ) + + setTimeout(function () { + workspace.setStuffWeDontNeedToStore(workspace.form) + }, 600) + workspace.reInitDragAndDropEvent() + workspace.afterInserting(workspace.body) + }) + }) } else { this.renderNew() } @@ -635,7 +657,8 @@ var FT_Workspace = function (fb, jqEl, comps) { } var $eles, i $eles = $fbComp.find('.fb-drop-here') - var $fbDropHere; var hasDrops = false + var $fbDropHere; + var hasDrops = false for (i = 0; i < $eles.length; ++i) { $fbDropHere = $($eles[i]) var $compChildsHolder = $fbDropHere.parent() @@ -885,7 +908,10 @@ var FT_Workspace = function (fb, jqEl, comps) { handlePercentX: 0, handlePercentY: 0 }, - mousePos: { x: 0, y: 0 }, + mousePos: { + x: 0, + y: 0 + }, _setDim: function ($t, startPos) { this.dim.mt = parseFloat($t.css('marginTop')) this.dim.ml = parseFloat($t.css('marginLeft')) @@ -902,8 +928,15 @@ var FT_Workspace = function (fb, jqEl, comps) { this.dim.handleX = this.dim.handlePercentX * this.dim.w / 100 this.dim.handleY = this.dim.handlePercentY * this.dim.h / 100 }, - tl: { x: 0, y: 0 }, - dragCompPosition: { scrollOffsetY: 0, top: 0, left: 0 }, + tl: { + x: 0, + y: 0 + }, + dragCompPosition: { + scrollOffsetY: 0, + top: 0, + left: 0 + }, _updateOrgPos: function (target) { if (!target) { target = this.$dragComp @@ -1182,7 +1215,9 @@ var FT_Workspace = function (fb, jqEl, comps) { this.updateDfsId = function (oldId, newId) { var visibleFbComp = this.body.find(".fb-component[data-dfsId='" + oldId + "']") visibleFbComp.attr('data-dfsId', newId) - this.updateMetaData(this.components[visibleFbComp.attr('id')], { compId: newId }) + this.updateMetaData(this.components[visibleFbComp.attr('id')], { + compId: newId + }) } this.componentChanged = function (dfsId, component) { var _ = this @@ -1196,7 +1231,9 @@ var FT_Workspace = function (fb, jqEl, comps) { } this.updateComponentWithSettingsMerge = function (workspaceCompEl, dfsId, component) { var compId = workspaceCompEl.attr('id') - this.fb.settingsTab.currentCompId({ release: true })// to ensure the settings on the ui are created fresh + this.fb.settingsTab.currentCompId({ + release: true + }) // to ensure the settings on the ui are created fresh var newSettings = this.fb.deepCopySettings(component.settings, this.components[compId]) this.body.find('.fb-component.selected').removeClass('selected') this.updateComponent(compId, newSettings) @@ -1268,7 +1305,8 @@ var FT_Workspace = function (fb, jqEl, comps) { } } this.addComponent = function (jqEl, isNew, index) { - var compId = jqEl.attr('id'); var dfsId = jqEl.attr('data-dfsId') + var compId = jqEl.attr('id'); + var dfsId = jqEl.attr('data-dfsId') var p = jqEl.nextParentWithClass('fbc-grp') if (p && p.length) { jqEl.data('lastFbcGrpIndex', p.attr('data-index')) @@ -1277,7 +1315,10 @@ var FT_Workspace = function (fb, jqEl, comps) { index = jqEl.index() } if (!isNew && compId && compId.length > 5) { - this.updateMetaData(this.components[compId], { compId: dfsId, order: index }, true) + this.updateMetaData(this.components[compId], { + compId: dfsId, + order: index + }, true) return } if (!compId || compId.length < 5) { @@ -1300,7 +1341,10 @@ var FT_Workspace = function (fb, jqEl, comps) { }, false) }) - this.updateMetaData(this.components[compId], { compId: dfsId, order: index }, true) + this.updateMetaData(this.components[compId], { + compId: dfsId, + order: index + }, true) this.beforeInserting(jqEl, this.form) this.afterInserting(jqEl, this.form) } @@ -1438,7 +1482,10 @@ var FT_Workspace = function (fb, jqEl, comps) { var dfsId = compMain['_compId'] var template = this.fb.componentsTab.getTemplateById(dfsId) if (dfsId && template) { - var component = { template: template, settings: pastedCompJson } + var component = { + template: template, + settings: pastedCompJson + } var _ = this success = true this.fb.componentsTab.componentTojqElement(dfsId, component, function (newJqEl) { @@ -1469,7 +1516,9 @@ var FT_Workspace = function (fb, jqEl, comps) { return _.selectComponent(e, $(this)) }, false) }) - _.updateMetaData(pastedCompJson, { compId: dfsId }, true) + _.updateMetaData(pastedCompJson, { + compId: dfsId + }, true) _.afterInserting(newJqEl, _.form) _.actionManager.mayShow(_.body) }) @@ -1622,12 +1671,12 @@ var FT_Workspace = function (fb, jqEl, comps) { var t = $(this) var id = t.attr('data-dfsid') var c = '.hcbuild-main .fb-workspace .fb-component[data-dfsid="' + id + '"] {' + - 'border-right: 2px solid ' + _.getRandomColor(id) + ';' + - '}' + 'border-right: 2px solid ' + _.getRandomColor(id) + ';' + + '}' _.addLocalCss(c) c = '.hcbuild-main .htmlComponents .fb-component[data-dfsid="' + id + '"]{' + - 'border-left: 2px solid ' + _.getRandomColor(id) + ';' + - '}' + 'border-left: 2px solid ' + _.getRandomColor(id) + ';' + + '}' _.addLocalCss(c) var startId t = t.findVisibleInputOrRefElement() @@ -1741,16 +1790,16 @@ var FT_Workspace = function (fb, jqEl, comps) { if (!this.localCssEl) { var c = '' c = '.hcbuild-main .fb-workspace .fb-component {' + - 'border-right: 2px solid #c3c3c3;' + - '}' + 'border-right: 2px solid #c3c3c3;' + + '}' this.localCssMap[c] = 1 c = '.hcbuild-main .htmlComponents .fb-component {' + - 'border-left: 2px solid #c3c3c3;' + - '}' + 'border-left: 2px solid #c3c3c3;' + + '}' this.localCssMap[c] = 1 c = '.hcbuild-main .am-endpoint-main>i {' + - 'border-right: none !important;' + - '}' + 'border-right: none !important;' + + '}' this.localCssMap[c] = 1 this.localCssEl = $('') this.fb.el.append(this.localCssEl) @@ -1758,7 +1807,8 @@ var FT_Workspace = function (fb, jqEl, comps) { if (css) { this.localCssMap[css] = 1 } - var allCss = ''; var key + var allCss = ''; + var key for (key in this.localCssMap) { if (this.localCssMap.hasOwnProperty(key)) { allCss += key @@ -1805,7 +1855,9 @@ var FT_Workspace = function (fb, jqEl, comps) { _colorAlreadySet: {}, getRandomColor: function (id) { if (!this._randomColor[id]) { - var tryCount = 6; var i = 0; var color + var tryCount = 6; + var i = 0; + var color for (; i < tryCount; ++i) { color = this.colorSet[this.fb.randomIntBetween(0, this.colorSet.length - 1)] if (!this._colorAlreadySet[color]) { @@ -1834,7 +1886,7 @@ var FT_Workspace = function (fb, jqEl, comps) { } return this.getRandomLineOffsetForMap[id] } - }// end of connectionManager + } // end of connectionManager /** "action":{ "source":[{"_destComp":"", "_index":"", "regex":"regex"}], @@ -1965,7 +2017,9 @@ var FT_Workspace = function (fb, jqEl, comps) { var srcComp = this.ws.components[data.srcCompId] var srcCompFieldObj = this.ws.fb.compiler.getCompFieldObjectByName(srcComp, data.name) if (!srcCompFieldObj.action) { - srcCompFieldObj.action = { source: [data.source] } + srcCompFieldObj.action = { + source: [data.source] + } } else { if (!$.isArray(srcCompFieldObj.action['source'])) { srcCompFieldObj.action['source'] = [] @@ -1980,10 +2034,16 @@ var FT_Workspace = function (fb, jqEl, comps) { var destComp = this.ws.components[data.source._destCompId] var destCompFieldObj = this.ws.fb.compiler.getCompMainObject(destComp) if (!destCompFieldObj.action) { - destCompFieldObj.action = { 'destination': { 'transition': this.transition } } + destCompFieldObj.action = { + 'destination': { + 'transition': this.transition + } + } } else { if (!destCompFieldObj.action['destination'] || !destCompFieldObj.action['destination']['transition']) { - destCompFieldObj.action['destination'] = { 'transition': this.transition } + destCompFieldObj.action['destination'] = { + 'transition': this.transition + } } } var settignsCompId = this.ws.fb.settingsTab.currentCompId() @@ -2052,7 +2112,8 @@ var FT_Workspace = function (fb, jqEl, comps) { return data.destCounter > 1 }, _drawPointerAndLines: function ($target) { - var _ = this; var key + var _ = this; + var key if ($target.hasClass('fb-component')) { this.update($target.nextAll('.fb-component').addBack()) } else { @@ -2142,8 +2203,7 @@ var FT_Workspace = function (fb, jqEl, comps) { lines.splice(l, 1) } } - } catch (e) { - } + } catch (e) {} $line.remove() } t.remove() @@ -2191,7 +2251,9 @@ var FT_Workspace = function (fb, jqEl, comps) { _index: _index, compId: compId } - var sourceItems; var $endpoint; var psel + var sourceItems; + var $endpoint; + var psel psel = "i[compRef='" + compId + "'][_index='" + _index + "'][_name='" + comp.name + "']" sourceItems = this._getSourceItemsFromComp(comp, _index) var hasSrcConnections = false @@ -2316,7 +2378,10 @@ var FT_Workspace = function (fb, jqEl, comps) { let $t = $(target) if ($t.hasClass('am-endpoint')) { _.$targetEndpoint = $t - _.intrDz.ondragenter({ target: _.$targetEndpoint[0], relatedTarget: _.$dragPointer[0] }) + _.intrDz.ondragenter({ + target: _.$targetEndpoint[0], + relatedTarget: _.$dragPointer[0] + }) } }, _dragleave: function (e) { @@ -2324,19 +2389,25 @@ var FT_Workspace = function (fb, jqEl, comps) { return } if (_.$targetEndpoint) { - _.intrDz.ondragleave({ target: _.$targetEndpoint[0], relatedTarget: _.$dragPointer[0] }) + _.intrDz.ondragleave({ + target: _.$targetEndpoint[0], + relatedTarget: _.$dragPointer[0] + }) _.$targetEndpoint = null } }, _dropcheck: function () { if (_.$targetEndpoint && _.$targetEndpoint.length && _._isInside(_.$targetEndpoint[0].getBoundingClientRect())) { - _.intrDz.ondrop({ target: _.$targetEndpoint[0], relatedTarget: _.$dragPointer[0] }) + _.intrDz.ondrop({ + target: _.$targetEndpoint[0], + relatedTarget: _.$dragPointer[0] + }) } }, - _isInside (r) { + _isInside(r) { return r && this.lastY > r.top && this.lastY < r.bottom && this.lastX > r.left && this.lastX < r.right }, - _enableDropzoneEntpoints (pointer) { + _enableDropzoneEntpoints(pointer) { var _ = this var $endpoints = this.ws.body.find('.fws-main:first') $endpoints = $endpoints.find('.am-endpoint') @@ -2348,10 +2419,13 @@ var FT_Workspace = function (fb, jqEl, comps) { // this.addEventListener("touchmove", _._dragenter, false); this.addEventListener('mouseover', _._dragenter, false) this.addEventListener('mouseout', _._dragleave, false) - _.intrDz.ondropactivate({ target: this, relatedTarget: pointer }) + _.intrDz.ondropactivate({ + target: this, + relatedTarget: pointer + }) }) }, - _disableDropzoneEntpoints (pointer) { + _disableDropzoneEntpoints(pointer) { var _ = this var $endpoints = this.ws.body.find('.fws-main:first') $endpoints = $endpoints.find('.am-endpoint') @@ -2359,7 +2433,10 @@ var FT_Workspace = function (fb, jqEl, comps) { // this.removeEventListener("touchmove", _._dragenter, false); this.removeEventListener('mouseover', _._dragenter, false) this.removeEventListener('mouseout', _._dragleave, false) - _.intrDz.ondropdeactivate({ target: this, relatedTarget: pointer }) + _.intrDz.ondropdeactivate({ + target: this, + relatedTarget: pointer + }) }) }, _initDropzone: function () { @@ -2595,7 +2672,10 @@ var FT_Workspace = function (fb, jqEl, comps) { if (!_._removeIfStartPointerExists($pointer)) { e.target.style.webkitTransform = e.target.style.transform = 'translate(0, 0)' var pos = $pointer.data('src').positionOfUnderlying(_.$pointLayer) - $pointer.css({ top: pos.y + 'px', left: pos.x + 'px' }) + $pointer.css({ + top: pos.y + 'px', + left: pos.x + 'px' + }) $pointer.data('line').attr('visibility', 'hidden') $pointer.data('lastEndpoint', null) } @@ -2632,8 +2712,7 @@ var FT_Workspace = function (fb, jqEl, comps) { lines.splice(l, 1) } } - } catch (e) { - } + } catch (e) {} $line.remove() $pointer.remove() return true @@ -2711,7 +2790,10 @@ var FT_Workspace = function (fb, jqEl, comps) { height: h + 'px', width: w + 'px' }) - $pointer.css({ top: startPos.y + 'px', left: startPos.x + 'px' }) + $pointer.css({ + top: startPos.y + 'px', + left: startPos.x + 'px' + }) $pointer.data('line').attr('visibility', 'hidden') $pointer.data('connected', false) @@ -2781,9 +2863,10 @@ var FT_Workspace = function (fb, jqEl, comps) { } return true } - }// end of actionManager + } // end of actionManager this.sizeOf = function (obj) { - var size = 0; var key + var size = 0; + var key for (key in obj) { if (obj.hasOwnProperty(key)) size++ } @@ -2928,7 +3011,7 @@ var FT_Workspace = function (fb, jqEl, comps) { } this.fb = null this.el = null - this.components = {}/** {"compId":{..settings..}**/ + this.components = {} /** {"compId":{..settings..}**/ this.init(fb, jqEl, comps) } @@ -2975,11 +3058,23 @@ var FT_ComponentsTab = function (fb, jqEl) { } }, items: { - 'edit': { name: 'Edit', icon: 'edit' }, + 'edit': { + name: 'Edit', + icon: 'edit' + }, // "cut": {name: "Cut", icon: "cut"}, - 'copy': { name: 'Copy', icon: 'copy' }, - 'paste': { name: 'Paste', icon: 'paste' }, - 'delete': { name: 'Delete', icon: 'delete' } + 'copy': { + name: 'Copy', + icon: 'copy' + }, + 'paste': { + name: 'Paste', + icon: 'paste' + }, + 'delete': { + name: 'Delete', + icon: 'delete' + } } }) } @@ -2997,7 +3092,7 @@ var FT_ComponentsTab = function (fb, jqEl) { var index = 1 while (!fbComponent.hasClass('fb-component')) { fbComponent = fbComponent.parent() - ++index + ++index if (maxIndex < index) { break } @@ -3035,10 +3130,10 @@ var FT_ComponentsTab = function (fb, jqEl) { } data[key].settings = _.fb.deepCopySettings(data[key].settings, _.getDefaultSettingsDescriptor()) searchedComponents[key] = { - template: data[key].template, - settings: data[key].settings - } - ++compsCount + template: data[key].template, + settings: data[key].settings + } + ++compsCount } } if (compsCount > 0) { @@ -3080,10 +3175,10 @@ var FT_ComponentsTab = function (fb, jqEl) { // data[key].settings.action = ""; // } componentsTab.components[key] = { - template: data[key].template, - settings: data[key].settings - } - ++count + template: data[key].template, + settings: data[key].settings + } + ++count } } } @@ -3113,7 +3208,7 @@ var FT_ComponentsTab = function (fb, jqEl) { this.el = null this.templates = null this.copiedComponentDfsId = null - this.components = {}// {"someDfsId":{template:"", settings:{}}}; + this.components = {} // {"someDfsId":{template:"", settings:{}}}; // same as components but this one is not being emptied when searching for components // it is needed to prevent from compile issues when re-rending components on the workspace this.backupComponents = {} @@ -3137,7 +3232,11 @@ var FT_ComponentsTab = function (fb, jqEl) { if (this.storeQueue.hasOwnProperty(key)) { if (this.components[key]) { var updateComp = this.components[key] - var newComp = { id: key, template: updateComp.template, settings: updateComp.settings } + var newComp = { + id: key, + template: updateComp.template, + settings: updateComp.settings + } this.fb.options.component.storeComp(newComp, function (data) { if (data && data.oldId && data.newId) { componentsTab.updateDfsId(data.oldId, data.newId) @@ -3250,7 +3349,11 @@ var FT_ComponentsTab = function (fb, jqEl) { for (var i = 0; i < deliveredCollector.length; ++i) { $refComp = $(deliveredCollector[i]) _.body.append($refComp) - try { _.fb.workspace.dragAndDropManager.attachDragEvent($refComp, true) } catch (eee) { console.log(eee) } + try { + _.fb.workspace.dragAndDropManager.attachDragEvent($refComp, true) + } catch (eee) { + console.log(eee) + } } setTimeout(function () { _.fb.workspace.connectionManager.update() @@ -3262,7 +3365,8 @@ var FT_ComponentsTab = function (fb, jqEl) { } } this.sizeOf = function (obj) { - var size = 0; var key + var size = 0; + var key for (key in obj) { if (obj.hasOwnProperty(key)) size++ } @@ -3327,218 +3431,200 @@ var FT_SettingsTab = function (fb, jqEl) { this.templates = { settings: { label: '', - hiddenField: - '{{#ifEq type "checkbox"}}' + - '' + - '{{else}}' + - '' + - '{{/ifEq}}', - field: - ' ' + - ' ' + - ' {{#if createI18nEl}}' + - ' ' + - ' {{/if}}' + - ' ' + - ' ' + - '
' + - ' ' + - ' ' + - ' {{#ifEq type "checkbox"}}' + - ' ' + - ' {{else}}' + - ' ' + - ' {{/ifEq}}' + - '
', - enumField: - ' ' + - ' ' + - ' ' + - ' ' + - '
' + - ' {{#each val.all}}' + - '
' + - ' ' + - ' ' + - '
' + - ' {{/each}}' + - ' {{#each val.all}}' + - ' ' + - ' {{/each}}' + - '
', - enumFieldSelect: - ' ' + - ' ' + - ' {{#ifEq label "file"}}{{/ifEq}}' + - ' ' + - ' ' + - '
exact' + - ' ' + - '
' + - ' ' + - ' {{#each val.all}}' + - ' ' + - ' {{/each}}' + - '
' + hiddenField: '{{#ifEq type "checkbox"}}' + + '' + + '{{else}}' + + '' + + '{{/ifEq}}', + field: ' ' + + ' ' + + ' {{#if createI18nEl}}' + + ' ' + + ' {{/if}}' + + ' ' + + ' ' + + '
' + + ' ' + + ' ' + + ' {{#ifEq type "checkbox"}}' + + ' ' + + ' {{else}}' + + ' ' + + ' {{/ifEq}}' + + '
', + enumField: ' ' + + ' ' + + ' ' + + ' ' + + '
' + + ' {{#each val.all}}' + + '
' + + ' ' + + ' ' + + '
' + + ' {{/each}}' + + ' {{#each val.all}}' + + ' ' + + ' {{/each}}' + + '
', + enumFieldSelect: ' ' + + ' ' + + ' {{#ifEq label "file"}}{{/ifEq}}' + + ' ' + + ' ' + + '
exact' + + ' ' + + '
' + + ' ' + + ' {{#each val.all}}' + + ' ' + + ' {{/each}}' + + '
' } } this.templates.startIndention = - '