Voeg Gitea workflows toe

- Replace 'as any' with proper CurrencyDb type in send-currency test
- Fix noTemplateCurlyInString warnings in deploy-workflow-contract test

.env.example

@@ -47,12 +47,6 @@ RCON_PORT=3001
 # Falls back to NEXT_PUBLIC_APP_URL/imaging when only the app URL is set.
 # NEXT_PUBLIC_IMAGER_URL=https://epicnabbo.nl/imaging
 
-# Optional OAuth (enabled when both id+secret are set)
-DISCORD_CLIENT_ID=
-DISCORD_CLIENT_SECRET=
-GOOGLE_CLIENT_ID=
-GOOGLE_CLIENT_SECRET=
-
 # Preferred email provider (HTTP API). Used before SMTP when set.
 RESEND_API_KEY=
 

.gitea/workflows/ci.yaml

@@ -30,6 +30,9 @@ jobs:
           git checkout -f "${REF}"
 
           export SKIP_ENV_VALIDATION=1
+          export ARGON2_MEMORY_SIZE=1024
+          export ARGON2_ITERATIONS=1
+          export BCRYPT_ROUNDS=4
           pnpm install --frozen-lockfile
           pnpm prisma:generate
           pnpm biome:lint

.gitea/workflows/deploy.yaml

@@ -241,6 +241,7 @@ jobs:
           CUTOVER_STARTED=0
 
           error_handler() {
+            cd /var/www/atom-nexst 2>/dev/null || cd / || true
             echo "!!! DEPLOYMENT FAILED on line $1 !!!" >&2
             # Roll back the build artifact if cutover already moved .next into place.
             if [ "${CUTOVER_STARTED}" = "1" ] && [ -d "${LIVE}/.next.prev" ]; then
@@ -251,7 +252,7 @@ jobs:
             if [ -n "${STAGE}" ] && [ -d "${STAGE}" ]; then
               git -C "${LIVE}" worktree remove --force "${STAGE}" 2>/dev/null || rm -rf "${STAGE}" || true
             fi
-            sudo systemctl start atom-nexst.service || true
+            pm2 restart next --update-env 2>/dev/null || pm2 start pnpm --name "next" -- start 2>/dev/null || true
             exit 1
           }
           trap 'error_handler $LINENO' ERR
@@ -260,7 +261,7 @@ jobs:
 
           DEPLOY_USER="$(id -un)"
           DEPLOY_GROUP="$(id -gn)"
-          sudo chown -R "${DEPLOY_USER}:${DEPLOY_GROUP}" "${LIVE}"
+          sudo chown -R "${DEPLOY_USER}:${DEPLOY_GROUP}" "${LIVE}" 2>/dev/null || true
           git config --global --add safe.directory "${LIVE}"
           git -C "${LIVE}" remote set-url origin /docker/gitea/gitea/git/repositories/remco/epicnext-cms.git/
 
@@ -298,6 +299,13 @@ jobs:
           find . -maxdepth 3 -name '*.tsbuildinfo' -delete 2>/dev/null || true
           rm -rf .output dist .next .next/types .next/dev
 
+          # Restore build cache from last deploy so Turbopack can do
+          # incremental compilation (much faster rebuilds).
+          if [ -d "${LIVE}/.next/cache" ]; then
+            mkdir -p .next/cache
+            cp -r "${LIVE}/.next/cache/." .next/cache/
+          fi
+
           # Stage shares MySQL with the live app + emulator. Keep the stage pool
           # tiny so install/test/build cannot exhaust max_connections.
           export DATABASE_POOL_SIZE="${DEPLOY_DATABASE_POOL_SIZE:-5}"
@@ -306,6 +314,7 @@ jobs:
           pnpm install --frozen-lockfile
           # prisma generate does not need a live DB connection.
           pnpm prisma:generate
+          export ARGON2_MEMORY_SIZE=1024 ARGON2_ITERATIONS=1 BCRYPT_ROUNDS=4
           pnpm typecheck
           pnpm test
           # Validate production env (AUTH_SECRET, DATABASE_URL, …) during build.
@@ -319,22 +328,21 @@ jobs:
 
           echo "Cutover: stop service (free DB connections), migrate, swap .next..."
           CUTOVER_STARTED=1
-          sudo systemctl stop atom-nexst.service || true
-          pkill -f 'next-server' || true
-          # Give MariaDB a moment to reclaim the live pool.
-          sleep 2
+          pm2 stop next --kill-timeout 10000 || true
+          # Wait for PM2 to fully exit and MariaDB to reclaim connections.
+          sleep 10
 
           # Migrate only after live is stopped — avoids ER_CON_COUNT_ERROR while
           # the old process still holds DATABASE_POOL_SIZE connections.
           cd "${STAGE}"
           MIGRATE_OK=0
-          for i in 1 2 3 4 5; do
+          for i in $(seq 1 10); do
             if pnpm db:migrate; then
               MIGRATE_OK=1
               break
             fi
-            echo "migrate attempt ${i}/5 failed (likely DB connections), retrying..."
-            sleep 3
+            echo "migrate attempt ${i}/10 failed (likely DB connections), retrying..."
+            sleep 5
           done
           if [ "${MIGRATE_OK}" != "1" ]; then
             echo "ERROR: db:migrate failed after retries" >&2
@@ -356,8 +364,7 @@ jobs:
           fi
           echo "Verified live src/ matches HEAD"
 
-          # Atomic-ish artifact swap: keep previous .next until the new one is in place.
-          rm -rf .next.prev
+          # Save current .next as backup before swapping (kept until health check passes).
           if [ -d .next ]; then
             mv .next .next.prev
           fi
@@ -370,14 +377,15 @@ jobs:
           # Prisma client is gitignored — regenerate into live src/generated.
           pnpm prisma:generate
 
-          sudo chown -R www-data:www-data "${LIVE}"
+          sudo chown -R www-data:www-data "${LIVE}" 2>/dev/null || true
 
-          echo "Starting systemd service..."
-          sudo systemctl start atom-nexst.service
+          echo "Starting PM2 (zero-downtime reload)..."
+          pm2 reload next --update-env || pm2 start next --update-env
 
-          sleep 2
-          if ! systemctl is-active --quiet atom-nexst.service; then
-            echo "ERROR: atom-nexst.service failed to start!" >&2
+          sleep 3
+          if ! pm2 show next 2>/dev/null | grep -q 'online'; then
+            echo "ERROR: PM2 next failed to start!" >&2
+            pm2 logs next --lines 20 --nostream >&2 || true
             exit 1
           fi
 
@@ -397,11 +405,11 @@ jobs:
           if [ "${HEALTH_OK}" != "1" ]; then
             echo "ERROR: Health check failed after deploy (${HEALTH_URL})" >&2
             echo "Last body: ${BODY:-<empty>}" >&2
-            journalctl -u atom-nexst.service -n 40 --no-pager >&2 || true
+            pm2 logs next --lines 40 --nostream >&2 || true
             exit 1
           fi
 
-          echo "Cleaning stage worktree and previous .next..."
+          echo "Cleaning stage worktree and previous .next backup..."
           rm -rf "${LIVE}/.next.prev"
           git -C "${LIVE}" worktree remove --force "${STAGE}" 2>/dev/null || rm -rf "${STAGE}" || true
           STAGE=""

.gitea/workflows/renovate.yaml

@@ -0,0 +1,28 @@
+name: Renovate
+on:
+  schedule:
+    - cron: "0 5 * * *" # Every day at 05:00 UTC
+  workflow_dispatch: # Manual trigger
+
+jobs:
+  renovate:
+    runs-on: shell
+    steps:
+      - name: Self-hosted Renovate
+        run: |
+          set -e
+          
+          # Zorg ervoor dat de cache-map lokaal bestaat vóór Docker start
+          # Dit voorkomt dat Docker de map automatisch als 'root' aanmaakt
+          mkdir -p /var/tmp/renovate-cache
+
+          docker run --rm \
+            --user "$(id -u):$(id -g)" \
+            -e RENOVATE_TOKEN="${{ secrets.RENOVATE_TOKEN }}" \
+            -e RENOVATE_AUTODISCOVER=false \
+            -e RENOVATE_REPOSITORIES="${{ gitea.repository }}" \
+            -e RENOVATE_ONBOARDING=false \
+            -e RENOVATE_CONFIG_FILE='{"extends":["config:recommended"]}' \
+            -e LOG_LEVEL=info \
+            -v /var/tmp/renovate-cache:/tmp/renovate-cache \
+            ghcr.io/renovatebot/renovate:latest

.gitignore

@@ -1,6 +1,7 @@
 node_modules/
 .turbo/
 .next/
+.next.prev/
 next-env.d.ts
 .env
 *.tsbuildinfo
@@ -23,3 +24,6 @@ gitea
 
 # Runtime uploaded media (persistent, outside public/)
 storage/
+
+# Test coverage reports
+coverage/

.nvmrc

@@ -0,0 +1 @@
+22

.prettierrc

@@ -1,9 +0,0 @@
-{
-  "semi": true,
-  "singleQuote": false,
-  "tabWidth": 2,
-  "trailingComma": "all",
-  "printWidth": 110,
-  "arrowParens": "always",
-  "endOfLine": "lf"
-}

LICENSE

@@ -0,0 +1,438 @@
+Attribution-NonCommercial-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information provided on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+    wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public:
+    wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
+Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-NonCommercial-ShareAlike 4.0 International Public License
+("Public License"). To the extent this Public License may be
+interpreted as a contract, You are granted the Licensed Rights in
+consideration of Your acceptance of these terms and conditions, and the
+Licensor grants You such rights in consideration of benefits the
+Licensor receives from making the Licensed Material available under
+these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-NC-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution, NonCommercial, and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. NonCommercial means not primarily intended for or directed towards
+     commercial advantage or monetary compensation. For purposes of
+     this Public License, the exchange of the Licensed Material for
+     other material subject to Copyright and Similar Rights by digital
+     file-sharing or similar means is NonCommercial provided there is
+     no payment of monetary compensation in connection with the
+     exchange.
+
+  l. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  m. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  n. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part, for NonCommercial purposes only; and
+
+            b. produce, reproduce, and Share Adapted Material for
+               NonCommercial purposes only.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties, including when
+          the Licensed Material is used other than for NonCommercial
+          purposes.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-NC-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database for NonCommercial purposes
+     only;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     FULLY ALLOWED IN PART OR IN WHOLE, THIS DISCLAIMER MAY NOT APPLY
+     TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT FULLY ALLOWED IN
+     PART OR IN WHOLE, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the "Licensor." The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including
+without limitation in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.

README.md

@@ -1,8 +1,8 @@
-# EpicNext-CMS
+# EpicNext-CMS v1.0.1
 
 A modern, high-performance content management system for Habbo hotel emulators, built on **Next.js 16** (App Router) with **Prisma 7** and **React 19**. Designed to integrate seamlessly with Polaris / Arcturus Morningstar MySQL/MariaDB databases.
 
-Features a full public-facing website, an administrative panel, NextAuth authentication (argon2id/bcrypt with MD5-to-argon2id upgrade), real-time RCON communication with the emulator, Server-Sent Events for live radio data, smooth page transitions, and extensive extensibility.
+Features a premium animated homepage (typewriter hero, floating orbs, scroll counters), a full admin panel, NextAuth authentication (argon2id/bcrypt with MD5-to-argon2id upgrade), real-time RCON communication, Server-Sent Events for live radio data, smooth page transitions, and PM2 production deployment.
 
 ---
 
@@ -98,6 +98,27 @@ Open `http://localhost:3000` in your browser.
 
 ---
 
+## Production Deployment (PM2)
+
+```bash
+pnpm build
+pm2 start pnpm --name "next" -- start
+pm2 save
+```
+
+Restart after updates:
+
+```bash
+git pull
+pnpm install
+pnpm build
+pm2 restart next
+```
+
+The CMS runs behind an nginx reverse proxy on the default port 3000. Static assets (media uploads) are persisted via `/api/media/*` and survive rebuilds.
+
+---
+
 ## Scripts
 
 | Command                | Description                                        |
@@ -125,13 +146,14 @@ Open `http://localhost:3000` in your browser.
 | **Server-Sent Events**         | Real-time radio now-playing & listeners via SSE (no polling)   |
 | **Redis Caching**              | Caches API responses (home, radio config) up to 30s in Redis   |
 | **Bundle Analyzer**            | Run `pnpm analyze` to visualize and optimize bundle sizes      |
-| **AnimatePresence**            | Framer Motion exit animations on modals, dialogs, and lightbox |
 | **RCON (TCP Socket)**          | Live commands to the emulator (credits, badges, kick, ban)     |
 | **Streaming & Suspense**       | Next.js App Router streaming for fast page loads               |
 | **Automatic Image Optimization** | `next/image` with Sharp for resizing and WebP/AVIF          |
-| **CSS-based Animations**       | Base UI components use `data-open`/`data-closed` CSS animations |
+| **CSS-based Animations**       | `input-glow`, `btn-shine`, `Reveal` scroll animations, floating orbs |
 | **Compression**                | Gzip compression enabled on all responses                      |
 | **Stale Times**                | Optimized router cache (30s dynamic, 180s static)              |
+| **PWA**                        | Service worker with skip-waiting, stale CSS chunk recovery     |
+| **Biome**                      | Fast linting and formatting (replaces ESLint + Prettier)       |
 
 ---
 
@@ -158,7 +180,7 @@ Open `http://localhost:3000` in your browser.
 │   │   ├── cache.ts           # In-memory cache fallback
 │   │   ├── motion.ts          # Framer Motion animation variants
 │   │   └── use-event-source.ts # React hook for SSE subscriptions
-│   ├── messages/              # i18n translations (en, nl, de, fr, es, it)
+│   ├── messages/              # i18n translations (en, nl, de, fr, es, it, pt, da, no, sv)
 │   └── env.ts                 # Zod-validated environment schema
 ├── public/
 │   ├── assets/                # Images, icons, fonts
@@ -228,7 +250,7 @@ Optional OpenAI-powered moderation for comments and guestbook posts. Set `OPENAI
 ```bash
 pnpm dev          # Start with hot reload
 pnpm typecheck    # Type check all files
-pnpm test         # Run test suite (312+ tests)
+pnpm test         # Run test suite
 pnpm analyze      # Build and analyze bundle sizes
 pnpm biome:check  # Lint and format
 ```

biome.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.5.5/schema.json",
+	"$schema": "https://biomejs.dev",
 	"vcs": {
 		"enabled": true,
 		"clientKind": "git",
@@ -7,7 +7,7 @@
 	},
 	"files": {
 		"ignoreUnknown": false,
-		"includes": ["**", "!setup", "!public"]
+		"includes": ["**", "!setup", "!*.cjs", "!coverage"]
 	},
 	"formatter": {
 		"enabled": true,
@@ -23,9 +23,6 @@
 			"performance": {
 				"noImgElement": "off"
 			},
-			"a11y": {
-				"noLabelWithoutControl": "off"
-			},
 			"style": {
 				"noDescendingSpecificity": "off"
 			}

e2e/admin.spec.ts

@@ -0,0 +1,14 @@
+import { expect, test } from "@playwright/test";
+
+test.describe("Admin panel", () => {
+	test("admin login page redirects unauthenticated users", async ({ page }) => {
+		await page.goto("/admin");
+		await expect(page).toHaveURL(/login/);
+	});
+
+	test("admin page has login form", async ({ page }) => {
+		await page.goto("/admin");
+		await expect(page.locator('input[name="username"]')).toBeVisible();
+		await expect(page.locator('input[name="password"]')).toBeVisible();
+	});
+});

e2e/auth.spec.ts

@@ -0,0 +1,32 @@
+import { expect, test } from "@playwright/test";
+
+test.describe("Authentication flows", () => {
+	test("login form validates required fields", async ({ page }) => {
+		await page.goto("/login");
+		await page.click('button[type="submit"]');
+		await expect(page.locator("text=required")).toBeVisible({ timeout: 5000 });
+	});
+
+	test("login with invalid credentials shows error", async ({ page }) => {
+		await page.goto("/login");
+		await page.fill('input[name="username"]', "nonexistent");
+		await page.fill('input[name="password"]', "wrongpassword");
+		await page.click('button[type="submit"]');
+		await expect(page.locator("text=invalid")).toBeVisible({ timeout: 5000 });
+	});
+
+	test("register page has password confirmation field", async ({ page }) => {
+		await page.goto("/register");
+		await expect(page.locator('input[name="confirmPassword"]')).toBeVisible();
+	});
+
+	test("register form validates password match", async ({ page }) => {
+		await page.goto("/register");
+		await page.fill('input[name="password"]', "Password123!");
+		await page.fill('input[name="confirmPassword"]', "DifferentPass123!");
+		await page.click('button[type="submit"]');
+		await expect(page.locator("text=match|komen overeen|kloppen")).toBeVisible({
+			timeout: 5000,
+		});
+	});
+});

e2e/example.spec.ts

@@ -1,16 +1,16 @@
-import { test, expect } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 
 test("homepage has title", async ({ page }) => {
-  await page.goto("/");
-  await expect(page).toHaveTitle(/Magic Hotel|Atom/i);
+	await page.goto("/");
+	await expect(page).toHaveTitle(/Magic Hotel|Atom/i);
 });
 
 test("register page loads", async ({ page }) => {
-  await page.goto("/register");
-  await expect(page).toHaveTitle(/registreer|register|konto/i);
+	await page.goto("/register");
+	await expect(page).toHaveTitle(/registreer|register|konto/i);
 });
 
 test("login page loads", async ({ page }) => {
-  await page.goto("/login");
-  await expect(page).toHaveTitle(/inloggen|login/i);
+	await page.goto("/login");
+	await expect(page).toHaveTitle(/inloggen|login/i);
 });

e2e/navigation.spec.ts

@@ -0,0 +1,24 @@
+import { expect, test } from "@playwright/test";
+
+test.describe("Public navigation", () => {
+	test("homepage loads with expected elements", async ({ page }) => {
+		await page.goto("/");
+		await expect(page.locator("nav")).toBeVisible();
+		await expect(page.locator("footer")).toBeVisible();
+	});
+
+	test("community page loads", async ({ page }) => {
+		await page.goto("/community");
+		await expect(page).toHaveTitle(/community/i);
+	});
+
+	test("shop page loads", async ({ page }) => {
+		await page.goto("/shop");
+		await expect(page.locator("h1, h2").first()).toBeVisible();
+	});
+
+	test("404 page for unknown routes", async ({ page }) => {
+		const response = await page.goto("/this-page-does-not-exist");
+		expect(response?.status()).toBe(404);
+	});
+});

eslint.config.mjs

@@ -1,21 +1,47 @@
 import js from "@eslint/js";
+import nextPlugin from "@next/eslint-plugin-next";
+import reactHooks from "eslint-plugin-react-hooks";
+import security from "eslint-plugin-security";
 import unusedImports from "eslint-plugin-unused-imports";
 import tseslint from "typescript-eslint";
 
 export default tseslint.config(
-  {
-    ignores: ["node_modules", ".next", "dist", "build"],
-  },
-  js.configs.recommended,
-  tseslint.configs.recommended,
-  {
-    files: ["src/**/*.{ts,tsx}", "pages/**/*.{ts,tsx}", "app/**/*.{ts,tsx}"],
-    plugins: {
-      "unused-imports": unusedImports,
-    },
-    rules: {
-      "unused-imports/no-unused-vars": "error",
-      "no-console": "warn",
-    },
-  }
+	{
+		ignores: ["node_modules", ".next", "dist", "build"],
+	},
+	js.configs.recommended,
+	tseslint.configs.recommended,
+	{
+		files: ["src/**/*.{ts,tsx}", "pages/**/*.{ts,tsx}", "app/**/*.{ts,tsx}"],
+		plugins: {
+			"unused-imports": unusedImports,
+			security: security,
+			"react-hooks": reactHooks,
+			"@next/next": nextPlugin,
+		},
+		rules: {
+			// Laad automatisch alle aanbevolen beveiligings- en framework-regels in
+			...security.configs.recommended.rules,
+			...reactHooks.configs.recommended.rules,
+			...nextPlugin.configs.recommended.rules,
+
+			// Zorg dat variabelen die beginnen met een underscore (_req) genegeerd worden
+			"@typescript-eslint/no-unused-vars": [
+				"error",
+				{
+					argsIgnorePattern: "^_",
+					varsIgnorePattern: "^_",
+				},
+			],
+			"unused-imports/no-unused-vars": [
+				"error",
+				{
+					argsIgnorePattern: "^_",
+					varsIgnorePattern: "^_",
+				},
+			],
+
+			"no-console": "warn",
+		},
+	},
 );

knip.json

@@ -5,17 +5,15 @@
 		"src/app/**/layout.{ts,tsx}",
 		"src/app/**/route.{ts,tsx}",
 		"src/app/**/{error,not-found,loading,template,default,global-error}.{ts,tsx}",
-		"src/app/**/actions.{ts,tsx}",
-		"next.config.ts",
-		"src/proxy.ts",
-		"src/instrumentation.ts",
 		"sentry.{server,edge}.config.ts"
 	],
 	"project": ["src/**/*.{ts,tsx}"],
-	"ignore": [
-		"src/**/*.test.{ts,tsx}",
-		"scripts/**"
+	"ignoreDependencies": [
+		"tailwindcss-animate",
+		"@tailwindcss/forms",
+		"@tailwindcss/typography",
+		"pino-pretty",
+		"tailwindcss"
 	],
-	"ignoreDependencies": ["@types/*", "knip"],
-	"ignoreBinaries": ["corepack"]
+	"ignoreBinaries": ["sendmail"]
 }

next.config.ts

@@ -1,7 +1,7 @@
-import type { NextConfig } from "next";
-import { withSentryConfig } from "@sentry/nextjs";
-import createNextIntlPlugin from "next-intl/plugin";
 import withBundleAnalyzer from "@next/bundle-analyzer";
+import { withSentryConfig } from "@sentry/nextjs";
+import type { NextConfig } from "next";
+import createNextIntlPlugin from "next-intl/plugin";
 
 const securityHeaders = [
 	{ key: "X-DNS-Prefetch-Control", value: "on" },
@@ -20,7 +20,7 @@ const securityHeaders = [
 ];
 
 const nextConfig: NextConfig = {
-	turbopack: { root: import.meta.dirname },
+	turbopack: {},
 	serverExternalPackages: [
 		"@prisma/adapter-mariadb",
 		"mariadb",
@@ -39,18 +39,6 @@ const nextConfig: NextConfig = {
 
 	// Disable Next.js telemetry
 	productionBrowserSourceMaps: false,
-	output: "standalone",
-
-	// Cache pages longer in the router cache for faster back/forward navigation
-	experimental: {
-		staleTimes: {
-			dynamic: 30,
-			static: 180,
-		},
-		optimizePackageImports: ["lucide-react"],
-		// Keep build-time DB fan-out low (shared MySQL with emulator).
-		staticGenerationMaxConcurrency: 3,
-	},
 
 	// Add caching headers for static assets
 	async headers() {
@@ -91,17 +79,19 @@ const withBA = withBundleAnalyzer({
 	enabled: process.env.ANALYZE === "true",
 });
 
-export default withBA(withSentryConfig(config, {
-	org: process.env.SENTRY_ORG,
-	project: process.env.SENTRY_PROJECT,
-	authToken: sentryAuthToken,
-	silent: !process.env.CI,
-	widenClientFileUpload: true,
-	sourcemaps: {
-		disable: !sentryAuthToken,
-	},
-	release: {
-		create: Boolean(sentryAuthToken),
-	},
-	telemetry: false,
-}));
+export default withBA(
+	withSentryConfig(config, {
+		org: process.env.SENTRY_ORG,
+		project: process.env.SENTRY_PROJECT,
+		authToken: sentryAuthToken,
+		silent: !process.env.CI || !sentryAuthToken,
+		widenClientFileUpload: true,
+		sourcemaps: {
+			disable: !sentryAuthToken,
+		},
+		release: {
+			create: Boolean(sentryAuthToken),
+		},
+		telemetry: false,
+	}),
+);

package.json

@@ -11,7 +11,7 @@
 		"build": "next build",
 		"start": "next start",
 		"prisma:generate": "prisma generate",
-		"typecheck": "tsc --noEmit --incremental false",
+		"typecheck": "tsc6 --noEmit --incremental false",
 		"biome:check": "biome check --write .",
 		"biome:lint": "biome lint .",
 		"biome:format": "biome format --write .",
@@ -19,8 +19,8 @@
 		"analyze": "ANALYZE=true pnpm build",
 		"test": "vitest run",
 		"test:e2e": "playwright test",
-		"lint": "eslint . --ext .ts,.tsx --max-warnings=1000",
-		"lint:fix": "eslint . --ext .ts,.tsx --fix --max-warnings=1000",
+		"lint": "eslint . --ext .ts,.tsx --max-warnings=50",
+		"lint:fix": "eslint . --ext .ts,.tsx --fix --max-warnings=50",
 		"lhci:collect": "lhci collect",
 		"lhci:assert": "lhci assert",
 		"lhci:server": "lhci server",
@@ -32,7 +32,7 @@
 	"lint-staged": {
 		"*.{js,jsx,ts,tsx}": [
 			"biome check --write",
-			"eslint --fix --max-warnings=1000"
+			"eslint --fix --max-warnings=50"
 		],
 		"*.{json,md,css,scss,html}": [
 			"biome format --write"
@@ -43,11 +43,11 @@
 		"@dnd-kit/core": "^6.3.1",
 		"@dnd-kit/sortable": "^10.0.0",
 		"@dnd-kit/utilities": "^3.2.2",
-		"@hookform/resolvers": "^5.4.0",
-		"@prisma/adapter-mariadb": "^7.9.0",
-		"@prisma/client": "^7.9.0",
-		"@sentry/nextjs": "^10.67.0",
-		"@tanstack/react-virtual": "^3.14.7",
+		"@hookform/resolvers": "^5.5.7",
+		"@prisma/adapter-mariadb": "^7.9.1",
+		"@prisma/client": "^7.9.1",
+		"@sentry/nextjs": "^10.68.0",
+		"@tanstack/react-virtual": "^3.14.8",
 		"bcrypt": "^6.0.0",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
@@ -60,21 +60,21 @@
 		"json5": "^2.2.3",
 		"jszip": "^3.10.1",
 		"lenis": "^1.3.25",
-		"lucide-react": "^1.25.0",
+		"lucide-react": "^1.27.0",
 		"lzma": "^2.3.2",
 		"music-metadata": "^11.14.0",
-		"mysql2": "^3.23.1",
-		"next": "^16.2.11",
+		"mysql2": "^3.23.2",
+		"next": "^16.2.12",
 		"next-auth": "5.0.0-beta.32",
-		"next-intl": "^4.13.3",
+		"next-intl": "^4.13.4",
 		"next-view-transitions": "^0.3.5",
-		"nodemailer": "^7.0.13",
+		"nodemailer": "^9.0.3",
 		"otplib": "^13.4.1",
 		"pino": "^10.3.1",
 		"react": "^19.2.8",
 		"react-dom": "^19.2.8",
-		"react-hook-form": "^7.82.0",
-		"resend": "^6.18.0",
+		"react-hook-form": "^7.83.0",
+		"resend": "^6.18.1",
 		"sanitize-html": "^2.17.6",
 		"server-only": "^0.0.1",
 		"sharp": "^0.35.3",
@@ -84,37 +84,38 @@
 		"zod": "^4.4.3"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "2.5.5",
-		"@eslint/js": "^10.0.1",
+		"@biomejs/biome": "2.5.6",
+		"@eslint/js": "10.0.1",
 		"@lhci/cli": "^0.15.1",
-		"@next/bundle-analyzer": "^16.2.11",
-		"@playwright/test": "^1.61.1",
+		"@next/bundle-analyzer": "^16.2.12",
+		"@next/eslint-plugin-next": "^16.2.12",
+		"@playwright/test": "1.62.0",
 		"@tailwindcss/forms": "^0.5.11",
 		"@tailwindcss/postcss": "^4.3.3",
 		"@tailwindcss/typography": "^0.5.20",
 		"@types/bcrypt": "^6.0.0",
-		"@types/node": "^26.1.1",
-		"@types/nodemailer": "^7.0.12",
+		"@types/node": "^26.1.2",
+		"@types/nodemailer": "^8.0.1",
 		"@types/react": "^19.2.17",
 		"@types/react-dom": "^19.2.3",
 		"@types/sanitize-html": "^2.16.1",
+		"@vitest/coverage-v8": "4.1.10",
 		"babel-plugin-react-compiler": "^1.0.0",
-		"dotenv": "^16.4.0",
-		"eslint": "^10.7.0",
-		"eslint-config-prettier": "^10.1.8",
-		"eslint-plugin-unused-imports": "^4.4.1",
+		"dotenv": "^17.4.2",
+		"eslint": "10.8.0",
+		"eslint-plugin-react-hooks": "^7.1.1",
+		"eslint-plugin-security": "^4.0.1",
+		"eslint-plugin-unused-imports": "4.4.1",
 		"husky": "^9.1.7",
-		"knip": "^6.27.0",
-		"lint-staged": "^17.1.0",
+		"knip": "^6.29.0",
 		"pino-pretty": "^13.1.3",
-		"plausible-tracker": "^0.3.9",
-		"postcss": "^8.5.21",
-		"prisma": "^7.9.0",
+		"postcss": "^8.5.24",
+		"prisma": "^7.9.1",
 		"tailwindcss": "^4.3.3",
 		"tsx": "^4.23.1",
-		"typescript": "^5.9.3",
+		"typescript": "npm:@typescript/typescript6@^6.0.2",
 		"typescript-eslint": "^8.65.0",
-		"vite": "^8.1.5",
-		"vitest": "^4.1.10"
+		"vite": "8.1.5",
+		"vitest": "4.1.10"
 	}
-}
+}

playwright.config.ts

@@ -1,33 +1,33 @@
 import { defineConfig, devices } from "@playwright/test";
 
 export default defineConfig({
-  testDir: "./e2e",
-  fullyParallel: true,
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  workers: process.env.CI ? 1 : undefined,
-  reporter: "html",
-  use: {
-    baseURL: process.env.NEXT_PUBLIC_APP_URL || "http://localhost:3000",
-    trace: "on-first-retry",
-  },
-  projects: [
-    {
-      name: "chromium",
-      use: { ...devices["Desktop Chrome"] },
-    },
-    {
-      name: "firefox",
-      use: { ...devices["Desktop Firefox"] },
-    },
-    {
-      name: "webkit",
-      use: { ...devices["Desktop Safari"] },
-    },
-  ],
-  webServer: {
-    command: "pnpm dev",
-    url: "http://localhost:3000",
-    reuseExistingServer: !process.env.CI,
-  },
+	testDir: "./e2e",
+	fullyParallel: true,
+	forbidOnly: !!process.env.CI,
+	retries: process.env.CI ? 2 : 0,
+	workers: process.env.CI ? 1 : undefined,
+	reporter: "html",
+	use: {
+		baseURL: process.env.NEXT_PUBLIC_APP_URL || "http://localhost:3000",
+		trace: "on-first-retry",
+	},
+	projects: [
+		{
+			name: "chromium",
+			use: { ...devices["Desktop Chrome"] },
+		},
+		{
+			name: "firefox",
+			use: { ...devices["Desktop Firefox"] },
+		},
+		{
+			name: "webkit",
+			use: { ...devices["Desktop Safari"] },
+		},
+	],
+	webServer: {
+		command: "pnpm dev",
+		url: "http://localhost:3000",
+		reuseExistingServer: !process.env.CI,
+	},
 });

pnpm-workspace.yaml

@@ -1,15 +1,35 @@
-onlyBuiltDependencies:
-  - esbuild
-  - prisma
-  - "@prisma/client"
-  - "@prisma/engines"
-  - sharp
-  - "@parcel/watcher"
-  - "@swc/core"
-  - "@sentry/cli"
-  - bcrypt
+# pnpm-workspace.yaml
 
+# pnpm v11 vervanger voor onlyBuiltDependencies
+allowBuilds:
+  esbuild: true
+  prisma: true
+  "@prisma/client": true
+  "@prisma/engines": true
+  sharp: true
+  "@parcel/watcher": true
+  "@swc/core": true
+  "@sentry/cli": true
+  bcrypt: true
+
+# Al jouw overrides netjes bij elkaar inclusief de nieuwe security patches
 overrides:
+  glob: "^10.4.5"
+  inflight: "npm:lru-cache@^10.2.2"
+  rimraf: "^5.0.7"
+  uuid: "^9.0.1"
   fast-uri: "^3.1.3"
   "@hono/node-server": "^1.19.13"
   postcss: "^8.5.19"
+  # Dwingt alle diepe subdependencies (zoals lhci) naar de veilige tmp-versie
+  tmp: "^0.2.6"
+  # NIEUWE SECURITY PATCHES:
+  sharp: "^0.35.3"
+  brace-expansion: "^5.0.8"
+
+# Zorgt voor een schone terminal zonder de Next-Auth / Nodemailer waarschuwing
+peerDependencyRules:
+  allowedVersions:
+    nodemailer: "9.0.3"
+  ignoreMissing:
+    - nodemailer

prisma/migrations/0019_add_website_login_logs.sql

@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS `website_login_logs` (
+  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id` INT NOT NULL,
+  `ip` VARCHAR(45) NOT NULL,
+  `user_agent` VARCHAR(512) DEFAULT NULL,
+  `created_at` TIMESTAMP NULL DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `website_login_logs_user_id_index` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

