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

Commit 4750c19

Browse files
Merge pull request #1214 from deckgo/chore/prettier-no-trailing-comma
chore: prettier no trailing comma
2 parents 264da2c + afaeb94 commit 4750c19

File tree

197 files changed

+2464
-2650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+2464
-2650
lines changed

studio/.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.firebase
2+
www

studio/.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"arrowParens": "always",
55
"bracketSpacing": false,
66
"jsxBracketSameLine": true,
7+
"trailingComma": "none",
78
"overrides": [
89
{
910
"files": ["*.scss", "*.css"],

studio/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
- figma integration ([#246](https://github.com/deckgo/deckdeckgo/issues/246))
4040
- german translations ([#1122](https://github.com/deckgo/deckdeckgo/issues/1122) and [#1123](https://github.com/deckgo/deckdeckgo/issues/1123))
41-
- accept images svg and webp ([#1113](https://github.com/deckgo/deckdeckgo/pull/1113))
41+
- accept images svg and webp ([#1113](https://github.com/deckgo/deckdeckgo/pull/1113))
4242
- csp object-src and base-uri ([#1111](https://github.com/deckgo/deckdeckgo/pull/1111))
4343

4444
# 4.4.0 (2020-03-18)

studio/scripts/i18n.types.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const generate = async () => {
1212
return {
1313
key,
1414
name: `I18n${key.charAt(0).toUpperCase()}${key.slice(1)}`,
15-
properties,
15+
properties
1616
};
1717
});
1818

studio/src/app/app-root.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {LangService} from './services/lang/lang.service';
1717

1818
@Component({
1919
tag: 'app-root',
20-
styleUrl: 'app-root.scss',
20+
styleUrl: 'app-root.scss'
2121
})
2222
export class AppRoot {
2323
@Element() el: HTMLElement;
@@ -56,7 +56,7 @@ export class AppRoot {
5656
this.themeService.initDarkModePreference(),
5757
this.colorService.init(),
5858
this.settingsService.init(),
59-
this.langService.init(),
59+
this.langService.init()
6060
];
6161

6262
await Promise.all(promises);
@@ -112,11 +112,11 @@ export class AppRoot {
112112
handler: () => {
113113
registration.waiting.postMessage('skipWaiting');
114114
window.location.reload();
115-
},
116-
},
115+
}
116+
}
117117
],
118118
position: 'top',
119-
color: 'quaternary',
119+
color: 'quaternary'
120120
});
121121

122122
await toast.present();
@@ -128,12 +128,12 @@ export class AppRoot {
128128
buttons: [
129129
{
130130
text: 'Close',
131-
role: 'cancel',
132-
},
131+
role: 'cancel'
132+
}
133133
],
134134
position: 'top',
135135
color: 'danger',
136-
duration: 6000,
136+
duration: 6000
137137
});
138138

139139
toast.onDidDismiss().then(() => {
@@ -218,7 +218,7 @@ export class AppRoot {
218218
<ion-nav id="menu-content" />
219219

220220
<app-share-deck ref={(el) => (this.shareRef = el as HTMLAppShareDeckElement)}></app-share-deck>
221-
</ion-app>,
221+
</ion-app>
222222
];
223223
}
224224
}

studio/src/app/components/core/app-footer/app-links.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import i18n from '../../../stores/i18n.store';
55
@Component({
66
tag: 'app-links',
77
styleUrl: 'app-links.scss',
8-
shadow: false,
8+
shadow: false
99
})
1010
export class AppLinks {
1111
render() {

studio/src/app/components/core/app-menu/app-menu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {AuthService} from '../../../services/auth/auth.service';
1212
@Component({
1313
tag: 'app-menu',
1414
styleUrl: 'app-menu.scss',
15-
shadow: false,
15+
shadow: false
1616
})
1717
export class AppMenu {
1818
@Element() el: HTMLElement;
@@ -32,7 +32,7 @@ export class AppMenu {
3232

3333
navStore.state.nav = {
3434
url: '/',
35-
direction: NavDirection.RELOAD,
35+
direction: NavDirection.RELOAD
3636
};
3737
}
3838

studio/src/app/components/core/app-navigation-actions/app-navigation-actions.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {signIn} from '../../../utils/core/signin.utils';
1212
@Component({
1313
tag: 'app-navigation-actions',
1414
styleUrl: 'app-navigation-actions.scss',
15-
shadow: false,
15+
shadow: false
1616
})
1717
export class AppNavigationActions {
1818
@Prop() signIn: boolean = true;
@@ -25,7 +25,7 @@ export class AppNavigationActions {
2525
const popover: HTMLIonPopoverElement = await popoverController.create({
2626
component: 'app-user-menu',
2727
event: $event,
28-
mode: 'ios',
28+
mode: 'ios'
2929
});
3030

3131
await popover.present();

studio/src/app/components/core/app-navigation/app-navigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import store from '../../../stores/deck.store';
77
@Component({
88
tag: 'app-navigation',
99
styleUrl: 'app-navigation.scss',
10-
shadow: false,
10+
shadow: false
1111
})
1212
export class AppNavigation {
1313
@Prop() menuToggle: boolean = true;

studio/src/app/components/core/app-random-gif/app-random-gif.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {GifService} from '../../../services/tenor/gif/gif.service';
44

55
@Component({
66
tag: 'app-random-gif',
7-
styleUrl: 'app-random-gif.scss',
7+
styleUrl: 'app-random-gif.scss'
88
})
99
export class AppRandomGif {
1010
@Prop()

studio/src/app/components/core/app-share-deck/app-share-deck.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {getPublishedUrl, getShareText, getShareTwitterText} from '../../../utils
99
@Component({
1010
tag: 'app-share-deck',
1111
styleUrl: 'app-share-deck.scss',
12-
shadow: true,
12+
shadow: true
1313
})
1414
export class AppShareDeck {
1515
@Element() el: HTMLElement;
@@ -31,7 +31,7 @@ export class AppShareDeck {
3131
// @ts-ignore
3232
await navigator.share({
3333
text: text,
34-
url: publishedUrl,
34+
url: publishedUrl
3535
});
3636
}
3737

@@ -54,40 +54,40 @@ export class AppShareDeck {
5454
socialShareText: twitterText,
5555
socialShareUrl: publishedUrl,
5656
socialSharePopupWidth: 300,
57-
socialSharePopupHeight: 400,
58-
},
57+
socialSharePopupHeight: 400
58+
}
5959
},
6060
{
6161
linkedin: {
62-
socialShareUrl: publishedUrl,
63-
},
62+
socialShareUrl: publishedUrl
63+
}
6464
},
6565
{
6666
email: {
67-
socialShareBody: `${text} ${publishedUrl}`,
68-
},
67+
socialShareBody: `${text} ${publishedUrl}`
68+
}
6969
},
7070
{
7171
whatsapp: {
72-
socialShareUrl: publishedUrl,
73-
},
72+
socialShareUrl: publishedUrl
73+
}
7474
},
7575
{
7676
copy: {
77-
socialShareUrl: publishedUrl,
78-
},
77+
socialShareUrl: publishedUrl
78+
}
7979
},
8080
{
8181
hackernews: {
82-
socialShareUrl: publishedUrl,
83-
},
82+
socialShareUrl: publishedUrl
83+
}
8484
},
8585
{
8686
telegram: {
87-
socialShareUrl: publishedUrl,
88-
},
89-
},
90-
],
87+
socialShareUrl: publishedUrl
88+
}
89+
}
90+
]
9191
};
9292

9393
webSocialShare.share = shareOptions;

studio/src/app/components/core/app-signin/app-signin.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {DeckService} from '../../../services/data/deck/deck.service';
2222

2323
@Component({
2424
tag: 'app-signin',
25-
styleUrl: 'app-signin.scss',
25+
styleUrl: 'app-signin.scss'
2626
})
2727
export class AppSignIn {
2828
@Element() el: HTMLElement;
@@ -67,7 +67,7 @@ export class AppSignIn {
6767

6868
await Utils.injectJS({
6969
id: 'firebase-ui-script',
70-
src: 'https://www.gstatic.com/firebasejs/ui/4.8.0/firebase-ui-auth.js',
70+
src: 'https://www.gstatic.com/firebasejs/ui/4.8.0/firebase-ui-auth.js'
7171
});
7272
await Utils.injectCSS('firebase-ui-css', 'https://www.gstatic.com/firebasejs/ui/4.8.0/firebase-ui-auth.css');
7373

@@ -83,7 +83,7 @@ export class AppSignIn {
8383
// GitHub scope
8484
signInOptions.push({
8585
provider: firebase.auth.GithubAuthProvider.PROVIDER_ID,
86-
scopes: ['public_repo'],
86+
scopes: ['public_repo']
8787
});
8888

8989
signInOptions.push(firebase.auth.GoogleAuthProvider.PROVIDER_ID);
@@ -125,8 +125,8 @@ export class AppSignIn {
125125
},
126126
// signInFailure callback must be provided to handle merge conflicts which
127127
// occur when an existing credential is linked to an anonymous user.
128-
signInFailure: this.onSignInFailure,
129-
},
128+
signInFailure: this.onSignInFailure
129+
}
130130
};
131131

132132
// @ts-ignore
@@ -232,7 +232,7 @@ export class AppSignIn {
232232
deckId: this.redirectId ? this.redirectId : null,
233233
userId: authStore.state.authUser ? authStore.state.authUser.uid : null,
234234
userToken: token,
235-
anonymous: authStore.state.authUser ? authStore.state.authUser.anonymous : true,
235+
anonymous: authStore.state.authUser ? authStore.state.authUser.anonymous : true
236236
})
237237
);
238238
}
@@ -255,13 +255,13 @@ export class AppSignIn {
255255
// Do not push a new page but reload as we might later face a DOM with contains two firebaseui which would not work
256256
navStore.state.nav = {
257257
url: url + `?signin=${redirectStatus}`,
258-
direction,
258+
direction
259259
};
260260
}
261261

