Skip to content

Commit 0289dbb

Browse files
committed
Minor adjustements
1 parent d5efa3f commit 0289dbb

File tree

5 files changed

+15
-37
lines changed

5 files changed

+15
-37
lines changed

we-applet/demo/index.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
<link href="../dist/styles.css" rel="stylesheet" />
99
</head>
1010
<body style="margin:0px;background: #9bb791">
11-
<!-- <div id="container"></div> -->
12-
11+
<script type="module">
12+
console.log("Waiting for Shoelace...")
13+
await Promise.allSettled([
14+
customElements.whenDefined('sl-tab'),
15+
//customElements.whenDefined('sl-tab-group')
16+
]);
17+
console.log("Shoelace READY!");
18+
</script>
1319
<script type="module">
14-
//import '@shoelace-style/shoelace/dist/themes/light.css';
1520
import { AppAgentWebsocket, AdminWebsocket, encodeHashToBase64, fakeDnaHash, fakeEntryHash} from '@holochain/client';
1621
import { ProfilesClient } from '@holochain-open-dev/profiles';
1722
import { ProfilesZomeMock } from "@holochain-open-dev/profiles/dist/mocks.js";
@@ -106,19 +111,19 @@
106111
//console.log("mock agentId", mockProfilesZome.myPubKey);
107112
mockProfilesZome.myPubKey = whereCellId[1];
108113
//console.log("mock agentId", encodeHashToBase64(mockProfilesZome.myPubKey));
109-
mockProfilesZome.create_profile({nickname: "Bobby Joe", fields: {}})
114+
mockProfilesZome.create_profile({nickname: "Alex", fields: {}})
110115

111116
/** */
112117
const renderers = await Applet.appletViews(
113118
appAgentWs,
114119
whereDemoAppletId,
115120
new ProfilesClient(mockProfilesZome, mockProfilesZome.roleName),
116-
// new ProfilesClient(new ProfilesZomeMock()),
117121
mockWeServices,
118122
);
119-
renderers.main(document.body); // container, window.customElements
123+
renderers.main(document.body);
120124
}
121125

126+
/** Run it */
122127
setup();
123128
</script>
124129
</body>

we-applet/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"build:watch": "tsc -w --preserveWatchOutput",
99
"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\"",
1010
"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\"",
11-
"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",
12-
"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",
11+
"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",
12+
"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",
1313
"start:ui": "concurrently -k --names tsc,dev-server \"npm run build:watch\" \"wds --config web-dev-server.config.mjs\""
1414
},
1515
"devDependencies": {
@@ -18,7 +18,6 @@
1818
"@rollup/plugin-commonjs": "18.0.0",
1919
"@rollup/plugin-node-resolve": "^13.0.4",
2020
"@rollup/plugin-replace": "^3.0.0",
21-
"@rollup/plugin-typescript": "^8.2.5",
2221
"@web/dev-server": "^0.1.21",
2322
"@web/dev-server-rollup": "^0.3.10",
2423
"babel-plugin-template-html-minifier": "^4.1.0",

we-applet/rollup.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import nodeResolve from "@rollup/plugin-node-resolve";
2-
import typescript from "@rollup/plugin-typescript";
2+
//import typescript from "@rollup/plugin-typescript";
33
//import replace from "@rollup/plugin-replace";
44
//import builtins from "rollup-plugin-node-builtins";
55
//import globals from "rollup-plugin-node-globals";
@@ -32,6 +32,7 @@ export default {
3232
{ src: "icon.png", dest: DIST_FOLDER },
3333
{ src: "../webapp/favicon.ico", dest: DIST_FOLDER },
3434
{ src: "../webapp/logo.svg", dest: DIST_FOLDER },
35+
{ src: "../webapp/logo.svg", dest: "demo" },
3536
{ src: "../node_modules/@shoelace-style/shoelace/dist/themes/light.css", dest: DIST_FOLDER, rename: "styles.css" },
3637
],
3738
}),

webapp/index.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
<where-app></where-app>
1515
<script type="module">
1616
import { WhereApp } from "./";
17-
//import { setBasePath } from '@shoelace-style/shoelace/dist/utilities/base-path.js';
18-
//setBasePath('shoelace');
1917
</script>
2018
</body>
2119
</html>

webcomponents/src/dialogs/where-play-dialog.ts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,31 +1020,6 @@ export class WherePlayDialog extends ZomeElement<PlaysetPerspective, PlaysetZvm>
10201020
svgMarkerField.select(svgMarkerField.children.length - 1);
10211021
}
10221022

1023-
// /** */
1024-
// static get scopedElements() {
1025-
// return {
1026-
// 'sl-avatar': SlAvatar,
1027-
// 'sl-tab-group': SlTabGroup,
1028-
// 'sl-tab': SlTab,
1029-
// 'sl-tab-panel': SlTabPanel,
1030-
// "mwc-select": Select,
1031-
// "mwc-list-item": ListItem,
1032-
// "mwc-button": Button,
1033-
// "mwc-icon-button": IconButton,
1034-
// "mwc-dialog": Dialog,
1035-
// "mwc-textfield": TextField,
1036-
// "mwc-textarea": TextArea,
1037-
// "mwc-formfield": Formfield,
1038-
// "mwc-checkbox": Checkbox,
1039-
// "mwc-radio": Radio,
1040-
// "mwc-tab": Tab,
1041-
// "mwc-tab-bar": TabBar,
1042-
// "where-emoji-group-dialog" : WhereEmojiGroupDialog,
1043-
// "where-emoji-dialog" : WhereEmojiDialog,
1044-
// "where-svg-marker-dialog" : WhereSvgMarkerDialog,
1045-
// "emoji-picker": customElements.get('emoji-picker'),
1046-
// };
1047-
// }
10481023

10491024
/** */
10501025
static get styles() {

0 commit comments

Comments
 (0)