Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix isoData not working

Browse source
This commit is contained in:
abias 2023-06-09 08:47:13 -04:00
parent a1393131f0
commit 1cb23bd8f3
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/index.tsx
View file

@ -7,7 +7,7 @@ import "bootstrap/js/dist/collapse";
import "bootstrap/js/dist/dropdown"; import "bootstrap/js/dist/dropdown";
import { HistoryService } from "../shared/services/HistoryService"; import { HistoryService } from "../shared/services/HistoryService";
const site = window.isoData.site_res; const site = JSON.parse(window.isoData).site_res;
initializeSite(site); initializeSite(site);
const wrapper = ( const wrapper = (

7
src/server/index.tsx
View file

@ -26,7 +26,6 @@ import {
favIconUrl, favIconUrl,
initializeSite, initializeSite,
isAuthPath, isAuthPath,
md,
} from "../shared/utils"; } from "../shared/utils";
const server = express(); const server = express();
@ -354,10 +353,8 @@ async function createSsrHtml(root: string, isoData: IsoDataOptionalSite) {
<!DOCTYPE html> <!DOCTYPE html>
<html ${helmet.htmlAttributes.toString()} lang="en"> <html ${helmet.htmlAttributes.toString()} lang="en">
<head> <head>
<script>window.isoData = ${md.utils.escapeHtml( <script>window.isoData = JSON.stringify(${JSON.stringify(isoData)});</script>
JSON.stringify(isoData) <script>window.lemmyConfig = ${serialize(config)};</script>
)}</script>
<script>window.lemmyConfig = ${serialize(config)}</script>
<!-- A remote debugging utility for mobile --> <!-- A remote debugging utility for mobile -->
${erudaStr} ${erudaStr}

2
src/shared/interfaces.ts
View file

@ -22,7 +22,7 @@ export interface ILemmyConfig {
declare global { declare global {
interface Window { interface Window {
isoData: IsoData; isoData: string;
lemmyConfig?: ILemmyConfig; lemmyConfig?: ILemmyConfig;
} }
} }

2
src/shared/utils.ts
View file

@ -1164,7 +1164,7 @@ export function isBrowser() {
export function setIsoData(context: any): IsoData { export function setIsoData(context: any): IsoData {
// If its the browser, you need to deserialize the data from the window // If its the browser, you need to deserialize the data from the window
if (isBrowser()) { if (isBrowser()) {
return window.isoData; return JSON.parse(window.isoData);
} else return context.router.staticContext; } else return context.router.staticContext;
} }