Skip to content
Merged

Deploy #1735

Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 34 additions & 34 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
name: Continuous Integration

on:
pull_request:
pull_request:

# Allow job to be manually started
workflow_dispatch:
# Allow job to be manually started
workflow_dispatch:

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2
with:
node-version: '18'

- uses: actions/cache@v4
id: cache-node-modules
with:
key: ${{ runner.os }}-node18-modules-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node18-modules-
path: |
apps/frontend/node_modules

- name: Install dependencies
if: steps.cache-node-modules.outputs.cache-hit != 'true'
working-directory: apps/frontend/
run: npm i --no-audit --no-fund

- name: ESLint
working-directory: apps/frontend/
run: npm run lint

- name: Svelte Check
working-directory: apps/frontend/
run: npm run check
lint:
name: Lint
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2
with:
node-version: "22"

- uses: actions/cache@v4
id: cache-node-modules
with:
key: ${{ runner.os }}-node22-modules-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node22-modules-
path: |
apps/frontend/node_modules

- name: Install dependencies
if: steps.cache-node-modules.outputs.cache-hit != 'true'
working-directory: apps/frontend/
run: npm i --no-audit --no-fund

- name: ESLint
working-directory: apps/frontend/
run: npm run lint

- name: Svelte Check
working-directory: apps/frontend/
run: npm run check
2 changes: 1 addition & 1 deletion apps/frontend/components/achievements/CriteriaTree.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
criteriaCharacters?.[criteriaTree?.criteriaId || -1]?.[0]?.[1] || 0;
have = maxCharacter > 0 && maxCharacter >= criteriaTree.amount;
} else {
let maybeCriteria: number[][] = [];
let maybeCriteria: number[][];
maybeCriteria = criteriaCharacters[criteria?.id] || [[0, 0]];

if (achievement.isAccountWide) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,54 +1,53 @@
<script lang="ts">
import debounce from 'lodash/debounce'
import debounce from 'lodash/debounce';

import type { Character } from '@/types'
import type { Character } from '@/types';

import BackgroundSelector from '@/components/common/BackgroundSelector.svelte'
import RangeInput from '@/shared/components/forms/RangeInput.svelte'
import BackgroundSelector from '@/components/common/BackgroundSelector.svelte';
import RangeInput from '@/shared/components/forms/RangeInput.svelte';

export let backgroundBrightness: number
export let backgroundSaturation: number
export let character: Character
export let selected: number
export let backgroundBrightness: number;
export let backgroundSaturation: number;
export let character: Character;
export let selected: number;

let first = true
let status = ''

$: debouncedSave(selected, backgroundBrightness, backgroundSaturation)

const getValue = (value: number): string => value === -1 ? 'Def' : `${value * 10}%`
let first = true;
let status = '';

const debouncedSave = debounce(async (id: number, brightness: number, saturation: number) => {
if (first) {
first = false
return
first = false;
return;
}

status = 'Saving...'
status = 'Saving...';

const form = {
backgroundId: id,
backgroundBrightness: brightness,
backgroundSaturation: saturation,
}
const xsrf = document.getElementById('app').getAttribute('data-xsrf')
};
const xsrf = document.getElementById('app').getAttribute('data-xsrf');

const response = await fetch(`/api/character/${character.id}/configuration`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'RequestVerificationToken': xsrf,
RequestVerificationToken: xsrf,
},
body: JSON.stringify(form),
})
});

if (response.ok) {
status = 'Saved!'
status = 'Saved!';
} else {
status = 'ERROR!';
}
else {
status = 'ERROR!'
}
}, 500)
}, 500);

$: debouncedSave(selected, backgroundBrightness, backgroundSaturation);

const getValue = (value: number): string => (value === -1 ? 'Def' : `${value * 10}%`);
</script>

<style lang="scss">
Expand Down Expand Up @@ -96,10 +95,11 @@
<span class="status">{status}</span>
</div>

<BackgroundSelector
bind:selected
showDefault={true}
/>

<p>You can change your default background in <a href="#/settings/characters">Settings > Characters</a></p>
<BackgroundSelector bind:selected showDefault={true} />

<p>
You can change your default background in <a href="#/settings/characters"
>Settings > Characters</a
>
</p>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
const character: Character = getContext('character');

let addonMap: CharacterMythicPlusAddonMap;
let allRuns: CharacterMythicPlusAddonRun[];
// let allRuns: CharacterMythicPlusAddonRun[];
let bestRun: CharacterMythicPlusRun;
let hasPortal: boolean;
let isTyrannical: boolean;
Expand Down Expand Up @@ -118,7 +118,7 @@
component: TooltipMythicPlusRuns,
props: {
addonMap,
allRuns,
allRuns: [],
character,
dungeonId,
runs,
Expand Down
8 changes: 8 additions & 0 deletions apps/frontend/components/professions/recipes/View.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,14 @@
{/if}
</WowheadLink>
</span>
{:else if ability.spellId}
<WowheadLink type="spell" id={ability.spellId}>
<WowthingImage
name="spell/{ability.spellId}"
size={20}
border={1}
/>
</WowheadLink>
{:else}
<ProfessionIcon id={profession.id} border={1} />
{/if}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}

for (const character of userState.general.activeCharacters) {
let quantity = 0;
let quantity: number;
if (currency) {
quantity = character.currencies?.[currency.id]?.quantity || 0;
} else if (item) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
.getCurrentPeriodForCharacter($timeStore, character)
.endTime.toUnixInteger();

runCounts = [];
const allRuns: CharacterMythicPlusAddonRun[] = [];

for (const [timestamp, weekRuns] of Object.entries(character.mythicPlusWeeks || {})) {
Expand Down
35 changes: 18 additions & 17 deletions apps/frontend/components/zone-maps/ZoneMapsMap.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@
children: [ManualDataZoneMapFarm, number][];
};

const lootFarmTypes = toIndexRecord<number>([
FarmType.Event,
FarmType.EventBig,
FarmType.Kill,
FarmType.KillBig,
FarmType.Treasure,
]);
const lootRewardTypes = toIndexRecord<number>([
RewardType.Armor,
RewardType.Cosmetic,
RewardType.Illusion,
RewardType.Item,
RewardType.Mount,
RewardType.Pet,
RewardType.Toy,
RewardType.Weapon,
]);

let categories: ManualDataZoneMapCategory[];
let farms: ManualDataZoneMapFarm[];
let farmStatuses: FarmStatus[];
Expand Down Expand Up @@ -191,23 +209,6 @@
}
};

const lootFarmTypes = toIndexRecord<number>([
FarmType.Event,
FarmType.EventBig,
FarmType.Kill,
FarmType.KillBig,
FarmType.Treasure,
]);
const lootRewardTypes = toIndexRecord<number>([
RewardType.Armor,
RewardType.Cosmetic,
RewardType.Illusion,
RewardType.Item,
RewardType.Mount,
RewardType.Pet,
RewardType.Toy,
RewardType.Weapon,
]);
const typeOrder = toIndexRecord<number>([
FarmType.Vendor,
FarmType.Profession,
Expand Down
Loading
Loading