diff --git a/cli/src/fonts.ts b/cli/src/fonts.ts index 06b7cb2d0..11f9d9610 100644 --- a/cli/src/fonts.ts +++ b/cli/src/fonts.ts @@ -600,7 +600,7 @@ function filterFonts(fontsList: FontsList) { if (input && input.length >= 3) { return true; } else { - return 'Please provide at least 3 characters for the font\'s family name'; + return "Please provide at least 3 characters for the font's family name"; } }, }, diff --git a/infra/nix/sources.json b/infra/nix/sources.json index 2afe6890a..d68c9f28b 100644 --- a/infra/nix/sources.json +++ b/infra/nix/sources.json @@ -1,97 +1,97 @@ { - "deckdeckgo-starter": { - "branch": "master", - "description": "The Progressive Web App alternative for simple presentations", - "homepage": "https://deckdeckgo.com", - "owner": "deckgo", - "repo": "studio-kit", - "rev": "58357c71466e36d1e8d0973f06ab0fd9c5c8f5c3", - "sha256": "178bfwqv2afy1v3r4knm2byhj2yf63dx1s85g3k8k4rfz42vkk29", - "type": "tarball", - "url": "https://github.com/deckgo/studio-kit/archive/58357c71466e36d1e8d0973f06ab0fd9c5c8f5c3.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "elasticmq": { - "sha256": "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz", - "type": "file", - "url": "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.14.6.jar", - "url_template": "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.14.6.jar" - }, - "hs-jose": { - "branch": "master", - "description": "Haskell JOSE and JWT library", - "homepage": "http://hackage.haskell.org/package/jose", - "owner": "frasertweedale", - "repo": "hs-jose", - "rev": "71274bf64c0600c1d877152173a08a5bff7adf4d", - "sha256": "0ah189vika1s0jk8f17mn77gilkw24vbs6xlggxw1qj926i6c4pk", - "type": "tarball", - "url": "https://github.com/frasertweedale/hs-jose/archive/71274bf64c0600c1d877152173a08a5bff7adf4d.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "napalm": { - "branch": "master", - "description": "Support for building npm packages in Nix and lightweight npm registry", - "homepage": "", - "owner": "nmattia", - "repo": "napalm", - "rev": "0331a5b586a186c966f816d434bd5c1ecfa16089", - "sha256": "14nlqmmv3xx4cf3r9kcw2xbfgpddppw27ygp8s3r0bbccgwcp9gi", - "type": "tarball", - "url": "https://github.com/nmattia/napalm/archive/0331a5b586a186c966f816d434bd5c1ecfa16089.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "c2698b0780b783880e0b1a520723948fe3b5c26a", - "sha256": "0v68x0h9si6kjqg5fcjrgsbsf4x18m32a786yvjmrdkrki9qwmcq", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/c2698b0780b783880e0b1a520723948fe3b5c26a.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs": { - "branch": "master", - "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", - "homepage": null, - "owner": "nh2", - "repo": "nixpkgs", - "rev": "a2d7e9b875e8ba7fd15b989cf2d80be4e183dc72", - "sha256": "1hnmp637r99qd6g0sbx4w3za564gbzwl5c4z0x7fvn7kfi2jp1hx", - "type": "tarball", - "url": "https://github.com/nh2/nixpkgs/archive/a2d7e9b875e8ba7fd15b989cf2d80be4e183dc72.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "port-utils": { - "sha256": "1vfmm8mmkmfffgza64h6qz4ibniibqdr8mj452ikp1xmvv6m8qm9", - "type": "tarball", - "url": "http://hackage.haskell.org/package/port-utils-0.2.1.0/port-utils-0.2.1.0.tar.gz", - "url_template": "http://hackage.haskell.org/package/port-utils-0.2.1.0/port-utils-0.2.1.0.tar.gz" - }, - "static-haskell-nix": { - "branch": "master", - "description": "easily build most Haskell programs into fully static Linux executables", - "homepage": "", - "owner": "nh2", - "repo": "static-haskell-nix", - "rev": "8d004d7ced9da947c785b93b4011f39367442339", - "sha256": "0nw4g23c5rs0cvaar2phpr60zim9r0qycznpifi8d8k85y4r3bdd", - "type": "tarball", - "url": "https://github.com/nh2/static-haskell-nix/archive/8d004d7ced9da947c785b93b4011f39367442339.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "wai-lambda": { - "branch": "master", - "description": "Haskell Webapps on AWS Lambda", - "owner": "deckgo", - "repo": "wai-lambda", - "rev": "7f139047addff89e9d30e55b7eebb07c0e846456", - "sha256": "0qqi6wlg8v35dkh6gh9mrj0kb9kpzrz2pc7k0dykk2ahcj6m22k6", - "type": "tarball", - "url": "https://github.com/deckgo/wai-lambda/archive/7f139047addff89e9d30e55b7eebb07c0e846456.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - } + "deckdeckgo-starter": { + "branch": "master", + "description": "The Progressive Web App alternative for simple presentations", + "homepage": "https://deckdeckgo.com", + "owner": "deckgo", + "repo": "studio-kit", + "rev": "58357c71466e36d1e8d0973f06ab0fd9c5c8f5c3", + "sha256": "178bfwqv2afy1v3r4knm2byhj2yf63dx1s85g3k8k4rfz42vkk29", + "type": "tarball", + "url": "https://github.com/deckgo/studio-kit/archive/58357c71466e36d1e8d0973f06ab0fd9c5c8f5c3.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "elasticmq": { + "sha256": "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz", + "type": "file", + "url": "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.14.6.jar", + "url_template": "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-0.14.6.jar" + }, + "hs-jose": { + "branch": "master", + "description": "Haskell JOSE and JWT library", + "homepage": "http://hackage.haskell.org/package/jose", + "owner": "frasertweedale", + "repo": "hs-jose", + "rev": "71274bf64c0600c1d877152173a08a5bff7adf4d", + "sha256": "0ah189vika1s0jk8f17mn77gilkw24vbs6xlggxw1qj926i6c4pk", + "type": "tarball", + "url": "https://github.com/frasertweedale/hs-jose/archive/71274bf64c0600c1d877152173a08a5bff7adf4d.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "napalm": { + "branch": "master", + "description": "Support for building npm packages in Nix and lightweight npm registry", + "homepage": "", + "owner": "nmattia", + "repo": "napalm", + "rev": "0331a5b586a186c966f816d434bd5c1ecfa16089", + "sha256": "14nlqmmv3xx4cf3r9kcw2xbfgpddppw27ygp8s3r0bbccgwcp9gi", + "type": "tarball", + "url": "https://github.com/nmattia/napalm/archive/0331a5b586a186c966f816d434bd5c1ecfa16089.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "niv": { + "branch": "master", + "description": "Easy dependency management for Nix projects", + "homepage": "https://github.com/nmattia/niv", + "owner": "nmattia", + "repo": "niv", + "rev": "c2698b0780b783880e0b1a520723948fe3b5c26a", + "sha256": "0v68x0h9si6kjqg5fcjrgsbsf4x18m32a786yvjmrdkrki9qwmcq", + "type": "tarball", + "url": "https://github.com/nmattia/niv/archive/c2698b0780b783880e0b1a520723948fe3b5c26a.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nixpkgs": { + "branch": "master", + "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", + "homepage": null, + "owner": "nh2", + "repo": "nixpkgs", + "rev": "a2d7e9b875e8ba7fd15b989cf2d80be4e183dc72", + "sha256": "1hnmp637r99qd6g0sbx4w3za564gbzwl5c4z0x7fvn7kfi2jp1hx", + "type": "tarball", + "url": "https://github.com/nh2/nixpkgs/archive/a2d7e9b875e8ba7fd15b989cf2d80be4e183dc72.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "port-utils": { + "sha256": "1vfmm8mmkmfffgza64h6qz4ibniibqdr8mj452ikp1xmvv6m8qm9", + "type": "tarball", + "url": "http://hackage.haskell.org/package/port-utils-0.2.1.0/port-utils-0.2.1.0.tar.gz", + "url_template": "http://hackage.haskell.org/package/port-utils-0.2.1.0/port-utils-0.2.1.0.tar.gz" + }, + "static-haskell-nix": { + "branch": "master", + "description": "easily build most Haskell programs into fully static Linux executables", + "homepage": "", + "owner": "nh2", + "repo": "static-haskell-nix", + "rev": "8d004d7ced9da947c785b93b4011f39367442339", + "sha256": "0nw4g23c5rs0cvaar2phpr60zim9r0qycznpifi8d8k85y4r3bdd", + "type": "tarball", + "url": "https://github.com/nh2/static-haskell-nix/archive/8d004d7ced9da947c785b93b4011f39367442339.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "wai-lambda": { + "branch": "master", + "description": "Haskell Webapps on AWS Lambda", + "owner": "deckgo", + "repo": "wai-lambda", + "rev": "7f139047addff89e9d30e55b7eebb07c0e846456", + "sha256": "0qqi6wlg8v35dkh6gh9mrj0kb9kpzrz2pc7k0dykk2ahcj6m22k6", + "type": "tarball", + "url": "https://github.com/deckgo/wai-lambda/archive/7f139047addff89e9d30e55b7eebb07c0e846456.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + } } diff --git a/studio/package-lock.json b/studio/package-lock.json index 093329514..976734a1d 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -612,9 +612,9 @@ } }, "@ionic/core": { - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.3.4.tgz", - "integrity": "sha512-4UVzj+Vd7o0VJ06dReG01PvttnLLPSzUVgXSYMBKKR849Pvuh5Q9t5s4GEEQgGoxhv1S6Ai+zphWGFMvviOyfw==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.3.5.tgz", + "integrity": "sha512-Zk9Jaoupr+WrlTwuUrdrkFcnlU/8Z+e1lFCfwDH7nzbGjRgO5QLAqooW9GW4hBLQQFBeMArXX1VjmY7f4G5bMg==", "requires": { "ionicons": "^5.1.2", "tslib": "^1.10.0" @@ -1727,9 +1727,9 @@ "dev": true }, "ionicons": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.1.2.tgz", - "integrity": "sha512-zO7ZgbBbXhpA7cXO2rDzTNdcCqErjg1Sprq/ossTvaiV0MriOjRE7JO3EGvYjDTPzF9YALGpvLXqCgsRT0tprA==" + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.2.3.tgz", + "integrity": "sha512-87qtgBkieKVFagwYA9Cf91B3PCahQbEOMwMt8bSvlQSgflZ4eE5qI4MGj2ZlIyadeX0dgo+0CzZsy3ow0CsBAg==" }, "is-arrayish": { "version": "0.2.1", diff --git a/studio/package.json b/studio/package.json index 1b7ad9e6c..808d426cf 100644 --- a/studio/package.json +++ b/studio/package.json @@ -44,7 +44,7 @@ "@deckdeckgo/social": "^3.0.0", "@deckdeckgo/utils": "^1.3.0", "@deckdeckgo/youtube": "^2.0.0", - "@ionic/core": "^5.3.4", + "@ionic/core": "^5.3.5", "firebase": "^7.21.1", "idb-keyval": "^3.2.0", "socket.io-client": "^2.3.0", diff --git a/studio/src/app/components/editor/actions/deck/app-action-busy/app-action-busy.tsx b/studio/src/app/components/editor/actions/deck/app-action-busy/app-action-busy.tsx index f4b181e47..01aeeb0a3 100644 --- a/studio/src/app/components/editor/actions/deck/app-action-busy/app-action-busy.tsx +++ b/studio/src/app/components/editor/actions/deck/app-action-busy/app-action-busy.tsx @@ -21,7 +21,7 @@ export class AppActionBusy { return ( ); diff --git a/studio/src/app/components/editor/actions/deck/app-action-help/app-action-help.tsx b/studio/src/app/components/editor/actions/deck/app-action-help/app-action-help.tsx index 9d7001e7a..6f02afa62 100644 --- a/studio/src/app/components/editor/actions/deck/app-action-help/app-action-help.tsx +++ b/studio/src/app/components/editor/actions/deck/app-action-help/app-action-help.tsx @@ -36,10 +36,10 @@ export class AppActionHelp { ); } else { return ( - ); } diff --git a/studio/src/app/components/editor/actions/deck/app-action-share/app-action-share.tsx b/studio/src/app/components/editor/actions/deck/app-action-share/app-action-share.tsx index 00c14c17d..03fca559a 100644 --- a/studio/src/app/components/editor/actions/deck/app-action-share/app-action-share.tsx +++ b/studio/src/app/components/editor/actions/deck/app-action-share/app-action-share.tsx @@ -57,10 +57,10 @@ export class AppActionShare { render() { return ( - ); } diff --git a/studio/src/app/components/editor/actions/deck/app-actions-deck/app-actions-deck.tsx b/studio/src/app/components/editor/actions/deck/app-actions-deck/app-actions-deck.tsx index 10d2a6241..63c14006b 100644 --- a/studio/src/app/components/editor/actions/deck/app-actions-deck/app-actions-deck.tsx +++ b/studio/src/app/components/editor/actions/deck/app-actions-deck/app-actions-deck.tsx @@ -515,62 +515,73 @@ export class AppActionsDeck { return ( - this.onActionOpenSlideAdd($event)}> - Add slide + this.onActionOpenSlideAdd($event)}> + - - - - this.openDeckStyle()}> - Style + this.openDeckStyle()}> + {this.renderFullscreenButton()} - this.openEmbed()}> - - @@ -592,9 +603,9 @@ export class AppActionsDeck { private renderFullscreen() { if (this.fullscreen) { - return [, Exit fullscreen]; + return [, ]; } else { - return [, Fullscreen]; + return [, ]; } } } diff --git a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx index 939eca9a9..9a1bb8e60 100644 --- a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx +++ b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx @@ -1033,8 +1033,8 @@ export class AppActionsElement { disabled={store.state.deckBusy && this.slide} class="wider-devices ion-activatable"> - - Delete + + ); } @@ -1045,8 +1045,8 @@ export class AppActionsElement { return ( ); } @@ -1058,8 +1058,8 @@ export class AppActionsElement { return ( ); } @@ -1068,8 +1068,8 @@ export class AppActionsElement { return ( ); } @@ -1095,8 +1095,8 @@ export class AppActionsElement { class={classSlide} tabindex={displayed ? 0 : -1}> - - Options + + ); } @@ -1106,10 +1106,10 @@ export class AppActionsElement { const classToggle: string | undefined = `ion-activatable${displayed ? '' : ' hidden'}`; return ( - ); } @@ -1121,18 +1121,18 @@ export class AppActionsElement { return [ , , , ]; } @@ -1141,10 +1141,10 @@ export class AppActionsElement { const classSlideCode: string | undefined = `ion-activatable${this.code ? '' : ' hidden'}`; return ( - ); } @@ -1154,8 +1154,8 @@ export class AppActionsElement { return ( ); } @@ -1166,8 +1166,8 @@ export class AppActionsElement { return ( ); } @@ -1176,8 +1176,8 @@ export class AppActionsElement { return ( ); } diff --git a/studio/src/assets/icons/ionicons/arrow-back.svg b/studio/src/assets/icons/ionicons/arrow-back.svg index 134872386..1713f5ddb 100644 --- a/studio/src/assets/icons/ionicons/arrow-back.svg +++ b/studio/src/assets/icons/ionicons/arrow-back.svg @@ -1 +1 @@ -ionicons-v5-a + diff --git a/studio/src/assets/icons/ionicons/arrow-forward.svg b/studio/src/assets/icons/ionicons/arrow-forward.svg index f72bfcbe1..b29cb8141 100644 --- a/studio/src/assets/icons/ionicons/arrow-forward.svg +++ b/studio/src/assets/icons/ionicons/arrow-forward.svg @@ -1 +1 @@ -ionicons-v5-a + diff --git a/studio/src/assets/icons/ionicons/brush.svg b/studio/src/assets/icons/ionicons/brush.svg index 04c156261..84aa52f46 100644 --- a/studio/src/assets/icons/ionicons/brush.svg +++ b/studio/src/assets/icons/ionicons/brush.svg @@ -1 +1 @@ -ionicons-v5-h + diff --git a/studio/src/assets/icons/ionicons/checkmark.svg b/studio/src/assets/icons/ionicons/checkmark.svg index a27bfbf7d..78627bb59 100644 --- a/studio/src/assets/icons/ionicons/checkmark.svg +++ b/studio/src/assets/icons/ionicons/checkmark.svg @@ -1 +1 @@ -ionicons-v5-e + diff --git a/studio/src/assets/icons/ionicons/chevron-down.svg b/studio/src/assets/icons/ionicons/chevron-down.svg index 0ddceaab6..ea7283669 100644 --- a/studio/src/assets/icons/ionicons/chevron-down.svg +++ b/studio/src/assets/icons/ionicons/chevron-down.svg @@ -1 +1 @@ -ionicons-v5-a + diff --git a/studio/src/assets/icons/ionicons/clipboard.svg b/studio/src/assets/icons/ionicons/clipboard.svg index c0947edb4..e1639dd39 100644 --- a/studio/src/assets/icons/ionicons/clipboard.svg +++ b/studio/src/assets/icons/ionicons/clipboard.svg @@ -1 +1 @@ -ionicons-v5-l + diff --git a/studio/src/assets/icons/ionicons/close.svg b/studio/src/assets/icons/ionicons/close.svg index ebe27da48..431b921d4 100644 --- a/studio/src/assets/icons/ionicons/close.svg +++ b/studio/src/assets/icons/ionicons/close.svg @@ -1 +1 @@ -ionicons-v5-m \ No newline at end of file + diff --git a/studio/src/assets/icons/ionicons/cloud-done.svg b/studio/src/assets/icons/ionicons/cloud-done.svg index dbb2e068f..07a80daf3 100644 --- a/studio/src/assets/icons/ionicons/cloud-done.svg +++ b/studio/src/assets/icons/ionicons/cloud-done.svg @@ -1 +1 @@ -ionicons-v5-f + diff --git a/studio/src/assets/icons/ionicons/cloud-offline.svg b/studio/src/assets/icons/ionicons/cloud-offline.svg index 10d067e93..c2f811004 100644 --- a/studio/src/assets/icons/ionicons/cloud-offline.svg +++ b/studio/src/assets/icons/ionicons/cloud-offline.svg @@ -1 +1 @@ -ionicons-v5-s + diff --git a/studio/src/assets/icons/ionicons/code.svg b/studio/src/assets/icons/ionicons/code.svg index 3faa65ad5..462a91ebd 100644 --- a/studio/src/assets/icons/ionicons/code.svg +++ b/studio/src/assets/icons/ionicons/code.svg @@ -1 +1 @@ -ionicons-v5-m + diff --git a/studio/src/assets/icons/ionicons/color-palette.svg b/studio/src/assets/icons/ionicons/color-palette.svg index 8bd0a4c46..84451493f 100644 --- a/studio/src/assets/icons/ionicons/color-palette.svg +++ b/studio/src/assets/icons/ionicons/color-palette.svg @@ -1 +1 @@ -ionicons-v5-m + diff --git a/studio/src/assets/icons/ionicons/color-wand.svg b/studio/src/assets/icons/ionicons/color-wand.svg index 5d118c52c..f695a621f 100644 --- a/studio/src/assets/icons/ionicons/color-wand.svg +++ b/studio/src/assets/icons/ionicons/color-wand.svg @@ -1 +1 @@ -ionicons-v5-m + diff --git a/studio/src/assets/icons/ionicons/contract.svg b/studio/src/assets/icons/ionicons/contract.svg index c431240a6..489cd5016 100644 --- a/studio/src/assets/icons/ionicons/contract.svg +++ b/studio/src/assets/icons/ionicons/contract.svg @@ -1 +1 @@ -ionicons-v5-b + diff --git a/studio/src/assets/icons/ionicons/copy.svg b/studio/src/assets/icons/ionicons/copy.svg index 044bacdd8..9b3df2131 100644 --- a/studio/src/assets/icons/ionicons/copy.svg +++ b/studio/src/assets/icons/ionicons/copy.svg @@ -1 +1 @@ -ionicons-v5-e + diff --git a/studio/src/assets/icons/ionicons/create.svg b/studio/src/assets/icons/ionicons/create.svg index fc5bfb88f..f571fc332 100644 --- a/studio/src/assets/icons/ionicons/create.svg +++ b/studio/src/assets/icons/ionicons/create.svg @@ -1 +1 @@ -ionicons-v5-n + diff --git a/studio/src/assets/icons/ionicons/ellipsis-vertical.svg b/studio/src/assets/icons/ionicons/ellipsis-vertical.svg index 39fe46af9..144529030 100644 --- a/studio/src/assets/icons/ionicons/ellipsis-vertical.svg +++ b/studio/src/assets/icons/ionicons/ellipsis-vertical.svg @@ -1 +1 @@ -ionicons-v5-f \ No newline at end of file + diff --git a/studio/src/assets/icons/ionicons/expand.svg b/studio/src/assets/icons/ionicons/expand.svg index 7388b39b2..2813756ab 100644 --- a/studio/src/assets/icons/ionicons/expand.svg +++ b/studio/src/assets/icons/ionicons/expand.svg @@ -1 +1 @@ -ionicons-v5-b + diff --git a/studio/src/assets/icons/ionicons/github.svg b/studio/src/assets/icons/ionicons/github.svg index 78b6beff5..1062c8fba 100644 --- a/studio/src/assets/icons/ionicons/github.svg +++ b/studio/src/assets/icons/ionicons/github.svg @@ -1 +1 @@ -ionicons-v5_logos \ No newline at end of file + diff --git a/studio/src/assets/icons/ionicons/globe.svg b/studio/src/assets/icons/ionicons/globe.svg index de3fc9e39..7282f22f8 100644 --- a/studio/src/assets/icons/ionicons/globe.svg +++ b/studio/src/assets/icons/ionicons/globe.svg @@ -1 +1 @@ -ionicons-v5-e + diff --git a/studio/src/assets/icons/ionicons/help.svg b/studio/src/assets/icons/ionicons/help.svg index 96511c5d1..26bdc7123 100644 --- a/studio/src/assets/icons/ionicons/help.svg +++ b/studio/src/assets/icons/ionicons/help.svg @@ -1 +1 @@ -ionicons-v5-e + diff --git a/studio/src/assets/icons/ionicons/images.svg b/studio/src/assets/icons/ionicons/images.svg index 522e90d46..1f9a78588 100644 --- a/studio/src/assets/icons/ionicons/images.svg +++ b/studio/src/assets/icons/ionicons/images.svg @@ -1 +1 @@ -ionicons-v5-e + diff --git a/studio/src/assets/icons/ionicons/linkedin.svg b/studio/src/assets/icons/ionicons/linkedin.svg index e55a635ab..56174a8a5 100644 --- a/studio/src/assets/icons/ionicons/linkedin.svg +++ b/studio/src/assets/icons/ionicons/linkedin.svg @@ -1 +1 @@ -ionicons-v5_logos \ No newline at end of file + diff --git a/studio/src/assets/icons/ionicons/list.svg b/studio/src/assets/icons/ionicons/list.svg index bdf888022..ddbf57a32 100644 --- a/studio/src/assets/icons/ionicons/list.svg +++ b/studio/src/assets/icons/ionicons/list.svg @@ -1 +1 @@ -ionicons-v5-o + diff --git a/studio/src/assets/icons/ionicons/open.svg b/studio/src/assets/icons/ionicons/open.svg index f51416885..4312ee65a 100644 --- a/studio/src/assets/icons/ionicons/open.svg +++ b/studio/src/assets/icons/ionicons/open.svg @@ -1 +1 @@ -ionicons-v5-k + diff --git a/studio/src/assets/icons/ionicons/pencil.svg b/studio/src/assets/icons/ionicons/pencil.svg index 08bd0cb2a..ad3313764 100644 --- a/studio/src/assets/icons/ionicons/pencil.svg +++ b/studio/src/assets/icons/ionicons/pencil.svg @@ -1 +1 @@ -ionicons-v5-k + diff --git a/studio/src/assets/icons/ionicons/person.svg b/studio/src/assets/icons/ionicons/person.svg index 9e2c9a388..9b502b49e 100644 --- a/studio/src/assets/icons/ionicons/person.svg +++ b/studio/src/assets/icons/ionicons/person.svg @@ -1 +1 @@ -ionicons-v5-j + diff --git a/studio/src/assets/icons/ionicons/phone-portrait.svg b/studio/src/assets/icons/ionicons/phone-portrait.svg index 51622f251..8aac8cbbb 100644 --- a/studio/src/assets/icons/ionicons/phone-portrait.svg +++ b/studio/src/assets/icons/ionicons/phone-portrait.svg @@ -1 +1 @@ -ionicons-v5-k + diff --git a/studio/src/assets/icons/ionicons/settings.svg b/studio/src/assets/icons/ionicons/settings.svg index 204a1e405..1945cff8d 100644 --- a/studio/src/assets/icons/ionicons/settings.svg +++ b/studio/src/assets/icons/ionicons/settings.svg @@ -1 +1 @@ -ionicons-v5-q + diff --git a/studio/src/assets/icons/ionicons/shapes.svg b/studio/src/assets/icons/ionicons/shapes.svg index 89c72f681..d00066a2f 100644 --- a/studio/src/assets/icons/ionicons/shapes.svg +++ b/studio/src/assets/icons/ionicons/shapes.svg @@ -1 +1 @@ -ionicons-v5-l + diff --git a/studio/src/assets/icons/ionicons/share.svg b/studio/src/assets/icons/ionicons/share.svg index b5a659ff0..4959cd8a2 100644 --- a/studio/src/assets/icons/ionicons/share.svg +++ b/studio/src/assets/icons/ionicons/share.svg @@ -1 +1 @@ -ionicons-v5-f + diff --git a/studio/src/assets/icons/ionicons/trash-bin.svg b/studio/src/assets/icons/ionicons/trash-bin.svg index 7075fc03b..bce36b69e 100644 --- a/studio/src/assets/icons/ionicons/trash-bin.svg +++ b/studio/src/assets/icons/ionicons/trash-bin.svg @@ -1 +1 @@ -ionicons-v5-k + diff --git a/studio/src/assets/icons/ionicons/twitter.svg b/studio/src/assets/icons/ionicons/twitter.svg index 439dfd881..1b39d4418 100644 --- a/studio/src/assets/icons/ionicons/twitter.svg +++ b/studio/src/assets/icons/ionicons/twitter.svg @@ -1 +1 @@ -ionicons-v5_logos \ No newline at end of file + diff --git a/webcomponents/word-cloud/README.md b/webcomponents/word-cloud/README.md new file mode 100644 index 000000000..60156dd3c --- /dev/null +++ b/webcomponents/word-cloud/README.md @@ -0,0 +1,38 @@ +[![npm][npm-badge]][npm-badge-url] +[![license][npm-license]][npm-license-url] + +[npm-badge]: https://img.shields.io/npm/v/@deckdeckgo/word-cloud +[npm-badge-url]: https://www.npmjs.com/package/@deckdeckgo/word-cloud +[npm-license]: https://img.shields.io/npm/l/@deckdeckgo/word-cloud +[npm-license-url]: https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/word-cloud/LICENSE + +# DeckDeckGo - Word Cloud + +A Web Component to generate word clouds. + +## Table of contents + +- [Getting Started](#getting-started) +- [Develop](#develop) +- [License](#license) + +## Getting Started + +To get started with this Web Component, have a look to its [documentation](https://docs.deckdeckgo.com/components/word-cloud). + +## Develop + +To develop and run this Web Component locally, proceed as following: + +``` +git clone https://github.com/deckgo/deckdeckgo +cd deckdeckgo/webcomponents/word-cloud +npm install +npm run start +``` + +## License + +MIT © [David Dal Busco](mailto:david.dalbusco@outlook.com) and [Nicolas Mattia](mailto:nicolas@nmattia.com) + +[deckdeckgo]: https://deckdeckgo.com diff --git a/webcomponents/word-cloud/package-lock.json b/webcomponents/word-cloud/package-lock.json index 4880c6c6a..cd4ada97f 100644 --- a/webcomponents/word-cloud/package-lock.json +++ b/webcomponents/word-cloud/package-lock.json @@ -1,5 +1,5 @@ { - "name": "word-cloud", + "name": "@deckdeckgo/word-cloud", "version": "0.0.1", "lockfileVersion": 1, "requires": true, @@ -50,12 +50,6 @@ "integrity": "sha512-w6rkOsRIPY1rBa/13Wf+rMZrOzc6z86/Mkp3inzaYGsxBmLkf4PeP1rfaUB4SFDVRfMduP7FTd4ZJi/+FVrsMw==", "dev": true }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true - }, "@types/d3": { "version": "3.5.44", "resolved": "https://registry.npmjs.org/@types/d3/-/d3-3.5.44.tgz", @@ -71,11 +65,6 @@ "@types/d3": "^3" } }, - "@types/katex": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.11.0.tgz", - "integrity": "sha512-27BfE8zASRLYfSBNMk5/+KIjr2CBBrH0i5lhsO04fca4TGirIIMay73v3zNkzqmsaeIa/Mi5kejWDcxPLAmkvA==" - }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -165,9 +154,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001142", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001142.tgz", - "integrity": "sha512-pDPpn9ankEpBFZXyCv2I4lh1v/ju+bqb78QfKf+w9XgDAFWBwSYPswXqprRdrgQWK0wQnpIbfwRjNHO1HWqvoQ==", + "version": "1.0.30001144", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001144.tgz", + "integrity": "sha512-4GQTEWNMnVZVOFG3BK0xvGeaDAtiPAbG2N8yuMXuXzx/c2Vd4XoMPO8+E918zeXn5IF0FRVtGShBfkfQea2wHQ==", "dev": true }, "chalk": { @@ -295,13 +284,6 @@ "d3-timer": "2", "d3-transition": "2", "d3-zoom": "2" - }, - "dependencies": { - "d3-dispatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz", - "integrity": "sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==" - } } }, "d3-array": { @@ -340,6 +322,13 @@ "integrity": "sha512-4s2hXZgvs0CoUIw31oBAGrHt9Kt/7P9Ik5HIVzISFiWkD0Ga2VLAuO/emO/z1tYIpE7KG2smB4PhMPfFMJpahw==", "requires": { "d3-dispatch": "^1.0.3" + }, + "dependencies": { + "d3-dispatch": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz", + "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==" + } } }, "d3-color": { @@ -364,9 +353,9 @@ } }, "d3-dispatch": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz", - "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz", + "integrity": "sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==" }, "d3-drag": { "version": "2.0.0", @@ -538,9 +527,9 @@ "integrity": "sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag==" }, "electron-to-chromium": { - "version": "1.3.576", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz", - "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==", + "version": "1.3.578", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz", + "integrity": "sha512-z4gU6dA1CbBJsAErW5swTGAaU2TBzc2mPAonJb00zqW1rOraDo2zfBMDRvaz9cVic+0JEZiYbHWPw/fTaZlG2Q==", "dev": true }, "end-of-stream": { @@ -649,12 +638,11 @@ }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, @@ -959,9 +947,9 @@ "dev": true }, "prettier": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz", - "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", + "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", "dev": true }, "pretty-quick": { @@ -979,12 +967,11 @@ }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, diff --git a/webcomponents/word-cloud/package.json b/webcomponents/word-cloud/package.json index e6155e43d..625e87dbc 100644 --- a/webcomponents/word-cloud/package.json +++ b/webcomponents/word-cloud/package.json @@ -3,26 +3,27 @@ "version": "0.0.1", "description": "A Web Component for creating word clouds", "main": "dist/index.cjs.js", - "module": "dist/custom-elements/index.js", - "es2015": "dist/esm/index.mjs", - "es2017": "dist/esm/index.mjs", - "types": "dist/custom-elements/index.d.ts", + "module": "dist/index.js", + "es2015": "dist/esm/index.js", + "es2017": "dist/esm/index.js", + "jsnext:main": "dist/esm/index.js", + "types": "dist/types/index.d.ts", "collection": "dist/collection/collection-manifest.json", "collection:main": "dist/collection/index.js", - "unpkg": "dist/word-cloud/word-cloud.js", + "unpkg": "dist/deckdeckgo-math/deckdeckgo-math.js", "files": [ "dist/", - "loader/" + "README.md", + "LICENSE" ], "scripts": { - "build": "stencil build --docs", + "build": "stencil build", "start": "stencil build --dev --watch --serve", "test": "stencil test --spec --e2e", - "test.watch": "stencil test --spec --e2e --watchAll", - "generate": "stencil generate" + "test.watch": "stencil test --spec --e2e --watchAll" }, "dependencies": { - "@stencil/core": "^2.0.1", + "@stencil/core": "^2.0.3", "d3": "^6.2.0", "d3-cloud": "^1.2.5" }, @@ -32,9 +33,9 @@ "@stencil/postcss": "^1.0.1", "@stencil/sass": "^1.3.2", "autoprefixer": "^9.8.6", - "husky": "^4.2.5", - "prettier": "2.1.1", - "pretty-quick": "^3.0.0" + "husky": "^4.3.0", + "prettier": "2.1.2", + "pretty-quick": "^3.0.2" }, "repository": { "type": "git", diff --git a/webcomponents/word-cloud/readme.md b/webcomponents/word-cloud/readme.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/webcomponents/word-cloud/src/components/word-cloud/readme.md b/webcomponents/word-cloud/src/components/word-cloud/readme.md deleted file mode 100644 index 1b67e9c48..000000000 --- a/webcomponents/word-cloud/src/components/word-cloud/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# deckgo-word-cloud - - - -## Properties - -| Property | Attribute | Description | Type | Default | -| ---------- | ---------- | ----------- | --------- | -------------------------------------------------------- | -| `colors` | `colors` | | `string` | `'#6114E5, #000000, #4E7224, #C43636, #7136C4, #76E514'` | -| `editable` | `editable` | | `boolean` | `false` | -| `font` | `font` | | `string` | `'Impact'` | -| `height` | `height` | | `number` | `500` | -| `width` | `width` | | `number` | `500` | - -## Events - -| Event | Description | Type | -| -------------------- | ----------- | -------------------------- | -| `wordCloudDidChange` | | `CustomEvent` | - ---- - -_Built with [StencilJS](https://stenciljs.com/)_ diff --git a/webcomponents/word-cloud/src/index.html b/webcomponents/word-cloud/src/index.html index 037046448..6019c0f46 100644 --- a/webcomponents/word-cloud/src/index.html +++ b/webcomponents/word-cloud/src/index.html @@ -5,8 +5,8 @@ Stencil Component Starter - - + +

You can edit this awesome word cloud

diff --git a/webcomponents/word-cloud/src/index.ts b/webcomponents/word-cloud/src/index.ts index 7531c10b8..67786c0c1 100644 --- a/webcomponents/word-cloud/src/index.ts +++ b/webcomponents/word-cloud/src/index.ts @@ -1 +1 @@ -export { Components, JSX } from './components'; +export {Components, JSX} from './components'; diff --git a/webcomponents/word-cloud/stencil.config.ts b/webcomponents/word-cloud/stencil.config.ts index f16dbcdd7..622fc10e9 100644 --- a/webcomponents/word-cloud/stencil.config.ts +++ b/webcomponents/word-cloud/stencil.config.ts @@ -1,25 +1,18 @@ -import { Config } from '@stencil/core'; +import {Config} from '@stencil/core'; -import { sass } from '@stencil/sass'; -import { postcss } from '@stencil/postcss'; +import {sass} from '@stencil/sass'; +import {postcss} from '@stencil/postcss'; import autoprefixer from 'autoprefixer'; export const config: Config = { - namespace: 'word-cloud', + namespace: 'deckdeckgo-word-cloud', outputTargets: [ { type: 'dist', - esmLoaderPath: '../loader', - }, - { - type: 'dist-custom-elements-bundle', - }, - { - type: 'docs-readme', }, { type: 'www', - serviceWorker: null, // disable service workers + serviceWorker: null, }, ], plugins: [ diff --git a/webcomponents/word-cloud/tsconfig.json b/webcomponents/word-cloud/tsconfig.json index 09367cee5..5971d5da3 100644 --- a/webcomponents/word-cloud/tsconfig.json +++ b/webcomponents/word-cloud/tsconfig.json @@ -4,10 +4,7 @@ "allowUnreachableCode": false, "declaration": false, "experimentalDecorators": true, - "lib": [ - "dom", - "es2017" - ], + "lib": ["dom", "es2017"], "moduleResolution": "node", "module": "esnext", "target": "es2017", @@ -16,10 +13,6 @@ "jsx": "react", "jsxFactory": "h" }, - "include": [ - "src" - ], - "exclude": [ - "node_modules" - ] + "include": ["src"], + "exclude": ["node_modules"] }