Minor adjustements

lightningrodlabs · Aug 1, 2023 · 0289dbb · 0289dbb
1 parent d5efa3f
commit 0289dbb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 37 deletions.
diff --git a/we-applet/demo/index.html b/we-applet/demo/index.html
@@ -8,10 +8,15 @@
     <link href="../dist/styles.css" rel="stylesheet" />
   </head>
   <body style="margin:0px;background: #9bb791">
-    <!-- <div id="container"></div> -->
-
+  <script type="module">
+    console.log("Waiting for Shoelace...")
+    await Promise.allSettled([
+      customElements.whenDefined('sl-tab'),
+      //customElements.whenDefined('sl-tab-group')
+    ]);
+    console.log("Shoelace READY!");
+  </script>
     <script type="module">
-      //import '@shoelace-style/shoelace/dist/themes/light.css';
       import { AppAgentWebsocket, AdminWebsocket, encodeHashToBase64,  fakeDnaHash, fakeEntryHash} from '@holochain/client';
       import { ProfilesClient } from '@holochain-open-dev/profiles';
       import { ProfilesZomeMock } from "@holochain-open-dev/profiles/dist/mocks.js";
@@ -106,19 +111,19 @@
         //console.log("mock agentId", mockProfilesZome.myPubKey);
         mockProfilesZome.myPubKey = whereCellId[1];
         //console.log("mock agentId", encodeHashToBase64(mockProfilesZome.myPubKey));
-        mockProfilesZome.create_profile({nickname: "Bobby Joe", fields: {}})
+        mockProfilesZome.create_profile({nickname: "Alex", fields: {}})
 
         /** */
         const renderers = await Applet.appletViews(
                 appAgentWs,
                 whereDemoAppletId,
                 new ProfilesClient(mockProfilesZome, mockProfilesZome.roleName),
-                 // new ProfilesClient(new ProfilesZomeMock()),
                 mockWeServices,
         );
-        renderers.main(document.body); // container, window.customElements
+        renderers.main(document.body);
       }
 
+      /** Run it */
       setup();
     </script>
   </body>

diff --git a/we-applet/package.json b/we-applet/package.json
@@ -8,8 +8,8 @@
     "build:watch": "tsc -w --preserveWatchOutput",
     "devtest": "npm run build && cross-env HC_APP_PORT=$(port) HC_ADMIN_PORT=$(port) BUILD_MODE='dev' concurrently \"npm run start:happ\" \"npm run start:ui\"",
     "devtest:ludo": "npm run build && cross-env HC_APP_PORT=$(port) HC_ADMIN_PORT=$(port) BUILD_MODE='dev' concurrently \"npm run start:happ:ludo\" \"npm run start:ui\"",
-    "start:happ": "RUST_LOG=warn WASM_LOG=debug echo \"pass\" | ../$npm_package_config_bin/hc s --piped -f=$HC_ADMIN_PORT generate ../artifacts/where.happ --run=$HC_APP_PORT -a where-applet network mdns",
-    "start:happ:ludo": "RUST_LOG=warn WASM_LOG=debug echo \"pass\" | hc s --piped -f=$HC_ADMIN_PORT generate ../artifacts/ludotheque.happ --run=$HC_APP_PORT -a ludotheque-applet network mdns",
+    "start:happ": "RUST_LOG=warn WASM_LOG=debug echo \"pass\" | ../$npm_package_config_bin/hc s --piped -f=$HC_ADMIN_PORT generate ../artifacts/where.happ --run=$HC_APP_PORT -a where-applet network mem",
+    "start:happ:ludo": "RUST_LOG=warn WASM_LOG=debug echo \"pass\" | hc s --piped -f=$HC_ADMIN_PORT generate ../artifacts/ludotheque.happ --run=$HC_APP_PORT -a ludotheque-applet network mem",
     "start:ui": "concurrently -k --names tsc,dev-server \"npm run build:watch\" \"wds --config web-dev-server.config.mjs\""
   },
   "devDependencies": {
@@ -18,7 +18,6 @@
     "@rollup/plugin-commonjs": "18.0.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-replace": "^3.0.0",
-    "@rollup/plugin-typescript": "^8.2.5",
     "@web/dev-server": "^0.1.21",
     "@web/dev-server-rollup": "^0.3.10",
     "babel-plugin-template-html-minifier": "^4.1.0",

diff --git a/we-applet/rollup.config.js b/we-applet/rollup.config.js
@@ -1,5 +1,5 @@
 import nodeResolve from "@rollup/plugin-node-resolve";
-import typescript from "@rollup/plugin-typescript";
+//import typescript from "@rollup/plugin-typescript";
 //import replace from "@rollup/plugin-replace";
 //import builtins from "rollup-plugin-node-builtins";
 //import globals from "rollup-plugin-node-globals";
@@ -32,6 +32,7 @@ export default {
         { src: "icon.png", dest: DIST_FOLDER },
         { src: "../webapp/favicon.ico", dest: DIST_FOLDER },
         { src: "../webapp/logo.svg", dest: DIST_FOLDER },
+        { src: "../webapp/logo.svg", dest: "demo" },
         { src: "../node_modules/@shoelace-style/shoelace/dist/themes/light.css", dest: DIST_FOLDER, rename: "styles.css" },
       ],
     }),

diff --git a/webapp/index.html b/webapp/index.html
@@ -14,8 +14,6 @@
     <where-app></where-app>
     <script type="module">
       import { WhereApp } from "./";
-      //import { setBasePath } from '@shoelace-style/shoelace/dist/utilities/base-path.js';
-      //setBasePath('shoelace');
     </script>
   </body>
 </html>
diff --git a/webcomponents/src/dialogs/where-play-dialog.ts b/webcomponents/src/dialogs/where-play-dialog.ts
@@ -1020,31 +1020,6 @@ export class WherePlayDialog extends ZomeElement<PlaysetPerspective, PlaysetZvm>
     svgMarkerField.select(svgMarkerField.children.length - 1);
   }
 
-  // /** */
-  // static get scopedElements() {
-  //   return {
-  //     'sl-avatar': SlAvatar,
-  //     'sl-tab-group': SlTabGroup,
-  //     'sl-tab': SlTab,
-  //     'sl-tab-panel': SlTabPanel,
-  //     "mwc-select": Select,
-  //     "mwc-list-item": ListItem,
-  //     "mwc-button": Button,
-  //     "mwc-icon-button": IconButton,
-  //     "mwc-dialog": Dialog,
-  //     "mwc-textfield": TextField,
-  //     "mwc-textarea": TextArea,
-  //     "mwc-formfield": Formfield,
-  //     "mwc-checkbox": Checkbox,
-  //     "mwc-radio": Radio,
-  //     "mwc-tab": Tab,
-  //     "mwc-tab-bar": TabBar,
-  //     "where-emoji-group-dialog" : WhereEmojiGroupDialog,
-  //     "where-emoji-dialog" : WhereEmojiDialog,
-  //     "where-svg-marker-dialog" : WhereSvgMarkerDialog,
-  //     "emoji-picker": customElements.get('emoji-picker'),
-  //   };
-  // }
 
   /** */
   static get styles() {