diff --git a/Makefile b/Makefile index 43f524b30..9cdc3a989 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,9 @@ all: dep build dep: dep-tensorflow dep-js dep-go build: generate build-js build-go install: install-bin install-assets -test: reset-test-db test-js test-go +test: test-js test-go +test-go: reset-test-db run-test-go +test-short: reset-test-db run-test-short acceptance-all: start acceptance acceptance-firefox stop test-all: test acceptance-all fmt: fmt-js fmt-go @@ -91,8 +93,12 @@ acceptance-firefox: $(info Running JS acceptance tests in Firefox...) (cd frontend && npm run acceptance-firefox) reset-test-db: + $(info Purging test database...) mysql < scripts/reset-test-db.sql -test-go: +run-test-short: + $(info Running short Go unit tests in parallel mode...) + $(GOTEST) -parallel 2 -count 1 -cpu 2 -short -timeout 5m ./pkg/... ./internal/... +run-test-go: $(info Running all Go unit tests...) $(GOTEST) -parallel 1 -count 1 -cpu 1 -tags slow -timeout 20m ./pkg/... ./internal/... test-parallel: @@ -101,9 +107,6 @@ test-parallel: test-verbose: $(info Running all Go unit tests in verbose mode...) $(GOTEST) -parallel 1 -count 1 -cpu 1 -tags slow -timeout 20m -v ./pkg/... ./internal/... -test-short: - $(info Running short Go unit tests in parallel mode...) - $(GOTEST) -parallel 2 -count 1 -cpu 2 -short -timeout 5m ./pkg/... ./internal/... test-race: $(info Running all Go unit tests with race detection in verbose mode...) $(GOTEST) -tags slow -race -timeout 60m -v ./pkg/... ./internal/... diff --git a/assets/resources/templates/index.tmpl b/assets/resources/templates/index.tmpl index b5950eeed..bcc89b33b 100644 --- a/assets/resources/templates/index.tmpl +++ b/assets/resources/templates/index.tmpl @@ -5,33 +5,33 @@ - {{ .clientConfig.title }} + {{ .config.title }} - - - - + + + + - - - + + + - - + + - + - + + + folder + + + + clear + + + + + + + diff --git a/frontend/src/component/p-label-clipboard.vue b/frontend/src/component/p-label-clipboard.vue index 573c1a83b..f818f852c 100644 --- a/frontend/src/component/p-label-clipboard.vue +++ b/frontend/src/component/p-label-clipboard.vue @@ -110,10 +110,10 @@ this.clearSelection(); this.expanded = false; }, - addToAlbum(albumUUID) { + addToAlbum(ppid) { this.dialog.album = false; - Api.post(`albums/${albumUUID}/photos`, {"labels": this.selection}).then(() => this.onAdded()); + Api.post(`albums/${ppid}/photos`, {"labels": this.selection}).then(() => this.onAdded()); }, onAdded() { this.clearClipboard(); diff --git a/frontend/src/component/p-navigation.vue b/frontend/src/component/p-navigation.vue index 02d4c893f..d1ae4e8e4 100644 --- a/frontend/src/component/p-navigation.vue +++ b/frontend/src/component/p-navigation.vue @@ -55,7 +55,7 @@ - {{ $gettext('Photos') }} + Photos @@ -63,7 +63,7 @@ - {{ $gettext('Photos') }} + Photos {{ config.count.photos }} @@ -71,19 +71,22 @@ - {{ $gettext('Monochrome') }} + Monochrome - + - {{ $gettext('Review') }} + + Review + {{ config.count.review }} + - {{ $gettext('Archive') }} + Archive @@ -95,7 +98,7 @@ - {{ $gettext('Favorites') }} + Favorites {{ config.count.favorites }} @@ -108,7 +111,7 @@ - {{ $gettext('Private') }} + Private {{ config.count.private }} @@ -121,7 +124,7 @@ - {{ $gettext('Videos') }} + Videos {{ config.count.videos }} @@ -134,45 +137,65 @@ - {{ $gettext('Albums') }} + Albums - + - {{ $gettext('Albums') }} + Albums {{ config.count.albums }} + + + + Folders + {{ config.count.folders }} + + + + + :to="{ name: 'album', params: { uid: album.UID, slug: album.Slug } }"> - {{ album.AlbumName }} + {{ album.Name }} Untitled - + - label + star - {{ $gettext('Labels') }} - {{ config.count.labels }} + Moments + {{ config.count.moments }} + + @@ -181,7 +204,7 @@ - {{ $gettext('Places') }} + Places {{ config.count.places }} @@ -220,6 +243,34 @@ + + + + + + label + + + + + Labels + {{ config.count.labels }} + + + + camera_roll @@ -227,7 +278,7 @@ - {{ $gettext('Library') }} + Originals @@ -239,7 +290,7 @@ - {{ $gettext('Settings') }} + Settings @@ -251,7 +302,7 @@ - {{ $gettext('Logout') }} + Logout @@ -263,7 +314,7 @@ - {{ $gettext('Login') }} + Login @@ -330,7 +381,7 @@ }, createAlbum() { let name = "New Album"; - const album = new Album({AlbumName: name, AlbumFavorite: true}); + const album = new Album({Name: name, Favorite: true}); album.save(); }, logout() { diff --git a/frontend/src/component/p-photo-cards.vue b/frontend/src/component/p-photo-cards.vue index 5bc08c4a3..b22d1933b 100644 --- a/frontend/src/component/p-photo-cards.vue +++ b/frontend/src/component/p-photo-cards.vue @@ -54,7 +54,7 @@ ma-0 class="p-photo-live" style="overflow: hidden;" - v-if="photo.PhotoType === 'live'" + v-if="photo.Type === 'live'" v-show="hover" > - lock @@ -79,14 +79,14 @@ - favorite + favorite favorite_border - burst_mode - photo_camera @@ -111,22 +111,22 @@
-

+

-
- {{ photo.PhotoDescription }} +
+ {{ photo.Description }}
-