refactor: guest function

dewanakl · Jan 20, 2025 · b3508d2 · b3508d2
1 parent f3dfec0
commit b3508d2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/dashboard.html b/dashboard.html
@@ -331,7 +331,7 @@ <h5 class="fw-bold mt-1 mb-0 ms-0 p-0" style="color: var(--bs-gray-900); font-si
 
                         <div class="p-3 bg-theme-light mb-4 rounded-4 shadow">
                             <p class="mx-0 mt-0 mb-1 p-0 fw-bold"><i class="fa-solid fa-heart me-2"></i>Love Project</p>
-                            <p class="m-0 p-0">If you want to support me, consider <a target="_blank" href="https://saweria.co/dewanakl">buying me a coffee</a><i class="fa-solid fa-mug-hot ms-1"></i></p>
+                            <p class="m-0 p-0">If you want to support me, consider <a target="_blank" rel="noopener noreferrer" href="https://saweria.co/dewanakl">buying me a coffee</a><i class="fa-solid fa-mug-hot ms-1"></i></p>
                         </div>
                     </section>
                 </div>

diff --git a/js/app/guest/guest.js b/js/app/guest/guest.js
@@ -105,7 +105,6 @@ export const guest = (() => {
      */
     const open = (button) => {
         button.disabled = true;
-        document.body.scrollIntoView({ behavior: 'instant' });
 
         if (!theme.isAutoMode()) {
             document.getElementById('button-theme').style.display = 'none';
@@ -164,12 +163,14 @@ export const guest = (() => {
         offline.init();
         progress.init();
 
-        countDownDate();
-        normalizeArabicFont();
         information = storage('information');
-
-        document.addEventListener('progressDone', showGuestName);
-        document.addEventListener('progressDone', window.AOS.init);
+        document.addEventListener('progressDone', () => {
+            countDownDate();
+            showGuestName();
+            window.AOS.init();
+            normalizeArabicFont();
+            document.body.scrollIntoView({ behavior: 'instant' });
+        });
 
         if (session.isAdmin()) {
             storage('user').clear();
@@ -198,6 +199,7 @@ export const guest = (() => {
 
         if (token.length > 0) {
             // add 2 progress for config and comment.
+            // before load image.
             progress.add();
             progress.add();
 

diff --git a/js/app/guest/image.js b/js/app/guest/image.js
@@ -5,7 +5,7 @@ export const image = (() => {
     /**
      * @type {Map<string, string>}
      */
-    let uniqueUrl = null;
+    let uniqUrl = null;
 
     /**
      * @type {NodeListOf<HTMLImageElement>}
@@ -14,10 +14,10 @@ export const image = (() => {
 
     let hasSrc = true;
 
-    // 6 hour TTL
-    const ttl = 1000 * 60 * 60 * 6;
+    // default 6 hour TTL
+    let ttl = 1000 * 60 * 60 * 6;
 
-    const cacheName = 'image_cache';
+    const cacheName = 'images';
 
     /**
      * @param {HTMLImageElement} el 
@@ -27,8 +27,8 @@ export const image = (() => {
         const url = el.getAttribute('data-src');
         const exp = 'x-expiration-time';
 
-        if (uniqueUrl.has(url)) {
-            el.src = uniqueUrl.get(url);
+        if (uniqUrl.has(url)) {
+            el.src = uniqUrl.get(url);
             progress.complete('image');
             return;
         }
@@ -59,7 +59,7 @@ export const image = (() => {
                 return c.delete(url).then((s) => s ? fetchPut(c) : res.blob());
             }).then((b) => {
                 el.src = URL.createObjectURL(b);
-                uniqueUrl.set(url, el.src);
+                uniqUrl.set(url, el.src);
                 progress.complete('image');
             })
         }).catch(() => progress.invalid('image'));
@@ -85,6 +85,14 @@ export const image = (() => {
      */
     const hasDataSrc = () => hasSrc;
 
+    /**
+     * @param {number} v
+     * @returns {void} 
+     */
+    const setTtl = (v) => {
+        ttl = Number(v)
+    };
+
     /**
      * @returns {void}
      */
@@ -104,14 +112,15 @@ export const image = (() => {
      * @returns {object}
      */
     const init = () => {
-        uniqueUrl = new Map();
+        uniqUrl = new Map();
         images = document.querySelectorAll('img');
 
         images.forEach(progress.add);
         hasSrc = Array.from(images).some((i) => i.hasAttribute('data-src'));
 
         return {
             load,
+            setTtl,
             hasDataSrc,
         };
     };