From 440e7a7b00641ee276d22bc558d8d507aba5a5f8 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 17 Apr 2020 11:57:55 +0200 Subject: [PATCH] Run prettier for all JS files --- .../core/js/src/admin/AdminApplication.js | 8 +- framework/core/js/src/admin/compat.js | 4 +- .../src/admin/components/AddExtensionModal.js | 6 +- .../src/admin/components/AdminLinkButton.js | 6 +- .../core/js/src/admin/components/AdminNav.js | 94 ++-- .../js/src/admin/components/AppearancePage.js | 58 +-- .../js/src/admin/components/BasicsPage.js | 102 +++-- .../js/src/admin/components/DashboardPage.js | 6 +- .../src/admin/components/DashboardWidget.js | 6 +- .../admin/components/EditCustomCssModal.js | 10 +- .../admin/components/EditCustomFooterModal.js | 4 +- .../admin/components/EditCustomHeaderModal.js | 4 +- .../js/src/admin/components/EditGroupModal.js | 111 +++-- .../js/src/admin/components/ExtensionsPage.js | 86 ++-- .../js/src/admin/components/HeaderPrimary.js | 6 +- .../src/admin/components/HeaderSecondary.js | 6 +- .../core/js/src/admin/components/MailPage.js | 102 ++--- .../admin/components/PermissionDropdown.js | 79 ++-- .../js/src/admin/components/PermissionGrid.js | 400 +++++++++++------- .../src/admin/components/PermissionsPage.js | 17 +- .../src/admin/components/SessionDropdown.js | 10 +- .../src/admin/components/SettingDropdown.js | 6 +- .../js/src/admin/components/SettingsModal.js | 17 +- .../js/src/admin/components/StatusWidget.js | 32 +- .../src/admin/components/UploadImageButton.js | 50 ++- .../core/js/src/admin/components/Widget.js | 6 +- framework/core/js/src/admin/index.js | 1 - framework/core/js/src/admin/routes.js | 14 +- .../core/js/src/admin/utils/saveSettings.js | 18 +- framework/core/js/src/common/Application.js | 136 +++--- framework/core/js/src/common/Component.js | 18 +- framework/core/js/src/common/Model.js | 94 ++-- framework/core/js/src/common/Session.js | 15 +- framework/core/js/src/common/Store.js | 29 +- framework/core/js/src/common/Translator.js | 44 +- framework/core/js/src/common/compat.js | 16 +- .../core/js/src/common/components/Alert.js | 15 +- .../js/src/common/components/AlertManager.js | 4 +- .../core/js/src/common/components/Badge.js | 8 +- .../core/js/src/common/components/Button.js | 4 +- .../core/js/src/common/components/Checkbox.js | 13 +- .../core/js/src/common/components/Dropdown.js | 25 +- .../js/src/common/components/GroupBadge.js | 2 +- .../js/src/common/components/LinkButton.js | 4 +- .../core/js/src/common/components/Modal.js | 21 +- .../js/src/common/components/ModalManager.js | 20 +- .../js/src/common/components/Navigation.js | 31 +- .../common/components/RequestErrorModal.js | 20 +- .../core/js/src/common/components/Select.js | 15 +- .../src/common/components/SelectDropdown.js | 9 +- .../js/src/common/components/Separator.js | 2 +- .../js/src/common/components/SplitDropdown.js | 10 +- framework/core/js/src/common/extend.js | 4 +- framework/core/js/src/common/extend/Model.js | 10 +- .../core/js/src/common/extend/PostTypes.js | 2 +- framework/core/js/src/common/extend/Routes.js | 2 +- .../core/js/src/common/helpers/avatar.js | 4 +- .../core/js/src/common/helpers/fullTime.js | 6 +- .../core/js/src/common/helpers/humanTime.js | 6 +- framework/core/js/src/common/helpers/icon.js | 2 +- .../core/js/src/common/helpers/listItems.js | 19 +- .../js/src/common/helpers/punctuateSeries.js | 4 +- .../core/js/src/common/helpers/userOnline.js | 6 +- .../core/js/src/common/models/Discussion.js | 14 +- framework/core/js/src/common/models/Group.js | 2 +- .../core/js/src/common/models/Notification.js | 2 +- framework/core/js/src/common/models/Post.js | 6 +- framework/core/js/src/common/models/User.js | 12 +- framework/core/js/src/common/utils/Drawer.js | 2 +- .../core/js/src/common/utils/ItemList.js | 21 +- .../js/src/common/utils/ScrollListener.js | 10 +- .../js/src/common/utils/SubtreeRetainer.js | 2 +- .../core/js/src/common/utils/classList.js | 2 +- .../core/js/src/common/utils/computed.js | 9 +- framework/core/js/src/common/utils/evented.js | 8 +- .../core/js/src/common/utils/extractText.js | 2 +- .../core/js/src/common/utils/humanTime.js | 2 +- .../js/src/common/utils/liveHumanTimes.js | 2 +- framework/core/js/src/common/utils/mixin.js | 2 +- .../core/js/src/common/utils/patchMithril.js | 8 +- framework/core/js/src/common/utils/string.js | 11 +- .../core/js/src/common/utils/stringToColor.js | 38 +- .../core/js/src/forum/ForumApplication.js | 17 +- framework/core/js/src/forum/compat.js | 4 +- .../js/src/forum/components/AvatarEditor.js | 62 +-- .../src/forum/components/ChangeEmailModal.js | 36 +- .../forum/components/ChangePasswordModal.js | 17 +- .../js/src/forum/components/CommentPost.js | 49 ++- .../core/js/src/forum/components/Composer.js | 110 ++--- .../js/src/forum/components/ComposerBody.js | 9 +- .../forum/components/DiscussionComposer.js | 26 +- .../js/src/forum/components/DiscussionList.js | 27 +- .../forum/components/DiscussionListItem.js | 66 +-- .../js/src/forum/components/DiscussionPage.js | 68 +-- .../DiscussionRenamedNotification.js | 2 +- .../forum/components/DiscussionRenamedPost.js | 4 +- .../components/DiscussionsSearchSource.js | 16 +- .../forum/components/DiscussionsUserPage.js | 4 +- .../src/forum/components/EditPostComposer.js | 20 +- .../js/src/forum/components/EditUserModal.js | 180 ++++---- .../core/js/src/forum/components/EventPost.js | 17 +- .../forum/components/ForgotPasswordModal.js | 24 +- .../js/src/forum/components/HeaderPrimary.js | 6 +- .../src/forum/components/HeaderSecondary.js | 64 +-- .../core/js/src/forum/components/IndexPage.js | 48 ++- .../js/src/forum/components/LoadingPost.js | 10 +- .../js/src/forum/components/LogInButton.js | 17 +- .../js/src/forum/components/LogInButtons.js | 6 +- .../js/src/forum/components/LogInModal.js | 115 ++--- .../js/src/forum/components/Notification.js | 51 ++- .../src/forum/components/NotificationGrid.js | 48 +-- .../src/forum/components/NotificationList.js | 120 +++--- .../forum/components/NotificationsDropdown.js | 6 +- .../core/js/src/forum/components/Post.js | 60 +-- .../js/src/forum/components/PostEdited.js | 5 +- .../core/js/src/forum/components/PostMeta.js | 17 +- .../js/src/forum/components/PostPreview.js | 3 +- .../js/src/forum/components/PostStream.js | 107 ++--- .../forum/components/PostStreamScrubber.js | 61 +-- .../core/js/src/forum/components/PostUser.js | 15 +- .../js/src/forum/components/PostsUserPage.js | 26 +- .../forum/components/RenameDiscussionModal.js | 27 +- .../js/src/forum/components/ReplyComposer.js | 36 +- .../src/forum/components/ReplyPlaceholder.js | 7 +- .../core/js/src/forum/components/Search.js | 67 +-- .../js/src/forum/components/SearchSource.js | 6 +- .../src/forum/components/SessionDropdown.js | 25 +- .../js/src/forum/components/SettingsPage.js | 36 +- .../js/src/forum/components/SignUpModal.js | 122 +++--- .../js/src/forum/components/TerminalPost.js | 2 +- .../js/src/forum/components/TextEditor.js | 22 +- .../core/js/src/forum/components/UserCard.js | 55 ++- .../core/js/src/forum/components/UserPage.js | 67 +-- .../src/forum/components/UsersSearchSource.js | 26 +- .../js/src/forum/components/WelcomeHero.js | 4 +- framework/core/js/src/forum/routes.js | 28 +- .../js/src/forum/utils/DiscussionControls.js | 95 +++-- framework/core/js/src/forum/utils/History.js | 6 +- .../js/src/forum/utils/KeyboardNavigatable.js | 12 +- framework/core/js/src/forum/utils/Pane.js | 5 +- .../core/js/src/forum/utils/PostControls.js | 58 ++- .../core/js/src/forum/utils/UserControls.js | 63 +-- .../core/js/src/forum/utils/affixSidebar.js | 10 +- .../src/forum/utils/alertEmailConfirmation.js | 35 +- framework/core/js/src/forum/utils/slidable.js | 23 +- 145 files changed, 2374 insertions(+), 2050 deletions(-) diff --git a/framework/core/js/src/admin/AdminApplication.js b/framework/core/js/src/admin/AdminApplication.js index 96857c55a..e0d9464e4 100644 --- a/framework/core/js/src/admin/AdminApplication.js +++ b/framework/core/js/src/admin/AdminApplication.js @@ -12,9 +12,9 @@ export default class AdminApplication extends Application { canGoBack: () => true, getPrevious: () => {}, backUrl: () => this.forum.attribute('baseUrl'), - back: function() { + back: function () { window.location = this.backUrl(); - } + }, }; constructor() { @@ -27,7 +27,7 @@ export default class AdminApplication extends Application { * @inheritdoc */ mount() { - m.mount(document.getElementById('app-navigation'), Navigation.component({className: 'App-backControl', drawer: true})); + m.mount(document.getElementById('app-navigation'), Navigation.component({ className: 'App-backControl', drawer: true })); m.mount(document.getElementById('header-navigation'), Navigation.component()); m.mount(document.getElementById('header-primary'), HeaderPrimary.component()); m.mount(document.getElementById('header-secondary'), HeaderSecondary.component()); @@ -59,5 +59,5 @@ export default class AdminApplication extends Application { } return required; - }; + } } diff --git a/framework/core/js/src/admin/compat.js b/framework/core/js/src/admin/compat.js index b72a6ff0f..0b5706b04 100644 --- a/framework/core/js/src/admin/compat.js +++ b/framework/core/js/src/admin/compat.js @@ -58,6 +58,6 @@ export default Object.assign(compat, { 'components/AdminNav': AdminNav, 'components/EditCustomCssModal': EditCustomCssModal, 'components/EditGroupModal': EditGroupModal, - 'routes': routes, - 'AdminApplication': AdminApplication + routes: routes, + AdminApplication: AdminApplication, }); diff --git a/framework/core/js/src/admin/components/AddExtensionModal.js b/framework/core/js/src/admin/components/AddExtensionModal.js index afcd451ee..d3428c9ac 100644 --- a/framework/core/js/src/admin/components/AddExtensionModal.js +++ b/framework/core/js/src/admin/components/AddExtensionModal.js @@ -22,8 +22,10 @@ export default class AddExtensionModal extends Modal { return (

{app.translator.trans('core.admin.add_extension.temporary_text')}

-

{app.translator.trans('core.admin.add_extension.install_text', {a: })}

-

{app.translator.trans('core.admin.add_extension.developer_text', {a: })}

+

+ {app.translator.trans('core.admin.add_extension.install_text', { a: })} +

+

{app.translator.trans('core.admin.add_extension.developer_text', { a: })}

); } diff --git a/framework/core/js/src/admin/components/AdminLinkButton.js b/framework/core/js/src/admin/components/AdminLinkButton.js index 1378c1e3b..2602bc273 100644 --- a/framework/core/js/src/admin/components/AdminLinkButton.js +++ b/framework/core/js/src/admin/components/AdminLinkButton.js @@ -13,11 +13,7 @@ export default class AdminLinkButton extends LinkButton { getButtonContent() { const content = super.getButtonContent(); - content.push( -
- {this.props.description} -
- ); + content.push(
{this.props.description}
); return content; } diff --git a/framework/core/js/src/admin/components/AdminNav.js b/framework/core/js/src/admin/components/AdminNav.js index 4c4cc1df0..f96a4e162 100644 --- a/framework/core/js/src/admin/components/AdminNav.js +++ b/framework/core/js/src/admin/components/AdminNav.js @@ -15,9 +15,7 @@ import ItemList from '../../common/utils/ItemList'; export default class AdminNav extends Component { view() { return ( - + {this.items().toArray()} ); @@ -31,47 +29,65 @@ export default class AdminNav extends Component { items() { const items = new ItemList(); - items.add('dashboard', AdminLinkButton.component({ - href: app.route('dashboard'), - icon: 'far fa-chart-bar', - children: app.translator.trans('core.admin.nav.dashboard_button'), - description: app.translator.trans('core.admin.nav.dashboard_text') - })); + items.add( + 'dashboard', + AdminLinkButton.component({ + href: app.route('dashboard'), + icon: 'far fa-chart-bar', + children: app.translator.trans('core.admin.nav.dashboard_button'), + description: app.translator.trans('core.admin.nav.dashboard_text'), + }) + ); - items.add('basics', AdminLinkButton.component({ - href: app.route('basics'), - icon: 'fas fa-pencil-alt', - children: app.translator.trans('core.admin.nav.basics_button'), - description: app.translator.trans('core.admin.nav.basics_text') - })); + items.add( + 'basics', + AdminLinkButton.component({ + href: app.route('basics'), + icon: 'fas fa-pencil-alt', + children: app.translator.trans('core.admin.nav.basics_button'), + description: app.translator.trans('core.admin.nav.basics_text'), + }) + ); - items.add('mail', AdminLinkButton.component({ - href: app.route('mail'), - icon: 'fas fa-envelope', - children: app.translator.trans('core.admin.nav.email_button'), - description: app.translator.trans('core.admin.nav.email_text') - })); + items.add( + 'mail', + AdminLinkButton.component({ + href: app.route('mail'), + icon: 'fas fa-envelope', + children: app.translator.trans('core.admin.nav.email_button'), + description: app.translator.trans('core.admin.nav.email_text'), + }) + ); - items.add('permissions', AdminLinkButton.component({ - href: app.route('permissions'), - icon: 'fas fa-key', - children: app.translator.trans('core.admin.nav.permissions_button'), - description: app.translator.trans('core.admin.nav.permissions_text') - })); + items.add( + 'permissions', + AdminLinkButton.component({ + href: app.route('permissions'), + icon: 'fas fa-key', + children: app.translator.trans('core.admin.nav.permissions_button'), + description: app.translator.trans('core.admin.nav.permissions_text'), + }) + ); - items.add('appearance', AdminLinkButton.component({ - href: app.route('appearance'), - icon: 'fas fa-paint-brush', - children: app.translator.trans('core.admin.nav.appearance_button'), - description: app.translator.trans('core.admin.nav.appearance_text') - })); + items.add( + 'appearance', + AdminLinkButton.component({ + href: app.route('appearance'), + icon: 'fas fa-paint-brush', + children: app.translator.trans('core.admin.nav.appearance_button'), + description: app.translator.trans('core.admin.nav.appearance_text'), + }) + ); - items.add('extensions', AdminLinkButton.component({ - href: app.route('extensions'), - icon: 'fas fa-puzzle-piece', - children: app.translator.trans('core.admin.nav.extensions_button'), - description: app.translator.trans('core.admin.nav.extensions_text') - })); + items.add( + 'extensions', + AdminLinkButton.component({ + href: app.route('extensions'), + icon: 'fas fa-puzzle-piece', + children: app.translator.trans('core.admin.nav.extensions_button'), + description: app.translator.trans('core.admin.nav.extensions_text'), + }) + ); return items; } diff --git a/framework/core/js/src/admin/components/AppearancePage.js b/framework/core/js/src/admin/components/AppearancePage.js index 2f788ea96..98a1cc373 100644 --- a/framework/core/js/src/admin/components/AppearancePage.js +++ b/framework/core/js/src/admin/components/AppearancePage.js @@ -24,85 +24,85 @@ export default class AppearancePage extends Page {
{app.translator.trans('core.admin.appearance.colors_heading')} -
- {app.translator.trans('core.admin.appearance.colors_text')} -
+
{app.translator.trans('core.admin.appearance.colors_text')}
- - + +
{Switch.component({ state: this.darkMode(), children: app.translator.trans('core.admin.appearance.dark_mode_label'), - onchange: this.darkMode + onchange: this.darkMode, })} {Switch.component({ state: this.coloredHeader(), children: app.translator.trans('core.admin.appearance.colored_header_label'), - onchange: this.coloredHeader + onchange: this.coloredHeader, })} {Button.component({ className: 'Button Button--primary', type: 'submit', children: app.translator.trans('core.admin.appearance.submit_button'), - loading: this.loading + loading: this.loading, })}
{app.translator.trans('core.admin.appearance.logo_heading')} -
- {app.translator.trans('core.admin.appearance.logo_text')} -
- +
{app.translator.trans('core.admin.appearance.logo_text')}
+
{app.translator.trans('core.admin.appearance.favicon_heading')} -
- {app.translator.trans('core.admin.appearance.favicon_text')} -
- +
{app.translator.trans('core.admin.appearance.favicon_text')}
+
{app.translator.trans('core.admin.appearance.custom_header_heading')} -
- {app.translator.trans('core.admin.appearance.custom_header_text')} -
+
{app.translator.trans('core.admin.appearance.custom_header_text')}
{Button.component({ className: 'Button', children: app.translator.trans('core.admin.appearance.edit_header_button'), - onclick: () => app.modal.show(new EditCustomHeaderModal()) + onclick: () => app.modal.show(new EditCustomHeaderModal()), })}
{app.translator.trans('core.admin.appearance.custom_footer_heading')} -
- {app.translator.trans('core.admin.appearance.custom_footer_text')} -
+
{app.translator.trans('core.admin.appearance.custom_footer_text')}
{Button.component({ className: 'Button', children: app.translator.trans('core.admin.appearance.edit_footer_button'), - onclick: () => app.modal.show(new EditCustomFooterModal()) + onclick: () => app.modal.show(new EditCustomFooterModal()), })}
{app.translator.trans('core.admin.appearance.custom_styles_heading')} -
- {app.translator.trans('core.admin.appearance.custom_styles_text')} -
+
{app.translator.trans('core.admin.appearance.custom_styles_text')}
{Button.component({ className: 'Button', children: app.translator.trans('core.admin.appearance.edit_css_button'), - onclick: () => app.modal.show(new EditCustomCssModal()) + onclick: () => app.modal.show(new EditCustomCssModal()), })}
@@ -126,7 +126,7 @@ export default class AppearancePage extends Page { theme_primary_color: this.primaryColor(), theme_secondary_color: this.secondaryColor(), theme_dark_mode: this.darkMode(), - theme_colored_header: this.coloredHeader() + theme_colored_header: this.coloredHeader(), }).then(() => window.location.reload()); } } diff --git a/framework/core/js/src/admin/components/BasicsPage.js b/framework/core/js/src/admin/components/BasicsPage.js index 3a4d082fd..746bcce8b 100644 --- a/framework/core/js/src/admin/components/BasicsPage.js +++ b/framework/core/js/src/admin/components/BasicsPage.js @@ -20,12 +20,12 @@ export default class BasicsPage extends Page { 'show_language_selector', 'default_route', 'welcome_title', - 'welcome_message' + 'welcome_message', ]; this.values = {}; const settings = app.data.settings; - this.fields.forEach(key => this.values[key] = m.prop(settings[key])); + this.fields.forEach((key) => (this.values[key] = m.prop(settings[key]))); this.localeOptions = {}; const locales = app.data.locales; @@ -33,7 +33,7 @@ export default class BasicsPage extends Page { this.localeOptions[i] = `${locales[i]} (${i})`; } - if (typeof this.values.show_language_selector() !== "number") this.values.show_language_selector(1); + if (typeof this.values.show_language_selector() !== 'number') this.values.show_language_selector(1); } view() { @@ -43,67 +43,75 @@ export default class BasicsPage extends Page {
{FieldSet.component({ label: app.translator.trans('core.admin.basics.forum_title_heading'), - children: [ - - ] + children: [], })} {FieldSet.component({ label: app.translator.trans('core.admin.basics.forum_description_heading'), children: [ -
- {app.translator.trans('core.admin.basics.forum_description_text')} -
, -