Bump prettier

webkom · Nov 7, 2018 · 283e002 · 283e002
1 parent fc807a2
commit 283e002
Show file tree

Hide file tree

Showing 31 changed files with 375 additions and 405 deletions.
diff --git a/app/components/AnnouncementInLine/index.js b/app/components/AnnouncementInLine/index.js
@@ -73,51 +73,48 @@ class AnnouncementInLine extends Component<Props, State> {
 
     return (
       <div>
-        {actionGrant &&
-          (event || meeting || group) && (
-            <div>
-              {showButton && (
-                <Button
-                  onClick={this.handleHide}
-                  className={styles.announcementButton}
-                >
-                  Ny kunngjøring
-                </Button>
-              )}
-              {showLabel && (
-                <a
-                  onClick={this.handleHide}
-                  className={cx(
-                    button ? styles.labelButton : styles.label,
-                    className
-                  )}
-                >
-                  {!this.state.sent
-                    ? ' Ny kunngjøring '
-                    : ' Kunngjøring sendt '}
-                </a>
-              )}
+        {actionGrant && (event || meeting || group) && (
+          <div>
+            {showButton && (
+              <Button
+                onClick={this.handleHide}
+                className={styles.announcementButton}
+              >
+                Ny kunngjøring
+              </Button>
+            )}
+            {showLabel && (
+              <a
+                onClick={this.handleHide}
+                className={cx(
+                  button ? styles.labelButton : styles.label,
+                  className
+                )}
+              >
+                {!this.state.sent ? ' Ny kunngjøring ' : ' Kunngjøring sendt '}
+              </a>
+            )}
 
-              {showForm && (
-                <Form
-                  onSubmit={handleSubmit(values =>
-                    this.onSubmit(values, event, meeting, group)
-                  )}
-                >
-                  <Field
-                    name="message"
-                    component={TextArea.Field}
-                    placeholder={placeholder || 'Skriv din kunngjøring her...'}
-                    fieldClassName={styles.field}
-                    className={styles.fieldText}
-                  />
-                  <Button submit className={styles.button}>
-                    SEND
-                  </Button>
-                </Form>
-              )}
-            </div>
-          )}
+            {showForm && (
+              <Form
+                onSubmit={handleSubmit(values =>
+                  this.onSubmit(values, event, meeting, group)
+                )}
+              >
+                <Field
+                  name="message"
+                  component={TextArea.Field}
+                  placeholder={placeholder || 'Skriv din kunngjøring her...'}
+                  fieldClassName={styles.field}
+                  className={styles.fieldText}
+                />
+                <Button submit className={styles.button}>
+                  SEND
+                </Button>
+              </Form>
+            )}
+          </div>
+        )}
       </div>
     );
   }

