update

daocatt · Mar 21, 2024 · 29ff2e8 · 29ff2e8
1 parent 1dda1c7
commit 29ff2e8
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 33 deletions.
diff --git a/js/src/forum/addBadgesToUserCard.tsx b/js/src/forum/addBadgesToUserCard.tsx
@@ -22,7 +22,7 @@ export default function addBadgesToUserCard() {
     if (user.attribute('badges_count') <= 0) return;
 
     const limit = app.forum.attribute('numberOfBadgesOnUserCard');
-    
+
     const badges = [];
 
     visibleBadges.forEach((badgeItem, indx) => {
@@ -58,6 +58,5 @@ export default function addBadgesToUserCard() {
     }
 
     items.add('badges', badges);
-
   });
 }
diff --git a/js/src/forum/components/BadgeModal.tsx b/js/src/forum/components/BadgeModal.tsx
@@ -71,13 +71,11 @@ export default class BadgeModal extends Modal {
           background: 'radial-gradient(' + radials + ',' + radiale + ')',
         }}
       >
-
-        {this.attrs.badge.image()  ? (
-          <img src={this.attrs.badge.image() } className="icon" />
+        {this.attrs.badge.image() ? (
+          <img src={this.attrs.badge.image()} className="icon" />
         ) : (
-          <i className={this.attrs.badge.icon()} style={'color:'+this.attrs.badge.iconColor()}></i>
+          <i className={this.attrs.badge.icon()} style={'color:' + this.attrs.badge.iconColor()}></i>
         )}
-
       </div>
     );
 

diff --git a/js/src/forum/components/SelectUserCardBadgesModal.tsx b/js/src/forum/components/SelectUserCardBadgesModal.tsx
@@ -132,7 +132,7 @@ export default class SelectUserCardBadgesModal extends Modal {
       .save({ userCardBadges: this.selectedBadges })
       .then(() => {
         // Update current user badges store
-        
+
         // this.attrs.user.attribute('badges').map((badgeItem) => {
         //   badgeItem.in_user_card = this.selectedBadges.indexOf(parseInt(badgeItem.id)) >= 0;
         // });

diff --git a/js/src/forum/components/UserBadgesContent.js b/js/src/forum/components/UserBadgesContent.js
@@ -27,20 +27,20 @@ export default class UserBadgesContent extends Component {
 
                 {category && category.description() && <p>{category.description()}</p>}
                 <div className="badgeList">
-                {badges
-                  .sort((a, b) => a.badge().order() - b.badge().order())
-                  .map((userBadge) => (
-                    <UserBadge
-                      badge={userBadge.badge()}
-                      onclick={() =>
-                        app.modal.show(BadgeModal, {
-                          badge: userBadge.badge(),
-                          userBadgeData: userBadge,
-                        })
-                      }
-                    />
-                  ))}
-                  </div>
+                  {badges
+                    .sort((a, b) => a.badge().order() - b.badge().order())
+                    .map((userBadge) => (
+                      <UserBadge
+                        badge={userBadge.badge()}
+                        onclick={() =>
+                          app.modal.show(BadgeModal, {
+                            badge: userBadge.badge(),
+                            userBadgeData: userBadge,
+                          })
+                        }
+                      />
+                    ))}
+                </div>
               </div>
             );
           })}

diff --git a/js/src/forum/components/UserCardBadge.tsx b/js/src/forum/components/UserCardBadge.tsx
@@ -2,8 +2,6 @@ import Component from 'flarum/common/Component';
 import Tooltip from 'flarum/common/components/Tooltip';
 
 export default class UserCardBadge extends Component {
-
-
   view() {
     const item = this.attrs.badge;
     const tooltip = this.attrs.tooltip !== false;

diff --git a/js/src/forum/components/UserCardBadgeModal.tsx b/js/src/forum/components/UserCardBadgeModal.tsx
@@ -50,13 +50,15 @@ export default class UserCardBadgeModal extends Modal {
                   const that = this;
                   // this.badgeData.delete().then(() => this.hide());
 
-                  app.request({
-                    method: 'DELETE',
-                    url: app.forum.attribute('apiUrl') + '/user-badges/' + this.badgeData.id,
-                    body: {},
-                  }).then(() => {
-                    that.hide();
-                  });
+                  app
+                    .request({
+                      method: 'DELETE',
+                      url: app.forum.attribute('apiUrl') + '/user-badges/' + this.badgeData.id,
+                      body: {},
+                    })
+                    .then(() => {
+                      that.hide();
+                    });
                 }
               }}
               loading={this.loading}
@@ -86,7 +88,7 @@ export default class UserCardBadgeModal extends Modal {
         {this.badgeItem.image ? (
           <img src={this.badgeItem.image} className="icon" />
         ) : (
-          <i className={this.badgeItem.icon} style={'color:'+this.badgeItem.icon_color}></i>
+          <i className={this.badgeItem.icon} style={'color:' + this.badgeItem.icon_color}></i>
         )}
       </div>
     );

diff --git a/js/src/forum/notification/BadgeReceivedNotification.js b/js/src/forum/notification/BadgeReceivedNotification.js
@@ -16,7 +16,6 @@ export default class BadgeReceivedNotification extends Notification {
   }
 
   excerpt() {
-
     const subject = this.attrs.notification.subject();
 
     return (
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       excerpt() {
         const subject = this.attrs.notification.subject();
         return (
@@ Expand Down @@