Merge pull request #78 from MarvNC/72-add-most-usedfavorites-icons

Add Most Used/Favorites Icons
MarvNC · Jul 23, 2023 · c8de60c · c8de60c
2 parents 6c75981 + ab63287
commit c8de60c
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 42 deletions.
diff --git a/dist/index.css b/dist/index.css
@@ -140,9 +140,14 @@ body {
   overflow: scroll;
 }
 #app #main-content #leftbar #top-buttons {
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(40px, 1fr));
   justify-content: space-evenly;
-  margin: 5px;
+  justify-items: center;
+  align-content: space-evenly;
+  align-items: center;
+  margin: 10px;
+  gap: 10px 0;
 }
 #app #main-content #leftbar #top-buttons .circle {
   height: 40px;

diff --git a/src/index.html b/src/index.html
@@ -37,6 +37,12 @@
             <div id="add-button" class="circle">
               <span class="material-symbols-outlined"> add </span>
             </div>
+            <div id="most-used-icon" class="circle">
+              <span class="material-symbols-outlined"> history </span>
+            </div>
+            <div id="favorites-icon" class="circle">
+              <span class="material-symbols-outlined"> star </span>
+            </div>
           </div>
           <div id="sticker-pack-list"></div>
         </div>

diff --git a/src/index.scss b/src/index.scss
@@ -162,9 +162,15 @@ body {
       overflow: scroll;
 
       #top-buttons {
-        display: flex;
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(40px, 1fr));
         justify-content: space-evenly;
-        margin: 5px;
+        justify-items: center;
+        align-content: space-evenly;
+        align-items: center;
+        margin: 10px;
+        gap: 10px 0;
+
 
         .circle {
           height: 40px;

diff --git a/src/render/stickerRenderer.js b/src/render/stickerRenderer.js
@@ -45,14 +45,28 @@ class StickerRenderer {
       storeURL: 'https://store.line.me/stickershop/',
       noIcon: true,
     });
-    this.stickerContainer.appendChild(favoritesDiv);
-    this.setUpDraggableFavorites(favoritesDiv);
+    if (favoritesDiv) {
+      this.stickerContainer.appendChild(favoritesDiv);
+      this.setUpDraggableFavorites(favoritesDiv);
+    }
+
+    // set click to scroll to pack on icon for most-used and favorite
+    const icons = ['most-used', 'favorites'];
+    for (const icon of icons) {
+      const iconDiv = document.getElementById(`${icon}-icon`);
+      iconDiv.addEventListener('click', (e) => {
+        const stickerPackDiv = document.getElementById(`sticker-pack-container-${icon}`);
+        stickerPackDiv.scrollIntoView({ behavior: 'instant' });
+      });
+    }
 
     for (const stickerPackID of this.stickerPacksOrder) {
       const stickerPack = this.stickerPacksMap[stickerPackID];
 
       const stickerPackDiv = this.makeAndSetUpStickerPack(stickerPackID, stickerPack);
-      this.stickerContainer.appendChild(stickerPackDiv);
+      if (stickerPackDiv) {
+        this.stickerContainer.appendChild(stickerPackDiv);
+      }
     }
 
     // Scroll sticker pack icons list when scrolling sticker packs