diff --git a/app/components/ErrorBoundary/index.js b/app/components/ErrorBoundary/index.js
@@ -64,12 +64,11 @@ class ErrorBoundary extends React.Component<Props, State> {
             <h3>En feil har oppstått</h3>
             <p>
               Webkom har fått beskjed om feilen.{' '}
-              {!openReportDialog &&
-                Raven.lastEventId() && (
-                  <span>
-                    Klikk <b>her</b> for å sende en rapport.
-                  </span>
-                )}
+              {!openReportDialog && Raven.lastEventId() && (
+                <span>
+                  Klikk <b>her</b> for å sende en rapport.
+                </span>
+              )}
             </p>
           </div>
         </div>

diff --git a/app/components/Feed/activity.js b/app/components/Feed/activity.js
@@ -65,16 +65,15 @@ export default class ActivityRenderer extends Component<Props, State> {
         (aggregatedActivity.activityCount > activities.length &&
           this.state.expanded) ? (
           <div className={styles.activityFooter}>
-            {aggregatedActivity.activities.length > 3 &&
-              !this.state.expanded && (
-                <Button
-                  size="small"
-                  submit={false}
-                  onClick={() => this.setState({ expanded: true })}
-                >
-                  Vis mer
-                </Button>
-              )}
+            {aggregatedActivity.activities.length > 3 && !this.state.expanded && (
+              <Button
+                size="small"
+                submit={false}
+                onClick={() => this.setState({ expanded: true })}
+              >
+                Vis mer
+              </Button>
+            )}
             {aggregatedActivity.activityCount > activities.length &&
               this.state.expanded &&
               `og ${aggregatedActivity.activityCount -

diff --git a/app/components/Form/ObjectPermissions.js b/app/components/Form/ObjectPermissions.js
@@ -4,7 +4,7 @@ import * as React from 'react';
 import { SelectInput, CheckBox } from 'app/components/Form';
 import Tooltip from 'app/components/Tooltip';
 
-/* 
+/*
  * Usage inside redux-form:
  *
  *   <Fields

diff --git a/app/components/Form/legoForm.js b/app/components/Form/legoForm.js
@@ -29,7 +29,7 @@ type Props = {
   /* Also pick these values based on the keys given on the array
    * Should be used when there isn't a visible field for the value,
    * at the time of submitting
-   * 
+   *
    * The id is always picked, together with all registered fields
    */
   pickAdditionalValues?: Array<string>,

diff --git a/app/components/Search/SearchPageResults.js b/app/components/Search/SearchPageResults.js
@@ -77,12 +77,11 @@ function SearchResult({ result, onSelect, isSelected }: SearchResultProps) {
         </div>
       </Flex>
 
-      {result.picture &&
-        result.picture !== 'cover' && (
-          <Flex className={styles.picture}>
-            <img src={result.picture} alt="search" role="presentation" />
-          </Flex>
-        )}
+      {result.picture && result.picture !== 'cover' && (
+        <Flex className={styles.picture}>
+          <img src={result.picture} alt="search" role="presentation" />
+        </Flex>
+      )}
     </Flex>
   );
 }

diff --git a/app/components/Search/SearchResults.js b/app/components/Search/SearchResults.js
@@ -29,14 +29,13 @@ const SearchResultItem = ({
           style={{ margin: '0px 12px 0px 0px' }}
         />
       )}
-      {!result.profilePicture &&
-        result.icon && (
-          <Icon
-            className={styles.searchResultItemIcon}
-            name={result.icon}
-            size={28}
-          />
-        )}
+      {!result.profilePicture && result.icon && (
+        <Icon
+          className={styles.searchResultItemIcon}
+          name={result.icon}
+          size={28}
+        />
+      )}
       <ul>
         <li className={styles.resultTitle}>
           <div className={styles.truncateTitle}>{result.title}</div>

diff --git a/app/components/Upload/ImageUpload.js b/app/components/Upload/ImageUpload.js
@@ -182,16 +182,15 @@ export default class ImageUpload extends Component<Props, State> {
           backdrop
         >
           <Fragment>
-            {inModal &&
-              !preview && (
-                <div className={styles.inModalUpload}>
-                  <UploadArea
-                    onDrop={this.onDrop}
-                    multiple={multiple}
-                    image={this.state.img}
-                  />
-                </div>
-              )}
+            {inModal && !preview && (
+              <div className={styles.inModalUpload}>
+                <UploadArea
+                  onDrop={this.onDrop}
+                  multiple={multiple}
+                  image={this.state.img}
+                />
+              </div>
+            )}
             {/* $FlowFixMe */}
             {preview && (
               <Cropper
@@ -204,19 +203,18 @@ export default class ImageUpload extends Component<Props, State> {
                 guides={false}
               />
             )}
-            {multiple &&
-              !crop && (
-                <Flex wrap column>
-                  {files.map((file, index) => (
-                    <FilePreview
-                      onRemove={this.onRemove}
-                      file={file}
-                      index={index}
-                      key={index}
-                    />
-                  ))}
-                </Flex>
-              )}
+            {multiple && !crop && (
+              <Flex wrap column>
+                {files.map((file, index) => (
+                  <FilePreview
+                    onRemove={this.onRemove}
+                    file={file}
+                    index={index}
+                    key={index}
+                  />
+                ))}
+              </Flex>
+            )}
             <Flex
               wrap
               className={styles.footer}

diff --git a/app/reducers/events.js b/app/reducers/events.js
@@ -424,9 +424,8 @@ export const selectRegistrationsFromPools = createSelector(
 export const getRegistrationGroups = createSelector(
   selectAllRegistrationsForEvent,
   registrations => {
-    const grouped = groupBy(
-      registrations,
-      obj => (obj.unregistrationDate.isValid() ? 'unregistered' : 'registered')
+    const grouped = groupBy(registrations, obj =>
+      obj.unregistrationDate.isValid() ? 'unregistered' : 'registered'
     );
     const registered = (grouped['registered'] || []).sort((a, b) =>
       a.registrationDate.diff(b.registrationDate)

diff --git a/app/reducers/memberships.js b/app/reducers/memberships.js
@@ -34,13 +34,15 @@ export const selectMembershipsForGroup = createSelector(
     if (!group) return [];
     const memberships = group.memberships;
     if (!memberships) return [];
-    return memberships.map(m => membershipsById[m]).map(m => {
-      const userId = m.user;
-      const user = users[userId];
-      return {
-        ...m,
-        user
-      };
-    });
+    return memberships
+      .map(m => membershipsById[m])
+      .map(m => {
+        const userId = m.user;
+        const user = users[userId];
+        return {
+          ...m,
+          user
+        };
+      });
   }
 );
diff --git a/app/reducers/pages.js b/app/reducers/pages.js
@@ -109,9 +109,8 @@ const separateRoles = [
 const defaultRole = 'member';
 
 const groupMemberships = memberships =>
-  groupBy(
-    sortBy(memberships, 'user.fullName'),
-    ({ role }) => (separateRoles.includes(role) ? role : defaultRole)
+  groupBy(sortBy(memberships, 'user.fullName'), ({ role }) =>
+    separateRoles.includes(role) ? role : defaultRole
   );
 
 export const selectCommitteeForPages = createSelector(

diff --git a/app/routes/admin/email/components/RestrictedMailEditor.js b/app/routes/admin/email/components/RestrictedMailEditor.js
@@ -141,19 +141,18 @@ const RestrictedMailEditor = ({
           Lag flaskepost
         </Button>
       )}
-      {restrictedMailId &&
-        restrictedMail && (
-          <a
-            href={`${
-              config.serverUrl
-            }/restricted-mail/${restrictedMailId}/token?auth=${
-              restrictedMail.tokenQueryParam
-            }`}
-            download
-          >
-            <Button>Last ned Epost token</Button>
-          </a>
-        )}
+      {restrictedMailId && restrictedMail && (
+        <a
+          href={`${
+            config.serverUrl
+          }/restricted-mail/${restrictedMailId}/token?auth=${
+            restrictedMail.tokenQueryParam
+          }`}
+          download
+        >
+          <Button>Last ned Epost token</Button>
+        </a>
+      )}
     </Form>
   );
 };

diff --git a/app/routes/announcements/components/AnnouncementsList.js b/app/routes/announcements/components/AnnouncementsList.js
@@ -43,23 +43,22 @@ const AnnouncementsList = ({
         createAnnouncement={createAnnouncement}
         actionGrant={actionGrant}
       />
-      {actionGrant.includes('list') &&
-        actionGrant.includes('delete') && (
-          <ContentMain>
-            <h1 className={styles.header}> Mine kunngjøringer </h1>
-            <Flex column className={styles.list}>
-              {announcements.map((a, i) => (
-                <AnnouncementItem
-                  key={i}
-                  announcement={a}
-                  sendAnnouncement={sendAnnouncement}
-                  deleteAnnouncement={deleteAnnouncement}
-                  actionGrant={actionGrant}
-                />
-              ))}
-            </Flex>
-          </ContentMain>
-        )}
+      {actionGrant.includes('list') && actionGrant.includes('delete') && (
+        <ContentMain>
+          <h1 className={styles.header}> Mine kunngjøringer </h1>
+          <Flex column className={styles.list}>
+            {announcements.map((a, i) => (
+              <AnnouncementItem
+                key={i}
+                announcement={a}
+                sendAnnouncement={sendAnnouncement}
+                deleteAnnouncement={deleteAnnouncement}
+                actionGrant={actionGrant}
+              />
+            ))}
+          </Flex>
+        </ContentMain>
+      )}
     </Content>
   );
 };

diff --git a/app/routes/company/components/CompaniesPage.js b/app/routes/company/components/CompaniesPage.js
@@ -40,12 +40,11 @@ const CompanyItem = ({ company }: Company) => {
             </span>
           </div>
         </Link>
-        {company.website &&
-          !company.website.includes('example.com') && (
-            <a href={company.website} target="_blank">
-              <div className={styles.website}>{websiteString}</div>
-            </a>
-          )}
+        {company.website && !company.website.includes('example.com') && (
+          <a href={company.website} target="_blank">
+            <div className={styles.website}>{websiteString}</div>
+          </a>
+        )}
       </div>
     </div>
   );