1.0.43

fix(core): update
1.0.42
2020-11-27 15:59:18 +00:00 · 2020-11-27 15:59:18 +00:00 · 2020-11-26 03:16:19 +00:00 · 2020-11-26 03:16:18 +00:00 · 2020-11-26 02:59:47 +00:00 · 2020-11-26 02:59:46 +00:00
9 changed files with 75 additions and 35 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -19,23 +19,35 @@ mirror:
  stage: security
  script:
    - npmci git mirror
+  only:
+    - tags
  tags:
    - lossless
    - docker
    - notpriv

-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
  stage: security
  script:
    - npmci npm prepare
    - npmci command npm install --ignore-scripts
    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
  tags:
-    - lossless
    - docker
-    - notpriv
+  allow_failure: true

 # ====================
 # test stage
@ -50,9 +62,7 @@ testStable:
    - npmci npm test
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - lossless
    - docker
-    - priv

 testBuild:
  stage: test
@ -63,9 +73,7 @@ testBuild:
    - npmci command npm run build
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-    - lossless
    - docker
-    - notpriv

 release:
  stage: release
@ -85,6 +93,8 @@ release:
 codequality:
  stage: metadata
  allow_failure: true
+  only:
+    - tags
  script:
    - npmci command npm install -g tslint typescript
    - npmci npm prepare
--- a/html/index.html
+++ b/html/index.html
@ -9,7 +9,6 @@
      content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height"
    />
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />

    <style>
      body {
@ -18,7 +17,8 @@
      }
    </style>

-    <script src="../test/index.ts"></script>
+    <script src="./index.ts"></script>
  </head>
-  <body></body>
+  <body>
+  </body>
 </html>
--- a/html/index.ts
+++ b/html/index.ts
@ -0,0 +1,10 @@
+// dees tools
+import * as deesWccTools from '../ts_web';
+import * as deesDomTools from '@designestate/dees-domtools';
+
+// elements and pages
+import * as elements from '../test/elements';
+import * as pages from '../test/pages';
+
+deesWccTools.setupWccTools(elements as any, pages);
+deesDomTools.elementBasic.setup();
--- a/npmextra.json
+++ b/npmextra.json
@ -1,6 +1,6 @@
 {
  "gitzone": {
-    "projectType": "element",
+    "projectType": "wcc",
    "module": {
      "githost": "gitlab.com",
      "gitscope": "designestate",
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@designestate/dees-wcctools",
-  "version": "1.0.39",
+  "version": "1.0.43",
  "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",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@designestate/dees-wcctools",
-  "version": "1.0.39",
+  "version": "1.0.43",
  "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",
--- a/ts_web/elements/wcc-dashboard.ts
+++ b/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,8 +98,8 @@ export class WccDashboard extends LitElement {
      ></wcc-properties>
      <wcc-frame id="wccFrame" viewport=${this.selectedViewport}>
        ${(() => {
-          if (this.selectedItem instanceof TemplateResult) {
-            return this.selectedItem;
+          if (this.selectedType === 'page') {
+            return this.selectedItem();
          } else if (this.selectedItem) {
            // console.log(this.selectedItem);
            const anonItem: any = this.selectedItem;
@ -166,7 +171,7 @@ export class WccDashboard extends LitElement {

  public buildUrl() {
    this.domtools.router.pushUrl(
-      `/${this.selectedType}/${(this.selectedItem as any).name}/${this.selectedViewport}/${
+      `/${this.selectedType}/${this.selectedItemName}/${this.selectedViewport}/${
        this.selectedTheme
      }`,
      0
--- a/ts_web/elements/wcc-defaultelement.ts
+++ b/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;
--- a/ts_web/elements/wcc-sidebar.ts
+++ b/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;
@ -109,10 +109,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 +131,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 +144,26 @@ 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');
    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();
  }
 }
Author	SHA1	Message	Date
Phil Kunz	64d6379cd2	1.0.43	2020-11-27 15:59:18 +00:00
Phil Kunz	847733286c	fix(core): update	2020-11-27 15:59:18 +00:00
Phil Kunz	67a037c511	1.0.42	2020-11-26 03:16:19 +00:00
Phil Kunz	21bcdb2e01	fix(core): update	2020-11-26 03:16:18 +00:00
Phil Kunz	1743490a26	1.0.41	2020-11-26 02:59:47 +00:00
Phil Kunz	2f9ec6a700	fix(core): update	2020-11-26 02:59:46 +00:00
Phil Kunz	3a89888289	1.0.40	2020-11-26 02:56:12 +00:00
Phil Kunz	98909c61ff	fix(core): update	2020-11-26 02:56:11 +00:00