diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 60b97cfc3..8ae1102f3 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -97,7 +97,7 @@ jobs: uses: actions/checkout@v3 with: repository: NotEnoughUpdates/NotEnoughUpdates-REPO - path: src/lib/constants/NotEnoughUpdates-REPO/items + path: src/lib/server/constants/NotEnoughUpdates-REPO/ token: ${{ secrets.GITHUB_TOKEN }} - name: PNPM Install diff --git a/.gitmodules b/.gitmodules index 5ed9afa61..183a6ea17 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "src/lib/constants/NotEnoughUpdates-REPO"] - path = src/lib/constants/NotEnoughUpdates-REPO +[submodule "src/lib/constants/server/NotEnoughUpdates-REPO"] + path = src/lib/constants/server/NotEnoughUpdates-REPO url = https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO diff --git a/src/hooks.server.ts b/src/hooks.server.ts index a1376ca8a..bd627255e 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,11 +1,11 @@ -import { startMongo } from "./lib/server/db/mongo"; -import { startRedis } from "./lib/server/db/redis"; import { init } from "$lib/custom_resources"; -import { parseNEURepository } from "$lib/scripts/parseNEURepository"; -import { updateNotEnoughUpdatesRepository } from "$lib/scripts/updateNEURepository"; -import { getPrices } from "skyhelper-networth"; -import { updateItems } from "$lib/server/constants/update-items"; import { updateCollections } from "$lib/server/constants/update-collections"; +import { updateItems } from "$lib/server/constants/update-items"; +import { parseNEURepository } from "$lib/server/helper/NotEnoughUpdates/parseNEURepository"; +import { updateNotEnoughUpdatesRepository } from "$lib/server/helper/NotEnoughUpdates/updateNEURepository"; +import { getPrices } from "skyhelper-networth"; +import { startMongo } from "./lib/server/db/mongo"; +import { startRedis } from "./lib/server/db/redis"; init(); diff --git a/src/lib/components/AdditionStat.svelte b/src/lib/components/AdditionStat.svelte index f56bf7fd7..77e6e87c2 100644 --- a/src/lib/components/AdditionStat.svelte +++ b/src/lib/components/AdditionStat.svelte @@ -1,6 +1,6 @@

Miscellaneous

diff --git a/src/lib/sections/stats/Pets.svelte b/src/lib/sections/stats/Pets.svelte index 05dcccb4e..d23fcd092 100644 --- a/src/lib/sections/stats/Pets.svelte +++ b/src/lib/sections/stats/Pets.svelte @@ -1,25 +1,31 @@ @@ -32,16 +38,7 @@

Pet score is calculated based on how many unique pets you have and the rarity of these pets.

You gain an additional score for each max level pet you have!

-
- {#each Object.entries(PET_REWARDS) as [score, data]} -
- {score} Score: +{data.magic_find} Magic Find - {#if data.magic_find === pets.petScore.amount} - « - {/if} -
- {/each} -
+
diff --git a/src/lib/sections/stats/Rift.svelte b/src/lib/sections/stats/Rift.svelte index 442b4ff8f..9af5e9f0d 100644 --- a/src/lib/sections/stats/Rift.svelte +++ b/src/lib/sections/stats/Rift.svelte @@ -2,8 +2,9 @@ import AdditionStat from "$lib/components/AdditionStat.svelte"; import Chip from "$lib/components/Chip.svelte"; import Items from "$lib/layouts/stats/Items.svelte"; - import { cn } from "$lib/utils"; - import type { Stats as StatsType } from "$types/stats"; + import { format } from "numerable"; + import { cn } from "$lib/shared/utils"; + import type { Stats as StatsType } from "$lib/types/stats"; import { formatDate, formatDistanceToNowStrict } from "date-fns"; import { getContext } from "svelte"; @@ -14,12 +15,12 @@
- +
Lifetime Motes: - {rift.motes.lifetime} + {format(rift.motes.lifetime)} Total Motes earned in Rift.
diff --git a/src/lib/sections/stats/Slayer.svelte b/src/lib/sections/stats/Slayer.svelte index 60fadaa51..3d1a76623 100644 --- a/src/lib/sections/stats/Slayer.svelte +++ b/src/lib/sections/stats/Slayer.svelte @@ -1,7 +1,7 @@