Compare commits

..

12 Commits

Author SHA1 Message Date
0294895f78 3.0.10 2020-11-05 20:03:13 +00:00
74fc97a220 fix(core): update 2020-11-05 20:03:12 +00:00
bab9124ad9 3.0.9 2020-11-05 18:36:09 +00:00
fda71ac3e6 fix(core): update 2020-11-05 18:36:08 +00:00
3d6a421d25 3.0.8 2020-11-05 17:56:36 +00:00
a7fca4e0c1 fix(core): update 2020-11-05 17:56:35 +00:00
782c9cd740 3.0.7 2020-11-05 17:27:10 +00:00
b8ab19a683 fix(core): update 2020-11-05 17:27:10 +00:00
e47869caed 3.0.6 2020-11-05 17:15:28 +00:00
4f06c5d7c5 fix(core): update 2020-11-05 17:15:27 +00:00
c0d223959d 3.0.5 2020-11-05 15:35:32 +00:00
c40c01b5c8 fix(core): update 2020-11-05 15:35:31 +00:00
8 changed files with 60 additions and 23 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/websetup", "name": "@pushrocks/websetup",
"version": "3.0.4", "version": "3.0.10",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/websetup", "name": "@pushrocks/websetup",
"version": "3.0.4", "version": "3.0.10",
"private": false, "private": false,
"description": "setup basic page properties", "description": "setup basic page properties",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
@ -24,6 +24,7 @@
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartpromise": "^3.1.3", "@pushrocks/smartpromise": "^3.1.3",
"@tsclass/tsclass": "^3.0.29" "@tsclass/tsclass": "^3.0.29"
}, },

View File

@ -2,7 +2,7 @@ import * as plugins from '../websetup.plugins';
export interface IMetaObject { export interface IMetaObject {
title: string; title: string;
description: string; description?: string;
canonicalDomain?: string; canonicalDomain?: string;
ldCompany?: plugins.tsclass.business.ICompany; ldCompany?: plugins.tsclass.business.ICompany;
ldProduct?: any; ldProduct?: any;

View File

@ -63,13 +63,15 @@ export class JsonLdTag extends Tag {
}, },
"description": newsArticleArg.author.firstName "description": newsArticleArg.author.firstName
}; };
const ldTag = new JsonLdTag(newsArticleArg);
return ldTag;
} }
constructor(ldObjectArg: any) { constructor(ldObjectArg: any) {
super(); super();
const jsonLdElement = document.createElement('script'); const jsonLdElement = document.createElement('script');
jsonLdElement.type = 'application/ld+json'; jsonLdElement.type = 'application/ld+json';
jsonLdElement.text = JSON.stringify(JSON.stringify(ldObjectArg)); jsonLdElement.text = JSON.stringify(ldObjectArg);
this.elementRef = jsonLdElement; this.elementRef = jsonLdElement;
} }
} }

View File

