From 7665b2d1597db63139e80669a17b029f5c5728de Mon Sep 17 00:00:00 2001 From: P-Bouffier Date: Fri, 5 Apr 2024 16:14:14 -0400 Subject: [PATCH 1/5] Fixing homepage widget position --- .../Pages/Users/UserProfile/store/ProfileItemsStore.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/js/components/Pages/Users/UserProfile/store/ProfileItemsStore.js b/resources/js/components/Pages/Users/UserProfile/store/ProfileItemsStore.js index 60103e94..9708ee68 100644 --- a/resources/js/components/Pages/Users/UserProfile/store/ProfileItemsStore.js +++ b/resources/js/components/Pages/Users/UserProfile/store/ProfileItemsStore.js @@ -276,9 +276,9 @@ document.addEventListener('alpine:init', () => { return { id: item.id, - x: item.x, - y: item.y, - z: item.z, + x: parseInt(item.x), + y: parseInt(item.y), + z: parseInt(item.z), is_reversed: item.is_reversed, theme: item.theme, placed: !this.removedItemIds.includes(item.id), From 9ff7bfa16d9ba873678594b7825bb47cb8b84fe7 Mon Sep 17 00:00:00 2001 From: P-Bouffier Date: Fri, 5 Apr 2024 19:54:08 -0400 Subject: [PATCH 2/5] Fixing ducket currency in leaderboard --- app/Enums/CurrencyType.php | 2 +- app/Http/Controllers/RankingController.php | 2 +- resources/scss/partials/icons/big.scss | 5 +++++ resources/views/pages/community/rankings/index.blade.php | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Enums/CurrencyType.php b/app/Enums/CurrencyType.php index 896de6e6..94349efd 100644 --- a/app/Enums/CurrencyType.php +++ b/app/Enums/CurrencyType.php @@ -5,7 +5,7 @@ enum CurrencyType: int { case Credits = -1; - case Duckets = 0; + case Duckets = 0; // Duckets & Pixels are the same case Diamonds = 5; case Points = 101; diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php index c338399d..5d7548e0 100644 --- a/app/Http/Controllers/RankingController.php +++ b/app/Http/Controllers/RankingController.php @@ -26,7 +26,7 @@ public function __invoke(Request $request): View return [ 'diamonds' => UserCurrency::getRankingFor(CurrencyType::Diamonds, $staffIds)->get(), 'respects' => UserSetting::getRanking('respects_received', $staffIds)->get(), - 'pixels' => UserCurrency::getRankingFor(CurrencyType::Duckets, $staffIds)->get(), + 'duckets' => UserCurrency::getRankingFor(CurrencyType::Duckets, $staffIds)->get(), 'coins' => User::getCreditsRanking()->get(), 'points' => UserCurrency::getRankingFor(CurrencyType::Points, $staffIds)->get(), 'online-time' => UserSetting::getRanking('online_time', $staffIds)->get() diff --git a/resources/scss/partials/icons/big.scss b/resources/scss/partials/icons/big.scss index d2d332e5..769770d5 100644 --- a/resources/scss/partials/icons/big.scss +++ b/resources/scss/partials/icons/big.scss @@ -35,7 +35,12 @@ i.icon { background-image: url('https://i.imgur.com/ckw1yDf.png'); } + &.pixels { + background-image: url('https://i.imgur.com/uGY9pbm.png'); + } + + &.duckets { background-image: url('https://i.imgur.com/TjKAB3L.png'); } diff --git a/resources/views/pages/community/rankings/index.blade.php b/resources/views/pages/community/rankings/index.blade.php index 60aa2511..5c4c0bdb 100644 --- a/resources/views/pages/community/rankings/index.blade.php +++ b/resources/views/pages/community/rankings/index.blade.php @@ -4,6 +4,7 @@ 'diamonds' => __('Top Diamonds'), 'respects' => __('Top Respects'), 'coins' => __('Top Credits'), + 'duckets' => __('Top Duckets'), 'pixels' => __('Top Pixels'), 'points' => __('Top Points'), 'online-time' => __('Top Online Time') @@ -13,6 +14,7 @@ 'diamonds' => __('The richest users in diamonds'), 'respects' => __('The richest users in respects'), 'coins' => __('The richest users in coins'), + 'duckets' => __('The richest users in duckets'), 'pixels' => __('The richest users in pixels'), 'points' => __('The richest users in points'), 'online-time' => __('Users who play the most') From e9941d4a54a0110a39b852c8467446ff5ca5b535 Mon Sep 17 00:00:00 2001 From: P-Bouffier Date: Fri, 5 Apr 2024 19:58:08 -0400 Subject: [PATCH 3/5] Fixing the php dependencies (version & extensions) --- composer.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 31a33782..0351bb1c 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,15 @@ "keywords": ["framework", "laravel"], "license": "MIT", "require": { - "php": "^8.1", + "php": "^8.2", + "ext-intl": "*", + "ext-gd": "*", + "ext-zip": "*", + "ext-sodium": "*", + "ext-sodium": "*", + "ext-mysqli": "*", + "ext-pdo": "*", + "ext-pdo_mysql": "*", "bezhansalleh/filament-language-switch": "^3.0", "coderflex/filament-turnstile": "^2.0", "cyrildewit/eloquent-viewable": "^7.0", From e48e5da1dcd6e1ae35174d511ed47fb3565e7cb5 Mon Sep 17 00:00:00 2001 From: P-Bouffier Date: Sat, 6 Apr 2024 11:50:11 -0400 Subject: [PATCH 4/5] Fixing default value. Change to .com because of broken figure --- database/seeders/CmsSettingsSeeder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/seeders/CmsSettingsSeeder.php b/database/seeders/CmsSettingsSeeder.php index 5f9a7398..403905b7 100644 --- a/database/seeders/CmsSettingsSeeder.php +++ b/database/seeders/CmsSettingsSeeder.php @@ -53,7 +53,7 @@ public function getDefaultSettings(): array ], [ 'figure_imager', - 'https://www.habbo.com.br/habbo-imaging/avatarimage?figure=', + 'https://www.habbo.com/habbo-imaging/avatarimage?figure=', 'The imager base URL to render the user look on the CMS (by figure)' ], [ @@ -238,7 +238,7 @@ public function getDefaultSettings(): array ], [ 'using_nitro_imager', - '1', + '0', 'Determines if the hotel is using the Nitro imager' ], [ From 3eb858dcf9142ca80e1df4955823748fe6db6d26 Mon Sep 17 00:00:00 2001 From: P-Bouffier Date: Sat, 6 Apr 2024 11:50:45 -0400 Subject: [PATCH 5/5] Fixing all figures positions with nitro imager --- resources/views/components/ui/story-modal.blade.php | 2 +- .../pages/articles/fragments/article-reactions.blade.php | 4 ++-- resources/views/pages/community/photos/index.blade.php | 2 +- .../pages/community/rankings/_partials/ranking-box.blade.php | 2 +- .../views/pages/users/fragments/user/online-friends.blade.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/components/ui/story-modal.blade.php b/resources/views/components/ui/story-modal.blade.php index 4c6b88d2..27ed048c 100644 --- a/resources/views/components/ui/story-modal.blade.php +++ b/resources/views/components/ui/story-modal.blade.php @@ -19,7 +19,7 @@ class="w-16 h-16 bg-center bg-no-repeat bg-cover relative rounded-full bg-slate- @class([ "w-full h-full bg-no-repeat", "bg-center" => !$usingNitroImager, - "bg-[-15px_-20px]" => $usingNitroImager + "bg-[-2px_-10px]" => $usingNitroImager ]) x-bind:style="{ backgroundImage: `url({{ getSetting('figure_imager') }}${getActiveFriendLook()}&headonly=1&head_direction=2&size=m)` }" > diff --git a/resources/views/pages/articles/fragments/article-reactions.blade.php b/resources/views/pages/articles/fragments/article-reactions.blade.php index eb27412d..bd4e362d 100644 --- a/resources/views/pages/articles/fragments/article-reactions.blade.php +++ b/resources/views/pages/articles/fragments/article-reactions.blade.php @@ -35,9 +35,9 @@ class="w-8 h-8 rounded-md border-none shadow-[inset_0_-3px_0_0_rgba(0,0,0,0.5)] data-tippy-singleton data-tippy-content="{{ $reaction->user->username }}" @class([ - "w-12 h-12 group shadow-lg relative rounded-lg bg-center bg-no-repeat border-b-2 cursor-pointer even:bg-blue-300 dark:even:bg-blue-600 bg-blue-400 dark:bg-blue-400 dark:text-white border-blue-500", + "w-12 h-12 group shadow-lg relative rounded-lg bg-no-repeat border-b-2 cursor-pointer even:bg-blue-300 dark:even:bg-blue-600 bg-blue-400 dark:bg-blue-400 dark:text-white border-blue-500", "bg-center" => !$usingNitroImager, - "bg-[-20px_-27px]" => $usingNitroImager + "bg-[-8px_-18px]" => $usingNitroImager ]) style="background-image: url('{{ getFigureUrl($reaction->user->look, 'head_direction=2&size=m&gesture=sml&headonly=1') }}')" > diff --git a/resources/views/pages/community/photos/index.blade.php b/resources/views/pages/community/photos/index.blade.php index 9cacf02e..d46c3184 100644 --- a/resources/views/pages/community/photos/index.blade.php +++ b/resources/views/pages/community/photos/index.blade.php @@ -104,7 +104,7 @@ class="bg-center border border-slate-300 dark:border-slate-700 hover:scale-[1.05 @class([ "w-[50px] min-w-[50px] h-[50px] bg-no-repeat rounded-full bg-white border border-gray-200 dark:bg-gray-950 dark:border-black", "bg-center" => !$usingNitroImager, - "bg-[-20px_-27px]" => $usingNitroImager + "bg-[-8px_-14px]" => $usingNitroImager ]) @if($photo->user) style="background-image: url('{{ getFigureUrl($photo->user->look, 'direction=2&head_direction=2&size=m&gesture=sml&headonly=1') }}')" diff --git a/resources/views/pages/community/rankings/_partials/ranking-box.blade.php b/resources/views/pages/community/rankings/_partials/ranking-box.blade.php index 926655a7..d686fee1 100644 --- a/resources/views/pages/community/rankings/_partials/ranking-box.blade.php +++ b/resources/views/pages/community/rankings/_partials/ranking-box.blade.php @@ -29,7 +29,7 @@ @class([ "w-[54px] h-14 bg-no-repeat", "bg-center" => !$usingNitroImager, - "bg-[-18px_-25px]" => $usingNitroImager + "bg-[center_-10px]" => $usingNitroImager ]) style="background-image: url('{{ $getUser($ranking)->figure_path }}&direction=3&head_direction=2&size=m&headonly=1')" > diff --git a/resources/views/pages/users/fragments/user/online-friends.blade.php b/resources/views/pages/users/fragments/user/online-friends.blade.php index 396450ef..178fa9a9 100644 --- a/resources/views/pages/users/fragments/user/online-friends.blade.php +++ b/resources/views/pages/users/fragments/user/online-friends.blade.php @@ -17,7 +17,7 @@ class="w-14 hover:bg-gray-100 dark:hover:bg-slate-700 h-14 relative shrink-0 rou
!$usingNitroImager, - "bg-[-20px_-27px]" => $usingNitroImager + "bg-[-8px_-14px]" => $usingNitroImager ]) style="background-image: url('{{ getFigureUrl($onlineFriend->look, 'head_direction=3&gesture=sml&headonly=1') }}')">
{{ $onlineFriend->username }}