diff --git a/internal/colors/colors.go b/internal/colors/colors.go index f592bbd30..8c301ea6a 100644 --- a/internal/colors/colors.go +++ b/internal/colors/colors.go @@ -156,22 +156,22 @@ func (m LightMap) Hex() (result string) { } var ColorExamples = map[Color]string{ - Red: "#E57373", + Red: "#E57373", Magenta: "#FF00FF", - Pink: "#F06292", - Orange: "#FFB74D", - Brown: "#A1887F", - Gold: "#FFD54F", - Yellow: "#FFF176", - Lime: "#DCE775", - Green: "#81C784", - Teal: "#4DB6AC", - Cyan: "#4DD0E1", - Blue: "#64B5F6", - Purple: "#BA68C8", - White: "#F5F5F5", - Grey: "#BDBDBD", - Black: "#333333", + Pink: "#F06292", + Orange: "#FFB74D", + Brown: "#A1887F", + Gold: "#FFD54F", + Yellow: "#FFF176", + Lime: "#DCE775", + Green: "#81C784", + Teal: "#4DB6AC", + Cyan: "#4DD0E1", + Blue: "#64B5F6", + Purple: "#BA68C8", + White: "#F5F5F5", + Grey: "#BDBDBD", + Black: "#333333", } var ColorMap = map[color.RGBA]Color{ diff --git a/internal/maps/countries.go b/internal/maps/countries.go index 0df1216a9..8ac9abfbc 100644 --- a/internal/maps/countries.go +++ b/internal/maps/countries.go @@ -252,4 +252,4 @@ var CountryNames = map[string]string{ "zm": "Zambia", "zw": "Zimbabwe", "zz": "Unknown", -} \ No newline at end of file +} diff --git a/internal/maps/location.go b/internal/maps/location.go index 92dc82f96..0a7c3289c 100644 --- a/internal/maps/location.go +++ b/internal/maps/location.go @@ -19,8 +19,7 @@ import ( HAVING photo_count > 10) ORDER BY loc_country, album_name, taken_year; - */ - +*/ // Photo location type Location struct { diff --git a/internal/maps/osm/location_test.go b/internal/maps/osm/location_test.go index 94bf204b9..50c94afdb 100644 --- a/internal/maps/osm/location_test.go +++ b/internal/maps/osm/location_test.go @@ -86,6 +86,7 @@ func TestOSM_State(t *testing.T) { assert.Equal(t, "Berlin", l.State()) }) } + /* func TestOSM_City(t *testing.T) { t.Run("Berlin", func(t *testing.T) { diff --git a/internal/photoprism/colors_test.go b/internal/photoprism/colors_test.go index 452534999..0ef3fb255 100644 --- a/internal/photoprism/colors_test.go +++ b/internal/photoprism/colors_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" + "github.com/photoprism/photoprism/internal/colors" "github.com/photoprism/photoprism/internal/config" "github.com/stretchr/testify/assert" - "github.com/photoprism/photoprism/internal/colors" ) func TestMediaFile_Colors_Testdata(t *testing.T) { diff --git a/internal/repo/category.go b/internal/repo/category.go index 25ae24b54..087d5741d 100644 --- a/internal/repo/category.go +++ b/internal/repo/category.go @@ -5,15 +5,13 @@ import ( ) type CategoryLabel struct { - Name string + Name string Title string } func (s *Repo) CategoryLabels(limit, offset int) (results []CategoryLabel) { q := s.db.NewScope(nil).DB() - // q.LogMode(true) - q = q.Table("categories"). Select("label_name AS name"). Joins("JOIN labels l ON categories.category_id = l.id").