Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: storm indicator & separate storm & non-storm fissures in the sort #487

Merged
merged 1 commit into from
May 25, 2021
Merged

feat: storm indicator & separate storm & non-storm fissures in the sort #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/components/panels/FissuresPanel.vue
View file
Open in desktop
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
View file
Open in desktop
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