From 694b58ead1c89d5ac48e5d19b92dffcf62913c35 Mon Sep 17 00:00:00 2001 From: TimRudy <3942818+TimRudy@users.noreply.github.com> Date: Fri, 31 Jan 2025 14:20:19 -0500 Subject: [PATCH 1/2] Add prettier - first batch, .htmls - also remove some unused dependencies in .js --- .github/workflows/prettier-pr.yml | 54 ++ .jshintrc | 48 +- .prettierignore | 6 + .prettierrc | 4 + Gruntfile.js | 5 +- app/index.html | 891 +++++++++--------- app/package.json | 4 +- .../collectionManager2/collectionManager.html | 28 +- .../plugins/collectionManager2/manifest.json | 55 +- .../plugins/example-plugin/index.html | 72 +- .../plugins/example-plugin/manifest.json | 10 +- app/resources/plugins/icerok/index.html | 84 +- app/resources/plugins/icerok/manifest.json | 12 +- app/resources/plugins/launchBar/launchBar.js | 6 +- app/resources/plugins/launchBar/mainBar.html | 2 +- app/resources/plugins/launchBar/manifest.json | 30 +- .../plugins/launchBar/views/plugin-list.html | 6 +- app/resources/viewers/markdown/js/readme.js | 43 +- app/resources/viewers/markdown/readme.html | 12 +- app/resources/viewers/plain/output.html | 21 +- app/resources/viewers/plain/pcf.html | 22 +- app/resources/viewers/svg/pinout.html | 20 +- app/resources/viewers/system/js/system.js | 123 +-- app/resources/viewers/system/system.html | 43 +- app/resources/viewers/table/rules.html | 47 +- app/scripts/services/collections.js | 18 +- app/scripts/services/compiler.js | 12 +- app/scripts/services/drivers.js | 25 +- app/scripts/services/utils.js | 1 - app/views/advanced.html | 26 +- app/views/languages.html | 92 +- app/views/menu.html | 725 ++++++++------ app/views/uithemes.html | 12 +- app/views/version.html | 135 +-- package.json | 6 +- 35 files changed, 1519 insertions(+), 1181 deletions(-) create mode 100644 .github/workflows/prettier-pr.yml create mode 100644 .prettierignore create mode 100644 .prettierrc diff --git a/.github/workflows/prettier-pr.yml b/.github/workflows/prettier-pr.yml new file mode 100644 index 000000000..b27a68e9c --- /dev/null +++ b/.github/workflows/prettier-pr.yml @@ -0,0 +1,54 @@ +name: Prettier hook for PRs + +on: + pull_request: + types: [opened, synchronize, reopened, closed] + branches: [develop, master] + push: + branches: [develop, master] + +jobs: + ci-pr: + # Run on any change from PR or direct push, but don't run on a cancel PR + if: github.event_name != 'pull_request' || ( + github.event.action == 'opened' || + github.event.action == 'synchronize' || + github.event.action == 'reopened' && github.event.before != github.event.after || + github.event.action == 'closed' && github.event.pull_request.merged == true + ) + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: "latest" + cache: "npm" + + - name: Install dependencies + run: npm ci + + - name: Confirm code format + run: npm prettier + + - name: Commit changes + run: | + git config --global user.name "maria[bot]" + git config --global user.email "maria[bot]@users.noreply.github.com" + git add . + git commit -m "Auto-format code with prettier" || echo "No changes to commit" + git push + + ci-close-pr: + # Run on a cancel PR + if: github.event_name == 'pull_request' && github.event.pull_request.merged == false + + runs-on: ubuntu-latest + + steps: + - name: Just report closed, nothing to do + run: | + echo PR #${{ github.event.number }} has been closed, not merged diff --git a/.jshintrc b/.jshintrc index 045136980..3a8941c3c 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,6 +1,6 @@ { - "esversion": 11, - "node": true, + "esversion": 11, + "node": true, "browser": true, "bitwise": true, "camelcase": true, @@ -21,27 +21,27 @@ "-W069": true, "-W083": true, "-W084": true, - "globals": { - "iceStudio":false, - "Icestudio":false, - "iceStudioReady":false, - "domCache":false, - "iprof":false, - "IceProfiler":false, - "IceBlock":false, - "subModuleActive":false, - "ICEpm":false, - "IcePlugManager":false, - "iceConsole":false, - "IceLogger":false, - "IceEventBus":false, - "IceTemplateSystem":false, - "IceParametricHelper":false, - "Mustache":false, - "jexcel":false, - "nw":false, - "Snap":false, - "mina":false, + "globals": { + "iceStudio": false, + "Icestudio": false, + "iceStudioReady": false, + "domCache": false, + "iprof": false, + "IceProfiler": false, + "IceBlock": false, + "subModuleActive": false, + "ICEpm": false, + "IcePlugManager": false, + "iceConsole": false, + "IceLogger": false, + "IceEventBus": false, + "IceTemplateSystem": false, + "IceParametricHelper": false, + "Mustache": false, + "jexcel": false, + "nw": false, + "Snap": false, + "mina": false, "$": false, "angular": false, "console": false, @@ -55,7 +55,7 @@ "ace": false, "g": false, "V": false, - "IceCollection":false, + "IceCollection": false, "IceHD": false, "WafleModal": false } diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..46d7aba94 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,6 @@ +resources/libs/vendor/ +resources/fonts/ +*.md +icerok/vendor/sweetalert2.min.js +icerok/css/*.min.css +Gruntfile.js diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..30b4336be --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "quoteProps": "consistent", + "trailingComma": "es5" +} diff --git a/Gruntfile.js b/Gruntfile.js index e217ce3df..2af3eb5fc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -824,7 +824,7 @@ module.exports = function (grunt) { }, //-- Download NWjs for ARM arquitecture, as it is not part of the - //-- oficial NWjs project + //-- official NWjs project //-- It is downloaded during the ARM build process //-- Only ARM nwjsAarch64: { @@ -1234,8 +1234,7 @@ module.exports = function (grunt) { path: MAC_EXEC_FILE, }, ], - /* -- For code oficial packages of Icestudio, for developers maintain commented - + /* -- For code official packages of Icestudio, for developers maintain commented "code-sign": { "signing-identity": "XXXX", } diff --git a/app/index.html b/app/index.html index 2ddfed62f..fbadf9665 100644 --- a/app/index.html +++ b/app/index.html @@ -1,79 +1,80 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Icestudio + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- icestudio splash -
-
+ .spinner-wrapper { + width: 100%; + height: 100vh; + position: fixed; + overflow: hidden; + top: 0; + left: 0; + z-index: 999; + display: none; + } + body.waiting .spinner-wrapper { + display: block; + } + .spinner-wrapper--bg { + width: 100%; + height: 100vh; + position: absolute; + top: 0; + left: 0; + overflow: hidden; + z-index: 0; + background-color: #7ccff4; + opacity: 0.4; + } + .spinner-wrapper--container { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + width: 80px; + height: 80px; + z-index: 1; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ icestudio splash
- - - - -
- - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - -
- - - - - - - - - -
- +
+
+ + + + +
+ + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + +
+ + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/package.json b/app/package.json index f4a65ee8c..909bf30e1 100644 --- a/app/package.json +++ b/app/package.json @@ -17,7 +17,9 @@ "updatecheck": "https://raw.githubusercontent.com/FPGAwars/icestudio/develop/app/package.json", "license": "GPL-2.0", "main": "index.html", - "permissions": ["desktopCapture"], + "permissions": [ + "desktopCapture" + ], "chromium-args": "--enable-experimental-web-platform-features --enable-media-stream --enable-usermedia-screen-capturing --disable-backgrounding-occluded-window --allow-file-access-from-files --disable-web-security", "development": { "mode": false diff --git a/app/resources/plugins/collectionManager2/collectionManager.html b/app/resources/plugins/collectionManager2/collectionManager.html index 08bdfcb9b..479ce9502 100644 --- a/app/resources/plugins/collectionManager2/collectionManager.html +++ b/app/resources/plugins/collectionManager2/collectionManager.html @@ -1,16 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
Indexing Database
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file +
Indexing Database
+
+
diff --git a/app/resources/plugins/collectionManager2/manifest.json b/app/resources/plugins/collectionManager2/manifest.json index 3b1d55a46..815046735 100644 --- a/app/resources/plugins/collectionManager2/manifest.json +++ b/app/resources/plugins/collectionManager2/manifest.json @@ -1,30 +1,29 @@ { - "manifest_ver": "1.0", - "id":"collectionManager2", - "name": "Collection Manager", - "author":{ - "name":"Carlos Venegas", - "twitter": "@cavearr" + "manifest_ver": "1.0", + "id": "collectionManager2", + "name": "Collection Manager", + "author": { + "name": "Carlos Venegas", + "twitter": "@cavearr" + }, + "version": "1.0", + "launchAtStartup": false, + "icon": "icon.svg", + "multipleInstances": false, + "gui": { + "type": "embedded", + "windowed": "true", + "layout": ["collectionManager.html"], + "style": ["css/style.css"], + "styleThemed": { + "dark": ["css/dark/dark.css"], + "light": ["css/light/light.css"] }, - "version":"1.0", - "launchAtStartup":false, - "icon": "icon.svg", - "multipleInstances": false, - "gui":{ - "type":"embedded", - "windowed":"true", - "layout":["collectionManager.html"], - "style":["css/style.css"], - "styleThemed":{"dark":["css/dark/dark.css"], - "light":["css/light/light.css"] - }, - "styleHost":["css/host.css"], - "scripts":["js/events.js","js/collectionManager.js"], - "views":[] - }, - "config":{ - "fontSize":{"label": "Font size", - "type": "integer", - "default":12} - } -} \ No newline at end of file + "styleHost": ["css/host.css"], + "scripts": ["js/events.js", "js/collectionManager.js"], + "views": [] + }, + "config": { + "fontSize": { "label": "Font size", "type": "integer", "default": 12 } + } +} diff --git a/app/resources/plugins/example-plugin/index.html b/app/resources/plugins/example-plugin/index.html index 3654f5c05..92752e785 100644 --- a/app/resources/plugins/example-plugin/index.html +++ b/app/resources/plugins/example-plugin/index.html @@ -1,42 +1,36 @@ - + - - - Icestudio Plugin Sample - - - - - - - - - -

This is an Icestudio Plugin Sample

- - - - - - + iceStudio.bus.events.subscribe('callbackTest', callbackTest); + } + + function onClose() { + alert('Bye!'); + } + + function onLoad() { + alert('Inicializando'); + } + + diff --git a/app/resources/plugins/example-plugin/manifest.json b/app/resources/plugins/example-plugin/manifest.json index a8a503927..d2630f1be 100644 --- a/app/resources/plugins/example-plugin/manifest.json +++ b/app/resources/plugins/example-plugin/manifest.json @@ -1,7 +1,7 @@ { - "manifest_ver": "1.0", - "id": "example-plugin", - "name": "Plugin example", - "icon": "img/icestudio-logo.png", - "launchAtStartup": false + "manifest_ver": "1.0", + "id": "example-plugin", + "name": "Plugin example", + "icon": "img/icestudio-logo.png", + "launchAtStartup": false } diff --git a/app/resources/plugins/icerok/index.html b/app/resources/plugins/icerok/index.html index 5cc932938..777486591 100644 --- a/app/resources/plugins/icerok/index.html +++ b/app/resources/plugins/icerok/index.html @@ -1,45 +1,55 @@ - + + + IceRok :: Icestudio => Sigrok pulseview + + + + - - IceRok :: Icestudio => Sigrok pulseview - - - - - - - + + -
-

1) Install Pulseview (if you don’t have installed).

