diff --git a/CHANGELOG.md b/CHANGELOG.md index 535b02e9b..a1c935066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * remote: v1.0.0-rc.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/remote/CHANGELOG.md)) ### New: Web Components -* slide-poll: v1.0.0-beta.4 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/poll/CHANGELOG.md)) +* slide-poll: v1.0.0-beta.5 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/poll/CHANGELOG.md)) ### Web Components * charts: v1.0.0-rc.5 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/charts/CHANGELOG.md)) diff --git a/docs/docs/slides/app-slide-poll/app-slide-poll.md b/docs/docs/slides/app-slide-poll/app-slide-poll.md index c294caee1..7f08f6012 100644 --- a/docs/docs/slides/app-slide-poll/app-slide-poll.md +++ b/docs/docs/slides/app-slide-poll/app-slide-poll.md @@ -28,13 +28,13 @@ Add a slide "Poll" to your presentation.
- +

Do you like my presentation so far?

It is super

Meh

I could'nt care less

Tell me why

-

Go to poll.deckdeckgo.com and use the code {0}

+

Go to deckdeckgo.com/poll and use the code {0}

Awaiting first votes

Ain't nothin' but a heartache

 @@ -101,7 +101,7 @@ The "Poll" slide's Web Component could be integrated using the tag `I could'nt care less

Tell me why

Ain't nothin' but a heartache

-

Go to poll.deckdeckgo.com and use the code {0}

+

Go to deckdeckgo.com/poll and use the code {0}

Awaiting first votes

 ``` @@ -129,7 +129,7 @@ This component offers the following options which could be set using attributes: | socketUrl | string | `https://api.deckdeckgo.com` | The url of the socket (server) where the poll (chat room) is going to be created. | | socketPath | string | `/poll` | The path to reach the socket server | | connectPollSocket | boolean | `true` | In case you would not like that the template try to reach the socket server | -| pollLink | string | `https://poll.deckdeckgo.com` | The url which leads to the voting application respectively where your audience will be available to make their voice heard aka where they will be able to vote. | +| pollLink | string | `https://deckdeckgo.com/poll` | The url which leads to the voting application respectively where your audience will be available to make their voice heard aka where they will be able to vote. | | pollKey | string | | Per default the template will always try to create a new poll but if you set this value, it will try to retrieve an existing poll | ## Theming diff --git a/docs/docs/slides/app-slides-concept/app-slides-concept.md b/docs/docs/slides/app-slides-concept/app-slides-concept.md index 6f9a90625..7a565fb4a 100644 --- a/docs/docs/slides/app-slides-concept/app-slides-concept.md +++ b/docs/docs/slides/app-slides-concept/app-slides-concept.md @@ -190,13 +190,13 @@ The core component of [DeckDeckGo] (``) does not contain any slide
- +

Do you like my presentation so far?

It is super

Meh

I could'nt care less

Tell me why

-

Go to poll.deckdeckgo.com and use the code {0}

+

Go to deckdeckgo.com/poll and use the code {0}

Awaiting first votes

