IM-457 Fix conflicts in develop merge. Prevent recharging pages befor…

…e be authenticated.
integratedmodelling · Dec 16, 2024 · 6c3a35c · 6c3a35c
1 parent c361dc3
commit 6c3a35c
Show file tree

Hide file tree

Showing 29 changed files with 43 additions and 652 deletions.
diff --git a/klab.engine/src/main/resources/static/ui/index.html b/klab.engine/src/main/resources/static/ui/index.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=description content="Web based explorer for k.LAB engine"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><title>k.Explorer</title><link rel=icon href=statics/klab-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link rel=stylesheet type=text/css href=/modeler/shared/report.css><link rel=stylesheet type=text/css href=/modeler/shared/documentation.css><script type=text/javascript src=statics/js/xlsx.full.min.js></script><script>var environmentPath = "/modeler/engine/environments";
-    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><link as=style href=css/app.27820942.css rel=preload><link as=script href=js/app.87cc1f0f.js rel=preload><link as=script href=js/runtime.5d4b968f.js rel=preload><link as=script href=js/vendor.c26ff961.js rel=preload><link href=css/4365aeeb.b0f9de2f.css rel=prefetch><link href=js/4365aeeb.a8ccfbdc.js rel=prefetch><link href=js/4b4818b8.cd768103.js rel=prefetch><link href=css/app.27820942.css rel=stylesheet></head><body><noscript><style>[data-simplebar] {
+    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><link as=style href=css/app.27820942.css rel=preload><link as=script href=js/app.acc7c5c8.js rel=preload><link as=script href=js/runtime.dac0142d.js rel=preload><link as=script href=js/vendor.c26ff961.js rel=preload><link href=css/4365aeeb.b0f9de2f.css rel=prefetch><link href=js/4365aeeb.4d95cfb6.js rel=prefetch><link href=js/4b4818b8.cd768103.js rel=prefetch><link href=css/app.27820942.css rel=stylesheet></head><body><noscript><style>[data-simplebar] {
           overflow: auto;
-        }</style></noscript><div id=q-app></div><script type=text/javascript src=js/app.87cc1f0f.js></script><script type=text/javascript src=js/runtime.5d4b968f.js></script><script type=text/javascript src=js/vendor.c26ff961.js></script></body></html>
+        }</style></noscript><div id=q-app></div><script type=text/javascript src=js/app.acc7c5c8.js></script><script type=text/javascript src=js/runtime.dac0142d.js></script><script type=text/javascript src=js/vendor.c26ff961.js></script></body></html>
diff --git a/...sources/static/ui/js/4365aeeb.a8ccfbdc.js → ...sources/static/ui/js/4365aeeb.4d95cfb6.js b/...sources/static/ui/js/4365aeeb.a8ccfbdc.js → ...sources/static/ui/js/4365aeeb.4d95cfb6.js
diff --git a/klab.engine/src/main/resources/static/ui/js/app.87cc1f0f.js b/klab.engine/src/main/resources/static/ui/js/app.87cc1f0f.js
diff --git a/klab.engine/src/main/resources/static/ui/js/app.acc7c5c8.js b/klab.engine/src/main/resources/static/ui/js/app.acc7c5c8.js
diff --git a/klab.engine/src/main/resources/static/ui/js/runtime.5d4b968f.js b/klab.engine/src/main/resources/static/ui/js/runtime.5d4b968f.js
diff --git a/klab.engine/src/main/resources/static/ui/js/runtime.dac0142d.js b/klab.engine/src/main/resources/static/ui/js/runtime.dac0142d.js
diff --git a/klab.hub/src/main/resources/static/ui/css/vendor.d5f84891.css b/klab.hub/src/main/resources/static/ui/css/vendor.d5f84891.css
diff --git a/klab.hub/src/main/resources/static/ui/css/vendor.e364e6ae.css b/klab.hub/src/main/resources/static/ui/css/vendor.e364e6ae.css
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOkCnqEu92Fr1MmgVxIIzQ.68bb21d0.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOkCnqEu92Fr1MmgVxIIzQ.68bb21d0.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOkCnqEu92Fr1MmgVxIIzQ.fa21e2c7.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOkCnqEu92Fr1MmgVxIIzQ.fa21e2c7.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmEU9fBBc-.48af7707.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmEU9fBBc-.48af7707.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmEU9fBBc-.4dc33a1e.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmEU9fBBc-.4dc33a1e.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmSU5fBBc-.7b05c22e.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmSU5fBBc-.7b05c22e.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmSU5fBBc-.c2f7ab22.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmSU5fBBc-.c2f7ab22.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmWUlfBBc-.77ecb942.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmWUlfBBc-.77ecb942.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmWUlfBBc-.87f3a1cb.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmWUlfBBc-.87f3a1cb.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmYUtfBBc-.f5677eb2.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmYUtfBBc-.f5677eb2.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmYUtfBBc-.fe849ef5.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOlCnqEu92Fr1MmYUtfBBc-.fe849ef5.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOmCnqEu92Fr1Mu4mxM.676b7653.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOmCnqEu92Fr1Mu4mxM.676b7653.woff
diff --git a/klab.hub/src/main/resources/static/ui/fonts/KFOmCnqEu92Fr1Mu4mxM.f1e2a767.woff b/klab.hub/src/main/resources/static/ui/fonts/KFOmCnqEu92Fr1Mu4mxM.f1e2a767.woff
diff --git a/klab.hub/src/main/resources/static/ui/index.html b/klab.hub/src/main/resources/static/ui/index.html
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 <!DOCTYPE html><html><head><base href=/hub/ui/ ><title>k.Hub</title><meta charset=utf-8><meta name=description content=""><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png href=khub-logo.png><link rel=icon type=image/ico href=favicon.ico><link rel=apple-touch-icon sizes=57x57 href=icons/apple-icon-57x57.png><link rel=apple-touch-icon sizes=60x60 href=icons/apple-icon-60x60.png><link rel=apple-touch-icon sizes=72x72 href=icons/apple-icon-72x72.png><link rel=apple-touch-icon sizes=76x76 href=icons/apple-icon-76x76.png><link rel=apple-touch-icon sizes=114x114 href=icons/apple-icon-114x114.png><link rel=apple-touch-icon sizes=120x120 href=icons/apple-icon-120x120.png><link rel=apple-touch-icon sizes=144x144 href=icons/apple-icon-144x144.png><link rel=apple-touch-icon sizes=152x152 href=icons/apple-icon-152x152.png><link rel=apple-touch-icon sizes=180x180 href=icons/apple-icon-180x180.png><link rel=icon type=image/png sizes=192x192 href=icons/android-icon-192x192.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=manifest href=icons/manifest.json><meta name=msapplication-TileColor content=#ffffff><meta name=msapplication-TileImage content=icons/ms-icon-144x144.png><meta name=theme-color content=#ffffff><script>var environmentPath = "false" === "true" ? "/environments" : "./environments";
-    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><script defer data-domain=integratedmodelling.org/hub src=https://plausible.integratedmodelling.org/js/script.js></script><link href=/hub/ui/css/vendor.d5f84891.css rel=stylesheet><link href=/hub/ui/css/app.d2a88fe9.css rel=stylesheet></head><body><div id=q-app></div><script src=/hub/ui/js/vendor.43e6402e.js></script><script src=/hub/ui/js/app.793a1b17.js></script></body></html>
-=======
-<!DOCTYPE html><html><head><base href=/hub/ui/ ><title>k.Hub</title><meta charset=utf-8><meta name=description content=""><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png href=khub-logo.png><link rel=icon type=image/ico href=favicon.ico><link rel=apple-touch-icon sizes=57x57 href=icons/apple-icon-57x57.png><link rel=apple-touch-icon sizes=60x60 href=icons/apple-icon-60x60.png><link rel=apple-touch-icon sizes=72x72 href=icons/apple-icon-72x72.png><link rel=apple-touch-icon sizes=76x76 href=icons/apple-icon-76x76.png><link rel=apple-touch-icon sizes=114x114 href=icons/apple-icon-114x114.png><link rel=apple-touch-icon sizes=120x120 href=icons/apple-icon-120x120.png><link rel=apple-touch-icon sizes=144x144 href=icons/apple-icon-144x144.png><link rel=apple-touch-icon sizes=152x152 href=icons/apple-icon-152x152.png><link rel=apple-touch-icon sizes=180x180 href=icons/apple-icon-180x180.png><link rel=icon type=image/png sizes=192x192 href=icons/android-icon-192x192.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=manifest href=icons/manifest.json><meta name=msapplication-TileColor content=#ffffff><meta name=msapplication-TileImage content=icons/ms-icon-144x144.png><meta name=theme-color content=#ffffff><script defer data-domain=integratedmodelling.org/hub src=https://plausible.integratedmodelling.org/js/script.js></script><link href=/hub/ui/css/vendor.e364e6ae.css rel=stylesheet><link href=/hub/ui/css/app.160cccfd.css rel=stylesheet></head><body><div id=q-app></div><script src=/hub/ui/js/vendor.1a3f0482.js></script><script src=/hub/ui/js/app.59867649.js></script></body></html>
->>>>>>> origin/develop
+    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><script defer data-domain=integratedmodelling.org/hub src=https://plausible.integratedmodelling.org/js/script.js></script><link href=/hub/ui/css/vendor.d5f84891.css rel=stylesheet><link href=/hub/ui/css/app.d2a88fe9.css rel=stylesheet></head><body><div id=q-app></div><script src=/hub/ui/js/vendor.43e6402e.js></script><script src=/hub/ui/js/app.793a1b17.js></script></body></html>