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

Integrate hotspots/markers into image gallery #874

Merged
merged 54 commits into from
Jan 16, 2025
Merged

Integrate hotspots/markers into image gallery #874

merged 54 commits into from
Jan 16, 2025

Conversation

markus-moser
Copy link
Contributor

@markus-moser markus-moser commented Jan 15, 2025 •
edited
Loading

  • Save coordinates in percent instead of pixels
  • Integrate hotspots/markers into image gallery
  • Maintaining hotspot data (and crop) still missing, will be done in separate PRs

sholzer and others added 30 commits January 13, 2025 09:03
@sholzer
Hotspot image (#839)
79db7b5
@markus-moser
Start implementing the hotspots modal and respecting units in percent
a8c29d4
@markus-moser
Fix percent to pixel conversion
353365a
@markus-moser
Extract dragItem to separate file
c07a8e4
@markus-moser
Use containerBounds instead of image dimensions
cef1362
@markus-moser
Extract resizeItem to separate file
93e502c
@markus-moser
Implement onRemove + onUpdate and clean-up code a bit
6325537
@markus-moser
Add onChange prop
a5663d8
@markus-moser
Merge remote-tracking branch 'origin/1.x' into hotspot-image
1c6f93c 
# Conflicts:
#	public/build/2a63e2e2-3316-4383-a125-7fbc7e0f4e59/vendor.js
#	public/build/2a63e2e2-3316-4383-a125-7fbc7e0f4e59/vendor.js.LICENSE.txt
#	public/build/2f623677-db60-4800-ae05-1de8e6f7119b/main.js
#	public/build/2f623677-db60-4800-ae05-1de8e6f7119b/main.js.LICENSE.txt
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/105.js
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/105.js.LICENSE.txt
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/core-dll.css
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/core-dll.js.LICENSE.txt
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/fonts/Lato-Bold.636be8de.ttf
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/fonts/Lato-Light.c7400fca.ttf
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/fonts/Lato-Regular.9d883d54.ttf
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/images/layers-2x.8f2c4d11.png
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/images/layers.416d9136.png
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/images/marker-icon.2b3e1faf.png
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/images/spritesheet-2x.7ea3a6d4.png
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/images/spritesheet.a4e0eb7a.svg
#	public/build/3893e1d7-af98-4082-937a-b84dbd896b17/images/spritesheet.ef32ea2b.png
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/105.js
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/105.js.LICENSE.txt
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/core-dll.css
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/core-dll.js
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/core-dll.js.LICENSE.txt
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/fonts/Lato-Bold.636be8de.ttf
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/fonts/Lato-Light.c7400fca.ttf
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/fonts/Lato-Regular.9d883d54.ttf
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/images/layers-2x.8f2c4d11.png
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/images/layers.416d9136.png
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/images/marker-icon.2b3e1faf.png
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/images/spritesheet-2x.7ea3a6d4.png
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/images/spritesheet.a4e0eb7a.svg
#	public/build/65c637ca-c3f5-44ac-a924-650388b9e379/images/spritesheet.ef32ea2b.png
#	public/build/725ab79b-3143-4cdb-b80c-a30e4ffa461a/vendor.js
#	public/build/725ab79b-3143-4cdb-b80c-a30e4ffa461a/vendor.js.LICENSE.txt
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/105.js
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/105.js.LICENSE.txt
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/core-dll.css
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/core-dll.js
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/core-dll.js.LICENSE.txt
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/fonts/Lato-Bold.636be8de.ttf
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/fonts/Lato-Light.c7400fca.ttf
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/fonts/Lato-Regular.9d883d54.ttf
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/images/layers-2x.8f2c4d11.png
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/images/layers.416d9136.png
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/images/marker-icon.2b3e1faf.png
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/images/spritesheet-2x.7ea3a6d4.png
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/images/spritesheet.a4e0eb7a.svg
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/images/spritesheet.ef32ea2b.png
#	public/build/93311a19-ec30-43bb-8869-790d86cee68a/manifest.json
#	public/build/c9d487e0-ca2e-43c0-a4f5-ee680ca35472/vendor.js
#	public/build/c9d487e0-ca2e-43c0-a4f5-ee680ca35472/vendor.js.LICENSE.txt
#	public/build/ca48ba3e-d9d0-485f-ba89-988aab4c7123/main.js
#	public/build/ca48ba3e-d9d0-485f-ba89-988aab4c7123/main.js.LICENSE.txt
#	public/build/e3db547c-db55-4d91-a653-0bb72b60cb7d/main.js
#	public/build/e3db547c-db55-4d91-a653-0bb72b60cb7d/main.js.LICENSE.txt
@markus-moser
Implement modal open/ok/cancel
e46914d
@markus-moser
Implement add marker/hotspot functionality
538f12e
@markus-moser @github-actions
Apply eslint-fixer changes
343b1cf
@markus-moser @github-actions
Automatic frontend build
ec46541
@markus-moser
Sonar fixes
ccc3a8d
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
fec397e
@markus-moser @github-actions
Automatic frontend build
ed00682
@markus-moser
Add marker clone + toolitps
2860a44
@markus-moser @github-actions
Automatic frontend build
c7fcf11
@markus-moser
Icon cleanup
437b73c
@markus-moser @github-actions
Automatic frontend build
f9b814d
@markus-moser
Avoid drag&drop problems by using a container for the modals outside-…
26a4d75 
…of the sortable context
@markus-moser @github-actions
Automatic frontend build
80e2117
@markus-moser
Simplify translation keys
00f18a0
@markus-moser
Fix sonar
ac2894d
@markus-moser
Merge branch '1.x' into hotspot-image
81444b9
@markus-moser @github-actions
Automatic frontend build
0c7ff18
@markus-moser
Cleanup
11b0e09
@markus-moser @github-actions
Automatic frontend build
56d2fad
@markus-moser
Fix problems when sorting and changing images
8f02585
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
c72185e
markus-moser and others added 23 commits January 15, 2025 16:29
@markus-moser @github-actions
Automatic frontend build
8570f47
@markus-moser
Merge remote-tracking branch 'origin/1.x' into hotspot-image
bf580bc
@markus-moser @github-actions
Automatic frontend build
1cd897d
@markus-moser
Add clear data functionality
b5868c7
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
c4df468
@markus-moser
Add "empty" feature
2b17f9d
@markus-moser @github-actions
Automatic frontend build
ca984aa
@markus-moser
Add remove-marker icon
14354e2
@markus-moser @github-actions
Automatic frontend build
4eb0621
@markus-moser
Do not upscale images with too small dimensions
9a3e333
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
f9f7f2c
@markus-moser @github-actions
Automatic frontend build
1ed88ca
@markus-moser
Respect the marker dimensions so that the coordinates are exactly at …
f76b745 
…the pin
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
3de294e
@markus-moser @github-actions
Automatic frontend build
8c245d5
@markus-moser
Add clear hotspots/crop data confirm
15a17a0
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
facf609
@markus-moser @github-actions
Automatic frontend build
f7451e8
@markus-moser
Improve translation key
8a4a0ef
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
db275e8
@markus-moser @github-actions
Automatic frontend build
97685e1
@markus-moser
Add hotspots/markers indicator button
e4346ba
@markus-moser
Merge remote-tracking branch 'origin/hotspot-image' into hotspot-image
ca08931
@markus-moser markus-moser marked this pull request as ready for review January 16, 2025 12:35
@markus-moser markus-moser merged commit d56e6ce into 1.x Jan 16, 2025
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
2 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@markus-moser markus-moser deleted the hotspot-image branch January 16, 2025 12:40
@github-actions github-actions bot locked and limited conversation to collaborators Jan 16, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@markus-moser @sholzer