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

User experience interaction polish #94

Merged
merged 17 commits into from
Feb 17, 2024
Merged

User experience interaction polish #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1587027
wip zoomy zoom is back!
SmilyOrg Jan 4, 2024
8fcbc4a
Merge remote-tracking branch 'origin/main' into remove-strip-viewer
SmilyOrg Jan 14, 2024
d78b460
Mostly working dirty version
SmilyOrg Feb 4, 2024
fde958f
Interaction polish for scrollviewer
SmilyOrg Feb 7, 2024
4fa0e2a
Fix date display on mobile
SmilyOrg Feb 7, 2024
63f5295
Add back map support, remove geoview from tileviewer
SmilyOrg Feb 11, 2024
2cb0e1c
Small bug fixes and polish
SmilyOrg Feb 11, 2024
900d346
Fix left/right nav transition for scroll, more bg color polish
SmilyOrg Feb 12, 2024
c6d3866
Fixed video playback & page titles
SmilyOrg Feb 17, 2024
b41c4bb
Cleanup unused code in CollectionView
SmilyOrg Feb 17, 2024
41a56b4
Video is now controllable (finally!)
SmilyOrg Feb 17, 2024
1167b32
Prevent focusing regions outside of focused region
SmilyOrg Feb 17, 2024
e63b757
Tagging and reload fixes
SmilyOrg Feb 17, 2024
9f15a2e
Add map selection + cleanup
SmilyOrg Feb 17, 2024
85b3f24
Replace paths for better back nav
SmilyOrg Feb 17, 2024
b19a6fc
Fix reloading and video controls again...
SmilyOrg Feb 17, 2024
0cb3c5c
Fix tag search layout
SmilyOrg Feb 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
6 changes: 0 additions & 6 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,6 @@ func (*Api) PostScenes(w http.ResponseWriter, r *http.Request) {
}
if data.Search != nil {
sceneConfig.Scene.Search = string(*data.Search)
if sceneConfig.Layout.Type != layout.Strip {
sceneConfig.Layout.Type = layout.Search
}
}

scene := sceneSource.Add(sceneConfig, imageSource)
Expand Down Expand Up @@ -439,9 +436,6 @@ func (*Api) GetScenes(w http.ResponseWriter, r *http.Request, params openapi.Get
}
if params.Search != nil {
sceneConfig.Scene.Search = string(*params.Search)
if sceneConfig.Layout.Type != layout.Strip {
sceneConfig.Layout.Type = layout.Search
}
}
collection := getCollectionById(string(params.CollectionId))
if collection == nil {
Expand Down
11 changes: 11 additions & 0 deletions ui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"date-fns": "^2.28.0",
"deep-iterator": "^1.1.0",
"fast-deep-equal": "^3.1.3",
"kalmanjs": "^1.1.0",
"ol": "^6.15.1",
"overlayscrollbars": "^1.13.2",
"overlayscrollbars-vue": "^0.3.0",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export function useScene({
reset();
loadSpeed.value = 0;

if (newValue.stale && !newValue.loading && !oldValue?.loading) {
if (newValue?.stale && !newValue?.loading && !oldValue?.loading) {
console.log("scene stale, recreating...");
await recreateScene();
return;
Expand Down
Loading
Loading