Skip to content

Commit

Permalink
User experience interaction polish (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
SmilyOrg authored Feb 17, 2024
2 parents 5532c9f + 0cb3c5c commit d499700
Show file tree
Hide file tree
Showing 14 changed files with 1,171 additions and 548 deletions.
6 changes: 0 additions & 6 deletions main.go
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

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
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
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

0 comments on commit d499700

Please sign in to comment.