Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
8 changes: 4 additions & 4 deletions docs/docs/slides/app-slide-poll/app-slide-poll.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ Add a slide "Poll" to your presentation.

<div class="container ion-margin">
<deckgo-deck embedded={true}>
<deckgo-slide-poll poll-link="https://poll.deckdeckgo.com" socket-url="https://api.deckdeckgo.com">
<deckgo-slide-poll poll-link="https://deckdeckgo.com/poll" socket-url="https://api.deckdeckgo.com">
<h1 slot="question">Do you like my presentation so far?</h1>
<p slot="answer-1">It is super</p>
<p slot="answer-2">Meh</p>
<p slot="answer-3">I could'nt care less</p>
<p slot="answer-4">Tell me why</p>
<p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>
<p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>
<p slot="awaiting-votes">Awaiting first votes</p>
<p slot="answer-5">Ain't nothin' but a heartache</p>
</deckgo-slide-poll>
Expand Down Expand Up @@ -101,7 +101,7 @@ The "Poll" slide's Web Component could be integrated using the tag `<deckgo-slid
<p slot="answer-3">I could'nt care less</p>
<p slot="answer-4">Tell me why</p>
<p slot="answer-5">Ain't nothin' but a heartache</p>
<p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>
<p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>
<p slot="awaiting-votes">Awaiting first votes</p>
</deckgo-slide-poll>
```
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/slides/app-slides-concept/app-slides-concept.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ The core component of [DeckDeckGo] (`<deckgo-deck/>`) does not contain any slide

<div class="container ion-margin">
<deckgo-deck embedded={true}>
<deckgo-slide-poll poll-link="https://poll.deckdeckgo.com" socket-url="https://api.deckdeckgo.com" connectPollSocket={false}>
<deckgo-slide-poll poll-link="https://deckdeckgo.com/poll" socket-url="https://api.deckdeckgo.com" connectPollSocket={false}>
<h1 slot="question">Do you like my presentation so far?</h1>
<p slot="answer-1">It is super</p>
<p slot="answer-2">Meh</p>
<p slot="answer-3">I could'nt care less</p>
<p slot="answer-4">Tell me why</p>
<p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>
<p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>
<p slot="awaiting-votes">Awaiting first votes</p>
<p slot="answer-5">Ain't nothin' but a heartache</p>
</deckgo-slide-poll>
Expand Down
6 changes: 3 additions & 3 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ export class AppSlidePoll {
<h2 id="app-slide-poll-layout">Layout</h2>
<div class="container ion-margin">
<deckgo-deck embedded={true}>
<deckgo-slide-poll poll-link="https://poll.deckdeckgo.com" socket-url="https://api.deckdeckgo.com">
<deckgo-slide-poll poll-link="https://deckdeckgo.com/poll" socket-url="https://api.deckdeckgo.com">
<h1 slot="question">Do you like my presentation so far?</h1>
<p slot="answer-1">It is super</p>
<p slot="answer-2">Meh</p>
<p slot="answer-3">I could'nt care less</p>
<p slot="answer-4">Tell me why</p>
<p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>
<p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>
<p slot="awaiting-votes">Awaiting first votes</p>
<p slot="answer-5">Ain't nothin' but a heartache</p>
</deckgo-slide-poll>
Expand Down Expand Up @@ -99,7 +99,7 @@ export class AppSlidePoll {
</deckgo-highlight-code><h2 id="app-slide-poll-usage">Usage</h2>
<p>The &quot;Poll&quot; slide&#39;s Web Component could be integrated using the tag <code>&lt;deckgo-slide-poll/&gt;</code>.</p>
<deckgo-highlight-code language="javascript">
<code slot="code">&lt;deckgo-slide-poll poll-link=&quot;https:&#47;&#47;deckdeckgo.com&quot; socket-url=&quot;https:&#47;&#47;api.deckdeckgo.com&quot;&gt;{'\n'} &lt;h1 slot=&quot;question&quot;&gt;Do you like my presentation so far?&lt;&#47;h1&gt;{'\n'} &lt;p slot=&quot;answer-1&quot;&gt;It is super&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-2&quot;&gt;Meh&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-3&quot;&gt;I could&#039;nt care less&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-4&quot;&gt;Tell me why&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-5&quot;&gt;Ain&#039;t nothin&#039; but a heartache&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;how-to&quot;&gt;Go to &lt;a href=&quot;https:&#47;&#47;poll.deckdeckgo.com&quot;&gt;poll.deckdeckgo.com&lt;&#47;a&gt; and use the code &#123;0&#125;&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;awaiting-votes&quot;&gt;Awaiting first votes&lt;&#47;p&gt;{'\n'}&lt;&#47;deckgo-slide-poll&gt;</code>
<code slot="code">&lt;deckgo-slide-poll poll-link=&quot;https:&#47;&#47;deckdeckgo.com&quot; socket-url=&quot;https:&#47;&#47;api.deckdeckgo.com&quot;&gt;{'\n'} &lt;h1 slot=&quot;question&quot;&gt;Do you like my presentation so far?&lt;&#47;h1&gt;{'\n'} &lt;p slot=&quot;answer-1&quot;&gt;It is super&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-2&quot;&gt;Meh&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-3&quot;&gt;I could&#039;nt care less&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-4&quot;&gt;Tell me why&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;answer-5&quot;&gt;Ain&#039;t nothin&#039; but a heartache&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;how-to&quot;&gt;Go to &lt;a href=&quot;https:&#47;&#47;deckdeckgo.com&#47;poll&quot;&gt;deckdeckgo.com&#47;poll&lt;&#47;a&gt; and use the code &#123;0&#125;&lt;&#47;p&gt;{'\n'} &lt;p slot=&quot;awaiting-votes&quot;&gt;Awaiting first votes&lt;&#47;p&gt;{'\n'}&lt;&#47;deckgo-slide-poll&gt;</code>
</deckgo-highlight-code><h3 id="app-slide-poll-slots">Slots</h3>
<p>The slots <code>question</code> and at least one <code>answer</code> should be provided. Answer slots have to be provided as <code>answer-x</code> where <code>x</code> is a number bigger than 0.</p>
<p>The slot <code>how-to</code> and <code>awaiting-votes</code> are optional, still, it&#39;s probably for best of your audience to provide these.</p>
Expand Down Expand Up @@ -139,7 +139,7 @@ export class AppSlidePoll {
<tr>
<td>pollLink</td>
<td>string</td>
<td><code>https://poll.deckdeckgo.com</code></td>
<td><code>https://deckdeckgo.com/poll</code></td>
<td>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.</td>
</tr>
<tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,13 @@ export class AppSlidesConcept {
</ul>
<div class="container ion-margin">
<deckgo-deck embedded={true}>
<deckgo-slide-poll poll-link="https://poll.deckdeckgo.com" socket-url="https://api.deckdeckgo.com" connectPollSocket={false}>
<deckgo-slide-poll poll-link="https://deckdeckgo.com/poll" socket-url="https://api.deckdeckgo.com" connectPollSocket={false}>
<h1 slot="question">Do you like my presentation so far?</h1>
<p slot="answer-1">It is super</p>
<p slot="answer-2">Meh</p>
<p slot="answer-3">I could'nt care less</p>
<p slot="answer-4">Tell me why</p>
<p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>
<p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>
<p slot="awaiting-votes">Awaiting first votes</p>
<p slot="answer-5">Ain't nothin' but a heartache</p>
</deckgo-slide-poll>
Expand Down
6 changes: 3 additions & 3 deletions remote/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions studio/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion studio/src/app/utils/editor/create-slides.utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export class CreateSlidesUtils {
{questionSlot}
{...answerSlots}

<div slot="how-to">Go to <a href={EnvironmentConfigService.getInstance().get('deckdeckgo').pollUrl}>poll.deckdeckgo.com</a> and use the code {'{0}'}</div>
<div slot="how-to">Go to <a href={EnvironmentConfigService.getInstance().get('deckdeckgo').pollUrl}>deckdeckgo.com/poll</a> and use the code {'{0}'}</div>
<div slot="awaiting-votes">Awaiting votes</div>
</deckgo-slide-poll>;

Expand Down
2 changes: 1 addition & 1 deletion studio/src/global/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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@>'
Expand Down
7 changes: 7 additions & 0 deletions webcomponents/slides/poll/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<a name="1.0.0-beta.5"></a>
# 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`