@@ -174,47 +188,54 @@ class StickerRenderer {
 
     // Sticker main icon
     if (!noIcon) {
-      const stickerIconDiv = document.createElement('div');
-      stickerIconDiv.classList.add('sticker-pack-icon-wrapper');
-      stickerIconDiv.dataset.packID = stickerPackID;
+      // Don't add icon if it already exists
+      if (!document.getElementById(`sticker-pack-icon-${stickerPackID}`)) {
+        const stickerIconDiv = document.createElement('div');
+        stickerIconDiv.classList.add('sticker-pack-icon-wrapper');
+        stickerIconDiv.dataset.packID = stickerPackID;
+        stickerIconDiv.id = `sticker-pack-icon-${stickerPackID}`;
 
-      const stickerIconImg = document.createElement('img');
-      stickerIconImg.src = mainIcon;
-      stickerIconDiv.appendChild(stickerIconImg);
-      this.stickerPackListDiv.appendChild(stickerIconDiv);
+        const stickerIconImg = document.createElement('img');
+        stickerIconImg.src = mainIcon;
+        stickerIconDiv.appendChild(stickerIconImg);
+        this.stickerPackListDiv.appendChild(stickerIconDiv);
 
-      // Scroll to sticker pack on hover
-      stickerIconDiv.addEventListener('mouseover', (e) => {
-        stickerPackDiv.scrollIntoView({ behavior: 'instant' });
-        // remove active from all sticker pack icons
-        document.querySelectorAll('.active').forEach((el) => el.classList.remove('active'));
-        // add active to current sticker pack icon
-        if (!this.sorting) {
-          e.currentTarget.classList.add('active');
-        }
-      });
+        // Scroll to sticker pack on hover
+        stickerIconDiv.addEventListener('mouseover', (e) => {
+          const stickerPackDiv = document.getElementById(`sticker-pack-container-${stickerPackID}`);
+          stickerPackDiv.scrollIntoView({ behavior: 'instant' });
+          // remove active from all sticker pack icons
+          document.querySelectorAll('.active').forEach((el) => el.classList.remove('active'));
+          // add active to current sticker pack icon
+          if (!this.sorting) {
+            e.currentTarget.classList.add('active');
+          }
+        });
+      }
     }
 
-    // Sticker pack
-    const stickerPackDiv = document.createElement('div');
-    stickerPackDiv.classList.add('sticker-pack');
-    stickerPackDiv.dataset.packID = stickerPackID;
-    stickerPackDiv.id = `sticker-pack-container-${stickerPackID}`;
+    // Make sticker pack if it doesn't exist
+    if (!document.getElementById(`sticker-pack-container-${stickerPackID}`)) {
+      const stickerPackDiv = document.createElement('div');
+      stickerPackDiv.classList.add('sticker-pack');
+      stickerPackDiv.dataset.packID = stickerPackID;
+      stickerPackDiv.id = `sticker-pack-container-${stickerPackID}`;
 
-    const stickerPackHeader = createElementFromHTML(/* html */ `
+      const stickerPackHeader = createElementFromHTML(/* html */ `
 <div class="sticker-pack-header">
 <a class="sticker-pack-title" href="${storeURL}" target="_blank">${title}</a>
 <a class="sticker-pack-author" href="${authorURL}" target="_blank">${author}</a>
 </div>
 `);
-    stickerPackDiv.appendChild(stickerPackHeader);
+      stickerPackDiv.appendChild(stickerPackHeader);
 
-    // loop through stickers
-    for (const sticker of stickers) {
-      stickerPackDiv.appendChild(this.createSticker(sticker));
-    }
+      // loop through stickers
+      for (const sticker of stickers) {
+        stickerPackDiv.appendChild(this.createSticker(sticker));
+      }
 
-    return stickerPackDiv;
+      return stickerPackDiv;
+    }
   }
   /**
    * Fetches and updates the most used sticker pack section
@@ -231,7 +252,11 @@ class StickerRenderer {
     mostUsedDiv.innerHTML = '';
 
     api.getMostUsed().then((mostUsed) => {
-      const newDiv = this.makeAndSetUpStickerPack('most-used', {
+      // delete old most used
+      this.stickerContainer.removeChild(
+        document.getElementById('sticker-pack-container-most-used')
+      );
+      const mostUsedDiv = this.makeAndSetUpStickerPack('most-used', {
         title: '<span class="material-symbols-outlined">history</span> Most Used',
         author: '',
         stickers: mostUsed.map(({ PackID, StickerID }) => {
@@ -243,10 +268,11 @@ class StickerRenderer {
         storeURL: 'https://store.line.me/stickershop/',
         noIcon: true,
       });
-      // reinsert most used at the top
-      this.stickerContainer.insertBefore(newDiv, mostUsedDiv);
-      // delete old most used
-      this.stickerContainer.removeChild(mostUsedDiv);
+      // reinsert most used before favorites div
+      this.stickerContainer.insertBefore(
+        mostUsedDiv,
+        document.getElementById('sticker-pack-container-favorites')
+      );
     });
   }
   /**
@@ -376,7 +402,6 @@ class StickerRenderer {
    * Gets and refreshes all sticker packs
    */
   refreshStickerPacks() {
-    this.stickerContainer.innerHTML = '';
     this.populateStickerPacks();
   }
 }