diff --git a/.vscode/settings.json b/.vscode/settings.json index 3a1d500e..cea90f0a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,4 @@ { - "eslint.experimental.useFlatConfig": true, - "prettier.enable": false, "editor.formatOnSave": false, diff --git a/package.json b/package.json index 01fe2c51..a693a190 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "prepare": "husky" }, "dependencies": { - "@hmbanan666/chat-game-api": "^0.1.15", + "@hmbanan666/chat-game-api": "^0.1.17", "@paralleldrive/cuid2": "^2.2.2", "@radix-ui/colors": "^3.0.0", "@twurple/api": "^7.1.0", diff --git a/src/lib/assets/website/coin-128.png b/src/lib/assets/website/coin-128.png new file mode 100644 index 00000000..bc0ff4fd Binary files /dev/null and b/src/lib/assets/website/coin-128.png differ diff --git a/src/lib/assets/website/coin-16.png b/src/lib/assets/website/coin-16.png new file mode 100644 index 00000000..b184839b Binary files /dev/null and b/src/lib/assets/website/coin-16.png differ diff --git a/src/lib/assets/website/coin-32.png b/src/lib/assets/website/coin-32.png new file mode 100644 index 00000000..bfb69e53 Binary files /dev/null and b/src/lib/assets/website/coin-32.png differ diff --git a/src/lib/assets/website/coin-64.png b/src/lib/assets/website/coin-64.png new file mode 100644 index 00000000..f37aa7d6 Binary files /dev/null and b/src/lib/assets/website/coin-64.png differ diff --git a/src/lib/components/Footer.svelte b/src/lib/components/Footer.svelte index b890c7cf..6f771141 100644 --- a/src/lib/components/Footer.svelte +++ b/src/lib/components/Footer.svelte @@ -37,11 +37,11 @@ a { font-weight: 600; - color: var(--color-text); + color: inherit; } a:hover { - color: var(--color-accent-1); + color: var(--green-9); } @media (min-width: 480px) { diff --git a/src/lib/components/Hamburger.svelte b/src/lib/components/Hamburger.svelte index 8b82ddfd..7c72c2da 100644 --- a/src/lib/components/Hamburger.svelte +++ b/src/lib/components/Hamburger.svelte @@ -32,7 +32,6 @@ svg { min-height: 24px; transition: transform 0.2s ease-in-out; - color: var(--color-text); } svg line { diff --git a/src/lib/components/MenuDesktop.svelte b/src/lib/components/MenuDesktop.svelte index f1901c4b..3398484a 100644 --- a/src/lib/components/MenuDesktop.svelte +++ b/src/lib/components/MenuDesktop.svelte @@ -1,9 +1,12 @@
- +
+ {#if profile?.coins > 0} +
+
{profile.coins}
+
+ {/if} + + {#if profile?.coupons > 0} +
+
{profile.coupons}
+
+ {/if} + + +
diff --git a/src/lib/components/Profile.svelte b/src/lib/components/Profile.svelte index f13ac03c..56849161 100644 --- a/src/lib/components/Profile.svelte +++ b/src/lib/components/Profile.svelte @@ -58,7 +58,7 @@ .wrapper { position: relative; width: fit-content; - margin-left: auto; + display: inline-block; } .twitch { diff --git a/src/lib/game/stream-plugin/customWebSocketService.ts b/src/lib/game/stream-plugin/customWebSocketService.ts new file mode 100644 index 00000000..e3dc0754 --- /dev/null +++ b/src/lib/game/stream-plugin/customWebSocketService.ts @@ -0,0 +1,85 @@ +import type { WebSocketMessage } from '@hmbanan666/chat-game-api' +import type { UnitsOnStream } from '$lib/game/types' +import { browser } from '$app/environment' +import { config } from '$lib/config' + +export class CustomWebSocketService { + socket!: WebSocket + messagesPerSecond = 0 + kbitPerSecond = 0 + game: UnitsOnStream + + constructor(game: UnitsOnStream) { + this.game = game + + if (browser && this.game.options.isSocketOn) { + this.#init() + } + } + + update() {} + + async #handleMessage(message: WebSocketMessage) { + if (message.type === 'MESSAGE') { + const { text, player } = message.data + this.game.handleMessage({ text, playerId: player.id }) + } + // if (message.type === 'RAID_STARTED') { + // this.game.audio.playSound('MARCHING_WITH_HORNS') + // } + // if (message.type === 'GROUP_FORM_STARTED') { + // this.game.audio.playSound('MARCHING_WITH_HORNS') + // } + // if (message.type === 'MAIN_QUEST_STARTED') { + // this.game.audio.playSound('MARCHING_WITH_HORNS') + // } + // if (message.type === 'SCENE_CHANGED') { + // this.game.rebuildScene() + // } + // if (message.type === 'IDEA_CREATED') { + // this.game.audio.playSound('YEAH') + // } + } + + #init() { + this.socket = new WebSocket(config.websocketUrl ?? '', [this.game.id]) + + this.#setMessagesPerSecondHandler() + + this.socket.addEventListener('open', () => { + this.socket.send(JSON.stringify({ type: 'GAME_HANDSHAKE', id: this.game.id, profileJWT: this.game.profileJWT })) + }) + + this.socket.addEventListener('message', (event) => { + const message = this.#parse(event.data.toString()) + if (!message) { + return + } + + this.messagesPerSecond += 1 + const bytes = JSON.stringify(message).length + this.kbitPerSecond += Math.round((bytes * 8) / 1024) + + void this.#handleMessage(message) + }) + } + + #parse(message: string): WebSocketMessage | undefined { + const parsed = JSON.parse(message) + if (parsed) { + return parsed as WebSocketMessage + } + + return undefined + } + + #setMessagesPerSecondHandler() { + return setInterval(() => { + // console.log( + // `${this.messagesPerSecond} msg/s, ${this.kbitPerSecond} kbit/s`, + // ) + this.messagesPerSecond = 0 + this.kbitPerSecond = 0 + }, 1000) + } +} diff --git a/src/lib/game/stream-plugin/unitsOnStreamPlugin.ts b/src/lib/game/stream-plugin/unitsOnStreamPlugin.ts new file mode 100644 index 00000000..fe22e400 --- /dev/null +++ b/src/lib/game/stream-plugin/unitsOnStreamPlugin.ts @@ -0,0 +1,369 @@ +import { Application, Container } from 'pixi.js' +import { createId } from '@paralleldrive/cuid2' +import { gameOptions } from '../store.svelte' +import { ServerService } from '../services/server/serverService' +import { BaseWagon } from '../objects/baseWagon' +import { FlagObject } from '../objects/flagObject' +import { ANSWER } from '../services/action/answer' +import { Player } from '../objects/units/player' +import { MoveOffScreenAndSelfDestroyScript } from '../scripts/moveOffScreenAndSelfDestroyScript' +import { CustomWebSocketService } from './customWebSocketService' +import type { + Game, + GameObject, + GameObjectPlayer, + GameOptions, + IGameActionResponse, + UnitsOnStream, +} from '$lib/game/types' +import { AssetsManager } from '$lib/game/utils/assetsManager' +import { getRandomInRange } from '$lib/utils/random' +import { MoveToTargetScript } from '$lib/game/scripts/moveToTargetScript' +import { EventService } from '$lib/game/services/event/eventService' +import { Group } from '$lib/game/common/group' +import { PlayerService } from '$lib/game/services/player/playerService' +import type { Wagon } from '$lib/game/services/wagon/interface' +import { getDateMinusMinutes } from '$lib/utils/date' + +interface UnitsOnStreamPluginOptions { + isSocketOn?: boolean +} + +export class UnitsOnStreamPlugin extends Container implements UnitsOnStream { + id: string + profileJWT?: string + options: GameOptions + children: Game['children'] = [] + app: Application + scene!: Game['scene'] + tick: Game['tick'] = 0 + group: Group + wagon!: BaseWagon + + eventService: EventService + playerService: PlayerService + websocketService: CustomWebSocketService + serverService: ServerService + + #outFlags: FlagObject[] = [] + #nearFlags: FlagObject[] = [] + + #cameraX = 0 + #cameraY = 0 + #cameraPerfectX = 0 + #cameraPerfectY = 0 + + constructor({ isSocketOn }: UnitsOnStreamPluginOptions) { + super() + + this.options = gameOptions + this.options.isSocketOn = isSocketOn ?? false + + this.id = createId() + this.app = new Application() + this.group = new Group() + + this.eventService = new EventService(this as any) + this.playerService = new PlayerService(this as any) + this.websocketService = new CustomWebSocketService(this) + this.serverService = new ServerService(this as any) + } + + async init() { + await this.app.init({ + backgroundAlpha: 0, + antialias: false, + roundPixels: false, + resolution: 1, + resizeTo: window, + }) + + await AssetsManager.init() + + // this.audio.playSound("FOREST_BACKGROUND") + + this.#initWagon({ x: 1, y: 1 }) + + this.app.stage.addChild(this) + + // this.initScene('MOVING') + + this.app.ticker.add(() => { + if (this.options.isPaused) { + return + } + + this.tick = this.app.ticker.FPS + + this.eventService.update() + // this.wagonService.update() + this.#removeInactivePlayers() + this.#updateObjects() + this.#removeDestroyedObjects() + + this.#changeCameraPosition(this.wagon) + this.#moveCamera() + }) + } + + async play() { + this.options.isPaused = false + + // setInterval(() => { + // console.log("FPS", this.app.ticker.FPS) + // console.log("Objects", this.children.length) + // }, 1000) + } + + destroy() { + this.app.destroy() + + super.destroy() + } + + removeObject(obj: GameObject) { + this.removeChild(obj) + } + + get activePlayers() { + return this.children.filter((obj) => obj.type === 'PLAYER') as GameObjectPlayer[] + } + + checkIfThisFlagIsTarget(id: string): boolean { + for (const obj of this.children) { + if (obj.target?.id === id) { + return true + } + } + return false + } + + findObject(id: string): GameObject | undefined { + return this.children.find((obj) => obj.id === id) + } + + rebuildScene(): void { + this.removeChild(...this.children) + } + + get randomOutFlag() { + return this.#outFlags[Math.floor(Math.random() * this.#outFlags.length)] + } + + get randomNearFlag() { + return this.#nearFlags[Math.floor(Math.random() * this.#nearFlags.length)] + } + + #initWagon({ x, y }: { x: number, y: number }) { + this.wagon = new BaseWagon({ game: this as any, x, y }) + this.wagon.init() + + this.#initOutFlags() + this.#initNearFlags() + } + + #initOutFlags(count = 1) { + for (let i = 0; i < count; i++) { + this.#outFlags.push(this.#generateRandomOutFlag()) + } + } + + #initNearFlags(count = 20) { + for (let i = 0; i < count; i++) { + this.#nearFlags.push(this.#generateRandomNearFlag()) + } + } + + #generateRandomOutFlag() { + const offsetX = -500 + const offsetY = 30 + + const flag = new FlagObject({ + game: this as any, + variant: 'OUT_OF_SCREEN', + x: this.wagon.x + offsetX, + y: this.wagon.y + offsetY, + offsetX, + offsetY, + }) + + return flag + } + + #generateRandomNearFlag() { + const minOffsetX = 200 + + const offsetX + = getRandomInRange(minOffsetX, this.app.screen.width - 500) + const offsetY = 30 + + const flag = new FlagObject({ + game: this as any, + variant: 'WAGON_NEAR_MOVEMENT', + x: this.wagon.x + offsetX, + y: this.wagon.y + offsetY, + offsetX, + offsetY, + }) + + return flag + } + + async handleMessage({ playerId, text }: { playerId: string, text: string }): Promise { + const player = await this.#initPlayer(playerId) + if (!player) { + return ANSWER.NO_PLAYER_ERROR + } + + return this.#handleMessage(player, text) + } + + async #initPlayer(id: string) { + const player = await this.findOrCreatePlayer(id) + if (!player) { + return + } + + this.group.join(player) + this.addChild(player) + player.updateLastActionAt() + + return player + } + + async findOrCreatePlayer(id: string): Promise { + const player = this.#findPlayer(id) + if (!player) { + return this.#createPlayer(id) + } + + return player + } + + #findPlayer(id: string) { + return this.children.find((p) => p.id === id && p.type === 'PLAYER') as Player | undefined + } + + async #createPlayer(id: string) { + const player = new Player({ game: this as any, id, x: -100, y: -100 }) + await player.init() + + const flag = this.randomOutFlag + player.x = flag.x + player.y = flag.y + + return player + } + + #removeInactivePlayers() { + for (const player of this.activePlayers) { + const checkTime = getDateMinusMinutes(8) + if (player.lastActionAt.getTime() <= checkTime.getTime()) { + if (player.script) { + continue + } + + const target = this.randomOutFlag + const selfDestroyFunc = () => { + this.group.remove(player) + } + + player.script = new MoveOffScreenAndSelfDestroyScript({ + target, + object: player, + selfDestroyFunc, + }) + } + } + } + + async #handleMessage(player: GameObjectPlayer, text: string): Promise { + player.addMessage(text) + + return ANSWER.OK + } + + #updateObjects() { + for (const object of this.children) { + object.animate() + object.live() + + if (object.type === 'PLAYER') { + this.#updatePlayer(object as GameObjectPlayer) + } + } + } + + #updatePlayer(object: GameObjectPlayer) { + if (object.script) { + return + } + + if (object.state === 'IDLE') { + const random = getRandomInRange(1, 150) + if (random <= 1) { + const target = this.randomNearFlag + + object.script = new MoveToTargetScript({ + object, + target, + }) + } + } + } + + #removeDestroyedObjects() { + for (const object of this.children) { + if (object.state === 'DESTROYED') { + const index = this.children.indexOf(object) + this.children.splice(index, 1) + return + } + } + } + + #changeCameraPosition(wagon: Wagon) { + const columnWidth = this.app.screen.width / 8 + const rowHeight = this.app.screen.height / 8 + + const leftPadding = columnWidth - 20 + const topPadding = rowHeight * 7 - 5 + + this.#cameraPerfectX = -wagon.x + leftPadding + this.#cameraPerfectY = -wagon.y + topPadding + + // If first load + if (Math.abs(-wagon.x - this.#cameraX) > 3000) { + this.#cameraX = this.#cameraPerfectX + } + if (Math.abs(-wagon.y - this.#cameraY) > 3000) { + this.#cameraY = this.#cameraPerfectY + } + } + + #moveCamera() { + const cameraSpeedPerSecond = 25 + const cameraDistance = cameraSpeedPerSecond / this.tick + + const bufferX = Math.abs(this.#cameraPerfectX - this.#cameraX) + const moduleX = this.#cameraPerfectX - this.#cameraX > 0 ? 1 : -1 + const addToX = bufferX > cameraDistance ? cameraDistance : bufferX + + if (this.#cameraX !== this.#cameraPerfectX) { + this.#cameraX += addToX * moduleX + } + + const bufferY = Math.abs(this.#cameraPerfectY - this.#cameraY) + const moduleY = this.#cameraPerfectY - this.#cameraY > 0 ? 1 : -1 + const addToY = bufferY > cameraDistance ? cameraDistance : bufferY + + if (this.#cameraY !== this.#cameraPerfectY) { + this.#cameraY += addToY * moduleY + } + + if (this.parent) { + this.parent.x = this.#cameraX + this.parent.y = this.#cameraY + } + } +} diff --git a/src/lib/game/types.ts b/src/lib/game/types.ts index a4940cfa..f590ec22 100644 --- a/src/lib/game/types.ts +++ b/src/lib/game/types.ts @@ -22,6 +22,26 @@ import type { import type { GameActionService } from '$lib/game/services/action/interface' import type { GameQuestService } from '$lib/game/services/quest/interface' +export interface UnitsOnStream extends Container { + id: string + profileJWT?: string + options: GameOptions + children: GameObject[] + tick: number + scene: GameScene + group: IGameGroup + activePlayers: GameObjectPlayer[] + eventService: GameEventService + playerService: GamePlayerService + serverService: GameServerService + play: () => void + checkIfThisFlagIsTarget: (id: string) => boolean + findObject: (id: string) => GameObject | undefined + removeObject: (obj: GameObject) => void + rebuildScene: () => void + handleMessage: ({ playerId, text }: { playerId: string, text: string }) => Promise +} + export interface Game extends Container { id: string profileJWT?: string diff --git a/src/lib/styles/styles.css b/src/lib/styles/styles.css index 6527c9c1..4b139844 100644 --- a/src/lib/styles/styles.css +++ b/src/lib/styles/styles.css @@ -1,8 +1,13 @@ @import url('https://fonts.googleapis.com/css2?family=Noto+Serif:ital,wdth,wght@0,62.5..100,100..900;1,62.5..100,100..900&display=swap'); +@import '@radix-ui/colors/bronze.css'; +@import '@radix-ui/colors/brown.css'; +@import '@radix-ui/colors/gray.css'; +@import '@radix-ui/colors/green.css'; +@import '@radix-ui/colors/orange.css'; +@import '@radix-ui/colors/violet.css'; + :root { - --color-accent-1: #30A46C; - --color-text: #331E0B; --color-twitch: #8E4EC6; --color-background: #FFF7ED; --color-background-2: #F6EEE7; @@ -10,7 +15,7 @@ --color-border-2: #E1DCCF; --color-bg-accent-1: #56468B; --color-bg-accent-2: #6F5F58; - --color-common: #BBBBBB; + --color-common: var(--gray-9); --color-uncommon: #33B074; --color-rare: #0090FF; --color-epic: #7D66D9; @@ -22,14 +27,15 @@ html { font-size: 16px; } -html, body { +html, +body { font-family: "Noto Serif", "Times New Roman", "Georgia", serif; font-optical-sizing: auto; font-weight: 500; font-style: normal; font-variation-settings: "wdth" 100; - background-color: var(--color-background); - color: var(--color-text); + background-color: var(--orange-2); + color: var(--bronze-12); } body { @@ -60,7 +66,7 @@ p { } a { - color: var(--color-accent-1); + color: var(--green-9); text-decoration: none; } @@ -84,7 +90,6 @@ pre { box-shadow: 2px 2px 6px rgb(255 255 255 / 25%); padding: 0.5em; overflow-x: auto; - color: var(--color-text); } input, @@ -93,7 +98,9 @@ button { font-family: inherit; } -button, input[type="submit"], input[type="reset"] { +button, +input[type="submit"], +input[type="reset"] { background: none; color: inherit; border: none; @@ -139,19 +146,20 @@ button:focus:not(:focus-visible) { bottom: -0.25em; transform: translateY(100%); padding: 0.5em; - background-color: var(--color-background-2); + background-color: var(--brown-3); z-index: 5; - } +} - .dropdown-menu a { +.dropdown-menu a { color: inherit; text-decoration: none; - } +} - .dropdown-menu button { +.dropdown-menu button { text-align: left; - } +} - .dropdown-menu button:hover, .dropdown-menu a:hover { - color: var(--color-accent-1); - } +.dropdown-menu button:hover, +.dropdown-menu a:hover { + color: var(--green-9); +} \ No newline at end of file diff --git a/src/routes/[lang]/(game)/play/GamePollProgress.svelte b/src/routes/[lang]/(game)/play/GamePollProgress.svelte index b3d69785..f7b17952 100644 --- a/src/routes/[lang]/(game)/play/GamePollProgress.svelte +++ b/src/routes/[lang]/(game)/play/GamePollProgress.svelte @@ -65,7 +65,7 @@ width: 100%; height: 100%; display: none; - background-color: var(--color-accent-1); + background-color: var(--green-9); } .votes { diff --git a/src/routes/[lang]/(game)/play/GameRouteInfo.svelte b/src/routes/[lang]/(game)/play/GameRouteInfo.svelte index 97cb90bd..7e7f6368 100644 --- a/src/routes/[lang]/(game)/play/GameRouteInfo.svelte +++ b/src/routes/[lang]/(game)/play/GameRouteInfo.svelte @@ -61,7 +61,7 @@ .progress-bar { z-index: 10; height: 1.5em; - background-color: var(--color-accent-1); + background-color: var(--green-9); border-radius: 1em; } diff --git a/src/routes/[lang]/(game)/stream/+layout.svelte b/src/routes/[lang]/(game)/stream/+layout.svelte new file mode 100644 index 00000000..e59ac339 --- /dev/null +++ b/src/routes/[lang]/(game)/stream/+layout.svelte @@ -0,0 +1,17 @@ + + +
+ +
+ + diff --git a/src/routes/[lang]/(game)/stream/+page.svelte b/src/routes/[lang]/(game)/stream/+page.svelte new file mode 100644 index 00000000..8bbeb1de --- /dev/null +++ b/src/routes/[lang]/(game)/stream/+page.svelte @@ -0,0 +1,45 @@ + + +
+
+
+ + diff --git a/src/routes/[lang]/(website)/character/+page.svelte b/src/routes/[lang]/(website)/character/+page.svelte index 66645203..f748d141 100644 --- a/src/routes/[lang]/(website)/character/+page.svelte +++ b/src/routes/[lang]/(website)/character/+page.svelte @@ -1,5 +1,6 @@ @@ -8,6 +9,18 @@

Игровые персонажи

Игроки сами создают и "прокачивают" персонажей. Можно "арендовать" на неделю, получить доступ к странице, создавать посты и делать активности.

+ +
+
+ +
+

{$page.data.profileData.coins}

+

Монет

+
+
+ + Создать нового [в разработке] +
@@ -87,4 +100,59 @@ .block .info p { font-weight: 500; } + + .currency-block { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + align-items: center; + justify-content: space-between; + gap: 0.5em; + margin-top: 2em; + background-color: var(--bronze-3); + border: 2px solid var(--bronze-5); + padding: 1em; + + & .currency { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + align-items: center; + justify-content: center; + gap: 0.75em; + + & .right { + display: flex; + flex-direction: column; + flex-wrap: nowrap; + align-items: flex-start; + justify-content: center; + + & .counter { + font-size: 1.5rem; + font-weight: 600; + line-height: 1.2; + color: var(--green-10); + } + + & .description { + font-size: 0.9rem; + } + } + } + + & a { + padding: 0.5em 1em; + border: 2px solid var(--brown-7); + background-color: var(--violet-10); + color: var(--brown-3); + font-weight: 600; + transition: all 0.2s; + + &:hover { + opacity: 0.9; + text-decoration: none; + } + } + } diff --git a/src/routes/[lang]/(website)/character/[id]/+page.svelte b/src/routes/[lang]/(website)/character/[id]/+page.svelte index a3c4efdb..844fcba1 100644 --- a/src/routes/[lang]/(website)/character/[id]/+page.svelte +++ b/src/routes/[lang]/(website)/character/[id]/+page.svelte @@ -7,8 +7,8 @@
-

{data.character.name}

-

Игровой персонаж, созданный valentina8177

+

"{data.character.nickname}" {data.character.name}

+

Игровой персонаж, созданный {data.character.profile.userName}

Сейчас под управлением hmbanan666
@@ -21,7 +21,7 @@
-

Малый

+

Обычный

Уровень проработанности

diff --git a/src/routes/[lang]/(website)/character/new/+page.svelte b/src/routes/[lang]/(website)/character/new/+page.svelte new file mode 100644 index 00000000..1c4b873f --- /dev/null +++ b/src/routes/[lang]/(website)/character/new/+page.svelte @@ -0,0 +1,180 @@ + + +
+

Создание нового персонажа

+

Не торопись. Заполни все поля и ознакомься с правилами.

+
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+ + +
+
+ +
+

Правила публикации контента

+ +

1. Контент не должен содержать оскорбительных или дискриминационных элементов.

+

2. Избегайте копирования других игровых персонажей.

+

3. Не включайте политические темы, религиозные убеждения или социальные комментарии.

+
+ + diff --git a/src/routes/[lang]/(website)/coupon/+page.svelte b/src/routes/[lang]/(website)/coupon/+page.svelte index 6ccb8932..469ff82f 100644 --- a/src/routes/[lang]/(website)/coupon/+page.svelte +++ b/src/routes/[lang]/(website)/coupon/+page.svelte @@ -1,7 +1,7 @@

{data.trophy.name}

-

Трофей, созданный hmbanan666

+

+ Трофей, созданный hmbanan666 +

@@ -56,101 +58,101 @@
diff --git a/src/routes/[lang]/+layout.server.ts b/src/routes/[lang]/+layout.server.ts index b37d0943..f86fdb02 100644 --- a/src/routes/[lang]/+layout.server.ts +++ b/src/routes/[lang]/+layout.server.ts @@ -1,5 +1,6 @@ import { redirect } from '@sveltejs/kit' import { dictionary, supportedLocales } from '$lib/translations' +import { api } from '$lib/server/api' export async function load({ locals, params }) { const locale = locals.locale @@ -8,8 +9,19 @@ export async function load({ locals, params }) { redirect(301, `/${locale}`) } + let profileData = null + if (locals.profile?.userName) { + const profile = await api.profile.getByUserName(locals.profile.userName) + if (!profile || profile instanceof Error) { + profileData = null + } else { + profileData = profile + } + } + return { locale, t: dictionary(locale), + profileData, } } diff --git a/yarn.lock b/yarn.lock index 8bf10775..43dc3b54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -528,10 +528,10 @@ resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== -"@hmbanan666/chat-game-api@^0.1.15": - version "0.1.15" - resolved "https://registry.yarnpkg.com/@hmbanan666/chat-game-api/-/chat-game-api-0.1.15.tgz#4ca76ac95aa9e96554eef238de191bc02b13e742" - integrity sha512-NEehogrHYFrf2U/V+b8L7dRDXvhHZRoNdKUj2C4JHk1/EZjQEO3cD2+nVZGnQbvbi+VKP+4A2ofg2EsgihH4qg== +"@hmbanan666/chat-game-api@^0.1.17": + version "0.1.17" + resolved "https://registry.yarnpkg.com/@hmbanan666/chat-game-api/-/chat-game-api-0.1.17.tgz#84963bc8d64f287e539fce9e077b809f234ef8fc" + integrity sha512-kfhRAqQ2V4nKWyuc2jndTd5ZC/9HpLynr3gE4KJHfGF5UUz0HkR6erqbYQfBpN3M/pH/QRFiLah8bkeBBUzifg== "@humanwhocodes/module-importer@^1.0.1": version "1.0.1"