From 6e7dacc1e07f7deb7edf7c115b9a2a59948d7d8e Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 17 Oct 2022 13:48:01 -0400 Subject: [PATCH] Improved dynamic loading of CSS and JS files! --- app/index.html | 93 ++++++-------- app/index_development_internal.html | 2 +- app/index_development_localhost.html | 2 +- app/index_onsite_5000.html | 2 +- app/index_primary.html | 177 +++++++++++++++++++++++++++ config.json | 8 ++ config.json.default | 12 +- index.js | 2 + 8 files changed, 235 insertions(+), 63 deletions(-) create mode 100644 app/index_primary.html diff --git a/app/index.html b/app/index.html index ebdfd99..49773a2 100644 --- a/app/index.html +++ b/app/index.html @@ -4,79 +4,64 @@ - One Sky IT's Aether App (default) + One Sky IT's Aether App - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -160,18 +146,13 @@ - - - - - + diff --git a/app/index_development_internal.html b/app/index_development_internal.html index 3a333c8..3ef0766 100644 --- a/app/index_development_internal.html +++ b/app/index_development_internal.html @@ -4,7 +4,7 @@ - One Sky IT's Aether App (onsite) + One Sky IT's Aether App (development internal) diff --git a/app/index_development_localhost.html b/app/index_development_localhost.html index 4edb515..3d16525 100644 --- a/app/index_development_localhost.html +++ b/app/index_development_localhost.html @@ -4,7 +4,7 @@ - One Sky IT's Aether App (onsite) + One Sky IT's Aether App (development localhost) diff --git a/app/index_onsite_5000.html b/app/index_onsite_5000.html index 082585b..9a843c7 100644 --- a/app/index_onsite_5000.html +++ b/app/index_onsite_5000.html @@ -4,7 +4,7 @@ - One Sky IT's Aether App (onsite) + One Sky IT's Aether App (onsite :5000) diff --git a/app/index_primary.html b/app/index_primary.html new file mode 100644 index 0000000..e1df786 --- /dev/null +++ b/app/index_primary.html @@ -0,0 +1,177 @@ + + + + + + + One Sky IT's Aether App (primary) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Site-Nav-Menu
+ +
+ + + + + +
+
System-Notifications (and Site-Notifications)
+ +
+ +
+ +
+
+ + + +
+ +
+ + + +
System-Debug
+ + + + + + + + + + + + + + diff --git a/config.json b/config.json index d08d7c6..8a0e85b 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,8 @@ { "developer_tools": false, "native_app_js_css_option": "default", + "native_app_js_css_base_url": "http://demo.oneskyit.local:5000", + "native_app_js_css_base_url_bak": "https://demo.oneskyit.com", "account_id": "_XY7DXtc9MY", "event_id": "pjrcghqwert", @@ -8,6 +10,12 @@ "event_location_id": "7ReVVemiSM0", "event_session_id": null, + "account_code": "", + "event_code": "", + "event_device_code": "", + "event_location_code": "", + "event_session_code": "", + "app_root_path": "[home]/tmp/OSIT/native_app", "api_secret_key": "dFP6J9DVj9hUgIMn-fNIqg", diff --git a/config.json.default b/config.json.default index 515a6e4..a4e63ba 100644 --- a/config.json.default +++ b/config.json.default @@ -1,17 +1,21 @@ { "developer_tools": false, "native_app_js_css_option": "default", + "native_app_js_css_base_url": "https://demo.oneskyit.com", + "native_app_js_css_base_url_bak": "https://app.oneskyit.com", "account_id": "", - "account_code": "", "event_id": "", - "event_code": "", "event_device_id": "", - "event_device_code": "", "event_location_id": "", - "event_location_code": "", "event_session_id": "", + "account_code": "", + "event_code": "", + "event_device_code": "", + "event_location_code": "", + "event_session_code": "", + "app_root_path": "[home]/OSIT/native_app", "api_protocol": "https", diff --git a/index.js b/index.js index fc80742..bd86fac 100644 --- a/index.js +++ b/index.js @@ -84,6 +84,8 @@ function createWindow () { // and load the index.html of the app. if (config.native_app_js_css_option == '' || config.native_app_js_css_option == 'default') { win.loadFile('app/index.html'); + } else if (config.native_app_js_css_option == 'primary') { + win.loadFile('app/index_primary.html'); } else if (config.native_app_js_css_option == 'development_internal') { win.loadFile('app/index_development_internal.html'); } else if (config.native_app_js_css_option == 'development_localhost') {