Ain't nothin' but a heartache

 diff --git a/docs/package-lock.json b/docs/package-lock.json index d72e3da74..4bb3245c3 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -134,9 +134,9 @@ } }, "@deckdeckgo/slide-poll": { - "version": "1.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@deckdeckgo/slide-poll/-/slide-poll-1.0.0-beta.4.tgz", - "integrity": "sha512-hYlEeAl1yEye0xF5/nZ+ZZPkl8YFnrQjL2K2dmMWu6rQoI0L8wuH3UOMDokcnm3C5Cl5qkJ/n07K11utgbaXYA==", + "version": "1.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@deckdeckgo/slide-poll/-/slide-poll-1.0.0-beta.5.tgz", + "integrity": "sha512-Gju0U6UWZVO7RcljCx2h5o5RLn/N0htpNKCr0/71Ryi1T5G7fOJNnc4HAxI3A4X9A0T1yh79nkA8sM/9dPoXiQ==", "requires": { "@deckdeckgo/slide-utils": "^1.0.0-rc.4", "@deckdeckgo/utils": "^1.0.0-rc.2", diff --git a/docs/package.json b/docs/package.json index 3a57709d9..4af95a10c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -27,7 +27,7 @@ "@deckdeckgo/slide-content": "^1.0.0-rc.1", "@deckdeckgo/slide-countdown": "^1.0.0-rc.1", "@deckdeckgo/slide-gif": "^1.0.0-rc.1-1", - "@deckdeckgo/slide-poll": "^1.0.0-beta.4", + "@deckdeckgo/slide-poll": "^1.0.0-beta.5", "@deckdeckgo/slide-qrcode": "^1.0.0-rc.2-1", "@deckdeckgo/slide-split": "^1.0.0-rc.2", "@deckdeckgo/slide-title": "^1.0.0-rc.1", diff --git a/docs/src/app/pages/docs/slides/app-slide-poll/app-slide-poll.tsx b/docs/src/app/pages/docs/slides/app-slide-poll/app-slide-poll.tsx index 73c6c374d..f153351ed 100644 --- a/docs/src/app/pages/docs/slides/app-slide-poll/app-slide-poll.tsx +++ b/docs/src/app/pages/docs/slides/app-slide-poll/app-slide-poll.tsx @@ -58,13 +58,13 @@ export class AppSlidePoll {

Layout

- +

Do you like my presentation so far?

It is super

Meh

I could'nt care less

Tell me why

-

Go to poll.deckdeckgo.com and use the code {0}

+

Go to deckdeckgo.com/poll and use the code {0}

Awaiting first votes

Ain't nothin' but a heartache

 @@ -99,7 +99,7 @@ export class AppSlidePoll {

Usage

The "Poll" slide's Web Component could be integrated using the tag <deckgo-slide-poll/>.

- <deckgo-slide-poll poll-link="https://deckdeckgo.com" socket-url="https://api.deckdeckgo.com">{'\n'} <h1 slot="question">Do you like my presentation so far?</h1>{'\n'} <p slot="answer-1">It is super</p>{'\n'} <p slot="answer-2">Meh</p>{'\n'} <p slot="answer-3">I could'nt care less</p>{'\n'} <p slot="answer-4">Tell me why</p>{'\n'} <p slot="answer-5">Ain't nothin' but a heartache</p>{'\n'} <p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>{'\n'} <p slot="awaiting-votes">Awaiting first votes</p>{'\n'}</deckgo-slide-poll> + <deckgo-slide-poll poll-link="https://deckdeckgo.com" socket-url="https://api.deckdeckgo.com">{'\n'} <h1 slot="question">Do you like my presentation so far?</h1>{'\n'} <p slot="answer-1">It is super</p>{'\n'} <p slot="answer-2">Meh</p>{'\n'} <p slot="answer-3">I could'nt care less</p>{'\n'} <p slot="answer-4">Tell me why</p>{'\n'} <p slot="answer-5">Ain't nothin' but a heartache</p>{'\n'} <p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>{'\n'} <p slot="awaiting-votes">Awaiting first votes</p>{'\n'}</deckgo-slide-poll>

Slots

The slots question and at least one answer should be provided. Answer slots have to be provided as answer-x where x is a number bigger than 0.

The slot how-to and awaiting-votes are optional, still, it's probably for best of your audience to provide these.

@@ -139,7 +139,7 @@ export class AppSlidePoll { pollLink string -https://poll.deckdeckgo.com +https://deckdeckgo.com/poll The url which leads to the voting application respectively where your audience will be available to make their voice heard aka where they will be able to vote. diff --git a/docs/src/app/pages/docs/slides/app-slides-concept/app-slides-concept.tsx b/docs/src/app/pages/docs/slides/app-slides-concept/app-slides-concept.tsx index edb61798b..deac2059d 100644 --- a/docs/src/app/pages/docs/slides/app-slides-concept/app-slides-concept.tsx +++ b/docs/src/app/pages/docs/slides/app-slides-concept/app-slides-concept.tsx @@ -226,13 +226,13 @@ export class AppSlidesConcept {
- +

Do you like my presentation so far?

It is super

Meh

I could'nt care less

Tell me why

-

Go to poll.deckdeckgo.com and use the code {0}

+

Go to deckdeckgo.com/poll and use the code {0}

Awaiting first votes

Ain't nothin' but a heartache

 diff --git a/remote/package-lock.json b/remote/package-lock.json index f9497351b..1ded2e087 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -122,9 +122,9 @@ } }, "@deckdeckgo/slide-poll": { - "version": "1.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@deckdeckgo/slide-poll/-/slide-poll-1.0.0-beta.4.tgz", - "integrity": "sha512-hYlEeAl1yEye0xF5/nZ+ZZPkl8YFnrQjL2K2dmMWu6rQoI0L8wuH3UOMDokcnm3C5Cl5qkJ/n07K11utgbaXYA==", + "version": "1.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@deckdeckgo/slide-poll/-/slide-poll-1.0.0-beta.5.tgz", + "integrity": "sha512-Gju0U6UWZVO7RcljCx2h5o5RLn/N0htpNKCr0/71Ryi1T5G7fOJNnc4HAxI3A4X9A0T1yh79nkA8sM/9dPoXiQ==", "requires": { "@deckdeckgo/slide-utils": "^1.0.0-rc.4", "@deckdeckgo/utils": "^1.0.0-rc.2", diff --git a/remote/package.json b/remote/package.json index 628c7ca01..b76c35dc9 100644 --- a/remote/package.json +++ b/remote/package.json @@ -28,7 +28,7 @@ "@deckdeckgo/slide-content": "^1.0.0-rc.1", "@deckdeckgo/slide-countdown": "^1.0.0-rc.1", "@deckdeckgo/slide-gif": "^1.0.0-rc.1-1", - "@deckdeckgo/slide-poll": "^1.0.0-beta.4", + "@deckdeckgo/slide-poll": "^1.0.0-beta.5", "@deckdeckgo/slide-qrcode": "^1.0.0-rc.2-1", "@deckdeckgo/slide-split": "^1.0.0-rc.2", "@deckdeckgo/slide-title": "^1.0.0-rc.1", diff --git a/studio/package-lock.json b/studio/package-lock.json index effeb7fb9..4f821cdb9 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -124,9 +124,9 @@ } }, "@deckdeckgo/slide-poll": { - "version": "1.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@deckdeckgo/slide-poll/-/slide-poll-1.0.0-beta.4.tgz", - "integrity": "sha512-hYlEeAl1yEye0xF5/nZ+ZZPkl8YFnrQjL2K2dmMWu6rQoI0L8wuH3UOMDokcnm3C5Cl5qkJ/n07K11utgbaXYA==", + "version": "1.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@deckdeckgo/slide-poll/-/slide-poll-1.0.0-beta.5.tgz", + "integrity": "sha512-Gju0U6UWZVO7RcljCx2h5o5RLn/N0htpNKCr0/71Ryi1T5G7fOJNnc4HAxI3A4X9A0T1yh79nkA8sM/9dPoXiQ==", "requires": { "@deckdeckgo/slide-utils": "^1.0.0-rc.4", "@deckdeckgo/utils": "^1.0.0-rc.2", diff --git a/studio/package.json b/studio/package.json index 0b8d9e8e8..19a829c4d 100644 --- a/studio/package.json +++ b/studio/package.json @@ -28,7 +28,7 @@ "@deckdeckgo/slide-chart": "^1.0.0-rc.2-1", "@deckdeckgo/slide-content": "^1.0.0-rc.1", "@deckdeckgo/slide-gif": "^1.0.0-rc.1-1", - "@deckdeckgo/slide-poll": "^1.0.0-beta.4", + "@deckdeckgo/slide-poll": "^1.0.0-beta.5", "@deckdeckgo/slide-qrcode": "^1.0.0-rc.2-1", "@deckdeckgo/slide-split": "^1.0.0-rc.2", "@deckdeckgo/slide-title": "^1.0.0-rc.1", diff --git a/studio/src/app/utils/editor/create-slides.utils.tsx b/studio/src/app/utils/editor/create-slides.utils.tsx index db10795d9..699dae056 100644 --- a/studio/src/app/utils/editor/create-slides.utils.tsx +++ b/studio/src/app/utils/editor/create-slides.utils.tsx @@ -316,7 +316,7 @@ export class CreateSlidesUtils { {questionSlot} {...answerSlots} -
Go to poll.deckdeckgo.com and use the code {'{0}'}
+
Go to deckdeckgo.com/poll and use the code {'{0}'}
Awaiting votes
; diff --git a/studio/src/global/app.ts b/studio/src/global/app.ts index b33e0d84f..b84f2d3d2 100644 --- a/studio/src/global/app.ts +++ b/studio/src/global/app.ts @@ -32,7 +32,7 @@ setupDeckGoConfig({ prod: true, appUrl: 'https://deckdeckgo.com', globalAssetsUrl: 'https://deckdeckgo.com/assets', - pollUrl: 'https://poll.deckdeckgo.com', + pollUrl: 'https://deckdeckgo.com/poll', apiUrl: '<@API_URL@>', presentationUrl: '<@PRESENTATION_URL@>', socketUrl: '<@SOCKET_URL@>' diff --git a/webcomponents/slides/poll/CHANGELOG.md b/webcomponents/slides/poll/CHANGELOG.md index d9318e1e6..1bcd72152 100644 --- a/webcomponents/slides/poll/CHANGELOG.md +++ b/webcomponents/slides/poll/CHANGELOG.md @@ -1,3 +1,10 @@ + +# 1.0.0-beta.5 (2019-12-04) + +### Features + +* Firebase can't redirect subdomain to path, therefore use `deckdeckgo.com/poll` instead of `poll.deckdeckgo.com` + # 1.0.0-beta.4 (2019-12-01) diff --git a/webcomponents/slides/poll/package-lock.json b/webcomponents/slides/poll/package-lock.json index cfe8a9591..6c07a887e 100644 --- a/webcomponents/slides/poll/package-lock.json +++ b/webcomponents/slides/poll/package-lock.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/slide-poll", - "version": "1.0.0-beta.4", + "version": "1.0.0-beta.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/webcomponents/slides/poll/package.json b/webcomponents/slides/poll/package.json index a2218e0bf..1a7b9f541 100644 --- a/webcomponents/slides/poll/package.json +++ b/webcomponents/slides/poll/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/slide-poll", - "version": "1.0.0-beta.4", + "version": "1.0.0-beta.5", "description": "Interact with your audience, add a live poll to your presentation", "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.e2e.ts b/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.e2e.ts index fe9559ccf..80e4b838d 100644 --- a/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.e2e.ts +++ b/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.e2e.ts @@ -5,13 +5,13 @@ describe('deckgo-slide-poll', () => { beforeEach(async () => { page = await newE2EPage(); - await page.setContent(` + await page.setContent(`

Do you like my presentation so far?

It is super

Meh

I could'nt care less

Tell me why

-

Go to poll.deckdeckgo.com and use the code {0}

+

Go to deckdeckgo.com/poll and use the code {0}

Awaiting first votes

Ain't nothin' but a heartache

`); diff --git a/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.tsx b/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.tsx index a1f6b1f27..1aabb2bdd 100644 --- a/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.tsx +++ b/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.tsx @@ -39,7 +39,7 @@ export class DeckdeckgoSlidePoll implements DeckdeckgoSlideResize { @Prop() connectPollSocket: boolean = true; - @Prop({reflect: true}) pollLink: string = 'https://poll.deckdeckgo.com'; + @Prop({reflect: true}) pollLink: string = 'https://deckdeckgo.com/poll'; @Prop({reflect: true, mutable: true}) pollKey: string; diff --git a/webcomponents/slides/poll/src/components/slide/readme.md b/webcomponents/slides/poll/src/components/slide/readme.md index bf14e1d59..918620ccb 100644 --- a/webcomponents/slides/poll/src/components/slide/readme.md +++ b/webcomponents/slides/poll/src/components/slide/readme.md @@ -13,7 +13,7 @@ | `customActions` | `custom-actions` | | `boolean` | `false` | | `customBackground` | `custom-background` | | `boolean` | `false` | | `pollKey` | `poll-key` | | `string` | `undefined` | -| `pollLink` | `poll-link` | | `string` | `'https://poll.deckdeckgo.com'` | +| `pollLink` | `poll-link` | | `string` | `'https://deckdeckgo.com/poll'` | | `socketPath` | `socket-path` | | `string` | `'/poll'` | | `socketUrl` | `socket-url` | | `string` | `'https://api.deckdeckgo.com'` | diff --git a/webcomponents/slides/poll/src/index.html b/webcomponents/slides/poll/src/index.html index aaa0ad9eb..8956abf38 100644 --- a/webcomponents/slides/poll/src/index.html +++ b/webcomponents/slides/poll/src/index.html @@ -28,7 +28,7 @@

Do you like my presentation so far?

Meh

I could'nt care less

Tell me why

-

Go to poll.deckdeckgo.com and use the code {0}

+

Go to deckdeckgo.com/poll and use the code {0}

Awaiting first votes

Ain't nothin' but a heartache