Merge branch 'master' of https://github.com/maxence-charriere/go-app

maxence-charriere · Aug 16, 2023 · f5665d9 · f5665d9
2 parents fc91330 + 6d74dd4
commit f5665d9
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 8 deletions.
diff --git a/docs/web/icon.svg b/docs/web/icon.svg
diff --git a/pkg/app/http.go b/pkg/app/http.go
@@ -294,14 +294,18 @@ func (h *Handler) initCacheableResources() {
 
 func (h *Handler) initIcon() {
 	if h.Icon.Default == "" {
-		h.Icon.Default = "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"
-		h.Icon.Large = "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"
+		h.Icon.Default = "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"
+		h.Icon.Large = "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"
 	}
 
 	if h.Icon.AppleTouch == "" {
 		h.Icon.AppleTouch = h.Icon.Default
 	}
 
+	if h.Icon.SVG == "" {
+		h.Icon.SVG = "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.svg"
+	}
+
 	h.Icon.Default = h.resolveStaticPath(h.Icon.Default)
 	h.Icon.Large = h.resolveStaticPath(h.Icon.Large)
 	h.Icon.SVG = h.resolveStaticPath(h.Icon.SVG)

diff --git a/pkg/app/http_test.go b/pkg/app/http_test.go
@@ -356,8 +356,8 @@ func TestHandlerServeManifestJSONWithLocalDir(t *testing.T) {
 	require.Equal(t, "application/manifest+json", w.Header().Get("Content-Type"))
 	require.Contains(t, body, `"short_name": "foo"`)
 	require.Contains(t, body, `"name": "foobar"`)
-	require.Contains(t, body, `"src": "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"`)
-	require.Contains(t, body, `"src": "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"`)
+	require.Contains(t, body, `"src": "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"`)
+	require.Contains(t, body, `"src": "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"`)
 	require.Contains(t, body, `"background_color": "#0000f0"`)
 	require.Contains(t, body, `"theme_color": "#0000ff"`)
 	require.Contains(t, body, `"scope": "/"`)
@@ -383,8 +383,8 @@ func TestHandlerServeManifestJSONWithRemoteBucket(t *testing.T) {
 	require.Equal(t, "application/manifest+json", w.Header().Get("Content-Type"))
 	require.Contains(t, body, `"short_name": "foo"`)
 	require.Contains(t, body, `"name": "foobar"`)
-	require.Contains(t, body, `"src": "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"`)
-	require.Contains(t, body, `"src": "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"`)
+	require.Contains(t, body, `"src": "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"`)
+	require.Contains(t, body, `"src": "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"`)
 	require.Contains(t, body, `"background_color": "#0000f0"`)
 	require.Contains(t, body, `"theme_color": "#0000ff"`)
 	require.Contains(t, body, `"scope": "/"`)
@@ -410,8 +410,8 @@ func TestHandlerServeManifestJSONWithGitHubPages(t *testing.T) {
 	require.Equal(t, "application/manifest+json", w.Header().Get("Content-Type"))
 	require.Contains(t, body, `"short_name": "foo"`)
 	require.Contains(t, body, `"name": "foobar"`)
-	require.Contains(t, body, `"src": "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"`)
-	require.Contains(t, body, `"src": "https://github.com/maxence-charriere/go-app/blob/master/docs/web/icon.png"`)
+	require.Contains(t, body, `"src": "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"`)
+	require.Contains(t, body, `"src": "https://raw.githubusercontent.com/maxence-charriere/go-app/master/docs/web/icon.png"`)
 	require.Contains(t, body, `"background_color": "#0000f0"`)
 	require.Contains(t, body, `"theme_color": "#0000ff"`)
 	require.Contains(t, body, `"scope": "/go-app/"`)