Skip to content
This repository has been archived by the owner on Feb 6, 2024. It is now read-only.

Commit

Permalink
feat: publish fallback name
Browse files Browse the repository at this point in the history
Signed-off-by: peterpeterparker <[email protected]>
  • Loading branch information
peterpeterparker committed Mar 20, 2022
1 parent eecc420 commit 245f9c5
Show file tree
Hide file tree
Showing 14 changed files with 57 additions and 37 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

### Providers

- firebase: v4.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/providers/firebase/CHANGELOG.md))
- ic: v7.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/providers/ic/CHANGELOG.md))
- firebase: v4.1.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/providers/firebase/CHANGELOG.md))
- ic: v7.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/providers/ic/CHANGELOG.md))

### Web Components: New

Expand All @@ -27,7 +27,7 @@
### Others

- deck-utils: v7.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/utils/deck/CHANGELOG.md))
- editor: v7.6.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/utils/editor/CHANGELOG.md))
- editor: v7.7.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/utils/editor/CHANGELOG.md))
- styles: v1.4.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/utils/styles/CHANGELOG.md))

<a name="6.0.0"></a>
Expand Down
29 changes: 14 additions & 15 deletions package-lock.json

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

6 changes: 6 additions & 0 deletions providers/firebase/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 4.1.3 (2022-03-19)

### Build

- update `editor` utils

# 4.1.1 - 4.1.2 (2022-03-15)

### Fix
Expand Down
4 changes: 2 additions & 2 deletions providers/firebase/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deckdeckgo/firebase",
"version": "4.1.2",
"version": "4.1.3",
"description": "The Firebase connectors of the DeckDeckGo editor for slides",
"main": "dist/index.cjs.js",
"module": "dist/index.js",
Expand All @@ -25,7 +25,7 @@
},
"dependencies": {
"@deckdeckgo/api": "file:providers/api",
"@deckdeckgo/editor": "^7.6.1",
"@deckdeckgo/editor": "^7.7.0",
"firebase": "^8.9.1",
"idb-keyval": "^6.0.1"
},
Expand Down
6 changes: 6 additions & 0 deletions providers/ic/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 7.1.0 (2022-03-19)

### Features

- fallback author name for publish home

# 7.0.0 (2022-03-19)

