diff --git a/CHANGELOG.md b/CHANGELOG.md index 149b0f1b9..633d4c2f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ + +# [1.0.0-rc.13-1](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-rc.13...v1.0.0-13-1) (2019-09-15) + +### Applications + +* studio: v1.0.0-beta.3-2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/studio/CHANGELOG.md)) +* remote: v1.0.0-beta.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/remote/CHANGELOG.md)) + +### Web Components + +* remote: v1.0.0-rc.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/remote/CHANGELOG.md)) + +### Others + +* types: v1.0.0-rc.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/types/CHANGELOG.md)) + # [1.0.0-rc.13](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-rc.12-2...v1.0.0-13) (2019-09-14) @@ -33,9 +49,11 @@ # [1.0.0-rc.12-1](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-rc.12...v1.0.0-12-1) (2019-09-09) ### Applications + * studio: v1.0.0-beta.3-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/studio/CHANGELOG.md)) ### Web Components + * highlight-code: v1.0.0-rc.1-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md)) * slide-gif: v1.0.0-rc.1-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/gif/CHANGELOG.md)) @@ -43,6 +61,7 @@ # [1.0.0-rc.12](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-rc.11-2...v1.0.0-12) (2019-09-08) ### Applications + * studio: v1.0.0-beta.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/studio/CHANGELOG.md)) ### Others @@ -53,9 +72,11 @@ # [1.0.0-rc.11-2](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-rc.11-1...v1.0.0-11-2) (2019-09-04) ### Web Components + * core: v1.0.0-rc.1-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md)) ### Applications + * website: v1.0.0-rc.1-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-website/blob/master/CHANGELOG.md)) ### Others @@ -74,12 +95,15 @@ # [1.0.0-rc.11](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-rc.10...v1.0.0-11) (2019-09-01) ### Applications + * studio: v1.0.0-beta.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/studio/CHANGELOG.md)) ### Web Components + * inline-editor: v1.0.0-rc.1-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/inline-editor/CHANGELOG.md)) ### Others + * utils: v1.0.0-rc.1-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/utils/CHANGELOG.md)) @@ -93,7 +117,7 @@ ### Applications * docs: v1.0.0-rc.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/docs/CHANGELOG.md)) -* remote: v1.0.0-beta.11 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/remote/CHANGELOG.md)) +* remote: v1.0.0-beta.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/remote/CHANGELOG.md)) * studio: v1.0.0-beta.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/studio/CHANGELOG.md)) * website: v1.0.0-rc.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-website/blob/master/CHANGELOG.md)) diff --git a/remote/CHANGELOG.md b/remote/CHANGELOG.md index 5315a83f1..675f6ebda 100644 --- a/remote/CHANGELOG.md +++ b/remote/CHANGELOG.md @@ -1,3 +1,11 @@ + +# 1.0.0-beta.2 (2019-09-15) + +### Features + +* support `play` and `pause` for the youtube and big-img slides +* update `play` and `pause` if performed in the deck + # 1.0.0-beta.1 (2019-08-30) diff --git a/remote/package-lock.json b/remote/package-lock.json index 1561390a2..37b156e9f 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -1,6 +1,6 @@ { "name": "deckdeckgo-app", - "version": "1.0.0-beta.1", + "version": "1.0.0-beta.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -38,9 +38,9 @@ } }, "@deckdeckgo/types": { - "version": "1.0.0-rc.1", - "resolved": "https://registry.npmjs.org/@deckdeckgo/types/-/types-1.0.0-rc.1.tgz", - "integrity": "sha512-MgbjbBuJi3EMRHpxX8V6NA0M+xLe/u+iQkcpNsHOrl0X8JQhKTk4C/gvK477eBQBNntm/pIkdrFV2tv29vQFpw==", + "version": "1.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@deckdeckgo/types/-/types-1.0.0-rc.2.tgz", + "integrity": "sha512-rTduK6xTcFsCsquQHvBlB67A9Rg0u+O1A6gnf1K7ADwAgjSrNkcPSx961oVRA2fBgmGbl/uGEBrOtKdR+kl2Ug==", "dev": true }, "@deckdeckgo/utils": { diff --git a/remote/package.json b/remote/package.json index a94824cd3..ca2681492 100644 --- a/remote/package.json +++ b/remote/package.json @@ -1,6 +1,6 @@ { "name": "deckdeckgo-app", - "version": "1.0.0-beta.1", + "version": "1.0.0-beta.2", "author": "David Dal Busco", "description": "Present and interact with your lightweight DeckDeckGo's presentation", "license": "AGPL-3.0-or-later", @@ -25,7 +25,7 @@ "socket.io-client": "^2.2.0" }, "devDependencies": { - "@deckdeckgo/types": "^1.0.0-rc.1", + "@deckdeckgo/types": "^1.0.0-rc.2", "@stencil/core": "^1.3.1", "@stencil/postcss": "^1.0.1", "@stencil/sass": "^1.0.1", diff --git a/remote/src/app/pages/app-remote/app-remote.tsx b/remote/src/app/pages/app-remote/app-remote.tsx index 1e2d9f8de..a606be2cf 100644 --- a/remote/src/app/pages/app-remote/app-remote.tsx +++ b/remote/src/app/pages/app-remote/app-remote.tsx @@ -10,7 +10,7 @@ import { DeckdeckgoEventType, DeckdeckgoEventSlides, DeckdeckgoEventSlideTo, - DeckdeckgoSlideAction, DeckdeckgoSlideDefinition + DeckdeckgoSlideAction, DeckdeckgoSlideDefinition, DeckdeckgoEventSlideAction } from '@deckdeckgo/types'; // Utils @@ -45,7 +45,7 @@ export class AppRemote { @State() drawing: boolean = false; - @State() youtubeAction: DeckdeckgoSlideAction; + @State() action: DeckdeckgoSlideAction; private acceleratorSubscription: Subscription; private acceleratorInitSubscription: Subscription; @@ -89,6 +89,8 @@ export class AppRemote { await this.slideTo(index, speed); } else if ($event.type === DeckdeckgoEventType.DELETE_SLIDE) { await this.deleteSlide(); + } else if ($event.type === DeckdeckgoEventType.SLIDE_ACTION) { + this.action = ($event as DeckdeckgoEventSlideAction).action; } } }); @@ -207,7 +209,7 @@ export class AppRemote { private async afterSwipe() { await this.setActiveIndex(); - this.youtubeAction = null; + this.action = null; } private setActiveIndex(): Promise { @@ -367,15 +369,15 @@ export class AppRemote { }); } - private emitYoutubeAction(e: UIEvent) { + private emitAction(e: UIEvent) { e.stopPropagation(); - this.youtubeAction = this.youtubeAction === DeckdeckgoSlideAction.YOUTUBE_PLAY ? DeckdeckgoSlideAction.YOUTUBE_PAUSE : DeckdeckgoSlideAction.YOUTUBE_PLAY; + this.action = this.action === DeckdeckgoSlideAction.PLAY ? DeckdeckgoSlideAction.PAUSE : DeckdeckgoSlideAction.PLAY; this.communicationService.emit({ type: DeckdeckgoEventType.SLIDE_ACTION, emitter: DeckdeckgoEventEmitter.APP, - action: this.youtubeAction + action: this.action }); } @@ -636,12 +638,14 @@ export class AppRemote { } private renderExtraActions() { - if (this.slides && this.slides[this.slideIndex].name === 'deckgo-slide-youtube'.toUpperCase()) { + if (this.slides && + (this.slides[this.slideIndex].name === 'deckgo-slide-youtube'.toUpperCase() || + this.slides[this.slideIndex].name === 'deckgo-slide-big-img'.toUpperCase())) { - const icon: string = this.youtubeAction === DeckdeckgoSlideAction.YOUTUBE_PLAY ? 'pause' : 'play'; + const icon: string = this.action === DeckdeckgoSlideAction.PLAY ? 'pause' : 'play'; return ( - this.emitYoutubeAction(e)}> + this.emitAction(e)}> ) diff --git a/studio/CHANGELOG.md b/studio/CHANGELOG.md index b641356e6..259647525 100644 --- a/studio/CHANGELOG.md +++ b/studio/CHANGELOG.md @@ -1,3 +1,10 @@ + +# 1.0.0-beta.3-2 (2019-09-15) + +### Refactoring + +* remote event `youtube_pause` renamed to `pause` + # 1.0.0-beta.3-1 (2019-09-09) diff --git a/studio/package-lock.json b/studio/package-lock.json index 314b9305f..d48da2c81 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -1,6 +1,6 @@ { "name": "deckdeckgo-studio", - "version": "1.0.0-beta.3-1", + "version": "1.0.0-beta.3-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/studio/package.json b/studio/package.json index 8e6e2c05c..7a1ff2b70 100644 --- a/studio/package.json +++ b/studio/package.json @@ -1,6 +1,6 @@ { "name": "deckdeckgo-studio", - "version": "1.0.0-beta.3-1", + "version": "1.0.0-beta.3-2", "author": "David Dal Busco", "description": "The web open source editor for presentations", "license": "AGPL-3.0-or-later", diff --git a/studio/src/app/handlers/editor/events/remote/remote-events.handler.tsx b/studio/src/app/handlers/editor/events/remote/remote-events.handler.tsx index 4322c266a..3fd054848 100644 --- a/studio/src/app/handlers/editor/events/remote/remote-events.handler.tsx +++ b/studio/src/app/handlers/editor/events/remote/remote-events.handler.tsx @@ -199,7 +199,7 @@ export class RemoteEventsHandler { return; } - if ($event.detail.action === 'youtube_pause') { + if ($event.detail.action === 'pause') { await youtubeSlideElement.pause(); } else { await youtubeSlideElement.play(); diff --git a/webcomponents/remote/CHANGELOG.md b/webcomponents/remote/CHANGELOG.md index d6a7eb651..795899f9e 100644 --- a/webcomponents/remote/CHANGELOG.md +++ b/webcomponents/remote/CHANGELOG.md @@ -1,3 +1,17 @@ + +# 1.0.0-rc.2 (2019-09-15) + +### Features + +* add methods to forward play and pause from the deck to the remote app + + +# 1.0.0-rc.1-1 (2019-09-15) + +### Libs + +* update `@deckdeckgo/types` last definition + # 1.0.0-rc.1 (2019-08-30) diff --git a/webcomponents/remote/README.md b/webcomponents/remote/README.md index 5d89966dc..3d83052e0 100644 --- a/webcomponents/remote/README.md +++ b/webcomponents/remote/README.md @@ -150,6 +150,22 @@ This method will delete the current slide in the remote app. await deck.deleteSlide(); ``` +### Play + +This method will tell the remote app that the play action was performed in the deck. + +``` +await deck.play(); +``` + +### Play + +This method will tell the remote app that the pause action was performed in the deck. + +``` +await deck.pause(); +``` + ## License MIT © [David Dal Busco](mailto:david.dalbusco@outlook.com) and [Nicolas Mattia](mailto:nicolas@nmattia.com) diff --git a/webcomponents/remote/package-lock.json b/webcomponents/remote/package-lock.json index 102d8746e..af8fda27b 100644 --- a/webcomponents/remote/package-lock.json +++ b/webcomponents/remote/package-lock.json @@ -1,13 +1,13 @@ { "name": "@deckdeckgo/remote", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { "@deckdeckgo/types": { - "version": "1.0.0-rc.1", - "resolved": "https://registry.npmjs.org/@deckdeckgo/types/-/types-1.0.0-rc.1.tgz", - "integrity": "sha512-MgbjbBuJi3EMRHpxX8V6NA0M+xLe/u+iQkcpNsHOrl0X8JQhKTk4C/gvK477eBQBNntm/pIkdrFV2tv29vQFpw==", + "version": "1.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@deckdeckgo/types/-/types-1.0.0-rc.2.tgz", + "integrity": "sha512-rTduK6xTcFsCsquQHvBlB67A9Rg0u+O1A6gnf1K7ADwAgjSrNkcPSx961oVRA2fBgmGbl/uGEBrOtKdR+kl2Ug==", "dev": true }, "@stencil/core": { diff --git a/webcomponents/remote/package.json b/webcomponents/remote/package.json index 9a890b04b..6d0409abe 100644 --- a/webcomponents/remote/package.json +++ b/webcomponents/remote/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/remote", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.2", "description": "Present and interact with your DeckDeckGo's PWA presentation", "main": "dist/index.js", "module": "dist/index.mjs", @@ -26,7 +26,7 @@ "socket.io-client": "^2.2.0" }, "devDependencies": { - "@deckdeckgo/types": "^1.0.0-rc.1", + "@deckdeckgo/types": "^1.0.0-rc.2", "@stencil/core": "^1.3.1", "@stencil/postcss": "^1.0.1", "@stencil/sass": "^1.0.1", diff --git a/webcomponents/remote/src/components.d.ts b/webcomponents/remote/src/components.d.ts index bb87fcc72..1cb8f662c 100644 --- a/webcomponents/remote/src/components.d.ts +++ b/webcomponents/remote/src/components.d.ts @@ -24,6 +24,8 @@ export namespace Components { 'length': number; 'moveDraw': (leftOffset: number, transitionDuration: string) => Promise; 'nextSlide': () => Promise; + 'pause': () => Promise; + 'play': () => Promise; 'prevSlide': () => Promise; 'room': string; 'server': string; diff --git a/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx b/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx index 557f1e0bf..3a83391f0 100644 --- a/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx +++ b/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx @@ -9,7 +9,7 @@ import { DeckdeckgoEventType, DeckdeckgoEventEmitter, DeckdeckgoDrawAction, - DeckdeckgoSlideDefinition + DeckdeckgoSlideDefinition, DeckdeckgoSlideAction } from '@deckdeckgo/types'; // Services @@ -313,6 +313,24 @@ export class DeckdeckgoRemote { }); } + @Method() + async play() { + this.communicationService.emit({ + type: DeckdeckgoEventType.SLIDE_ACTION, + emitter: DeckdeckgoEventEmitter.DECK, + action: DeckdeckgoSlideAction.PLAY + }); + } + + @Method() + async pause() { + this.communicationService.emit({ + type: DeckdeckgoEventType.SLIDE_ACTION, + emitter: DeckdeckgoEventEmitter.DECK, + action: DeckdeckgoSlideAction.PAUSE + }); + } + private clear(): Promise { return new Promise((resolve) => { this.ctx.beginPath(); diff --git a/webcomponents/remote/src/services/communication/communication.service.tsx b/webcomponents/remote/src/services/communication/communication.service.tsx index 018ea6473..e508366a0 100644 --- a/webcomponents/remote/src/services/communication/communication.service.tsx +++ b/webcomponents/remote/src/services/communication/communication.service.tsx @@ -3,7 +3,12 @@ import * as io from 'socket.io-client'; import {BehaviorSubject, Observable, Subject} from 'rxjs'; // Types -import {DeckdeckgoEvent, DeckdeckgoEventSlides, DeckdeckgoEventSlideTo} from '@deckdeckgo/types'; +import { + DeckdeckgoEvent, + DeckdeckgoEventSlideAction, + DeckdeckgoEventSlides, + DeckdeckgoEventSlideTo +} from '@deckdeckgo/types'; const configuration: RTCConfiguration = { iceServers: [ @@ -228,7 +233,7 @@ export class CommunicationService { this.event.next(data); }; - emit(data: DeckdeckgoEvent | DeckdeckgoEventSlides | DeckdeckgoEventSlideTo) { + emit(data: DeckdeckgoEvent | DeckdeckgoEventSlides | DeckdeckgoEventSlideTo | DeckdeckgoEventSlideAction) { if (this.dataChannelOut) { this.dataChannelOut.send(JSON.stringify(data)); } diff --git a/webcomponents/types/CHANGELOG.md b/webcomponents/types/CHANGELOG.md index c013d4052..9d5e51223 100644 --- a/webcomponents/types/CHANGELOG.md +++ b/webcomponents/types/CHANGELOG.md @@ -1,3 +1,10 @@ + +# 1.0.0-rc.2 (2019-09-15) + +### Breaking Changes + +* slide actions `YOUTUBE_PLAY` and `YOUTUBE_PAUSE` renamed to `PLAY` and `PAUSE` + # 1.0.0-rc.1 (2019-08-30) diff --git a/webcomponents/types/package-lock.json b/webcomponents/types/package-lock.json index 127b73d33..e67aad6ad 100644 --- a/webcomponents/types/package-lock.json +++ b/webcomponents/types/package-lock.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/types", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/webcomponents/types/package.json b/webcomponents/types/package.json index 91e5d4432..019e4b6c2 100644 --- a/webcomponents/types/package.json +++ b/webcomponents/types/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/types", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.2", "author": "David Dal Busco", "description": "Present and interact with your DeckDeckGo's PWA presentation", "license": "MIT", diff --git a/webcomponents/types/src/index.ts b/webcomponents/types/src/index.ts index 4b427a660..074e22eb0 100644 --- a/webcomponents/types/src/index.ts +++ b/webcomponents/types/src/index.ts @@ -4,8 +4,8 @@ export enum DeckdeckgoDrawAction { } export enum DeckdeckgoSlideAction { - YOUTUBE_PLAY = 'youtube_play', - YOUTUBE_PAUSE = 'youtube_pause' + PLAY = 'play', + PAUSE = 'pause' } export interface DeckdeckgoSlideDefinition {