From 201d64a3fe2d51c2cf6b21db25f0ff620c804946 Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Thu, 13 Oct 2022 17:36:24 -0400 Subject: [PATCH] Commit changes --- src/lib/constants.js | 4 ++++ src/lib/database.js | 2 +- src/routes/(app)/+layout.svelte | 4 ++-- src/routes/(app)/+page.svelte | 20 +------------------ src/routes/(app)/about/credits/+page.svelte | 3 --- src/routes/(app)/about/privacy/+page.svelte | 3 --- src/routes/(app)/about/rules/+page.svelte | 3 --- src/routes/(app)/about/tos/+page.svelte | 3 --- src/routes/(app)/catalog/+page.svelte | 3 --- src/routes/(app)/forums/+page.svelte | 3 --- src/routes/(app)/games/+page.svelte | 10 ---------- src/routes/(app)/games/[id]/+page.server.js | 6 ++++++ src/routes/(app)/groups/+page.svelte | 3 --- src/routes/(app)/my/avatar/+page.svelte | 3 --- src/routes/(app)/my/friends/+page.svelte | 3 --- src/routes/(app)/my/money/+page.svelte | 3 --- src/routes/(app)/my/profile/+page.svelte | 3 --- src/routes/(app)/my/settings/+page.svelte | 3 --- src/routes/(app)/people/+page.svelte | 3 --- .../(app)/users/[id]/profile/+page.server.js | 10 ++++++++++ .../(app)/users/[id]/profile/+page.svelte | 15 ++++++++++---- 21 files changed, 35 insertions(+), 75 deletions(-) delete mode 100644 src/routes/(app)/about/credits/+page.svelte delete mode 100644 src/routes/(app)/about/privacy/+page.svelte delete mode 100644 src/routes/(app)/about/rules/+page.svelte delete mode 100644 src/routes/(app)/about/tos/+page.svelte delete mode 100644 src/routes/(app)/catalog/+page.svelte delete mode 100644 src/routes/(app)/forums/+page.svelte delete mode 100644 src/routes/(app)/groups/+page.svelte delete mode 100644 src/routes/(app)/my/avatar/+page.svelte delete mode 100644 src/routes/(app)/my/friends/+page.svelte delete mode 100644 src/routes/(app)/my/money/+page.svelte delete mode 100644 src/routes/(app)/my/profile/+page.svelte delete mode 100644 src/routes/(app)/my/settings/+page.svelte delete mode 100644 src/routes/(app)/people/+page.svelte create mode 100644 src/routes/(app)/users/[id]/profile/+page.server.js diff --git a/src/lib/constants.js b/src/lib/constants.js index 7396859..c09773d 100644 --- a/src/lib/constants.js +++ b/src/lib/constants.js @@ -14,3 +14,7 @@ export const RANKS = { 4: "Developer", 5: "NO_ACCESS_MAX_PERMISSIONS" }; +export const GAME_VERSIONS = { + 0: "2013", + 1: "2015" +}; diff --git a/src/lib/database.js b/src/lib/database.js index 41d931f..1254f65 100644 --- a/src/lib/database.js +++ b/src/lib/database.js @@ -57,7 +57,7 @@ export async function createUser(username, password, lastip) { rank: 1, activity: 1, pendingFriendRequests: [], - bio: "" + bio: "This is my Rowblox profile!" }; const avatar = { diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index e240eda..f31c58e 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -19,13 +19,13 @@ Games Catalog - Forums + Discord 100 -
+
-
+

Friends

View All
- - - - - - - - - -
@@ -37,12 +27,4 @@ View All
- - - - - - - -
diff --git a/src/routes/(app)/about/credits/+page.svelte b/src/routes/(app)/about/credits/+page.svelte deleted file mode 100644 index acdd480..0000000 --- a/src/routes/(app)/about/credits/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Credits - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/about/privacy/+page.svelte b/src/routes/(app)/about/privacy/+page.svelte deleted file mode 100644 index bd6b986..0000000 --- a/src/routes/(app)/about/privacy/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Privacy - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/about/rules/+page.svelte b/src/routes/(app)/about/rules/+page.svelte deleted file mode 100644 index edd076c..0000000 --- a/src/routes/(app)/about/rules/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Rules - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/about/tos/+page.svelte b/src/routes/(app)/about/tos/+page.svelte deleted file mode 100644 index 526a84e..0000000 --- a/src/routes/(app)/about/tos/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Terms of Service - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/catalog/+page.svelte b/src/routes/(app)/catalog/+page.svelte deleted file mode 100644 index 1b767df..0000000 --- a/src/routes/(app)/catalog/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Catalog - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/forums/+page.svelte b/src/routes/(app)/forums/+page.svelte deleted file mode 100644 index 34b8130..0000000 --- a/src/routes/(app)/forums/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Forums - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/games/+page.svelte b/src/routes/(app)/games/+page.svelte index a9a8b6d..65f7070 100644 --- a/src/routes/(app)/games/+page.svelte +++ b/src/routes/(app)/games/+page.svelte @@ -13,13 +13,3 @@ Create Game
- - - - - - - - - - diff --git a/src/routes/(app)/games/[id]/+page.server.js b/src/routes/(app)/games/[id]/+page.server.js index e69de29..ae2819c 100644 --- a/src/routes/(app)/games/[id]/+page.server.js +++ b/src/routes/(app)/games/[id]/+page.server.js @@ -0,0 +1,6 @@ +import { error } from "@sveltejs/kit"; + +/** @type {import('./$types').PageServerLoad} */ +export async function load({ params }) { + throw error(404, "That game doesn't exist"); +} diff --git a/src/routes/(app)/groups/+page.svelte b/src/routes/(app)/groups/+page.svelte deleted file mode 100644 index a10ff1d..0000000 --- a/src/routes/(app)/groups/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Groups - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/my/avatar/+page.svelte b/src/routes/(app)/my/avatar/+page.svelte deleted file mode 100644 index 01f1d26..0000000 --- a/src/routes/(app)/my/avatar/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Avatar - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/my/friends/+page.svelte b/src/routes/(app)/my/friends/+page.svelte deleted file mode 100644 index 180e7df..0000000 --- a/src/routes/(app)/my/friends/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Friends - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/my/money/+page.svelte b/src/routes/(app)/my/money/+page.svelte deleted file mode 100644 index f6c4f97..0000000 --- a/src/routes/(app)/my/money/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Money - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/my/profile/+page.svelte b/src/routes/(app)/my/profile/+page.svelte deleted file mode 100644 index fff53f4..0000000 --- a/src/routes/(app)/my/profile/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Profile - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/my/settings/+page.svelte b/src/routes/(app)/my/settings/+page.svelte deleted file mode 100644 index 9ecc159..0000000 --- a/src/routes/(app)/my/settings/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Settings - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/people/+page.svelte b/src/routes/(app)/people/+page.svelte deleted file mode 100644 index 39c6adb..0000000 --- a/src/routes/(app)/people/+page.svelte +++ /dev/null @@ -1,3 +0,0 @@ - - Users - Rowblox - \ No newline at end of file diff --git a/src/routes/(app)/users/[id]/profile/+page.server.js b/src/routes/(app)/users/[id]/profile/+page.server.js new file mode 100644 index 0000000..af16d7f --- /dev/null +++ b/src/routes/(app)/users/[id]/profile/+page.server.js @@ -0,0 +1,10 @@ +import { error } from "@sveltejs/kit"; +import { getUser } from "$lib/database"; + +/** @type {import('./$types').PageServerLoad} */ +export async function load({ params }) { + const user = await getUser({ _id: Number(params.id) }, { username: true, currency: true, joinDate: true, lastOnline: true, rank: true, activity: true, bio: true }); + if (!user) throw error(404, "That user doesn't exist"); + + return { profile: user }; +} diff --git a/src/routes/(app)/users/[id]/profile/+page.svelte b/src/routes/(app)/users/[id]/profile/+page.svelte index 84448ff..1ef2946 100644 --- a/src/routes/(app)/users/[id]/profile/+page.svelte +++ b/src/routes/(app)/users/[id]/profile/+page.svelte @@ -1,7 +1,14 @@ + +
-

Only16Characters

+

{data.profile?.username}

0 Friends

0 Followers

@@ -20,15 +27,15 @@

About

-

bio

+

{data.profile?.bio}

Join Date

-

a

+

{joinDate.getMonth() + 1}/{joinDate.getDate()}/{joinDate.getFullYear()}

Last Online

-

b

+

{lastOnline.getMonth() + 1}/{lastOnline.getDate()}/{lastOnline.getFullYear()}