Open platform to collect and prioritize feedback
Changed the location of the Fider Logo to serve from the app.
Matt Roberts299c24278269
diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 95ac14b99..b55a39c98 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -43,6 +43,7 @@ func routes(r *web.Engine) *web.Engine {assets.Use(middlewares.ClientCache(365 * 24 * time.Hour))assets.Get("/static/favicon", handlers.Favicon())assets.Static("/assets/*filepath", "dist")+ assets.Static("/static/assets/*filepath", "static")}feed := r.Group()diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex ef7e1a750..64f636400 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -605,7 +605,7 @@ func LogoURL(ctx context.Context) string {if hasTenant && tenant.LogoBlobKey != "" {return AssetsURL(ctx, "/static/images/%s?size=200", tenant.LogoBlobKey)}- return "https://fider.io/images/logo-100x100.png"+ return "https://login.fider.io/static/assets/logo.png"}// BaseURL return the base URL from given contextdiff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.htmlindex 4f7cd1fd1..c5c3fb69d 100755--- a/app/pkg/web/testdata/basic.html+++ b/app/pkg/web/testdata/basic.html@@ -1,60 +1,66 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>Fider</title>- <meta name="description" content="" />- <meta property="og:title" content="Fider" />- <meta property="og:description" content="" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <title>Fider</title>+ <meta name="description" content="" />+ <meta property="og:title" content="Fider" />+ <meta property="og:description" content="" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","page":"","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":null,"title":"Fider"}+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>- </script>--+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "page": "",+ "props": {},+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [],+ "postWithTags": true+ },+ "tenant": null,+ "title": "Fider"+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -77,15 +83,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>----</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/pkg/web/testdata/canonical.html b/app/pkg/web/testdata/canonical.htmlindex f6334b1e2..863ecec8b 100755--- a/app/pkg/web/testdata/canonical.html+++ b/app/pkg/web/testdata/canonical.html@@ -1,62 +1,68 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">-- <link rel="canonical" href="http://feedback.demo.org" />---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>Fider</title>- <meta name="description" content="" />- <meta property="og:title" content="Fider" />- <meta property="og:description" content="" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="canonical" href="http://feedback.demo.org" />+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","page":"","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":null,"title":"Fider"}+ <title>Fider</title>+ <meta name="description" content="" />+ <meta property="og:title" content="Fider" />+ <meta property="og:description" content="" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- </script>+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>-+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "page": "",+ "props": {},+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [],+ "postWithTags": true+ },+ "tenant": null,+ "title": "Fider"+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -79,15 +85,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>----</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.htmlindex dfdf17bc3..e03ce1e3c 100644--- a/app/pkg/web/testdata/chunk.html+++ b/app/pkg/web/testdata/chunk.html@@ -1,60 +1,66 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>Fider</title>- <meta name="description" content="" />- <meta property="og:title" content="Fider" />- <meta property="og:description" content="" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <title>Fider</title>+ <meta name="description" content="" />+ <meta property="og:title" content="Fider" />+ <meta property="og:description" content="" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","page":"Test.page","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":null,"title":"Fider"}+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>- </script>--+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "page": "Test.page",+ "props": {},+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [],+ "postWithTags": true+ },+ "tenant": null,+ "title": "Fider"+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -77,15 +83,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>----</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/pkg/web/testdata/home.html b/app/pkg/web/testdata/home.htmlindex 3297e64d6..4b8f4cb52 100755--- a/app/pkg/web/testdata/home.html+++ b/app/pkg/web/testdata/home.html@@ -1,60 +1,67 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>My Page Title · Fider</title>- <meta name="description" content="My Page Description" />- <meta property="og:title" content="My Page Title · Fider" />- <meta property="og:description" content="My Page Description" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <title>My Page Title · Fider</title>+ <meta name="description" content="My Page Description" />+ <meta property="og:title" content="My Page Title · Fider" />+ <meta property="og:description" content="My Page Description" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","description":"My Page Description","page":"","props":{"countPerStatus":{},"posts":[],"tags":[]},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":null,"title":"My Page Title · Fider"}+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>- </script>--+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "description": "My Page Description",+ "page": "",+ "props": { "countPerStatus": {}, "posts": [], "tags": [] },+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [],+ "postWithTags": true+ },+ "tenant": null,+ "title": "My Page Title · Fider"+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -77,15 +84,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>----</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.htmlindex 727bc1b48..8d6c72674 100755--- a/app/pkg/web/testdata/home_ssr.html+++ b/app/pkg/web/testdata/home_ssr.html@@ -1,60 +1,85 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>My Page Title · </title>- <meta name="description" content="My Page Description" />- <meta property="og:title" content="My Page Title · " />- <meta property="og:description" content="My Page Description" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <title>My Page Title ·</title>+ <meta name="description" content="My Page Description" />+ <meta property="og:title" content="My Page Title · " />+ <meta property="og:description" content="My Page Description" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","description":"My Page Description","page":"Test.page","props":{"countPerStatus":{},"posts":[],"tags":[]},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":{"id":0,"name":"","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","cname":"","status":0,"locale":"en","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false,"isModerationEnabled":false,"isCommercial":false},"title":"My Page Title · "}+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>- </script>--+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "description": "My Page Description",+ "page": "Test.page",+ "props": { "countPerStatus": {}, "posts": [], "tags": [] },+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [],+ "postWithTags": true+ },+ "tenant": {+ "id": 0,+ "name": "",+ "subdomain": "",+ "invitation": "",+ "welcomeMessage": "",+ "welcomeHeader": "",+ "cname": "",+ "status": 0,+ "locale": "en",+ "isPrivate": false,+ "logoBlobKey": "",+ "allowedSchemes": "",+ "isEmailAuthAllowed": false,+ "isFeedEnabled": false,+ "preventIndexing": false,+ "isModerationEnabled": false,+ "isCommercial": false+ },+ "title": "My Page Title · "+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -77,17 +102,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>------</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/pkg/web/testdata/oauth.html b/app/pkg/web/testdata/oauth.htmlindex 7019812c2..1ed4c8311 100755--- a/app/pkg/web/testdata/oauth.html+++ b/app/pkg/web/testdata/oauth.html@@ -1,60 +1,77 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>Fider</title>- <meta name="description" content="" />- <meta property="og:title" content="Fider" />- <meta property="og:description" content="" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <title>Fider</title>+ <meta name="description" content="" />+ <meta property="og:title" content="Fider" />+ <meta property="og:description" content="" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","page":"","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[{"provider":"google","displayName":"Google","clientID":"1234","url":"https://demo.test.fider.io:3000/oauth/google","callbackURL":"https://demo.test.fider.io:3000/oauth/google/callback","logoBlobKey":"google.png","isCustomProvider":false,"isEnabled":true}],"postWithTags":true},"tenant":null,"title":"Fider"}+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>- </script>--+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "page": "",+ "props": {},+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [+ {+ "provider": "google",+ "displayName": "Google",+ "clientID": "1234",+ "url": "https://demo.test.fider.io:3000/oauth/google",+ "callbackURL": "https://demo.test.fider.io:3000/oauth/google/callback",+ "logoBlobKey": "google.png",+ "isCustomProvider": false,+ "isEnabled": true+ }+ ],+ "postWithTags": true+ },+ "tenant": null,+ "title": "Fider"+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -77,15 +94,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>----</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.htmlindex 9399560fd..1c8b96f09 100755--- a/app/pkg/web/testdata/tenant.html+++ b/app/pkg/web/testdata/tenant.html@@ -1,60 +1,84 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>Game of Thrones</title>- <meta name="description" content="" />- <meta property="og:title" content="Game of Thrones" />- <meta property="og:description" content="" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <title>Game of Thrones</title>+ <meta name="description" content="" />+ <meta property="og:title" content="Game of Thrones" />+ <meta property="og:description" content="" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","page":"","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","welcomeHeader":"","cname":"","status":0,"locale":"","isPrivate":false,"logoBlobKey":"","allowedSchemes":"","isEmailAuthAllowed":false,"isFeedEnabled":false,"preventIndexing":false,"isModerationEnabled":false,"isCommercial":false},"title":"Game of Thrones"}+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>- </script>--+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "page": "",+ "props": {},+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [],+ "postWithTags": true+ },+ "tenant": {+ "id": 0,+ "name": "Game of Thrones",+ "subdomain": "",+ "invitation": "",+ "welcomeMessage": "",+ "welcomeHeader": "",+ "cname": "",+ "status": 0,+ "locale": "",+ "isPrivate": false,+ "logoBlobKey": "",+ "allowedSchemes": "",+ "isEmailAuthAllowed": false,+ "isFeedEnabled": false,+ "preventIndexing": false,+ "isModerationEnabled": false,+ "isCommercial": false+ },+ "title": "Game of Thrones"+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -77,17 +101,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>------</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.htmlindex 168530a36..502625a22 100755--- a/app/pkg/web/testdata/user.html+++ b/app/pkg/web/testdata/user.html@@ -1,60 +1,80 @@<!DOCTYPE html><html lang="en" dir="ltr" data-theme="light">-<head>- <meta charset="utf-8"/>- <meta name="viewport" content="width=device-width, initial-scale=1">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png">- <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png">- <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png">---- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />-------- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />----+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=64" sizes="64x64" type="image/png" />+ <link rel="icon" href="https://demo.test.fider.io:3000/static/favicon?size=192" sizes="192x192" type="image/png" />+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/static/favicon?size=180&bg=white" sizes="180x180" type="image/png" />- <title>My Page Title · Fider</title>- <meta name="description" content="My Page Description" />- <meta property="og:title" content="My Page Title · Fider" />- <meta property="og:description" content="My Page Description" />- <meta property="og:type" content="website" />- <meta property="og:url" content="https://demo.test.fider.io:3000/" />- <meta property="og:image" content="https://fider.io/images/logo-100x100.png">-</head>-<body>--<noscript class="container page">- <div class="mt-8">- <h2 class="text-display2">Please enable JavaScript</h2>- <p>This website requires JavaScript, please enable and reload the page.</p>- </div>-</noscript>+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>+ <title>My Page Title · Fider</title>+ <meta name="description" content="My Page Description" />+ <meta property="og:title" content="My Page Title · Fider" />+ <meta property="og:description" content="My Page Description" />+ <meta property="og:type" content="website" />+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />+ <meta property="og:image" content="https://login.fider.io/static/assets/logo.png" />+ </head>+ <body>+ <noscript class="container page">+ <div class="mt-8">+ <h2 class="text-display2">Please enable JavaScript</h2>+ <p>This website requires JavaScript, please enable and reload the page.</p>+ </div>+ </noscript>- <script id="server-data" type="application/json">-- {"contextID":"CONTEXT_ID","description":"My Page Description","page":"","props":{},"sessionID":"","settings":{"allowAllowedSchemes":true,"assetsURL":"https://demo.test.fider.io:3000","baseURL":"https://demo.test.fider.io:3000","domain":".test.fider.io","environment":"test","googleAnalytics":"","hasLegal":true,"isBillingEnabled":false,"locale":"en","localeDirection":"ltr","mode":"multi","oauth":[],"postWithTags":true},"tenant":null,"title":"My Page Title · Fider","user":{"avatarBlobKey":"","avatarType":"gravatar","avatarURL":"https://demo.test.fider.io:3000/static/avatars/gravatar/5/Jon%20Snow","email":"[email protected]","id":5,"isAdministrator":true,"isCollaborator":true,"isTrusted":false,"name":"Jon Snow","role":"administrator","status":"active"}}+ <div id="root"></div>+ <div id="root-modal"></div>+ <div id="root-toastify"></div>- </script>--+ <script id="server-data" type="application/json">+ {+ "contextID": "CONTEXT_ID",+ "description": "My Page Description",+ "page": "",+ "props": {},+ "sessionID": "",+ "settings": {+ "allowAllowedSchemes": true,+ "assetsURL": "https://demo.test.fider.io:3000",+ "baseURL": "https://demo.test.fider.io:3000",+ "domain": ".test.fider.io",+ "environment": "test",+ "googleAnalytics": "",+ "hasLegal": true,+ "isBillingEnabled": false,+ "locale": "en",+ "localeDirection": "ltr",+ "mode": "multi",+ "oauth": [],+ "postWithTags": true+ },+ "tenant": null,+ "title": "My Page Title · Fider",+ "user": {+ "avatarBlobKey": "",+ "avatarType": "gravatar",+ "avatarURL": "https://demo.test.fider.io:3000/static/avatars/gravatar/5/Jon%20Snow",+ "email": "[email protected]",+ "id": 5,+ "isAdministrator": true,+ "isCollaborator": true,+ "isTrusted": false,+ "name": "Jon Snow",+ "role": "administrator",+ "status": "active"+ }+ }+ </script><script type="text/javascript" nonce="CONTEXT_ID">;(function () {try {- if (typeof window !== 'undefined' && window.localStorage) {+ if (typeof window !== "undefined" && window.localStorage) {const params = new URLSearchParams(window.location.search)let theme = "light"if ((params.has("theme") && params.get("theme") === "light") || params.get("theme") === "dark") {@@ -77,15 +97,8 @@})()</script>---<script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>-- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>----</body>+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>+ </body></html>diff --git a/app/tasks/change_email_test.go b/app/tasks/change_email_test.goindex 4d61def17..bbf06a44f 100644--- a/app/tasks/change_email_test.go+++ b/app/tasks/change_email_test.go@@ -35,7 +35,7 @@ func TestSendChangeEmailConfirmationTask(t *testing.T) {Expect(emailmock.MessageHistory[0].TemplateName).Equals("change_emailaddress_email")Expect(emailmock.MessageHistory[0].Tenant).Equals(mock.DemoTenant)Expect(emailmock.MessageHistory[0].Props).Equals(dto.Props{- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: mock.DemoTenant.Name,diff --git a/app/tasks/delete_post_test.go b/app/tasks/delete_post_test.goindex 04d45c92c..1b41218ce 100644--- a/app/tasks/delete_post_test.go+++ b/app/tasks/delete_post_test.go@@ -77,7 +77,7 @@ func TestNotifyAboutDeletePostTask(t *testing.T) {"siteName": "Demonstration","content": template.HTML("<p>Invalid post!</p>"),"change": "<a href='http://domain.com/settings'>change your notification preferences</a>",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Jon Snow",diff --git a/app/tasks/invites_test.go b/app/tasks/invites_test.goindex 32358b6b5..cb0c9ed93 100644--- a/app/tasks/invites_test.go+++ b/app/tasks/invites_test.go@@ -44,7 +44,7 @@ func TestSendInvites(t *testing.T) {Expect(emailmock.MessageHistory[0].Tenant).Equals(mock.DemoTenant)Expect(emailmock.MessageHistory[0].Props).Equals(dto.Props{"subject": "My Subject",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Jon Snow",diff --git a/app/tasks/new_comment_test.go b/app/tasks/new_comment_test.goindex c8d444420..98d8d5523 100644--- a/app/tasks/new_comment_test.go+++ b/app/tasks/new_comment_test.go@@ -90,7 +90,7 @@ func TestNotifyAboutNewCommentTask(t *testing.T) {"view": "<a href='http://domain.com/posts/1/add-support-for-typescript'>view it on your browser</a>","change": "<a href='http://domain.com/settings'>change your notification preferences</a>","unsubscribe": "<a href='http://domain.com/posts/1/add-support-for-typescript'>unsubscribe from it</a>",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Arya Stark",@@ -205,7 +205,7 @@ func TestNotifyAboutNewCommentTask_WithMention(t *testing.T) {"view": "<a href='http://domain.com/posts/1/add-support-for-typescript'>view it on your browser</a>","change": "<a href='http://domain.com/settings'>change your notification preferences</a>","unsubscribe": "<a href='http://domain.com/posts/1/add-support-for-typescript'>unsubscribe from it</a>",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Arya Stark",@@ -324,7 +324,7 @@ func TestNotifyAboutUpdatedComment(t *testing.T) {"view": "<a href='http://domain.com/posts/1/add-support-for-typescript'>view it on your browser</a>","change": "<a href='http://domain.com/settings'>change your notification preferences</a>","unsubscribe": "<a href='http://domain.com/posts/1/add-support-for-typescript'>unsubscribe from it</a>",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Arya Stark",diff --git a/app/tasks/new_post_test.go b/app/tasks/new_post_test.goindex b250d3e28..950b8dcfb 100644--- a/app/tasks/new_post_test.go+++ b/app/tasks/new_post_test.go@@ -71,7 +71,7 @@ func TestNotifyAboutNewPostTask(t *testing.T) {"content": template.HTML("<p>TypeScript is great, please add support for it</p>"),"view": "<a href='http://domain.com/posts/1/add-support-for-typescript'>view it on your browser</a>","change": "<a href='http://domain.com/settings'>change your notification preferences</a>",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Jon Snow",diff --git a/app/tasks/signin_test.go b/app/tasks/signin_test.goindex a554c487f..d4ae64a9c 100644--- a/app/tasks/signin_test.go+++ b/app/tasks/signin_test.go@@ -29,7 +29,7 @@ func TestSendSignInEmailTask(t *testing.T) {Expect(emailmock.MessageHistory[0].TemplateName).Equals("signin_email")Expect(emailmock.MessageHistory[0].Tenant).Equals(mock.DemoTenant)Expect(emailmock.MessageHistory[0].Props).Equals(dto.Props{- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: mock.DemoTenant.Name,diff --git a/app/tasks/signup_test.go b/app/tasks/signup_test.goindex 2fa72d338..e80d300f2 100644--- a/app/tasks/signup_test.go+++ b/app/tasks/signup_test.go@@ -30,7 +30,7 @@ func TestSendSignUpEmailTask(t *testing.T) {Expect(emailmock.MessageHistory[0].TemplateName).Equals("signup_email")Expect(emailmock.MessageHistory[0].Tenant).IsNil()Expect(emailmock.MessageHistory[0].Props).Equals(dto.Props{- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Fider",diff --git a/app/tasks/status_change_test.go b/app/tasks/status_change_test.goindex 5bb3a56bc..f3b8bc596 100644--- a/app/tasks/status_change_test.go+++ b/app/tasks/status_change_test.go@@ -82,7 +82,7 @@ func TestNotifyAboutStatusChangeTask(t *testing.T) {"view": "<a href='http://domain.com/posts/1/add-support-for-typescript'>view it on your browser</a>","change": "<a href='http://domain.com/settings'>change your notification preferences</a>","unsubscribe": "<a href='http://domain.com/posts/1/add-support-for-typescript'>unsubscribe from it</a>",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Jon Snow",@@ -199,7 +199,7 @@ func TestNotifyAboutStatusChangeTask_Duplicate(t *testing.T) {"view": "<a href='http://domain.com/posts/2/i-need-typescript'>view it on your browser</a>","change": "<a href='http://domain.com/settings'>change your notification preferences</a>","unsubscribe": "<a href='http://domain.com/posts/2/i-need-typescript'>unsubscribe from it</a>",- "logo": "https://fider.io/images/logo-100x100.png",+ "logo": "https://login.fider.io/static/assets/logo.png",})Expect(emailmock.MessageHistory[0].From).Equals(dto.Recipient{Name: "Jon Snow",diff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsxindex 98ce12be4..f5f03cf5a 100644--- a/public/components/common/Logo.tsx+++ b/public/components/common/Logo.tsx@@ -24,7 +24,7 @@ export const TenantLogo = ({ size, useFiderIfEmpty = false }: TenantLogoProps) =if (tenant && tenant.logoBlobKey) {return <img src={TenantLogoURL(fider.session.tenant, size)} alt={tenant.name} />} else if (useFiderIfEmpty) {- return <img src="https://fider.io/images/logo-100x100.png" alt="Fider" height={size} width={size} />+ return <img src="https://login.fider.io/static/assets/logo.png" alt="Fider" height={size} width={size} />}return null}diff --git a/public/pages/SignUp/SignUp.page.tsx b/public/pages/SignUp/SignUp.page.tsxindex 0c26e3e80..dd801e893 100644--- a/public/pages/SignUp/SignUp.page.tsx+++ b/public/pages/SignUp/SignUp.page.tsx@@ -100,7 +100,7 @@ const SignUpPage = () => {return (<div id="p-signup" className="page container w-max-6xl"><div className="h-20 text-center mb-4">- <img className="logo" alt="Logo" src="https://fider.io/images/logo-100x100.png" />+ <img className="logo" alt="Logo" src="https://login.fider.io/static/assets/logo.png" /></div><h3 className="text-display mb-2">1. Who are you?</h3>diff --git a/static/logo.png b/static/logo.pngnew file mode 100644index 000000000..efad6b0f2Binary files /dev/null and b/static/logo.png differ