262262
async navigateBack() {
263263
navStore.state.nav = {
264-
direction: NavDirection.BACK,
264+
direction: NavDirection.BACK
265265
};
266266
}
267267

@@ -278,9 +278,9 @@ export class AppSignIn {
278278
id: userCred.user.uid,
279279
data: {
280280
github: {
281-
token: (userCred.credential as OAuthCredential).accessToken,
282-
},
283-
},
281+
token: (userCred.credential as OAuthCredential).accessToken
282+
}
283+
}
284284
};
285285
}
286286

@@ -298,14 +298,14 @@ export class AppSignIn {
298298
<p class="ion-text-center ion-padding-start ion-padding-end">
299299
<small>{i18n.state.core.free_open_source}</small>
300300
</p>
301-
</main>,
301+
</main>
302302
];
303303
}
304304

305305
private renderMsg() {
306306
return [
307307
<h1 class="ion-text-center ion-padding-start ion-padding-end">{i18n.state.sign_in.hi}</h1>,
308-
<p class="ion-text-center ion-padding">{i18n.state.sign_in.why}</p>,
308+
<p class="ion-text-center ion-padding">{i18n.state.sign_in.why}</p>
309309
];
310310
}
311311

studio/src/app/components/core/app-spinner/app-spinner.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, h} from '@stencil/core';
22

