Skip to content

Commit

Permalink
Merge branch 'master' into appertize_preview
Browse files Browse the repository at this point in the history
  • Loading branch information
jfmcquade authored Feb 13, 2024
2 parents b4dac68 + 0097430 commit d9af56a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
5 changes: 5 additions & 0 deletions packages/data-models/deployment.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ export interface IDeploymentConfig {
/** translated string for import. Default `./app_data/translations_source/translated_strings */
translated_strings_path?: string;
};
web: {
/** Relative path of custom favicon asset to load from app_data assets */
favicon_asset?: string;
};
workflows: {
/** path to custom workflow files to include */
custom_ts_files: string[];
Expand Down Expand Up @@ -136,6 +140,7 @@ export const DEPLOYMENT_CONFIG_EXAMPLE_DEFAULTS: IDeploymentConfig = {
source_strings_path: "./app_data/translations_source/source_strings",
translated_strings_path: "./app_data/translations_source/translated_strings",
},
web: {},
workflows: {
custom_ts_files: [],
task_cache_path: "./tasks",
Expand Down
9 changes: 7 additions & 2 deletions src/app/shared/services/seo/seo.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,15 @@ export class SeoService extends SyncServiceBase {
*/
private getDefaultSEOTags(): ISEOMeta {
const PUBLIC_URL = location.origin;
let faviconUrl = `${PUBLIC_URL}/assets/icon/favicon.png`;
const { web, app_config } = environment.deploymentConfig;
if (web?.favicon_asset) {
faviconUrl = `${PUBLIC_URL}/assets/app_data/assets/${web.favicon_asset}`;
}
return {
title: environment.deploymentConfig.app_config.APP_HEADER_DEFAULTS.title,
title: app_config.APP_HEADER_DEFAULTS.title,
description: "",
faviconUrl: `${PUBLIC_URL}/assets/icon/favicon.png`,
faviconUrl,
imageUrl: ``,
};
}
Expand Down

0 comments on commit d9af56a

Please sign in to comment.