1.0.49

html/index.ts

@@ -1,10 +1,10 @@
 // dees tools
-import * as deesWccTools from '@designestate/dees-wcctools';
+import * as deesWccTools from '../ts_web';
 import * as deesDomTools from '@designestate/dees-domtools';
 
 // elements and pages
-import * as elements from '../ts_web/elements';
-import * as pages from '../ts_web/pages';
+import * as elements from '../test/elements';
+import * as pages from '../test/pages';
 
 deesWccTools.setupWccTools(elements as any, pages);
 deesDomTools.elementBasic.setup();

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-wcctools",
-  "version": "1.0.41",
+  "version": "1.0.49",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1153,6 +1153,15 @@
         "sweet-scroll": "^4.0.0"
       }
     },
+    "@designestate/dees-element": {
+      "version": "1.0.6",
+      "resolved": "https://verdaccio.lossless.one/@designestate%2fdees-element/-/dees-element-1.0.6.tgz",
+      "integrity": "sha512-nYwFrXlDpm85fDDu9IkvrRWartgDabcxs3DDwNLKamd0DmL2EJjYrEpkme7V25gfw9TuwIPXmBcvpKpqrRtNcQ==",
+      "requires": {
+        "@designestate/dees-domtools": "^1.0.70",
+        "lit-element": "^2.4.0"
+      }
+    },
     "@gitzone/tsbuild": {
       "version": "2.1.25",
       "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.25.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-wcctools",
-  "version": "1.0.41",
+  "version": "1.0.49",
   "private": false,
   "description": "wcc tools for creating element catalogues",
   "main": "dist_ts_web/index.js",
@@ -14,6 +14,7 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@designestate/dees-domtools": "^1.0.74",
+    "@designestate/dees-element": "^1.0.6",
     "@gitzone/tsrun": "^1.2.12",
     "@pushrocks/smartdelay": "^2.0.10",
     "@pushrocks/smartexpress": "^3.0.97",

test/elements/test-demoelement.ts

@@ -1,27 +1,38 @@
-import { LitElement, customElement, TemplateResult, html } from 'lit-element';
+import { DeesElement, customElement, TemplateResult, html } from '@designestate/dees-element';
 
 import * as domtools from '@designestate/dees-domtools';
 
 @customElement('test-demoelement')
-export class TestDemoelement extends LitElement {
+export class TestDemoelement extends DeesElement {
   public static demo = () => html`<test-demoelement></test-demoelement>`;
 
   public render() {
     return html`
       <style>
-        .maincontainer {
+        .maincontainer, .themeindicator {
           display: block;
-          background: #fff;
           padding: 10px;
           border-radius: 10px;
+          margin-bottom: 20px;
+        }
+        .maincontainer {
+            color: #fff;
+            background: #000;
+        }
+        .themeindicator {
+          color: ${this.goBright ? '#000' : '#fff'};
+          background: ${this.goBright ? '#fff' : '#000'};
         }
         ${domtools.breakpoints.cssForPhablet(`
-          .maincontainer {
-            background: #000;
+          .maincontainer, .themeindicator {
+            border-radius: 50px;
           }
         `)}
       </style>
-      <div class="maincontainer">This is a demo element</div>
+      <div class="maincontainer"><slot>This is a demo element</slot></div>
+      <div class="themeindicator">
+        You have selected the ${this.goBright ? 'bright' : 'dark'} theme;
+      </div>
     `;
   }
 }

ts_web/elements/wcc-dashboard.ts

@@ -20,7 +20,10 @@ export class WccDashboard extends LitElement {
   public selectedType: TElementType;
 
   @property()
-  public selectedItem: TemplateResult | LitElement;
+  public selectedItemName: string;
+
+  @property()
+  public selectedItem: (() => TemplateResult) | LitElement;
 
   @property()
   public selectedViewport: plugins.deesDomtools.breakpoints.TViewport = 'desktop';
@@ -29,7 +32,7 @@ export class WccDashboard extends LitElement {
   public selectedTheme: TTheme = 'dark';
 
   @property()
-  public pages: { [key: string]: TemplateResult } = {};
+  public pages: { [key: string]: () => TemplateResult } = {};
 
   @property()
   public elements: { [key: string]: LitElement } = {};
@@ -39,7 +42,7 @@ export class WccDashboard extends LitElement {
 
   constructor(
     elementsArg?: { [key: string]: LitElement },
-    pagesArg?: { [key: string]: TemplateResult }
+    pagesArg?: { [key: string]: () => TemplateResult }
   ) {
     super();
     if (elementsArg) {
@@ -56,7 +59,6 @@ export class WccDashboard extends LitElement {
   public render(): TemplateResult {
     return html`
       <style>
-        @import url('https://fonts.googleapis.com/css?family=Roboto');
         :host {
           font-family: 'Roboto', sans-serif;
           background: #fcfcfc;
@@ -70,12 +72,15 @@ export class WccDashboard extends LitElement {
       <wcc-sidebar
         .dashboardRef=${this}
         .selectedItem=${this.selectedItem}
-        @selectedItem=${(eventArg) => {
-          this.selectedItem = eventArg.detail;
-        }}
         @selectedType=${(eventArg) => {
           this.selectedType = eventArg.detail;
         }}
+        @selectedItemName=${(eventArg) => {
+          this.selectedItemName = eventArg.detail;
+        }}
+        @selectedItem=${(eventArg) => {
+          this.selectedItem = eventArg.detail;
+        }}
       ></wcc-sidebar>
       <wcc-properties
         .dashboardRef=${this}
@@ -93,9 +98,14 @@ export class WccDashboard extends LitElement {
       ></wcc-properties>
       <wcc-frame id="wccFrame" viewport=${this.selectedViewport}>
         ${(() => {
-          if (this.selectedItem instanceof TemplateResult) {
-            return this.selectedItem;
-          } else if (this.selectedItem) {
+          if (this.selectedType === 'page' && this.selectedItem) {
+            if (typeof this.selectedItem === 'function') {
+              return this.selectedItem();
+            } else {
+              console.error('The selected item looks strange:')
+              console.log(this.selectedItem);
+            }
+          } else if (this.selectedType === 'element' && this.selectedItem) {
             // console.log(this.selectedItem);
             const anonItem: any = this.selectedItem;
             if (!anonItem.demo) {
@@ -128,18 +138,18 @@ export class WccDashboard extends LitElement {
 
   public async firstUpdated() {
     this.domtools = await plugins.deesDomtools.DomTools.setupDomTools();
-    this.domtools.router.on('/:itemType/:itemName/:viewport/:theme', async (routeInfo) => {
+    this.domtools.router.on('/wcctools-route/:itemType/:itemName/:viewport/:theme', async (routeInfo) => {
+      this.selectedType = routeInfo.params.itemType as TElementType;
+      this.selectedItemName = routeInfo.params.itemName;
+      this.selectedViewport = routeInfo.params.viewport as TViewport;
+      this.selectedTheme = routeInfo.params.theme as TTheme;
       if (routeInfo.params.itemType === 'element') {
-        this.selectedType = 'element';
         this.selectedItem = this.elements[routeInfo.params.itemName];
       } else if (routeInfo.params.itemType === 'page') {
-        this.selectedType = 'page';
-        this.selectedItem = this.pages[routeInfo.params.pageName];
+        this.selectedItem = this.pages[routeInfo.params.itemName];
       }
       const domtoolsInstance = await plugins.deesDomtools.elementBasic.setup();
       domtoolsInstance.setVirtualViewport(routeInfo.params.viewport as TViewport);
-      this.selectedViewport = routeInfo.params.viewport as TViewport;
-      this.selectedTheme = routeInfo.params.theme as TTheme;
       domtoolsInstance.themeManager.goBrightBoolean = this.selectedTheme === 'bright';
     });
   }
@@ -166,10 +176,9 @@ export class WccDashboard extends LitElement {
 
   public buildUrl() {
     this.domtools.router.pushUrl(
-      `/${this.selectedType}/${(this.selectedItem as any).name}/${this.selectedViewport}/${
+      `/wcctools-route/${this.selectedType}/${this.selectedItemName}/${this.selectedViewport}/${
         this.selectedTheme
-      }`,
-      0
+      }`
     );
   }
 }

ts_web/elements/wcc-defaultelement.ts

@@ -16,7 +16,6 @@ export class WccDefaultElement extends LitElement {
   public render(): TemplateResult {
     return html`
       <style>
-        @import url('https://fonts.googleapis.com/css?family=Roboto');
         :host {
           font-family: 'Roboto', sans-serif;
           background: #333;

ts_web/elements/wcc-properties.ts

@@ -130,6 +130,9 @@ export class WccProperties extends LitElement {
           ${(() => {
             if (this.selectedItem && !(this.selectedItem instanceof TemplateResult)) {
               const anonItem: any = this.selectedItem;
+              if (!anonItem._classProperties) {
+                return `You have selected a page!`;
+              }
               const classProperties: Map<string, any> = anonItem._classProperties;
               const returnArray: TemplateResult[] = [];
               for (const key of classProperties.keys()) {
@@ -150,7 +153,7 @@ export class WccProperties extends LitElement {
                 this.selectTheme('dark');
               }}
             >
-              Dark<br /><i class="material-icons">nights_stay</i>
+              Dark<br /><i class="material-icons">brightness_3</i>
             </div>
             <div
               class="button ${this.selectedTheme === 'bright' ? 'selected' : null}"

ts_web/elements/wcc-sidebar.ts

@@ -10,7 +10,7 @@ export class WccSidebar extends LitElement {
   public websites: string[] = [];
 
   @property({ attribute: false })
-  public selectedItem: LitElement | TemplateResult;
+  public selectedItem: LitElement | (() => TemplateResult);
 
   @property({ attribute: false })
   public selectedType: TElementType;
@@ -41,9 +41,15 @@ export class WccSidebar extends LitElement {
 
         .heading {
           font-size: 24px;
-          text-align: center;
+          text-align: center;        
           margin: 20px 5px 5px 5px;
         }
+
+        .heading a {
+          text-decoration: none;
+          color: #fff;
+        }
+
         .subheading {
           text-align: center;
         }
@@ -92,10 +98,10 @@ export class WccSidebar extends LitElement {
         
       </style>
       <div class="heading">
-        lele-catalog
+        <a href="https://gitlab.com/designestate/dees-wcctools" target="_blank">wcctools</a>
       </div>
       <div class="subheading">
-        Lossless GmbH
+        by Lossless GmbH
       </div>
       <div class="menu">
         <h3>Live Websites</h3>
@@ -109,10 +115,10 @@ export class WccSidebar extends LitElement {
             const item = this.dashboardRef.pages[pageName];
             return html`
               <div
-                class="selectOption ${this.selectedItem === item ? 'selected' : console.log('hi')}"
+                class="selectOption ${this.selectedItem === item ? 'selected' : null}"
                 @click=${async () => {
                   const domtools = await plugins.deesDomtools.DomTools.setupDomTools();
-                  this.selectItem('page', item);
+                  this.selectItem('page', pageName, item);
                 }}
               >
                 <i class="material-icons">insert_drive_file</i>
@@ -131,7 +137,7 @@ export class WccSidebar extends LitElement {
                 class="selectOption ${this.selectedItem === item ? 'selected' : console.log('hi')}"
                 @click=${async () => {
                   const domtools = await plugins.deesDomtools.DomTools.setupDomTools();
-                  this.selectItem('element', item);
+                  this.selectItem('element', elementName, item);
                 }}
               >
                 <i class="material-icons">featured_video</i>
@@ -144,20 +150,28 @@ export class WccSidebar extends LitElement {
     `;
   }
 
-  public selectItem(typeArg: TElementType, itemArg: TemplateResult | LitElement) {
+  public selectItem(typeArg: TElementType, itemNameArg: string, itemArg: (() => TemplateResult) | LitElement) {
     console.log('selected item');
+    console.log(itemNameArg);
+    console.log(itemArg);
     this.selectedItem = itemArg;
     this.selectedType = typeArg;
-    this.dispatchEvent(
-      new CustomEvent('selectedItem', {
-        detail: itemArg
-      })
-    );
     this.dispatchEvent(
       new CustomEvent('selectedType', {
         detail: typeArg
       })
     );
+    this.dispatchEvent(
+      new CustomEvent('selectedItemName', {
+        detail: itemNameArg
+      })
+    );
+    this.dispatchEvent(
+      new CustomEvent('selectedItem', {
+        detail: itemArg
+      })
+    );
+    
     this.dashboardRef.buildUrl();
   }
 }

ts_web/index.ts

@@ -1,7 +1,7 @@
 import { WccDashboard } from './elements/wcc-dashboard';
 import { LitElement, TemplateResult } from 'lit-element';
 
-const setupWccTools = (elementsArg?: { [key: string]: LitElement }, pagesArg?: { [key: string]: TemplateResult }) => {
+const setupWccTools = (elementsArg?: { [key: string]: LitElement }, pagesArg?: { [key: string]: () => TemplateResult }) => {
   let hasRun = false;
   const runWccToolsSetup = async () => {
     if (document.readyState === 'complete' && !hasRun) {