Skip to content

Commit be3690a

Browse files
madcowfredmadcowfred
authored
Merge pull request #1735 from ThingEngineering/main
Deploy
2 parents 8352c35 + ff7f560 commit be3690a

25 files changed

Lines changed: 996 additions & 1603 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
name: Continuous Integration
22

33
on:
4-
pull_request:
4+
pull_request:
55

6-
# Allow job to be manually started
7-
workflow_dispatch:
6+
# Allow job to be manually started
7+
workflow_dispatch:
88

99
jobs:
10-
lint:
11-
name: Lint
12-
runs-on: ubuntu-latest
13-
timeout-minutes: 5
14-
steps:
15-
- uses: actions/checkout@v2
16-
17-
- uses: actions/setup-node@v2
18-
with:
19-
node-version: '18'
20-
21-
- uses: actions/cache@v4
22-
id: cache-node-modules
23-
with:
24-
key: ${{ runner.os }}-node18-modules-${{ hashFiles('**/package-lock.json') }}
25-
restore-keys: ${{ runner.os }}-node18-modules-
26-
path: |
27-
apps/frontend/node_modules
28-
29-
- name: Install dependencies
30-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
31-
working-directory: apps/frontend/
32-
run: npm i --no-audit --no-fund
33-
34-
- name: ESLint
35-
working-directory: apps/frontend/
36-
run: npm run lint
37-
38-
- name: Svelte Check
39-
working-directory: apps/frontend/
40-
run: npm run check
10+
lint:
11+
name: Lint
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 5
14+
steps:
15+
- uses: actions/checkout@v2
16+
17+
- uses: actions/setup-node@v2
18+
with:
19+
node-version: "22"
20+
21+
- uses: actions/cache@v4
22+
id: cache-node-modules
23+
with:
24+
key: ${{ runner.os }}-node22-modules-${{ hashFiles('**/package-lock.json') }}
25+
restore-keys: ${{ runner.os }}-node22-modules-
26+
path: |
27+
apps/frontend/node_modules
28+
29+
- name: Install dependencies
30+
if: steps.cache-node-modules.outputs.cache-hit != 'true'
31+
working-directory: apps/frontend/
32+
run: npm i --no-audit --no-fund
33+
34+
- name: ESLint
35+
working-directory: apps/frontend/
36+
run: npm run lint
37+
38+
- name: Svelte Check
39+
working-directory: apps/frontend/
40+
run: npm run check

‎apps/frontend/components/achievements/CriteriaTree.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
criteriaCharacters?.[criteriaTree?.criteriaId || -1]?.[0]?.[1] || 0;
4444
have = maxCharacter > 0 && maxCharacter >= criteriaTree.amount;
4545
} else {
46-
let maybeCriteria: number[][] = [];
46+
let maybeCriteria: number[][];
4747
maybeCriteria = criteriaCharacters[criteria?.id] || [[0, 0]];
4848
4949
if (achievement.isAccountWide) {

‎apps/frontend/components/characters/paperdoll/CharactersPaperdollConfigure.svelte‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,53 @@
11
<script lang="ts">
2-
import debounce from 'lodash/debounce'
2+
import debounce from 'lodash/debounce';
33
4-
import type { Character } from '@/types'
4+
import type { Character } from '@/types';
55
6-
import BackgroundSelector from '@/components/common/BackgroundSelector.svelte'
7-
import RangeInput from '@/shared/components/forms/RangeInput.svelte'
6+
import BackgroundSelector from '@/components/common/BackgroundSelector.svelte';
7+
import RangeInput from '@/shared/components/forms/RangeInput.svelte';
88
9-
export let backgroundBrightness: number
10-
export let backgroundSaturation: number
11-
export let character: Character
12-
export let selected: number
9+
export let backgroundBrightness: number;
10+
export let backgroundSaturation: number;
11+
export let character: Character;
12+
export let selected: number;
1313
14-
let first = true
15-
let status = ''
16-
17-
$: debouncedSave(selected, backgroundBrightness, backgroundSaturation)
18-
19-
const getValue = (value: number): string => value === -1 ? 'Def' : `${value * 10}%`
14+
let first = true;
15+
let status = '';
2016
2117
const debouncedSave = debounce(async (id: number, brightness: number, saturation: number) => {
2218
if (first) {
23-
first = false
24-
return
19+
first = false;
20+
return;
2521
}
2622
27-
status = 'Saving...'
23+
status = 'Saving...';
2824
2925
const form = {
3026
backgroundId: id,
3127
backgroundBrightness: brightness,
3228
backgroundSaturation: saturation,
33-
}
34-
const xsrf = document.getElementById('app').getAttribute('data-xsrf')
35-
29+
};
30+
const xsrf = document.getElementById('app').getAttribute('data-xsrf');
31+
3632
const response = await fetch(`/api/character/${character.id}/configuration`, {
3733
method: 'POST',
3834
headers: {
3935
'Content-Type': 'application/json',
40-
'RequestVerificationToken': xsrf,
36+
RequestVerificationToken: xsrf,
4137
},
4238
body: JSON.stringify(form),
43-
})
39+
});
4440
4541
if (response.ok) {
46-
status = 'Saved!'
42+
status = 'Saved!';
43+
} else {
44+
status = 'ERROR!';
4745
}
48-
else {
49-
status = 'ERROR!'
50-
}
51-
}, 500)
46+
}, 500);
47+
48+
$: debouncedSave(selected, backgroundBrightness, backgroundSaturation);
49+
50+
const getValue = (value: number): string => (value === -1 ? 'Def' : `${value * 10}%`);
5251
</script>
5352

