Skip to content

Commit

Permalink
feat: storm indicator & separate storm & non-storm fissures in the so…
Browse files Browse the repository at this point in the history
…rt (#487)
  • Loading branch information
TobiTenno authored May 25, 2021
1 parent f517761 commit faddc2f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
21 changes: 19 additions & 2 deletions src/components/panels/FissuresPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,18 @@
<b>{{ fissure.node }}</b> | {{ fissure.missionType }} |
{{ fissure.tier }}
</span>
<TimeBadge :starttime="fissure.activation" :endtime="fissure.expiry" :interval="1000" style="padding: 5px" />

<span class="pull-right">
<TimeBadge :starttime="fissure.activation" :endtime="fissure.expiry" :interval="1000" style="padding: 5px" />
<HubImg
v-if="fissure.isStorm"
:src="archwing"
:name="$t('fissures.voidstorm')"
class="li-mission-decorator li-mission-decorator-lg"
height="24px"
width="24px"
/>
</span>
</b-list-group-item>
<NoDataItem v-if="filteredFissures.length === 0" :text="headertext" />
</b-list-group>
Expand All @@ -34,6 +45,7 @@ import TimeBadge from '@/components/TimeBadge.vue';
import HubImg from '@/components/HubImg.vue';
import NoDataItem from '@/components/NoDataItem.vue';
import HubPanelWrap from '@/components/HubPanelWrap';
import archwing from '@/assets/img/archwing.svg';
const fissureIcons = [];
import lith from '@/assets/img/fissures/1.svg';
Expand Down Expand Up @@ -67,7 +79,11 @@ export default {
const isFiltered = planets.test(fissure.node);
return (pState.length > 0 ? !isFiltered : true) && !fissure.expired;
})
.sort((a, b) => a.tierNum - b.tierNum);
.sort((a, b) => {
return (a.isStorm && !b.isStorm)
? 1
: ((!a.isStorm && b.isStorm) ? -1 : a.tierNum - b.tierNum);
});
},
},
methods: {
Expand All @@ -81,6 +97,7 @@ export default {
display: 'inline',
'vertical-align': 'middle',
},
archwing,
};
},
components: {
Expand Down
3 changes: 2 additions & 1 deletion src/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
"sentient": "Sentient"
},
"fissures": {
"header": "Fissures"
"header": "Fissures",
"voidstorm": "Void Storm"
},
"invasions": {
"header": "Invasions",
Expand Down

1 comment on commit faddc2f

@vercel
Copy link

@vercel vercel bot commented on faddc2f May 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.