Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

album tag counter #887

Draft
wants to merge 5 commits into
base: staging
Choose a base branch
from
+40 −21
Draft

album tag counter #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc1500a
added total tag counters to album cover cards
ToMaarton Oct 14, 2024
18ffadc
added number of tagged photos out of total
ToMaarton Oct 14, 2024
5515fbe
added photo tag counter in album view
ToMaarton Oct 15, 2024
acf65a9
fixed lint
ToMaarton Oct 15, 2024
0f81f0d
lint fix 2
ToMaarton Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/components/cards/photo-album-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
src='{{album.albumMediumUrl}}'
class='card-img-rounded'
/>

<div class='card-title-bar gradient-overlay-rounded'>
<div class='card-titles'>
<h2 class='card-title'>{{album.title}}</h2>
<h3 class='card-subtitle'>{{moment-format album.date 'DD-MM-YYYY'}}</h3>
</div>
{{#if album.amountOfTaggedPhotos}}
<span class='album-tag-counter badge bg-info bottom-0 end-0'>
<FaIcon @icon='tag' />
{{album.amountOfTaggedPhotos}}/{{album.amountOfPhotos}}
</span>
{{/if}}
</div>
</div>
</div>
12 changes: 12 additions & 0 deletions app/models/photo-album.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@
return this.photos?.sortBy('exifDateTimeOriginal', 'createdAt');
}

get amountOfTaggedPhotos() {
var counter = 0;
for (var photo of this.photos._objects) {
counter += photo.amountOfTags > 0 ? 1 : 0;

Check warning on line 41 in app/models/photo-album.js

View check run for this annotation

Codecov / codecov/patch

app/models/photo-album.js#L39-L41 

Added lines #L39 - L41 were not covered by tests
}
return counter;

Check warning on line 43 in app/models/photo-album.js

View check run for this annotation

Codecov / codecov/patch

app/models/photo-album.js#L43 

Added line #L43 was not covered by tests
}

get amountOfPhotos() {
return this.photos.length;

Check warning on line 47 in app/models/photo-album.js

View check run for this annotation

Codecov / codecov/patch

app/models/photo-album.js#L47 

Added line #L47 was not covered by tests
}

// Methods
isOwner(user) {
if (user.get('id') === this.author.get('id')) {
Expand Down
8 changes: 8 additions & 0 deletions app/styles/components/cards/photo-album-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,12 @@
.card-title {
font-size: 1.5rem;
}

.album-tag-counter {
position: absolute;
bottom: 0;
margin-right: 15px;
margin-bottom: 1rem;
padding-left: 5px;
}
}
12 changes: 9 additions & 3 deletions app/templates/photo-albums/photo-album/photos/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}' />
Expand Down
22 changes: 4 additions & 18 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8827,24 +8827,10 @@ __metadata:
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000844, caniuse-lite@npm:^1.0.30001313":
version: 1.0.30001458
resolution: "caniuse-lite@npm:1.0.30001458"
checksum: 258cc5a25babbbfe483bf788c6f321a19400ff80b2bf156b360bac09a6f9f4da44516350d187a30395667cb142c682d9ea96577ea0df236d35f76234b07ccb41
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.30001449":
version: 1.0.30001485
resolution: "caniuse-lite@npm:1.0.30001485"
checksum: 2db8a9e5facf8df5275c96e44714a6caf3b9485813be1fe0aa5a72a7ced974137adeeed806a9a97f713d2f6d1b5c342949b88355ee0323ba35656bfa00d57fea
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.30001541":
version: 1.0.30001547
resolution: "caniuse-lite@npm:1.0.30001547"
checksum: ec0fc2b46721887f6f4aca1f3902f03d9a1a07416d16a86b7cd4bfba60e7b6b03ab3969659d3ea0158cc2f298972c80215c06c9457eb15c649d7780e8f5e91a7
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000844, caniuse-lite@npm:^1.0.30001313, caniuse-lite@npm:^1.0.30001449, caniuse-lite@npm:^1.0.30001541":
version: 1.0.30001668
resolution: "caniuse-lite@npm:1.0.30001668"
checksum: ce6996901b5883454a8ddb3040f82342277b6a6275876dfefcdecb11f7e472e29877f34cae47c2b674f08f2e71971dd4a2acb9bc01adfe8421b7148a7e9e8297
languageName: node
linkType: hard

Expand Down
Loading