KaiOS 3 webActivity

strukturart · Oct 2, 2023 · 8f1a0fa · 8f1a0fa
1 parent f15303f
commit 8f1a0fa
Show file tree

Hide file tree

Showing 10 changed files with 410 additions and 121 deletions.
diff --git a/application/app.js b/application/app.js
@@ -40,7 +40,7 @@ const google_oauth_url =
 export let events = [];
 export let accounts = [];
 export let event_templates = [];
-
+export let closing_prohibited = false;
 export let search_history = [];
 
 const google_acc = {
@@ -128,7 +128,6 @@ let style_calendar_cell = function () {
         }
 
         if (rrule_check(p).rrule == true) {
-          //  e.classList.add('event');
           e.classList.add('rrule');
 
           if (rrule_check(p).count > 1) e.classList.add('multievent');
@@ -176,6 +175,7 @@ async function getClientInstance(item) {
 ///load events
 
 async function load_caldav(callback = false) {
+  closing_prohibited = true;
   // Clear events
   events = events.filter((e) => !e.isCaldav);
 
@@ -233,11 +233,12 @@ async function load_caldav(callback = false) {
         document.getElementById('icon-loading').style.visibility = 'hidden';
         if (callback) side_toaster('all event reloaded', 2000);
       }
-
+      closing_prohibited = false;
       style_calendar_cell(currentYear, currentMonth);
       side_toaster('Data loaded', 3000);
     } catch (e) {
       if (m.route.get() === '/page_calendar') {
+        closing_prohibited = false;
         document.getElementById('icon-loading').style.visibility = 'hidden';
       }
     }
@@ -477,7 +478,7 @@ export let create_caldav = async function (
             try {
               sort_array(events, 'dateStartUnix', 'number');
             } catch (e) {
-              alert(e);
+              console.log(e);
             }
           }, 5000);
         }
@@ -663,7 +664,6 @@ export let sync_caldav_callback = function () {
       ) == true
     ) {
       m.route.set('/page_events', { query: 'sort_by_last_mod' });
-      status.sortEvents = 'startDate';
     }
   });
 };
@@ -692,21 +692,26 @@ localforage
 
 //load accounts data
 //load cached data
-localforage
-  .getItem('accounts')
-  .then(function (value) {
+async function loadAccounts() {
+  try {
+    const value = await localforage.getItem('accounts');
     if (value == null) {
       accounts = [];
       return false;
     }
     accounts = value;
-    setTimeout(() => {
-      load_cached_caldav();
-    }, 100);
-  })
-  .catch(function (err) {
+    return true;
+  } catch (err) {
     console.log(err);
-  });
+    return false;
+  }
+}
+
+loadAccounts().then((result) => {
+  if (result) {
+    load_cached_caldav();
+  }
+});
 
 //store templates
 let store_event_as_template = function (
@@ -1107,7 +1112,7 @@ let event_slider = function (date) {
         document.querySelectorAll('div#event-slider article')[0].style.display =
           'block';
       } catch (e) {
-        alert(e);
+        console.log(e);
       }
     }
   }
@@ -1487,7 +1492,7 @@ var page_calendar = {
               id: 'time',
               oncreate: function () {
                 document.getElementById('time').innerText =
-                  dayjs().format('hh:mm');
+                  dayjs().format('HH:mm');
               },
             },
             'time is relative'
@@ -1588,6 +1593,7 @@ var page_events = {
           if (!query) find_closest_date();
           if (query == 'sort_by_last_mod') {
             sort_array_last_mod();
+            status.sortEvents = 'startDate';
           }
 
           bottom_bar(
@@ -2201,7 +2207,6 @@ export let page_options = {
 
           onfocus: function () {
             bottom_bar('', 'open ads', '');
-            alert('kk');
           },
           onblur: function () {
             bottom_bar('', 'open ads', '');
@@ -3464,16 +3469,13 @@ localforage
     if (value != null) {
       events = value;
       try {
-        sort_array(events, 'dateStartUnix', 'number');
         style_calendar_cell(currentYear, currentMonth);
       } catch (e) {
-        alert(e);
+        console.log(e);
       }
 
       //check if calendar has updated
-      setTimeout(() => {
-        sync_caldav(sync_caldav_callback);
-      }, 1000);
+      sync_caldav(sync_caldav_callback);
     }
   })
   .catch(function (err) {});
@@ -3624,12 +3626,11 @@ let nav = function (move) {
   highlight_current_day();
 };
 
-if ('b2g' in Navigator) {
+if ('b2g' in navigator) {
   try {
     navigator.serviceWorker
       .register(new URL('sw.js', import.meta.url), {
         type: 'module',
-        scope: '/',
       })
       .then((registration) => {
         registration.systemMessageManager.subscribe('alarm').then(
@@ -3706,7 +3707,7 @@ let add_alarm = function (date, message_text, id) {
         (err) => console.log('add err: ' + err)
       );
     } catch (e) {
-      alert(e);
+      console.log(e);
     }
   }
 };
@@ -3763,7 +3764,7 @@ let remove_alarm = function (id) {
         });
       };
     } catch (e) {
-      alert(e);
+      console.log(e);
     }
   }
 };
@@ -4560,7 +4561,7 @@ function shortpress_action(param) {
         return true;
       }
 