@ -6,19 +6,36 @@ import * as plugins from './websetup.plugins';
export type TBaseLevelType = 'global' | 'base' | 'subpage'; export type TBaseLevelType = 'global' | 'base' | 'subpage';
export type TLevelState = 'enabled' | 'disabled';
export class TagLevel { export class TagLevel {
public tagManagerRef: TagManager; public tagManagerRef: TagManager;
public title: string; private titleStore: string;
public set title(titleArg: string) {
this.titleStore = titleArg;
if (this.state === 'enabled') {
document.title = this.titleStore;
}
}
public get title() {
return this.titleStore;
}
public type: TBaseLevelType; public type: TBaseLevelType;
public tags: Tag[] = []; public tags: Tag[] = [];
public state: TLevelState = 'disabled';
constructor(tagManagerRefArg: TagManager, levelType: TBaseLevelType) { constructor(tagManagerRefArg: TagManager, levelType: TBaseLevelType) {
this.tagManagerRef = tagManagerRefArg; this.tagManagerRef = tagManagerRefArg;
} }
public addTag(tagArg: Tag) { public addTag(tagArg: Tag) {
this.tags.push(tagArg); this.tags.push(tagArg);
if (this.state === 'enabled') {
tagArg.appendToDom();
}
} }
public async addCompanyInfo(companyDataArg: plugins.tsclass.business.ICompany) { public async addCompanyInfo(companyDataArg: plugins.tsclass.business.ICompany) {
@ -52,7 +69,9 @@ export class TagLevel {
); );
} }
public addPostInfo() {} public addNewsArticleInfo(articleArg: plugins.tsclass.content.IArticle) {
this.addTag(JsonLdTag.createNewsArticleLd(articleArg));
}
public async enable() { public async enable() {
if (this.title) { if (this.title) {
@ -61,11 +80,13 @@ export class TagLevel {
for (const tagArg of this.tags) { for (const tagArg of this.tags) {
tagArg.appendToDom(); tagArg.appendToDom();
} }
this.state = 'enabled';
} }
public async disable() { public async disable() {
for (const tagArg of this.tags) { for (const tagArg of this.tags) {
tagArg.removeFromDom(); tagArg.removeFromDom();
} }
this.state = 'disabled';
} }
} }

View File

@ -6,22 +6,22 @@ import { JsonLdTag } from './websetup.classes.tag.jsonldtag';
import { OpengraphTag } from './websetup.classes.tag.opengraphtag'; import { OpengraphTag } from './websetup.classes.tag.opengraphtag';
export class TagManager { export class TagManager {
public globalLevel: TagLevel; public globalLevel: TagLevel = new TagLevel(this, 'global');
public baseLevel: TagLevel; public baseLevel: TagLevel = new TagLevel(this, 'base');
public activeLevel: TagLevel; public activeLevel: TagLevel;
public async setup(metaObjectArg: interfaces.IMetaObject) { public async setup(metaObjectArg: interfaces.IMetaObject) {
// global tag level // global tag level
this.globalLevel = new TagLevel(this, 'global');
this.globalLevel.addTag(new MetaTag('google', 'notranslate')); this.globalLevel.addTag(new MetaTag('google', 'notranslate'));
this.globalLevel.addTag(new MetaTag('revisit-after', '1 days')); this.globalLevel.addTag(new MetaTag('revisit-after', '1 days'));
// base tag level // base tag level
this.baseLevel = new TagLevel(this, 'base');
this.baseLevel.title = metaObjectArg.title; this.baseLevel.title = metaObjectArg.title;
if (metaObjectArg.description) {
this.baseLevel.addTag(new MetaTag('description', metaObjectArg.description)); this.baseLevel.addTag(new MetaTag('description', metaObjectArg.description));
}
if (metaObjectArg.canonicalDomain) { if (metaObjectArg.canonicalDomain) {
this.baseLevel.addTag(new MetaTag('canonical', metaObjectArg.canonicalDomain)); this.baseLevel.addTag(new MetaTag('canonical', metaObjectArg.canonicalDomain));
@ -31,23 +31,27 @@ export class TagManager {
this.baseLevel.addCompanyInfo(metaObjectArg.ldCompany); this.baseLevel.addCompanyInfo(metaObjectArg.ldCompany);
} }
await this.globalLevel.enable(); await this.globalLevel.enable();
await this.baseLevel.enable(); this.activeLevel = this.baseLevel;
await this.activeLevel.enable();
} }
public setSubPageLevel(metaObjectArg: interfaces.IMetaObject) { public async setSubPageLevel(metaObjectArg: interfaces.IMetaObject) {
const subPageLevel = new TagLevel(this, 'subpage'); const subPageLevel = new TagLevel(this, 'subpage');
subPageLevel.title = metaObjectArg.title; subPageLevel.title = metaObjectArg.title;
if (metaObjectArg.description) {
subPageLevel.addTag(new MetaTag('description', metaObjectArg.description)); subPageLevel.addTag(new MetaTag('description', metaObjectArg.description));
this.activeLevel.disable(); }
await this.activeLevel.disable();
this.activeLevel = subPageLevel; this.activeLevel = subPageLevel;
this.activeLevel.enable(); await this.activeLevel.enable();
return subPageLevel;
} }
public revertToBaseLevel() { public async revertToBaseLevel() {
if (this.activeLevel !== this.baseLevel) { if (this.activeLevel !== this.baseLevel) {
this.activeLevel.disable(); await this.activeLevel.disable();
this.activeLevel = this.baseLevel; this.activeLevel = this.baseLevel;
this.activeLevel.enable(); await this.activeLevel.enable();
} }
} }
} }

View File

@ -25,7 +25,10 @@ export class WebSetup {
/** /**
* an async setup called by the constructor * an async setup called by the constructor
*/ */
private async setup() { public async setup(optionsArg?: IWebSetupConstructorOptions) {
if (optionsArg) {
this.options = optionsArg;
}
await this.tagManager.setup(this.options.metaObject); await this.tagManager.setup(this.options.metaObject);
} }
@ -38,7 +41,12 @@ export class WebSetup {
/** /**
* sets a subpage * sets a subpage
* @param metaObject * @param metaObjectArg
*/ */
public setSubLevel(metaObject: interfaces.IMetaObject) {} public async setSubLevel(metaObjectArg: interfaces.IMetaObject) {
const subLevel = await this.tagManager.setSubPageLevel(metaObjectArg);
return subLevel;
}
public flashTitle(flashTextArg: string) {}
} }

View File

@ -1,7 +1,8 @@
// pushrocks scope // pushrocks scope
import * as smartdelay from '@pushrocks/smartdelay';
import * as smartpromise from '@pushrocks/smartpromise'; import * as smartpromise from '@pushrocks/smartpromise';
export { smartpromise }; export { smartdelay, smartpromise };
// tsclass scope // tsclass scope
import * as tsclass from '@tsclass/tsclass'; import * as tsclass from '@tsclass/tsclass';