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,256 changes: 989 additions & 1,267 deletions studio/package-lock.json

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dependencies": {
"@deckdeckgo/charts": "^2.0.1",
"@deckdeckgo/color": "^4.0.0",
"@deckdeckgo/core": "^8.1.5",
"@deckdeckgo/core": "^8.1.6",
"@deckdeckgo/deck-utils": "^3.4.1",
"@deckdeckgo/demo": "^2.0.1",
"@deckdeckgo/drag-resize-rotate": "^2.0.1",
Expand All @@ -48,28 +48,29 @@
"@deckdeckgo/slide-utils": "^2.6.1",
"@deckdeckgo/slide-youtube": "^2.2.2",
"@deckdeckgo/social": "^4.0.0",
"@deckdeckgo/utils": "^1.8.0",
"@deckdeckgo/utils": "^1.8.1",
"@deckdeckgo/word-cloud": "^1.0.5",
"@deckdeckgo/youtube": "^2.0.1",
"@ionic/core": "^5.5.0",
"firebase": "^8.0.2",
"idb-keyval": "^5.0.4",
"@ionic/core": "^5.6.6",
"firebase": "^8.5.0",
"idb-keyval": "^5.0.5",
"socket.io-client": "^2.3.1",
"uuid": "^8.3.2",
"web-social-share": "^7.1.0"
},
"devDependencies": {
"@deckdeckgo/types": "^1.1.0",
"@rollup/plugin-replace": "^2.4.1",
"@stencil/core": "^2.0.3",
"@rollup/plugin-replace": "^2.4.2",
"@stencil/core": "^2.5.2",
"@stencil/postcss": "^1.0.1",
"@stencil/sass": "^1.3.2",
"@stencil/store": "^1.3.0",
"@stencil/store": "^1.4.1",
"@types/resize-observer-browser": "^0.1.5",
"@types/socket.io-client": "^1.4.34",
"@types/uuid": "^8.3.0",
"@types/wicg-native-file-system": "^2020.6.0",
"@types/wicg-file-system-access": "^2020.9.1",
"autoprefixer": "^9.8.6",
"husky": "^5.2.0",
"husky": "^6.0.0",
"prettier": "2.2.1",
"pretty-quick": "^3.1.0",
"workbox-build": "5.1.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class AppRandomGif {
return;
}

const gifResponse: TenorSearchResponse = await this.gifService.getRandomGif(this.keyword);
const gifResponse: TenorSearchResponse | undefined = await this.gifService.getRandomGif(this.keyword);