-

2) Download probes from icerok and import as block in yout design.

-

3) Enjoy!

-
-
-
-

Select your serial device:

- -
Start Capture -
+
+

+ 1) Install + Pulseview + (if you don’t have installed). +

+

+ 2) Download probes from + icerok + and import as block in yout design. +

+

3) Enjoy!

+
+
+
+

Select your serial device:

+ +
+ Start Capture +
+
+
+ +
-
-
- -
- -
- - - - - - - - +
+ + + + + + + diff --git a/app/resources/plugins/icerok/manifest.json b/app/resources/plugins/icerok/manifest.json index eabdc54ed..e367d9934 100644 --- a/app/resources/plugins/icerok/manifest.json +++ b/app/resources/plugins/icerok/manifest.json @@ -1,8 +1,8 @@ { - "manifest_ver": "1.0", - "id": "icerok", - "name": "IceRok", - "icon": "assets/icon.svg", - "width": 840, - "height": 375 + "manifest_ver": "1.0", + "id": "icerok", + "name": "IceRok", + "icon": "assets/icon.svg", + "width": 840, + "height": 375 } diff --git a/app/resources/plugins/launchBar/launchBar.js b/app/resources/plugins/launchBar/launchBar.js index 8adbb7d96..83983e034 100644 --- a/app/resources/plugins/launchBar/launchBar.js +++ b/app/resources/plugins/launchBar/launchBar.js @@ -1,7 +1,5 @@ - registerEvents(); //Getting environment config -iceStudio.bus.events.publish('pluginManager.getEnvironment'); -iceStudio.bus.events.publish('pluginManager.getPluginList'); - +iceStudio.bus.events.publish('pluginManager.getEnvironment'); +iceStudio.bus.events.publish('pluginManager.getPluginList'); diff --git a/app/resources/plugins/launchBar/mainBar.html b/app/resources/plugins/launchBar/mainBar.html index 587d053eb..052359ed6 100644 --- a/app/resources/plugins/launchBar/mainBar.html +++ b/app/resources/plugins/launchBar/mainBar.html @@ -1 +1 @@ -
\ No newline at end of file +
diff --git a/app/resources/plugins/launchBar/manifest.json b/app/resources/plugins/launchBar/manifest.json index 5300efff2..35d3b5c3c 100644 --- a/app/resources/plugins/launchBar/manifest.json +++ b/app/resources/plugins/launchBar/manifest.json @@ -1,16 +1,16 @@ { - "manifest_ver": "1.0", - "id":"launchBar", - "name": "Launch bar for plugins", - "icon": "img/icestudio-logo.png", - "launchAtStartup":true, - "gui":{ - "type":"embedded", - "layout":["mainBar.html"], - "style":["css/style.css"], - "styleHost":["css/host.css"], - "scripts":["js/render.js","js/events.js","launchBar.js"], - "views":["views/plugin-list.html"] - }, - "capability":["core"] -} \ No newline at end of file + "manifest_ver": "1.0", + "id": "launchBar", + "name": "Launch bar for plugins", + "icon": "img/icestudio-logo.png", + "launchAtStartup": true, + "gui": { + "type": "embedded", + "layout": ["mainBar.html"], + "style": ["css/style.css"], + "styleHost": ["css/host.css"], + "scripts": ["js/render.js", "js/events.js", "launchBar.js"], + "views": ["views/plugin-list.html"] + }, + "capability": ["core"] +} diff --git a/app/resources/plugins/launchBar/views/plugin-list.html b/app/resources/plugins/launchBar/views/plugin-list.html index 9bbfebba3..85aa5fe3c 100644 --- a/app/resources/plugins/launchBar/views/plugin-list.html +++ b/app/resources/plugins/launchBar/views/plugin-list.html @@ -1,3 +1,5 @@ {{#pluginList}} -
{{{name}}}
-{{/pluginList}} \ No newline at end of file +
+ {{{name}}} +
+{{/pluginList}} diff --git a/app/resources/viewers/markdown/js/readme.js b/app/resources/viewers/markdown/js/readme.js index e81474ae5..1c823e9ed 100644 --- a/app/resources/viewers/markdown/js/readme.js +++ b/app/resources/viewers/markdown/js/readme.js @@ -5,32 +5,37 @@ const openurl = require('openurl'); const fs = require('fs'); function getURLParameter(name) { - return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [null, ''])[1].replace(/\+/g, '%20')) || null; + return ( + decodeURIComponent( + (new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec( + location.search + ) || [null, ''])[1].replace(/\+/g, '%20') + ) || null + ); } var renderer = new marked.Renderer(); renderer.link = function (href, title, text) { - var out = ''; - return out; + } + out += ' onclick="openurl.open(\'' + href + '\')"'; + out += '>' + text + ''; + return out; }; -window.onload = function() { - - const options = { renderer: renderer }; +window.onload = function () { + const options = { renderer: renderer }; - //-- Get the readme filename - const readme_filename = getURLParameter('readme'); - - //-- Read the readme file - const text = fs.readFileSync(readme_filename,'utf8'); + //-- Get the readme filename + const readme_filename = getURLParameter('readme'); - //-- Render de markdown file - if (text) { - document.getElementById('content').innerHTML = marked(text, options); - } + //-- Read the readme file + const text = fs.readFileSync(readme_filename, 'utf8'); + + //-- Render de markdown file + if (text) { + document.getElementById('content').innerHTML = marked(text, options); + } }; diff --git a/app/resources/viewers/markdown/readme.html b/app/resources/viewers/markdown/readme.html index 05bf3ad07..9bef35acf 100644 --- a/app/resources/viewers/markdown/readme.html +++ b/app/resources/viewers/markdown/readme.html @@ -1,24 +1,20 @@ - + - - - - + + +
-
Sorry, README.md file does not exist
-
- diff --git a/app/resources/viewers/plain/output.html b/app/resources/viewers/plain/output.html index badbc2628..8423629a8 100644 --- a/app/resources/viewers/plain/output.html +++ b/app/resources/viewers/plain/output.html @@ -1,4 +1,4 @@ - + @@ -25,9 +30,15 @@ diff --git a/app/resources/viewers/system/js/system.js b/app/resources/viewers/system/js/system.js index 4933af101..e909341b8 100644 --- a/app/resources/viewers/system/js/system.js +++ b/app/resources/viewers/system/js/system.js @@ -1,70 +1,71 @@ function getURLParameter(name) { - return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [null, ''])[1].replace(/\+/g, '%20')) || null; + return ( + decodeURIComponent( + (new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec( + location.search + ) || [null, ''])[1].replace(/\+/g, '%20') + ) || null + ); } -window.onload = function() { - - console.log("System info window opened"); +window.onload = function () { + console.log('System info window opened'); - //-- Get the parameters - const version = getURLParameter('version'); - const base_dir = getURLParameter('base_dir'); - const icestudio_dir = getURLParameter('icestudio_dir'); - const profile_path = getURLParameter('profile_path'); - const apio_home_dir = getURLParameter('apio_home_dir'); - const env_dir = getURLParameter('env_dir'); - const env_bin_dir = getURLParameter('env_bin_dir'); - const env_pip = getURLParameter('env_pip'); - const apio_cmd = getURLParameter('apio_cmd'); - const app = getURLParameter('app'); - const app_dir = getURLParameter('app_dir'); - - - //-- Get the HTML elements for displaying the info - const disp_version = document.getElementById('disp_version'); - const disp_arch = document.getElementById('disp_arch'); - const disp_platform = document.getElementById('disp_platform'); + //-- Get the parameters + const version = getURLParameter('version'); + const base_dir = getURLParameter('base_dir'); + const icestudio_dir = getURLParameter('icestudio_dir'); + const profile_path = getURLParameter('profile_path'); + const apio_home_dir = getURLParameter('apio_home_dir'); + const env_dir = getURLParameter('env_dir'); + const env_bin_dir = getURLParameter('env_bin_dir'); + const env_pip = getURLParameter('env_pip'); + const apio_cmd = getURLParameter('apio_cmd'); + const app = getURLParameter('app'); + const app_dir = getURLParameter('app_dir'); - const disp_base_dir = document.getElementById('disp_base_dir'); - const disp_icestudio_dir = document.getElementById('disp_icestudio_dir'); - const disp_profile_path = document.getElementById('disp_profile_path'); - const disp_apio_home_dir = document.getElementById('disp_apio_home_dir'); - const disp_env_dir = document.getElementById('disp_env_dir'); - const disp_env_bin_dir = document.getElementById('disp_env_bin_dir'); - const disp_env_pip = document.getElementById('disp_env_pip'); - const disp_apio_cmd = document.getElementById('disp_apio_cmd'); - const disp_app = document.getElementById('disp_app'); - const disp_app_dir = document.getElementById('disp_app_dir'); + //-- Get the HTML elements for displaying the info + const disp_version = document.getElementById('disp_version'); + const disp_arch = document.getElementById('disp_arch'); + const disp_platform = document.getElementById('disp_platform'); + const disp_base_dir = document.getElementById('disp_base_dir'); + const disp_icestudio_dir = document.getElementById('disp_icestudio_dir'); + const disp_profile_path = document.getElementById('disp_profile_path'); + const disp_apio_home_dir = document.getElementById('disp_apio_home_dir'); + const disp_env_dir = document.getElementById('disp_env_dir'); + const disp_env_bin_dir = document.getElementById('disp_env_bin_dir'); + const disp_env_pip = document.getElementById('disp_env_pip'); + const disp_apio_cmd = document.getElementById('disp_apio_cmd'); + const disp_app = document.getElementById('disp_app'); + const disp_app_dir = document.getElementById('disp_app_dir'); - //-- Display the information - disp_version.innerHTML += version; - disp_arch.innerHTML += process.arch; - disp_platform.innerHTML += process.platform; + //-- Display the information + disp_version.innerHTML += version; + disp_arch.innerHTML += process.arch; + disp_platform.innerHTML += process.platform; - disp_base_dir.innerHTML += base_dir; - disp_icestudio_dir.innerHTML += icestudio_dir; - disp_profile_path.innerHTML += profile_path; - disp_apio_home_dir.innerHTML += apio_home_dir; - disp_env_dir.innerHTML += env_dir; - disp_env_bin_dir.innerHTML += env_bin_dir; - disp_env_pip.innerHTML += env_pip; - disp_apio_cmd.innerHTML += apio_cmd; - disp_app.innerHTML += app; - disp_app_dir.innerHTML += app_dir; - - - //-- Debug - console.log("Version: " + version + "---"); - console.log("BASE_DIR: " + base_dir + "---"); - console.log("ICESTUDIO_DIR: " + icestudio_dir + "---"); - console.log("PROFILE_PATH: " + profile_path + "---"); - console.log("APIO_HOME_DIR: " + apio_home_dir + "---"); - console.log("ENV_DIR: " + env_dir + "---"); - console.log("ENV_BIN_DIR: " + env_bin_dir + "---"); - console.log("ENV_PIP: " + env_pip + "---"); - console.log("APIO_CMD: " + apio_cmd + "---"); - console.log("APP: " + app + "---"); - console.log("APP_DIR: " + app_dir + "---"); -}; + disp_base_dir.innerHTML += base_dir; + disp_icestudio_dir.innerHTML += icestudio_dir; + disp_profile_path.innerHTML += profile_path; + disp_apio_home_dir.innerHTML += apio_home_dir; + disp_env_dir.innerHTML += env_dir; + disp_env_bin_dir.innerHTML += env_bin_dir; + disp_env_pip.innerHTML += env_pip; + disp_apio_cmd.innerHTML += apio_cmd; + disp_app.innerHTML += app; + disp_app_dir.innerHTML += app_dir; + //-- Debug + console.log('Version: ' + version + '---'); + console.log('BASE_DIR: ' + base_dir + '---'); + console.log('ICESTUDIO_DIR: ' + icestudio_dir + '---'); + console.log('PROFILE_PATH: ' + profile_path + '---'); + console.log('APIO_HOME_DIR: ' + apio_home_dir + '---'); + console.log('ENV_DIR: ' + env_dir + '---'); + console.log('ENV_BIN_DIR: ' + env_bin_dir + '---'); + console.log('ENV_PIP: ' + env_pip + '---'); + console.log('APIO_CMD: ' + apio_cmd + '---'); + console.log('APP: ' + app + '---'); + console.log('APP_DIR: ' + app_dir + '---'); +}; diff --git a/app/resources/viewers/system/system.html b/app/resources/viewers/system/system.html index 0ebca12fb..db62d0ebd 100644 --- a/app/resources/viewers/system/system.html +++ b/app/resources/viewers/system/system.html @@ -1,33 +1,32 @@ - + - - - - - + + + + + - - + +

Icestudio version:

Computer:

    -
  • Architecture:
  • -
  • Platform:
  • +
  • Architecture:
  • +
  • Platform:

PATHs:

    -
  • BASE_DIR:
  • -
  • ICESTUDIO_DIR:
  • -
  • PROFILE_PATH:
  • -
  • APIO_HOME_DIR:
  • -
  • ENV_DIR:
  • -
  • ENV_BIN_DIR:
  • -
  • ENV_PIP:
  • -
  • APIO_CMD:
  • -
  • APP:
  • -
  • APP_DIR:
  • +
  • BASE_DIR:
  • +
  • ICESTUDIO_DIR:
  • +
  • PROFILE_PATH:
  • +
  • APIO_HOME_DIR:
  • +
  • ENV_DIR:
  • +
  • ENV_BIN_DIR:
  • +
  • ENV_PIP:
  • +
  • APIO_CMD:
  • +
  • APP:
  • +
  • APP_DIR:
- - + diff --git a/app/resources/viewers/table/rules.html b/app/resources/viewers/table/rules.html index b042f1183..e98091845 100644 --- a/app/resources/viewers/table/rules.html +++ b/app/resources/viewers/table/rules.html @@ -1,18 +1,23 @@ - + @@ -21,31 +26,47 @@