Open platform to collect and prioritize feedback
enhancement: expose extra system params (#608)
Guilherme Oenning2c8217cba57a
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 7e9c1fd60..4fb2f85bc 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -142,7 +142,8 @@ func (r *Renderer) Render(w io.Writer, name string, props Props, ctx *Context) {"domain": r.settings.Domain,"hasLegal": r.settings.HasLegal,"baseURL": ctx.BaseURL(),- "assetsURL": ctx.TenantAssetsURL(""),+ "tenantAssetsURL": ctx.TenantAssetsURL(""),+ "globalAssetsURL": ctx.GlobalAssetsURL(""),"oauth": oauthProviders,}diff --git a/public/components/common/Gravatar.tsx b/public/components/common/Gravatar.tsxindex f8dbd5b47..525e11e71 100644--- a/public/components/common/Gravatar.tsx+++ b/public/components/common/Gravatar.tsx@@ -13,7 +13,7 @@ export const Gravatar = (props: GravatarProps) => {const size = props.size || "normal";const id = props.user ? props.user.id : 0;const name = props.user ? props.user.name : "";- const url = `${Fider.settings.assetsURL}/avatars/50/${id}/${encodeURIComponent(name || "?")}`;+ const url = `${Fider.settings.tenantAssetsURL}/avatars/50/${id}/${encodeURIComponent(name || "?")}`;const className = classSet({"c-avatar": true,diff --git a/public/models/settings.ts b/public/models/settings.tsindex 4838f3354..1fde403e0 100644--- a/public/models/settings.ts+++ b/public/models/settings.ts@@ -18,7 +18,8 @@ export interface SystemSettings {domain: string;hasLegal: boolean;baseURL: string;- assetsURL: string;+ tenantAssetsURL: string;+ globalAssetsURL: string;oauth: OAuthProviderOption[];}diff --git a/public/services/fider.ts b/public/services/fider.tsindex 8e0b9e9d1..b3a710aae 100644--- a/public/services/fider.ts+++ b/public/services/fider.ts@@ -1,16 +1,22 @@import { CurrentUser, SystemSettings, Tenant } from "@fider/models";export class FiderSession {+ private pContextID: string;private pTenant: Tenant;private pUser: CurrentUser | undefined;private pProps: { [key: string]: any } = {};constructor() {+ this.pContextID = window.__contextID;this.pProps = window.__props;this.pUser = window.__user;this.pTenant = window.__tenant;}+ public get contextID(): string {+ return this.pContextID;+ }+public get user(): CurrentUser {return this.pUser!;}diff --git a/public/services/utils.ts b/public/services/utils.tsindex 97802f164..d15155eb2 100644--- a/public/services/utils.ts+++ b/public/services/utils.ts@@ -125,7 +125,7 @@ export const isCookieEnabled = (): boolean => {export const uploadedImageURL = (id: number, size: number): string | undefined => {if (id > 0) {- return `${Fider.settings.assetsURL}/images/${size}/${id}`;+ return `${Fider.settings.tenantAssetsURL}/images/${size}/${id}`;}return undefined;};diff --git a/public/tsd.d.ts b/public/tsd.d.tsindex 3cbfa96db..ee4c3e4b0 100644--- a/public/tsd.d.ts+++ b/public/tsd.d.ts@@ -5,6 +5,7 @@ declare global {ga?: (cmd: string, evt: string, args?: any) => void;set: (key: string, value: any) => void;__props: { [key: string]: any };+ __contextID: string;__user: CurrentUser | undefined;__tenant: Tenant;__settings: SystemSettings;diff --git a/views/base.html b/views/base.htmlindex 274747af9..ba2777350 100644--- a/views/base.html+++ b/views/base.html@@ -15,7 +15,7 @@<meta property="og:image" content="{{ .__logo }}">{{ if .__tenant }}{{ if .__tenant.CustomCSS }}- <link rel="stylesheet" href="{{ .__settings.assetsURL }}/custom/{{ .__tenant.CustomCSS | md5 }}.css" />+ <link rel="stylesheet" href="{{ .__settings.tenantAssetsURL }}/custom/{{ .__tenant.CustomCSS | md5 }}.css" />{{ end }}{{ end }}</head>diff --git a/views/index.html b/views/index.htmlindex 7267af891..c97246d00 100644--- a/views/index.html+++ b/views/index.html@@ -2,6 +2,7 @@// Compressed to avoid whitespace being printed{{define "javascript"}}{{ if .__user }}window.__user = {{ .__user }};{{ end }}+ window.__contextID = {{ .__contextID }};window.__settings = {{ .__settings }};window.__tenant = {{ .__tenant }};window.__props = {};