Merge branch 'main' of https://git.rother-woelki.de/chris/ironie-nextjs

# Conflicts:
#	src/app/[locale]/components/CommunityMatchList.tsx

src/app/[locale]/components/GameBanner.tsx

@@ -170,7 +170,7 @@ export default function GameBanner(props: Props) {
           <div className="flex-1 min-w-0">
             <div className="text-sm flex items-center gap-2">
               <span className="inline-flex items-center gap-1 font-semibold px-2 py-0.5 rounded-md bg-white/10 ring-1 ring-white/15">
-                {isConnected ? (serverLabel ?? 'CS2 Server') : t('disconnected')}
+                {isConnected ? (serverLabel ?? 'CS2 Server') : t('not-connected')}
               </span>
             </div>
             <InfoRow />

src/app/[locale]/components/MapVotePanel.tsx

@@ -401,11 +401,11 @@ export default function MapVotePanel({ match }: Props) {
   }, [match, state?.teams?.teamB?.players])
 
   const teamAPlayersForRank = useMemo(
-    () => playersA.map(p => ({ premierRank: p.stats?.rankNew ?? 0 })) as any,
+    () => playersA.map(p => ({ premierRank: p.user.premierRank ?? 0 })) as any,
     [playersA]
   )
   const teamBPlayersForRank = useMemo(
-    () => playersB.map(p => ({ premierRank: p.stats?.rankNew ?? 0 })) as any,
+    () => playersB.map(p => ({ premierRank: p.user.premierRank ?? 0 })) as any,
     [playersB]
   )
 
