Scott.Idem/OSIT-AE-App-Native-Electron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A lot of clean up!!!

Browse Source
This commit is contained in:
Scott Idem
2022-10-14 17:22:14 -04:00
parent 3a4812de4c
commit eb53e46ebc
16 changed files with 1819 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
app/index.html
View File

@@ -24,32 +24,34 @@
<link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/svelte/build/aether_css_variables.css">
<!-- <link rel="stylesheet" href="https://lci.oneskyit.com/static/svelte/build/aether_utilities.css"> -->
<link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/svelte/build/aether_utilities.css">
<!-- <link rel="stylesheet" href="https://lci.oneskyit.com/static/svelte/build/aether_elements.css"> -->
<link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/svelte/build/aether_elements.css">
<!-- <link rel="stylesheet" href="https://lci.oneskyit.com/static/css/aether_system.css"> -->
<link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/css/aether_system.css">
<!-- <link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/css/aether_system.css"> -->
<!-- <link rel="stylesheet" href="https://lci.oneskyit.com/static/svelte/build/aether_modules_core.css"> -->
<link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/svelte/build/aether_modules_core.css">
<!-- <link rel="stylesheet" href="https://lci.oneskyit.com/static/svelte/build/aether_layout_v5_root.css"> -->
<link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/svelte/build/aether_layout_v5_root.css">
<!-- <link rel="stylesheet" href="https://lci.oneskyit.com/static/svelte/build/aether_layout_v5_system.css"> -->
<link rel="stylesheet" href="http://demo.oneskyit.local:5000/static/svelte/build/aether_layout_v5_system.css">
<!-- <link href="https://lci.oneskyit.com/static/svelte/build/bundle.css" rel="stylesheet"> -->
<link href="http://demo.oneskyit.local:5000/static/svelte/build/bundle.css" rel="stylesheet">
<!-- <link href="https://lci.oneskyit.com/static/svelte/build/reloading.css" rel="stylesheet"> -->
<link href="http://demo.oneskyit.local:5000/static/svelte/build/reloading.css" rel="stylesheet">
<!-- <link href="https://lci.oneskyit.com/static/svelte/build/base_style_grid_layout_v3.css" rel="stylesheet"> -->
<link href="http://demo.oneskyit.local:5000/static/svelte/build/base_style_grid_layout_v3.css" rel="stylesheet">
<!-- <link href="https://lci.oneskyit.com/static/svelte/build/base_style_grid_theme_v3.css" rel="stylesheet"> -->
<link href="http://demo.oneskyit.local:5000/static/svelte/build/base_style_grid_theme_v3.css" rel="stylesheet">
<!-- <link href="https://lci.oneskyit.com/static/svelte/build/event_launcher.css" rel="stylesheet"> -->
<link href="http://demo.oneskyit.local:5000/static/svelte/build/event.css" rel="stylesheet">
<link href="http://demo.oneskyit.local:5000/static/svelte/build/event_launcher.css" rel="stylesheet">
<link rel="stylesheet" href="css/aether_native_app_v3.css">
<link rel="stylesheet" href="css/aether_app_native_v3.css">
<style>
</style>
<!-- Cascading Style Sheets (CSS) end -->
<!-- JavaScript (JS) start -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/axios/0.22.0/axios.min.js" integrity="sha512-m2ssMAtdCEYGWXQ8hXVG4Q39uKYtbfaJL5QMTbhl2kc6vYyubrKHhr6aLLXW4ITeXSywQLn1AhsAaqrJl8Acfg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/axios/1.1.2/axios.min.js" integrity="sha512-bHeT+z+n8rh9CKrSrbyfbINxu7gsBmSHlDCb3gUF1BjmjDzKhoKspyB71k0CIRBSjE5IVQiMMVBgCWjF60qsvA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
@@ -63,9 +65,9 @@
<!-- <script src="js/app_idb.js"></script> -->
<script>
const app = require('./js/aether_native_app_v3');
let app_config = app.load_config();
console.log('Native App Config:', app_config);
const native_app = require('./js/aether_app_native_v4');
let native_app_config = native_app.load_config();
console.log('Native App Config:', native_app_config);
// BEGIN: Environment constants set by server when rendering HTML
document.aether = {
@@ -81,7 +83,7 @@
// END: Environment constants set by server when rendering HTML
// BEGIN: Content constants set by server when rendering HTML
const page_for = {"event": app_config.event_id, "event_device": app_config.event_device_id, "event_location": app_config.event_location_id, "event_session": app_config.event_session_id}; // Simple key value like object
const page_for = {"event": native_app_config.event_id, "event_device": native_app_config.event_device_id, "event_location": native_app_config.event_location_id, "event_session": native_app_config.event_session_id}; // Simple key value like object
console.log('Page For:', page_for);
// END: Content constants set by server when rendering HTML
@@ -90,7 +92,7 @@
const client_person_jwt = {}; // Future use
const client_user_jwt = {}; // Future use
let client_account_id = app_config.account_id;
let client_account_id = native_app_config.account_id;
console.log(client_account_id);
// END: Client constants set by server when rendering HTML
@@ -99,17 +101,17 @@
// END: Other constants set by server when rendering HTML
let page = {}
page['page_for'] = { 'event': app_config.event_id, 'event_device': app_config.event_device_id, 'event_location': app_config.event_location_id, "event_session": app_config.event_session_id }; // Simple key value like object;
page['page_for'] = { 'event': native_app_config.event_id, 'event_device': native_app_config.event_device_id, 'event_location': native_app_config.event_location_id, "event_session": native_app_config.event_session_id }; // Simple key value like object;
// page['current_url_root'] = 'http://demo.oneskyit.local:5000/';
// page['current_url_full_path'] = '/event/pjrcghqwert/launcher/x7uFNCMEdOI?';
document.aether.page = page;
document.aether.client = {"account_id": app_config.account_id, "site_id": app_config.site_id, "site_domain_id": app_config.site_domain_id, "person_id": null, "user_id": null, "order_cart_id_random": null, "super_check": false, "manager_check": false, "administrator_check": false, "support_check": false, "assistant_check": false, "trusted_check": false, "verified_check": false, "provisional_check": false, "public_check": false, "user_check": false, "logged_in_check": false, "person_check": false, "authenticated_check": false, "anonymous_check": true, "person_group": null, "user_group": null, "orders_closed_count": 0, "order_count": 0, "app_mode": "native"};
document.aether.client = {"account_id": native_app_config.account_id, "site_id": native_app_config.site_id, "site_domain_id": native_app_config.site_domain_id, "person_id": null, "user_id": null, "order_cart_id_random": null, "super_check": false, "manager_check": false, "administrator_check": false, "support_check": false, "assistant_check": false, "trusted_check": false, "verified_check": false, "provisional_check": false, "public_check": false, "user_check": false, "logged_in_check": false, "person_check": false, "authenticated_check": false, "anonymous_check": true, "person_group": null, "user_group": null, "orders_closed_count": 0, "order_count": 0, "app_mode": "native"};
document.aether.cfg = {};
document.aether.cfg.app = {"name": "One Sky IT's Aether Native App DEV", "version": "3.5 DEV", "email": null, "env": null, "mode": "native", "host_file_cache_path": app_config.host_file_cache_path, "host_file_temp_path": app_config.host_file_temp_path};
document.aether.cfg.api = {"protocol": app_config.api_protocol, "server": app_config.api_server, "port": app_config.api_port, "path": app_config.api_path, "secret_key": app_config.api_secret_key, "base_url": null, "temporary_token": {"token": null, "expire_on": null}, "protocol_backup": app_config.api_protocol_backup, "server_backup": app_config.api_server_backup, "port_backup": app_config.api_port_backup, "path_backup": app_config.api_path_backup, "secret_key_backup": app_config.api_secret_key_backup, "base_url_backup": null, "temporary_token_backup": {"token": null, "expire_on": null}};
document.aether.cfg.idb = {"name": app_config.idb_name};
document.aether.cfg.app = {"name": "One Sky IT's Aether Native App DEV", "version": "3.5 DEV", "email": null, "env": null, "mode": "native", "local_file_cache_path": native_app_config.local_file_cache_path, "host_file_temp_path": native_app_config.host_file_temp_path};
document.aether.cfg.api = {"protocol": native_app_config.api_protocol, "server": native_app_config.api_server, "port": native_app_config.api_port, "path": native_app_config.api_path, "secret_key": native_app_config.api_secret_key, "base_url": null, "temporary_token": {"token": null, "expire_on": null}, "protocol_backup": native_app_config.api_protocol_backup, "server_backup": native_app_config.api_server_backup, "port_backup": native_app_config.api_port_backup, "path_backup": native_app_config.api_path_backup, "secret_key_backup": native_app_config.api_secret_key_backup, "base_url_backup": null, "temporary_token_backup": {"token": null, "expire_on": null}};
document.aether.cfg.idb = {"name": native_app_config.idb_name};
@@ -120,41 +122,41 @@
// const app_mode = 'native'; // null, 'default', 'native', 'onsite'
// let event_id = app_config.event_id;
// let event_device_id = app_config.event_device_id;
// let event_location_id = app_config.event_location_id;
// let event_id = native_app_config.event_id;
// let event_device_id = native_app_config.event_device_id;
// let event_location_id = native_app_config.event_location_id;
// const host_file_cache_path = app_config.host_file_cache_path; // 'file_cache/'
// console.log(host_file_cache_path);
// const host_file_temp_path = app_config.host_file_temp_path; // 'temp/'
// const local_file_cache_path = native_app_config.local_file_cache_path; // 'file_cache/'
// console.log(local_file_cache_path);
// const host_file_temp_path = native_app_config.host_file_temp_path; // 'temp/'
// console.log(host_file_temp_path);
// let idb_name = app_config.idb_name;
// let idb_name = native_app_config.idb_name;
// BEGIN: API section
// const access_control_allow_origin = app_config.access_control_allow_origin;
// const api_secret_key = app_config.api_secret_key;
// const access_control_allow_origin = native_app_config.access_control_allow_origin;
// const api_secret_key = native_app_config.api_secret_key;
// console.log(api_secret_key);
// let api_temporary_token = null;
// let api_base_url = app_config.api_base_url; // null;
// let api_base_url_bak = app_config.api_base_url_bak;
// let app_server_base_url = app_config.app_server_base_url;
// let file_base_url = app_config.file_server_base_url;
// let api_base_url = native_app_config.api_base_url; // null;
// let api_base_url_bak = native_app_config.api_base_url_bak;
// let app_server_base_url = native_app_config.app_server_base_url;
// let file_base_url = native_app_config.file_server_base_url;
// if (app_config.use_local_api) {
// api_base_url = app_config.api_local_base_url; // 'http://api.localhost:5001'
// if (native_app_config.use_local_api) {
// api_base_url = native_app_config.api_local_base_url; // 'http://api.localhost:5001'
// } else {
// api_base_url = app_config.api_remote_base_url; // 'https://api.oneskyit.com'
// api_base_url = native_app_config.api_remote_base_url; // 'https://api.oneskyit.com'
// }
/* ***** **** *** ** * ### * ** *** **** ***** */
let app_online = false;
//let app_use_cached_data = true;
window.addEventListener('online', app.currently_online);
window.addEventListener('offline', app.currently_offline);
window.addEventListener('online', native_app.currently_online);
window.addEventListener('offline', native_app.currently_offline);
/* ***** **** *** ** * ### * ** *** **** ***** */
@@ -167,24 +169,36 @@
</head>
<body class="body_container">
<body id="Body-Container" class="body_container">
<section id="System-Nav-Menu">Site-Nav-Menu</section>
<section id="Site-Header">Site-Header</section>
<section id="Site-Nav-Menu">Site-Nav-Menu</section>
<section id="System-Notifications">System-Notifications (and Site-Notifications)</section><!-- and what would be Site-Notifications-->
<div id="Site-Container">
<section id="Main-Body" class="main_template_content svelte_target event_launcher_main">
</section>
<section id="Site-Header">Site-Header</section>
<nav id="Site-Nav-Menu">Site-Nav-Menu</nav>
<section id="Notifications">
<section id="System-Notifications">System-Notifications (and Site-Notifications)</section><!-- and what would be Site-Notifications-->
</section>
<section id="Main-Body" class="main_template_content svelte_target event_launcher_main Side-Main-Nav-Menu">
<section id="Main-Nav-Menu"></section>
<main id="Main-Content"></main>
</section>
<section id="Site-Footer">Site-Footer</section>
</div>
<section id="Site-Modals"></section>
<section id="Site-Footer">Site-Footer</section>
<section id="System-Footer">Site-Footer</section>
<section id="System-Debug">System-Debug</section>
</body>
<!-- JavaScript (JS) start -->
@@ -201,7 +215,7 @@
// BEGIN: Load IDB section
// let idb_name = app_config.idb_name;
// let idb_name = native_app_config.idb_name;
// let tbl_event = null;
// let tbl_event_location = null;