From 6e723aadf6de45a79b4ef64d288ea275628232c5 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 15 Dec 2022 14:59:56 -0600 Subject: start updating to sveltekit v1 --- package.json | 86 +- src/app.html | 27 +- src/hooks.ts | 2 +- src/lib/AuctionPriceScatterplot.svelte | 2 +- src/lib/BackgroundImage.svelte | 2 +- src/lib/Collapsible.svelte | 2 +- src/lib/layout/Loader.svelte | 2 +- src/lib/minecraft/inventory.ts | 2 +- src/params/username.ts | 5 + src/routes/+error.svelte | 43 + src/routes/+layout.svelte | 10 + src/routes/+page.svelte | 128 ++ src/routes/+page.ts | 7 + src/routes/[player=username]/+page.ts | 11 + src/routes/[player].ts | 14 - src/routes/__error.svelte | 53 - src/routes/__layout.svelte | 10 - src/routes/auctionprices.svelte | 213 --- src/routes/auctionprices/+page.svelte | 198 +++ src/routes/auctionprices/+page.ts | 13 + src/routes/chat.svelte | 85 -- src/routes/chat/+page.svelte | 85 ++ src/routes/election.svelte | 257 ---- src/routes/election/+page.svelte | 257 ++++ src/routes/index.svelte | 138 -- src/routes/items.svelte | 216 --- src/routes/items/+page.svelte | 216 +++ src/routes/leaderboard/+page.ts | 10 + src/routes/leaderboard/[name].ts | 12 - src/routes/leaderboard/[name]/+page.ts | 12 + src/routes/leaderboard/index.ts | 11 - src/routes/leaderboards/+page.svelte | 40 + src/routes/leaderboards/+page.ts | 6 + src/routes/leaderboards/[name].svelte | 108 -- src/routes/leaderboards/[name]/+page.svelte | 89 ++ src/routes/leaderboards/[name]/+page.ts | 16 + src/routes/leaderboards/index.svelte | 55 - src/routes/loggedin.ts | 37 - src/routes/loggedin/+page.ts | 37 + src/routes/login.ts | 36 - src/routes/login/+page.ts | 36 + src/routes/logout.ts | 28 - src/routes/logout/+page.ts | 28 + src/routes/player/+page.server.ts | 16 + src/routes/player/[player]/+page.svelte | 135 ++ src/routes/player/[player]/+page.ts | 24 + src/routes/player/[player]/[profile].svelte | 434 ------ src/routes/player/[player]/[profile]/+page.svelte | 383 +++++ src/routes/player/[player]/[profile]/+page.ts | 48 + src/routes/player/[player]/index.svelte | 166 --- src/routes/player/index.ts | 14 - src/routes/profile/index.svelte | 2 +- src/routes/verify.svelte | 66 - src/routes/verify.ts | 75 - src/routes/verify/+page.server.ts | 75 + src/routes/verify/+page.svelte | 66 + svelte.config.js | 41 - tsconfig.json | 19 +- vite.config.js | 28 + yarn.lock | 1550 ++++++++++++++------- 60 files changed, 3123 insertions(+), 2664 deletions(-) create mode 100644 src/params/username.ts create mode 100644 src/routes/+error.svelte create mode 100644 src/routes/+layout.svelte create mode 100644 src/routes/+page.svelte create mode 100644 src/routes/+page.ts create mode 100644 src/routes/[player=username]/+page.ts delete mode 100644 src/routes/[player].ts delete mode 100644 src/routes/__error.svelte delete mode 100644 src/routes/__layout.svelte delete mode 100644 src/routes/auctionprices.svelte create mode 100644 src/routes/auctionprices/+page.svelte create mode 100644 src/routes/auctionprices/+page.ts delete mode 100644 src/routes/chat.svelte create mode 100644 src/routes/chat/+page.svelte delete mode 100644 src/routes/election.svelte create mode 100644 src/routes/election/+page.svelte delete mode 100644 src/routes/index.svelte delete mode 100644 src/routes/items.svelte create mode 100644 src/routes/items/+page.svelte create mode 100644 src/routes/leaderboard/+page.ts delete mode 100644 src/routes/leaderboard/[name].ts create mode 100644 src/routes/leaderboard/[name]/+page.ts delete mode 100644 src/routes/leaderboard/index.ts create mode 100644 src/routes/leaderboards/+page.svelte create mode 100644 src/routes/leaderboards/+page.ts delete mode 100644 src/routes/leaderboards/[name].svelte create mode 100644 src/routes/leaderboards/[name]/+page.svelte create mode 100644 src/routes/leaderboards/[name]/+page.ts delete mode 100644 src/routes/leaderboards/index.svelte delete mode 100644 src/routes/loggedin.ts create mode 100644 src/routes/loggedin/+page.ts delete mode 100644 src/routes/login.ts create mode 100644 src/routes/login/+page.ts delete mode 100644 src/routes/logout.ts create mode 100644 src/routes/logout/+page.ts create mode 100644 src/routes/player/+page.server.ts create mode 100644 src/routes/player/[player]/+page.svelte create mode 100644 src/routes/player/[player]/+page.ts delete mode 100644 src/routes/player/[player]/[profile].svelte create mode 100644 src/routes/player/[player]/[profile]/+page.svelte create mode 100644 src/routes/player/[player]/[profile]/+page.ts delete mode 100644 src/routes/player/[player]/index.svelte delete mode 100644 src/routes/player/index.ts delete mode 100644 src/routes/verify.svelte delete mode 100644 src/routes/verify.ts create mode 100644 src/routes/verify/+page.server.ts create mode 100644 src/routes/verify/+page.svelte create mode 100644 vite.config.js diff --git a/package.json b/package.json index be57989..c296792 100644 --- a/package.json +++ b/package.json @@ -1,48 +1,42 @@ { - "name": "skyblock-stats-svelte", - "version": "0.0.1", - "license": "MIT", - "scripts": { - "init": "node ./scripts/updateDonators.js && node ./scripts/updateBackgrounds.js && node ./scripts/updateRobots.js", - "dev": "svelte-kit dev", - "build": "yarn run init && svelte-kit build", - "package": "svelte-kit package", - "preview": "svelte-kit preview", - "check": "svelte-check --tsconfig ./tsconfig.json", - "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch", - "lint": "prettier --ignore-path .gitignore --check --plugin-search-dir=. . && eslint --ignore-path .gitignore .", - "format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ." - }, - "devDependencies": { - "@squoosh/lib": "^0.4.0", - "@sveltejs/adapter-auto": "^1.0.0-next.24", - "@types/cookie": "^0.5.1", - "@typescript-eslint/eslint-plugin": "^5.10.1", - "@typescript-eslint/parser": "^5.10.1", - "eslint": "^8.15.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-svelte3": "^4.0.0", - "prettier": "^2.5.1", - "prettier-plugin-svelte": "^2.5.0", - "svelte-check": "^2.4.6", - "tslib": "^2.3.1", - "typescript": "~4.6.4", - "vite": "^2.8.6", - "vite-plugin-html": "^3.0.6" - }, - "type": "module", - "dependencies": { - "@lukeed/uuid": "^2.0.0", - "@sveltejs/adapter-node": "^1.0.0-next.68", - "@sveltejs/adapter-static": "^1.0.0-next.28", - "@sveltejs/adapter-vercel": "^1.0.0-next.43", - "@sveltejs/kit": "^1.0.0-next.335", - "cookie": "^0.5.0", - "dotenv": "^16.0.0", - "skyblock-assets": "^2.0.11", - "svelte": "^3.48.0", - "svelte-preprocess": "^4.10.6", - "typed-hypixel-api": "^1.1.0" - }, - "packageManager": "yarn@3.1.1" + "name": "skyblock-stats-svelte", + "version": "0.0.1", + "license": "MIT", + "scripts": { + "dev": "vite dev", + "build": "vite build", + "preview": "vite preview" + }, + "devDependencies": { + "@sveltejs/adapter-auto": "^1.0.0", + "@types/cookie": "^0.5.1", + "@typescript-eslint/eslint-plugin": "^5.46.1", + "@typescript-eslint/parser": "^5.46.1", + "eslint": "^8.29.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-svelte3": "^4.0.0", + "prettier": "^2.8.1", + "prettier-plugin-svelte": "^2.9.0", + "svelte-check": "^2.10.2", + "tslib": "^2.4.1", + "typescript": "^4.9.4", + "vite": "^4.0.1", + "vite-plugin-html": "^3.2.0" + }, + "type": "module", + "dependencies": { + "@lukeed/uuid": "^2.0.0", + "@sveltejs/adapter-node": "^1.0.0", + "@sveltejs/adapter-static": "^1.0.0", + "@sveltejs/adapter-vercel": "^1.0.0", + "@sveltejs/kit": "^1.0.0", + "cookie": "^0.5.0", + "dotenv": "^16.0.3", + "skyblock-assets": "^2.0.11", + "squoosh": "^0.0.0", + "svelte": "^3.55.0", + "svelte-preprocess": "^5.0.0", + "typed-hypixel-api": "^1.8.0" + }, + "packageManager": "yarn@3.1.1" } diff --git a/src/app.html b/src/app.html index e0a73a9..b9273a6 100644 --- a/src/app.html +++ b/src/app.html @@ -1,14 +1,17 @@ - - - - - - - %svelte.head% - - - %svelte.body% - - + + + + + + + + %sveltekit.head% + + + + %sveltekit.body% + + + \ No newline at end of file diff --git a/src/hooks.ts b/src/hooks.ts index 3fa9299..457e8ae 100644 --- a/src/hooks.ts +++ b/src/hooks.ts @@ -1,5 +1,5 @@ import cookie from 'cookie' -import type { ExternalFetch, GetSession, Handle } from '@sveltejs/kit' +import type { Handle } from '@sveltejs/kit' export const handle: Handle = async ({ event, resolve }) => { diff --git a/src/lib/AuctionPriceScatterplot.svelte b/src/lib/AuctionPriceScatterplot.svelte index da1aed2..17a09f1 100644 --- a/src/lib/AuctionPriceScatterplot.svelte +++ b/src/lib/AuctionPriceScatterplot.svelte @@ -1,5 +1,5 @@ + + +
+ +
+
+

{status}

+

{error.message}

+ Home +
+
+ + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte new file mode 100644 index 0000000..74e29b9 --- /dev/null +++ b/src/routes/+layout.svelte @@ -0,0 +1,10 @@ + + + + +