public/sw.js

@@ -1,5 +1,5 @@
-const CACHE = "atom-v2";
-const API_CACHE = "atom-api-v2";
+const CACHE = "atom-v3";
+const API_CACHE = "atom-api-v3";
 
 self.addEventListener("install", () => self.skipWaiting());
 
@@ -9,7 +9,9 @@ self.addEventListener("activate", (event) => {
 			.keys()
 			.then((keys) =>
 				Promise.all(
-					keys.filter((k) => k !== CACHE && k !== API_CACHE).map((k) => caches.delete(k)),
+					keys
+						.filter((k) => k !== CACHE && k !== API_CACHE)
+						.map((k) => caches.delete(k)),
 				),
 			)
 			.then(() => self.clients.claim()),
@@ -60,14 +62,6 @@ self.addEventListener("fetch", (event) => {
 	}
 
 	if (req.mode === "navigate") {
-		event.respondWith(
-			fetch(req)
-				.then((res) => {
-					const copy = res.clone();
-					caches.open(CACHE).then((c) => c.put(req, copy)).catch(() => {});
-					return res;
-				})
-				.catch(() => caches.match(req).then((hit) => hit || caches.match("/"))),
-		);
+		event.respondWith(fetch(req));
 	}
 });

renovate.json

@@ -0,0 +1,42 @@
+{
+	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"extends": ["config:recommended", "helpers:disableTypesNodeMajor"],
+	"labels": ["dependencies"],
+	"rangeStrategy": "bump",
+	"dependencyDashboard": true,
+	"dependencyDashboardTitle": "Dependency Dashboard",
+	"commitMessagePrefix": "chore(deps):",
+	"commitMessageAction": "update",
+	"schedule": ["at any time"],
+	"timezone": "Europe/Amsterdam",
+	"rebaseWhen": "conflicted",
+	"prCreation": "immediate",
+	"prConcurrentLimit": 5,
+	"packageRules": [
+		{
+			"description": "Group all dependency updates into a single PR",
+			"matchPackagePatterns": ["*"],
+			"groupName": "All dependencies",
+			"groupSlug": "all",
+			"automerge": true
+		},
+		{
+			"description": "Major updates need manual review",
+			"matchUpdateTypes": ["major"],
+			"labels": ["dependencies", "major"],
+			"automerge": false,
+			"assignees": [],
+			"reviewers": []
+		},
+		{
+			"description": "Disable updates for engine pins",
+			"matchPackageNames": ["node", "pnpm"],
+			"enabled": false
+		},
+		{
+			"description": "Disable server-only (abandoned, pinned at 0.0.1)",
+			"matchPackageNames": ["server-only"],
+			"enabled": false
+		}
+	]
+}

scripts/apply-migrations.ts

@@ -24,27 +24,28 @@ function getDbConfig(): { url: string; database: string } {
 	return { url: mysqlConnectionUrl(url), database: dbName };
 }
 
-async function ensureConnection(): Promise<void> {
+async function openConnection() {
 	const { url } = getDbConfig();
 	const mysql = await import("mysql2/promise");
-	const conn = await mysql.createConnection(url);
-	try {
-		await conn.execute(
-			`CREATE TABLE IF NOT EXISTS \`${TRACKING_TABLE}\` (
+	return mysql.createConnection(url);
+}
+void openConnection;
+
+async function createTrackingTable(
+	conn: import("mysql2/promise").Connection,
+): Promise<void> {
+	await conn.execute(
+		`CREATE TABLE IF NOT EXISTS \`${TRACKING_TABLE}\` (
         id INT AUTO_INCREMENT PRIMARY KEY,
         migration VARCHAR(255) NOT NULL UNIQUE,
         applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`,
-		);
-	} finally {
-		await conn.end();
-	}
+	);
 }
 
-async function getApplied(): Promise<Set<string>> {
-	const { url } = getDbConfig();
-	const mysql = await import("mysql2/promise");
-	const conn = await mysql.createConnection(url);
+async function getApplied(
+	conn: import("mysql2/promise").Connection,
+): Promise<Set<string>> {
 	try {
 		const [rows] = await conn.execute(
 			`SELECT migration FROM \`${TRACKING_TABLE}\` ORDER BY id`,
@@ -52,8 +53,6 @@ async function getApplied(): Promise<Set<string>> {
 		return new Set((rows as { migration: string }[]).map((r) => r.migration));
 	} catch {
 		return new Set();
-	} finally {
-		await conn.end();
 	}
 }
 
@@ -70,69 +69,70 @@ function loadMigrations(): MigrationFile[] {
 	});
 }
 
-async function apply(migration: MigrationFile): Promise<void> {
-	const { url } = getDbConfig();
-	const mysql = await import("mysql2/promise");
-	const conn = await mysql.createConnection(url);
-	try {
-		const statements = splitSqlStatements(migration.sql);
+async function apply(
+	conn: import("mysql2/promise").Connection,
+	migration: MigrationFile,
+): Promise<void> {
+	const statements = splitSqlStatements(migration.sql);
 
-		for (const stmt of statements) {
-			await conn.execute(stmt);
-		}
-
-		await conn.execute(
-			`INSERT INTO \`${TRACKING_TABLE}\` (migration) VALUES (?)`,
-			[migration.id],
-		);
-		console.log(`[migrate] Applied: ${migration.name}`);
-	} finally {
-		await conn.end();
+	for (const stmt of statements) {
+		await conn.execute(stmt);
 	}
+
+	await conn.execute(
+		`INSERT INTO \`${TRACKING_TABLE}\` (migration) VALUES (?)`,
+		[migration.id],
+	);
+	console.log(`[migrate] Applied: ${migration.name}`);
 }
 
 async function main() {
-	const flag = process.argv[2];
+	const mysql = await import("mysql2/promise");
+	const { url } = getDbConfig();
+	const conn = await mysql.createConnection(url);
 
-	if (flag === "--status") {
-		await ensureConnection();
-		const applied = await getApplied();
-		const all = loadMigrations();
+	try {
+		await createTrackingTable(conn);
+		const applied = await getApplied(conn);
 
-		console.log("\nMigration status:\n");
-		for (const m of all) {
-			const done = applied.has(m.id);
-			console.log(
-				`  ${done ? "✓" : " "} ${m.name}${done ? "" : "  [PENDING]"}`,
-			);
+		if (process.argv[2] === "--status") {
+			const all = loadMigrations();
+
+			console.log("\nMigration status:\n");
+			for (const m of all) {
+				const done = applied.has(m.id);
+				console.log(
+					`  ${done ? "✓" : " "} ${m.name}${done ? "" : "  [PENDING]"}`,
+				);
+			}
+
+			const pending = all.filter((m) => !applied.has(m.id));
+			const total = all.length;
+			const done = total - pending.length;
+			console.log(`\n${done}/${total} applied, ${pending.length} pending\n`);
+			return;
 		}
 
-		const pending = all.filter((m) => !applied.has(m.id));
-		const total = all.length;
-		const done = total - pending.length;
-		console.log(`\n${done}/${total} applied, ${pending.length} pending\n`);
-		return;
-	}
+		const pending = loadMigrations().filter((m) => !applied.has(m.id));
 
-	await ensureConnection();
-	const applied = await getApplied();
-	const pending = loadMigrations().filter((m) => !applied.has(m.id));
-
-	if (pending.length === 0) {
-		console.log("[migrate] All migrations already applied.");
-		return;
-	}
-
-	console.log(`[migrate] Applying ${pending.length} migration(s)...\n`);
-	for (const m of pending) {
-		try {
-			await apply(m);
-		} catch (err) {
-			console.error(`[migrate] FAILED: ${m.name}`, err);
-			process.exit(1);
+		if (pending.length === 0) {
+			console.log("[migrate] All migrations already applied.");
+			return;
 		}
+
+		console.log(`[migrate] Applying ${pending.length} migration(s)...\n`);
+		for (const m of pending) {
+			try {
+				await apply(conn, m);
+			} catch (err) {
+				console.error(`[migrate] FAILED: ${m.name}`, err);
+				process.exit(1);
+			}
+		}
+		console.log("\n[migrate] Done.");
+	} finally {
+		await conn.end();
 	}
-	console.log("\n[migrate] Done.");
 }
 
 main().catch((err) => {

scripts/check-local-imports.ts

@@ -1,13 +0,0 @@
-import { findMissingLocalImports } from "../src/lib/local-imports";
-
-const missing = await findMissingLocalImports(process.cwd());
-
-if (missing.length === 0) {
-	console.log("No unresolved local imports.");
-	process.exit(0);
-}
-
-for (const item of missing)
-	console.error(`${item.importer}: ${item.specifier}`);
-console.error(`${missing.length} unresolved local import(s).`);
-process.exitCode = 1;

scripts/create-release.sh

@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-BARE="/docker/gitea/gitea/git/repositories/remco/epicnext-cms.git"
-GITEA_API="${GITEA_API:-https://gitlab.epicnabbo.nl}"
-REPO="remco/EpicNext-Cms"
-TOKEN="${GITEA_TOKEN:-}"
-
-if [ $# -ne 1 ]; then
-  echo "Usage: $0 <tag>"
-  exit 1
-fi
-
-VERSION="$1"
-
-if [ -z "$TOKEN" ]; then
-  echo "ERROR: GITEA_TOKEN not set"
-  exit 1
-fi
-
-echo "=== Creating release for ${VERSION} ==="
-
-if ! git -C "$BARE" rev-parse "$VERSION" >/dev/null 2>&1; then
-  echo "ERROR: tag $VERSION not found in bare repo"
-  exit 1
-fi
-
-PREV_TAG="$(git -C "$BARE" tag --sort=-creatordate | head -2 | tail -1 || echo '')"
-
-if [ -n "$PREV_TAG" ] && [ "$PREV_TAG" != "$VERSION" ]; then
-  CHANGELOG="$(git -C "$BARE" log --oneline --no-decorate "${PREV_TAG}..${VERSION}")"
-else
-  CHANGELOG="$(git -C "$BARE" log --oneline --no-decorate "${VERSION}")"
-fi
-
-[ -z "$CHANGELOG" ] && CHANGELOG="Initial release"
-
-echo "Previous tag: ${PREV_TAG:-none}"
-echo "Changelog (${#CHANGELOG} chars):"
-echo "${CHANGELOG}"
-
-BODY="## EpicNext-CMS ${VERSION}
-
-### Changes
-${CHANGELOG}
-
----
-*Automated release from Gitea Actions*
-"
-
-echo "$BODY" | jq -Rs '{tag_name: $v, name: $v, body: ., draft: false, prerelease: false}' --arg v "${VERSION}" > /tmp/payload.json
-
-HTTP_CODE="$(curl -s -w '%{http_code}' -o /tmp/release-resp.json \
-  -X POST "${GITEA_API}/api/v1/repos/${REPO}/releases" \
-  -H "Authorization: token ${TOKEN}" \
-  -H "Content-Type: application/json" \
-  -d @/tmp/payload.json)"
-
-if [ "${HTTP_CODE}" = "409" ]; then
-  echo "Release exists, updating..."
-  RELEASES="$(curl -sf "${GITEA_API}/api/v1/repos/${REPO}/releases" \
-    -H "Authorization: token ${TOKEN}")"
-  REL_ID="$(echo "$RELEASES" | jq -r ".[] | select(.tag_name==\"${VERSION}\") | .id")"
-  echo "Release ID: ${REL_ID}"
-  HTTP_CODE="$(curl -s -w '%{http_code}' -o /tmp/release-resp.json \
-    -X PATCH "${GITEA_API}/api/v1/repos/${REPO}/releases/${REL_ID}" \
-    -H "Authorization: token ${TOKEN}" \
-    -H "Content-Type: application/json" \
-    -d @/tmp/payload.json)"
-fi
-
-if [ "${HTTP_CODE:-0}" -ge 200 ] && [ "${HTTP_CODE:-0}" -lt 300 ]; then
-  echo "SUCCESS: Release ${VERSION} created/updated"
-  cat /tmp/release-resp.json | jq -r '.html_url // .id'
-else
-  echo "FAILED HTTP ${HTTP_CODE}"
-  cat /tmp/release-resp.json
-  exit 1
-fi

src/actions/admin-ads.ts

@@ -5,6 +5,7 @@ import { redirect } from "next/navigation";
 import { z } from "zod";
 import { requirePermission } from "@/lib/admin/guard";
 import { formPositiveBigInt } from "@/lib/form-data";
+import { logger } from "@/lib/logger";
 import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 import { adminAction } from "@/lib/safe-action";
@@ -34,8 +35,11 @@ export async function createAd(formData: FormData): Promise<void> {
 			targetType: "website_ad",
 			targetId: Number(ad.id),
 		});
-	} catch {
-		// DB error — page re-renders unchanged.
+	} catch (err) {
+		logger.error("Action failed: createAd", {
+			action: "createAd",
+			error: err instanceof Error ? err.message : "DB error",
+		});
 		revalidatePath("/admin/ads");
 		return;
 	}
@@ -65,8 +69,12 @@ export async function updateAd(formData: FormData): Promise<void> {
 			targetType: "website_ad",
 			targetId: Number(id),
 		});
-	} catch {
-		// Not found or DB error — ignore.
+	} catch (err) {
+		logger.error("Action failed: updateAd", {
+			action: "updateAd",
+			id: Number(id),
+			error: err instanceof Error ? err.message : "DB error",
+		});
 		revalidatePath(`/admin/ads/${id}`);
 		return;
 	}
@@ -115,8 +123,12 @@ export async function deleteAdForm(formData: FormData): Promise<void> {
 			targetType: "website_ad",
 			targetId: Number(id),
 		});
-	} catch {
-		// Not found or DB error — ignore.
+	} catch (err) {
+		logger.error("Action failed: deleteAdForm", {
+			action: "deleteAdForm",
+			id: Number(id),
+			error: err instanceof Error ? err.message : "DB error",
+		});
 	}
 	redirect("/admin/ads");
 }

src/actions/admin-applications.ts

@@ -2,8 +2,8 @@
 
 import { revalidatePath } from "next/cache";
 import { requirePermission } from "@/lib/admin/guard";
-import { PERMS } from "@/lib/permissions";
 import { formPositiveBigInt } from "@/lib/form-data";
+import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 
 export async function dismissApplication(formData: FormData): Promise<void> {

src/actions/admin-articles.ts

@@ -3,8 +3,8 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { requirePermission } from "@/lib/admin/guard";
-import { PERMS } from "@/lib/permissions";
 import { slugify } from "@/lib/format";
+import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 
 async function uniqueSlug(title: string): Promise<string> {
@@ -74,9 +74,7 @@ export async function updateArticle(formData: FormData): Promise<void> {
 					.normalize("NFC")
 					.trim()
 					.slice(0, 255),
-				...(rawSlug
-					? { slug: await uniqueSlug(rawSlug) }
-					: {}),
+				...(rawSlug ? { slug: await uniqueSlug(rawSlug) } : {}),
 				shortStory: String(formData.get("shortStory") ?? "")
 					.normalize("NFC")
 					.trim()

src/actions/admin-email-templates.ts

@@ -2,8 +2,8 @@
 
 import { revalidatePath } from "next/cache";
 import { requirePermission } from "@/lib/admin/guard";
-import { PERMS } from "@/lib/permissions";
 import { formPositiveBigInt } from "@/lib/form-data";
+import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 
 export async function createEmailTemplate(formData: FormData): Promise<void> {

src/actions/admin-help.ts

@@ -3,9 +3,9 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { requirePermission } from "@/lib/admin/guard";
-import { PERMS } from "@/lib/permissions";
 import { formPositiveBigInt } from "@/lib/form-data";
 import { canonicalize, sanitizeField } from "@/lib/foundation/security";
+import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 import { logStaffActivity } from "@/lib/services/staff-activity";
 
@@ -26,8 +26,10 @@ export async function createHelpQuestion(formData: FormData): Promise<void> {
 	const imageUrl = sanitizeField(formData.get("imageUrl"));
 	const buttonText = sanitizeField(formData.get("buttonText"));
 	const buttonUrl = sanitizeField(formData.get("buttonUrl"));
-	const buttonColor = sanitizeField(formData.get("buttonColor"), 16) || "#eeb425";
-	const buttonBorderColor = sanitizeField(formData.get("buttonBorderColor"), 16) || "#facc15";
+	const buttonColor =
+		sanitizeField(formData.get("buttonColor"), 16) || "#eeb425";
+	const buttonBorderColor =
+		sanitizeField(formData.get("buttonBorderColor"), 16) || "#facc15";
 
 	try {
 		const entry = await prisma.websiteHelpCenterCategories.create({
@@ -73,8 +75,10 @@ export async function updateHelpQuestion(formData: FormData): Promise<void> {
 	const imageUrl = sanitizeField(formData.get("imageUrl"));
 	const buttonText = sanitizeField(formData.get("buttonText"));
 	const buttonUrl = sanitizeField(formData.get("buttonUrl"));
-	const buttonColor = sanitizeField(formData.get("buttonColor"), 16) || "#eeb425";
-	const buttonBorderColor = sanitizeField(formData.get("buttonBorderColor"), 16) || "#facc15";
+	const buttonColor =
+		sanitizeField(formData.get("buttonColor"), 16) || "#eeb425";
+	const buttonBorderColor =
+		sanitizeField(formData.get("buttonBorderColor"), 16) || "#facc15";
 
 	try {
 		await prisma.websiteHelpCenterCategories.update({

src/actions/admin-maintenance.test.ts

@@ -0,0 +1,182 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const { mockUpsert, mockRequirePermission, mockReload, mockRevalidatePath } =
+	vi.hoisted(() => ({
+		mockUpsert: vi.fn(),
+		mockRequirePermission: vi.fn(),
+		mockReload: vi.fn(),
+		mockRevalidatePath: vi.fn(),
+	}));
+
+vi.mock("@/lib/permissions", () => ({
+	PERMS: {
+		ADMIN_DASHBOARD: "admin.dashboard",
+		SETTINGS_VIEW: "admin.settings.view",
+		SETTINGS_EDIT: "admin.settings.edit",
+	},
+}));
+
+vi.mock("@/lib/prisma", () => ({
+	prisma: {
+		websiteSetting: { upsert: mockUpsert },
+	},
+}));
+
+vi.mock("@/lib/admin/guard", () => ({
+	requirePermission: mockRequirePermission,
+}));
+
+vi.mock("@/lib/services/site-settings", () => ({
+	siteSettings: { reload: mockReload },
+}));
+
+vi.mock("next/cache", () => ({
+	revalidatePath: mockRevalidatePath,
+}));
+
+import { saveMaintenance } from "./admin-maintenance";
+
+beforeEach(() => {
+	vi.clearAllMocks();
+});
+
+describe("saveMaintenance", () => {
+	it("enables maintenance mode with message and min rank", async () => {
+		mockRequirePermission.mockResolvedValue({
+			id: 1,
+			rank: 7,
+			username: "admin",
+		});
+
+		const fd = new FormData();
+		fd.set("enabled", "on");
+		fd.set("message", "We will be back soon!");
+		fd.set("min_rank", "3");
+
+		await saveMaintenance(fd);
+
+		expect(mockRequirePermission).toHaveBeenCalled();
+
+		expect(mockUpsert).toHaveBeenCalledTimes(3);
+		expect(mockUpsert).toHaveBeenCalledWith(
+			expect.objectContaining({
+				where: { key: "maintenance_enabled" },
+				update: { value: "1" },
+				create: expect.objectContaining({
+					key: "maintenance_enabled",
+					value: "1",
+				}),
+			}),
+		);
+		expect(mockUpsert).toHaveBeenCalledWith(
+			expect.objectContaining({
+				where: { key: "maintenance_message" },
+				update: { value: "We will be back soon!" },
+				create: expect.objectContaining({
+					key: "maintenance_message",
+					value: "We will be back soon!",
+				}),
+			}),
+		);
+		expect(mockUpsert).toHaveBeenCalledWith(
+			expect.objectContaining({
+				where: { key: "min_maintenance_login_rank" },
+				update: { value: "3" },
+				create: expect.objectContaining({
+					key: "min_maintenance_login_rank",
+					value: "3",
+				}),
+			}),
+		);
+
+		expect(mockReload).toHaveBeenCalledOnce();
+		expect(mockRevalidatePath).toHaveBeenCalledWith("/admin/maintenance");
+	});
+
+	it("disables maintenance mode", async () => {
+		mockRequirePermission.mockResolvedValue({
+			id: 1,
+			rank: 7,
+			username: "admin",
+		});
+
+		const fd = new FormData();
+		fd.set("message", "");
+		fd.set("min_rank", "");
+
+		await saveMaintenance(fd);
+
+		expect(mockUpsert).toHaveBeenCalledWith(
+			expect.objectContaining({
+				where: { key: "maintenance_enabled" },
+				update: { value: "0" },
+			}),
+		);
+		expect(mockUpsert).toHaveBeenCalledWith(
+			expect.objectContaining({
+				where: { key: "min_maintenance_login_rank" },
+				update: { value: "5" },
+			}),
+		);
+	});
+
+	it("defaults min_rank to 5 when input is empty", async () => {
+		mockRequirePermission.mockResolvedValue({
+			id: 1,
+			rank: 7,
+			username: "admin",
+		});
+
+		const fd = new FormData();
+		fd.set("enabled", "on");
+		fd.set("message", "");
+		fd.set("min_rank", "");
+
+		await saveMaintenance(fd);
+
+		expect(mockUpsert).toHaveBeenCalledWith(
+			expect.objectContaining({
+				where: { key: "min_maintenance_login_rank" },
+				update: { value: "5" },
+			}),
+		);
+	});
+
+	it("defaults min_rank to 5 when input is negative", async () => {
+		mockRequirePermission.mockResolvedValue({
+			id: 1,
+			rank: 7,
+			username: "admin",
+		});
+
+		const fd = new FormData();
+		fd.set("enabled", "on");
+		fd.set("message", "");
+		fd.set("min_rank", "-1");
+
+		await saveMaintenance(fd);
+
+		expect(mockUpsert).toHaveBeenCalledWith(
+			expect.objectContaining({
+				where: { key: "min_maintenance_login_rank" },
+				update: { value: "5" },
+			}),
+		);
+	});
+
+	it("calls requirePermission with SETTINGS_EDIT", async () => {
+		mockRequirePermission.mockResolvedValue({
+			id: 1,
+			rank: 7,
+			username: "admin",
+		});
+
+		const fd = new FormData();
+		fd.set("message", "");
+		fd.set("min_rank", "");
+
+		await saveMaintenance(fd);
+
+		expect(mockRequirePermission).toHaveBeenCalledWith("admin.settings.edit");
+	});
+});

src/actions/admin-media.ts

@@ -4,8 +4,8 @@ import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { revalidatePath } from "next/cache";
 import { requirePermission } from "@/lib/admin/guard";
-import { PERMS } from "@/lib/permissions";
 import { MEDIA_ROOT, resolveMediaPath } from "@/lib/media-storage";
+import { PERMS } from "@/lib/permissions";
 
 const MAX_SIZE = 5 * 1024 * 1024; // 5MB
 const ALLOWED = ["image/png", "image/jpeg", "image/gif", "image/webp"];
@@ -19,7 +19,10 @@ export async function uploadMedia(
 	if (file.size > MAX_SIZE)
 		return { ok: false, error: "File too large (max 5MB)" };
 	if (!ALLOWED.includes(file.type))
-		return { ok: false, error: "Invalid file type. Allowed: PNG, JPEG, GIF, WebP" };
+		return {
+			ok: false,
+			error: "Invalid file type. Allowed: PNG, JPEG, GIF, WebP",
+		};
 
 	const baseDir = MEDIA_ROOT;
 	// eslint-disable-next-line security/detect-non-literal-fs-filename

src/actions/admin-rare-values.ts

@@ -2,8 +2,8 @@
 
 import { revalidatePath } from "next/cache";
 import { requirePermission } from "@/lib/admin/guard";
-import { PERMS } from "@/lib/permissions";
 import { formPositiveBigInt } from "@/lib/form-data";
+import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 
 export async function createCategory(formData: FormData): Promise<void> {

src/actions/admin-settings.ts

@@ -11,8 +11,8 @@ import {
 } from "@/lib/habbo-gamedata-hotel";
 import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
-import { clearBadgeCache } from "@/lib/services/habboassets";
 import { clearHabboItCache } from "@/lib/services/habbo-furnidata-cache";
+import { clearBadgeCache } from "@/lib/services/habboassets";
 import { siteSettings } from "@/lib/services/site-settings";
 
 const managedKeySet = new Set(MANAGED_SETTING_KEYS);

src/actions/admin-shop.ts

@@ -3,8 +3,8 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { requirePermission } from "@/lib/admin/guard";
-import { PERMS } from "@/lib/permissions";
 import { formPositiveBigInt } from "@/lib/form-data";
+import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 import { logServerError } from "@/lib/server-log";
 import { logStaffActivity } from "@/lib/services/staff-activity";

src/actions/admin-theme.ts

@@ -7,6 +7,7 @@ import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 import { siteSettings } from "@/lib/services/site-settings";
 import { logStaffActivity } from "@/lib/services/staff-activity";
+import { ensureReadableThemeColors } from "@/lib/theme-contrast";
 import {
 	deleteCustomThemeStore,
 	getCustomTheme,
@@ -15,7 +16,6 @@ import {
 } from "@/lib/theme-custom-store";
 import { FONTS, PRESETS, THEME_COLOR_KEYS } from "@/lib/theme-presets";
 import { presetSettings, settingKey } from "@/lib/theme-settings";
-import { ensureReadableThemeColors } from "@/lib/theme-contrast";
 
 // Only hex/keyword colour values are accepted (matches ThemeVars' sanitiser).
 const COLOR_RE = /^[#a-zA-Z0-9(),.\s%-]+$/;
@@ -46,7 +46,10 @@ export async function saveTheme(formData: FormData): Promise<void> {
 			}
 			const fixed = ensureReadableThemeColors(bag);
 			for (const [key, value] of Object.entries(fixed)) {
-				await writeSetting(settingKey(key as (typeof THEME_COLOR_KEYS)[number], mode), value);
+				await writeSetting(
+					settingKey(key as (typeof THEME_COLOR_KEYS)[number], mode),
+					value,
+				);
 			}
 		}
 		const ADMIN_KEYS = [

src/actions/admin-vouchers.ts

@@ -1,14 +1,14 @@
 "use server";
 
 import { revalidatePath } from "next/cache";
-import { positiveBigInt } from "@/lib/api";
 import { requirePermission } from "@/lib/admin/guard";
+import { positiveBigInt } from "@/lib/api";
 import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 import {
+	type ActionResult,
 	actionError,
 	actionOk,
-	type ActionResult,
 } from "@/lib/safe-action-shared";
 import { logServerError } from "@/lib/server-log";
 

src/actions/admin-wordfilter.ts

@@ -5,9 +5,9 @@ import { requirePermission } from "@/lib/admin/guard";
 import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 import {
+	type ActionResult,
 	actionError,
 	actionOk,
-	type ActionResult,
 } from "@/lib/safe-action-shared";
 import { reloadWordFilter } from "@/lib/services/moderation";
 import { rcon } from "@/lib/services/rcon";
@@ -33,9 +33,7 @@ export async function addWord(input: {
 	}
 }
 
-export async function deleteWord(input: {
-	id: string;
-}): Promise<ActionResult> {
+export async function deleteWord(input: { id: string }): Promise<ActionResult> {
 	await requirePermission(PERMS.WORDFILTER_EDIT);
 	const raw = String(input.id ?? "").normalize("NFC");
 	if (!raw) return actionError("Missing word id");

src/actions/draw-badge.ts

@@ -64,63 +64,65 @@ export async function buyBadge(formData: FormData): Promise<void> {
 		if (!(await rateLimit(`draw-badge-buy:${userId}`, 5, 60_000)).ok) {
 			outcome = "ratelimit";
 		} else {
-		const badge = await prisma.websiteDrawbadges.findUnique({
-			where: { id: BigInt(rawId) },
-			select: { id: true, badgePath: true, published: true },
-		});
+			const badge = await prisma.websiteDrawbadges.findUnique({
+				where: { id: BigInt(rawId) },
+				select: { id: true, badgePath: true, published: true },
+			});
 
-		if (!badge?.published) {
-			outcome = "invalid";
-		} else {
-			const code = badgeCodeFromPath(badge.badgePath);
-			if (code.length === 0) {
+			if (!badge?.published) {
 				outcome = "invalid";
 			} else {
-				const price = await resolvePrice();
-
-				// Re-read the buyer's live credit balance and verify it covers the cost.
-				const buyer = await prisma.user.findUnique({
-					where: { id: userId },
-					select: { credits: true },
-				});
-				if (!buyer || buyer.credits < price) {
-					outcome = "credits";
+				const code = badgeCodeFromPath(badge.badgePath);
+				if (code.length === 0) {
+					outcome = "invalid";
 				} else {
-					// Atomically deduct credits and persist the badge so a failure
-					// between the two operations cannot orphan the user.
-					if (price > 0) {
-						await prisma.$transaction(async (tx: Prisma.TransactionClient) => {
-							await tx.user.update({
-								where: { id: userId },
-								data: { credits: { decrement: price } },
-							});
+					const price = await resolvePrice();
 
-							const existing = await tx.usersBadges.findFirst({
-								where: { userId, badgeCode: code },
-								select: { id: true },
-							});
-							if (!existing) {
-								const max = await tx.usersBadges.aggregate({
-									where: { userId },
-									_max: { slotId: true },
-								});
-								const slotId = (max._max.slotId ?? 0) + 1;
-								await tx.usersBadges.create({
-									data: { userId, slotId, badgeCode: code },
-								});
-							}
-						});
+					// Re-read the buyer's live credit balance and verify it covers the cost.
+					const buyer = await prisma.user.findUnique({
+						where: { id: userId },
+						select: { credits: true },
+					});
+					if (!buyer || buyer.credits < price) {
+						outcome = "credits";
+					} else {
+						// Atomically deduct credits and persist the badge so a failure
+						// between the two operations cannot orphan the user.
+						if (price > 0) {
+							await prisma.$transaction(
+								async (tx: Prisma.TransactionClient) => {
+									await tx.user.update({
+										where: { id: userId },
+										data: { credits: { decrement: price } },
+									});
+
+									const existing = await tx.usersBadges.findFirst({
+										where: { userId, badgeCode: code },
+										select: { id: true },
+									});
+									if (!existing) {
+										const max = await tx.usersBadges.aggregate({
+											where: { userId },
+											_max: { slotId: true },
+										});
+										const slotId = (max._max.slotId ?? 0) + 1;
+										await tx.usersBadges.create({
+											data: { userId, slotId, badgeCode: code },
+										});
+									}
+								},
+							);
+						}
+
+						// Grant the badge live so it appears immediately for online users.
+						await rcon.giveBadge(userId, code).catch(() => {});
+
+						outcome = "bought";
+						boughtCode = code;
 					}
-
-					// Grant the badge live so it appears immediately for online users.
-					await rcon.giveBadge(userId, code).catch(() => {});
-
-					outcome = "bought";
-					boughtCode = code;
 				}
 			}
 		}
-		}
 	} catch {
 		outcome = "fail";
 	}

src/actions/email-verify.test.ts

@@ -53,9 +53,9 @@ describe("email verification tokens", () => {
 
 	it("rejects legacy forever-valid digests", async () => {
 		const legacy = "a".repeat(64);
-		expect(
-			await isValidVerificationToken("[email protected]", legacy),
-		).toBe(false);
+		expect(await isValidVerificationToken("[email protected]", legacy)).toBe(
+			false,
+		);
 	});
 
 	it("rejects expired tokens", async () => {
@@ -69,18 +69,19 @@ describe("email verification tokens", () => {
 	});
 
 	it("sends mail with a verify link", async () => {
-		mockGetTranslations.mockResolvedValue(
-			((key: string, values?: { hotel?: string }) => {
-				const map: Record<string, string> = {
-					subject: `Verify your email · ${values?.hotel}`,
-					heading: "Verify your email",
-					body: `Welcome to ${values?.hotel}!`,
-					button: "Verify email",
-					fallback: "Paste this link:",
-				};
-				return map[key] ?? key;
-			}) as never,
-		);
+		mockGetTranslations.mockResolvedValue(((
+			key: string,
+			values?: { hotel?: string },
+		) => {
+			const map: Record<string, string> = {
+				subject: `Verify your email · ${values?.hotel}`,
+				heading: "Verify your email",
+				body: `Welcome to ${values?.hotel}!`,
+				button: "Verify email",
+				fallback: "Paste this link:",
+			};
+			return map[key] ?? key;
+		}) as never);
 
 		await sendVerification("[email protected]");
 		expect(mockSendMail).toHaveBeenCalledWith(

src/actions/help-tickets.ts

@@ -3,10 +3,10 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { z } from "zod";
+import { positiveBigInt } from "@/lib/api";
 import { auth } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { clientIp, rateLimit } from "@/lib/rate-limit";
-import { positiveBigInt } from "@/lib/api";
 import { moderateOrThrow } from "@/lib/services/moderation";
 import { createOwnedTicketReply } from "@/lib/services/ticket-replies";
 

src/actions/link-discord.ts

@@ -1,66 +0,0 @@
-"use server";
-
-import { auth } from "@/lib/auth";
-import { logger } from "@/lib/logger";
-import { prisma } from "@/lib/prisma";
-
-export async function linkDiscordId(discordId: string): Promise<string | null> {
-	const session = await auth();
-	if (!session?.user?.id) return "Not logged in";
-
-	const userId = Number(session.user.id);
-	if (!discordId || !/^\d{17,20}$/.test(discordId.trim())) {
-		return "Invalid Discord ID format";
-	}
-
-	const discordIdClean = discordId.trim();
-
-	try {
-		const existing = await prisma.socialAccounts.findUnique({
-			where: {
-				provider_providerId: {
-					provider: "discord",
-					providerId: discordIdClean,
-				},
-			},
-			select: { userId: true },
-		});
-		if (existing && Number(existing.userId) !== userId) {
-			return "This Discord ID is already linked to another account";
-		}
-	} catch {
-		return "Failed to check Discord ID";
-	}
-
-	try {
-		await prisma.socialAccounts.upsert({
-			where: {
-				provider_providerId: {
-					provider: "discord",
-					providerId: discordIdClean,
-				},
-			},
-			create: {
-				userId: BigInt(userId),
-				provider: "discord",
-				providerId: discordIdClean,
-				createdAt: new Date(),
-				updatedAt: new Date(),
-			},
-			update: { userId: BigInt(userId), updatedAt: new Date() },
-		});
-
-		await prisma.user.update({
-			where: { id: userId },
-			data: { mailVerified: "1" },
-		});
-
-		return null;
-	} catch (e) {
-		logger.error("Failed to link Discord account", {
-			module: "link-discord",
-			error: (e as Error).message,
-		});
-		return "Failed to link Discord account";
-	}
-}

src/actions/messenger.ts

@@ -3,8 +3,8 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth";
-import { clientIp, rateLimit } from "@/lib/rate-limit";
 import { prisma } from "@/lib/prisma";
+import { clientIp, rateLimit } from "@/lib/rate-limit";
 
 type FriendOutcome =
 	| "accepted"
@@ -71,68 +71,72 @@ export async function acceptFriend(formData: FormData): Promise<void> {
 		if (!(await rateLimit(`friend-accept:${meId}`, 10, 60_000)).ok) {
 			outcome = "ratelimit";
 		} else {
-		const requestId = Number(formData.get("requestId"));
-		if (!Number.isInteger(requestId) || requestId <= 0) {
-			outcome = "invalid";
-		} else {
-			// The request must exist AND be addressed to the session user.
-			const request = await prisma.messengerFriendrequests.findUnique({
-				where: { id: requestId },
-				select: { id: true, userFromId: true, userToId: true },
-			});
-			if (!request) {
-				outcome = "not_found";
-			} else if (request.userToId !== meId) {
-				outcome = "unauthorized";
+			const requestId = Number(formData.get("requestId"));
+			if (!Number.isInteger(requestId) || requestId <= 0) {
+				outcome = "invalid";
 			} else {
-				const friendId = request.userFromId;
-				if (!Number.isInteger(friendId) || friendId <= 0 || friendId === meId) {
-					// Malformed/self request — clear it and treat as not found.
-					await prisma.messengerFriendrequests.delete({
-						where: { id: requestId },
-					});
+				// The request must exist AND be addressed to the session user.
+				const request = await prisma.messengerFriendrequests.findUnique({
+					where: { id: requestId },
+					select: { id: true, userFromId: true, userToId: true },
+				});
+				if (!request) {
 					outcome = "not_found";
+				} else if (request.userToId !== meId) {
+					outcome = "unauthorized";
 				} else {
-					const friendsSince = Math.floor(Date.now() / 1000);
-
-					await prisma.$transaction(async (tx) => {
-						// Don't double-insert if a friendship already exists in either direction.
-						const existing = await tx.messengerFriendships.findFirst({
-							where: {
-								OR: [
-									{ userOneId: meId, userTwoId: friendId },
-									{ userOneId: friendId, userTwoId: meId },
-								],
-							},
-							select: { id: true },
+					const friendId = request.userFromId;
+					if (
+						!Number.isInteger(friendId) ||
+						friendId <= 0 ||
+						friendId === meId
+					) {
+						// Malformed/self request — clear it and treat as not found.
+						await prisma.messengerFriendrequests.delete({
+							where: { id: requestId },
 						});
+						outcome = "not_found";
+					} else {
+						const friendsSince = Math.floor(Date.now() / 1000);
 
-						if (!existing) {
-							await tx.messengerFriendships.createMany({
-								data: [
-									{ userOneId: meId, userTwoId: friendId, friendsSince },
-									{ userOneId: friendId, userTwoId: meId, friendsSince },
-								],
+						await prisma.$transaction(async (tx) => {
+							// Don't double-insert if a friendship already exists in either direction.
+							const existing = await tx.messengerFriendships.findFirst({
+								where: {
+									OR: [
+										{ userOneId: meId, userTwoId: friendId },
+										{ userOneId: friendId, userTwoId: meId },
+									],
+								},
+								select: { id: true },
 							});
-						}
 
-						// Clear this request and any reverse pending request between the pair.
-						await tx.messengerFriendrequests.deleteMany({
-							where: {
-								OR: [
-									{ id: requestId },
-									{ userFromId: meId, userToId: friendId },
-									{ userFromId: friendId, userToId: meId },
-								],
-							},
+							if (!existing) {
+								await tx.messengerFriendships.createMany({
+									data: [
+										{ userOneId: meId, userTwoId: friendId, friendsSince },
+										{ userOneId: friendId, userTwoId: meId, friendsSince },
+									],
+								});
+							}
+
+							// Clear this request and any reverse pending request between the pair.
+							await tx.messengerFriendrequests.deleteMany({
+								where: {
+									OR: [
+										{ id: requestId },
+										{ userFromId: meId, userToId: friendId },
+										{ userFromId: friendId, userToId: meId },
+									],
+								},
+							});
 						});
-					});
 
-					outcome = "accepted";
+						outcome = "accepted";
+					}
 				}
 			}
 		}
-		}
 	} catch (e) {
 		// redirect() throws a NEXT_REDIRECT control-flow signal — re-throw it.
 		if (
@@ -172,26 +176,26 @@ export async function declineFriendRequest(formData: FormData): Promise<void> {
 		if (!(await rateLimit(`friend-decline:${meId}`, 10, 60_000)).ok) {
 			outcome = "ratelimit";
 		} else {
-		const requestId = Number(formData.get("requestId"));
-		if (!Number.isInteger(requestId) || requestId <= 0) {
-			outcome = "invalid";
-		} else {
-			const request = await prisma.messengerFriendrequests.findUnique({
-				where: { id: requestId },
-				select: { id: true, userToId: true },
-			});
-			if (!request) {
-				outcome = "not_found";
-			} else if (request.userToId !== meId) {
-				outcome = "unauthorized";
+			const requestId = Number(formData.get("requestId"));
+			if (!Number.isInteger(requestId) || requestId <= 0) {
+				outcome = "invalid";
 			} else {
-				await prisma.messengerFriendrequests.delete({
+				const request = await prisma.messengerFriendrequests.findUnique({
 					where: { id: requestId },
+					select: { id: true, userToId: true },
 				});
-				outcome = "declined";
+				if (!request) {
+					outcome = "not_found";
+				} else if (request.userToId !== meId) {
+					outcome = "unauthorized";
+				} else {
+					await prisma.messengerFriendrequests.delete({
+						where: { id: requestId },
+					});
+					outcome = "declined";
+				}
 			}
 		}
-		}
 	} catch (e) {
 		if (
 			e &&
@@ -231,34 +235,34 @@ export async function removeFriendship(formData: FormData): Promise<void> {
 		if (!(await rateLimit(`friend-remove:${meId}`, 10, 60_000)).ok) {
 			outcome = "ratelimit";
 		} else {
-		const friendId = Number(formData.get("friendId"));
-		if (!Number.isInteger(friendId) || friendId <= 0 || friendId === meId) {
-			outcome = "invalid";
-		} else {
-			const deleted = await prisma.$transaction(async (tx) => {
-				const result = await tx.messengerFriendships.deleteMany({
-					where: {
-						OR: [
-							{ userOneId: meId, userTwoId: friendId },
-							{ userOneId: friendId, userTwoId: meId },
-						],
-					},
+			const friendId = Number(formData.get("friendId"));
+			if (!Number.isInteger(friendId) || friendId <= 0 || friendId === meId) {
+				outcome = "invalid";
+			} else {
+				const deleted = await prisma.$transaction(async (tx) => {
+					const result = await tx.messengerFriendships.deleteMany({
+						where: {
+							OR: [
+								{ userOneId: meId, userTwoId: friendId },
+								{ userOneId: friendId, userTwoId: meId },
+							],
+						},
+					});
+
+					await tx.messengerFriendrequests.deleteMany({
+						where: {
+							OR: [
+								{ userFromId: meId, userToId: friendId },
+								{ userFromId: friendId, userToId: meId },
+							],
+						},
+					});
+
+					return result.count;
 				});
 
-				await tx.messengerFriendrequests.deleteMany({
-					where: {
-						OR: [
-							{ userFromId: meId, userToId: friendId },
-							{ userFromId: friendId, userToId: meId },
-						],
-					},
-				});
-
-				return result.count;
-			});
-
-			outcome = deleted > 0 ? "removed" : "not_found";
-		}
+				outcome = deleted > 0 ? "removed" : "not_found";
+			}
 		}
 	} catch (e) {
 		if (

src/actions/radio-apply.ts

@@ -12,11 +12,7 @@ const NAME_MAX = 255;
 const TEXT_MAX = 5000;
 const STYLE_MAX = 5000;
 
-type ApplyOutcome =
-	| "submitted"
-	| "invalid"
-	| "ratelimit"
-	| "error";
+type ApplyOutcome = "submitted" | "invalid" | "ratelimit" | "error";
 
 function applyRedirect(outcome: ApplyOutcome): never {
 	if (outcome === "submitted") redirect("/radio/apply?submitted=1");

src/actions/radio-requests.ts

@@ -9,12 +9,7 @@ import { clientIp, rateLimit } from "@/lib/rate-limit";
 const SONG_MAX = 255;
 const ARTIST_MAX = 255;
 
-type RequestOutcome =
-	| "posted"
-	| "empty"
-	| "invalid"
-	| "ratelimit"
-	| "error";
+type RequestOutcome = "posted" | "empty" | "invalid" | "ratelimit" | "error";
 
 function requestsRedirect(outcome: RequestOutcome): never {
 	if (outcome === "posted") redirect("/radio/requests?posted=1");

src/actions/radio-shouts.ts

@@ -12,12 +12,7 @@ const shoutSchema = z.object({
 	message: z.string().min(1, "Message is required").max(255),
 });
 
-type ShoutOutcome =
-	| "posted"
-	| "invalid"
-	| "moderated"
-	| "ratelimit"
-	| "error";
+type ShoutOutcome = "posted" | "invalid" | "moderated" | "ratelimit" | "error";
 
 function shoutsRedirect(outcome: ShoutOutcome): never {
 	if (outcome === "posted") redirect("/radio/shouts?posted=1");

src/actions/register.ts

@@ -4,6 +4,7 @@ import { redirect } from "next/navigation";
 import { z } from "zod";
 import { sendVerification } from "@/actions/email-verify";
 import { hashPassword } from "@/lib/auth/password";
+import { logger } from "@/lib/logger";
 import { prisma } from "@/lib/prisma";
 import { clientIp, rateLimit } from "@/lib/rate-limit";
 import { captchaConfig, verifyCaptcha } from "@/lib/services/captcha";
@@ -100,6 +101,7 @@ export async function register(
 		});
 		if (existing) return "That username is already taken";
 	} catch {
+		logger.warn("Username uniqueness check failed during registration");
 		return "Registration is temporarily unavailable";
 	}
 
@@ -122,18 +124,13 @@ export async function register(
 			try {
 				await sendVerification(mail);
 			} catch {
-				// No-op: account is created; user can request a new link later.
+				logger.warn("Failed to send verification email after registration");
 			}
 		}
 	} catch {
+		logger.warn("Account creation failed");
 		return "Could not create the account (is the username unique?)";
 	}
 
-	if (hasEmail) {
-		redirect("/login?registered=1");
-	} else {
-		const { signIn } = await import("@/lib/auth");
-		await signIn("credentials", { username, password, redirect: false });
-		redirect("/verify?method=discord");
-	}
+	redirect("/login?registered=1");
 }

src/actions/save-favicon.ts

@@ -3,9 +3,9 @@
 import { mkdir, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { revalidatePath } from "next/cache";
+import { resolveMediaPath } from "@/lib/media-storage";
 import { prisma } from "@/lib/prisma";
 import { siteSettings } from "@/lib/services/site-settings";
-import { resolveMediaPath } from "@/lib/media-storage";
 
 const FAVICON_DIR = resolveMediaPath("favicon");
 const MAX_SIZE = 2 * 1024 * 1024; // 2MB

src/actions/save-logo.ts

@@ -3,9 +3,9 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { revalidatePath } from "next/cache";
+import { resolveMediaPath } from "@/lib/media-storage";
 import { prisma } from "@/lib/prisma";
 import { siteSettings } from "@/lib/services/site-settings";
-import { resolveMediaPath } from "@/lib/media-storage";
 
 const MEDIA_DIR = resolveMediaPath("logo");
 

src/actions/sessions.ts

@@ -3,6 +3,7 @@
 import { auth, signOut } from "@/lib/auth";
 import { invalidateJwtVersionCache } from "@/lib/auth/jwt-version-cache";
 import { personalTokenScope } from "@/lib/auth/personal-token-scope";
+import { logger } from "@/lib/logger";
 import { prisma } from "@/lib/prisma";
 
 /**
@@ -23,8 +24,11 @@ export async function signOutEverywhere(): Promise<void> {
 			data: { websiteJwtVersion: { increment: 1 } },
 		});
 		await invalidateJwtVersionCache(userId);
-	} catch {
-		/* still continue */
+	} catch (err) {
+		logger.warn("Failed to bump JWT version during sign-out-everywhere", {
+			userId,
+			error: err instanceof Error ? err.message : "Unknown",
+		});
 	}
 
 	// Revoke API bearer tokens (Sanctum / personal_access_tokens).
@@ -32,8 +36,14 @@ export async function signOutEverywhere(): Promise<void> {
 		await prisma.personalAccessTokens.deleteMany({
 			where: personalTokenScope(userId),
 		});
-	} catch {
-		/* still sign out locally */
+	} catch (err) {
+		logger.warn(
+			"Failed to revoke personal access tokens during sign-out-everywhere",
+			{
+				userId,
+				error: err instanceof Error ? err.message : "Unknown",
+			},
+		);
 	}
 
 	await signOut({ redirectTo: "/login?signedOutAll=1" });

src/actions/shop.ts

@@ -28,12 +28,7 @@ function parseBadgeCodes(raw: string | null | undefined): string[] {
 		.filter((s) => s.length > 0 && s.length <= 32);
 }
 
-type BuyOutcome =
-	| "bought"
-	| "invalid"
-	| "credits"
-	| "ratelimit"
-	| "error";
+type BuyOutcome = "bought" | "invalid" | "credits" | "ratelimit" | "error";
 
 function shopRedirect(
 	categoryId: string,

src/actions/social.ts

@@ -22,12 +22,7 @@ type FriendRequestOutcome =
 	| "ratelimit"
 	| "error";
 
-type ThreadOutcome =
-	| "posted"
-	| "invalid"
-	| "not_found"
-	| "ratelimit"
-	| "error";
+type ThreadOutcome = "posted" | "invalid" | "not_found" | "ratelimit" | "error";
 
 type ReplyOutcome =
 	| "replied"

src/actions/users.ts

@@ -388,6 +388,7 @@ export const muteUser = adminAction(
 	{ permission: PERMS.USERS_EDIT, schema: muteSchema },
 	async (ctx) => {
 		const _target = await guardRank(ctx.data.userId, ctx.session.user.rank);
+		void _target;
 		const success = await rcon.muteUser(ctx.data.userId, ctx.data.duration);
 		if (!success)
 			throw new ActionError("Failed to mute. Is the emulator running?");
@@ -440,6 +441,7 @@ export const sendCredits = adminAction(
 	{ permission: PERMS.USERS_EDIT, schema: sendCreditsSchema },
 	async (ctx) => {
 		const _target = await guardRank(ctx.data.userId, ctx.session.user.rank);
+		void _target;
 		const success = await rcon.giveCredits(ctx.data.userId, ctx.data.amount);
 		if (!success)
 			throw new ActionError("Failed to send credits. Is the emulator running?");

src/app/(site)/apply/staff/page.tsx

@@ -4,8 +4,9 @@ import type { CSSProperties } from "react";
 import { applyStaff } from "@/actions/applications";
 import { ContentCard, EmptyState } from "@/components/public/ui";
 import { auth } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
+import { formatDate } from "@/lib/format-date";
 import { resolveHotelName } from "@/lib/hotel-name";
+import { prisma } from "@/lib/prisma";
 
 export const dynamic = "force-dynamic";
 
@@ -55,11 +56,6 @@ export default async function ApplyStaffPage({
 	const userId = Number(session.user.id);
 	const hotelName = await resolveHotelName();
 
-	function formatDeadline(d: Date | null | undefined): string {
-		if (!d) return t("noDeadline");
-		return d.toISOString().slice(0, 16).replace("T", " ");
-	}
-
 	// ── Open positions ──────────────────────────────────────────
 	// Each query is isolated so a DB hiccup degrades that section to empty
 	// rather than 500-ing the whole page.
@@ -149,7 +145,13 @@ export default async function ApplyStaffPage({
 								<div className="content-card-body">
 									<p style={{ margin: "0 0 0.5rem" }}>{position.description}</p>
 									<p className="muted" style={{ margin: "0 0 0.75rem" }}>
-										{t("deadline", { date: formatDeadline(position.applyTo) })}
+										{t("deadline", {
+											date: formatDate(
+												position.applyTo,
+												"datetime",
+												t("noDeadline"),
+											),
+										})}
 									</p>
 
 									{alreadyApplied ? (

src/app/(site)/apply/team/page.tsx

@@ -4,8 +4,8 @@ import type { CSSProperties } from "react";
 import { applyTeam } from "@/actions/applications";
 import { ContentCard, EmptyState } from "@/components/public/ui";
 import { auth } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
 import { resolveHotelName } from "@/lib/hotel-name";
+import { prisma } from "@/lib/prisma";
 
 export const dynamic = "force-dynamic";
 

src/app/(site)/events/[slugOrId]/page.tsx

@@ -42,7 +42,10 @@ export default async function EventDetailPage({
 		})
 		.catch(() => null);
 
-	if (!event || (event.status !== "published" && event.status !== "completed")) {
+	if (
+		!event ||
+		(event.status !== "published" && event.status !== "completed")
+	) {
 		notFound();
 	}
 
@@ -70,8 +73,7 @@ export default async function EventDetailPage({
 	const winnerName = new Map(winners.map((u) => [u.id, u.username]));
 
 	const isFull =
-		event.maxPlayers != null &&
-		event._count.registrations >= event.maxPlayers;
+		event.maxPlayers != null && event._count.registrations >= event.maxPlayers;
 	const hasEnded =
 		event.status === "completed" ||
 		(event.endsAt != null && event.endsAt.getTime() < Date.now());
@@ -157,7 +159,11 @@ export default async function EventDetailPage({
 				</div>
 			</ContentCard>
 
-			<ContentCard icon="✍️" title={t("registerTitle")} subtitle={t("registerSubtitle")}>
+			<ContentCard
+				icon="✍️"
+				title={t("registerTitle")}
+				subtitle={t("registerSubtitle")}
+			>
 				{session?.user && canRegister ? (
 					<EventRegisterButton eventId={event.id} />
 				) : (

src/app/(site)/events/page.tsx

@@ -112,7 +112,13 @@ export default async function EventsPage() {
 										>
 											{formatDate(event.startsAt, "datetime", "")}
 										</p>
-										<p style={{ margin: 0, fontSize: "0.88rem", lineHeight: 1.5 }}>
+										<p
+											style={{
+												margin: 0,
+												fontSize: "0.88rem",
+												lineHeight: 1.5,
+											}}
+										>
 											{excerpt(event.description, 120)}
 										</p>
 										<p

src/app/(site)/guilds/[id]/forum/[threadId]/page.tsx

@@ -5,6 +5,7 @@ import type { CSSProperties } from "react";
 import { replyToThread } from "@/actions/social";
 import { ContentCard, EmptyState } from "@/components/public/ui";
 import { auth } from "@/lib/auth";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 60;
@@ -27,11 +28,6 @@ function feedbackStyle(tone: "success" | "error"): CSSProperties {
 	};
 }
 
-function formatTimestamp(ts: number | null | undefined): string {
-	if (!ts) return "";
-	return new Date(ts * 1000).toISOString().slice(0, 16).replace("T", " ");
-}
-
 export default async function GuildForumThreadPage({
 	params,
 	searchParams,
@@ -220,7 +216,9 @@ export default async function GuildForumThreadPage({
 											)}
 										</span>
 										<span className="muted" style={{ fontSize: "0.85rem" }}>
-											{formatTimestamp(post.createdAt)}
+											{formatDate(
+												post.createdAt ? new Date(post.createdAt * 1000) : null,
+											)}
 										</span>
 									</div>
 									<p
@@ -240,7 +238,11 @@ export default async function GuildForumThreadPage({
 			</ContentCard>
 
 			{canReply ? (
-				<ContentCard icon="✍️" title={t("replyTitle")} subtitle={t("replySubtitle")}>
+				<ContentCard
+					icon="✍️"
+					title={t("replyTitle")}
+					subtitle={t("replySubtitle")}
+				>
 					<form action={replyToThread}>
 						<input type="hidden" name="guildId" value={String(guild.id)} />
 						<input type="hidden" name="threadId" value={String(thread.id)} />
@@ -266,8 +268,7 @@ export default async function GuildForumThreadPage({
 				</p>
 			) : (
 				<p className="muted" style={{ margin: 0 }}>
-					{t("loginToReply")}{" "}
-					<Link href="/login">{t("loginLink")}</Link>
+					{t("loginToReply")} <Link href="/login">{t("loginLink")}</Link>
 				</p>
 			)}
 		</main>

src/app/(site)/guilds/[id]/forum/page.tsx

@@ -3,6 +3,7 @@ import { notFound } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import type { CSSProperties } from "react";
 import { ContentCard, EmptyState } from "@/components/public/ui";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
@@ -36,11 +37,6 @@ type ThreadRow = {
 	locked: number | null;
 };
 
-function formatTimestamp(ts: number | null | undefined): string {
-	if (!ts) return "";
-	return new Date(ts * 1000).toISOString().slice(0, 10);
-}
-
 export default async function GuildForumPage({
 	params,
 	searchParams,
@@ -194,7 +190,10 @@ export default async function GuildForumPage({
 											{t2.postsCount ?? 0}
 										</td>
 										<td className="muted" style={{ padding: "0.6rem 0.75rem" }}>
-											{formatTimestamp(t2.createdAt)}
+											{formatDate(
+												t2.createdAt ? new Date(t2.createdAt * 1000) : null,
+												"date",
+											)}
 										</td>
 									</tr>
 								);

src/app/(site)/guilds/[id]/page.tsx

@@ -3,6 +3,7 @@ import { notFound } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState, StatBlock } from "@/components/public/ui";
 import { avatarImageUrl } from "@/lib/format";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 import { siteSettings } from "@/lib/services/site-settings";
 
@@ -26,11 +27,6 @@ type MemberView = {
 	isOwner: boolean;
 };
 
-function formatTimestamp(ts: number): string {
-	if (!ts) return "";
-	return new Date(ts * 1000).toISOString().slice(0, 10);
-}
-
 export default async function GuildPage({
 	params,
 }: {
@@ -123,7 +119,7 @@ export default async function GuildPage({
 			return a.memberSince - b.memberSince;
 		});
 
-	const created = formatTimestamp(guild.dateCreated);
+	const created = formatDate(new Date(guild.dateCreated * 1000), "date");
 
 	return (
 		<main style={{ display: "grid", gap: "1.5rem" }}>

src/app/(site)/help/[category]/page.tsx

@@ -2,10 +2,10 @@ import Link from "next/link";
 import { notFound } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { ContentCard } from "@/components/public/ui";
-import { prisma } from "@/lib/prisma";
-import { sanitize } from "@/lib/sanitize";
 import { SanitizedHtml } from "@/components/shared/sanitized-html";
 import { resolveHotelName } from "@/lib/hotel-name";
+import { prisma } from "@/lib/prisma";
+import { sanitize } from "@/lib/sanitize";
 
 export const revalidate = 300;
 
@@ -118,8 +118,8 @@ export default async function HelpCategoryPage({
 					/>
 				) : null}
 
-		{/* content is author-supplied HTML — sanitised server-side. */}
-		<SanitizedHtml html={sanitize(content)} style={{ lineHeight: 1.7 }} />
+				{/* content is author-supplied HTML — sanitised server-side. */}
+				<SanitizedHtml html={sanitize(content)} style={{ lineHeight: 1.7 }} />
 
 				{hasButton ? (
 					<div style={{ clear: "both", marginTop: "1rem" }}>

src/app/(site)/help/tickets/[id]/page.tsx

@@ -99,9 +99,7 @@ export default async function HelpTicketDetailPage({
 		replies = [];
 	}
 
-	const authorIds = [
-		...new Set([userId, ...replies.map((r) => r.userId)]),
-	];
+	const authorIds = [...new Set([userId, ...replies.map((r) => r.userId)])];
 	let users: { id: number; username: string }[] = [];
 	try {
 		users = await prisma.user.findMany({
@@ -174,7 +172,11 @@ export default async function HelpTicketDetailPage({
 				<Link href="/help/tickets">{t("backToList")}</Link>
 			</p>
 
-			<ContentCard icon="🎫" title={ticket.title} subtitle={t("ticketId", { id: String(ticket.id) })}>
+			<ContentCard
+				icon="🎫"
+				title={ticket.title}
+				subtitle={t("ticketId", { id: String(ticket.id) })}
+			>
 				<span className={`online-badge${ticket.open ? " online" : ""}`}>
 					<span className="online-dot" aria-hidden />
 					{ticket.open ? t("statusOpen") : t("statusClosed")}
@@ -220,7 +222,9 @@ export default async function HelpTicketDetailPage({
 									}}
 								>
 									<span style={{ fontWeight: 700 }}>
-										{index === 0 ? t("you") : username ? (
+										{index === 0 ? (
+											t("you")
+										) : username ? (
 											<Link href={`/u/${username}`}>{username}</Link>
 										) : (
 											<span className="muted">

src/app/(site)/layout.tsx

@@ -11,7 +11,11 @@ import { auth } from "@/lib/auth";
  * Public site chrome. Route group `(site)` keeps this off `/admin` and `/client`,
  * so housekeeping is never constrained by the public max-w-7xl grid.
  */
-export default async function SiteLayout({ children }: { children: ReactNode }) {
+export default async function SiteLayout({
+	children,
+}: {
+	children: ReactNode;
+}) {
 	const session = await auth();
 
 	return (

src/app/(site)/login/page.tsx

@@ -3,25 +3,29 @@ import Image from "next/image";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { LoginForm } from "@/components/auth/login-form";
+import { Clock } from "@/components/clock";
+import { LanguageSwitcher } from "@/components/language-switcher";
+import { Reveal } from "@/components/motion-reveal";
+import { ThemeSwitcher } from "@/components/theme-switcher";
 import { cached } from "@/lib/cache";
 import { avatarImageUrl } from "@/lib/format";
+import { resolveHotelName } from "@/lib/hotel-name";
 import { prisma } from "@/lib/prisma";
 import { captchaConfig } from "@/lib/services/captcha";
-import { resolveHotelName } from "@/lib/hotel-name";
 import { siteSettings } from "@/lib/services/site-settings";
-import { ThemeSwitcher } from "@/components/theme-switcher";
-import { LanguageSwitcher } from "@/components/language-switcher";
 
 export default async function LoginPage() {
 	const t = await getTranslations("pages.login");
 	const th = await getTranslations("header");
-	const [hotelName, imagerRaw, cfg] = await Promise.all([
+	const [hotelName, imagerRaw, cfg, logo] = await Promise.all([
 		resolveHotelName(),
 		siteSettings.get(
 			"habbo_imaging_url",
 			"https://www.habbo.com/habbo-imaging/avatarimage",
 		),
 		captchaConfig(),
+		siteSettings.get("radio_social_discord", ""),
+		siteSettings.get("cms_logo", ""),
 	]);
 	const imager = imagerRaw ?? "https://www.habbo.com/habbo-imaging/avatarimage";
 	const nonce = (await headers()).get("x-nonce") ?? undefined;
@@ -47,225 +51,351 @@ export default async function LoginPage() {
 	]);
 
 	return (
-		<div className="flex flex-col gap-6">
-			<div className="relative">
+		<div className="flex flex-col gap-10 pb-14">
+			{/* ── Top Bar ── */}
+			<Reveal>
 				<div
-					className="absolute -inset-6 rounded-full opacity-[0.06] blur-[40px]"
-					style={{ background: "var(--color-primary)" }}
-				/>
-				<div
-					className="relative flex items-center justify-between rounded-2xl border px-5 py-3"
+					className="relative flex items-center justify-between rounded-xl border px-5 py-3"
 					style={{
-						background: "color-mix(in srgb, var(--color-surface) 50%, transparent)",
-						backdropFilter: "blur(12px)",
-						WebkitBackdropFilter: "blur(12px)",
-						borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
+						background:
+							"color-mix(in srgb, var(--color-surface) 60%, transparent)",
+						backdropFilter: "blur(14px)",
+						WebkitBackdropFilter: "blur(14px)",
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
 					}}
 				>
-					<span className="text-xs font-bold uppercase tracking-[0.15em] opacity-40" style={{ color: "var(--color-text-muted)" }}>
-						{hotelName}
-					</span>
-					<div className="flex items-center gap-1">
+					<div className="flex items-center gap-3">
+						{logo ? (
+							<Image
+								src={logo}
+								alt={hotelName}
+								width={100}
+								height={28}
+								className="shrink-0 object-contain"
+								unoptimized
+								style={{ maxHeight: 28, width: "auto", height: "auto" }}
+							/>
+						) : (
+							<Image
+								src="/assets/images/icons/lighthouse.png"
+								alt={hotelName}
+								width={28}
+								height={28}
+								className="shrink-0"
+								unoptimized
+							/>
+						)}
+						<span
+							className="text-sm font-extrabold uppercase tracking-wide"
+							style={{ color: "var(--color-text-readable)" }}
+						>
+							{hotelName}
+						</span>
+					</div>
+					<div
+						className="flex items-center gap-1.5 rounded-lg px-2 py-1"
+						style={{
+							background:
+								"color-mix(in srgb, var(--color-text-muted) 4%, transparent)",
+						}}
+					>
 						<LanguageSwitcher />
-						<div className="w-px h-5 mx-1" style={{ background: "color-mix(in srgb, var(--color-text-muted) 12%, transparent)" }} />
+						<div
+							className="w-px h-5"
+							style={{
+								background:
+									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+							}}
+						/>
+						<Clock />
+						<div
+							className="w-px h-5"
+							style={{
+								background:
+									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+							}}
+						/>
 						<ThemeSwitcher />
 					</div>
 				</div>
-			</div>
-			<div className="flex flex-col lg:flex-row gap-10">
-			{/* Left panel */}
-			<div className="lg:w-80 shrink-0 space-y-4">
-				<div
-					className="relative overflow-hidden rounded-2xl border p-6 text-center"
-					style={{
-						borderColor: "color-mix(in srgb, var(--color-primary) 20%, transparent)",
-						background: `url(/assets/images/background.png) center/cover no-repeat`,
-					}}
-				>
-					<div
-						className="absolute inset-0"
-						style={{
-							background: "linear-gradient(135deg, color-mix(in srgb, var(--color-surface) 85%, transparent) 0%, color-mix(in srgb, var(--color-surface) 40%, transparent) 100%)",
-						}}
-					/>
-					<div className="relative">
-						<Image
-							src="/assets/images/FrankwithBag.gif"
-							alt="Frank"
-							width={130}
-							height={170}
-							className="object-contain mx-auto drop-shadow-xl"
-							unoptimized
-							priority
-						/>
+			</Reveal>
+			<Reveal>
+				<div className="flex flex-col lg:flex-row gap-10 stagger-children">
+					{/* Left panel */}
+					<div className="lg:w-80 shrink-0 space-y-4">
 						<div
-							className="inline-flex items-center gap-2 px-3.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider mt-4 mb-3 border backdrop-blur-sm"
+							className="relative overflow-hidden rounded-2xl border p-6 text-center card-premium"
 							style={{
-								borderColor: "color-mix(in srgb, var(--color-primary) 18%, transparent)",
-								background: "color-mix(in srgb, var(--color-primary) 10%, transparent)",
-								color: "var(--color-primary-readable, var(--color-primary))",
+								borderColor:
+									"color-mix(in srgb, var(--color-primary) 20%, transparent)",
+								background: `url(/assets/images/background.png) center/cover no-repeat`,
 							}}
 						>
-							<span className="relative flex h-2 w-2">
-								<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75" />
-								<span className="relative inline-flex rounded-full h-2 w-2 bg-green-500" />
-							</span>
-							{th("online", { count: online, hotel: "" }).trim()}
-						</div>
-						<h1
-							className="text-xl font-black"
-							style={{ color: "var(--color-text-readable)" }}
-						>
-							{t("welcomeBack")}
-						</h1>
-						<p
-							className="text-xs mt-1 mx-auto max-w-[200px] leading-relaxed"
-							style={{ color: "var(--color-text-muted)" }}
-						>
-							{t("welcomeBackSub", { hotelName })}
-						</p>
-					</div>
-				</div>
-
-				{recentUsers.length > 0 && (
-					<div
-						className="rounded-2xl border p-4"
-						style={{
-							background: "color-mix(in srgb, var(--color-surface) 70%, transparent)",
-							backdropFilter: "blur(8px)",
-							WebkitBackdropFilter: "blur(8px)",
-							borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-						}}
-					>
-						<h3
-							className="text-xs font-bold uppercase tracking-widest mb-3 flex items-center gap-2"
-							style={{ color: "var(--color-text-muted)" }}
-						>
-							<span className="w-2 h-2 rounded-full bg-green-500" />
-							{th("online", { count: online, hotel: "" }).trim()}
-						</h3>
-						<div className="grid grid-cols-4 gap-1.5">
-							{recentUsers.map((u) => (
+							<div
+								className="absolute inset-0"
+								style={{
+									background:
+										"linear-gradient(135deg, color-mix(in srgb, var(--color-surface) 85%, transparent) 0%, color-mix(in srgb, var(--color-surface) 40%, transparent) 100%)",
+								}}
+							/>
+							<div className="relative">
+								<Image
+									src="/assets/images/FrankwithBag.gif"
+									alt="Frank"
+									width={130}
+									height={170}
+									className="object-contain mx-auto drop-shadow-xl animate-float"
+									unoptimized
+									priority
+								/>
 								<div
-									key={u.username}
-									className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+									className="inline-flex items-center gap-2 px-3.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider mt-4 mb-3 border backdrop-blur-sm"
 									style={{
-										background: "color-mix(in srgb, var(--color-primary) 4%, transparent)",
+										borderColor:
+											"color-mix(in srgb, var(--color-primary) 18%, transparent)",
+										background:
+											"color-mix(in srgb, var(--color-primary) 10%, transparent)",
+										color:
+											"var(--color-primary-readable, var(--color-primary))",
+									}}
+								>
+									<span className="relative flex h-2 w-2">
+										<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75" />
+										<span className="relative inline-flex rounded-full h-2 w-2 bg-green-500" />
+									</span>
+									{th("online", { count: online, hotel: "" }).trim()}
+								</div>
+								<h1
+									className="text-xl font-black"
+									style={{
+										color: "var(--color-text-readable)",
+										fontFamily: "var(--font-nunito)",
+									}}
+								>
+									{t("welcomeBack")}
+								</h1>
+								<p
+									className="text-xs mt-1 mx-auto max-w-[200px] leading-relaxed"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{t("welcomeBackSub", { hotelName })}
+								</p>
+							</div>
+						</div>
+
+						{recentUsers.length > 0 && (
+							<div
+								className="overflow-hidden rounded-xl border"
+								style={{
+									borderColor:
+										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+								}}
+							>
+								<div
+									className="flex items-center gap-2.5 px-4 py-3"
+									style={{
+										background:
+											"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
 									}}
 								>
 									<Image
-										src={avatarImageUrl(imager, u.look, { headOnly: true, direction: 2, size: "s" })}
+										src="/assets/images/icons/navigation/goody.png"
 										alt=""
-										width={26}
-										height={32}
-										className="rounded-md"
+										width={18}
+										height={18}
 										unoptimized
 									/>
-									<span
-										className="text-[8px] font-bold truncate w-full text-center leading-tight"
-										style={{ color: "var(--color-text-readable)" }}
+									<h3
+										className="text-sm font-bold text-white"
+										style={{ fontFamily: "var(--font-nunito)" }}
 									>
-										{u.username}
-									</span>
+										{th("online", { count: online, hotel: "" }).trim()}
+									</h3>
 								</div>
-							))}
-						</div>
-					</div>
-				)}
-
-				{latestUsers.length > 0 && (
-					<div
-						className="rounded-2xl border p-4"
-						style={{
-							background: "color-mix(in srgb, var(--color-surface) 70%, transparent)",
-							backdropFilter: "blur(8px)",
-							WebkitBackdropFilter: "blur(8px)",
-							borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-						}}
-					>
-						<h3
-							className="text-xs font-bold uppercase tracking-widest mb-3 flex items-center gap-2"
-							style={{ color: "var(--color-text-muted)" }}
-						>
-							✨ Newest citizens
-						</h3>
-						<div className="grid grid-cols-4 gap-1.5">
-							{latestUsers.map((u) => (
 								<div
-									key={u.username}
-									className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+									className="p-4"
 									style={{
-										background: "color-mix(in srgb, var(--color-primary) 4%, transparent)",
+										background:
+											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
+									}}
+								>
+									<div className="grid grid-cols-4 gap-1.5">
+										{recentUsers.map((u) => (
+											<div
+												key={u.username}
+												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+												style={{
+													background:
+														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+												}}
+											>
+												<Image
+													src={avatarImageUrl(imager, u.look, {
+														headOnly: true,
+														direction: 2,
+														size: "s",
+													})}
+													alt=""
+													width={26}
+													height={32}
+													className="rounded-md"
+													unoptimized
+												/>
+												<span
+													className="text-[8px] font-bold truncate w-full text-center leading-tight"
+													style={{ color: "var(--color-text-readable)" }}
+												>
+													{u.username}
+												</span>
+											</div>
+										))}
+									</div>
+								</div>
+							</div>
+						)}
+
+						{latestUsers.length > 0 && (
+							<div
+								className="overflow-hidden rounded-xl border"
+								style={{
+									borderColor:
+										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+								}}
+							>
+								<div
+									className="flex items-center gap-2.5 px-4 py-3"
+									style={{
+										background:
+											"linear-gradient(140deg, #5a2d82 0%, #6b3a9e 20%, #7d47b8 40%, #8f54d0 60%, #7d47b8 75%, #6b3a9e 90%, #5a2d82 100%)",
 									}}
 								>
 									<Image
-										src={avatarImageUrl(imager, u.look, { headOnly: true, direction: 2, size: "s" })}
+										src="/assets/images/icons/friends.png"
 										alt=""
-										width={26}
-										height={32}
-										className="rounded-md"
+										width={18}
+										height={18}
 										unoptimized
 									/>
-									<span
-										className="text-[8px] font-bold truncate w-full text-center leading-tight"
-										style={{ color: "var(--color-text-readable)" }}
+									<h3
+										className="text-sm font-bold text-white"
+										style={{ fontFamily: "var(--font-nunito)" }}
 									>
-										{u.username}
-									</span>
+										Newest citizens
+									</h3>
 								</div>
-							))}
-						</div>
-					</div>
-				)}
+								<div
+									className="p-4"
+									style={{
+										background:
+											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
+									}}
+								>
+									<div className="grid grid-cols-4 gap-1.5">
+										{latestUsers.map((u) => (
+											<div
+												key={u.username}
+												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+												style={{
+													background:
+														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+												}}
+											>
+												<Image
+													src={avatarImageUrl(imager, u.look, {
+														headOnly: true,
+														direction: 2,
+														size: "s",
+													})}
+													alt=""
+													width={26}
+													height={32}
+													className="rounded-md"
+													unoptimized
+												/>
+												<span
+													className="text-[8px] font-bold truncate w-full text-center leading-tight"
+													style={{ color: "var(--color-text-readable)" }}
+												>
+													{u.username}
+												</span>
+											</div>
+										))}
+									</div>
+								</div>
+							</div>
+						)}
 
-				<p className="text-xs text-center" style={{ color: "var(--color-text-muted)" }}>
-					{t("noAccount") ?? "No account?"}{" "}
-					<Link
-						href="/register"
-						className="font-extrabold hover:underline"
-						style={{ color: "var(--color-primary-readable, var(--color-primary))" }}
-					>
-						{t("createOne") ?? "Create one"}
-					</Link>
-				</p>
-			</div>
-
-			{/* Right: form */}
-			<div className="flex-1">
-				<div
-					className="rounded-2xl border p-6"
-					style={{
-						background: "color-mix(in srgb, var(--color-surface) 70%, transparent)",
-						backdropFilter: "blur(8px)",
-						WebkitBackdropFilter: "blur(8px)",
-						borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-					}}
-				>
-					<div className="mb-6">
-						<h2
-							className="text-2xl font-black tracking-tight"
-							style={{ color: "var(--color-text-readable)" }}
-						>
-							{t("title")}
-						</h2>
 						<p
-							className="text-sm mt-0.5"
+							className="text-xs text-center"
 							style={{ color: "var(--color-text-muted)" }}
 						>
-							{t("subtitle")}
+							{t("noAccount") ?? "No account?"}{" "}
+							<Link
+								href="/register"
+								className="font-extrabold hover:underline"
+								style={{
+									color: "var(--color-primary-readable, var(--color-primary))",
+								}}
+							>
+								{t("createOne") ?? "Create one"}
+							</Link>
 						</p>
 					</div>
-					<LoginForm
-						captcha={{
-							provider: cfg.provider,
-							siteKey: cfg.siteKey || undefined,
-							field: cfg.field || undefined,
-						}}
-						nonce={nonce}
-					/>
+
+					{/* Right: form */}
+					<div className="flex-1">
+						<div
+							className="overflow-hidden rounded-xl border"
+							style={{
+								borderColor:
+									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+							}}
+						>
+							<div
+								className="flex items-center gap-2.5 px-4 py-3"
+								style={{
+									background:
+										"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
+								}}
+							>
+								<Image
+									src="/assets/images/icons/navigation/me.png"
+									alt=""
+									width={18}
+									height={18}
+									unoptimized
+								/>
+								<h2
+									className="text-sm font-bold text-white"
+									style={{ fontFamily: "var(--font-nunito)" }}
+								>
+									{t("title")}
+								</h2>
+							</div>
+							<div
+								className="p-6"
+								style={{ backgroundColor: "var(--color-surface)" }}
+							>
+								<p
+									className="text-sm mb-6"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{t("subtitle")}
+								</p>
+								<LoginForm
+									captcha={{
+										provider: cfg.provider,
+										siteKey: cfg.siteKey || undefined,
+										field: cfg.field || undefined,
+									}}
+									nonce={nonce}
+								/>
+							</div>
+						</div>
+					</div>
 				</div>
-			</div>
-			</div>
+			</Reveal>
 		</div>
 	);
 }

src/app/(site)/marketplace/page.tsx

@@ -1,5 +1,6 @@
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState, StatBlock } from "@/components/public/ui";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
@@ -26,10 +27,6 @@ function listedAgo(ts: number, t: RelativeTimeTranslator): string {
 	return t("daysAgo", { count: days });
 }
 
-function listedAt(ts: number): string {
-	return new Date(ts * 1000).toISOString().slice(0, 16).replace("T", " ");
-}
-
 export default async function MarketplacePage() {
 	const t = await getTranslations("pages.marketplace");
 	let offers: {
@@ -127,7 +124,10 @@ export default async function MarketplacePage() {
 										<td style={{ fontWeight: 700 }}>
 											{o.price.toLocaleString()} cr
 										</td>
-										<td className="muted" title={listedAt(o.timestamp)}>
+										<td
+											className="muted"
+											title={formatDate(new Date(o.timestamp * 1000))}
+										>
 											{listedAgo(o.timestamp, t)}
 										</td>
 									</tr>

src/app/(site)/me/page.tsx

@@ -3,7 +3,8 @@ import Link from "next/link";
 import { redirect } from "next/navigation";
 import type { CSSProperties, ReactNode } from "react";
 import { claimReferral } from "@/actions/referral";
-import { ContentCard, EmptyState, OnlineBadge } from "@/components/public/ui";
+
+import { Reveal } from "@/components/motion-reveal";
 import { auth } from "@/lib/auth";
 import { avatarImageUrl } from "@/lib/format";
 import { resolveHotelName } from "@/lib/hotel-name";
@@ -68,51 +69,107 @@ export default async function MePage({
 
 	let content: ReactNode;
 	try {
-		const [user, imagerBase, hotelName, neededRaw, amountRaw, currencyRaw] =
-			await Promise.all([
-				prisma.user.findUnique({
-					where: { id: userId },
+		const BADGE_IMG_BASE = "https://images.habbo.com/c_images/album1584";
+
+		const [
+			user,
+			imagerBase,
+			hotelName,
+			neededRaw,
+			amountRaw,
+			currencyRaw,
+			alertRaw,
+			recentRooms,
+			badges,
+			lastWebLogin,
+			userSettings,
+			friendCount,
+			unreadCount,
+		] = await Promise.all([
+			prisma.user.findUnique({
+				where: { id: userId },
+				select: {
+					id: true,
+					username: true,
+					look: true,
+					motto: true,
+					rank: true,
+					credits: true,
+					accountCreated: true,
+					lastLogin: true,
+					lastOnline: true,
+				},
+			}),
+			siteSettings.get(
+				"habbo_imaging_url",
+				"https://www.habbo.com/habbo-imaging/avatarimage",
+			),
+			resolveHotelName(),
+			prisma.websiteSetting
+				.findUnique({
+					where: { key: "referrals_needed" },
+					select: { value: true },
+				})
+				.catch(() => null),
+			prisma.websiteSetting
+				.findUnique({
+					where: { key: "referral_reward_amount" },
+					select: { value: true },
+				})
+				.catch(() => null),
+			prisma.websiteSetting
+				.findFirst({
+					where: {
+						key: {
+							in: ["referral_reward_currency_type", "referral_reward_currency"],
+						},
+					},
+					select: { value: true },
+				})
+				.catch(() => null),
+			siteSettings.get("hotel_alert_banner", ""),
+			prisma.rooms
+				.findMany({
+					orderBy: { id: "desc" },
 					select: {
 						id: true,
-						username: true,
-						look: true,
-						motto: true,
-						rank: true,
-						credits: true,
-						accountCreated: true,
+						name: true,
+						ownerName: true,
+						users: true,
+						usersMax: true,
 					},
-				}),
-				siteSettings.get(
-					"habbo_imaging_url",
-					"https://www.habbo.com/habbo-imaging/avatarimage",
-				),
-				resolveHotelName(),
-				prisma.websiteSetting
-					.findUnique({
-						where: { key: "referrals_needed" },
-						select: { value: true },
-					})
-					.catch(() => null),
-				prisma.websiteSetting
-					.findUnique({
-						where: { key: "referral_reward_amount" },
-						select: { value: true },
-					})
-					.catch(() => null),
-				prisma.websiteSetting
-					.findFirst({
-						where: {
-							key: {
-								in: [
-									"referral_reward_currency_type",
-									"referral_reward_currency",
-								],
-							},
-						},
-						select: { value: true },
-					})
-					.catch(() => null),
-			]);
+					take: 6,
+				})
+				.catch(() => []),
+			prisma.usersBadges
+				.findMany({
+					where: { userId, slotId: { gt: 0 } },
+					orderBy: { slotId: "asc" },
+					select: { badgeCode: true, slotId: true },
+				})
+				.catch(() => []),
+			prisma.websiteLoginLogs
+				.findFirst({
+					where: { userId },
+					orderBy: { id: "desc" },
+					select: { createdAt: true },
+				})
+				.catch(() => null),
+			prisma.usersSettings
+				.findUnique({
+					where: { userId },
+					select: { achievementScore: true, respectsReceived: true },
+				})
+				.catch(() => null),
+			prisma.messengerFriendships
+				.count({
+					where: { OR: [{ userOneId: userId }, { userTwoId: userId }] },
+				})
+				.catch(() => 0),
+			prisma.messengerOffline.count({ where: { userId } }).catch(() => 0),
+		]);
+
+		void lastWebLogin;
 
 		if (!user) throw new Error("user-not-found");
 
@@ -168,18 +225,26 @@ export default async function MePage({
 		const registered = new Date(user.accountCreated * 1000)
 			.toISOString()
 			.slice(0, 10);
+		const lastLoginDate = user.lastLogin
+			? new Date(user.lastLogin * 1000).toISOString().slice(0, 10)
+			: "Never";
+		const lastOnlineDate = user.lastOnline
+			? new Date(user.lastOnline * 1000).toISOString().slice(0, 10)
+			: "Never";
 		const referralLink = `/register?ref=${encodeURIComponent(user.username)}`;
 
-		const imager = imagerBase ?? "https://www.habbo.com/habbo-imaging/avatarimage";
-		const avatarFull = avatarImageUrl(imager, user.look, { size: "l", direction: 2 });
-		const avatarHead = avatarImageUrl(imager, user.look, { headOnly: true, direction: 2, size: "s" });
-
+		const imager =
+			imagerBase ?? "https://www.habbo.com/habbo-imaging/avatarimage";
+		const avatarFull = avatarImageUrl(imager, user.look, {
+			size: "l",
+			direction: 2,
+		});
 		content = (
 			<div className="flex flex-col gap-8 pb-8">
-				{/* Feedback banners */}
 				{claimed ? (
 					<div role="status" style={feedbackStyle("success")}>
-						Woah! You have successfully claimed your reward — keep up the good work!
+						Woah! You have successfully claimed your reward — keep up the good
+						work!
 					</div>
 				) : null}
 				{error ? (
@@ -188,160 +253,223 @@ export default async function MePage({
 					</div>
 				) : null}
 
-				{/* ── Profile header ── */}
-				<div
-					className="rounded-2xl border p-6 flex flex-col sm:flex-row items-center sm:items-start gap-6"
-					style={{
-						background: `linear-gradient(135deg, color-mix(in srgb, var(--color-primary) 10%, var(--color-surface)), var(--color-surface))`,
-						borderColor: "color-mix(in srgb, var(--color-primary) 20%, transparent)",
-					}}
-				>
-					<div className="relative shrink-0">
+				<Reveal>
+					<div
+						className="relative overflow-hidden rounded-2xl border p-6 flex items-start gap-6"
+						style={{
+							background: `linear-gradient(135deg, color-mix(in srgb, var(--color-primary) 12%, var(--color-surface)), var(--color-surface))`,
+							borderColor:
+								"color-mix(in srgb, var(--color-primary) 20%, transparent)",
+						}}
+					>
 						<div
-							className="absolute -inset-3 rounded-full opacity-[0.15] blur-[40px]"
+							className="absolute -top-10 -right-10 w-40 h-40 rounded-full opacity-10"
 							style={{ background: "var(--color-primary)" }}
 						/>
-						<Image
-							src={avatarFull}
-							alt={`${user.username} avatar`}
-							width={120}
-							height={160}
-							className="object-contain drop-shadow-xl relative"
-							unoptimized
-							priority
-						/>
-					</div>
-					<div className="flex-1 text-center sm:text-left">
-						<div
-							className="inline-flex items-center gap-2 px-3.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider mb-3 border"
-							style={{
-								borderColor: "color-mix(in srgb, var(--color-primary) 18%, transparent)",
-								background: "color-mix(in srgb, var(--color-primary) 10%, transparent)",
-								color: "var(--color-primary-readable, var(--color-primary))",
-							}}
-						>
-							Rank {user.rank}
-						</div>
-						<h1
-							className="text-2xl md:text-3xl font-black tracking-tight"
-							style={{ color: "var(--color-text-readable)" }}
-						>
-							{user.username}
-						</h1>
-						<p className="text-sm mt-1" style={{ color: "var(--color-text-muted)" }}>
-							{user.motto || "No motto"}
-						</p>
-					</div>
-				</div>
-
-				{/* ── Enter hotel ── */}
-				<Link
-					href="/client"
-					className="flex items-center justify-center gap-3 rounded-2xl border py-4 px-6 font-extrabold text-base transition-all duration-200 hover:scale-[1.02] active:scale-95 shadow-lg"
-					style={{
-						background: "var(--color-primary)",
-						color: "var(--color-primary-foreground)",
-						borderColor: "color-mix(in srgb, var(--color-primary) 20%, transparent)",
-						boxShadow: "0 4px 24px color-mix(in srgb, var(--color-primary) 35%, transparent)",
-					}}
-				>
-					<Image
-						src="/assets/images/EnterHubbly.png"
-						alt=""
-						width={22}
-						height={22}
-						unoptimized
-					/>
-					Enter {hotelName}
-				</Link>
-
-				{/* ── Stat tiles ── */}
-				<div className="grid grid-cols-3 gap-4">
-					{[
-						{ value: user.credits.toLocaleString(), label: "Credits" },
-						{ value: `Rank ${user.rank}`, label: "Hotel rank" },
-						{ value: registered, label: "Registered" },
-					].map((s) => (
-						<div
-							key={s.label}
-							className="rounded-2xl border p-5 text-center transition-all duration-200 hover:-translate-y-0.5"
-							style={{
-								background: "var(--color-surface)",
-								borderColor: "color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-							}}
-						>
+						<div className="relative shrink-0 flex flex-col items-center gap-3">
 							<div
-								className="text-xl md:text-2xl font-black tracking-tight mb-0.5"
-								style={{ color: "var(--color-primary)" }}
+								className="absolute -inset-3 rounded-full opacity-[0.15] blur-[40px]"
+								style={{ background: "var(--color-primary)" }}
+							/>
+							<Image
+								src={avatarFull}
+								alt=""
+								width={120}
+								height={160}
+								className="object-contain drop-shadow-xl relative"
+								unoptimized
+								priority
+							/>
+							<Link
+								href="/client"
+								className="btn-shine flex items-center justify-center gap-1.5 rounded-xl border py-2 px-4 font-extrabold text-xs transition-all duration-200 hover:scale-[1.02] active:scale-95 shadow-lg"
+								style={{
+									background: "var(--color-primary)",
+									color: "var(--color-primary-foreground)",
+									borderColor:
+										"color-mix(in srgb, var(--color-primary) 20%, transparent)",
+									boxShadow:
+										"0 4px 24px color-mix(in srgb, var(--color-primary) 35%, transparent)",
+								}}
 							>
-								{s.value}
-							</div>
-							<div
-								className="text-xs font-bold uppercase tracking-widest"
-								style={{ color: "var(--color-text-muted)" }}
-							>
-								{s.label}
-							</div>
+								<Image
+									src="/assets/images/EnterHubbly.png"
+									alt=""
+									width={16}
+									height={16}
+									unoptimized
+								/>
+								Enter {hotelName}
+							</Link>
 						</div>
-					))}
-				</div>
-
-				{/* ── Online friends ── */}
-				<div
-					className="rounded-2xl border p-5"
-					style={{
-						background: "var(--color-surface)",
-						borderColor: "color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-					}}
-				>
-					<div className="flex items-center justify-between mb-4">
-						<div>
-							<h2
-								className="text-lg font-black tracking-tight"
+						<div className="flex-1 min-w-0 pt-1">
+							<div
+								className="inline-flex items-center gap-1.5 px-3 py-1 rounded-full text-[11px] font-bold uppercase tracking-wider mb-3 border"
+								style={{
+									borderColor:
+										"color-mix(in srgb, var(--color-primary) 18%, transparent)",
+									background:
+										"color-mix(in srgb, var(--color-primary) 10%, transparent)",
+									color: "var(--color-primary-readable, var(--color-primary))",
+								}}
+							>
+								Rank {user.rank}
+							</div>
+							<h1
+								className="text-2xl md:text-3xl font-black tracking-tight"
 								style={{ color: "var(--color-text-readable)" }}
 							>
-								Online friends
-							</h2>
-							<p className="text-xs mt-0.5" style={{ color: "var(--color-text-muted)" }}>
-								{onlineFriends.length === 0
-									? "None of your friends are online right now"
-									: `${onlineFriends.length} of your ${friends.length} friends online`}
+								{user.username}
+							</h1>
+							<p
+								className="text-sm mt-1"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								{user.motto || "No motto"}
 							</p>
+							<div className="flex flex-wrap gap-x-6 gap-y-1 mt-4 text-xs">
+								<span style={{ color: "var(--color-text-muted)" }}>
+									Registered:{" "}
+									<strong style={{ color: "var(--color-text-readable)" }}>
+										{registered}
+									</strong>
+								</span>
+								<span style={{ color: "var(--color-text-muted)" }}>
+									Last online:{" "}
+									<strong style={{ color: "var(--color-text-readable)" }}>
+										{lastOnlineDate}
+									</strong>
+								</span>
+							</div>
 						</div>
-						<Link
-							href="/friends"
-							className="text-xs font-bold hover:underline shrink-0"
-							style={{ color: "var(--color-primary)" }}
-						>
-							View all
-						</Link>
 					</div>
-					{onlineFriends.length === 0 ? (
-						<div className="text-center py-6">
-							<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
-								No friends online right now. Check back later!
+				</Reveal>
+
+				{alertRaw ? (
+					<Reveal delay={0.05}>
+						<div
+							className="rounded-2xl border px-6 py-4 text-center"
+							style={{
+								background:
+									"color-mix(in srgb, var(--color-accent) 12%, transparent)",
+								borderColor:
+									"color-mix(in srgb, var(--color-accent) 25%, transparent)",
+							}}
+						>
+							<p
+								className="text-sm font-bold"
+								style={{ color: "var(--color-accent)" }}
+							>
+								{alertRaw}
 							</p>
 						</div>
-					) : (
-						<div className="grid grid-cols-2 sm:grid-cols-3 gap-3">
-							{onlineFriends.map((friend) => {
-								const avatar = avatarImageUrl(imager, friend.look, {
-									size: "s",
-									headOnly: true,
-								});
-								return (
+					</Reveal>
+				) : null}
+
+				<Reveal delay={0.1}>
+					<div className="grid grid-cols-2 sm:grid-cols-3 gap-4">
+						{[
+							{ value: user.credits.toLocaleString(), label: "Credits" },
+							{ value: `Rank ${user.rank}`, label: "Hotel rank" },
+							{
+								value: (userSettings?.achievementScore ?? 0).toLocaleString(),
+								label: "Achievement score",
+							},
+							{
+								value: (userSettings?.respectsReceived ?? 0).toLocaleString(),
+								label: "Respects",
+							},
+							{ value: friendCount.toLocaleString(), label: "Friends" },
+							{ value: lastLoginDate, label: "Last login" },
+						].map((s) => (
+							<div
+								key={s.label}
+								className="relative rounded-2xl border p-5 text-center transition-all duration-200 hover:-translate-y-0.5 hover:shadow-lg"
+								style={{
+									background: "var(--color-surface)",
+									borderColor:
+										"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+								}}
+							>
+								<div
+									className="text-xl md:text-2xl font-black tracking-tight mb-0.5"
+									style={{ color: "var(--color-primary)" }}
+								>
+									{s.value}
+								</div>
+								<div
+									className="text-[11px] font-bold uppercase tracking-widest"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{s.label}
+								</div>
+							</div>
+						))}
+					</div>
+				</Reveal>
+
+				<Reveal delay={0.15}>
+					<div
+						className="rounded-2xl border p-5"
+						style={{
+							background: "var(--color-surface)",
+							borderColor:
+								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+						}}
+					>
+						<div className="flex items-center justify-between mb-4">
+							<div>
+								<h2
+									className="text-lg font-black tracking-tight"
+									style={{ color: "var(--color-text-readable)" }}
+								>
+									Online friends
+								</h2>
+								<p
+									className="text-xs mt-0.5"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{onlineFriends.length === 0
+										? "None of your friends are online right now"
+										: `${onlineFriends.length} of your ${friends.length} friends online`}
+								</p>
+							</div>
+							<Link
+								href="/friends"
+								className="text-xs font-bold hover:underline shrink-0"
+								style={{ color: "var(--color-primary)" }}
+							>
+								View all
+							</Link>
+						</div>
+						{onlineFriends.length === 0 ? (
+							<div className="text-center py-6">
+								<p
+									className="text-sm"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									No friends online right now. Check back later!
+								</p>
+							</div>
+						) : (
+							<div className="grid grid-cols-2 sm:grid-cols-3 gap-3">
+								{onlineFriends.map((friend) => (
 									<Link
 										key={friend.id}
 										href={`/u/${friend.username}`}
-										className="flex items-center gap-3 p-3 rounded-xl transition-all duration-200 hover:-translate-y-0.5"
+										className="flex items-center gap-3 p-3 rounded-xl transition-all duration-200 hover:-translate-y-0.5 hover:shadow-md"
 										style={{
-											background: "color-mix(in srgb, var(--color-primary) 4%, transparent)",
+											background:
+												"color-mix(in srgb, var(--color-primary) 4%, transparent)",
 											textDecoration: "none",
 										}}
 									>
 										<Image
-											src={avatar}
-											alt={`${friend.username} avatar`}
+											src={avatarImageUrl(imager, friend.look, {
+												size: "s",
+												headOnly: true,
+											})}
+											alt=""
 											width={40}
 											height={50}
 											className="rounded-lg shrink-0"
@@ -364,101 +492,272 @@ export default async function MePage({
 												className="inline-flex items-center gap-1 text-[10px] font-bold mt-1"
 												style={{ color: "var(--color-success)" }}
 											>
-												<span className="w-1.5 h-1.5 rounded-full" style={{ background: "var(--color-success)" }} />
+												<span
+													className="w-1.5 h-1.5 rounded-full"
+													style={{ background: "var(--color-success)" }}
+												/>{" "}
 												Online
 											</span>
 										</div>
 									</Link>
-								);
-							})}
-						</div>
-					)}
-				</div>
-
-				{/* ── Referral card ── */}
-				<div
-					className="rounded-2xl border p-5"
-					style={{
-						background: "var(--color-surface)",
-						borderColor: "color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-					}}
-				>
-					<div className="mb-4">
-						<h2
-							className="text-lg font-black tracking-tight"
-							style={{ color: "var(--color-text-readable)" }}
-						>
-							Refer a friend ({referralTotal}/{needed})
-						</h2>
-						<p className="text-xs mt-0.5" style={{ color: "var(--color-text-muted)" }}>
-							Refer new users and earn in-game rewards
-						</p>
-					</div>
-					<div className="flex flex-col gap-4">
-						<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
-							{rewardAmount > 0
-								? `For every ${needed} users who register through your referral link you can claim a reward of ${rewardAmount.toLocaleString()} ${rewardCurrency}!`
-								: `Invite ${needed} users through your referral link to claim a reward!`}
-						</p>
-
-						<div role="note" style={feedbackStyle("warning")}>
-							⚠️ Boosting referrals by making your own accounts will lead to removal of all progress, currency, inventory and a potential ban.
-						</div>
-
-						<div>
-							<label
-								htmlFor="referral-link"
-								className="text-xs font-bold mb-1.5 block"
-								style={{ color: "var(--color-text-muted)" }}
-							>
-								Your referral link
-							</label>
-							<div className="flex gap-2 flex-wrap">
-								<input
-									id="referral-link"
-									type="text"
-									readOnly
-									defaultValue={referralLink}
-									className="flex-1 min-w-0 rounded-xl border-2 px-4 py-2.5 text-sm font-medium"
-									style={{
-										backgroundColor: "var(--color-background)",
-										color: "var(--color-text-readable, var(--color-text))",
-										borderColor: "color-mix(in srgb, var(--color-text-muted) 25%, transparent)",
-									}}
-								/>
-								<CopyReferralButton value={referralLink} />
+								))}
 							</div>
-						</div>
-
-						{canClaim ? (
-							<form action={claimReferral}>
-								<button
-									type="submit"
-									className="w-full rounded-xl font-extrabold text-sm py-3.5 transition-all duration-200 hover:scale-[1.02] active:scale-95 shadow-lg"
-									style={{
-										background: "var(--color-primary)",
-										color: "var(--color-primary-foreground)",
-										boxShadow: "0 4px 24px color-mix(in srgb, var(--color-primary) 35%, transparent)",
-									}}
-								>
-									Claim your referral reward!
-								</button>
-							</form>
-						) : (
-							<button
-								type="button"
-								disabled
-								className="w-full rounded-xl font-extrabold text-sm py-3.5 opacity-60 cursor-not-allowed"
-								style={{
-									background: "color-mix(in srgb, var(--color-text-muted) 15%, transparent)",
-									color: "var(--color-text-muted)",
-								}}
-							>
-								{`Refer ${remaining} more ${remaining === 1 ? "user" : "users"} to unlock your reward`}
-							</button>
 						)}
 					</div>
-				</div>
+				</Reveal>
+
+				<Reveal delay={0.2}>
+					<div
+						className="rounded-2xl border p-5"
+						style={{
+							background: "var(--color-surface)",
+							borderColor:
+								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+						}}
+					>
+						<div className="mb-4">
+							<h2
+								className="text-lg font-black tracking-tight"
+								style={{ color: "var(--color-text-readable)" }}
+							>
+								Refer a friend ({referralTotal}/{needed})
+							</h2>
+							<p
+								className="text-xs mt-0.5"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								Refer new users and earn in-game rewards
+							</p>
+						</div>
+						<div className="flex flex-col gap-4">
+							<p
+								className="text-sm"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								{rewardAmount > 0
+									? `For every ${needed} users who register through your referral link you can claim a reward of ${rewardAmount.toLocaleString()} ${rewardCurrency}!`
+									: `Invite ${needed} users through your referral link to claim a reward!`}
+							</p>
+							<div role="note" style={feedbackStyle("warning")}>
+								Boosting referrals by making your own accounts will lead to
+								removal of all progress, currency, inventory and a potential
+								ban.
+							</div>
+							<div>
+								<label
+									htmlFor="referral-link"
+									className="text-xs font-bold mb-1.5 block"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									Your referral link
+								</label>
+								<div className="flex gap-2 flex-wrap">
+									<input
+										id="referral-link"
+										type="text"
+										readOnly
+										defaultValue={referralLink}
+										className="input-glow flex-1 min-w-0 rounded-xl border-2 px-4 py-2.5 text-sm font-medium"
+										style={{
+											backgroundColor: "var(--color-background)",
+											color: "var(--color-text-readable, var(--color-text))",
+											borderColor:
+												"color-mix(in srgb, var(--color-text-muted) 25%, transparent)",
+										}}
+									/>
+									<CopyReferralButton value={referralLink} />
+								</div>
+							</div>
+							{canClaim ? (
+								<form action={claimReferral}>
+									<button
+										type="submit"
+										className="btn-shine w-full rounded-xl font-extrabold text-sm py-3.5 transition-all duration-200 hover:scale-[1.02] active:scale-95 shadow-lg"
+										style={{
+											background: "var(--color-primary)",
+											color: "var(--color-primary-foreground)",
+											boxShadow:
+												"0 4px 24px color-mix(in srgb, var(--color-primary) 35%, transparent)",
+										}}
+									>
+										Claim your referral reward!
+									</button>
+								</form>
+							) : (
+								<button
+									type="button"
+									disabled
+									className="w-full rounded-xl font-extrabold text-sm py-3.5 opacity-60 cursor-not-allowed"
+									style={{
+										background:
+											"color-mix(in srgb, var(--color-text-muted) 15%, transparent)",
+										color: "var(--color-text-muted)",
+									}}
+								>
+									{`Refer ${remaining} more ${remaining === 1 ? "user" : "users"} to unlock your reward`}
+								</button>
+							)}
+						</div>
+					</div>
+				</Reveal>
+
+				{recentRooms.length > 0 && (
+					<Reveal delay={0.25}>
+						<div
+							className="rounded-2xl border p-5"
+							style={{
+								background: "var(--color-surface)",
+								borderColor:
+									"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+							}}
+						>
+							<div className="flex items-center justify-between mb-4">
+								<div>
+									<h2
+										className="text-lg font-black tracking-tight"
+										style={{ color: "var(--color-text-readable)" }}
+									>
+										Recent rooms
+									</h2>
+									<p
+										className="text-xs mt-0.5"
+										style={{ color: "var(--color-text-muted)" }}
+									>
+										Newest rooms in the hotel
+									</p>
+								</div>
+								<Link
+									href="/community"
+									className="text-xs font-bold hover:underline shrink-0"
+									style={{ color: "var(--color-primary)" }}
+								>
+									View all
+								</Link>
+							</div>
+							<div className="grid grid-cols-2 sm:grid-cols-3 gap-3">
+								{recentRooms.map((room) => (
+									<Link
+										key={room.id}
+										href={`/room/${room.id}`}
+										className="block rounded-xl border p-3 transition-all duration-200 hover:-translate-y-0.5 hover:shadow-md"
+										style={{
+											background:
+												"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+											borderColor:
+												"color-mix(in srgb, var(--color-primary) 10%, transparent)",
+										}}
+									>
+										<p
+											className="text-sm font-extrabold truncate"
+											style={{ color: "var(--color-text-readable)" }}
+										>
+											{room.name}
+										</p>
+										<p
+											className="text-[10px] font-semibold mt-0.5"
+											style={{ color: "var(--color-text-muted)" }}
+										>
+											{room.ownerName} &middot; {room.users}/{room.usersMax}
+										</p>
+									</Link>
+								))}
+							</div>
+						</div>
+					</Reveal>
+				)}
+
+				{badges.length > 0 && (
+					<Reveal delay={0.3}>
+						<div
+							className="rounded-2xl border p-5"
+							style={{
+								background: "var(--color-surface)",
+								borderColor:
+									"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+							}}
+						>
+							<div className="mb-4">
+								<h2
+									className="text-lg font-black tracking-tight"
+									style={{ color: "var(--color-text-readable)" }}
+								>
+									Badges
+								</h2>
+								<p
+									className="text-xs mt-0.5"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{badges.length} badge{badges.length !== 1 ? "s" : ""} equipped
+								</p>
+							</div>
+							<div className="flex flex-wrap gap-2">
+								{badges.map((badge) => (
+									<Image
+										key={badge.badgeCode}
+										src={`${BADGE_IMG_BASE}/${badge.badgeCode}.gif`}
+										alt={badge.badgeCode}
+										width={40}
+										height={40}
+										className="rounded-md transition-transform hover:scale-110"
+										unoptimized
+									/>
+								))}
+							</div>
+						</div>
+					</Reveal>
+				)}
+
+				<Reveal delay={0.35}>
+					<div
+						className="rounded-2xl border p-5"
+						style={{
+							background: "var(--color-surface)",
+							borderColor:
+								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+						}}
+					>
+						<h2
+							className="text-lg font-black tracking-tight mb-4"
+							style={{ color: "var(--color-text-readable)" }}
+						>
+							Quick links
+						</h2>
+						<div className="grid grid-cols-2 sm:grid-cols-4 gap-3">
+							{[
+								{ href: "/messages", label: "Messages", badge: unreadCount },
+								{ href: `/u/${user.username}`, label: "My profile", badge: 0 },
+								{ href: "/settings", label: "Settings", badge: 0 },
+								{ href: "/shop", label: "Shop", badge: 0 },
+							].map((link) => (
+								<Link
+									key={link.href}
+									href={link.href}
+									className="relative flex items-center justify-center rounded-xl border p-3 text-sm font-bold transition-all hover:-translate-y-0.5 hover:shadow-md"
+									style={{
+										background:
+											"color-mix(in srgb, var(--color-primary) 6%, transparent)",
+										borderColor:
+											"color-mix(in srgb, var(--color-primary) 18%, transparent)",
+										color: "var(--color-text-readable)",
+									}}
+								>
+									{link.label}
+									{link.badge > 0 && (
+										<span
+											className="absolute -top-1.5 -right-1.5 flex min-w-[18px] h-[18px] items-center justify-center rounded-full px-1 text-[10px] font-bold leading-none"
+											style={{
+												background: "var(--color-danger)",
+												color: "white",
+											}}
+										>
+											{link.badge > 99 ? "99+" : link.badge}
+										</span>
+									)}
+								</Link>
+							))}
+						</div>
+					</div>
+				</Reveal>
 			</div>
 		);
 	} catch {
@@ -467,11 +766,16 @@ export default async function MePage({
 				className="rounded-2xl border p-6 text-center"
 				style={{
 					background: "var(--color-surface)",
-					borderColor: "color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+					borderColor:
+						"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
 				}}
 			>
-				<p className="text-sm font-bold" style={{ color: "var(--color-text-muted)" }}>
-					We couldn&apos;t load your dashboard right now. Please try again shortly.
+				<p
+					className="text-sm font-bold"
+					style={{ color: "var(--color-text-muted)" }}
+				>
+					We couldn&apos;t load your dashboard right now. Please try again
+					shortly.
 				</p>
 			</div>
 		);

src/app/(site)/messages/page.tsx

@@ -10,6 +10,7 @@ import {
 import { ContentCard, EmptyState } from "@/components/public/ui";
 import { auth } from "@/lib/auth";
 import { avatarImageUrl } from "@/lib/format";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 import { siteSettings } from "@/lib/services/site-settings";
 
@@ -39,12 +40,6 @@ function feedbackStyle(tone: "success" | "error"): CSSProperties {
 	};
 }
 
-function formatTimestamp(seconds: number): string {
-	if (!seconds) return "";
-	// sended_on is a unix timestamp in seconds (emulator convention).
-	return new Date(seconds * 1000).toISOString().slice(0, 16).replace("T", " ");
-}
-
 export default async function MessagesPage({
 	searchParams,
 }: {
@@ -353,7 +348,7 @@ export default async function MessagesPage({
 								size: "s",
 								headOnly: true,
 							});
-							const when = formatTimestamp(msg.sendedOn);
+							const when = formatDate(new Date(msg.sendedOn * 1000));
 							return (
 								<article
 									key={msg.id}

src/app/(site)/news/[slug]/page.tsx

@@ -16,7 +16,11 @@ import { sanitize } from "@/lib/sanitize";
 
 export const revalidate = 60;
 
-type SearchParams = Promise<{ comment?: string; reaction?: string; error?: string }>;
+type SearchParams = Promise<{
+	comment?: string;
+	reaction?: string;
+	error?: string;
+}>;
 
 function feedbackStyle(tone: "success" | "error"): CSSProperties {
 	const accent =
@@ -78,7 +82,6 @@ const REACTIONS: { key: string; emoji: string }[] = [
 	{ key: "wow", emoji: "😮" },
 ];
 
-
 export default async function ArticlePage({
 	params,
 	searchParams,
@@ -204,9 +207,7 @@ export default async function ArticlePage({
 				icon="📰"
 				title={article.title}
 				subtitle={
-					article.createdAt
-						? article.createdAt.toISOString().slice(0, 10)
-						: undefined
+					article.createdAt ? formatDate(article.createdAt, "date") : undefined
 				}
 				action={
 					<Link className="btn btn-outline" href="/news">
@@ -222,8 +223,11 @@ export default async function ArticlePage({
 						style={{ width: "100%", borderRadius: 10, margin: "0 0 1rem" }}
 					/>
 				) : null}
-			{/* Article body is rich HTML (atom uses TinyMCE) — sanitised server-side. */}
-			<SanitizedHtml html={sanitize(article.fullStory)} className="article-body" />
+				{/* Article body is rich HTML (atom uses TinyMCE) — sanitised server-side. */}
+				<SanitizedHtml
+					html={sanitize(article.fullStory)}
+					className="article-body"
+				/>
 			</ContentCard>
 
 			{/* ── Reactions ─────────────────────────────────────────── */}

src/app/(site)/news/page.tsx

@@ -1,16 +1,15 @@
 import Image from "next/image";
-import { formatDate } from "@/lib/format-date";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState } from "@/components/public/ui";
 import { excerpt } from "@/lib/format";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
 
 export const metadata = { title: "News" };
 
-
 export default async function NewsPage() {
 	const t = await getTranslations("pages.news");
 

src/app/(site)/photos/page.tsx

@@ -4,6 +4,7 @@ import {
 	PhotoLightbox,
 } from "@/components/public/photo-lightbox";
 import { ContentCard, EmptyState } from "@/components/public/ui";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
@@ -18,13 +19,6 @@ type Photo = {
 	url: string;
 };
 
-function formatDate(timestamp: number): string {
-	return new Date(timestamp * 1000)
-		.toISOString()
-		.slice(0, 16)
-		.replace("T", " ");
-}
-
 export default async function PhotosPage() {
 	const t = await getTranslations("pages.photos");
 
@@ -44,7 +38,7 @@ export default async function PhotosPage() {
 		id: String(p.id),
 		url: p.url,
 		alt: t("photoAlt", { id: p.userId }),
-		date: formatDate(p.timestamp),
+		date: formatDate(new Date(p.timestamp * 1000)),
 		user: t("byUser", { id: p.userId }),
 	}));
 

src/app/(site)/polls/[id]/page.tsx

@@ -36,7 +36,11 @@ export default async function PollDetailPage({
 	}
 
 	const now = Date.now();
-	if (poll.startsAt && poll.startsAt.getTime() > now && poll.status === "active") {
+	if (
+		poll.startsAt &&
+		poll.startsAt.getTime() > now &&
+		poll.status === "active"
+	) {
 		// Not started yet — treat as unavailable for guests
 		notFound();
 	}
@@ -101,7 +105,11 @@ export default async function PollDetailPage({
 
 			{isOpen && !hasVoted ? (
 				session?.user ? (
-					<ContentCard icon="🗳️" title={t("voteTitle")} subtitle={t("voteSubtitle")}>
+					<ContentCard
+						icon="🗳️"
+						title={t("voteTitle")}
+						subtitle={t("voteSubtitle")}
+					>
 						<PollVoteForm
 							pollId={poll.id}
 							questions={poll.questions.map((q) => ({
@@ -156,7 +164,10 @@ export default async function PollDetailPage({
 							const counts = new Map<string, number>();
 							for (const opt of options) counts.set(opt, 0);
 							for (const vote of votes) {
-								for (const part of vote.split("\n").map((a) => a.trim()).filter(Boolean)) {
+								for (const part of vote
+									.split("\n")
+									.map((a) => a.trim())
+									.filter(Boolean)) {
 									counts.set(part, (counts.get(part) ?? 0) + 1);
 								}
 							}

src/app/(site)/polls/[id]/poll-vote-form.tsx

@@ -99,10 +99,16 @@ export function PollVoteForm({
 								value={answers[q.id] ?? ""}
 								onChange={(e) => setSingle(q.id, e.target.value)}
 								placeholder={t("textPlaceholder")}
-								style={{ width: "100%", marginTop: "0.35rem", resize: "vertical" }}
+								style={{
+									width: "100%",
+									marginTop: "0.35rem",
+									resize: "vertical",
+								}}
 							/>
 						) : q.type === "multiple" ? (
-							<div style={{ display: "grid", gap: "0.4rem", marginTop: "0.35rem" }}>
+							<div
+								style={{ display: "grid", gap: "0.4rem", marginTop: "0.35rem" }}
+							>
 								{options.map((opt) => (
 									<label
 										key={opt}
@@ -123,7 +129,9 @@ export function PollVoteForm({
 								))}
 							</div>
 						) : (
-							<div style={{ display: "grid", gap: "0.4rem", marginTop: "0.35rem" }}>
+							<div
+								style={{ display: "grid", gap: "0.4rem", marginTop: "0.35rem" }}
+							>
 								{options.map((opt) => (
 									<label
 										key={opt}

src/app/(site)/polls/page.tsx

@@ -64,7 +64,13 @@ export default async function PollsPage() {
 										{poll.title}
 									</h3>
 									{poll.description ? (
-										<p style={{ margin: 0, fontSize: "0.88rem", lineHeight: 1.5 }}>
+										<p
+											style={{
+												margin: 0,
+												fontSize: "0.88rem",
+												lineHeight: 1.5,
+											}}
+										>
 											{excerpt(poll.description, 120)}
 										</p>
 									) : null}

src/app/(site)/radio/apply/page.tsx

@@ -4,6 +4,7 @@ import type { CSSProperties } from "react";
 import { applyDj } from "@/actions/radio-apply";
 import { ContentCard } from "@/components/public/ui";
 import { auth } from "@/lib/auth";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const dynamic = "force-dynamic";
@@ -57,7 +58,7 @@ export default async function RadioApplyPage({
 		.catch(() => null);
 
 	const submittedDate = existing?.createdAt
-		? existing.createdAt.toISOString().slice(0, 10)
+		? formatDate(existing.createdAt, "date")
 		: null;
 
 	return (

src/app/(site)/radio/contests/[id]/page.tsx

@@ -1,13 +1,12 @@
 import Link from "next/link";
-import { formatDate } from "@/lib/format-date";
 import { notFound } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { ContentCard } from "@/components/public/ui";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
 
-
 export default async function RadioContestDetailPage({
 	params,
 }: {
@@ -61,9 +60,13 @@ export default async function RadioContestDetailPage({
 						<tr>
 							<th>Period</th>
 							<td>
-								{contest.startDate ? formatDate(contest.startDate, "datetime-seconds", "") : "—"}
+								{contest.startDate
+									? formatDate(contest.startDate, "datetime-seconds", "")
+									: "—"}
 								{" — "}
-								{contest.endDate ? formatDate(contest.endDate, "datetime-seconds", "") : "ongoing"}
+								{contest.endDate
+									? formatDate(contest.endDate, "datetime-seconds", "")
+									: "ongoing"}
 							</td>
 						</tr>
 						<tr>

src/app/(site)/radio/contests/page.tsx

@@ -1,12 +1,11 @@
 import Link from "next/link";
-import { formatDate } from "@/lib/format-date";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState } from "@/components/public/ui";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
 
-
 export default async function RadioContestsPage() {
 	const t = await getTranslations("pages.radioContests");
 

src/app/(site)/radio/giveaways/[id]/page.tsx

@@ -1,13 +1,12 @@
 import Link from "next/link";
-import { formatDate } from "@/lib/format-date";
 import { notFound } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { ContentCard } from "@/components/public/ui";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
 
-
 export default async function RadioGiveawayDetailPage({
 	params,
 }: {
@@ -66,9 +65,13 @@ export default async function RadioGiveawayDetailPage({
 						<tr>
 							<th>Period</th>
 							<td>
-								{giveaway.startDate ? formatDate(giveaway.startDate, "datetime-seconds", "") : "—"}
+								{giveaway.startDate
+									? formatDate(giveaway.startDate, "datetime-seconds", "")
+									: "—"}
 								{" — "}
-								{giveaway.endDate ? formatDate(giveaway.endDate, "datetime-seconds", "") : "ongoing"}
+								{giveaway.endDate
+									? formatDate(giveaway.endDate, "datetime-seconds", "")
+									: "ongoing"}
 							</td>
 						</tr>
 						<tr>

src/app/(site)/radio/giveaways/page.tsx

@@ -1,12 +1,11 @@
 import Link from "next/link";
-import { formatDate } from "@/lib/format-date";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState } from "@/components/public/ui";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const revalidate = 300;
 
-
 export default async function RadioGiveawaysPage() {
 	const t = await getTranslations("pages.radioGiveaways");
 

src/app/(site)/radio/requests/page.tsx

@@ -1,9 +1,9 @@
 import { getTranslations } from "next-intl/server";
 import type { CSSProperties } from "react";
-import { formatDate } from "@/lib/format-date";
 import { submitRequest } from "@/actions/radio-requests";
 import { ContentCard, EmptyState } from "@/components/public/ui";
 import { auth } from "@/lib/auth";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const dynamic = "force-dynamic";
@@ -179,7 +179,9 @@ export default async function RadioRequestsPage({
 											)}
 										</td>
 										<td className="muted">
-											{r.submittedAt ? formatDate(r.submittedAt, "datetime", "") : "—"}
+											{r.submittedAt
+												? formatDate(r.submittedAt, "datetime", "")
+												: "—"}
 										</td>
 										<td>{status}</td>
 									</tr>

src/app/(site)/register/page.tsx

@@ -3,25 +3,29 @@ import Image from "next/image";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { RegisterForm } from "@/components/auth/register-form";
+import { Clock } from "@/components/clock";
+import { LanguageSwitcher } from "@/components/language-switcher";
+import { Reveal } from "@/components/motion-reveal";
+import { ThemeSwitcher } from "@/components/theme-switcher";
 import { cached } from "@/lib/cache";
 import { avatarImageUrl } from "@/lib/format";
+import { resolveHotelName } from "@/lib/hotel-name";
 import { prisma } from "@/lib/prisma";
 import { captchaConfig } from "@/lib/services/captcha";
-import { resolveHotelName } from "@/lib/hotel-name";
 import { siteSettings } from "@/lib/services/site-settings";
-import { ThemeSwitcher } from "@/components/theme-switcher";
-import { LanguageSwitcher } from "@/components/language-switcher";
 
 export default async function RegisterPage() {
 	const th = await getTranslations("header");
 	const tpr = await getTranslations("pages.register");
-	const [hotelName, imagerRaw, cfg] = await Promise.all([
+	const [hotelName, imagerRaw, cfg, logo] = await Promise.all([
 		resolveHotelName(),
 		siteSettings.get(
 			"habbo_imaging_url",
 			"https://www.habbo.com/habbo-imaging/avatarimage",
 		),
 		captchaConfig(),
+		siteSettings.get("radio_social_discord", ""),
+		siteSettings.get("cms_logo", ""),
 	]);
 	const imager = imagerRaw ?? "https://www.habbo.com/habbo-imaging/avatarimage";
 	const nonce = (await headers()).get("x-nonce") ?? undefined;
@@ -47,234 +51,347 @@ export default async function RegisterPage() {
 	]);
 
 	return (
-		<div className="flex flex-col gap-6">
-			<div className="relative">
+		<div className="flex flex-col gap-10 pb-14">
+			{/* ── Top Bar ── */}
+			<Reveal>
 				<div
-					className="absolute -inset-6 rounded-full opacity-[0.06] blur-[40px]"
-					style={{ background: "var(--color-primary)" }}
-				/>
-				<div
-					className="relative flex items-center justify-between rounded-2xl border px-5 py-3"
+					className="relative flex items-center justify-between rounded-xl border px-5 py-3"
 					style={{
-						background: "color-mix(in srgb, var(--color-surface) 50%, transparent)",
-						backdropFilter: "blur(12px)",
-						WebkitBackdropFilter: "blur(12px)",
-						borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
+						background:
+							"color-mix(in srgb, var(--color-surface) 60%, transparent)",
+						backdropFilter: "blur(14px)",
+						WebkitBackdropFilter: "blur(14px)",
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
 					}}
 				>
-					<span className="text-xs font-bold uppercase tracking-[0.15em] opacity-40" style={{ color: "var(--color-text-muted)" }}>
-						{hotelName}
-					</span>
-					<div className="flex items-center gap-1">
+					<div className="flex items-center gap-3">
+						{logo ? (
+							<Image
+								src={logo}
+								alt={hotelName}
+								width={100}
+								height={28}
+								className="shrink-0 object-contain"
+								unoptimized
+								style={{ maxHeight: 28, width: "auto", height: "auto" }}
+							/>
+						) : (
+							<Image
+								src="/assets/images/icons/lighthouse.png"
+								alt={hotelName}
+								width={28}
+								height={28}
+								className="shrink-0"
+								unoptimized
+							/>
+						)}
+						<span
+							className="text-sm font-extrabold uppercase tracking-wide"
+							style={{ color: "var(--color-text-readable)" }}
+						>
+							{hotelName}
+						</span>
+					</div>
+					<div
+						className="flex items-center gap-1.5 rounded-lg px-2 py-1"
+						style={{
+							background:
+								"color-mix(in srgb, var(--color-text-muted) 4%, transparent)",
+						}}
+					>
 						<LanguageSwitcher />
-						<div className="w-px h-5 mx-1" style={{ background: "color-mix(in srgb, var(--color-text-muted) 12%, transparent)" }} />
+						<div
+							className="w-px h-5"
+							style={{
+								background:
+									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+							}}
+						/>
+						<Clock />
+						<div
+							className="w-px h-5"
+							style={{
+								background:
+									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+							}}
+						/>
 						<ThemeSwitcher />
 					</div>
 				</div>
-			</div>
-			<div className="flex flex-col lg:flex-row gap-10">
-			{/* Left panel */}
-			<div className="lg:w-80 shrink-0 space-y-4">
-				<div
-					className="relative overflow-hidden rounded-2xl border p-6 text-center"
-					style={{
-						borderColor: "color-mix(in srgb, var(--color-primary) 20%, transparent)",
-						background: `url(/assets/images/background.png) center/cover no-repeat`,
-					}}
-				>
-					<div
-						className="absolute inset-0"
-						style={{
-							background: "linear-gradient(135deg, color-mix(in srgb, var(--color-surface) 85%, transparent) 0%, color-mix(in srgb, var(--color-surface) 40%, transparent) 100%)",
-						}}
-					/>
-					<div className="relative">
-					<Image
-						src="/assets/images/FrankwithBag.gif"
-						alt="Frank"
-						width={130}
-						height={170}
-						className="object-contain mx-auto drop-shadow-xl"
-						unoptimized
-						priority
-					/>
-					<div
-						className="inline-flex items-center gap-2 px-3.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider mt-4 mb-3 border"
-						style={{
-							borderColor:
-								"color-mix(in srgb, var(--color-primary) 18%, transparent)",
-							background:
-								"color-mix(in srgb, var(--color-primary) 10%, transparent)",
-							color: "var(--color-primary-readable, var(--color-primary))",
-						}}
-					>
-						<span className="w-2 h-2 rounded-full bg-green-500" />
-						{tpr("usersOnline", { count: online })}
-					</div>
-					<h1
-						className="text-xl font-black"
-						style={{ color: "var(--color-text-readable)" }}
-					>
-						{tpr("title")} — {hotelName}
-					</h1>
-					<p
-						className="text-xs mt-1 mx-auto max-w-[200px] leading-relaxed"
-						style={{ color: "var(--color-text-muted)" }}
-					>
-						{th("tagline")}
-					</p>
-				</div>
-			</div>
-
-				{recentUsers.length > 0 && (
-					<div
-						className="rounded-2xl border p-4"
-						style={{
-							background: "color-mix(in srgb, var(--color-surface) 70%, transparent)",
-							backdropFilter: "blur(8px)",
-							WebkitBackdropFilter: "blur(8px)",
-							borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-						}}
-					>
-						<h3
-							className="text-xs font-bold uppercase tracking-widest mb-3 flex items-center gap-2"
-							style={{ color: "var(--color-text-muted)" }}
+			</Reveal>
+			<Reveal>
+				<div className="flex flex-col lg:flex-row gap-10 stagger-children">
+					{/* Left panel */}
+					<div className="lg:w-80 shrink-0 space-y-4">
+						<div
+							className="relative overflow-hidden rounded-2xl border p-6 text-center card-premium"
+							style={{
+								borderColor:
+									"color-mix(in srgb, var(--color-primary) 20%, transparent)",
+								background: `url(/assets/images/background.png) center/cover no-repeat`,
+							}}
 						>
-							<span className="w-2 h-2 rounded-full bg-green-500" />
-							{tpr("whoIsOnline")}
-						</h3>
-						<div className="grid grid-cols-4 gap-1.5">
-							{recentUsers.map((u) => (
+							<div
+								className="absolute inset-0"
+								style={{
+									background:
+										"linear-gradient(135deg, color-mix(in srgb, var(--color-surface) 85%, transparent) 0%, color-mix(in srgb, var(--color-surface) 40%, transparent) 100%)",
+								}}
+							/>
+							<div className="relative">
+								<Image
+									src="/assets/images/FrankwithBag.gif"
+									alt="Frank"
+									width={130}
+									height={170}
+									className="object-contain mx-auto drop-shadow-xl animate-float"
+									unoptimized
+									priority
+								/>
 								<div
-									key={u.username}
-									className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+									className="inline-flex items-center gap-2 px-3.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider mt-4 mb-3 border"
+									style={{
+										borderColor:
+											"color-mix(in srgb, var(--color-primary) 18%, transparent)",
+										background:
+											"color-mix(in srgb, var(--color-primary) 10%, transparent)",
+										color:
+											"var(--color-primary-readable, var(--color-primary))",
+									}}
+								>
+									<span className="w-2 h-2 rounded-full bg-green-500" />
+									{tpr("usersOnline", { count: online })}
+								</div>
+								<h1
+									className="text-xl font-black"
+									style={{
+										color: "var(--color-text-readable)",
+										fontFamily: "var(--font-nunito)",
+									}}
+								>
+									{tpr("title")} — {hotelName}
+								</h1>
+								<p
+									className="text-xs mt-1 mx-auto max-w-[200px] leading-relaxed"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{th("tagline")}
+								</p>
+							</div>
+						</div>
+
+						{recentUsers.length > 0 && (
+							<div
+								className="overflow-hidden rounded-xl border"
+								style={{
+									borderColor:
+										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+								}}
+							>
+								<div
+									className="flex items-center gap-2.5 px-4 py-3"
 									style={{
 										background:
-											"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+											"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
 									}}
 								>
 									<Image
-										src={avatarImageUrl(imager, u.look, {
-											headOnly: true,
-											direction: 2,
-											size: "s",
-										})}
+										src="/assets/images/icons/navigation/goody.png"
 										alt=""
-										width={26}
-										height={32}
-										className="rounded-md"
+										width={18}
+										height={18}
 										unoptimized
 									/>
-									<span
-										className="text-[8px] font-bold truncate w-full text-center leading-tight"
-										style={{ color: "var(--color-text-readable)" }}
+									<h3
+										className="text-sm font-bold text-white"
+										style={{ fontFamily: "var(--font-nunito)" }}
 									>
-										{u.username}
-									</span>
+										{tpr("whoIsOnline")}
+									</h3>
 								</div>
-							))}
-						</div>
-					</div>
-				)}
+								<div
+									className="p-4"
+									style={{
+										background:
+											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
+									}}
+								>
+									<div className="grid grid-cols-4 gap-1.5">
+										{recentUsers.map((u) => (
+											<div
+												key={u.username}
+												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+												style={{
+													background:
+														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+												}}
+											>
+												<Image
+													src={avatarImageUrl(imager, u.look, {
+														headOnly: true,
+														direction: 2,
+														size: "s",
+													})}
+													alt=""
+													width={26}
+													height={32}
+													className="rounded-md"
+													unoptimized
+												/>
+												<span
+													className="text-[8px] font-bold truncate w-full text-center leading-tight"
+													style={{ color: "var(--color-text-readable)" }}
+												>
+													{u.username}
+												</span>
+											</div>
+										))}
+									</div>
+								</div>
+							</div>
+						)}
 
-				{latestUsers.length > 0 && (
-					<div
-						className="rounded-2xl border p-4"
-						style={{
-							background: "color-mix(in srgb, var(--color-surface) 70%, transparent)",
-							backdropFilter: "blur(8px)",
-							WebkitBackdropFilter: "blur(8px)",
-							borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-						}}
-					>
-						<h3
-							className="text-xs font-bold uppercase tracking-widest mb-3 flex items-center gap-2"
+						{latestUsers.length > 0 && (
+							<div
+								className="overflow-hidden rounded-xl border"
+								style={{
+									borderColor:
+										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+								}}
+							>
+								<div
+									className="flex items-center gap-2.5 px-4 py-3"
+									style={{
+										background:
+											"linear-gradient(140deg, #5a2d82 0%, #6b3a9e 20%, #7d47b8 40%, #8f54d0 60%, #7d47b8 75%, #6b3a9e 90%, #5a2d82 100%)",
+									}}
+								>
+									<Image
+										src="/assets/images/icons/friends.png"
+										alt=""
+										width={18}
+										height={18}
+										unoptimized
+									/>
+									<h3
+										className="text-sm font-bold text-white"
+										style={{ fontFamily: "var(--font-nunito)" }}
+									>
+										Newest citizens
+									</h3>
+								</div>
+								<div
+									className="p-4"
+									style={{
+										background:
+											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
+									}}
+								>
+									<div className="grid grid-cols-4 gap-1.5">
+										{latestUsers.map((u) => (
+											<div
+												key={u.username}
+												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+												style={{
+													background:
+														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+												}}
+											>
+												<Image
+													src={avatarImageUrl(imager, u.look, {
+														headOnly: true,
+														direction: 2,
+													})}
+													alt=""
+													width={52}
+													height={64}
+													className="rounded-md"
+													unoptimized
+												/>
+												<span
+													className="text-[10px] font-bold truncate w-full text-center leading-tight"
+													style={{ color: "var(--color-text-readable)" }}
+												>
+													{u.username}
+												</span>
+											</div>
+										))}
+									</div>
+								</div>
+							</div>
+						)}
+
+						<p
+							className="text-xs text-center"
 							style={{ color: "var(--color-text-muted)" }}
 						>
-							✨ Newest citizens
-						</h3>
-						<div className="grid grid-cols-4 gap-1.5">
-							{latestUsers.map((u) => (
-								<div
-									key={u.username}
-									className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
-									style={{
-										background: "color-mix(in srgb, var(--color-primary) 4%, transparent)",
-									}}
+							{tpr("alreadyHaveAccountPre")}{" "}
+							<Link
+								href="/login"
+								className="font-extrabold hover:underline"
+								style={{
+									color: "var(--color-primary-readable, var(--color-primary))",
+								}}
+							>
+								{tpr("alreadyHaveAccountLink")}
+							</Link>
+						</p>
+					</div>
+
+					{/* Right: form */}
+					<div className="flex-1">
+						<div
+							className="overflow-hidden rounded-xl border"
+							style={{
+								borderColor:
+									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+							}}
+						>
+							<div
+								className="flex items-center gap-2.5 px-4 py-3"
+								style={{
+									background:
+										"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
+								}}
+							>
+								<Image
+									src="/assets/images/icons/navigation/me.png"
+									alt=""
+									width={18}
+									height={18}
+									unoptimized
+								/>
+								<h2
+									className="text-sm font-bold text-white"
+									style={{ fontFamily: "var(--font-nunito)" }}
 								>
-									<Image
-										src={avatarImageUrl(imager, u.look, { headOnly: true, direction: 2, size: "s" })}
-										alt=""
-										width={26}
-										height={32}
-										className="rounded-md"
-										unoptimized
-									/>
-									<span
-										className="text-[8px] font-bold truncate w-full text-center leading-tight"
-										style={{ color: "var(--color-text-readable)" }}
-									>
-										{u.username}
-									</span>
-								</div>
-							))}
+									{tpr("title")}
+								</h2>
+							</div>
+							<div
+								className="p-6"
+								style={{ backgroundColor: "var(--color-surface)" }}
+							>
+								<p
+									className="text-sm mb-6"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{tpr("subtitle")}
+								</p>
+								<RegisterForm
+									hotelName={hotelName}
+									captcha={{
+										provider: cfg.provider,
+										siteKey: cfg.siteKey || undefined,
+									}}
+									nonce={nonce}
+								/>
+							</div>
 						</div>
 					</div>
-				)}
-
-				<p
-					className="text-xs text-center"
-					style={{ color: "var(--color-text-muted)" }}
-				>
-					{tpr("alreadyHaveAccountPre")}{" "}
-					<Link
-						href="/login"
-						className="font-extrabold hover:underline"
-						style={{
-							color: "var(--color-primary-readable, var(--color-primary))",
-						}}
-					>
-						{tpr("alreadyHaveAccountLink")}
-					</Link>
-				</p>
-			</div>
-
-			{/* Right: form */}
-			<div className="flex-1">
-				<div
-					className="rounded-2xl border p-6"
-					style={{
-						background: "color-mix(in srgb, var(--color-surface) 70%, transparent)",
-						backdropFilter: "blur(8px)",
-						WebkitBackdropFilter: "blur(8px)",
-						borderColor: "color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-					}}
-				>
-				<div className="mb-6">
-					<h2
-						className="text-2xl font-black tracking-tight"
-						style={{ color: "var(--color-text-readable)" }}
-					>
-						{tpr("title")}
-					</h2>
-					<p
-						className="text-sm mt-0.5"
-						style={{ color: "var(--color-text-muted)" }}
-					>
-						{tpr("subtitle")}
-					</p>
 				</div>
-				<RegisterForm
-					hotelName={hotelName}
-					captcha={{
-						provider: cfg.provider,
-						siteKey: cfg.siteKey || undefined,
-					}}
-					nonce={nonce}
-				/>
-			</div>
-			</div>
-		</div>
+			</Reveal>
 		</div>
 	);
 }

src/app/(site)/search/page.tsx

@@ -0,0 +1,244 @@
+import type { Metadata } from "next";
+import Image from "next/image";
+import Link from "next/link";
+import { avatarImageUrl } from "@/lib/format";
+import { prisma } from "@/lib/prisma";
+import { siteSettings } from "@/lib/services/site-settings";
+
+export const metadata: Metadata = { title: "Search" };
+
+type SearchParams = Promise<{ q?: string }>;
+
+export default async function SearchPage({
+	searchParams,
+}: {
+	searchParams: SearchParams;
+}) {
+	const { q } = await searchParams;
+	const query = q?.trim();
+
+	const imager =
+		(await siteSettings.get(
+			"habbo_imaging_url",
+			"https://www.habbo.com/habbo-imaging/avatarimage",
+		)) ?? "";
+
+	if (!query) {
+		return (
+			<div
+				className="rounded-2xl border p-10 text-center"
+				style={{
+					background: "var(--color-surface)",
+					borderColor:
+						"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+				}}
+			>
+				<p
+					className="text-sm font-bold"
+					style={{ color: "var(--color-text-muted)" }}
+				>
+					Enter a search term to find users.
+				</p>
+			</div>
+		);
+	}
+
+	const users = await prisma.user
+		.findMany({
+			where: {
+				username: { contains: query },
+			},
+			select: {
+				id: true,
+				username: true,
+				look: true,
+				motto: true,
+				online: true,
+				rank: true,
+			},
+			take: 30,
+		})
+		.catch(() => []);
+
+	const rooms = await prisma.rooms
+		.findMany({
+			where: {
+				name: { contains: query },
+				state: "open",
+			},
+			select: {
+				id: true,
+				name: true,
+				ownerName: true,
+				users: true,
+				usersMax: true,
+			},
+			take: 12,
+		})
+		.catch(() => []);
+
+	return (
+		<div className="flex flex-col gap-6">
+			<div
+				className="rounded-2xl border p-4"
+				style={{
+					background: "var(--color-surface)",
+					borderColor:
+						"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+				}}
+			>
+				<form action="/search" method="GET" className="flex gap-2">
+					<input
+						type="text"
+						name="q"
+						defaultValue={query}
+						placeholder="Search users or rooms..."
+						className="flex-1 rounded-xl border-2 px-4 py-2.5 text-sm font-medium"
+						style={{
+							backgroundColor: "var(--color-background)",
+							color: "var(--color-text-readable)",
+							borderColor:
+								"color-mix(in srgb, var(--color-text-muted) 25%, transparent)",
+						}}
+					/>
+					<button
+						type="submit"
+						className="rounded-xl px-6 py-2.5 font-extrabold text-sm transition-all duration-200 hover:scale-[1.02] active:scale-95"
+						style={{
+							background: "var(--color-primary)",
+							color: "var(--color-primary-foreground)",
+						}}
+					>
+						Search
+					</button>
+				</form>
+			</div>
+
+			<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
+				Results for &quot;{query}&quot; — {users.length} user
+				{users.length !== 1 ? "s" : ""}
+				{rooms.length > 0 &&
+					`, ${rooms.length} room${rooms.length !== 1 ? "s" : ""}`}
+			</p>
+
+			{users.length > 0 && (
+				<div
+					className="rounded-2xl border p-5"
+					style={{
+						background: "var(--color-surface)",
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+					}}
+				>
+					<h2
+						className="text-lg font-black tracking-tight mb-4"
+						style={{ color: "var(--color-text-readable)" }}
+					>
+						Users
+					</h2>
+					<div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-5 gap-3">
+						{users.map((u) => (
+							<Link
+								key={u.id}
+								href={`/u/${u.username}`}
+								className="flex flex-col items-center gap-1.5 rounded-xl p-3 transition-all duration-200 hover:-translate-y-0.5"
+								style={{
+									background:
+										"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+								}}
+							>
+								<Image
+									src={avatarImageUrl(imager, u.look, {
+										headOnly: true,
+										direction: 2,
+									})}
+									alt={u.username}
+									width={40}
+									height={48}
+									unoptimized
+									className="rounded-lg"
+								/>
+								<span
+									className="text-xs font-extrabold truncate max-w-full text-center"
+									style={{ color: "var(--color-text-readable)" }}
+								>
+									{u.username}
+								</span>
+								<span
+									className="text-[9px] font-semibold"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{u.online === "1" ? "🟢 Online" : "Offline"}
+								</span>
+							</Link>
+						))}
+					</div>
+				</div>
+			)}
+
+			{rooms.length > 0 && (
+				<div
+					className="rounded-2xl border p-5"
+					style={{
+						background: "var(--color-surface)",
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+					}}
+				>
+					<h2
+						className="text-lg font-black tracking-tight mb-4"
+						style={{ color: "var(--color-text-readable)" }}
+					>
+						Rooms
+					</h2>
+					<div className="grid grid-cols-2 sm:grid-cols-3 gap-3">
+						{rooms.map((room) => (
+							<Link
+								key={room.id}
+								href={`/room/${room.id}`}
+								className="rounded-xl border p-3 transition-all duration-200 hover:-translate-y-0.5"
+								style={{
+									background:
+										"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+									borderColor:
+										"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+								}}
+							>
+								<p
+									className="text-sm font-extrabold truncate"
+									style={{ color: "var(--color-text-readable)" }}
+								>
+									{room.name}
+								</p>
+								<p
+									className="text-[10px] font-semibold mt-0.5"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									{room.ownerName} · {room.users}/{room.usersMax}
+								</p>
+							</Link>
+						))}
+					</div>
+				</div>
+			)}
+
+			{users.length === 0 && rooms.length === 0 && (
+				<div
+					className="rounded-2xl border p-10 text-center"
+					style={{
+						background: "var(--color-surface)",
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+					}}
+				>
+					<p
+						className="text-sm font-bold"
+						style={{ color: "var(--color-text-muted)" }}
+					>
+						No users or rooms found for &quot;{query}&quot;.
+					</p>
+				</div>
+			)}
+		</div>
+	);
+}

src/app/(site)/settings/2fa/page.tsx

@@ -11,8 +11,8 @@ import { env } from "@/env";
 import { auth } from "@/lib/auth";
 import { LaravelEncrypter } from "@/lib/auth/laravel-encrypter";
 import { totpKeyUri } from "@/lib/auth/totp";
-import { prisma } from "@/lib/prisma";
 import { resolveHotelName } from "@/lib/hotel-name";
+import { prisma } from "@/lib/prisma";
 
 export const dynamic = "force-dynamic";
 

src/app/(site)/settings/connections/page.tsx

@@ -1,137 +0,0 @@
-import Link from "next/link";
-import { redirect } from "next/navigation";
-import { getTranslations } from "next-intl/server";
-import { ContentCard } from "@/components/public/ui";
-import { env } from "@/env";
-import { auth } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-
-export const dynamic = "force-dynamic";
-
-// Social providers we can link. `available` reflects whether the OAuth app
-// credentials are configured (mirrors src/lib/auth.ts, which only registers a
-// provider when both its id + secret env vars are set). When unavailable the
-// connect button is disabled so we don't bounce the user to a 404 sign-in URL.
-const PROVIDERS = [
-	{
-		key: "discord",
-		label: "Discord",
-		icon: "🎮",
-		available: Boolean(env.DISCORD_CLIENT_ID && env.DISCORD_CLIENT_SECRET),
-	},
-	{
-		key: "google",
-		label: "Google",
-		icon: "🔵",
-		available: Boolean(env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET),
-	},
-] as const;
-
-export default async function ConnectionsPage() {
-	const t = await getTranslations("pages.connections");
-	const session = await auth();
-	if (!session?.user?.id) redirect("/login");
-
-	const id = Number(session.user.id);
-
-	// social_accounts is a CMS-only table that may not exist in every install
-	// (it has no bundled migration). Fall back to "nothing linked" on any error so
-	// the page still renders the generic connect buttons.
-	let linked: Set<string> = new Set();
-	let lookupFailed = false;
-	try {
-		const rows = await prisma.socialAccounts.findMany({
-			where: { userId: BigInt(id) },
-			select: { provider: true },
-		});
-		linked = new Set(rows.map((r) => r.provider.toLowerCase()));
-	} catch {
-		lookupFailed = true;
-	}
-
-	// After connecting/erroring, NextAuth bounces back here so we land on a known page.
-	const callbackUrl = "/settings/connections";
-
-	return (
-		<main
-			style={{
-				display: "grid",
-				gap: "1.5rem",
-				maxWidth: 620,
-				margin: "0 auto",
-			}}
-		>
-			<p className="muted" style={{ margin: 0 }}>
-				<Link href="/settings">{t("backToSettings")}</Link>
-			</p>
-
-			<ContentCard icon="🔗" title={t("title")} subtitle={t("subtitle")}>
-				<p className="muted" style={{ marginTop: 0 }}>
-					{t("matchByEmail")} <strong>{session.user.name}</strong>.
-				</p>
-
-				{lookupFailed ? (
-					<p className="muted" style={{ marginBottom: 0 }}>
-						{t("lookupFailed")}
-					</p>
-				) : null}
-			</ContentCard>
-
-			<div className="card-grid sm-2">
-				{PROVIDERS.map((p) => {
-					const isLinked = linked.has(p.key);
-					return (
-						<ContentCard
-							key={p.key}
-							icon={p.icon}
-							title={p.label}
-							subtitle={
-								!p.available
-									? t("statusUnavailable")
-									: isLinked
-										? t("statusConnected")
-										: t("statusNotConnected")
-							}
-						>
-							{isLinked ? (
-								<span
-									className="btn btn-outline"
-									style={{ cursor: "default", pointerEvents: "none" }}
-									aria-disabled="true"
-								>
-									{t("connected")}
-								</span>
-							) : p.available ? (
-								// Plain link into NextAuth's built-in sign-in handler. Re-using
-								// the same OAuth flow as /login binds the provider to the
-								// matching hotel account (see auth.ts signIn callback).
-								<a
-									className="btn btn-primary"
-									href={`/api/auth/signin/${p.key}?callbackUrl=${encodeURIComponent(callbackUrl)}`}
-								>
-									{t("connectProvider", { provider: p.label })}
-								</a>
-							) : (
-								<span
-									className="btn"
-									style={{
-										cursor: "not-allowed",
-										opacity: 0.55,
-										pointerEvents: "none",
-									}}
-									aria-disabled="true"
-								>
-									{t("unavailable")}
-								</span>
-							)}
-						</ContentCard>
-					);
-				})}
-			</div>
-
-			<p className="muted" style={{ margin: 0 }}>
-				{t("footerNote")}
-			</p>
-		</main>
-	);
-}

src/app/(site)/settings/page.tsx

@@ -1,8 +1,9 @@
+import Image from "next/image";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { updateMotto } from "@/actions/user-settings";
-import { ContentCard } from "@/components/public/ui";
+import { Reveal } from "@/components/motion-reveal";
 import { auth } from "@/lib/auth";
 import { avatarImageUrl } from "@/lib/format";
 import { prisma } from "@/lib/prisma";
@@ -39,107 +40,334 @@ export default async function SettingsPage() {
 		imagerBase =
 			(await siteSettings.get("habbo_imaging_url", imagerBase)) ?? imagerBase;
 	} catch {
-		// fall back to the default imager base
+		/* fall back to default */
 	}
 
 	const avatar = avatarImageUrl(imagerBase, user.look, { size: "l" });
 
 	return (
-		<main style={{ display: "grid", gap: "1.5rem" }}>
-			<ContentCard
-				icon="⚙️"
-				title={t("accountSettings")}
-				subtitle={t("accountSettingsSubtitle")}
-			/>
-
-			<ContentCard
-				icon="🙂"
-				title={user.username}
-				subtitle={t("publicProfile")}
-			>
+		<div className="flex flex-col gap-6 pb-14">
+			{/* Header */}
+			<Reveal>
 				<div
+					className="relative overflow-hidden rounded-xl border px-5 py-4"
 					style={{
-						display: "flex",
-						gap: "1.5rem",
-						alignItems: "center",
-						flexWrap: "wrap",
+						background:
+							"color-mix(in srgb, var(--color-surface) 60%, transparent)",
+						backdropFilter: "blur(14px)",
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
 					}}
 				>
-					{/* eslint-disable-next-line @next/next/no-img-element */}
-					<img
-						className="avatar"
-						src={avatar}
-						alt={`${user.username} avatar`}
-						width={100}
-						height={150}
-					/>
-					<div style={{ minWidth: 0 }}>
-						<p style={{ margin: "0 0 0.5rem", fontSize: "1.05rem" }}>
-							{user.motto || <span className="muted">{t("noMotto")}</span>}
-						</p>
-						<p className="muted" style={{ margin: 0 }}>
-							{user.mail || t("noEmail")}
-						</p>
+					<div className="flex items-center gap-3">
+						<div
+							className="w-10 h-10 rounded-xl flex items-center justify-center"
+							style={{
+								background:
+									"color-mix(in srgb, var(--color-primary) 14%, transparent)",
+							}}
+						>
+							<Image
+								src="/assets/images/icons/navigation/me.png"
+								alt=""
+								width={22}
+								height={22}
+								unoptimized
+							/>
+						</div>
+						<div>
+							<h1
+								className="text-lg font-black tracking-tight"
+								style={{
+									color: "var(--color-text-readable)",
+									fontFamily: "var(--font-nunito)",
+								}}
+							>
+								{t("accountSettings")}
+							</h1>
+							<p
+								className="text-xs"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								{t("accountSettingsSubtitle")}
+							</p>
+						</div>
 					</div>
 				</div>
-			</ContentCard>
+			</Reveal>
 
-			<ContentCard
-				icon="✏️"
-				title={t("changeMotto")}
-				subtitle={t("changeMottoSubtitle")}
-			>
-				<form
-					action={updateMotto}
+			{/* Profile card */}
+			<Reveal delay={0.05}>
+				<div
+					className="overflow-hidden rounded-xl border card-premium"
 					style={{
-						display: "flex",
-						flexDirection: "column",
-						gap: "0.75rem",
-						maxWidth: 520,
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
 					}}
 				>
-					<input
-						name="motto"
-						defaultValue={user.motto}
-						maxLength={127}
-						placeholder={t("mottoPlaceholder")}
-						aria-label="Motto"
-					/>
-					<div>
-						<button type="submit" className="btn btn-primary">
-							{t("saveMotto")}
-						</button>
+					<div
+						className="flex items-center gap-2.5 px-4 py-3"
+						style={{
+							background:
+								"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
+						}}
+					>
+						<Image
+							src="/assets/images/icons/navigation/me.png"
+							alt=""
+							width={18}
+							height={18}
+							unoptimized
+						/>
+						<h2
+							className="text-sm font-bold text-white"
+							style={{ fontFamily: "var(--font-nunito)" }}
+						>
+							{t("publicProfile")}
+						</h2>
 					</div>
-				</form>
-			</ContentCard>
+					<div
+						className="p-5 flex items-center gap-5"
+						style={{ backgroundColor: "var(--color-surface)" }}
+					>
+						<div className="shrink-0">
+							<div
+								className="rounded-xl overflow-hidden border"
+								style={{
+									borderColor:
+										"color-mix(in srgb, var(--color-primary) 15%, transparent)",
+								}}
+							>
+								<Image
+									src={avatar}
+									alt={`${user.username} avatar`}
+									width={80}
+									height={120}
+									className="block"
+									unoptimized
+								/>
+							</div>
+						</div>
+						<div className="min-w-0 flex-1">
+							<h3
+								className="text-base font-extrabold"
+								style={{ color: "var(--color-text-readable)" }}
+							>
+								{user.username}
+							</h3>
+							<p
+								className="text-sm mt-0.5"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								{user.motto || (
+									<span style={{ fontStyle: "italic", opacity: 0.5 }}>
+										{t("noMotto")}
+									</span>
+								)}
+							</p>
+							<p
+								className="text-xs mt-1.5 font-medium"
+								style={{
+									color:
+										"color-mix(in srgb, var(--color-text-muted) 70%, transparent)",
+								}}
+							>
+								{user.mail || t("noEmail")}
+							</p>
+						</div>
+					</div>
+				</div>
+			</Reveal>
 
-			<div className="card-grid sm-2">
-				<ContentCard
-					icon="🔒"
-					title={t("securityTitle")}
-					subtitle={t("securitySubtitle")}
+			{/* Motto form */}
+			<Reveal delay={0.1}>
+				<div
+					className="overflow-hidden rounded-xl border"
+					style={{
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+					}}
 				>
-					<p className="muted" style={{ marginTop: 0 }}>
-						{t("securityDescription")}
-					</p>
-					<Link href="/settings/2fa" className="btn btn-outline">
-						{t("twoFactorLink")}
-					</Link>
-				</ContentCard>
+					<div
+						className="flex items-center gap-2.5 px-4 py-3"
+						style={{
+							background:
+								"linear-gradient(140deg, #5a2d82 0%, #6b3a9e 20%, #7d47b8 40%, #8f54d0 60%, #7d47b8 75%, #6b3a9e 90%, #5a2d82 100%)",
+						}}
+					>
+						<Image
+							src="/assets/images/icons/star.gif"
+							alt=""
+							width={18}
+							height={18}
+							unoptimized
+						/>
+						<h2
+							className="text-sm font-bold text-white"
+							style={{ fontFamily: "var(--font-nunito)" }}
+						>
+							{t("changeMotto")}
+						</h2>
+					</div>
+					<div
+						className="p-5"
+						style={{ backgroundColor: "var(--color-surface)" }}
+					>
+						<p
+							className="text-xs mb-4"
+							style={{ color: "var(--color-text-muted)" }}
+						>
+							{t("changeMottoSubtitle")}
+						</p>
+						<form
+							action={updateMotto}
+							className="flex flex-col gap-3"
+							style={{ maxWidth: 520 }}
+						>
+							<input
+								name="motto"
+								defaultValue={user.motto}
+								maxLength={127}
+								placeholder={t("mottoPlaceholder")}
+								aria-label="Motto"
+								className="input-glow w-full rounded-xl border-2 px-4 py-3 text-sm font-medium transition-all focus:outline-none"
+								style={{
+									backgroundColor: "var(--color-background)",
+									color: "var(--color-text-readable)",
+									borderColor:
+										"color-mix(in srgb, var(--color-text-muted) 25%, transparent)",
+								}}
+							/>
+							<div>
+								<button
+									type="submit"
+									className="btn-shine inline-flex items-center gap-2 font-extrabold text-sm px-5 py-2.5 rounded-xl transition-all duration-200 hover:scale-[1.03] active:scale-95 shadow-lg"
+									style={{
+										background: "var(--color-primary)",
+										color: "var(--color-primary-foreground)",
+										boxShadow:
+											"0 4px 20px color-mix(in srgb, var(--color-primary) 30%, transparent)",
+									}}
+								>
+									{t("saveMotto")}
+								</button>
+							</div>
+						</form>
+					</div>
+				</div>
+			</Reveal>
 
-				<ContentCard
-					icon="🔗"
-					title={t("connectionsTitle")}
-					subtitle={t("connectionsSubtitle")}
+			{/* Security card */}
+			<Reveal delay={0.15}>
+				<div
+					className="overflow-hidden rounded-xl border"
+					style={{
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+					}}
 				>
-					<p className="muted" style={{ marginTop: 0 }}>
-						{t("connectionsDescription")}
-					</p>
-					<Link href="/settings/connections" className="btn btn-outline">
-						{t("manageConnections")}
-					</Link>
-				</ContentCard>
-			</div>
-		</main>
+					<div
+						className="flex items-center gap-2.5 px-4 py-3"
+						style={{
+							background:
+								"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
+						}}
+					>
+						<Image
+							src="/assets/images/icons/navigation/goody.png"
+							alt=""
+							width={18}
+							height={18}
+							unoptimized
+						/>
+						<h2
+							className="text-sm font-bold text-white"
+							style={{ fontFamily: "var(--font-nunito)" }}
+						>
+							{t("securityTitle")}
+						</h2>
+					</div>
+					<div
+						className="p-5"
+						style={{ backgroundColor: "var(--color-surface)" }}
+					>
+						<p
+							className="text-xs mb-4"
+							style={{ color: "var(--color-text-muted)" }}
+						>
+							{t("securityDescription")}
+						</p>
+						<Link
+							href="/settings/2fa"
+							className="inline-flex items-center gap-2 font-bold text-sm px-5 py-2.5 rounded-xl border-2 transition-all duration-200 hover:scale-[1.03] active:scale-95 backdrop-blur-sm"
+							style={{
+								borderColor:
+									"color-mix(in srgb, var(--color-text-muted) 20%, transparent)",
+								color: "var(--color-text-readable)",
+								background:
+									"color-mix(in srgb, var(--color-surface) 50%, transparent)",
+							}}
+						>
+							{t("twoFactorLink")}
+						</Link>
+					</div>
+				</div>
+			</Reveal>
+
+			{/* Sessions link */}
+			<Reveal delay={0.2}>
+				<Link
+					href="/settings/sessions"
+					className="block overflow-hidden rounded-xl border transition-all duration-200 hover:shadow-lg hover:-translate-y-0.5"
+					style={{
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+					}}
+				>
+					<div
+						className="flex items-center justify-between px-5 py-4"
+						style={{ backgroundColor: "var(--color-surface)" }}
+					>
+						<div className="flex items-center gap-3">
+							<div
+								className="w-10 h-10 rounded-xl flex items-center justify-center"
+								style={{
+									background:
+										"color-mix(in srgb, var(--color-primary) 14%, transparent)",
+								}}
+							>
+								<Image
+									src="/assets/images/icons/navigation/community.png"
+									alt=""
+									width={20}
+									height={20}
+									unoptimized
+								/>
+							</div>
+							<div>
+								<span
+									className="text-sm font-extrabold"
+									style={{ color: "var(--color-text-readable)" }}
+								>
+									Session Management
+								</span>
+								<p
+									className="text-xs mt-0.5"
+									style={{ color: "var(--color-text-muted)" }}
+								>
+									View active sessions and sign out everywhere
+								</p>
+							</div>
+						</div>
+						<span
+							className="text-lg font-bold"
+							style={{ color: "var(--color-text-muted)" }}
+						>
+							→
+						</span>
+					</div>
+				</Link>
+			</Reveal>
+		</div>
 	);
 }

src/app/(site)/settings/sessions/page.tsx

@@ -3,16 +3,13 @@ import { getTranslations } from "next-intl/server";
 import { signOutEverywhere } from "@/actions/sessions";
 import { ContentCard, EmptyState } from "@/components/public/ui";
 import { auth } from "@/lib/auth";
+import { formatDate } from "@/lib/format-date";
 import { prisma } from "@/lib/prisma";
 
 export const dynamic = "force-dynamic";
 
 type SearchParams = Promise<{ signedOutAll?: string }>;
 
-function fromDate(d: Date | null | undefined): string {
-	return d ? d.toISOString().slice(0, 16).replace("T", " ") : "—";
-}
-
 /** Tiny user-agent → "Browser on OS" summary (no dependency). */
 function deviceLabel(ua: string | null, unknown: string): string {
 	if (!ua) return unknown;
@@ -89,11 +86,7 @@ export default async function SessionsPage({
 				</p>
 			) : null}
 
-			<ContentCard
-				icon="🔐"
-				title={t("title")}
-				subtitle={t("subtitle")}
-			/>
+			<ContentCard icon="🔐" title={t("title")} subtitle={t("subtitle")} />
 
 			<ContentCard
 				icon="🚪"
@@ -107,7 +100,11 @@ export default async function SessionsPage({
 				</form>
 			</ContentCard>
 
-			<ContentCard icon="✅" title={t("recentTitle")} padded={logins.length === 0}>
+			<ContentCard
+				icon="✅"
+				title={t("recentTitle")}
+				padded={logins.length === 0}
+			>
 				{logins.length === 0 ? (
 					<EmptyState icon="🔐">{t("recentEmpty")}</EmptyState>
 				) : (
@@ -123,7 +120,7 @@ export default async function SessionsPage({
 							{logins.map((l) => (
 								<tr key={String(l.id)}>
 									<td className="muted" style={{ whiteSpace: "nowrap" }}>
-										{fromDate(l.createdAt)}
+										{formatDate(l.createdAt)}
 									</td>
 									<td className="muted">{l.ip}</td>
 									<td>{deviceLabel(l.userAgent, t("unknownDevice"))}</td>
@@ -151,9 +148,11 @@ export default async function SessionsPage({
 							{failed.map((f) => (
 								<tr key={f.id}>
 									<td className="muted" style={{ whiteSpace: "nowrap" }}>
-										{typeof f.attempted_at === "string"
-											? f.attempted_at.slice(0, 16).replace("T", " ")
-											: fromDate(f.attempted_at)}
+										{formatDate(
+											typeof f.attempted_at === "string"
+												? new Date(f.attempted_at)
+												: f.attempted_at,
+										)}
 									</td>
 									<td className="muted">{f.ip_address}</td>
 								</tr>

src/app/(site)/shop/page.tsx

@@ -79,7 +79,12 @@ const ARTICLE_SELECT = {
 export default async function ShopPage({
 	searchParams,
 }: {
-	searchParams: Promise<{ category?: string; bought?: string; error?: string; package?: string }>;
+	searchParams: Promise<{
+		category?: string;
+		bought?: string;
+		error?: string;
+		package?: string;
+	}>;
 }) {
 	const t = await getTranslations("pages.shop");
 	const sp = await searchParams;
@@ -185,8 +190,7 @@ export default async function ShopPage({
 				}
 			>
 				<p className="muted" style={{ margin: "0 0 0.75rem" }}>
-					{t("creditsHint")}{" "}
-					<Link href="/shop/topup">{t("topUpLink")}</Link>
+					{t("creditsHint")} <Link href="/shop/topup">{t("topUpLink")}</Link>
 				</p>
 				{categories.length > 0 ? (
 					<div
@@ -319,8 +323,16 @@ export default async function ShopPage({
 									</span>
 									{isLoggedIn ? (
 										<form action={buyShopArticle} style={{ margin: 0 }}>
-											<input type="hidden" name="articleId" value={String(a.id)} />
-											<input type="hidden" name="categoryId" value={categoryId} />
+											<input
+												type="hidden"
+												name="articleId"
+												value={String(a.id)}
+											/>
+											<input
+												type="hidden"
+												name="categoryId"
+												value={categoryId}
+											/>
 											<button type="submit" className="btn btn-primary">
 												{t("buy")}
 											</button>

src/app/(site)/u/[username]/page.tsx

@@ -67,11 +67,6 @@ const BADGE_IMG_BASE = "https://images.habbo.com/c_images/album1584";
 const CURRENCY_DUCKETS = 0;
 const CURRENCY_DIAMONDS = 5;
 
-function formatTimestamp(ts: number | null | undefined): string {
-	if (!ts) return "";
-	return new Date(ts * 1000).toISOString().slice(0, 10);
-}
-
 export default async function ProfilePage({
 	params,
 	searchParams,
@@ -107,9 +102,7 @@ export default async function ProfilePage({
 	if (!user) notFound();
 
 	const avatar = avatarImageUrl(imagerBase ?? "", user.look, { size: "l" });
-	const registered = new Date(user.accountCreated * 1000)
-		.toISOString()
-		.slice(0, 10);
+	const registered = formatDate(new Date(user.accountCreated * 1000), "date");
 	const meId = Number(session?.user?.id);
 	const isLoggedIn = Number.isInteger(meId) && meId > 0;
 	const isSelf = isLoggedIn && meId === user.id;
@@ -601,7 +594,7 @@ export default async function ProfilePage({
 									}}
 								/>
 								<p className="muted" style={{ margin: "0.4rem 0 0" }}>
-									{formatTimestamp(p.timestamp)}
+									{formatDate(new Date(p.timestamp * 1000), "date")}
 								</p>
 							</div>
 						))}

src/app/(site)/verify/page.tsx

@@ -1,14 +1,74 @@
+import { CheckCircle2, Clock, MailX } from "lucide-react";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { isValidVerificationToken } from "@/actions/email-verify";
-import { DiscordVerifyForm } from "@/components/auth/discord-verify-form";
-import { ContentCard, EmptyState } from "@/components/public/ui";
-import { auth } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 
 export const dynamic = "force-dynamic";
 
-type Status = "verified" | "already" | "invalid" | "unavailable" | "discord";
+type Status = "verified" | "already" | "invalid" | "unavailable";
+
+function StatusCard({
+	icon,
+	title,
+	subtitle,
+	children,
+	color,
+}: {
+	icon: React.ReactNode;
+	title: string;
+	subtitle: string;
+	children: React.ReactNode;
+	color: string;
+}) {
+	const gradientMap: Record<string, string> = {
+		green:
+			"linear-gradient(140deg, #0A2F1A 0%, #0F3D22 20%, #154C2A 40%, #1B5A32 60%, #20683A 75%, #1A5A30 90%, #144826 100%)",
+		yellow:
+			"linear-gradient(140deg, #3A2F0A 0%, #4A3D0F 20%, #5A4C15 40%, #6A5A1B 60%, #7A6820 75%, #6A5A1A 90%, #5A4814 100%)",
+		red: "linear-gradient(140deg, #3A0F0A 0%, #4A1A0F 20%, #5A2515 40%, #6A301B 60%, #7A3B20 75%, #6A301A 90%, #5A2514 100%)",
+		blue: "linear-gradient(140deg, #0A1A3A 0%, #0F254A 20%, #15305A 40%, #1B3B6A 60%, #20467A 75%, #1A3B6A 90%, #14305A 100%)",
+	};
+
+	return (
+		<main className="flex min-h-[60vh] items-center justify-center px-4">
+			<div
+				className="w-full max-w-md overflow-hidden rounded-xl border"
+				style={{
+					borderColor:
+						"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
+					backgroundColor: "var(--color-surface)",
+				}}
+			>
+				<div
+					className="flex items-center gap-2.5 px-5 py-4"
+					style={{ background: gradientMap[color] ?? gradientMap.blue }}
+				>
+					<span className="text-white">{icon}</span>
+					<h1 className="text-sm font-bold text-white">{title}</h1>
+				</div>
+				<div className="flex flex-col items-center gap-4 px-6 py-8 text-center">
+					<div
+						className="flex h-16 w-16 items-center justify-center rounded-full"
+						style={{
+							background:
+								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+						}}
+					>
+						{icon}
+					</div>
+					<p
+						className="text-sm font-semibold"
+						style={{ color: "var(--color-text-muted)" }}
+					>
+						{subtitle}
+					</p>
+					{children}
+				</div>
+			</div>
+		</main>
+	);
+}
 
 export default async function VerifyPage({
 	searchParams,
@@ -16,36 +76,15 @@ export default async function VerifyPage({
 	searchParams: Promise<{
 		token?: string;
 		email?: string;
-		method?: string;
-		linked?: string;
 	}>;
 }) {
 	const t = await getTranslations("pages.verify");
-	const {
-		token = "",
-		email = "",
-		method = "",
-		linked = "",
-	} = await searchParams;
+	const { token = "", email = "" } = await searchParams;
 	const normalisedEmail = email.trim().toLowerCase();
 
 	let status: Status = "invalid";
-	let discordAlreadyLinked = false;
 
-	if (method === "discord" || linked === "1") {
-		status = "discord";
-		const session = await auth();
-		if (session?.user?.id) {
-			const userId = Number(session.user.id);
-			try {
-				const linkedRow = await prisma.socialAccounts.findFirst({
-					where: { userId: BigInt(userId), provider: "discord" },
-					select: { id: true },
-				});
-				discordAlreadyLinked = !!linkedRow;
-			} catch {}
-		}
-	} else if (normalisedEmail && token) {
+	if (normalisedEmail && token) {
 		const ok = await isValidVerificationToken(normalisedEmail, token);
 		if (ok) {
 			try {
@@ -70,102 +109,86 @@ export default async function VerifyPage({
 		}
 	}
 
+	const linkClass =
+		"btn-shine inline-flex items-center gap-2 font-extrabold text-sm px-6 py-3 rounded-xl transition-all duration-200 hover:scale-[1.02] active:scale-95 shadow-lg";
+	const linkStyle = {
+		background: "var(--color-primary)",
+		color: "var(--color-primary-foreground)",
+		boxShadow:
+			"0 4px 20px color-mix(in srgb, var(--color-primary) 30%, transparent)",
+	};
+
 	return (
-		<main style={{ maxWidth: 480, margin: "2rem auto" }}>
+		<>
 			{status === "verified" && (
-				<ContentCard
-					icon="✅"
+				<StatusCard
+					icon={<CheckCircle2 size={22} />}
 					title={t("verifiedTitle")}
 					subtitle={t("verifiedSubtitle")}
+					color="green"
 				>
-					<p className="muted" style={{ marginTop: 0 }}>
+					<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
 						{t("verifiedBody")}
 					</p>
-					<Link href="/login" className="btn btn-primary">
+					<Link href="/login" className={linkClass} style={linkStyle}>
 						{t("goToLogin")}
 					</Link>
-				</ContentCard>
+				</StatusCard>
 			)}
 
 			{status === "already" && (
-				<ContentCard
-					icon="✅"
+				<StatusCard
+					icon={<CheckCircle2 size={22} />}
 					title={t("alreadyTitle")}
 					subtitle={t("alreadySubtitle")}
+					color="yellow"
 				>
-					<p className="muted" style={{ marginTop: 0 }}>
+					<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
 						{t("alreadyBody")}
 					</p>
-					<Link href="/login" className="btn btn-primary">
+					<Link href="/login" className={linkClass} style={linkStyle}>
 						{t("goToLogin")}
 					</Link>
-				</ContentCard>
+				</StatusCard>
 			)}
 
 			{status === "unavailable" && (
-				<ContentCard
-					icon="⏳"
+				<StatusCard
+					icon={<Clock size={22} />}
 					title={t("unavailableTitle")}
 					subtitle={t("unavailableSubtitle")}
+					color="blue"
 				>
-					<p className="muted" style={{ margin: 0 }}>
+					<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
 						{t("unavailableBody")}
 					</p>
-				</ContentCard>
+				</StatusCard>
 			)}
 
 			{status === "invalid" && (
-				<ContentCard
-					icon="📧"
+				<StatusCard
+					icon={<MailX size={22} />}
 					title={t("invalidTitle")}
 					subtitle={t("invalidSubtitle")}
+					color="red"
 				>
-					<EmptyState icon="🔗">{t("invalidBody")}</EmptyState>
-					<div style={{ textAlign: "center" }}>
-						<Link href="/login" className="btn btn-outline">
-							{t("backToLogin")}
-						</Link>
-					</div>
-				</ContentCard>
+					<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
+						{t("invalidBody")}
+					</p>
+					<Link
+						href="/login"
+						className={`${linkClass} !shadow-none`}
+						style={{
+							background: "transparent",
+							color: "var(--color-text-readable)",
+							border:
+								"2px solid color-mix(in srgb, var(--color-text-muted) 20%, transparent)",
+						}}
+					>
+						{t("backToLogin")}
+					</Link>
+				</StatusCard>
 			)}
-
-			{status === "discord" && (
-				<ContentCard
-					icon="🎮"
-					title="Verifieer via Discord"
-					subtitle="Koppel je Discord account"
-				>
-					{linked === "1" && (
-						<div
-							className="rounded-md p-4 text-center mb-4"
-							style={{ backgroundColor: "#14532d", color: "white" }}
-						>
-							<p className="text-lg font-bold mb-1">Gelinkt!</p>
-							<p className="text-sm opacity-90">
-								Je Discord account is gekoppeld. Je kunt nu verder.
-							</p>
-						</div>
-					)}
-					{discordAlreadyLinked ? (
-						<div
-							className="rounded-md p-4 text-center"
-							style={{ backgroundColor: "#14532d", color: "white" }}
-						>
-							<p className="text-lg font-bold mb-1">Al geverifieerd!</p>
-							<p className="text-sm opacity-90">
-								Je Discord account is al gekoppeld aan dit account.
-							</p>
-						</div>
-					) : (
-						<DiscordVerifyForm />
-					)}
-					<div style={{ textAlign: "center", marginTop: "1rem" }}>
-						<Link href="/" className="btn btn-primary">
-							Naar home
-						</Link>
-					</div>
-				</ContentCard>
-			)}
-		</main>
+		</>
 	);
 }

src/app/admin/achievements/page.tsx

@@ -1,8 +1,8 @@
+import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { StatusCard } from "@/components/admin/dashboard";
-import { prisma } from "@/lib/prisma";
-import { redirect } from "next/navigation";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
+import { prisma } from "@/lib/prisma";
 
 type Achievement = {
 	name: string;

src/app/admin/ads/[id]/page.tsx

@@ -3,8 +3,9 @@ import Link from "next/link";
 import { notFound, redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { updateAd } from "@/actions/admin-ads";
-import { prisma } from "@/lib/prisma";
+import { Button } from "@/components/ui/button";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
+import { prisma } from "@/lib/prisma";
 import { EditAdDeleteButton } from "../ads-table";
 
 export const dynamic = "force-dynamic";
@@ -54,9 +55,9 @@ export default async function EditAd({
 					required
 					maxLength={255}
 				/>
-				<button type="submit" className="btn btn-primary">
+				<Button type="submit" variant="default">
 					{t("form.save")}
-				</button>
+				</Button>
 			</form>
 			<div style={{ marginTop: "1rem" }}>
 				<EditAdDeleteButton id={String(ad.id)} />

src/app/admin/ads/ads-table.tsx

@@ -5,6 +5,7 @@ import Link from "next/link";
 import { useTranslations } from "next-intl";
 import { deleteAd } from "@/actions/admin-ads";
 import { useConfirmDialog } from "@/components/admin/confirm-dialog";
+import { Button } from "@/components/ui/button";
 import { useServerAction } from "@/hooks/use-server-action";
 
 export type AdRow = {
@@ -64,15 +65,16 @@ export function AdsTable({ ads }: { ads: AdRow[] }) {
 							<td>
 								<div className="flex items-center gap-2">
 									<Link href={`/admin/ads/${ad.id}`}>{t("edit")}</Link>
-									<button
+									<Button
 										type="button"
-										className="btn btn-danger btn-sm inline-flex items-center gap-1"
+										variant="destructive"
+										size="sm"
 										disabled={isPending}
 										onClick={() => handleDelete(ad)}
 									>
 										<Trash2 className="h-3.5 w-3.5" />
 										{t("delete")}
-									</button>
+									</Button>
 								</div>
 							</td>
 						</tr>
@@ -106,14 +108,14 @@ export function EditAdDeleteButton({ id }: { id: string }) {
 	return (
 		<>
 			{confirmDialog}
-			<button
+			<Button
 				type="button"
-				className="btn btn-danger"
+				variant="destructive"
 				disabled={isPending}
 				onClick={handleDelete}
 			>
 				{t("form.deleteAd")}
-			</button>
+			</Button>
 		</>
 	);
 }

src/app/admin/ads/new/page.tsx

@@ -2,6 +2,7 @@ import { Megaphone } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { createAd } from "@/actions/admin-ads";
+import { Button } from "@/components/ui/button";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
 
 export default async function NewAd() {
@@ -27,9 +28,9 @@ export default async function NewAd() {
 			</div>
 			<form action={createAd} className="admin-card">
 				<input name="image" placeholder="Image URL" required maxLength={255} />
-				<button type="submit" className="btn btn-primary">
+				<Button type="submit" variant="default">
 					Create
-				</button>
+				</Button>
 			</form>
 		</main>
 	);

src/app/admin/ads/page.tsx

@@ -1,9 +1,11 @@
 import Link from "next/link";
+import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { StatusCard } from "@/components/admin/dashboard";
-import { prisma } from "@/lib/prisma";
-import { redirect } from "next/navigation";
+import { Button } from "@/components/ui/button";
+import { formatDate } from "@/lib/format-date";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
+import { prisma } from "@/lib/prisma";
 import { AdsTable } from "./ads-table";
 
 export const dynamic = "force-dynamic";
@@ -25,16 +27,14 @@ export default async function AdminAds() {
 		ads = [];
 	}
 
-	const latest = ads[0]?.createdAt
-		? ads[0].createdAt.toISOString().slice(0, 10)
-		: "—";
+	const latest = ads[0]?.createdAt ? formatDate(ads[0].createdAt, "date") : "—";
 
 	return (
 		<main>
 			<div className="flex justify-end mb-6">
-				<Link href="/admin/ads/new" className="btn btn-primary">
-					+ {t("newAd")}
-				</Link>
+				<Button variant="default" asChild>
+					<Link href="/admin/ads/new">+ {t("newAd")}</Link>
+				</Button>
 			</div>
 
 			<div className="grid grid-cols-[repeat(auto-fit,minmax(180px,1fr))] gap-3.5 mb-6">
@@ -56,9 +56,7 @@ export default async function AdminAds() {
 						ads={ads.map((ad) => ({
 							id: String(ad.id),
 							image: ad.image,
-							createdAt: ad.createdAt
-								? ad.createdAt.toISOString().slice(0, 10)
-								: null,
+							createdAt: ad.createdAt ? formatDate(ad.createdAt, "date") : null,
 						}))}
 					/>
 				)}

src/app/admin/alerts/page.tsx

@@ -1,17 +1,15 @@
+import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { sendHotelAlert } from "@/actions/admin-alerts";
 import { StatusCard } from "@/components/admin/dashboard";
-import { prisma } from "@/lib/prisma";
-import { redirect } from "next/navigation";
+import { Button } from "@/components/ui/button";
+import { formatDate } from "@/lib/format-date";
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
+import { prisma } from "@/lib/prisma";
 
 const CRITICAL = new Set(["critical", "error", "danger"]);
 const WARNING = new Set(["warning", "warn"]);
 
-function fromDate(d: Date | null | undefined): string {
-	return d ? d.toISOString().slice(0, 16).replace("T", " ") : "—";
-}
-
 function severityColor(severity: string): string {
 	switch (severity.toLowerCase()) {
 		case "critical":
@@ -118,9 +116,9 @@ export default async function AdminAlerts() {
 						placeholder={t("form.messagePlaceholder")}
 						className="flex-1 min-w-[240px]"
 					/>
-					<button type="submit" className="btn btn-primary">
+					<Button type="submit" variant="default">
 						{t("form.send")}
-					</button>
+					</Button>
 				</div>
 			</form>
 
@@ -143,7 +141,7 @@ export default async function AdminAlerts() {
 								{alerts.map((a) => (
 									<tr key={String(a.id)}>
 										<td className="text-sm theme-text-muted dark:theme-text-muted whitespace-nowrap">
-											{fromDate(a.createdAt)}
+											{formatDate(a.createdAt)}
 										</td>
 										<td>
 											<Badge