Open platform to collect and prioritize feedback
enhancement: implement touch icons (#677)
Guilherme Oenning015dd6c5948d
diff --git a/Dockerfile b/Dockerfileindex 2583705e1..de4f84b1e 100644--- a/Dockerfile+++ b/Dockerfile@@ -4,7 +4,7 @@ RUN apk update && apk add ca-certificatesRUN mkdir /appWORKDIR /app-COPY favicon.ico /app+COPY favicon.png /appCOPY migrations /app/migrationsCOPY views /app/viewsCOPY dist /app/distdiff --git a/app/cmd/routes.go b/app/cmd/routes.goindex dc159398c..511448aab 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -31,7 +31,7 @@ func routes(r *web.Engine) *web.Engine {{assets.Use(middlewares.CORS())assets.Use(middlewares.ClientCache(365 * 24 * time.Hour))- assets.Static("/favicon.ico", "favicon.ico")+ assets.Get("/favicon/:size", handlers.Favicon())assets.Static("/assets/*filepath", "dist")}@@ -66,6 +66,7 @@ func routes(r *web.Engine) *web.Engine {tenantAssets.Get("/avatars/:size/:id/:name", handlers.Avatar())tenantAssets.Use(middlewares.ClientCache(30 * 24 * time.Hour))+ tenantAssets.Get("/images/:size/:id/favicon", handlers.Favicon())tenantAssets.Get("/images/:size/:id", handlers.ViewUploadedImage())tenantAssets.Get("/custom/:md5.css", func(c web.Context) error {return c.Blob(http.StatusOK, "text/css", []byte(c.Tenant().CustomCSS))diff --git a/app/handlers/images.go b/app/handlers/images.goindex 4b6b086e7..a56af5d58 100644--- a/app/handlers/images.go+++ b/app/handlers/images.go@@ -3,11 +3,14 @@ package handlersimport ("bytes""fmt"+ "image/color""image/png""io/ioutil""net/http""strings"+ "github.com/getfider/fider/app/pkg/env"+"github.com/getfider/fider/app/pkg/crypto""github.com/getfider/fider/app/pkg/img""github.com/getfider/fider/app/pkg/log"@@ -63,6 +66,51 @@ func Avatar() web.HandlerFunc {}}+//Favicon returns the Fider favicon by given size+func Favicon() web.HandlerFunc {+ return func(c web.Context) error {+ var (+ bytes []byte+ contentType string+ )++ id, err := c.ParamAsInt("id")+ if err == nil {+ logo, err := c.Services().Tenants.GetUpload(id)+ if err != nil {+ return c.Failure(err)+ }+ bytes = logo.Content+ contentType = logo.ContentType+ } else {+ bytes, err = ioutil.ReadFile(env.Path("favicon.png"))+ contentType = "image/png"+ if err != nil {+ return c.Failure(err)+ }+ }++ size, err := c.ParamAsInt("size")+ if err != nil {+ return c.NotFound()+ }++ bytes, err = img.Resize(bytes, size, 5)+ if err != nil {+ return c.Failure(err)+ }++ if c.QueryParam("bg") != "" {+ bytes, err = img.ChangeBackground(bytes, color.White)+ if err != nil {+ return c.Failure(err)+ }+ }++ return c.Blob(http.StatusOK, contentType, bytes)+ }+}+//ViewUploadedImage returns any uploaded image by given ID and sizefunc ViewUploadedImage() web.HandlerFunc {return func(c web.Context) error {@@ -81,7 +129,7 @@ func ViewUploadedImage() web.HandlerFunc {return c.Failure(err)}- bytes, err := img.Resize(logo.Content, size)+ bytes, err := img.Resize(logo.Content, size, 0)if err != nil {return c.Failure(err)}diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.goindex 849dbd0c4..c20938cbb 100644--- a/app/pkg/dbx/dbx_test.go+++ b/app/pkg/dbx/dbx_test.go@@ -291,7 +291,7 @@ func TestByteArray(t *testing.T) {Content []byte `db:"file"`}- fileContent, err := ioutil.ReadFile(env.Path("/favicon.ico"))+ fileContent, err := ioutil.ReadFile(env.Path("/favicon.png"))Expect(err).IsNil()_, err = trx.Execute(`diff --git a/app/pkg/img/img.go b/app/pkg/img/img.goindex 908d97c28..b6d2361c3 100644--- a/app/pkg/img/img.go+++ b/app/pkg/img/img.go@@ -4,6 +4,7 @@ import ("bytes""image"+ "image/color""image/gif""image/jpeg""image/png"@@ -40,29 +41,64 @@ func Parse(file []byte) (*File, error) {}, nil}+//ChangeBackground will change given image transparent background to given color+func ChangeBackground(file []byte, bgColor color.Color) ([]byte, error) {+ src, format, err := decode(file)+ if err != nil {+ return nil, err+ }++ if format != "png" {+ return file, nil+ }++ dst := image.NewRGBA(src.Bounds())+ draw.Draw(dst, dst.Bounds(), &image.Uniform{bgColor}, image.Point{}, draw.Src)+ draw.Draw(dst, dst.Bounds(), src, src.Bounds().Min, draw.Over)+ return encode(dst, format)+}+//Resize image based on given size-func Resize(file []byte, size int) ([]byte, error) {- src, format, err := image.Decode(bytes.NewReader(file))+func Resize(file []byte, size int, padding int) ([]byte, error) {+ src, format, err := decode(file)if err != nil {- return nil, errors.Wrap(err, "failed to decode image")+ return nil, err}+ //TODO: Very slow to resize images with aspect ratio different than 1:1+srcBounds := src.Bounds()srcW, srcH := srcBounds.Dx(), srcBounds.Dy()if (srcW <= size && srcH <= size) || srcW != srcH {- return file, nil+ size = srcW}+ padding = size * padding / 100dst := image.NewRGBA(image.Rect(0, 0, size, size))- draw.CatmullRom.Scale(dst, dst.Bounds(), src, srcBounds, draw.Src, nil)+ dstBounds := image.Rect(padding, padding, size-padding, size-padding)+ srcBounds = image.Rect(0, 0, srcBounds.Max.X, srcBounds.Max.Y)+ draw.CatmullRom.Scale(dst, dstBounds, src, srcBounds, draw.Src, nil)++ return encode(dst, format)+}++func decode(file []byte) (image.Image, string, error) {+ src, format, err := image.Decode(bytes.NewReader(file))+ if err != nil {+ return nil, "", errors.Wrap(err, "failed to decode image")+ }+ return src, format, err+}+func encode(img image.Image, format string) ([]byte, error) {+ var err errorwriter := new(bytes.Buffer)if format == "png" {- err = png.Encode(writer, dst)+ err = png.Encode(writer, img)} else if format == "jpeg" {- err = jpeg.Encode(writer, dst, nil)+ err = jpeg.Encode(writer, img, nil)} else if format == "gif" {- err = gif.Encode(writer, dst, nil)+ err = gif.Encode(writer, img, nil)}if err != nil {diff --git a/app/pkg/img/img_test.go b/app/pkg/img/img_test.goindex ff038566a..bb3a27f7c 100644--- a/app/pkg/img/img_test.go+++ b/app/pkg/img/img_test.go@@ -1,6 +1,7 @@package img_testimport (+ "image/color""io/ioutil""testing"@@ -22,7 +23,7 @@ var parseTestCases = []struct {{"/app/pkg/img/testdata/logo5.png", 200, 200, true},{"/app/pkg/img/testdata/logo6.jpg", 400, 400, true},{"/app/pkg/img/testdata/logo7.gif", 400, 400, true},- {"/favicon.ico", 0, 0, false},+ {"/app/pkg/img/testdata/favicon.ico", 0, 0, false},}func TestImageParse(t *testing.T) {@@ -49,15 +50,17 @@ var resizeTestCases = []struct {fileName stringresizedFileName stringsize int+ padding int}{- {"/app/pkg/img/testdata/logo1.png", "/app/pkg/img/testdata/logo1-200x200.png", 200},- {"/app/pkg/img/testdata/logo2.jpg", "/app/pkg/img/testdata/logo2.jpg", 200},- {"/app/pkg/img/testdata/logo3.gif", "/app/pkg/img/testdata/logo3.gif", 200},- {"/app/pkg/img/testdata/logo4.png", "/app/pkg/img/testdata/logo4-100x100.png", 100},- {"/app/pkg/img/testdata/logo5.png", "/app/pkg/img/testdata/logo5.png", 200},- {"/app/pkg/img/testdata/logo6.jpg", "/app/pkg/img/testdata/logo6-200x200.jpg", 200},- {"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7-200x200.gif", 200},- {"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7.gif", 1000},+ {"/app/pkg/img/testdata/logo1.png", "/app/pkg/img/testdata/logo1-200x200.png", 200, 0},+ //TODO: Very slow to resize images with aspect ratio different than 1:1+ // {"/app/pkg/img/testdata/logo2.jpg", "/app/pkg/img/testdata/logo2-200x200.jpg", 200, 0},+ // {"/app/pkg/img/testdata/logo3.gif", "/app/pkg/img/testdata/logo3-200x200.gif", 200, 0},+ {"/app/pkg/img/testdata/logo4.png", "/app/pkg/img/testdata/logo4-100x100.png", 100, 0},+ {"/app/pkg/img/testdata/logo5.png", "/app/pkg/img/testdata/logo5-200x200.png", 200, 0},+ {"/app/pkg/img/testdata/logo6.jpg", "/app/pkg/img/testdata/logo6-200x200.jpg", 200, 0},+ {"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7-200x200.gif", 200, 0},+ {"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7-1000-1000.gif", 1000, 0},}func TestImageResize(t *testing.T) {@@ -67,7 +70,7 @@ func TestImageResize(t *testing.T) {bytes, err := ioutil.ReadFile(env.Path(testCase.fileName))Expect(err).IsNil()- resized, err := img.Resize(bytes, testCase.size)+ resized, err := img.Resize(bytes, testCase.size, testCase.padding)Expect(err).IsNil()expected, err := ioutil.ReadFile(env.Path(testCase.resizedFileName))@@ -76,3 +79,29 @@ func TestImageResize(t *testing.T) {Expect(resized).Equals(expected)}}++var bgColorTestCases = []struct {+ fileName string+ whiteColorFileName string+ bgColor color.Color+}{+ {"/app/pkg/img/testdata/logo1.png", "/app/pkg/img/testdata/logo1-white.png", color.White},+ {"/app/pkg/img/testdata/logo1.png", "/app/pkg/img/testdata/logo1-black.png", color.Black},+}++func TestImageChangeBackground(t *testing.T) {+ RegisterT(t)++ for _, testCase := range bgColorTestCases {+ bytes, err := ioutil.ReadFile(env.Path(testCase.fileName))+ Expect(err).IsNil()++ withColor, err := img.ChangeBackground(bytes, testCase.bgColor)+ Expect(err).IsNil()++ expected, err := ioutil.ReadFile(env.Path(testCase.whiteColorFileName))+ Expect(err).IsNil()++ Expect(withColor).Equals(expected)+ }+}diff --git a/favicon.ico b/app/pkg/img/testdata/favicon.icosimilarity index 100%rename from favicon.icorename to app/pkg/img/testdata/favicon.icodiff --git a/app/pkg/img/testdata/logo1-black.png b/app/pkg/img/testdata/logo1-black.pngnew file mode 100755index 000000000..f7f0042aaBinary files /dev/null and b/app/pkg/img/testdata/logo1-black.png differdiff --git a/app/pkg/img/testdata/logo1-white.png b/app/pkg/img/testdata/logo1-white.pngnew file mode 100755index 000000000..50e0b781fBinary files /dev/null and b/app/pkg/img/testdata/logo1-white.png differdiff --git a/app/pkg/img/testdata/logo2-200x200.jpg b/app/pkg/img/testdata/logo2-200x200.jpgnew file mode 100755index 000000000..76c4ec57fBinary files /dev/null and b/app/pkg/img/testdata/logo2-200x200.jpg differdiff --git a/app/pkg/img/testdata/logo3-200x200.gif b/app/pkg/img/testdata/logo3-200x200.gifnew file mode 100755index 000000000..4c2fc35f7Binary files /dev/null and b/app/pkg/img/testdata/logo3-200x200.gif differdiff --git a/app/pkg/img/testdata/logo5-200x200.png b/app/pkg/img/testdata/logo5-200x200.pngnew file mode 100755index 000000000..f647ece27Binary files /dev/null and b/app/pkg/img/testdata/logo5-200x200.png differdiff --git a/app/pkg/img/testdata/logo7-1000-1000.gif b/app/pkg/img/testdata/logo7-1000-1000.gifnew file mode 100755index 000000000..da4eba819Binary files /dev/null and b/app/pkg/img/testdata/logo7-1000-1000.gif differdiff --git a/app/pkg/validate/upload_test.go b/app/pkg/validate/upload_test.goindex 44e20df4d..689231db1 100644--- a/app/pkg/validate/upload_test.go+++ b/app/pkg/validate/upload_test.go@@ -23,7 +23,7 @@ func TestValidateImageUpload(t *testing.T) {{"/app/pkg/img/testdata/logo4.png", 1},{"/app/pkg/img/testdata/logo5.png", 0},{"/README.md", 1},- {"/favicon.ico", 1},+ {"/app/pkg/img/testdata/favicon.ico", 1},}for _, testCase := range testCases {diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 0d09d6b61..d2fd68ace 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -555,9 +555,9 @@ func (ctx *Context) LogoURL() string {// FaviconURL return the full URL to the tenant-specific favicon URLfunc (ctx *Context) FaviconURL() string {if ctx.Tenant() != nil && ctx.Tenant().LogoID > 0 {- return ctx.TenantAssetsURL("/images/50/%d", ctx.Tenant().LogoID)+ return ctx.TenantAssetsURL("/images/:size/%d/favicon", ctx.Tenant().LogoID)}- return ctx.GlobalAssetsURL("/favicon.ico")+ return ctx.GlobalAssetsURL("/favicon/:size")}// SetCanonicalURL sets the canonical link on the HTTP Response Headersdiff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 861ab257c..511cd9cbb 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -24,6 +24,9 @@ var templateFunctions = template.FuncMap{"md5": func(input string) string {return crypto.MD5(input)},+ "replace": func(input, from, to string) string {+ return strings.Replace(input, from, to, -1)+ },"markdown": func(input string) template.HTML {return markdown.Full(input)},diff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.htmlindex 6b869aa70..a7d701ab1 100755--- a/app/pkg/web/testdata/basic.html+++ b/app/pkg/web/testdata/basic.html@@ -4,7 +4,9 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><meta http-equiv="X-UA-Compatible" content="IE=edge" />- <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/64' sizes="64x64" type="image/png">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/192' sizes="192x192" type="image/png">+ <link rel="apple-touch-icon" href='https://demo.test.fider.io:3000/favicon/180?bg=white' sizes="180x180" type="image/png">@@ -36,7 +38,7 @@<script id="server-data" type="application/json">- {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"Fider"}+ {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon/:size","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"Fider"}</script><script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>diff --git a/app/pkg/web/testdata/canonical.html b/app/pkg/web/testdata/canonical.htmlindex e818f2e5f..349ee2dda 100755--- a/app/pkg/web/testdata/canonical.html+++ b/app/pkg/web/testdata/canonical.html@@ -4,7 +4,9 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><meta http-equiv="X-UA-Compatible" content="IE=edge" />- <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/64' sizes="64x64" type="image/png">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/192' sizes="192x192" type="image/png">+ <link rel="apple-touch-icon" href='https://demo.test.fider.io:3000/favicon/180?bg=white' sizes="180x180" type="image/png"><link rel="canonical" href="http://feedback.demo.org" />@@ -38,7 +40,7 @@<script id="server-data" type="application/json">- {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__canonicalURL":"http://feedback.demo.org","__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"Fider"}+ {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__canonicalURL":"http://feedback.demo.org","__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon/:size","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"Fider"}</script><script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.htmlindex 7d17fa170..39e294085 100644--- a/app/pkg/web/testdata/chunk.html+++ b/app/pkg/web/testdata/chunk.html@@ -4,7 +4,9 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><meta http-equiv="X-UA-Compatible" content="IE=edge" />- <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/64' sizes="64x64" type="image/png">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/192' sizes="192x192" type="image/png">+ <link rel="apple-touch-icon" href='https://demo.test.fider.io:3000/favicon/180?bg=white' sizes="180x180" type="image/png">@@ -43,7 +45,7 @@<script id="server-data" type="application/json">- {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__chunkAssets":{"CSS":["/assets/css/Test.page.css"],"JS":["/assets/js/Test.page.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"Fider"}+ {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__chunkAssets":{"CSS":["/assets/css/Test.page.css"],"JS":["/assets/js/Test.page.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon/:size","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"Fider"}</script><script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>diff --git a/app/pkg/web/testdata/props.html b/app/pkg/web/testdata/props.htmlindex e157174e8..bdb947b12 100755--- a/app/pkg/web/testdata/props.html+++ b/app/pkg/web/testdata/props.html@@ -4,7 +4,9 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><meta http-equiv="X-UA-Compatible" content="IE=edge" />- <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/64' sizes="64x64" type="image/png">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/192' sizes="192x192" type="image/png">+ <link rel="apple-touch-icon" href='https://demo.test.fider.io:3000/favicon/180?bg=white' sizes="180x180" type="image/png">@@ -36,7 +38,7 @@<script id="server-data" type="application/json">- {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__description":"My Page Description","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":{"array":["1","2"],"number":2,"object":{"key1":"value1","key2":"value2"}},"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"My Page Title · Fider"}+ {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__description":"My Page Description","__favicon":"https://demo.test.fider.io:3000/favicon/:size","__logo":"https://getfider.com/images/logo-100x100.png","__props":{"array":["1","2"],"number":2,"object":{"key1":"value1","key2":"value2"}},"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"My Page Title · Fider"}</script><script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.htmlindex 2d1b7d634..1902cf87c 100755--- a/app/pkg/web/testdata/tenant.html+++ b/app/pkg/web/testdata/tenant.html@@ -4,7 +4,9 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><meta http-equiv="X-UA-Compatible" content="IE=edge" />- <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/64' sizes="64x64" type="image/png">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/192' sizes="192x192" type="image/png">+ <link rel="apple-touch-icon" href='https://demo.test.fider.io:3000/favicon/180?bg=white' sizes="180x180" type="image/png">@@ -38,7 +40,7 @@<script id="server-data" type="application/json">- {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","cname":"","isPrivate":false,"logoID":0},"__title":"Game of Thrones"}+ {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon/:size","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","cname":"","isPrivate":false,"logoID":0},"__title":"Game of Thrones"}</script><script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.htmlindex 993d4628e..6bdf6b0af 100755--- a/app/pkg/web/testdata/user.html+++ b/app/pkg/web/testdata/user.html@@ -4,7 +4,9 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><meta http-equiv="X-UA-Compatible" content="IE=edge" />- <link rel="icon" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/64' sizes="64x64" type="image/png">+ <link rel="icon" href='https://demo.test.fider.io:3000/favicon/192' sizes="192x192" type="image/png">+ <link rel="apple-touch-icon" href='https://demo.test.fider.io:3000/favicon/180?bg=white' sizes="180x180" type="image/png">@@ -36,7 +38,7 @@<script id="server-data" type="application/json">- {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__description":"My Page Description","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"My Page Title · Fider","__user":{"email":"[email protected]","id":0,"isAdministrator":true,"isCollaborator":true,"name":"Jon Snow","role":"administrator","status":"active"}}+ {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__description":"My Page Description","__favicon":"https://demo.test.fider.io:3000/favicon/:size","__logo":"https://getfider.com/images/logo-100x100.png","__props":null,"__settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"__tenant":null,"__title":"My Page Title · Fider","__user":{"email":"[email protected]","id":0,"isAdministrator":true,"isCollaborator":true,"name":"Jon Snow","role":"administrator","status":"active"}}</script><script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex ff9f7d65e..13fbd3206 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -183,7 +183,7 @@ func TestTenantStorage_UpdateSettings_WithLogo(t *testing.T) {tenant, _ := tenants.GetByDomain("demo")tenants.SetCurrentTenant(tenant)- logo, _ := ioutil.ReadFile(env.Path("./favicon.ico"))+ logo, _ := ioutil.ReadFile(env.Path("./favicon.png"))settings := &models.UpdateTenantSettings{Logo: &models.ImageUpload{@@ -203,7 +203,7 @@ func TestTenantStorage_UpdateSettings_WithLogo(t *testing.T) {Expect(err).IsNil()Expect(upload.Content).Equals(logo)Expect(upload.Size).Equals(len(logo))- Expect(upload.ContentType).Equals("image/vnd.microsoft.icon")+ Expect(upload.ContentType).Equals("image/png")//Remove Logosettings.Logo.Upload = nil@@ -223,7 +223,7 @@ func TestTenantStorage_UpdateSettings_ReplaceLogo(t *testing.T) {tenant, _ := tenants.GetByDomain("demo")tenants.SetCurrentTenant(tenant)- logo, _ := ioutil.ReadFile(env.Path("./favicon.ico"))+ logo, _ := ioutil.ReadFile(env.Path("./favicon.png"))settings := &models.UpdateTenantSettings{Logo: &models.ImageUpload{@@ -244,7 +244,7 @@ func TestTenantStorage_UpdateSettings_ReplaceLogo(t *testing.T) {Expect(err).IsNil()Expect(upload.Content).Equals(logo)Expect(upload.Size).Equals(len(logo))- Expect(upload.ContentType).Equals("image/vnd.microsoft.icon")+ Expect(upload.ContentType).Equals("image/png")//Replace logo with a new onenewLogo, _ := ioutil.ReadFile(env.Path("./README.md"))@@ -379,14 +379,14 @@ func TestTenantStorage_Save_Get_ListOAuthConfig(t *testing.T) {Expect(config).IsNil()Expect(errors.Cause(err)).Equals(app.ErrNotFound)- logo, _ := ioutil.ReadFile(env.Path("./favicon.ico"))+ logo, _ := ioutil.ReadFile(env.Path("./favicon.png"))err = tenants.SaveOAuthConfig(&models.CreateEditOAuthConfig{ID: 0,Logo: &models.ImageUpload{Upload: &models.ImageUploadData{Content: logo,- ContentType: "image/vnd.microsoft.icon",+ ContentType: "image/png",},},Provider: "_TEST",@@ -422,7 +422,7 @@ func TestTenantStorage_Save_Get_ListOAuthConfig(t *testing.T) {upload, err := tenants.GetUpload(config.LogoID)Expect(err).IsNil()Expect(upload.Content).Equals(logo)- Expect(upload.ContentType).Equals("image/vnd.microsoft.icon")+ Expect(upload.ContentType).Equals("image/png")err = tenants.SaveOAuthConfig(&models.CreateEditOAuthConfig{ID: config.ID,diff --git a/favicon.png b/favicon.pngnew file mode 100644index 000000000..be7756291Binary files /dev/null and b/favicon.png differdiff --git a/main.go b/main.goindex 8a2edf04e..015c3fa47 100644--- a/main.go+++ b/main.go@@ -21,7 +21,7 @@ var (// Use this for stable releases// version = "x.y.z"- version = "0.17.0"+ version = "0.18.0-" + buildnumber)func main() {diff --git a/public/services/utils.spec.ts b/public/services/utils.spec.tsindex 7f0f365c8..2fa452685 100644--- a/public/services/utils.spec.ts+++ b/public/services/utils.spec.ts@@ -73,10 +73,8 @@ import { readFileSync } from "fs";});test("Can convert file to base64", async () => {- const content = readFileSync("./favicon.ico");- const favicon = new File([content], "favicon.ico");+ const content = readFileSync("./favicon.png");+ const favicon = new File([content], "favicon.png");const base64 = await fileToBase64(favicon);- expect(base64).toBe(- "AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0YiwAfIqMAHBeHeR8bk6MgHJkQHxyWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACoAggA2H8QAOB3FKi0dsNsiHZ38Ix6mYCIdnwAmILEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBXPAAR4T/BTw32Jg3Ic3/KR/G/yYgtZAnIMYAJiCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYzPYASEjvADhz8kpCW+7wOj/l/ygg4/4nINVsKCDpACYgsQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG8v2ABvS9xMcwfa9N4v0/05r8f8+UenPJBjaHCce2wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYMT/AADg7QA8y/xxGNL5/BjK+f9Kn/f/YaP4xVWb9zVDkfYCTpn2AAAAAAAAAAAAAAAAAAAAAAAAAAAAj///AEDO4wBDzuMrKdHyxxLU+vckyvv/QLz9/lOo+f5QlfbnVZv3Y4zH/AFhpfgAAAAAAAAAAAAAAAAAAAAAAJaZUQC/gSIFN9C9mynWy88W0fSaH8n47D/D/f9Pw/3/UKX3/2Cj+ONgpvguYaX4AAAAAAAAAAAAAAAAAMuKGwDAgh4AxoAYQY+dVu85z7f1KNrMZxvJ+zNBwv+EQsP40y217PpIrPT/Ra36Y0is+QAAAAAAAAAAAAAAAACOTxoAxIIcAKtqG3+5eBT/h5hR/z7KpOg9yI9xUrtwGCS27hcbtu1ZJrTorzCz8FYss+0AAAAAAAAAAAAAAAAAhEUZAIM9KQCCPSRollMc/rt9FP6ZoUj/R8OI+0jBgtJ6mi96kHoAJDfBwwgRzv8HE8z/AAAAAAAAAAAAAAAAAAAAAAB9NisAezQsG4M5Kb2oYSP/xIUa/4qXQv5Hv3v/V6tH/nGBGOBYWwySYmcUNuztXgXQ0E4AAAAAAAAAAAAAAAAAfjcqAJA8JgCIOSgekUIleaxpFMuwcw/4f4gv/0yySv9OmTT/T14R/2JrFOufpTR60c9CBra3NgAAAAAAAAAAAAAAAAAAAAAAlDsRAEkAHwCnXhQUpWoTUqFnFaZ/jifnTqs6/k6MIP9VZw3/c30Y8YySHkWKkR4AaXcXAAAAAAAAAAAAAAAAAAAAAAAAAAAAn2YVALdyCgC3agoGsXkQLmCYJHxMmRzLXJIc9W19Fv9zexSAbXgVAHd+EwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+WGgA5dAoAUp4eGGKzKV9wkRvAfYASbXp/EwB/ghIA/j8AAPw/AAD4PwAA+D8AAPA/AADwHwAA4A8AAMAPAADADwAAwA8AAMAPAADABwAA4AMAAPADAAD+AwAA/4MAAA=="- );+ expect(base64).toBe(Buffer.from(content).toString("base64"));});diff --git a/views/base.html b/views/base.htmlindex 64d1708db..6a875850c 100644--- a/views/base.html+++ b/views/base.html@@ -4,7 +4,9 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><meta http-equiv="X-UA-Compatible" content="IE=edge" />- <link rel="icon" type="image/x-icon" href="{{ .__favicon }}">+ <link rel="icon" href='{{ replace .__favicon ":size" "64" }}' sizes="64x64" type="image/png">+ <link rel="icon" href='{{ replace .__favicon ":size" "192" }}' sizes="192x192" type="image/png">+ <link rel="apple-touch-icon" href='{{ replace .__favicon ":size" "180" }}?bg=white' sizes="180x180" type="image/png">{{ if .__canonicalURL }}<link rel="canonical" href="{{ .__canonicalURL }}" />{{ end }}