this.gif = gifResponse?.results?.[0] ?? null;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class AppActionsElement {
@Event() private imgDidChange: EventEmitter<HTMLElement>;
@Event() private notesDidChange: EventEmitter<HTMLElement>;

private elementResizeObserver: ResizeObserverConstructor;
private elementResizeObserver: ResizeObserver;

private readonly debounceResizeSlideContent: () => void;

Expand Down Expand Up @@ -677,7 +677,7 @@ export class AppActionsElement {
await this.detachMoveToolbarOnElement();

this.elementResizeObserver = new ResizeObserver(async (entries) => {
if (entries && entries.length > 0 && entries[0].target && entries[0].target.nodeName && !isSlide(entries[0].target)) {
if (entries && entries.length > 0 && entries[0].target && entries[0].target.nodeName && !isSlide(entries[0].target as HTMLElement)) {
await this.resizeSlideContent();
}
});
Expand Down
11 changes: 0 additions & 11 deletions studio/src/app/definitions/resize-observer.d.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export class RemoteEventsHandler {
};

private remoteEvent = async ($event) => {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
if (!$event || !$event.detail) {
resolve();
return;
Expand Down Expand Up @@ -205,7 +205,7 @@ export class RemoteEventsHandler {
};

private initRemoteSize = async () => {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement = this.el.querySelector('deckgo-remote');

const deck = this.el.querySelector('deckgo-deck');
Expand All @@ -232,7 +232,7 @@ export class RemoteEventsHandler {
};

private youtubePlayPause($event) {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deck = this.el.querySelector('deckgo-deck');

if (!deck) {
Expand Down Expand Up @@ -260,7 +260,7 @@ export class RemoteEventsHandler {
}

private initSlidesDidLoadListener() {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deck: HTMLElement = this.el.querySelector('deckgo-deck');

if (!deck) {
Expand All @@ -281,7 +281,7 @@ export class RemoteEventsHandler {
}

private initRemoteSlides = ($event: CustomEvent) => {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement = this.el.querySelector('deckgo-remote');

if (!deckgoRemoteElement || !document || !$event || !$event.detail) {
Expand All @@ -298,7 +298,7 @@ export class RemoteEventsHandler {
};

private initDeckMove() {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deck: HTMLElement = this.el.querySelector('deckgo-deck');

if (!deck) {
Expand Down Expand Up @@ -339,7 +339,7 @@ export class RemoteEventsHandler {
}

private slidePrevNext(next: boolean, animation: boolean) {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement = this.el.querySelector('deckgo-remote');

if (!deckgoRemoteElement) {
Expand All @@ -358,7 +358,7 @@ export class RemoteEventsHandler {
}

private moveRemote($event) {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement = this.el.querySelector('deckgo-remote');

if (!deckgoRemoteElement) {
Expand All @@ -373,7 +373,7 @@ export class RemoteEventsHandler {
}

private scrollRemote($event) {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement = this.el.querySelector('deckgo-remote');

if (!deckgoRemoteElement) {
Expand All @@ -388,7 +388,7 @@ export class RemoteEventsHandler {
}

private slideToChange($event) {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement = this.el.querySelector('deckgo-remote');

if (!deckgoRemoteElement || !event) {
Expand All @@ -410,7 +410,7 @@ export class RemoteEventsHandler {
}

private connect(): Promise<void> {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement = this.el.querySelector('deckgo-remote');

if (!deckgoRemoteElement) {
Expand Down Expand Up @@ -443,7 +443,7 @@ export class RemoteEventsHandler {
}

private disconnect(): Promise<void> {
return new Promise(async (resolve) => {
return new Promise<void>(async (resolve) => {
const deckgoRemoteElement: HTMLDeckgoRemoteElement = this.el.querySelector('deckgo-remote');

if (!deckgoRemoteElement) {
Expand Down
2 changes: 1 addition & 1 deletion studio/src/app/modals/editor/app-gif/app-gif.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export class AppGif {

this.searching = true;

const tenorResponse: TenorSearchResponse = await this.gifService.getGifs(this.searchTerm, this.paginationNext);
const tenorResponse: TenorSearchResponse | undefined = await this.gifService.getGifs(this.searchTerm, this.paginationNext);

this.searching = false;

Expand Down
2 changes: 1 addition & 1 deletion studio/src/app/modals/editor/app-photo/app-photo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class AppPhoto {

this.searching = true;

const unsplashResponse: UnsplashSearchResponse = await this.photoService.getPhotos(this.searchTerm, this.paginationNext);
const unsplashResponse: UnsplashSearchResponse | undefined = await this.photoService.getPhotos(this.searchTerm, this.paginationNext);

this.searching = false;

Expand Down
4 changes: 2 additions & 2 deletions studio/src/app/pages/editor/app-editor/app-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ export class AppEditor {
private contentRef!: HTMLElement;
private mainRef!: HTMLElement;

private mainResizeObserver: ResizeObserverConstructor;
private slideResizeObserver: ResizeObserverConstructor;
private mainResizeObserver: ResizeObserver;
private slideResizeObserver: ResizeObserver;

constructor() {
this.authService = AuthService.getInstance();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {ApiPhotoService} from './api.photo.service';

export class ApiPhotoMockService extends ApiPhotoService {
// @Override
getPhotos(_searchTerm: string, _next: string | number): Promise<UnsplashSearchResponse> {
getPhotos(_searchTerm: string, _next: string | number): Promise<UnsplashSearchResponse | undefined> {
return new Promise<UnsplashSearchResponse>(async (resolve) => {
const result: UnsplashSearchResponse = {
total: 1,
Expand Down
6 changes: 3 additions & 3 deletions studio/src/app/services/api/photo/api.photo.prod.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import store from '../../../stores/error.store';

export class ApiPhotoProdService extends ApiPhotoService {
// @Override
getPhotos(searchTerm: string, next: string | number): Promise<UnsplashSearchResponse> {
getPhotos(searchTerm: string, next: string | number): Promise<UnsplashSearchResponse | undefined> {
return new Promise<UnsplashSearchResponse>(async (resolve) => {
const config: EnvironmentUnsplashConfig = EnvironmentConfigService.getInstance().get('unsplash');

Expand All @@ -20,14 +20,14 @@ export class ApiPhotoProdService extends ApiPhotoService {

if (!response) {
store.state.error = 'Unsplash photos could not be fetched';
resolve();
resolve(undefined);
return;
}

resolve(response);
} catch (err) {
store.state.error = err.message;
resolve();
resolve(undefined);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion studio/src/app/services/api/photo/api.photo.service.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export abstract class ApiPhotoService {
abstract getPhotos(searchTerm: string, next: string | number): Promise<UnsplashSearchResponse>;
abstract getPhotos(searchTerm: string, next: string | number): Promise<UnsplashSearchResponse | undefined>;

abstract registerDownload(photoId: string): Promise<void>;
}
6 changes: 3 additions & 3 deletions studio/src/app/services/editor/offline/offline.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ export class OfflineService {
}

// 1. We upload the file to the storage cloud
const storageFile: StorageFile = await this.storageOnlineService.uploadFile(data, 'data', 10485760);
const storageFile: StorageFile | undefined = await this.storageOnlineService.uploadFile(data, 'data', 10485760);

if (!storageFile) {
reject(`Chart ${src} upload has failed.`);
Expand Down Expand Up @@ -588,7 +588,7 @@ export class OfflineService {
}

// 1. We upload the file to the storage cloud
const storageFile: StorageFile = await this.storageOnlineService.uploadFile(data, 'images', 10485760);
const storageFile: StorageFile | undefined = await this.storageOnlineService.uploadFile(data, 'images', 10485760);

if (!storageFile) {
reject(`Image ${img.imgSrc} upload has failed.`);
Expand Down Expand Up @@ -785,7 +785,7 @@ export class OfflineService {
}

// 1. We upload the file to the storage cloud
const storageFile: StorageFile = await this.storageOnlineService.uploadFile(data, 'images', 10485760);
const storageFile: StorageFile | undefined = await this.storageOnlineService.uploadFile(data, 'images', 10485760);

if (!storageFile) {
reject(`Image ${img.imgSrc} upload has failed.`);
Expand Down
8 changes: 4 additions & 4 deletions studio/src/app/services/storage/storage.offline.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ export class StorageOfflineService {
return StorageOfflineService.instance;
}

uploadFile(data: File, folder: string, maxSize: number): Promise<StorageFile> {
uploadFile(data: File, folder: string, maxSize: number): Promise<StorageFile | undefined> {
return new Promise<StorageFile>(async (resolve) => {
try {
if (!data || !data.name) {
store.state.error = 'File not valid.';
resolve();
resolve(undefined);
return;
}

if (data.size > maxSize) {
store.state.error = `File is too big (max. ${maxSize / 1048576} Mb)`;
resolve();
resolve(undefined);
return;
}

Expand All @@ -38,7 +38,7 @@ export class StorageOfflineService {
});
} catch (err) {
store.state.error = 'File could not be saved.';
resolve();
resolve(undefined);
}
});
}
Expand Down
10 changes: 5 additions & 5 deletions studio/src/app/services/storage/storage.online.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ export class StorageOnlineService {
return StorageOnlineService.instance;
}

uploadFile(data: File, folder: string, maxSize: number, downloadUrl: boolean = true): Promise<StorageFile> {
uploadFile(data: File, folder: string, maxSize: number, downloadUrl: boolean = true): Promise<StorageFile | undefined> {
return new Promise<StorageFile>(async (resolve) => {
try {
if (!authStore.state.authUser || !authStore.state.authUser.uid || authStore.state.authUser.uid === '' || authStore.state.authUser.uid === undefined) {
errorStore.state.error = 'Not logged in.';
resolve();
resolve(undefined);
return;
}

if (!data || !data.name) {
errorStore.state.error = 'File not valid.';
resolve();
resolve(undefined);
return;
}

if (data.size > maxSize) {
errorStore.state.error = `File is too big (max. ${maxSize / 1048576} Mb)`;
resolve();
resolve(undefined);
return;
}

Expand All @@ -50,7 +50,7 @@ export class StorageOnlineService {
});
} catch (err) {
errorStore.state.error = err.message;
resolve();
resolve(undefined);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion studio/src/app/services/storage/storage.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class StorageService {
return StorageService.instance;
}

async uploadFile(data: File, folder: string, maxSize: number, downloadUrl: boolean = true): Promise<StorageFile> {
async uploadFile(data: File, folder: string, maxSize: number, downloadUrl: boolean = true): Promise<StorageFile | undefined> {
const offline: OfflineDeck = await OfflineService.getInstance().status();

if (offline !== undefined) {
Expand Down
Loading