Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: WFCD/warframe-hub
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.5.1
Choose a base ref
...
head repository: WFCD/warframe-hub
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.5.2
Choose a head ref
Loading
Showing with 7,575 additions and 3,723 deletions.
  1. +10 −5 .github/dependabot.yml
  2. +11 −7 components/panels/AggregatedTimePanel.jsx
  3. +7,535 −3,692 package-lock.json
  4. +19 −19 package.json
15 changes: 10 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -7,16 +7,23 @@ updates:
day: "saturday"
time: "00:00"
commit-message:
prefix: "chore"
prefix-development: "dev"
include: "scope"
prefix: "ci"
labels:
- "Scope: Dependencies"
- "Type: Maintenance"
open-pull-requests-limit: 10
pull-request-branch-name:
separator: "-"
rebase-strategy: "auto"
groups:
babel:
patterns:
- '@babel/*'
- lint-staged
eslint:
patterns:
- eslint*
- prettier
ignore:
- dependency-name: leaflet
- dependency-name: vue2-leaflet
@@ -32,8 +39,6 @@ updates:
time: "00:00"
commit-message:
prefix: "ci"
prefix-development: "dev"
include: "scope"
labels:
- "Scope: Dependencies"
- "Type: Maintenance"
18 changes: 11 additions & 7 deletions components/panels/AggregatedTimePanel.jsx
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ import utc from 'dayjs/plugin/utc';
import { mapState } from 'vuex';
import TimeBadge from '@/components/TimeBadge.jsx';

import thumb from '@/components/AsyncItemThumb.jsx';
import HubPanelWrap from '@/components/HubPanelWrap.jsx';
import HubImg from '@/components/HubImg.jsx';

@@ -11,7 +12,6 @@ import { cdn, wfcdn, optimize } from '@/services/utilities.js';
dayjs.extend(utc);

const steelPath = cdn('svg/sp-logo.svg');
const steelEssence = optimize(wfcdn('steel-essence.png'), '250x250', 'fill', 'center');

const cycleDefault = {
activation: '0',
@@ -36,7 +36,11 @@ const fontStyle = {
const TimerPanel = {
name: 'TimerPanel',
render() {
return <div class="col-xs-3 col-sm-4 col-lg-6 my-3">{this.$slots.default}</div>;
return (
<b-col cols={4} sm={3} lg={6} xl={4} class="my-3">
{this.$slots.default}
</b-col>
);
},
};

@@ -250,7 +254,7 @@ const SteelPathTimer = {
</span>
<br />
{this.steelPath?.currentReward?.cost}
<HubImg src={steelEssence} name={this.$t('currency.steelEssense')} />
<thumb ikey={'Steel Essence'} alt={this.$t('currency.steelEssense')} />
<br />
<TimeBadge
starttime={this.steelPath?.activation || '0'}
@@ -367,8 +371,8 @@ export default {
<HubPanelWrap title={this.headertext} class="time">
<b-list-group>
<b-list-group-item class="list-group-item-borderbottom">
<div class="container">
<div class="row justify-content-center">
<b-container>
<b-row class="justify-content-center">
{this.componentState.earth.display && <EarthTimer earthCycle={this.worldstate.earthCycle} />}
{this.componentState.cetus.display && <CetusTimer cetusCycle={this.worldstate.cetusCycle} />}
{this.componentState.vallis.display && <VallisTimer vallisCycle={this.worldstate.vallisCycle} />}
@@ -382,8 +386,8 @@ export default {
<ArbitrationTimer arbitration={this.worldstate.arbitration} />
)}
{this.componentState.zariman?.display && <ZarimanTimer zarimanCycle={this.worldstate.zarimanCycle} />}
</div>
</div>
</b-row>
</b-container>
</b-list-group-item>
</b-list-group>
</HubPanelWrap>
Loading