-      if (m.route.get() == '/page_events') {
+      if (m.route.get().startsWith('/page_events')) {
         sort_events();
         return true;
       }
@@ -4585,10 +4586,7 @@ function shortpress_action(param) {
       if (m.route.get() == '/page_event_templates') {
         delete_template(document.activeElement.getAttribute('data-id'));
       }
-      if (
-        m.route.get() == '/page_events' ||
-        m.route.get().startsWith('/page_events_filtered')
-      ) {
+      if (m.route.get().startsWith('/page_events')) {
         if (document.activeElement.classList.contains('subscription')) {
           toaster('a subscription cannot be edited', 2000);
           return false;
@@ -4673,11 +4671,12 @@ function shortpress_action(param) {
 
       if (events.length > 0) {
         if (m.route.get().startsWith('/page_events')) {
+          m.route.set('/page_calendar');
+
           if (document.activeElement.tagName == 'INPUT')
-            m.route.set('/page_calendar');
-          setTimeout(() => {
-            jump_to_today();
-          }, 1000);
+            setTimeout(() => {
+              jump_to_today();
+            }, 1000);
         } else if (
           m.route.get() === '/page_calendar' ||
           m.route.get() === '/page_events'
@@ -4738,6 +4737,9 @@ function shortpress_action(param) {
       break;
 
     case '0':
+      if(!settings.eventsfilter){
+        side_toaster("no category selected, you can do that in the settings",4000)
+      }
       if (document.activeElement.tagName == 'INPUT') return false;
       m.route.set('/page_events_filtered', { query: settings.eventsfilter });
       break;
@@ -4754,12 +4756,12 @@ function handleKeyDown(evt) {
   }
 
   if (evt.key === 'Backspace' && m.route.get() == '/page_calendar') {
-    window.close();
+    if (closing_prohibited == false) window.close();
   }
 
   if (evt.key === 'EndCall') {
     evt.preventDefault();
-    window.close();
+    if (closing_prohibited == false) window.close();
   }
   if (!evt.repeat) {
     longpress = false;
@@ -4809,6 +4811,15 @@ let interval_is_running = false;
 let lastMessageTime; // Store the timestamp of the last received message
 let running = false;
 channel.addEventListener('message', (event) => {
+  //callback from Google OAuth
+  //ugly method to open a new window, because a window from sw clients.open can no longer be closed
+
+  if (event.data.oauth_success) {
+    const l = event.data.oauth_success;
+    setTimeout(() => {
+      window.open(l);
+    }, 5000);
+  }
   if (event.data.action == 'parse') {
     lastMessageTime = Date.now(); // Update the timestamp for the last received message
     running = true;
@@ -4820,21 +4831,8 @@ channel.addEventListener('message', (event) => {
     }
   }
   if (event.data.action == 'error') {
-    console.log(event.data.content);
     document.getElementById('icon-waiting').style.visibility = 'hidden';
   }
-
-  //callback from Google OAuth
-  //ugly method to open a new window, because a window from sw clients.open can no longer be closed
-
-  if (event.data.oauth_succes) {
-    const l = event.data.oauth_success;
-    if (event.data.oauth_success) {
-      setTimeout(() => {
-        window.open(l);
-      }, 5000);
-    }
-  }
 });
 
 let interval = () => {

diff --git a/application/assets/css/main.css b/application/assets/css/main.css
@@ -384,16 +384,19 @@ div#intro img {
 }
 
 #KaiOsAd {
-  height: 200px;
+  height: 264px;
   width: 240px;
 }
 
 #KaiOsAds-Wrapper {
-  padding: 10px;
+  padding: 0px;
+  height: 264px;
+  width: 240px;
 }
 
 #KaiOsAds-Wrapper iframe {
-  width: 220px;
+  width: 240px;
+  height: 264px;
 }
 
 /*///////////////////////////
@@ -857,7 +860,7 @@ div#options {
   position: absolute;
   z-index: 4;
   top: 0;
-  padding: 0px 5px 5px 0px;
+  padding: 0px 0px 0px 0px;
   height: 92vh;
   overflow: hidden;
 }

diff --git a/application/assets/js/ads.js b/application/assets/js/ads.js
@@ -12,7 +12,7 @@ export let load_ads = function () {
       slot: 'greg',
       test: 0,
       timeout: 10000,
-      h: 100,
+      h: 264,
       w: 240,
       container: document.getElementById('KaiOsAds-Wrapper'),
       onerror: (err) => console.error('Error:', err),

diff --git a/application/manifest.webapp b/application/manifest.webapp
@@ -1,5 +1,5 @@
 {
-  "version": "2.2.4",
+  "version": "2.2.563",
   "name": "greg",
   "id": "greg",
   "categories": ["utilities"],

diff --git a/application/manifest.webmanifest b/application/manifest.webmanifest
@@ -23,7 +23,7 @@
   ],
 
   "b2g_features": {
-    "version": "3.0.9",
+    "version": "3.0.210",
     "id": "greg",
     "subtitle": "easy to use calendar",
     "core": true,
@@ -77,9 +77,9 @@
       },
       "feature-detection": {
         "description": "query which keys are available"
-      },
+      }
 
-      "worker-activity": {}
+
 
     }
   }