From 2aa8dbb69f41079aea41d2b1a791bddc594dd57c Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Sun, 16 Apr 2023 21:47:43 +1200 Subject: [PATCH 001/178] [181] 'fix' dev to get started --- .gitignore | 1 + src/core/Recipe.mjs | 4 +++- src/core/lib/Magic.mjs | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3b7449c4..616ca224 100755 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ src/node/index.mjs **/*.DS_Store tests/browser/output/* .node-version +.idea diff --git a/src/core/Recipe.mjs b/src/core/Recipe.mjs index 3ce40aa4..86265b65 100755 --- a/src/core/Recipe.mjs +++ b/src/core/Recipe.mjs @@ -4,7 +4,9 @@ * @license Apache-2.0 */ -import OperationConfig from "./config/OperationConfig.json" assert {type: "json"}; +// @TODO: NTS return this to original? ( it breaks dev though ) +// import OperationConfig from "./config/OperationConfig.json" assert {type: "json"}; +import OperationConfig from "./config/OperationConfig.json"; import OperationError from "./errors/OperationError.mjs"; import Operation from "./Operation.mjs"; import DishError from "./errors/DishError.mjs"; diff --git a/src/core/lib/Magic.mjs b/src/core/lib/Magic.mjs index 921fc3f6..8a57969a 100644 --- a/src/core/lib/Magic.mjs +++ b/src/core/lib/Magic.mjs @@ -1,4 +1,6 @@ -import OperationConfig from "../config/OperationConfig.json" assert {type: "json"}; +// @TODO: NTS return this to original? ( it breaks dev though ) +// import OperationConfig from "../config/OperationConfig.json" assert {type: "json"}; +import OperationConfig from "../config/OperationConfig.json"; import Utils, { isWorkerEnvironment } from "../Utils.mjs"; import Recipe from "../Recipe.mjs"; import Dish from "../Dish.mjs"; From 3102adc73d3cb3b85d2ef321ef0d1575fb8d2b0a Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:06:26 +1200 Subject: [PATCH 002/178] [#181] update pane-controls display --- src/web/stylesheets/components/_pane.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/web/stylesheets/components/_pane.css b/src/web/stylesheets/components/_pane.css index 54e67b3b..b3fa81b6 100755 --- a/src/web/stylesheets/components/_pane.css +++ b/src/web/stylesheets/components/_pane.css @@ -12,9 +12,7 @@ } .title { - padding: 8px; - padding-left: 12px; - padding-right: 12px; + padding: 8px 12px; height: var(--title-height); border-bottom: 1px solid var(--primary-border-colour); font-weight: var(--title-weight); @@ -25,11 +23,9 @@ } .pane-controls { - position: absolute; right: 8px; top: 8px; - display: flex; - flex-direction: row; + display: inline-flex; } .pane-controls .btn { @@ -49,3 +45,4 @@ #files .card-header .float-right a:hover { text-decoration: none; } + From daf2c684a9c8e05b44542b150ac82741c433dd7c Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:07:26 +1200 Subject: [PATCH 003/178] [#181] add justify-content: space-between to the banner --- src/web/stylesheets/layout/_banner.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/web/stylesheets/layout/_banner.css b/src/web/stylesheets/layout/_banner.css index 59856958..6849b87b 100755 --- a/src/web/stylesheets/layout/_banner.css +++ b/src/web/stylesheets/layout/_banner.css @@ -15,6 +15,9 @@ color: var(--banner-font-colour); background-color: var(--banner-bg-colour); margin: 0; + + /*///////// dolphin additions //////*/ + justify-content: space-between; } #banner i { From 32d8ce7069b404febee22f57d0e71be619f2cd5b Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:09:01 +1200 Subject: [PATCH 004/178] [#181] update some css to shorthand --- src/web/stylesheets/layout/_io.css | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/web/stylesheets/layout/_io.css b/src/web/stylesheets/layout/_io.css index 0146bf27..344efe3c 100755 --- a/src/web/stylesheets/layout/_io.css +++ b/src/web/stylesheets/layout/_io.css @@ -131,10 +131,7 @@ .output-tab-content { width: 100%; max-width: 100%; - padding-left: 5px; - padding-right: 5px; - padding-top: 10px; - padding-bottom: 10px; + padding: 10px 5px; height: var(--tab-height); vertical-align: middle; overflow: hidden; @@ -319,8 +316,7 @@ #output-num-results-container { width: 20%; float: right; - margin: 0; - margin-left: 10%; + margin: 0 0 0 10%; } #input-find-options-checkboxes, @@ -355,10 +351,7 @@ #input-search-results li, #output-search-results li { - padding-left: 5px; - padding-right: 5px; - padding-top: 10px; - padding-bottom: 10px; + padding: 10px 5px; text-align: center; width: 100%; color: var(--op-list-operation-font-colour); From e998324194ccd7bade5e4b5dc0ac871830334169 Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:13:26 +1200 Subject: [PATCH 005/178] [#181] comment out edit-favourites for now --- src/web/stylesheets/layout/_operations.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/web/stylesheets/layout/_operations.css b/src/web/stylesheets/layout/_operations.css index b73dfa84..1766f6dc 100755 --- a/src/web/stylesheets/layout/_operations.css +++ b/src/web/stylesheets/layout/_operations.css @@ -20,10 +20,10 @@ linear-gradient(to top, var(--primary-border-colour) 1px, rgba(0, 0, 0, 0) 1px); } -#edit-favourites { - float: right; - margin-top: -7px; -} +/*#edit-favourites {*/ +/* float: right;*/ +/* margin-top: -7px;*/ +/*}*/ .favourites-hover { color: var(--rec-list-operation-font-colour); @@ -41,3 +41,4 @@ .op-list .operation:hover { filter: brightness(98%); } + From 3608d4ac127cb4b238d8ff6ba0d6d0666964cab6 Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:14:46 +1200 Subject: [PATCH 006/178] [#181] set up mobile UI, unsorted CSS blocks ( will move them to appropriate places when the UI is solid ) --- src/web/stylesheets/layout/_structure.css | 105 +++++++++++++--------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/src/web/stylesheets/layout/_structure.css b/src/web/stylesheets/layout/_structure.css index 4f262029..a23b0d50 100755 --- a/src/web/stylesheets/layout/_structure.css +++ b/src/web/stylesheets/layout/_structure.css @@ -10,50 +10,6 @@ body { overflow: hidden; } -#content-wrapper { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - -#workspace-wrapper { - position: absolute; - top: 30px; - bottom: 0; - width: 100%; -} - -div#operations, -div#recipe { - width: 50%; - height: 100%; -} - -div#input, -div#output { - width: 100%; - height: 50%; -} - -.split { - box-sizing: border-box; - /* overflow: auto; */ - /* Removed to enable Background Magic button pulse to overflow. - Replace this rule if it seems to be causing problems. */ - position: relative; -} - -#operations.split { - overflow: auto; -} - -.split.split-horizontal, .gutter.gutter-horizontal { - height: 100%; - float: left; -} - .gutter { background-color: var(--secondary-border-colour); background-repeat: no-repeat; @@ -69,3 +25,64 @@ div#output { background-image: url('data:image/png;base64,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'); cursor: ns-resize; } + +/*//////// dolphins mobile ui below ///////////*/ + +#workspace-wrapper { + margin-top: 30px; +} + +#content-wrapper, +#workspace-wrapper, +#operations, +#recipe, +#input, +#output, +#search { + width: 100vw; +} + +#recipe { + height: 15vh; + overflow-y: scroll; +} + +#input .cm-scroller, +#output .cm-scroller { + height: 20vh; + overflow-y: scroll; +} + +#recipe .title, +#input .title, +#output .title { + display: flex; + justify-content: space-between; +} + +#content-wrapper { + position: absolute; + top: 0; + bottom: 0; + right: 0; + left: 0; +} + +/*@TODO: move elsewhere*/ +.desktop-only { + display: none; +} + +@media only screen and ( min-width: 1024px ) { + .desktop-only { + display: inline-block; + } +} + +/*@TODO: rename*/ +/* reverse the pane controls and magic/stale indicator in order +to prevent weird empty spaces to the right on mobile*/ +.foo { + display: flex; + flex-direction: row-reverse; +} From 8ca5cfaf488fa18e12bc2651d99bab22370be4c9 Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:15:41 +1200 Subject: [PATCH 007/178] [#181] add generic default as per the norm --- src/web/stylesheets/utils/_overrides.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/stylesheets/utils/_overrides.css b/src/web/stylesheets/utils/_overrides.css index a2f8b029..f03acc34 100755 --- a/src/web/stylesheets/utils/_overrides.css +++ b/src/web/stylesheets/utils/_overrides.css @@ -17,7 +17,7 @@ } .material-icons { - font-family: 'Material Icons'; + font-family: 'Material Icons', sans-serif; font-weight: normal; font-style: normal; font-size: 24px; From 683c323fd500ef96900c73fa1457997129c8666a Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:19:18 +1200 Subject: [PATCH 008/178] [#181] add this.breakpoint and move some user layout choices into an if statement checking the breakpoint --- src/web/App.mjs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/web/App.mjs b/src/web/App.mjs index cce91b1e..7b98e109 100755 --- a/src/web/App.mjs +++ b/src/web/App.mjs @@ -46,6 +46,8 @@ class App { this.appLoaded = false; this.workerLoaded = false; this.waitersLoaded = false; + + this.breakpoint = 1024; } @@ -57,15 +59,17 @@ class App { setup() { document.dispatchEvent(this.manager.appstart); - this.initialiseSplitter(); + if ( window.innerWidth >= this.breakpoint ) { + this.initialiseSplitter(); + this.setCompileMessage(); + this.adjustComponentSizes(); + } + this.loadLocalStorage(); this.populateOperationsList(); this.manager.setup(); this.manager.output.saveBombe(); - this.adjustComponentSizes(); - this.setCompileMessage(); this.uriParams = this.getURIParams(); - log.debug("App loaded"); this.appLoaded = true; this.loaded(); From a1d89464ad5c7ffb4ea775ff3df2ce062566f45b Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:19:42 +1200 Subject: [PATCH 009/178] [#181] update breakpoint to 768, add a TODO --- src/web/App.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/App.mjs b/src/web/App.mjs index 7b98e109..5db558b7 100755 --- a/src/web/App.mjs +++ b/src/web/App.mjs @@ -47,7 +47,7 @@ class App { this.workerLoaded = false; this.waitersLoaded = false; - this.breakpoint = 1024; + this.breakpoint = 768; } @@ -59,6 +59,7 @@ class App { setup() { document.dispatchEvent(this.manager.appstart); + // @TODO: add a window resize listener if ( window.innerWidth >= this.breakpoint ) { this.initialiseSplitter(); this.setCompileMessage(); From ab996c32519a84a0540ea122fb7d8535bc8e15b6 Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:20:38 +1200 Subject: [PATCH 010/178] [#181] update breakpoint for .desktop-only --- src/web/stylesheets/layout/_structure.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/stylesheets/layout/_structure.css b/src/web/stylesheets/layout/_structure.css index a23b0d50..6b36cd2d 100755 --- a/src/web/stylesheets/layout/_structure.css +++ b/src/web/stylesheets/layout/_structure.css @@ -73,7 +73,7 @@ body { display: none; } -@media only screen and ( min-width: 1024px ) { +@media only screen and ( min-width: 768px ) { .desktop-only { display: inline-block; } From 3e76bc563c0f65afc12bbd49331f4b8ccec0f996 Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 17 Apr 2023 10:21:58 +1200 Subject: [PATCH 011/178] [#181] update template for mobile UI. I will incorporate / probably revert some things once the mobile UI is solid, then patch up desktop view to its original state --- src/web/html/index.html | 135 ++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 52 deletions(-) diff --git a/src/web/html/index.html b/src/web/html/index.html index c602c275..d70ca3e0 100755 --- a/src/web/html/index.html +++ b/src/web/html/index.html @@ -31,6 +31,7 @@ + + -
-
-
-
-
+ + + + + - +
+