33
@Component({
44
tag: 'app-spinner',
5-
styleUrl: 'app-spinner.scss',
5+
styleUrl: 'app-spinner.scss'
66
})
77
export class AppSpinner {
88
render() {

studio/src/app/components/core/app-start-deck/app-start-deck.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import i18n from '../../../stores/i18n.store';
66
import navStore, {NavDirection} from '../../../stores/nav.store';
77

88
@Component({
9-
tag: 'app-start-deck',
9+
tag: 'app-start-deck'
1010
})
1111
export class AppStartDeck {
1212
@Prop()
@@ -18,7 +18,7 @@ export class AppStartDeck {
1818
private async navigateEditor() {
1919
navStore.state.nav = {
2020
url: '/editor',
21-
direction: NavDirection.RELOAD,
21+
direction: NavDirection.RELOAD
2222
};
2323
}
2424

@@ -27,7 +27,7 @@ export class AppStartDeck {
2727
component: 'app-deck-import',
2828
event: $event,
2929
mode: 'ios',
30-
cssClass: 'info',
30+
cssClass: 'info'
3131
});
3232

3333
popover.onDidDismiss().then(async (detail: OverlayEventDetail) => {
@@ -44,7 +44,7 @@ export class AppStartDeck {
4444

4545
navStore.state.nav = {
4646
url: url,
47-
direction: NavDirection.RELOAD,
47+
direction: NavDirection.RELOAD
4848
};
4949
}
5050

studio/src/app/components/core/app-template-showcase/app-template-showcase.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {TemplateUtils} from '../../../utils/editor/template.utils';
88

99
@Component({
1010
tag: 'app-template-showcase',
11-
styleUrl: 'app-template-showcase.scss',
11+
styleUrl: 'app-template-showcase.scss'
1212
})
1313
export class AppTemplateShowcase {
1414
@Prop()

studio/src/app/components/core/app-unpublish/app-unpublish.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {renderI18n} from '../../../utils/core/i18n.utils';
66

77
@Component({
88
tag: 'app-unpublish',
9-
styleUrl: 'app-unpublish.scss',
9+
styleUrl: 'app-unpublish.scss'
1010
})
1111
export class AppUnpublish {
1212
render() {
@@ -18,7 +18,7 @@ export class AppUnpublish {
1818
<a href="https://deckdeckgo.com/en/contact/" rel="noopener norefferer" target="_blank">
1919
contact
2020
</a>
21-
),
21+
)
2222
})}
2323
</p>
2424
);

studio/src/app/components/core/app-user-info/app-user-info.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import apiUserStore from '../../../stores/api.user.store';
66

77
@Component({
88
tag: 'app-user-info',
9-
styleUrl: 'app-user-info.scss',
9+
styleUrl: 'app-user-info.scss'
1010
})
1111
export class AppUserInfo {
1212
@Prop()

0 commit comments

Comments
 (0)