<a name="1.0.0-beta.4"></a>
# 1.0.0-beta.4 (2019-12-01)

Expand Down
2 changes: 1 addition & 1 deletion webcomponents/slides/poll/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webcomponents/slides/poll/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ describe('deckgo-slide-poll', () => {

beforeEach(async () => {
page = await newE2EPage();
await page.setContent(`<deckgo-slide-poll poll-link="https://deckdeckgo.com" socket-url="http://localhost:3002" style="--deckgo-qrcode-color-fill: yellow; --deckgo-chart-fill-color-1: red;">
await page.setContent(`<deckgo-slide-poll style="--deckgo-qrcode-color-fill: yellow; --deckgo-chart-fill-color-1: red;">
<h1 slot="question">Do you like my presentation so far?</h1>
<p slot="answer-1">It is super</p>
<p slot="answer-2">Meh</p>
<p slot="answer-3">I could'nt care less</p>
<p slot="answer-4">Tell me why</p>
<p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>
<p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>
<p slot="awaiting-votes">Awaiting first votes</p>
<p slot="answer-5">Ain't nothin' but a heartache</p>
</deckgo-slide-poll>`);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion webcomponents/slides/poll/src/components/slide/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'` |

Expand Down
2 changes: 1 addition & 1 deletion webcomponents/slides/poll/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1 slot="question">Do you like my presentation so far?</h1>
<p slot="answer-2">Meh</p>
<p slot="answer-3">I could'nt care less</p>
<p slot="answer-4">Tell me why</p>
<p slot="how-to">Go to <a href="https://poll.deckdeckgo.com">poll.deckdeckgo.com</a> and use the code {0}</p>
<p slot="how-to">Go to <a href="https://deckdeckgo.com/poll">deckdeckgo.com/poll</a> and use the code {0}</p>
<p slot="awaiting-votes">Awaiting first votes</p>
<p slot="answer-5">Ain't nothin' but a heartache</p>
</deckgo-slide-poll>
Expand Down