@@ -647,7 +647,7 @@ export default function MapVotePanel({ match }: Props) {
                     side={teamLeftKey === 'teamA' ? 'A' : 'B'}
                     name={p.user.name ?? 'Unbekannt'}
                     avatar={p.user.avatar}
-                    rank={p.stats?.rankNew ?? 0}
+                    rank={p.user.premierRank ?? 0}
                     matchType={match.matchType}
                     onClick={() => router.push(`/profile/${p.user.steamId}`)}
                     isLeader={(state?.teams?.[teamLeftKey]?.leader?.steamId ?? teamLeft?.leader?.steamId) === p.user.steamId}
@@ -818,7 +818,7 @@ export default function MapVotePanel({ match }: Props) {
                     side={teamRightKey === 'teamA' ? 'A' : 'B'}
                     name={p.user.name ?? 'Unbekannt'}
                     avatar={p.user.avatar}
-                    rank={p.stats?.rankNew ?? 0}
+                    rank={p.user.premierRank ?? 0}
                     matchType={match.matchType}
                     onClick={() => router.push(`/profile/${p.user.steamId}`)}
                     isLeader={(state?.teams?.[teamRightKey]?.leader?.steamId ?? teamRight?.leader?.steamId) === p.user.steamId}

src/app/[locale]/components/MatchDetails.tsx

@@ -472,9 +472,18 @@ export function MatchDetails({match, initialNow}: { match: Match; initialNow: nu
 
               <Table.Cell>
                 <div className="flex items-center gap-[6px]">
-                  {match.matchType === 'premier'
-                    ? <PremierRankBadge rank={p.stats?.rankNew ?? 0} />
-                    : <CompRankBadge rank={p.stats?.rankNew ?? 0} />}
+                  {match.matchType === 'premier' ? (
+                    // Premier-Match: Premier-Badge aus Stats (Fallback auf User)
+                    <PremierRankBadge rank={p.stats?.rankNew ?? p.user?.premierRank ?? 0} />
+                  ) : match.matchType === 'community' ? (
+                    // Community-Match: IMMER Premier-Badge – Quelle primär User.premierRank
+                    <PremierRankBadge rank={p.user?.premierRank ?? p.stats?.rankNew ?? 0} />
+                  ) : (
+                    // Alle anderen (z. B. competitive): Comp-Badge
+                    <CompRankBadge rank={p.stats?.rankNew ?? 0} />
+                  )}
+
+                  {/* Rangänderung nur für echte Premier-Matches anzeigen */}
                   {match.matchType === 'premier' && typeof p.stats?.rankChange === 'number' && (
                     <span
                       className={`text-sm ${

src/app/[locale]/components/TeamPremierRankBadge.tsx

@@ -1,20 +1,27 @@
 'use client'
 
+import { useMemo } from 'react'
 import PremierRankBadge from './PremierRankBadge'
-import { Player } from '../../../types/team'
 
-type Props = {
-  players: Player[]
-}
+type PlayerLike = { premierRank?: number | null }
+type Props = { players: PlayerLike[] }
 
 export default function TeamPremierRankBadge({ players }: Props) {
-  const totalRank = players.reduce((sum, p) => {
-    return typeof p.premierRank === 'number' ? sum + p.premierRank : sum
-  }, 0)
+  const avgRank = useMemo(() => {
+    const ranks = players
+      .map(p => p.premierRank ?? 0)
+      .filter(r => Number.isFinite(r) && r > 0) // 0/undef als "unbekannt" ignorieren
+    if (ranks.length === 0) return 0
+    const sum = ranks.reduce((a, b) => a + b, 0)
+    return Math.round(sum / ranks.length) // oder Math.floor / Math.ceil
+  }, [players])
+
+  // Optional: gar nichts anzeigen, wenn kein valider Rank vorhanden
+  // if (avgRank === 0) return null
 
   return (
     <div className="mt-1">
-      <PremierRankBadge rank={totalRank} />
+      <PremierRankBadge rank={avgRank} />
     </div>
   )
 }

src/app/api/team/kick/route.ts

@@ -74,7 +74,7 @@ export async function POST(req: NextRequest) {
       data: {
         user       : { connect: { steamId } },
         title      : 'Team verlassen',
-        message    : `Du wurdest aus dem Team „${teamName}” entfernt.`,
+        message    : `Du wurdest aus dem Team „${teamName}” geworfen.`,
         actionType : 'team-kick-self',
       },
     })

src/generated/prisma/edge.js

@@ -35,11 +35,11 @@ exports.Prisma = Prisma
 exports.$Enums = {}
 
 /**
- * Prisma Client JS version: 6.16.2
+ * Prisma Client JS version: 6.16.1
  * Query Engine version: 1c57fdcd7e44b29b9313256c76699e91c3ac3c43
  */
 Prisma.prismaVersion = {
-  client: "6.16.2",
+  client: "6.16.1",
   engine: "1c57fdcd7e44b29b9313256c76699e91c3ac3c43"
 }
 
@@ -369,7 +369,7 @@ const config = {
       "value": "prisma-client-js"
     },
     "output": {
-      "value": "C:\\Users\\Rother\\fork\\ironie-nextjs\\src\\generated\\prisma",
+      "value": "C:\\Users\\Chris\\fork\\ironie-nextjs\\src\\generated\\prisma",
       "fromEnvVar": null
     },
     "config": {
@@ -383,7 +383,7 @@ const config = {
       }
     ],
     "previewFeatures": [],
-    "sourceFilePath": "C:\\Users\\Rother\\fork\\ironie-nextjs\\prisma\\schema.prisma",
+    "sourceFilePath": "C:\\Users\\Chris\\fork\\ironie-nextjs\\prisma\\schema.prisma",
     "isCustomOutput": true
   },
   "relativeEnvPaths": {
@@ -391,7 +391,7 @@ const config = {
     "schemaEnvPath": "../../../.env"
   },
   "relativePath": "../../../prisma",
-  "clientVersion": "6.16.2",
+  "clientVersion": "6.16.1",
   "engineVersion": "1c57fdcd7e44b29b9313256c76699e91c3ac3c43",
   "datasourceNames": [
     "db"

src/generated/prisma/index-browser.js

@@ -20,11 +20,11 @@ exports.Prisma = Prisma
 exports.$Enums = {}
 
 /**
- * Prisma Client JS version: 6.16.2
+ * Prisma Client JS version: 6.16.1
  * Query Engine version: 1c57fdcd7e44b29b9313256c76699e91c3ac3c43
  */
 Prisma.prismaVersion = {
-  client: "6.16.2",
+  client: "6.16.1",
   engine: "1c57fdcd7e44b29b9313256c76699e91c3ac3c43"
 }
 

src/generated/prisma/index.d.ts

@@ -460,7 +460,7 @@ export namespace Prisma {
   export import Exact = $Public.Exact
 
   /**
-   * Prisma Client JS version: 6.16.2
+   * Prisma Client JS version: 6.16.1
    * Query Engine version: 1c57fdcd7e44b29b9313256c76699e91c3ac3c43
    */
   export type PrismaVersion = {

src/generated/prisma/index.js

@@ -35,11 +35,11 @@ exports.Prisma = Prisma
 exports.$Enums = {}
 
 /**
- * Prisma Client JS version: 6.16.2
+ * Prisma Client JS version: 6.16.1
  * Query Engine version: 1c57fdcd7e44b29b9313256c76699e91c3ac3c43
  */
 Prisma.prismaVersion = {
-  client: "6.16.2",
+  client: "6.16.1",
   engine: "1c57fdcd7e44b29b9313256c76699e91c3ac3c43"
 }
 
@@ -370,7 +370,7 @@ const config = {
       "value": "prisma-client-js"
     },
     "output": {
-      "value": "C:\\Users\\Rother\\fork\\ironie-nextjs\\src\\generated\\prisma",
+      "value": "C:\\Users\\Chris\\fork\\ironie-nextjs\\src\\generated\\prisma",
       "fromEnvVar": null
     },
     "config": {
@@ -384,7 +384,7 @@ const config = {
       }
     ],
     "previewFeatures": [],
-    "sourceFilePath": "C:\\Users\\Rother\\fork\\ironie-nextjs\\prisma\\schema.prisma",
+    "sourceFilePath": "C:\\Users\\Chris\\fork\\ironie-nextjs\\prisma\\schema.prisma",
     "isCustomOutput": true
   },
   "relativeEnvPaths": {
@@ -392,7 +392,7 @@ const config = {
     "schemaEnvPath": "../../../.env"
   },
   "relativePath": "../../../prisma",
-  "clientVersion": "6.16.2",
+  "clientVersion": "6.16.1",
   "engineVersion": "1c57fdcd7e44b29b9313256c76699e91c3ac3c43",
   "datasourceNames": [
     "db"

src/generated/prisma/package.json

@@ -151,7 +151,7 @@
     },
     "./*": "./*"
   },
-  "version": "6.16.2",
+  "version": "6.16.1",
   "sideEffects": false,
   "imports": {
     "#wasm-engine-loader": {

src/generated/prisma/wasm.js

@@ -35,11 +35,11 @@ exports.Prisma = Prisma
 exports.$Enums = {}
 
 /**
- * Prisma Client JS version: 6.16.2
+ * Prisma Client JS version: 6.16.1
  * Query Engine version: 1c57fdcd7e44b29b9313256c76699e91c3ac3c43
  */
 Prisma.prismaVersion = {
-  client: "6.16.2",
+  client: "6.16.1",
   engine: "1c57fdcd7e44b29b9313256c76699e91c3ac3c43"
 }
 
@@ -369,7 +369,7 @@ const config = {
       "value": "prisma-client-js"
     },
     "output": {
-      "value": "C:\\Users\\Rother\\fork\\ironie-nextjs\\src\\generated\\prisma",
+      "value": "C:\\Users\\Chris\\fork\\ironie-nextjs\\src\\generated\\prisma",
       "fromEnvVar": null
     },
     "config": {
@@ -383,7 +383,7 @@ const config = {
       }
     ],
     "previewFeatures": [],
-    "sourceFilePath": "C:\\Users\\Rother\\fork\\ironie-nextjs\\prisma\\schema.prisma",
+    "sourceFilePath": "C:\\Users\\Chris\\fork\\ironie-nextjs\\prisma\\schema.prisma",
     "isCustomOutput": true
   },
   "relativeEnvPaths": {
@@ -391,7 +391,7 @@ const config = {
     "schemaEnvPath": "../../../.env"
   },
   "relativePath": "../../../prisma",
-  "clientVersion": "6.16.2",
+  "clientVersion": "6.16.1",
   "engineVersion": "1c57fdcd7e44b29b9313256c76699e91c3ac3c43",
   "datasourceNames": [
     "db"

src/messages/de.json

@@ -111,7 +111,7 @@
     }
   },
   "game-banner": {
-    "disconnected": "Nicht verbunden",
+    "not-connected": "Nicht verbunden",
     "player-connected": "Spieler verbunden",
     "open-game": "Spiel starten",
     "quit": "Beenden",

src/messages/en.json

@@ -111,7 +111,7 @@
     }
   },
   "game-banner": {
-    "disconnected": "Disconnected",
+    "not-connected": "Not connected",
     "player-connected": "Players connected",
     "open-game": "Open Game",
     "quit": "Quit",