Merge pull request #7 from Savage-Aim/bugfix-031

# 0.3.1

Fixed issue in Loot Tracker where giving a Mainhand item to a non-PLD wouldn't internally update their offhand, causing desync of information.
- If you have been assigned a mainhand using a Loot Tracker, go and manually save the BIS List again, which should fix this desync.

Fixed issue causing random scrolls to top of page when interacting with some elements.

Fixed issue where having exactly 4 latest notifications displays none of them in the latest box.

Fixed issue where Job Icon is not kept updated in the new mobile version of the BIS List form.

backend/api/views/loot.py

@@ -365,6 +365,9 @@ def post(self, request: Request, team_id: str) -> Response:
         # If we just copy bis_item onto current_item that will avoid any checking we have to do :D
         bis_item = getattr(bis, f'bis_{item}')
         setattr(bis, f'current_{item}', bis_item)
+        if item == 'mainhand' and bis.job.id != 'PLD':
+            # Set the offhand as well
+            bis.current_offhand = bis_item
         bis.save()
 
         # Send a notification

frontend/.env

@@ -1 +1 @@
-VUE_APP_VERSION="0.3.0"
+VUE_APP_VERSION="0.3.1"

frontend/src/components/bis_list_form.vue

@@ -369,10 +369,6 @@ export default class BISListForm extends Vue {
     return this.$refs.jobPicker as HTMLSelectElement
   }
 
-  get mobileJobIcon(): HTMLImageElement {
-    return this.$refs.mobileJobIcon as HTMLImageElement
-  }
-
   get mobileJobPicker(): HTMLSelectElement {
     return this.$refs.mobileJobPicker as HTMLSelectElement
   }
