Open platform to collect and prioritize feedback
Fixed the rendering tests
Matt Roberts5b3b6061ddd1
diff --git a/app/pkg/web/renderer_test.go b/app/pkg/web/renderer_test.goindex 717b805ad..4e73700c0 100644--- a/app/pkg/web/renderer_test.go+++ b/app/pkg/web/renderer_test.go@@ -21,7 +21,7 @@ import ()func compareRendererResponse(buf *bytes.Buffer, fileName string, ctx *web.Context) {- // os.WriteFile(env.Path(fileName), []byte(strings.Replace(buf.String(), ctx.ContextID(), "CONTEXT_ID", -1)), 0744)+ // os.WriteFile(env.Path(fileName), []byte(strings.ReplaceAll(buf.String(), ctx.ContextID(), "CONTEXT_ID")), 0744)bytes, err := os.ReadFile(env.Path(fileName))Expect(err).IsNil()Expect(strings.ReplaceAll(buf.String(), ctx.ContextID(), "CONTEXT_ID")).Equals(string(bytes))diff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.htmlindex c5c3fb69d..f4d39bc8b 100755--- a/app/pkg/web/testdata/basic.html+++ b/app/pkg/web/testdata/basic.html@@ -1,66 +1,60 @@<!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" />+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <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 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>++<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") {@@ -83,8 +77,15 @@})()</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>+++++</body></html>diff --git a/app/pkg/web/testdata/canonical.html b/app/pkg/web/testdata/canonical.htmlindex 863ecec8b..823a55fcc 100755--- a/app/pkg/web/testdata/canonical.html+++ b/app/pkg/web/testdata/canonical.html@@ -1,68 +1,62 @@<!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" />-+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <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 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>++<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") {@@ -85,8 +79,15 @@})()</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>+++++</body></html>diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.htmlindex e03ce1e3c..702ddd07d 100644--- a/app/pkg/web/testdata/chunk.html+++ b/app/pkg/web/testdata/chunk.html@@ -1,66 +1,60 @@<!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" />+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <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":"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 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>++<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") {@@ -83,8 +77,15 @@})()</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>+++++</body></html>diff --git a/app/pkg/web/testdata/home.html b/app/pkg/web/testdata/home.htmlindex 4b8f4cb52..a0d016335 100755--- a/app/pkg/web/testdata/home.html+++ b/app/pkg/web/testdata/home.html@@ -1,67 +1,60 @@<!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" />+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <div id="root"></div>- <div id="root-modal"></div>- <div id="root-toastify"></div>+ <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 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>++<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") {@@ -84,8 +77,15 @@})()</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>+++++</body></html>diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.htmlindex 8d6c72674..95c7c580b 100755--- a/app/pkg/web/testdata/home_ssr.html+++ b/app/pkg/web/testdata/home_ssr.html@@ -1,85 +1,60 @@<!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" />+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <div id="root"></div>- <div id="root-modal"></div>- <div id="root-toastify"></div>+ <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 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>++<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") {@@ -102,8 +77,17 @@})()</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>+++++++</body></html>diff --git a/app/pkg/web/testdata/oauth.html b/app/pkg/web/testdata/oauth.htmlindex 1ed4c8311..6ba48415c 100755--- a/app/pkg/web/testdata/oauth.html+++ b/app/pkg/web/testdata/oauth.html@@ -1,77 +1,60 @@<!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" />+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <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":[{"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 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>++<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") {@@ -94,8 +77,15 @@})()</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>+++++</body></html>diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.htmlindex 1c8b96f09..c77a1024a 100755--- a/app/pkg/web/testdata/tenant.html+++ b/app/pkg/web/testdata/tenant.html@@ -1,84 +1,60 @@<!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" />+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <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":{"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 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>++<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") {@@ -101,8 +77,17 @@})()</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>+++++++</body></html>diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.htmlindex 502625a22..992b582e0 100755--- a/app/pkg/web/testdata/user.html+++ b/app/pkg/web/testdata/user.html@@ -1,80 +1,60 @@<!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" />+<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" />++++- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+ <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>- <link rel="preload" href="https://demo.test.fider.io:3000/assets/locale-en.js" as="script" />- <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>+ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>- <div id="root"></div>- <div id="root-modal"></div>- <div id="root-toastify"></div>+ <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 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>++<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") {@@ -97,8 +77,15 @@})()</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>+++++</body></html>