### Features
Expand Down
4 changes: 2 additions & 2 deletions providers/ic/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deckdeckgo/ic",
"version": "7.0.0",
"version": "7.1.0",
"description": "The Internet Computer connectors of the DeckDeckGo editor for slides",
"main": "dist/index.cjs.js",
"module": "dist/index.js",
Expand Down Expand Up @@ -55,7 +55,7 @@
"canister"
],
"dependencies": {
"@deckdeckgo/editor": "^7.6.1",
"@deckdeckgo/editor": "^7.7.0",
"@dfinity/agent": "^0.10.4",
"@dfinity/auth-client": "^0.10.4",
"@dfinity/authentication": "^0.10.4",
Expand Down
3 changes: 2 additions & 1 deletion providers/ic/src/utils/publish.deck.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {Deck, DeckData, DeckPublishData, deckPublishData, PublishData} from '@de
import {setData} from './data.utils';
import {uploadSocialImage} from './publish.social.utils';
import {initIndexHTML, initUpload, StorageUpload, updateMetaData, uploadPublishFileIC} from './publish.utils';
import { EnvStore } from '../stores/env.store';

export const publishDeck = async ({
deck: deckSource
Expand Down Expand Up @@ -35,7 +36,7 @@ export const publishDeck = async ({
};

const initDeckIndexHTML = async ({deck}: {deck: Deck}): Promise<{html: string; publishData: DeckPublishData}> => {
const publishData: DeckPublishData = await deckPublishData({deck});
const publishData: DeckPublishData = await deckPublishData({deck, fallbackAuthor: EnvStore.getInstance().get().author});

const {slides} = publishData;

Expand Down
3 changes: 2 additions & 1 deletion providers/ic/src/utils/publish.doc.utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Doc, DocData, docPublishData, DocPublishData, PublishData} from '@deckdeckgo/editor';
import {EnvStore} from '../stores/env.store';
import {setData} from './data.utils';
import {uploadSocialImage} from './publish.social.utils';
import {initIndexHTML, initUpload, StorageUpload, updateMetaData, uploadPublishFileIC} from './publish.utils';
Expand Down Expand Up @@ -35,7 +36,7 @@ export const publishDoc = async ({
};

const initDocIndexHTML = async ({doc}: {doc: Doc}): Promise<{html: string; publishData: DocPublishData}> => {
const publishData: DocPublishData = await docPublishData({doc});
const publishData: DocPublishData = await docPublishData({doc, fallbackAuthor: EnvStore.getInstance().get().author});

const {paragraphs} = publishData;

Expand Down
4 changes: 2 additions & 2 deletions studio/src/global/app-ic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ setupDeckGoConfig({
},
cloud: {
api: {
cdn: 'https://unpkg.com/@deckdeckgo/ic@7.0.0/dist/deckdeckgo-ic/index.esm.js'
cdn: 'https://unpkg.com/@deckdeckgo/ic@7.1.0/dist/deckdeckgo-ic/index.esm.js'
},
signIn: {
cdn: 'https://unpkg.com/@deckdeckgo/ic@7.0.0/dist/deckdeckgo-ic/deckdeckgo-ic.esm.js',
cdn: 'https://unpkg.com/@deckdeckgo/ic@7.1.0/dist/deckdeckgo-ic/deckdeckgo-ic.esm.js',
tag: 'deckgo-ic-signin'
}
},
Expand Down
4 changes: 2 additions & 2 deletions studio/src/global/app-staging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ setupDeckGoConfig({
},
cloud: {
api: {
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].2/dist/deckdeckgo-firebase/index.esm.js'
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].3/dist/deckdeckgo-firebase/index.esm.js'
},
signIn: {
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].2/dist/deckdeckgo-firebase/deckdeckgo-firebase.esm.js',
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].3/dist/deckdeckgo-firebase/deckdeckgo-firebase.esm.js',
tag: 'deckgo-firebase-signin'
}
},
Expand Down
4 changes: 2 additions & 2 deletions studio/src/global/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ setupDeckGoConfig({
},
cloud: {
api: {
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].2/dist/deckdeckgo-firebase/index.esm.js'
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].3/dist/deckdeckgo-firebase/index.esm.js'
},
signIn: {
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].2/dist/deckdeckgo-firebase/deckdeckgo-firebase.esm.js',
cdn: 'https://unpkg.com/@deckdeckgo/[email protected].3/dist/deckdeckgo-firebase/deckdeckgo-firebase.esm.js',
tag: 'deckgo-firebase-signin'
}
},
Expand Down
6 changes: 6 additions & 0 deletions utils/editor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 7.7.0 (2022-03-19)

### Features

- add `fallbackAuthor` to publish data

# 7.6.1 (2022-03-15)

### Fix
Expand Down
2 changes: 1 addition & 1 deletion utils/editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deckdeckgo/editor",
"version": "7.6.1",
"version": "7.7.0",
"author": "David Dal Busco",
"description": "Types for the DeckDeckGo editor",
"license": "AGPL-3.0-or-later",
Expand Down
13 changes: 7 additions & 6 deletions utils/editor/src/utils/publish.utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {Deck} from '../models/data/deck';
import {Doc} from '../models/data/doc';
import {Meta} from '../models/data/meta';

import {deckSelector} from './deck.utils';
import {docSelector} from './doc.utils';
import {getGoogleFontUrl, GoogleFont, googleFonts} from './fonts.utils';
Expand Down Expand Up @@ -30,36 +29,38 @@ export interface DocPublishData extends PublishData {
paragraphs: string[];
}

export const deckPublishData = async ({deck}: {deck: Deck}): Promise<DeckPublishData> => {
export const deckPublishData = async ({deck, fallbackAuthor}: {deck: Deck; fallbackAuthor: string}): Promise<DeckPublishData> => {
const {data} = deck;
const {meta, background, footer, header} = data;

return {
...(await publishData({meta, selector: deckSelector, fallbackName: data.name})),
...(await publishData({meta, selector: deckSelector, fallbackName: data.name, fallbackAuthor})),
slides: getSlides(),
background: background ? `<div slot="background">${background}</div>` : undefined,
header: background ? `<div slot="header">${header}</div>` : undefined,
footer: background ? `<div slot="footer">${footer}</div>` : undefined
};
};

export const docPublishData = async ({doc}: {doc: Doc}): Promise<DocPublishData> => {
export const docPublishData = async ({doc, fallbackAuthor}: {doc: Doc; fallbackAuthor: string}): Promise<DocPublishData> => {
const {data} = doc;
const {meta} = data;

return {
...(await publishData({meta, selector: docSelector, fallbackName: data.name})),
...(await publishData({meta, selector: docSelector, fallbackName: data.name, fallbackAuthor})),
paragraphs: getParagraphs()
};
};

const publishData = async ({
meta,
fallbackName,
fallbackAuthor,
selector
}: {
meta: Meta | undefined;
fallbackName: string;
fallbackAuthor: string;
selector: string;
}): Promise<PublishData> => {
const googleFontLink: string | undefined = getGoogleFontLink();
Expand All @@ -76,7 +77,7 @@ const publishData = async ({
return {
title,
description: (meta?.description || fallbackName)?.trim(),
author: meta?.author?.name || 'DeckDeckGo',
author: meta?.author?.name || fallbackAuthor,
bio: meta?.author?.bio,
photo_url: meta?.author?.photo_url,
head_extra: head_extra.length > 0 ? head_extra.join('') : undefined,
Expand Down

0 comments on commit 245f9c5

Please sign in to comment.