5453
<style lang="scss">
@@ -96,10 +95,11 @@
9695
<span class="status">{status}</span>
9796
</div>
9897

99-
<BackgroundSelector
100-
bind:selected
101-
showDefault={true}
102-
/>
103-
104-
<p>You can change your default background in <a href="#/settings/characters">Settings > Characters</a></p>
98+
<BackgroundSelector bind:selected showDefault={true} />
99+
100+
<p>
101+
You can change your default background in <a href="#/settings/characters"
102+
>Settings > Characters</a
103+
>
104+
</p>
105105
</div>

‎apps/frontend/components/mythic-plus/MythicPlusTableRowDungeon.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
const character: Character = getContext('character');
2323
2424
let addonMap: CharacterMythicPlusAddonMap;
25-
let allRuns: CharacterMythicPlusAddonRun[];
25+
// let allRuns: CharacterMythicPlusAddonRun[];
2626
let bestRun: CharacterMythicPlusRun;
2727
let hasPortal: boolean;
2828
let isTyrannical: boolean;
@@ -118,7 +118,7 @@
118118
component: TooltipMythicPlusRuns,
119119
props: {
120120
addonMap,
121-
allRuns,
121+
allRuns: [],
122122
character,
123123
dungeonId,
124124
runs,

‎apps/frontend/components/professions/recipes/View.svelte‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,14 @@
227227
{/if}
228228
</WowheadLink>
229229
</span>
230+
{:else if ability.spellId}
231+
<WowheadLink type="spell" id={ability.spellId}>
232+
<WowthingImage
233+
name="spell/{ability.spellId}"
234+
size={20}
235+
border={1}
236+
/>
237+
</WowheadLink>
230238
{:else}
231239
<ProfessionIcon id={profession.id} border={1} />
232240
{/if}

‎apps/frontend/components/tooltips/currency/TooltipCurrency.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
}
5050
5151
for (const character of userState.general.activeCharacters) {
52-
let quantity = 0;
52+
let quantity: number;
5353
if (currency) {
5454
quantity = character.currencies?.[currency.id]?.quantity || 0;
5555
} else if (item) {

‎apps/frontend/components/tooltips/mythic-plus-score/TooltipMythicPlusScore.svelte‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
.getCurrentPeriodForCharacter($timeStore, character)
3333
.endTime.toUnixInteger();
3434
35-
runCounts = [];
3635
const allRuns: CharacterMythicPlusAddonRun[] = [];
3736
3837
for (const [timestamp, weekRuns] of Object.entries(character.mythicPlusWeeks || {})) {

‎apps/frontend/components/zone-maps/ZoneMapsMap.svelte‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@
3232
children: [ManualDataZoneMapFarm, number][];
3333
};
3434
35+
const lootFarmTypes = toIndexRecord<number>([
36+
FarmType.Event,
37+
FarmType.EventBig,
38+
FarmType.Kill,
39+
FarmType.KillBig,
40+
FarmType.Treasure,
41+
]);
42+
const lootRewardTypes = toIndexRecord<number>([
43+
RewardType.Armor,
44+
RewardType.Cosmetic,
45+
RewardType.Illusion,
46+
RewardType.Item,
47+
RewardType.Mount,
48+
RewardType.Pet,
49+
RewardType.Toy,
50+
RewardType.Weapon,
51+
]);
52+
3553
let categories: ManualDataZoneMapCategory[];
3654
let farms: ManualDataZoneMapFarm[];
3755
let farmStatuses: FarmStatus[];
@@ -191,23 +209,6 @@
191209
}
192210
};
193211
194-
const lootFarmTypes = toIndexRecord<number>([
195-
FarmType.Event,
196-
FarmType.EventBig,
197-
FarmType.Kill,
198-
FarmType.KillBig,
199-
FarmType.Treasure,
200-
]);
201-
const lootRewardTypes = toIndexRecord<number>([
202-
RewardType.Armor,
203-
RewardType.Cosmetic,
204-
RewardType.Illusion,
205-
RewardType.Item,
206-
RewardType.Mount,
207-
RewardType.Pet,
208-
RewardType.Toy,
209-
RewardType.Weapon,
210-
]);
211212
const typeOrder = toIndexRecord<number>([
212213
FarmType.Vendor,
213214
FarmType.Profession,

0 commit comments

Comments
 (0)