added photo tag counter in album view

csvalpha · Oct 15, 2024 · 5515fbe · 5515fbe
1 parent 18ffadc
commit 5515fbe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/components/cards/photo-album-card.hbs b/app/components/cards/photo-album-card.hbs
@@ -14,7 +14,7 @@
       {{#if album.amountOfTags}}
           <span class='album-tag-counter badge bg-info bottom-0 end-0'>
             <FaIcon @icon='tag' />
-            {{album.amountOfTags}}, {{album.amountOfTaggedPhotos}}/{{album.amountOfPhotos}}
+            {{album.amountOfTaggedPhotos}}/{{album.amountOfPhotos}}
           </span>
       {{/if}}
     </div>

diff --git a/app/styles/routes/photos.scss b/app/styles/routes/photos.scss
@@ -8,6 +8,7 @@
     bottom: 0;
     margin-bottom: 1rem;
     margin-left: 15px;
+    margin-right: 15px;
     padding-left: 5px;
   }
 

diff --git a/app/templates/photo-albums/photo-album/photos/index.hbs b/app/templates/photo-albums/photo-album/photos/index.hbs
@@ -21,10 +21,16 @@
         @route='photo-albums.photo-album.photos.photo'
         @model={{photo.id}}
       >
-        {{#if photo.amountOfComments}}
+        {{#if (or photo.amountOfComments photo.amountOfTags)}}
           <span class='comments-counter badge bg-info bottom-0 start-0'>
-            <FaIcon @icon='comments' />
-            {{photo.amountOfComments}}
+            {{#if photo.amountOfComments}}
+              <FaIcon @icon='comments' />
+              {{photo.amountOfComments}}
+            {{/if}}
+            {{#if photo.amountOfTags}}
+              <FaIcon @icon='tag' />
+              {{photo.amountOfTags}}
+            {{/if}}
           </span>
         {{/if}}
         <img class='image' src='{{photo.imageThumbUrl}}' />