@@ -410,10 +406,11 @@ export default class BISListForm extends Vue {
   setIcon(job: string): void {
     const src = `${this.baseImgUrl}${job}.png`
     const alt = `${job} job icon`
+    const mobileJobIcon = this.$refs.mobileJobIcon as HTMLImageElement
     this.jobIcon.src = src
     this.jobIcon.alt = alt
-    this.mobileJobIcon.src = src
-    this.mobileJobIcon.alt = alt
+    mobileJobIcon.src = src
+    mobileJobIcon.alt = alt
   }
 
   // Method toggle for the tabs
@@ -430,6 +427,9 @@ export default class BISListForm extends Vue {
   showDetails(): void {
     this.showNone()
     this.tabsShown.details = true
+    Vue.nextTick(() => {
+      this.changeMobileJobIcon()
+    })
   }
 
   showFilters(): void {

frontend/src/components/footer.vue

@@ -1,7 +1,7 @@
 <template>
   <footer id="footer" class="content has-text-centered">
     <a href="https://wiki.savageaim.com" target="_blank" data-microtip-position="top" role="tooltip" aria-label="Wiki"><span class="icon is-large"><i class="material-icons">menu_book</i></span></a>
-    <a href="#changelog" data-microtip-position="top" role="tooltip" aria-label="Changelog" @click="showChangelog"><span class="icon is-large"><i class="material-icons">update</i></span></a>
+    <a data-microtip-position="top" role="tooltip" aria-label="Changelog" @click="showChangelog"><span class="icon is-large"><i class="material-icons">update</i></span></a>
     <a href="https://github.com/Savage-Aim/app" target="_blank" data-microtip-position="top" role="tooltip" aria-label="Github Repo"><span class="icon is-large"><i class="material-icons">code</i></span></a>
     <a class="discord-link" href="https://discord.gg/k8szJ5qAKw" target="_blank" data-microtip-position="top" role="tooltip" aria-label="Savage Aim Discord"><span class="icon is-large"><img src="/discord.svg" alt="Discord Logo" class="image is-24x24 discord" /></span></a>
     <p>Savage Aim v{{ $store.state.version }}, by Erika Yukiko (Lich)</p>

frontend/src/components/modals/changelog.vue

@@ -11,39 +11,15 @@
       </div>
     </div>
     <div class="card-content content">
-      <h2 class="has-text-primary subtitle">{{ version }} - The First Discord Requests Release!</h2>
-      <div class="divider"><i class="material-icons icon">expand_more</i> More Character Page Details  (from @Rai) <i class="material-icons icon">expand_more</i></div>
-      <p>Split the Character page into two sections, one for BIS Lists and one for Teams.</p>
-      <p>
-        With only one visible at a time, the Character page can now display more information;
-        <ul>
-          <li>BIS Lists now display as tables similar to Team Details. <span class="has-text-warning">Uses the bis mainhand item level for colours.</span></li>
-          <li>Teams now display the exact same as they do on the home page, with jobs displayed along the bottom.</li>
-        </ul>
-      </p>
-
-      <div class="divider"><i class="material-icons icon">expand_more</i> Tome Augment Manager (from @Brandon) <i class="material-icons icon">expand_more</i></div>
-      <p>Adds Tome Armour Augment and Tome Accessory Augment to the automated section of the Loot Manager.</p>
-      <p>Due to the nature of the items in question, giving these items as loot using the manager does not update the corresponding BIS List.</p>
-      <p>The boxes indicating character details for these items are differ slightly from those for the raid gear, so please check the wiki if there are any questions!</p>
-
-      <div class="divider"><i class="material-icons icon">expand_more</i> Improve BIS Form on Mobile (from @Yord) <i class="material-icons icon">expand_more</i></div>
-      <p>
-        Improved User experience when creating and editing BIS Lists on mobile devices.
-        <ul>
-          <li>On mobile, the sections are separated into tabs to keep the page tidy and logically break up each piece of the form.</li>
-        </ul>
-      </p>
-
+      <h2 class="has-text-primary subtitle">{{ version }}</h2>
       <div class="divider"><i class="material-icons icon">expand_more</i> Minor Changes <i class="material-icons icon">expand_more</i></div>
-      <p>Added the arbitrary loot tracking form to mobile view as well as desktop, to not keep functionality away from the mobile version.</p>
       <p>
-        Using a Discord logo for the Discord link in the footer, to make it more immediately obvious what it is.
-        <ul>
-          <li>Note that to stick to Discord's branding guidelines, the links in the footer have all been made white when unhovered instead of the original dark blue.</li>
-        </ul>
+        Fixed issue in Loot Tracker where giving a Mainhand item to a non-PLD wouldn't internally update their offhand, causing desync of information.
+        <ul><li class="has-text-warning">If you have been assigned a mainhand using a Loot Tracker, go and manually save the BIS List again, which should fix this desync.</li></ul>
       </p>
-      <p>Trying to verify an already verified Character will reload the page instead of giving 404 error messages.</p>
+      <p>Fixed issue causing random scrolls to top of page when interacting with some elements.</p>
+      <p>Fixed issue where having exactly 4 latest notifications displays none of them in the latest box.</p>
+      <p>Fixed issue where Job Icon is not kept updated in the new mobile version of the BIS List form.</p>
     </div>
   </div>
 </template>

frontend/src/components/modals/notifications.vue

@@ -94,7 +94,7 @@ export default class Notifications extends Vue {
   }
 
   pageRange(): ReadonlyArray<number> {
-    const size = this.page * this.notifsPerPage < this.notifications.length ? this.notifsPerPage : this.notifications.length % this.notifsPerPage
+    const size = this.page * this.notifsPerPage <= this.notifications.length ? this.notifsPerPage : this.notifications.length % this.notifsPerPage
     const start = (this.page - 1) * this.notifsPerPage
     return Array.from({ length: size }, (x, i) => i + start)
   }

frontend/src/components/nav.vue

@@ -27,15 +27,15 @@
       </div>
 
       <div class="navbar-end">
-        <a href="#" @click="showLegend" class="navbar-item">
+        <a @click="showLegend" class="navbar-item">
           <div class="icon-text">
             <span class="icon"><i class="material-icons">bar_chart</i></span>
             <span>Colours Explanation</span>
           </div>
         </a>
 
         <template v-if="authenticated">
-          <a href="#" class="navbar-item notifications" @click="showNotifs">
+          <a class="navbar-item notifications" @click="showNotifs">
             <div class="icon-text" v-if="unreads > 0">
               <span class="icon">
                 <span class="badge is-info">{{ unreads }}</span>

frontend/src/views/settings.vue

@@ -8,7 +8,7 @@
     <div class="columns">
       <div class="column is-half">
         <div class="card">
-          <div href="#" class="card-header">
+          <div class="card-header">
             <div class="card-header-title">Colour Scheme</div>
           </div>
           <div class="card-content">
@@ -62,9 +62,9 @@
       <!-- Notifications -->
       <div class="column is-half">
         <div class="card">
-          <a href="#" class="card-header">
+          <div class="card-header">
             <div class="card-header-title">Notifications</div>
-          </a>
+          </div>
           <div class="card-content">
             <p class="has-text-info">Tick or untick boxes for the Notifications you do / don't want to receive, and click save!</p>
             <hr />

frontend/src/views/team/add.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="breadcrumb">
       <ul>
-        <li class="is-active"><a href="#">Create or Join a Team</a></li>
+        <li class="is-active"><a>Create or Join a Team</a></li>
       </ul>
     </div>
 

frontend/src/views/team/create.vue

@@ -3,7 +3,7 @@
     <div class="breadcrumb">
       <ul>
         <li><router-link to="/team/">Create or Join a Team</router-link></li>
-        <li class="is-active"><a href="#">Create a Team</a></li>
+        <li class="is-active"><a>Create a Team</a></li>
       </ul>
     </div>
 

frontend/src/views/team/join.vue

@@ -8,7 +8,7 @@
       <div class="breadcrumb">
         <ul>
           <li><router-link to="/team/">Create or Join a Team</router-link></li>
-          <li class="is-active"><a href="#">Join a Team</a></li>
+          <li class="is-active"><a>Join a Team</a></li>
         </ul>
       </div>
 

frontend/src/views/team/loot.vue

@@ -96,7 +96,7 @@
 
         <div class="column is-full">
           <div class="card">
-            <a href="#" class="card-header" @click="toggleHistory">
+            <a class="card-header" @click="toggleHistory">
               <div class="card-header-title">
                 Loot History
               </div>

frontend/src/views/team/manage_membership.vue

@@ -8,7 +8,7 @@
       <div class="breadcrumb">
         <ul>
           <li><router-link :to="`/team/${team.id}/`">{{ team.name }}</router-link></li>
-          <li class="is-active"><a href="#">Update Membership</a></li>
+          <li class="is-active"><a>Update Membership</a></li>
         </ul>
       </div>