idk

.gitea/workflows/ci-cd.yaml

@@ -1,143 +0,0 @@
-name: CI/CD Pipeline
-
-on:
-  push:
-    branches:
-      - development
-      - main
-
-jobs:
-  build-app:
-    name: Build and Push App Docker Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set environment variables
-        run: |
-          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
-            echo "DOCKER_TAG=latest" >> $GITHUB_ENV
-            echo "ENVIRONMENT=prod" >> $GITHUB_ENV
-          else
-            echo "DOCKER_TAG=dev" >> $GITHUB_ENV
-            echo "ENVIRONMENT=dev" >> $GITHUB_ENV
-          fi
-
-      - name: Build and push app Docker image
-        run: |
-          docker login git.yohler.net -u ${{ github.actor }} -p ${{ secrets.PACKAGES_TOKEN }}
-
-          docker build \
-            -f Dockerfile \
-            -t git.yohler.net/kyle/flxn-app:${{ env.DOCKER_TAG }} \
-            -t git.yohler.net/kyle/flxn-app:${{ github.sha }} \
-            .
-
-          docker push git.yohler.net/kyle/flxn-app:${{ env.DOCKER_TAG }}
-          docker push git.yohler.net/kyle/flxn-app:${{ github.sha }}
-
-  build-pocketbase:
-    name: Build and Push PocketBase Docker Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Check if PocketBase Dockerfile or migrations changed
-        id: check_changes
-        run: |
-          if [ "${{ github.event.before }}" == "0000000000000000000000000000000000000000" ] || ! git cat-file -e ${{ github.event.before }} 2>/dev/null; then
-            echo "changed=true" >> $GITHUB_OUTPUT
-          elif git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -qE "(Dockerfile.pocketbase|pb_migrations/)"; then
-            echo "changed=true" >> $GITHUB_OUTPUT
-          else
-            echo "changed=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Build and push PocketBase Docker image
-        if: steps.check_changes.outputs.changed == 'true' || github.event.before == '0000000000000000000000000000000000000000'
-        run: |
-          docker login git.yohler.net -u ${{ github.actor }} -p ${{ secrets.PACKAGES_TOKEN }}
-
-          docker build \
-            -f Dockerfile.pocketbase \
-            -t git.yohler.net/kyle/flxn-pocketbase:latest \
-            -t git.yohler.net/kyle/flxn-pocketbase:${{ github.sha }} \
-            .
-
-          docker push git.yohler.net/kyle/flxn-pocketbase:latest
-          docker push git.yohler.net/kyle/flxn-pocketbase:${{ github.sha }}
-
-  deploy:
-    name: Deploy to Kubernetes
-    needs: [build-app, build-pocketbase]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set environment variables
-        run: |
-          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
-            echo "ENVIRONMENT=prod" >> $GITHUB_ENV
-            echo "NAMESPACE=flxn-prod" >> $GITHUB_ENV
-          else
-            echo "ENVIRONMENT=dev" >> $GITHUB_ENV
-            echo "NAMESPACE=flxn-dev" >> $GITHUB_ENV
-          fi
-
-      - name: Install kubectl
-        run: |
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          chmod +x kubectl
-          mv kubectl /usr/local/bin/
-
-      - name: Configure kubectl
-        run: |
-          mkdir -p $HOME/.kube
-          echo "${{ secrets.KUBE_CONFIG }}" | base64 -d > $HOME/.kube/config
-          chmod 600 $HOME/.kube/config
-          kubectl config set-cluster local --insecure-skip-tls-verify=true
-
-      - name: Verify kubectl access
-        run: |
-          kubectl version --client
-          kubectl get nodes
-
-      - name: Deploy shared services (SuperTokens)
-        run: |
-          kubectl apply -k k8s/overlays/shared/
-
-      - name: Deploy to ${{ env.ENVIRONMENT }}
-        run: |
-          kubectl apply -k k8s/overlays/${{ env.ENVIRONMENT }}/
-
-      - name: Force rollout to pull latest image
-        run: |
-          kubectl rollout restart deployment/flxn-app -n ${{ env.NAMESPACE }}
-          kubectl rollout restart deployment/flxn-pocketbase -n ${{ env.NAMESPACE }}
-
-      - name: Wait for rollout
-        run: |
-          kubectl rollout status deployment/flxn-app -n ${{ env.NAMESPACE }} --timeout=5m
-          kubectl rollout status deployment/flxn-pocketbase -n ${{ env.NAMESPACE }} --timeout=5m
-
-      - name: Verify deployment
-        run: |
-          kubectl get pods -n ${{ env.NAMESPACE }} -l app=flxn
-          kubectl get svc -n ${{ env.NAMESPACE }} -l app=flxn
-          kubectl get ingress -n ${{ env.NAMESPACE }}
-
-      - name: Check app health
-        run: |
-          sleep 15
-          APP_POD=$(kubectl get pod -n ${{ env.NAMESPACE }} -l component=app -o jsonpath='{.items[0].metadata.name}')
-          kubectl exec -n ${{ env.NAMESPACE }} $APP_POD -- wget -O- http://localhost:3000/api/health || echo "Health check failed (endpoint may not exist yet)"
-
-      - name: Check PocketBase health
-        run: |
-          PB_POD=$(kubectl get pod -n ${{ env.NAMESPACE }} -l component=pocketbase -o jsonpath='{.items[0].metadata.name}')
-          kubectl exec -n ${{ env.NAMESPACE }} $PB_POD -- wget -O- http://localhost:8090/api/health || echo "PocketBase health check completed"

.gitignore

@@ -19,5 +19,4 @@ yarn.lock
 /playwright/.cache/
 /scripts/
 /pb_data/
-/.tanstack/
+/.tanstack/
-/dist/

Dockerfile

@@ -1,28 +0,0 @@
-FROM oven/bun:1 AS builder
-
-WORKDIR /app
-
-COPY package.json bun.lockb* ./
-
-RUN bun install --frozen-lockfile
-
-COPY . .
-
-RUN bun run build
-
-FROM oven/bun:1-alpine AS runtime
-
-WORKDIR /app
-
-COPY --from=builder /app/dist ./dist
-
-EXPOSE 3000
-
-ENV NODE_ENV=production
-ENV PORT=3000
-ENV NITRO_PORT=3000
-
-HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 \
-  CMD bun -e "fetch('http://localhost:3000/api/health').then(r => r.ok ? process.exit(0) : process.exit(1)).catch(() => process.exit(1))"
-
-CMD ["bun", "run", "./dist/server/index.mjs"]

Dockerfile.pocketbase

@@ -1,23 +1,16 @@
 FROM alpine:latest
 
-ARG PB_VERSION=0.26.5
+ARG PB_VERSION=0.29.2
 
 RUN apk add --no-cache \
     unzip \
     ca-certificates
 
+# download and unzip PocketBase
 ADD https://github.com/pocketbase/pocketbase/releases/download/v${PB_VERSION}/pocketbase_${PB_VERSION}_linux_amd64.zip /tmp/pb.zip
-RUN unzip /tmp/pb.zip -d /pb/ && \
+RUN unzip /tmp/pb.zip -d /pb/
-    rm /tmp/pb.zip && \
-    chmod +x /pb/pocketbase
-
-RUN mkdir -p /pb/pb_data
-
-COPY pb_migrations /pb/pb_migrations
 
 EXPOSE 8090
 
-HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 \
+# start PocketBase
-  CMD wget --no-verbose --tries=1 --spider http://localhost:8090/api/health || exit 1
+CMD ["/pb/pocketbase", "serve", "--http=0.0.0.0:8090"]
-
-CMD ["/pb/pocketbase", "serve", "--http=0.0.0.0:8090", "--dir=/pb/pb_data", "--migrationsDir=/pb/pb_migrations"]

docker-compose.yml

@@ -13,6 +13,7 @@ services:
       - .env.docker
     volumes:
       - postgres-data:/var/lib/postgresql/data
+      - ./.docker-postgres-init:/docker-entrypoint-initdb.d
     networks:
       - app-network
 

k8s/base/app-deployment.yaml

@@ -1,124 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: flxn-app
-  labels:
-    app: flxn
-    component: app
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: flxn
-      component: app
-  template:
-    metadata:
-      labels:
-        app: flxn
-        component: app
-    spec:
-      containers:
-      - name: flxn-app
-        image: git.yohler.net/kyle/flxn-app:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 3000
-          name: http
-          protocol: TCP
-        env:
-        - name: VITE_API_DOMAIN
-          valueFrom:
-            configMapKeyRef:
-              name: flxn-config
-              key: vite_api_domain
-        - name: VITE_WEBSITE_DOMAIN
-          valueFrom:
-            configMapKeyRef:
-              name: flxn-config
-              key: vite_website_domain
-        - name: SUPERTOKENS_URI
-          valueFrom:
-            configMapKeyRef:
-              name: flxn-config
-              key: supertokens_uri
-        - name: POCKETBASE_URL
-          valueFrom:
-            configMapKeyRef:
-              name: flxn-config
-              key: pocketbase_url
-        - name: SUPERTOKENS_API_KEY
-          valueFrom:
-            secretKeyRef:
-              name: flxn-secrets
-              key: supertokens_api_key
-        - name: PORT
-          value: "3000"
-        - name: NODE_ENV
-          value: "production"
-
-        - name: TWILIO_ACCOUNT_SID
-          valueFrom:
-            secretKeyRef:
-              name: flxn-secrets
-              key: twilio_account_sid
-        - name: TWILIO_AUTH_TOKEN
-          valueFrom:
-            secretKeyRef:
-              name: flxn-secrets
-              key: twilio_auth_token
-        - name: TWILIO_SERVICE_SID
-          valueFrom:
-            secretKeyRef:
-              name: flxn-secrets
-              key: twilio_service_sid
-        - name: POCKETBASE_ADMIN_EMAIL
-          valueFrom:
-            secretKeyRef:
-              name: flxn-secrets
-              key: pocketbase_admin_email
-        - name: POCKETBASE_ADMIN_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: flxn-secrets
-              key: pocketbase_admin_password
-        - name: VITE_SPOTIFY_CLIENT_ID
-          valueFrom:
-            configMapKeyRef:
-              name: flxn-config
-              key: vite_spotify_client_id
-        - name: SPOTIFY_CLIENT_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: flxn-secrets
-              key: spotify_client_secret
-        - name: VITE_SPOTIFY_REDIRECT_URI
-          valueFrom:
-            configMapKeyRef:
-              name: flxn-config
-              key: vite_spotify_redirect_uri
-
-        resources:
-          requests:
-            memory: "768Mi"
-            cpu: "250m"
-          limits:
-            memory: "1536Mi"
-            cpu: "1000m"
-
-        livenessProbe:
-          httpGet:
-            path: /api/health
-            port: 3000
-          initialDelaySeconds: 30
-          periodSeconds: 30
-          timeoutSeconds: 5
-          failureThreshold: 3
-
-        readinessProbe:
-          httpGet:
-            path: /api/health
-            port: 3000
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          timeoutSeconds: 3
-          failureThreshold: 3

k8s/base/app-service.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: flxn-app
-  labels:
-    app: flxn
-    component: app
-spec:
-  type: ClusterIP
-  ports:
-  - port: 3000
-    targetPort: 3000
-    protocol: TCP
-    name: http
-  selector:
-    app: flxn
-    component: app

k8s/base/kustomization.yaml

@@ -1,12 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- app-deployment.yaml
-- app-service.yaml
-- pocketbase-deployment.yaml
-- pocketbase-service.yaml
-- pb-data-pvc.yaml
-
-commonLabels:
-  app: flxn

k8s/base/pb-data-pvc.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: flxn-pb-data
-  labels:
-    app: flxn
-    component: pocketbase
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 10Gi

k8s/base/pocketbase-deployment.yaml

@@ -1,57 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: flxn-pocketbase
-  labels:
-    app: flxn
-    component: pocketbase
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: flxn
-      component: pocketbase
-  template:
-    metadata:
-      labels:
-        app: flxn
-        component: pocketbase
-    spec:
-      containers:
-      - name: pocketbase
-        image: git.yohler.net/kyle/flxn-pocketbase:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8090
-          name: http
-          protocol: TCP
-        volumeMounts:
-        - name: pb-data
-          mountPath: /pb/pb_data
-        resources:
-          requests:
-            memory: "256Mi"
-            cpu: "100m"
-          limits:
-            memory: "512Mi"
-            cpu: "500m"
-        livenessProbe:
-          httpGet:
-            path: /api/health
-            port: 8090
-          initialDelaySeconds: 10
-          periodSeconds: 30
-          timeoutSeconds: 5
-          failureThreshold: 3
-        readinessProbe:
-          httpGet:
-            path: /api/health
-            port: 8090
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          timeoutSeconds: 3
-          failureThreshold: 3
-      volumes:
-      - name: pb-data
-        persistentVolumeClaim:
-          claimName: flxn-pb-data

k8s/base/pocketbase-service.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: flxn-pocketbase
-  labels:
-    app: flxn
-    component: pocketbase
-spec:
-  type: NodePort
-  ports:
-  - port: 8090
-    targetPort: 8090
-    nodePort: 30090
-    protocol: TCP
-    name: http
-  selector:
-    app: flxn
-    component: pocketbase

k8s/overlays/dev/configmap.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: flxn-config
-  namespace: flxn-dev
-data:
-  vite_api_domain: "https://dev.flexxon.app"
-  vite_website_domain: "https://dev.flexxon.app"
-  supertokens_uri: "http://192.168.0.50:30568"
-  pocketbase_url: "http://192.168.0.50:30096"
-  vite_spotify_client_id: "3ffde6b594e84460b3d4b329b8919277"
-  vite_spotify_redirect_uri: "https://dev.flexxon.app/api/spotify/callback"
-  s3_endpoint: "https://s3.yohler.net"
-  s3_bucket: "flxn-dev"

k8s/overlays/dev/ingress.yaml

@@ -1,17 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: flxn-app
-  namespace: flxn-dev
-spec:
-  rules:
-  - host: dev.flexxon.app
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: flxn-app
-            port:
-              number: 3000

k8s/overlays/dev/kustomization.yaml

@@ -1,50 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: flxn-dev
-
-resources:
-- namespace.yaml
-- ../../base
-- configmap.yaml
-- ingress.yaml
-
-images:
-- name: git.yohler.net/kyle/flxn-app
-  newTag: dev
-- name: git.yohler.net/kyle/flxn-pocketbase
-  newTag: latest
-
-commonLabels:
-  environment: dev
-
-patches:
-- patch: |-
-    - op: replace
-      path: /spec/template/spec/containers/0/resources/requests/memory
-      value: "768Mi"
-    - op: replace
-      path: /spec/template/spec/containers/0/resources/limits/memory
-      value: "1536Mi"
-  target:
-    kind: Deployment
-    name: flxn-app
-
-- patch: |-
-    - op: replace
-      path: /spec/type
-      value: NodePort
-    - op: add
-      path: /spec/ports/0/nodePort
-      value: 30083
-  target:
-    kind: Service
-    name: flxn-app
-
-- patch: |-
-    - op: replace
-      path: /spec/ports/0/nodePort
-      value: 30096
-  target:
-    kind: Service
-    name: flxn-pocketbase

k8s/overlays/dev/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: flxn-dev

k8s/overlays/prod/configmap.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: flxn-config
-  namespace: flxn-prod
-data:
-  vite_api_domain: "https://flexxon.app"
-  vite_website_domain: "https://flexxon.app"
-  supertokens_uri: "http://192.168.0.50:30568"
-  pocketbase_url: "http://192.168.0.50:30097"
-  vite_spotify_client_id: "3ffde6b594e84460b3d4b329b8919277"
-  vite_spotify_redirect_uri: "https://flexxon.app/api/spotify/callback"
-  s3_endpoint: "https://s3.yohler.net"
-  s3_bucket: "flxn-prod"

k8s/overlays/prod/ingress.yaml

@@ -1,17 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: flxn-app
-  namespace: flxn-prod
-spec:
-  rules:
-  - host: flexxon.app
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: flxn-app
-            port:
-              number: 3000

k8s/overlays/prod/kustomization.yaml

@@ -1,50 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: flxn-prod
-
-resources:
-- namespace.yaml
-- ../../base
-- configmap.yaml
-- ingress.yaml
-
-images:
-- name: git.yohler.net/kyle/flxn-app
-  newTag: latest
-- name: git.yohler.net/kyle/flxn-pocketbase
-  newTag: latest
-
-commonLabels:
-  environment: prod
-
-patches:
-- patch: |-
-    - op: replace
-      path: /spec/template/spec/containers/0/resources/requests/memory
-      value: "1536Mi"
-    - op: replace
-      path: /spec/template/spec/containers/0/resources/limits/memory
-      value: "3Gi"
-  target:
-    kind: Deployment
-    name: flxn-app
-
-- patch: |-
-    - op: replace
-      path: /spec/type
-      value: NodePort
-    - op: add
-      path: /spec/ports/0/nodePort
-      value: 30084
-  target:
-    kind: Service
-    name: flxn-app
-
-- patch: |-
-    - op: replace
-      path: /spec/ports/0/nodePort
-      value: 30097
-  target:
-    kind: Service
-    name: flxn-pocketbase

k8s/overlays/prod/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: flxn-prod

k8s/overlays/shared/configmap.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: supertokens-config
-  namespace: flxn-shared

k8s/overlays/shared/kustomization.yaml

@@ -1,16 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: flxn-shared
-
-resources:
-- namespace.yaml
-- supertokens-deployment.yaml
-- supertokens-service.yaml
-- supertokens-postgres-deployment.yaml
-- supertokens-postgres-service.yaml
-- supertokens-db-pvc.yaml
-
-labels:
-- pairs:
-    environment: shared

k8s/overlays/shared/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: flxn-shared

k8s/overlays/shared/supertokens-db-pvc.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: supertokens-db-data
-  labels:
-    app: flxn
-    component: supertokens-db
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 2Gi

k8s/overlays/shared/supertokens-deployment.yaml

@@ -1,71 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: supertokens
-  labels:
-    app: flxn
-    component: supertokens
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: flxn
-      component: supertokens
-  template:
-    metadata:
-      labels:
-        app: flxn
-        component: supertokens
-    spec:
-      enableServiceLinks: false
-      containers:
-      - name: supertokens
-        image: registry.supertokens.io/supertokens/supertokens-postgresql:latest
-        ports:
-        - containerPort: 3567
-          name: http
-          protocol: TCP
-        env:
-        - name: PORT
-          value: "3567"
-        - name: POSTGRESQL_USER
-          value: supertokens
-        - name: POSTGRESQL_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: supertokens-secrets
-              key: postgres_password
-        - name: POSTGRESQL_HOST
-          value: supertokens-db
-        - name: POSTGRESQL_PORT
-          value: "5432"
-        - name: POSTGRESQL_DATABASE_NAME
-          value: supertokens
-        - name: API_KEYS
-          valueFrom:
-            secretKeyRef:
-              name: supertokens-secrets
-              key: api_keys
-        resources:
-          requests:
-            memory: "256Mi"
-            cpu: "100m"
-          limits:
-            memory: "512Mi"
-            cpu: "500m"
-        livenessProbe:
-          httpGet:
-            path: /hello
-            port: 3567
-          initialDelaySeconds: 30
-          periodSeconds: 30
-          timeoutSeconds: 5
-          failureThreshold: 3
-        readinessProbe:
-          httpGet:
-            path: /hello
-            port: 3567
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          timeoutSeconds: 3
-          failureThreshold: 3

k8s/overlays/shared/supertokens-postgres-deployment.yaml

@@ -1,68 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: supertokens-db
-  labels:
-    app: flxn
-    component: supertokens-db
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: flxn
-      component: supertokens-db
-  template:
-    metadata:
-      labels:
-        app: flxn
-        component: supertokens-db
-    spec:
-      containers:
-      - name: postgres
-        image: postgres:16-alpine
-        ports:
-        - containerPort: 5432
-          name: postgres
-          protocol: TCP
-        env:
-        - name: POSTGRES_USER
-          value: "supertokens"
-        - name: POSTGRES_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: supertokens-secrets
-              key: postgres_password
-        - name: POSTGRES_DB
-          value: "supertokens"
-        - name: PGDATA
-          value: "/var/lib/postgresql/data/pgdata"
-        volumeMounts:
-        - name: postgres-data
-          mountPath: /var/lib/postgresql/data
-        resources:
-          requests:
-            memory: "128Mi"
-            cpu: "50m"
-          limits:
-            memory: "256Mi"
-            cpu: "500m"
-        livenessProbe:
-          exec:
-            command:
-            - pg_isready
-            - -U
-            - supertokens
-          initialDelaySeconds: 30
-          periodSeconds: 10
-        readinessProbe:
-          exec:
-            command:
-            - pg_isready
-            - -U
-            - supertokens
-          initialDelaySeconds: 5
-          periodSeconds: 5
-      volumes:
-      - name: postgres-data
-        persistentVolumeClaim:
-          claimName: supertokens-db-data

k8s/overlays/shared/supertokens-postgres-service.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: supertokens-db
-  labels:
-    app: flxn
-    component: supertokens-db
-spec:
-  type: ClusterIP
-  ports:
-  - port: 5432
-    targetPort: 5432
-    protocol: TCP
-    name: postgres
-  selector:
-    app: flxn
-    component: supertokens-db

k8s/overlays/shared/supertokens-service.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: supertokens
-  labels:
-    app: flxn
-    component: supertokens
-spec:
-  type: NodePort
-  ports:
-  - port: 3567
-    targetPort: 3567
-    nodePort: 30568
-    protocol: TCP
-    name: http
-  selector:
-    app: flxn
-    component: supertokens

package.json

@@ -6,8 +6,7 @@
   "scripts": {
     "dev": "vite dev --host 0.0.0.0",
     "build": "vite build && tsc --noEmit",
-    "start": "bun run dist/server/index.mjs",
+    "start": "node .output/server/index.mjs"
-    "start:node": "node dist/server/index.mjs"
   },
   "dependencies": {
     "@hello-pangea/dnd": "^18.0.1",
@@ -20,20 +19,16 @@
     "@mantine/tiptap": "^8.2.4",
     "@phosphor-icons/react": "^2.1.10",
     "@svgmoji/noto": "^3.2.0",
-    "@tanstack/react-devtools": "^0.7.6",
     "@tanstack/react-query": "^5.66.0",
     "@tanstack/react-query-devtools": "^5.66.0",
-    "@tanstack/react-router": "^1.143.6",
+    "@tanstack/react-router": "1.130.12",
-    "@tanstack/react-router-devtools": "^1.143.6",
+    "@tanstack/react-router-devtools": "1.130.13",
-    "@tanstack/react-router-ssr-query": "^1.143.6",
+    "@tanstack/react-router-with-query": "1.130.12",
-    "@tanstack/react-start": "^1.143.6",
+    "@tanstack/react-start": "1.130.15",
-    "@tanstack/react-virtual": "^3.13.12",
     "@tiptap/pm": "^3.4.3",
     "@tiptap/react": "^3.4.3",
     "@tiptap/starter-kit": "^3.4.3",
-    "@types/bun": "^1.2.22",
     "@types/ioredis": "^4.28.10",
-    "browser-image-compression": "^2.0.2",
     "dotenv": "^17.2.2",
     "embla-carousel-react": "^8.6.0",
     "framer-motion": "^12.23.12",
@@ -52,12 +47,10 @@
     "supertokens-web-js": "^0.15.0",
     "twilio": "^5.8.0",
     "vaul": "^1.1.2",
-    "xlsx": "^0.18.5",
     "zod": "^4.0.15",
     "zustand": "^5.0.7"
   },
   "devDependencies": {
-    "@tanstack/router-plugin": "^1.132.2",
     "@types/node": "^22.5.4",
     "@types/pg": "^8.15.5",
     "@types/react": "^19.0.8",
@@ -70,7 +63,7 @@
     "postcss-simple-vars": "^7.0.1",
     "tsx": "^4.20.3",
     "typescript": "^5.7.2",
-    "vite": "^7.1.7",
+    "vite": "^6.3.5",
     "vite-tsconfig-paths": "^5.1.4"
   }
 }

pb_migrations/1759244692_created_activities.js

@@ -1,108 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = new Collection({
-    "createRule": null,
-    "deleteRule": null,
-    "fields": [
-      {
-        "autogeneratePattern": "[a-z0-9]{15}",
-        "hidden": false,
-        "id": "text3208210256",
-        "max": 15,
-        "min": 15,
-        "name": "id",
-        "pattern": "^[a-z0-9]+$",
-        "presentable": false,
-        "primaryKey": true,
-        "required": true,
-        "system": true,
-        "type": "text"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text1579384326",
-        "max": 0,
-        "min": 0,
-        "name": "name",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": false,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "hidden": false,
-        "id": "json4225120046",
-        "maxSize": 0,
-        "name": "arguments",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "cascadeDelete": false,
-        "collectionId": "pbc_3072146508",
-        "hidden": false,
-        "id": "relation2551806565",
-        "maxSelect": 1,
-        "minSelect": 0,
-        "name": "player",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "relation"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text3293145029",
-        "max": 0,
-        "min": 0,
-        "name": "user_agent",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": false,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "hidden": false,
-        "id": "autodate2990389176",
-        "name": "created",
-        "onCreate": true,
-        "onUpdate": false,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      },
-      {
-        "hidden": false,
-        "id": "autodate3332085495",
-        "name": "updated",
-        "onCreate": true,
-        "onUpdate": true,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      }
-    ],
-    "id": "pbc_1262591861",
-    "indexes": [],
-    "listRule": null,
-    "name": "activities",
-    "system": false,
-    "type": "base",
-    "updateRule": null,
-    "viewRule": null
-  });
-
-  return app.save(collection);
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1262591861");
-
-  return app.delete(collection);
-})

pb_migrations/1759245857_updated_activities.js

@@ -1,27 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1262591861")
-
-  // add field
-  collection.fields.addAt(5, new Field({
-    "hidden": false,
-    "id": "number2254405824",
-    "max": null,
-    "min": null,
-    "name": "duration",
-    "onlyInt": false,
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "number"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1262591861")
-
-  // remove field
-  collection.fields.removeById("number2254405824")
-
-  return app.save(collection)
-})

pb_migrations/1759246171_updated_activities.js

@@ -1,43 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1262591861")
-
-  // add field
-  collection.fields.addAt(6, new Field({
-    "hidden": false,
-    "id": "bool1862328242",
-    "name": "success",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "bool"
-  }))
-
-  // add field
-  collection.fields.addAt(7, new Field({
-    "autogeneratePattern": "",
-    "hidden": false,
-    "id": "text1574812785",
-    "max": 0,
-    "min": 0,
-    "name": "error",
-    "pattern": "",
-    "presentable": false,
-    "primaryKey": false,
-    "required": false,
-    "system": false,
-    "type": "text"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1262591861")
-
-  // remove field
-  collection.fields.removeById("bool1862328242")
-
-  // remove field
-  collection.fields.removeById("text1574812785")
-
-  return app.save(collection)
-})

pb_migrations/1759340868_updated_badges.js

@@ -1,27 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1340419796")
-
-  // add field
-  collection.fields.addAt(7, new Field({
-    "hidden": false,
-    "id": "number4113142680",
-    "max": null,
-    "min": null,
-    "name": "order",
-    "onlyInt": false,
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "number"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1340419796")
-
-  // remove field
-  collection.fields.removeById("number4113142680")
-
-  return app.save(collection)
-})

pb_migrations/1759344923_updated_players.js

@@ -1,46 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_3072146508")
-
-  // remove field
-  collection.fields.removeById("relation2029409178")
-
-  // remove field
-  collection.fields.removeById("relation2813965191")
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_3072146508")
-
-  // add field
-  collection.fields.addAt(5, new Field({
-    "cascadeDelete": false,
-    "collectionId": "pbc_1340419796",
-    "hidden": false,
-    "id": "relation2029409178",
-    "maxSelect": 999,
-    "minSelect": 0,
-    "name": "badges",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "relation"
-  }))
-
-  // add field
-  collection.fields.addAt(6, new Field({
-    "cascadeDelete": false,
-    "collectionId": "pbc_1340419796",
-    "hidden": false,
-    "id": "relation2813965191",
-    "maxSelect": 1,
-    "minSelect": 0,
-    "name": "featured_badge",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "relation"
-  }))
-
-  return app.save(collection)
-})

pb_migrations/1759344938_deleted_player_badge_progress.js

@@ -1,129 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_4251874343");
-
-  return app.delete(collection);
-}, (app) => {
-  const collection = new Collection({
-    "createRule": null,
-    "deleteRule": null,
-    "fields": [
-      {
-        "autogeneratePattern": "[a-z0-9]{15}",
-        "hidden": false,
-        "id": "text3208210256",
-        "max": 15,
-        "min": 15,
-        "name": "id",
-        "pattern": "^[a-z0-9]+$",
-        "presentable": false,
-        "primaryKey": true,
-        "required": true,
-        "system": true,
-        "type": "text"
-      },
-      {
-        "cascadeDelete": true,
-        "collectionId": "pbc_3072146508",
-        "hidden": false,
-        "id": "relation2847519201",
-        "maxSelect": 1,
-        "minSelect": 1,
-        "name": "player_id",
-        "presentable": false,
-        "required": true,
-        "system": false,
-        "type": "relation"
-      },
-      {
-        "cascadeDelete": true,
-        "collectionId": "pbc_1340419796",
-        "hidden": false,
-        "id": "relation3948571039",
-        "maxSelect": 1,
-        "minSelect": 1,
-        "name": "badge_id",
-        "presentable": false,
-        "required": true,
-        "system": false,
-        "type": "relation"
-      },
-      {
-        "hidden": false,
-        "id": "number1847293057",
-        "max": null,
-        "min": 0,
-        "name": "current_progress",
-        "onlyInt": false,
-        "presentable": false,
-        "required": true,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "number2948571040",
-        "max": null,
-        "min": 1,
-        "name": "target_progress",
-        "onlyInt": false,
-        "presentable": false,
-        "required": true,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "bool3049672141",
-        "name": "is_earned",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "bool"
-      },
-      {
-        "hidden": false,
-        "id": "date1150773242",
-        "max": "",
-        "min": "",
-        "name": "earned_at",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "date"
-      },
-      {
-        "hidden": false,
-        "id": "autodate2990389176",
-        "name": "created",
-        "onCreate": true,
-        "onUpdate": false,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      },
-      {
-        "hidden": false,
-        "id": "autodate3332085495",
-        "name": "updated",
-        "onCreate": true,
-        "onUpdate": true,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      }
-    ],
-    "id": "pbc_4251874343",
-    "indexes": [
-      "CREATE UNIQUE INDEX `idx_unique_player_badge` ON `player_badge_progress` (`player_id`, `badge_id`)"
-    ],
-    "listRule": null,
-    "name": "player_badge_progress",
-    "system": false,
-    "type": "base",
-    "updateRule": null,
-    "viewRule": null
-  });
-
-  return app.save(collection);
-})

pb_migrations/1759344944_deleted_badges.js

@@ -1,173 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1340419796");
-
-  return app.delete(collection);
-}, (app) => {
-  const collection = new Collection({
-    "createRule": null,
-    "deleteRule": null,
-    "fields": [
-      {
-        "autogeneratePattern": "[a-z0-9]{15}",
-        "hidden": false,
-        "id": "text3208210256",
-        "max": 15,
-        "min": 15,
-        "name": "id",
-        "pattern": "^[a-z0-9]+$",
-        "presentable": false,
-        "primaryKey": true,
-        "required": true,
-        "system": true,
-        "type": "text"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text1579384326",
-        "max": 0,
-        "min": 0,
-        "name": "name",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": true,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text1843675174",
-        "max": 0,
-        "min": 0,
-        "name": "description",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": true,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "hidden": false,
-        "id": "select4029814376",
-        "maxSelect": 1,
-        "name": "type",
-        "presentable": false,
-        "required": true,
-        "system": false,
-        "type": "select",
-        "values": [
-          "tournament_participation",
-          "tournament_placement",
-          "performance",
-          "overtime",
-          "match_milestone"
-        ]
-      },
-      {
-        "hidden": false,
-        "id": "json1578432567",
-        "maxSize": 2000000,
-        "name": "criteria",
-        "presentable": false,
-        "required": true,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text3928475610",
-        "max": 50,
-        "min": 0,
-        "name": "icon",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": false,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text1847293056",
-        "max": 50,
-        "min": 0,
-        "name": "color",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": false,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "hidden": false,
-        "id": "number4113142680",
-        "max": null,
-        "min": null,
-        "name": "order",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "bool2847519203",
-        "name": "is_progressive",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "bool"
-      },
-      {
-        "hidden": false,
-        "id": "number2948571038",
-        "max": null,
-        "min": null,
-        "name": "progress_target",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "autodate2990389176",
-        "name": "created",
-        "onCreate": true,
-        "onUpdate": false,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      },
-      {
-        "hidden": false,
-        "id": "autodate3332085495",
-        "name": "updated",
-        "onCreate": true,
-        "onUpdate": true,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      }
-    ],
-    "id": "pbc_1340419796",
-    "indexes": [],
-    "listRule": null,
-    "name": "badges",
-    "system": false,
-    "type": "base",
-    "updateRule": null,
-    "viewRule": null
-  });
-
-  return app.save(collection);
-})

pb_migrations/1759345060_created_badges.js

@@ -1,145 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = new Collection({
-    "createRule": null,
-    "deleteRule": null,
-    "fields": [
-      {
-        "autogeneratePattern": "[a-z0-9]{15}",
-        "hidden": false,
-        "id": "text3208210256",
-        "max": 15,
-        "min": 15,
-        "name": "id",
-        "pattern": "^[a-z0-9]+$",
-        "presentable": false,
-        "primaryKey": true,
-        "required": true,
-        "system": true,
-        "type": "text"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text1579384326",
-        "max": 0,
-        "min": 0,
-        "name": "name",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": false,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text2324736937",
-        "max": 0,
-        "min": 0,
-        "name": "key",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": false,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text1843675174",
-        "max": 0,
-        "min": 0,
-        "name": "description",
-        "pattern": "",
-        "presentable": false,
-        "primaryKey": false,
-        "required": false,
-        "system": false,
-        "type": "text"
-      },
-      {
-        "hidden": false,
-        "id": "json3055524737",
-        "maxSize": 0,
-        "name": "criteria",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "select2363381545",
-        "maxSelect": 1,
-        "name": "type",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "select",
-        "values": [
-          "manual",
-          "match",
-          "tournament"
-        ]
-      },
-      {
-        "hidden": false,
-        "id": "bool3646955747",
-        "name": "progressive",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "bool"
-      },
-      {
-        "hidden": false,
-        "id": "number4113142680",
-        "max": null,
-        "min": null,
-        "name": "order",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "autodate2990389176",
-        "name": "created",
-        "onCreate": true,
-        "onUpdate": false,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      },
-      {
-        "hidden": false,
-        "id": "autodate3332085495",
-        "name": "updated",
-        "onCreate": true,
-        "onUpdate": true,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      }
-    ],
-    "id": "pbc_1340419796",
-    "indexes": [],
-    "listRule": null,
-    "name": "badges",
-    "system": false,
-    "type": "base",
-    "updateRule": null,
-    "viewRule": null
-  });
-
-  return app.save(collection);
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1340419796");
-
-  return app.delete(collection);
-})

pb_migrations/1759345122_created_player_badge_progress.js

@@ -1,104 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = new Collection({
-    "createRule": null,
-    "deleteRule": null,
-    "fields": [
-      {
-        "autogeneratePattern": "[a-z0-9]{15}",
-        "hidden": false,
-        "id": "text3208210256",
-        "max": 15,
-        "min": 15,
-        "name": "id",
-        "pattern": "^[a-z0-9]+$",
-        "presentable": false,
-        "primaryKey": true,
-        "required": true,
-        "system": true,
-        "type": "text"
-      },
-      {
-        "cascadeDelete": false,
-        "collectionId": "pbc_1340419796",
-        "hidden": false,
-        "id": "relation4277159965",
-        "maxSelect": 1,
-        "minSelect": 0,
-        "name": "badge",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "relation"
-      },
-      {
-        "cascadeDelete": false,
-        "collectionId": "pbc_3072146508",
-        "hidden": false,
-        "id": "relation2551806565",
-        "maxSelect": 1,
-        "minSelect": 0,
-        "name": "player",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "relation"
-      },
-      {
-        "hidden": false,
-        "id": "number570552902",
-        "max": null,
-        "min": null,
-        "name": "progress",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "bool2625885481",
-        "name": "earned",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "bool"
-      },
-      {
-        "hidden": false,
-        "id": "autodate2990389176",
-        "name": "created",
-        "onCreate": true,
-        "onUpdate": false,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      },
-      {
-        "hidden": false,
-        "id": "autodate3332085495",
-        "name": "updated",
-        "onCreate": true,
-        "onUpdate": true,
-        "presentable": false,
-        "system": false,
-        "type": "autodate"
-      }
-    ],
-    "id": "pbc_1063824264",
-    "indexes": [],
-    "listRule": null,
-    "name": "player_badge_progress",
-    "system": false,
-    "type": "base",
-    "updateRule": null,
-    "viewRule": null
-  });
-
-  return app.save(collection);
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1063824264");
-
-  return app.delete(collection);
-})

pb_migrations/1759345318_updated_player_badge_progress.js

@@ -1,20 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1063824264")
-
-  // update collection data
-  unmarshal({
-    "name": "badge_progress"
-  }, collection)
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1063824264")
-
-  // update collection data
-  unmarshal({
-    "name": "player_badge_progress"
-  }, collection)
-
-  return app.save(collection)
-})

pb_migrations/1759594431_updated_tournaments.js

@@ -1,29 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // add field
-  collection.fields.addAt(10, new Field({
-    "hidden": false,
-    "id": "file538556518",
-    "maxSelect": 1,
-    "maxSize": 0,
-    "mimeTypes": [],
-    "name": "glitch_logo",
-    "presentable": false,
-    "protected": false,
-    "required": false,
-    "system": false,
-    "thumbs": [],
-    "type": "file"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // remove field
-  collection.fields.removeById("file538556518")
-
-  return app.save(collection)
-})

pb_migrations/1759594880_updated_tournaments.js

@@ -1,42 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // update field
-  collection.fields.addAt(10, new Field({
-    "hidden": false,
-    "id": "file538556518",
-    "maxSelect": 1,
-    "maxSize": 6000000,
-    "mimeTypes": [],
-    "name": "glitch_logo",
-    "presentable": false,
-    "protected": false,
-    "required": false,
-    "system": false,
-    "thumbs": [],
-    "type": "file"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // update field
-  collection.fields.addAt(10, new Field({
-    "hidden": false,
-    "id": "file538556518",
-    "maxSelect": 1,
-    "maxSize": 0,
-    "mimeTypes": [],
-    "name": "glitch_logo",
-    "presentable": false,
-    "protected": false,
-    "required": false,
-    "system": false,
-    "thumbs": [],
-    "type": "file"
-  }))
-
-  return app.save(collection)
-})

pb_migrations/1760127117_updated_players.js

@@ -1,26 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_3072146508")
-
-  // add field
-  collection.fields.addAt(5, new Field({
-    "hidden": false,
-    "id": "date3558165700",
-    "max": "",
-    "min": "",
-    "name": "last_activity",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "date"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_3072146508")
-
-  // remove field
-  collection.fields.removeById("date3558165700")
-
-  return app.save(collection)
-})

pb_migrations/1760556705_updated_teams.js

@@ -1,24 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1568971955")
-
-  // add field
-  collection.fields.addAt(14, new Field({
-    "hidden": false,
-    "id": "bool3523658193",
-    "name": "private",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "bool"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_1568971955")
-
-  // remove field
-  collection.fields.removeById("bool3523658193")
-
-  return app.save(collection)
-})

pb_migrations/1760556851_updated_tournaments.js

@@ -1,24 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // add field
-  collection.fields.addAt(12, new Field({
-    "hidden": false,
-    "id": "bool3403970290",
-    "name": "regional",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "bool"
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // remove field
-  collection.fields.removeById("bool3403970290")
-
-  return app.save(collection)
-})

pb_migrations/1760556905_updated_tournaments.js

@@ -1,31 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // add field
-  collection.fields.addAt(13, new Field({
-    "hidden": false,
-    "id": "select3736761055",
-    "maxSelect": 1,
-    "name": "format",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "select",
-    "values": [
-      "single_elim",
-      "double_elim",
-      "groups",
-      "swiss"
-    ]
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // remove field
-  collection.fields.removeById("select3736761055")
-
-  return app.save(collection)
-})

pb_migrations/1760559911_created_player_regional_stats.js

@@ -1,165 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = new Collection({
-    "createRule": null,
-    "deleteRule": null,
-    "fields": [
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text3208210256",
-        "max": 0,
-        "min": 0,
-        "name": "id",
-        "pattern": "^[a-z0-9]+$",
-        "presentable": false,
-        "primaryKey": true,
-        "required": true,
-        "system": true,
-        "type": "text"
-      },
-      {
-        "cascadeDelete": false,
-        "collectionId": "pbc_3072146508",
-        "hidden": false,
-        "id": "relation2582050271",
-        "maxSelect": 1,
-        "minSelect": 0,
-        "name": "player_id",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "relation"
-      },
-      {
-        "hidden": false,
-        "id": "json4231605813",
-        "maxSize": 1,
-        "name": "player_name",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "number103159226",
-        "max": null,
-        "min": null,
-        "name": "matches",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "number3837590211",
-        "max": null,
-        "min": null,
-        "name": "tournaments",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "json2732118329",
-        "maxSize": 1,
-        "name": "wins",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json724428801",
-        "maxSize": 1,
-        "name": "losses",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3154249934",
-        "maxSize": 1,
-        "name": "total_cups_made",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3227208027",
-        "maxSize": 1,
-        "name": "total_cups_against",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json2379943496",
-        "maxSize": 1,
-        "name": "win_percentage",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3165107022",
-        "maxSize": 1,
-        "name": "avg_cups_per_match",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3041953980",
-        "maxSize": 1,
-        "name": "margin_of_victory",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json1531431708",
-        "maxSize": 1,
-        "name": "margin_of_loss",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      }
-    ],
-    "id": "pbc_4086490894",
-    "indexes": [],
-    "listRule": null,
-    "name": "player_regional_stats",
-    "system": false,
-    "type": "view",
-    "updateRule": null,
-    "viewQuery": "SELECT\n      p.id as id,\n      p.id as player_id,\n      (p.first_name || ' ' || p.last_name) as player_name,\n      COUNT(m.id) as matches,\n      COUNT(DISTINCT m.tournament) as tournaments,\n      SUM(CASE\n          WHEN (m.home = t.id AND m.home_cups > m.away_cups) OR\n               (m.away = t.id AND m.away_cups > m.home_cups)\n          THEN 1 ELSE 0\n      END) as wins,\n      SUM(CASE\n          WHEN (m.home = t.id AND m.home_cups < m.away_cups) OR\n               (m.away = t.id AND m.away_cups < m.home_cups)\n          THEN 1 ELSE 0\n      END) as losses,\n      SUM(CASE\n          WHEN m.home = t.id THEN m.home_cups\n          WHEN m.away = t.id THEN m.away_cups\n          ELSE 0\n      END) as total_cups_made,\n      SUM(CASE\n          WHEN m.home = t.id THEN m.away_cups\n          WHEN m.away = t.id THEN m.home_cups\n          ELSE 0\n      END) as total_cups_against,\n      -- Win percentage\n      ROUND((CAST(SUM(CASE\n          WHEN (m.home = t.id AND m.home_cups > m.away_cups) OR\n               (m.away = t.id AND m.away_cups > m.home_cups)\n          THEN 1 ELSE 0\n      END) AS REAL) / COUNT(m.id)) * 100, 2) as win_percentage,\n      -- Average cups per match\n      ROUND(CAST(SUM(CASE\n          WHEN m.home = t.id THEN m.home_cups\n          WHEN m.away = t.id THEN m.away_cups\n          ELSE 0\n      END) AS REAL) / COUNT(m.id), 2) as avg_cups_per_match,\n      -- Margin of Victory\n      ROUND(AVG(CASE\n          WHEN m.home = t.id AND m.home_cups > m.away_cups\n          THEN m.home_cups - m.away_cups\n          WHEN m.away = t.id AND m.away_cups > m.home_cups\n          THEN m.away_cups - m.home_cups\n          ELSE NULL\n      END), 2) as margin_of_victory,\n      -- Margin of Loss\n      ROUND(AVG(CASE\n          WHEN m.home = t.id AND m.home_cups < m.away_cups\n          THEN m.away_cups - m.home_cups\n          WHEN m.away = t.id AND m.away_cups < m.home_cups\n          THEN m.home_cups - m.away_cups\n          ELSE NULL\n      END), 2) as margin_of_loss\n  FROM players p, teams t, matches m, tournaments tour\n  WHERE\n      t.players LIKE '%\"' || p.id || '\"%' AND\n      (m.home = t.id OR m.away = t.id) AND\n      m.tournament = tour.id AND\n      m.status = 'ended' AND\n      tour.regional = true\n  GROUP BY p.id",
-    "viewRule": null
-  });
-
-  return app.save(collection);
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_4086490894");
-
-  return app.delete(collection);
-})

pb_migrations/1760559954_created_player_mainline_stats.js

@@ -1,165 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = new Collection({
-    "createRule": null,
-    "deleteRule": null,
-    "fields": [
-      {
-        "autogeneratePattern": "",
-        "hidden": false,
-        "id": "text3208210256",
-        "max": 0,
-        "min": 0,
-        "name": "id",
-        "pattern": "^[a-z0-9]+$",
-        "presentable": false,
-        "primaryKey": true,
-        "required": true,
-        "system": true,
-        "type": "text"
-      },
-      {
-        "cascadeDelete": false,
-        "collectionId": "pbc_3072146508",
-        "hidden": false,
-        "id": "relation2582050271",
-        "maxSelect": 1,
-        "minSelect": 0,
-        "name": "player_id",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "relation"
-      },
-      {
-        "hidden": false,
-        "id": "json4231605813",
-        "maxSize": 1,
-        "name": "player_name",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "number103159226",
-        "max": null,
-        "min": null,
-        "name": "matches",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "number3837590211",
-        "max": null,
-        "min": null,
-        "name": "tournaments",
-        "onlyInt": false,
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "number"
-      },
-      {
-        "hidden": false,
-        "id": "json2732118329",
-        "maxSize": 1,
-        "name": "wins",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json724428801",
-        "maxSize": 1,
-        "name": "losses",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3154249934",
-        "maxSize": 1,
-        "name": "total_cups_made",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3227208027",
-        "maxSize": 1,
-        "name": "total_cups_against",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json2379943496",
-        "maxSize": 1,
-        "name": "win_percentage",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3165107022",
-        "maxSize": 1,
-        "name": "avg_cups_per_match",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json3041953980",
-        "maxSize": 1,
-        "name": "margin_of_victory",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      },
-      {
-        "hidden": false,
-        "id": "json1531431708",
-        "maxSize": 1,
-        "name": "margin_of_loss",
-        "presentable": false,
-        "required": false,
-        "system": false,
-        "type": "json"
-      }
-    ],
-    "id": "pbc_15286826",
-    "indexes": [],
-    "listRule": null,
-    "name": "player_mainline_stats",
-    "system": false,
-    "type": "view",
-    "updateRule": null,
-    "viewQuery": "SELECT\n      p.id as id,\n      p.id as player_id,\n      (p.first_name || ' ' || p.last_name) as player_name,\n      COUNT(m.id) as matches,\n      COUNT(DISTINCT m.tournament) as tournaments,\n      SUM(CASE\n          WHEN (m.home = t.id AND m.home_cups > m.away_cups) OR\n               (m.away = t.id AND m.away_cups > m.home_cups)\n          THEN 1 ELSE 0\n      END) as wins,\n      SUM(CASE\n          WHEN (m.home = t.id AND m.home_cups < m.away_cups) OR\n               (m.away = t.id AND m.away_cups < m.home_cups)\n          THEN 1 ELSE 0\n      END) as losses,\n      SUM(CASE\n          WHEN m.home = t.id THEN m.home_cups\n          WHEN m.away = t.id THEN m.away_cups\n          ELSE 0\n      END) as total_cups_made,\n      SUM(CASE\n          WHEN m.home = t.id THEN m.away_cups\n          WHEN m.away = t.id THEN m.home_cups\n          ELSE 0\n      END) as total_cups_against,\n      -- Win percentage\n      ROUND((CAST(SUM(CASE\n          WHEN (m.home = t.id AND m.home_cups > m.away_cups) OR\n               (m.away = t.id AND m.away_cups > m.home_cups)\n          THEN 1 ELSE 0\n      END) AS REAL) / COUNT(m.id)) * 100, 2) as win_percentage,\n      -- Average cups per match\n      ROUND(CAST(SUM(CASE\n          WHEN m.home = t.id THEN m.home_cups\n          WHEN m.away = t.id THEN m.away_cups\n          ELSE 0\n      END) AS REAL) / COUNT(m.id), 2) as avg_cups_per_match,\n      -- Margin of Victory\n      ROUND(AVG(CASE\n          WHEN m.home = t.id AND m.home_cups > m.away_cups\n          THEN m.home_cups - m.away_cups\n          WHEN m.away = t.id AND m.away_cups > m.home_cups\n          THEN m.away_cups - m.home_cups\n          ELSE NULL\n      END), 2) as margin_of_victory,\n      -- Margin of Loss\n      ROUND(AVG(CASE\n          WHEN m.home = t.id AND m.home_cups < m.away_cups\n          THEN m.away_cups - m.home_cups\n          WHEN m.away = t.id AND m.away_cups < m.home_cups\n          THEN m.home_cups - m.away_cups\n          ELSE NULL\n      END), 2) as margin_of_loss\n  FROM players p, teams t, matches m, tournaments tour\n  WHERE\n      t.players LIKE '%\"' || p.id || '\"%' AND\n      (m.home = t.id OR m.away = t.id) AND\n      m.tournament = tour.id AND\n      m.status = 'ended' AND\n      (tour.regional = false OR tour.regional IS NULL)\n  GROUP BY p.id",
-    "viewRule": null
-  });
-
-  return app.save(collection);
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_15286826");
-
-  return app.delete(collection);
-})

pb_migrations/1760585178_updated_tournaments.js

@@ -1,48 +0,0 @@
-/// <reference path="../pb_data/types.d.ts" />
-migrate((app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // update field
-  collection.fields.addAt(13, new Field({
-    "hidden": false,
-    "id": "select3736761055",
-    "maxSelect": 1,
-    "name": "format",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "select",
-    "values": [
-      "single_elim",
-      "double_elim",
-      "groups",
-      "swiss",
-      "swiss_bracket",
-      "round_robin"
-    ]
-  }))
-
-  return app.save(collection)
-}, (app) => {
-  const collection = app.findCollectionByNameOrId("pbc_340646327")
-
-  // update field
-  collection.fields.addAt(13, new Field({
-    "hidden": false,
-    "id": "select3736761055",
-    "maxSelect": 1,
-    "name": "format",
-    "presentable": false,
-    "required": false,
-    "system": false,
-    "type": "select",
-    "values": [
-      "single_elim",
-      "double_elim",
-      "groups",
-      "swiss"
-    ]
-  }))
-
-  return app.save(collection)
-})

public/site.webmanifest

@@ -1,14 +1,14 @@
 {
-  "name": "FLXN IX",
+  "name": "",
-  "short_name": "FLXN",
+  "short_name": "",
   "icons": [
     {
-      "src": "/favicon.png",
+      "src": "/android-chrome-192x192.png",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "/favicon.png",
+      "src": "/android-chrome-512x512.png",
       "sizes": "512x512",
       "type": "image/png"
     }

src/app/routeTree.gen.ts

@@ -8,41 +8,41 @@
 // You should NOT make any changes in this file as it will be overwritten.
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
+import { createServerRootRoute } from '@tanstack/react-start/server'
+
 import { Route as rootRouteImport } from './routes/__root'
 import { Route as RefreshSessionRouteImport } from './routes/refresh-session'
 import { Route as LogoutRouteImport } from './routes/logout'
 import { Route as LoginRouteImport } from './routes/login'
 import { Route as AuthedRouteImport } from './routes/_authed'
 import { Route as AuthedIndexRouteImport } from './routes/_authed/index'
-import { Route as ApiHealthRouteImport } from './routes/api/health'
 import { Route as AuthedStatsRouteImport } from './routes/_authed/stats'
 import { Route as AuthedSettingsRouteImport } from './routes/_authed/settings'
-import { Route as AuthedBadgesRouteImport } from './routes/_authed/badges'
 import { Route as AuthedAdminRouteImport } from './routes/_authed/admin'
 import { Route as AuthedTournamentsIndexRouteImport } from './routes/_authed/tournaments/index'
 import { Route as AuthedAdminIndexRouteImport } from './routes/_authed/admin/index'
-import { Route as ApiTournamentsUploadLogoRouteImport } from './routes/api/tournaments/upload-logo'
-import { Route as ApiTeamsUploadLogoRouteImport } from './routes/api/teams/upload-logo'
-import { Route as ApiSpotifyTokenRouteImport } from './routes/api/spotify/token'
-import { Route as ApiSpotifySearchRouteImport } from './routes/api/spotify/search'
-import { Route as ApiSpotifyResumeRouteImport } from './routes/api/spotify/resume'
-import { Route as ApiSpotifyPlaybackRouteImport } from './routes/api/spotify/playback'
-import { Route as ApiSpotifyCaptureRouteImport } from './routes/api/spotify/capture'
-import { Route as ApiSpotifyCallbackRouteImport } from './routes/api/spotify/callback'
-import { Route as ApiEventsSplatRouteImport } from './routes/api/events.$'
-import { Route as ApiAuthSplatRouteImport } from './routes/api/auth.$'
 import { Route as AuthedTournamentsTournamentIdRouteImport } from './routes/_authed/tournaments/$tournamentId'
 import { Route as AuthedTeamsTeamIdRouteImport } from './routes/_authed/teams.$teamId'
 import { Route as AuthedProfilePlayerIdRouteImport } from './routes/_authed/profile.$playerId'
 import { Route as AuthedAdminPreviewRouteImport } from './routes/_authed/admin/preview'
-import { Route as AuthedAdminBadgesRouteImport } from './routes/_authed/admin/badges'
-import { Route as AuthedAdminActivitiesRouteImport } from './routes/_authed/admin/activities'
 import { Route as AuthedAdminTournamentsIndexRouteImport } from './routes/_authed/admin/tournaments/index'
 import { Route as AuthedTournamentsIdBracketRouteImport } from './routes/_authed/tournaments/$id.bracket'
 import { Route as AuthedAdminTournamentsIdIndexRouteImport } from './routes/_authed/admin/tournaments/$id/index'
-import { Route as ApiFilesCollectionRecordIdFileRouteImport } from './routes/api/files/$collection/$recordId/$file'
 import { Route as AuthedAdminTournamentsRunIdRouteImport } from './routes/_authed/admin/tournaments/run.$id'
 import { Route as AuthedAdminTournamentsIdTeamsRouteImport } from './routes/_authed/admin/tournaments/$id/teams'
+import { ServerRoute as ApiTournamentsUploadLogoServerRouteImport } from './routes/api/tournaments/upload-logo'
+import { ServerRoute as ApiTeamsUploadLogoServerRouteImport } from './routes/api/teams/upload-logo'
+import { ServerRoute as ApiSpotifyTokenServerRouteImport } from './routes/api/spotify/token'
+import { ServerRoute as ApiSpotifySearchServerRouteImport } from './routes/api/spotify/search'
+import { ServerRoute as ApiSpotifyResumeServerRouteImport } from './routes/api/spotify/resume'
+import { ServerRoute as ApiSpotifyPlaybackServerRouteImport } from './routes/api/spotify/playback'
+import { ServerRoute as ApiSpotifyCaptureServerRouteImport } from './routes/api/spotify/capture'
+import { ServerRoute as ApiSpotifyCallbackServerRouteImport } from './routes/api/spotify/callback'
+import { ServerRoute as ApiEventsSplatServerRouteImport } from './routes/api/events.$'
+import { ServerRoute as ApiAuthSplatServerRouteImport } from './routes/api/auth.$'
+import { ServerRoute as ApiFilesCollectionRecordIdFileServerRouteImport } from './routes/api/files/$collection/$recordId/$file'
+
+const rootServerRouteImport = createServerRootRoute()
 
 const RefreshSessionRoute = RefreshSessionRouteImport.update({
   id: '/refresh-session',
@@ -68,11 +68,6 @@ const AuthedIndexRoute = AuthedIndexRouteImport.update({
   path: '/',
   getParentRoute: () => AuthedRoute,
 } as any)
-const ApiHealthRoute = ApiHealthRouteImport.update({
-  id: '/api/health',
-  path: '/api/health',
-  getParentRoute: () => rootRouteImport,
-} as any)
 const AuthedStatsRoute = AuthedStatsRouteImport.update({
   id: '/stats',
   path: '/stats',
@@ -83,11 +78,6 @@ const AuthedSettingsRoute = AuthedSettingsRouteImport.update({
   path: '/settings',
   getParentRoute: () => AuthedRoute,
 } as any)
-const AuthedBadgesRoute = AuthedBadgesRouteImport.update({
-  id: '/badges',
-  path: '/badges',
-  getParentRoute: () => AuthedRoute,
-} as any)
 const AuthedAdminRoute = AuthedAdminRouteImport.update({
   id: '/admin',
   path: '/admin',
@@ -103,57 +93,6 @@ const AuthedAdminIndexRoute = AuthedAdminIndexRouteImport.update({
   path: '/',
   getParentRoute: () => AuthedAdminRoute,
 } as any)
-const ApiTournamentsUploadLogoRoute =
-  ApiTournamentsUploadLogoRouteImport.update({
-    id: '/api/tournaments/upload-logo',
-    path: '/api/tournaments/upload-logo',
-    getParentRoute: () => rootRouteImport,
-  } as any)
-const ApiTeamsUploadLogoRoute = ApiTeamsUploadLogoRouteImport.update({
-  id: '/api/teams/upload-logo',
-  path: '/api/teams/upload-logo',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiSpotifyTokenRoute = ApiSpotifyTokenRouteImport.update({
-  id: '/api/spotify/token',
-  path: '/api/spotify/token',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiSpotifySearchRoute = ApiSpotifySearchRouteImport.update({
-  id: '/api/spotify/search',
-  path: '/api/spotify/search',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiSpotifyResumeRoute = ApiSpotifyResumeRouteImport.update({
-  id: '/api/spotify/resume',
-  path: '/api/spotify/resume',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiSpotifyPlaybackRoute = ApiSpotifyPlaybackRouteImport.update({
-  id: '/api/spotify/playback',
-  path: '/api/spotify/playback',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiSpotifyCaptureRoute = ApiSpotifyCaptureRouteImport.update({
-  id: '/api/spotify/capture',
-  path: '/api/spotify/capture',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiSpotifyCallbackRoute = ApiSpotifyCallbackRouteImport.update({
-  id: '/api/spotify/callback',
-  path: '/api/spotify/callback',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiEventsSplatRoute = ApiEventsSplatRouteImport.update({
-  id: '/api/events/$',
-  path: '/api/events/$',
-  getParentRoute: () => rootRouteImport,
-} as any)
-const ApiAuthSplatRoute = ApiAuthSplatRouteImport.update({
-  id: '/api/auth/$',
-  path: '/api/auth/$',
-  getParentRoute: () => rootRouteImport,
-} as any)
 const AuthedTournamentsTournamentIdRoute =
   AuthedTournamentsTournamentIdRouteImport.update({
     id: '/tournaments/$tournamentId',
@@ -175,16 +114,6 @@ const AuthedAdminPreviewRoute = AuthedAdminPreviewRouteImport.update({
   path: '/preview',
   getParentRoute: () => AuthedAdminRoute,
 } as any)
-const AuthedAdminBadgesRoute = AuthedAdminBadgesRouteImport.update({
-  id: '/badges',
-  path: '/badges',
-  getParentRoute: () => AuthedAdminRoute,
-} as any)
-const AuthedAdminActivitiesRoute = AuthedAdminActivitiesRouteImport.update({
-  id: '/activities',
-  path: '/activities',
-  getParentRoute: () => AuthedAdminRoute,
-} as any)
 const AuthedAdminTournamentsIndexRoute =
   AuthedAdminTournamentsIndexRouteImport.update({
     id: '/tournaments/',
@@ -203,12 +132,6 @@ const AuthedAdminTournamentsIdIndexRoute =
     path: '/tournaments/$id/',
     getParentRoute: () => AuthedAdminRoute,
   } as any)
-const ApiFilesCollectionRecordIdFileRoute =
-  ApiFilesCollectionRecordIdFileRouteImport.update({
-    id: '/api/files/$collection/$recordId/$file',
-    path: '/api/files/$collection/$recordId/$file',
-    getParentRoute: () => rootRouteImport,
-  } as any)
 const AuthedAdminTournamentsRunIdRoute =
   AuthedAdminTournamentsRunIdRouteImport.update({
     id: '/tournaments/run/$id',
@@ -221,74 +144,104 @@ const AuthedAdminTournamentsIdTeamsRoute =
     path: '/tournaments/$id/teams',
     getParentRoute: () => AuthedAdminRoute,
   } as any)
+const ApiTournamentsUploadLogoServerRoute =
+  ApiTournamentsUploadLogoServerRouteImport.update({
+    id: '/api/tournaments/upload-logo',
+    path: '/api/tournaments/upload-logo',
+    getParentRoute: () => rootServerRouteImport,
+  } as any)
+const ApiTeamsUploadLogoServerRoute =
+  ApiTeamsUploadLogoServerRouteImport.update({
+    id: '/api/teams/upload-logo',
+    path: '/api/teams/upload-logo',
+    getParentRoute: () => rootServerRouteImport,
+  } as any)
+const ApiSpotifyTokenServerRoute = ApiSpotifyTokenServerRouteImport.update({
+  id: '/api/spotify/token',
+  path: '/api/spotify/token',
+  getParentRoute: () => rootServerRouteImport,
+} as any)
+const ApiSpotifySearchServerRoute = ApiSpotifySearchServerRouteImport.update({
+  id: '/api/spotify/search',
+  path: '/api/spotify/search',
+  getParentRoute: () => rootServerRouteImport,
+} as any)
+const ApiSpotifyResumeServerRoute = ApiSpotifyResumeServerRouteImport.update({
+  id: '/api/spotify/resume',
+  path: '/api/spotify/resume',
+  getParentRoute: () => rootServerRouteImport,
+} as any)
+const ApiSpotifyPlaybackServerRoute =
+  ApiSpotifyPlaybackServerRouteImport.update({
+    id: '/api/spotify/playback',
+    path: '/api/spotify/playback',
+    getParentRoute: () => rootServerRouteImport,
+  } as any)
+const ApiSpotifyCaptureServerRoute = ApiSpotifyCaptureServerRouteImport.update({
+  id: '/api/spotify/capture',
+  path: '/api/spotify/capture',
+  getParentRoute: () => rootServerRouteImport,
+} as any)
+const ApiSpotifyCallbackServerRoute =
+  ApiSpotifyCallbackServerRouteImport.update({
+    id: '/api/spotify/callback',
+    path: '/api/spotify/callback',
+    getParentRoute: () => rootServerRouteImport,
+  } as any)
+const ApiEventsSplatServerRoute = ApiEventsSplatServerRouteImport.update({
+  id: '/api/events/$',
+  path: '/api/events/$',
+  getParentRoute: () => rootServerRouteImport,
+} as any)
+const ApiAuthSplatServerRoute = ApiAuthSplatServerRouteImport.update({
+  id: '/api/auth/$',
+  path: '/api/auth/$',
+  getParentRoute: () => rootServerRouteImport,
+} as any)
+const ApiFilesCollectionRecordIdFileServerRoute =
+  ApiFilesCollectionRecordIdFileServerRouteImport.update({
+    id: '/api/files/$collection/$recordId/$file',
+    path: '/api/files/$collection/$recordId/$file',
+    getParentRoute: () => rootServerRouteImport,
+  } as any)
 
 export interface FileRoutesByFullPath {
-  '/': typeof AuthedIndexRoute
   '/login': typeof LoginRoute
   '/logout': typeof LogoutRoute
   '/refresh-session': typeof RefreshSessionRoute
   '/admin': typeof AuthedAdminRouteWithChildren
-  '/badges': typeof AuthedBadgesRoute
   '/settings': typeof AuthedSettingsRoute
   '/stats': typeof AuthedStatsRoute
-  '/api/health': typeof ApiHealthRoute
+  '/': typeof AuthedIndexRoute
-  '/admin/activities': typeof AuthedAdminActivitiesRoute
-  '/admin/badges': typeof AuthedAdminBadgesRoute
   '/admin/preview': typeof AuthedAdminPreviewRoute
   '/profile/$playerId': typeof AuthedProfilePlayerIdRoute
   '/teams/$teamId': typeof AuthedTeamsTeamIdRoute
   '/tournaments/$tournamentId': typeof AuthedTournamentsTournamentIdRoute
-  '/api/auth/$': typeof ApiAuthSplatRoute
-  '/api/events/$': typeof ApiEventsSplatRoute
-  '/api/spotify/callback': typeof ApiSpotifyCallbackRoute
-  '/api/spotify/capture': typeof ApiSpotifyCaptureRoute
-  '/api/spotify/playback': typeof ApiSpotifyPlaybackRoute
-  '/api/spotify/resume': typeof ApiSpotifyResumeRoute
-  '/api/spotify/search': typeof ApiSpotifySearchRoute
-  '/api/spotify/token': typeof ApiSpotifyTokenRoute
-  '/api/teams/upload-logo': typeof ApiTeamsUploadLogoRoute
-  '/api/tournaments/upload-logo': typeof ApiTournamentsUploadLogoRoute
   '/admin/': typeof AuthedAdminIndexRoute
-  '/tournaments/': typeof AuthedTournamentsIndexRoute
+  '/tournaments': typeof AuthedTournamentsIndexRoute
   '/tournaments/$id/bracket': typeof AuthedTournamentsIdBracketRoute
-  '/admin/tournaments/': typeof AuthedAdminTournamentsIndexRoute
+  '/admin/tournaments': typeof AuthedAdminTournamentsIndexRoute
   '/admin/tournaments/$id/teams': typeof AuthedAdminTournamentsIdTeamsRoute
   '/admin/tournaments/run/$id': typeof AuthedAdminTournamentsRunIdRoute
-  '/api/files/$collection/$recordId/$file': typeof ApiFilesCollectionRecordIdFileRoute
+  '/admin/tournaments/$id': typeof AuthedAdminTournamentsIdIndexRoute
-  '/admin/tournaments/$id/': typeof AuthedAdminTournamentsIdIndexRoute
 }
 export interface FileRoutesByTo {
   '/login': typeof LoginRoute
   '/logout': typeof LogoutRoute
   '/refresh-session': typeof RefreshSessionRoute
-  '/badges': typeof AuthedBadgesRoute
   '/settings': typeof AuthedSettingsRoute
   '/stats': typeof AuthedStatsRoute
-  '/api/health': typeof ApiHealthRoute
   '/': typeof AuthedIndexRoute
-  '/admin/activities': typeof AuthedAdminActivitiesRoute
-  '/admin/badges': typeof AuthedAdminBadgesRoute
   '/admin/preview': typeof AuthedAdminPreviewRoute
   '/profile/$playerId': typeof AuthedProfilePlayerIdRoute
   '/teams/$teamId': typeof AuthedTeamsTeamIdRoute
   '/tournaments/$tournamentId': typeof AuthedTournamentsTournamentIdRoute
-  '/api/auth/$': typeof ApiAuthSplatRoute
-  '/api/events/$': typeof ApiEventsSplatRoute
-  '/api/spotify/callback': typeof ApiSpotifyCallbackRoute
-  '/api/spotify/capture': typeof ApiSpotifyCaptureRoute
-  '/api/spotify/playback': typeof ApiSpotifyPlaybackRoute
-  '/api/spotify/resume': typeof ApiSpotifyResumeRoute
-  '/api/spotify/search': typeof ApiSpotifySearchRoute
-  '/api/spotify/token': typeof ApiSpotifyTokenRoute
-  '/api/teams/upload-logo': typeof ApiTeamsUploadLogoRoute
-  '/api/tournaments/upload-logo': typeof ApiTournamentsUploadLogoRoute
   '/admin': typeof AuthedAdminIndexRoute
   '/tournaments': typeof AuthedTournamentsIndexRoute
   '/tournaments/$id/bracket': typeof AuthedTournamentsIdBracketRoute
   '/admin/tournaments': typeof AuthedAdminTournamentsIndexRoute
   '/admin/tournaments/$id/teams': typeof AuthedAdminTournamentsIdTeamsRoute
   '/admin/tournaments/run/$id': typeof AuthedAdminTournamentsRunIdRoute
-  '/api/files/$collection/$recordId/$file': typeof ApiFilesCollectionRecordIdFileRoute
   '/admin/tournaments/$id': typeof AuthedAdminTournamentsIdIndexRoute
 }
 export interface FileRoutesById {
@@ -298,105 +251,60 @@ export interface FileRoutesById {
   '/logout': typeof LogoutRoute
   '/refresh-session': typeof RefreshSessionRoute
   '/_authed/admin': typeof AuthedAdminRouteWithChildren
-  '/_authed/badges': typeof AuthedBadgesRoute
   '/_authed/settings': typeof AuthedSettingsRoute
   '/_authed/stats': typeof AuthedStatsRoute
-  '/api/health': typeof ApiHealthRoute
   '/_authed/': typeof AuthedIndexRoute
-  '/_authed/admin/activities': typeof AuthedAdminActivitiesRoute
-  '/_authed/admin/badges': typeof AuthedAdminBadgesRoute
   '/_authed/admin/preview': typeof AuthedAdminPreviewRoute
   '/_authed/profile/$playerId': typeof AuthedProfilePlayerIdRoute
   '/_authed/teams/$teamId': typeof AuthedTeamsTeamIdRoute
   '/_authed/tournaments/$tournamentId': typeof AuthedTournamentsTournamentIdRoute
-  '/api/auth/$': typeof ApiAuthSplatRoute
-  '/api/events/$': typeof ApiEventsSplatRoute
-  '/api/spotify/callback': typeof ApiSpotifyCallbackRoute
-  '/api/spotify/capture': typeof ApiSpotifyCaptureRoute
-  '/api/spotify/playback': typeof ApiSpotifyPlaybackRoute
-  '/api/spotify/resume': typeof ApiSpotifyResumeRoute
-  '/api/spotify/search': typeof ApiSpotifySearchRoute
-  '/api/spotify/token': typeof ApiSpotifyTokenRoute
-  '/api/teams/upload-logo': typeof ApiTeamsUploadLogoRoute
-  '/api/tournaments/upload-logo': typeof ApiTournamentsUploadLogoRoute
   '/_authed/admin/': typeof AuthedAdminIndexRoute
   '/_authed/tournaments/': typeof AuthedTournamentsIndexRoute
   '/_authed/tournaments/$id/bracket': typeof AuthedTournamentsIdBracketRoute
   '/_authed/admin/tournaments/': typeof AuthedAdminTournamentsIndexRoute
   '/_authed/admin/tournaments/$id/teams': typeof AuthedAdminTournamentsIdTeamsRoute
   '/_authed/admin/tournaments/run/$id': typeof AuthedAdminTournamentsRunIdRoute
-  '/api/files/$collection/$recordId/$file': typeof ApiFilesCollectionRecordIdFileRoute
   '/_authed/admin/tournaments/$id/': typeof AuthedAdminTournamentsIdIndexRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
   fullPaths:
-    | '/'
     | '/login'
     | '/logout'
     | '/refresh-session'
     | '/admin'
-    | '/badges'
     | '/settings'
     | '/stats'
-    | '/api/health'
+    | '/'
-    | '/admin/activities'
-    | '/admin/badges'
     | '/admin/preview'
     | '/profile/$playerId'
     | '/teams/$teamId'
     | '/tournaments/$tournamentId'
-    | '/api/auth/$'
-    | '/api/events/$'
-    | '/api/spotify/callback'
-    | '/api/spotify/capture'
-    | '/api/spotify/playback'
-    | '/api/spotify/resume'
-    | '/api/spotify/search'
-    | '/api/spotify/token'
-    | '/api/teams/upload-logo'
-    | '/api/tournaments/upload-logo'
     | '/admin/'
-    | '/tournaments/'
+    | '/tournaments'
     | '/tournaments/$id/bracket'
-    | '/admin/tournaments/'
+    | '/admin/tournaments'
     | '/admin/tournaments/$id/teams'
     | '/admin/tournaments/run/$id'
-    | '/api/files/$collection/$recordId/$file'
+    | '/admin/tournaments/$id'
-    | '/admin/tournaments/$id/'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/login'
     | '/logout'
     | '/refresh-session'
-    | '/badges'
     | '/settings'
     | '/stats'
-    | '/api/health'
     | '/'
-    | '/admin/activities'
-    | '/admin/badges'
     | '/admin/preview'
     | '/profile/$playerId'
     | '/teams/$teamId'
     | '/tournaments/$tournamentId'
-    | '/api/auth/$'
-    | '/api/events/$'
-    | '/api/spotify/callback'
-    | '/api/spotify/capture'
-    | '/api/spotify/playback'
-    | '/api/spotify/resume'
-    | '/api/spotify/search'
-    | '/api/spotify/token'
-    | '/api/teams/upload-logo'
-    | '/api/tournaments/upload-logo'
     | '/admin'
     | '/tournaments'
     | '/tournaments/$id/bracket'
     | '/admin/tournaments'
     | '/admin/tournaments/$id/teams'
     | '/admin/tournaments/run/$id'
-    | '/api/files/$collection/$recordId/$file'
     | '/admin/tournaments/$id'
   id:
     | '__root__'
@@ -405,17 +313,71 @@ export interface FileRouteTypes {
     | '/logout'
     | '/refresh-session'
     | '/_authed/admin'
-    | '/_authed/badges'
     | '/_authed/settings'
     | '/_authed/stats'
-    | '/api/health'
     | '/_authed/'
-    | '/_authed/admin/activities'
-    | '/_authed/admin/badges'
     | '/_authed/admin/preview'
     | '/_authed/profile/$playerId'
     | '/_authed/teams/$teamId'
     | '/_authed/tournaments/$tournamentId'
+    | '/_authed/admin/'
+    | '/_authed/tournaments/'
+    | '/_authed/tournaments/$id/bracket'
+    | '/_authed/admin/tournaments/'
+    | '/_authed/admin/tournaments/$id/teams'
+    | '/_authed/admin/tournaments/run/$id'
+    | '/_authed/admin/tournaments/$id/'
+  fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+  AuthedRoute: typeof AuthedRouteWithChildren
+  LoginRoute: typeof LoginRoute
+  LogoutRoute: typeof LogoutRoute
+  RefreshSessionRoute: typeof RefreshSessionRoute
+}
+export interface FileServerRoutesByFullPath {
+  '/api/auth/$': typeof ApiAuthSplatServerRoute
+  '/api/events/$': typeof ApiEventsSplatServerRoute
+  '/api/spotify/callback': typeof ApiSpotifyCallbackServerRoute
+  '/api/spotify/capture': typeof ApiSpotifyCaptureServerRoute
+  '/api/spotify/playback': typeof ApiSpotifyPlaybackServerRoute
+  '/api/spotify/resume': typeof ApiSpotifyResumeServerRoute
+  '/api/spotify/search': typeof ApiSpotifySearchServerRoute
+  '/api/spotify/token': typeof ApiSpotifyTokenServerRoute
+  '/api/teams/upload-logo': typeof ApiTeamsUploadLogoServerRoute
+  '/api/tournaments/upload-logo': typeof ApiTournamentsUploadLogoServerRoute
+  '/api/files/$collection/$recordId/$file': typeof ApiFilesCollectionRecordIdFileServerRoute
+}
+export interface FileServerRoutesByTo {
+  '/api/auth/$': typeof ApiAuthSplatServerRoute
+  '/api/events/$': typeof ApiEventsSplatServerRoute
+  '/api/spotify/callback': typeof ApiSpotifyCallbackServerRoute
+  '/api/spotify/capture': typeof ApiSpotifyCaptureServerRoute
+  '/api/spotify/playback': typeof ApiSpotifyPlaybackServerRoute
+  '/api/spotify/resume': typeof ApiSpotifyResumeServerRoute
+  '/api/spotify/search': typeof ApiSpotifySearchServerRoute
+  '/api/spotify/token': typeof ApiSpotifyTokenServerRoute
+  '/api/teams/upload-logo': typeof ApiTeamsUploadLogoServerRoute
+  '/api/tournaments/upload-logo': typeof ApiTournamentsUploadLogoServerRoute
+  '/api/files/$collection/$recordId/$file': typeof ApiFilesCollectionRecordIdFileServerRoute
+}
+export interface FileServerRoutesById {
+  __root__: typeof rootServerRouteImport
+  '/api/auth/$': typeof ApiAuthSplatServerRoute
+  '/api/events/$': typeof ApiEventsSplatServerRoute
+  '/api/spotify/callback': typeof ApiSpotifyCallbackServerRoute
+  '/api/spotify/capture': typeof ApiSpotifyCaptureServerRoute
+  '/api/spotify/playback': typeof ApiSpotifyPlaybackServerRoute
+  '/api/spotify/resume': typeof ApiSpotifyResumeServerRoute
+  '/api/spotify/search': typeof ApiSpotifySearchServerRoute
+  '/api/spotify/token': typeof ApiSpotifyTokenServerRoute
+  '/api/teams/upload-logo': typeof ApiTeamsUploadLogoServerRoute
+  '/api/tournaments/upload-logo': typeof ApiTournamentsUploadLogoServerRoute
+  '/api/files/$collection/$recordId/$file': typeof ApiFilesCollectionRecordIdFileServerRoute
+}
+export interface FileServerRouteTypes {
+  fileServerRoutesByFullPath: FileServerRoutesByFullPath
+  fullPaths:
     | '/api/auth/$'
     | '/api/events/$'
     | '/api/spotify/callback'
@@ -426,33 +388,47 @@ export interface FileRouteTypes {
     | '/api/spotify/token'
     | '/api/teams/upload-logo'
     | '/api/tournaments/upload-logo'
-    | '/_authed/admin/'
-    | '/_authed/tournaments/'
-    | '/_authed/tournaments/$id/bracket'
-    | '/_authed/admin/tournaments/'
-    | '/_authed/admin/tournaments/$id/teams'
-    | '/_authed/admin/tournaments/run/$id'
     | '/api/files/$collection/$recordId/$file'
-    | '/_authed/admin/tournaments/$id/'
+  fileServerRoutesByTo: FileServerRoutesByTo
-  fileRoutesById: FileRoutesById
+  to:
+    | '/api/auth/$'
+    | '/api/events/$'
+    | '/api/spotify/callback'
+    | '/api/spotify/capture'
+    | '/api/spotify/playback'
+    | '/api/spotify/resume'
+    | '/api/spotify/search'
+    | '/api/spotify/token'
+    | '/api/teams/upload-logo'
+    | '/api/tournaments/upload-logo'
+    | '/api/files/$collection/$recordId/$file'
+  id:
+    | '__root__'
+    | '/api/auth/$'
+    | '/api/events/$'
+    | '/api/spotify/callback'
+    | '/api/spotify/capture'
+    | '/api/spotify/playback'
+    | '/api/spotify/resume'
+    | '/api/spotify/search'
+    | '/api/spotify/token'
+    | '/api/teams/upload-logo'
+    | '/api/tournaments/upload-logo'
+    | '/api/files/$collection/$recordId/$file'
+  fileServerRoutesById: FileServerRoutesById
 }
-export interface RootRouteChildren {
+export interface RootServerRouteChildren {
-  AuthedRoute: typeof AuthedRouteWithChildren
+  ApiAuthSplatServerRoute: typeof ApiAuthSplatServerRoute
-  LoginRoute: typeof LoginRoute
+  ApiEventsSplatServerRoute: typeof ApiEventsSplatServerRoute
-  LogoutRoute: typeof LogoutRoute
+  ApiSpotifyCallbackServerRoute: typeof ApiSpotifyCallbackServerRoute
-  RefreshSessionRoute: typeof RefreshSessionRoute
+  ApiSpotifyCaptureServerRoute: typeof ApiSpotifyCaptureServerRoute
-  ApiHealthRoute: typeof ApiHealthRoute
+  ApiSpotifyPlaybackServerRoute: typeof ApiSpotifyPlaybackServerRoute
-  ApiAuthSplatRoute: typeof ApiAuthSplatRoute
+  ApiSpotifyResumeServerRoute: typeof ApiSpotifyResumeServerRoute
-  ApiEventsSplatRoute: typeof ApiEventsSplatRoute
+  ApiSpotifySearchServerRoute: typeof ApiSpotifySearchServerRoute
-  ApiSpotifyCallbackRoute: typeof ApiSpotifyCallbackRoute
+  ApiSpotifyTokenServerRoute: typeof ApiSpotifyTokenServerRoute
-  ApiSpotifyCaptureRoute: typeof ApiSpotifyCaptureRoute
+  ApiTeamsUploadLogoServerRoute: typeof ApiTeamsUploadLogoServerRoute
-  ApiSpotifyPlaybackRoute: typeof ApiSpotifyPlaybackRoute
+  ApiTournamentsUploadLogoServerRoute: typeof ApiTournamentsUploadLogoServerRoute
-  ApiSpotifyResumeRoute: typeof ApiSpotifyResumeRoute
+  ApiFilesCollectionRecordIdFileServerRoute: typeof ApiFilesCollectionRecordIdFileServerRoute
-  ApiSpotifySearchRoute: typeof ApiSpotifySearchRoute
-  ApiSpotifyTokenRoute: typeof ApiSpotifyTokenRoute
-  ApiTeamsUploadLogoRoute: typeof ApiTeamsUploadLogoRoute
-  ApiTournamentsUploadLogoRoute: typeof ApiTournamentsUploadLogoRoute
-  ApiFilesCollectionRecordIdFileRoute: typeof ApiFilesCollectionRecordIdFileRoute
 }
 
 declare module '@tanstack/react-router' {
@@ -481,7 +457,7 @@ declare module '@tanstack/react-router' {
     '/_authed': {
       id: '/_authed'
       path: ''
-      fullPath: '/'
+      fullPath: ''
       preLoaderRoute: typeof AuthedRouteImport
       parentRoute: typeof rootRouteImport
     }
@@ -492,13 +468,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthedIndexRouteImport
       parentRoute: typeof AuthedRoute
     }
-    '/api/health': {
-      id: '/api/health'
-      path: '/api/health'
-      fullPath: '/api/health'
-      preLoaderRoute: typeof ApiHealthRouteImport
-      parentRoute: typeof rootRouteImport
-    }
     '/_authed/stats': {
       id: '/_authed/stats'
       path: '/stats'
@@ -513,13 +482,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthedSettingsRouteImport
       parentRoute: typeof AuthedRoute
     }
-    '/_authed/badges': {
-      id: '/_authed/badges'
-      path: '/badges'
-      fullPath: '/badges'
-      preLoaderRoute: typeof AuthedBadgesRouteImport
-      parentRoute: typeof AuthedRoute
-    }
     '/_authed/admin': {
       id: '/_authed/admin'
       path: '/admin'
@@ -530,7 +492,7 @@ declare module '@tanstack/react-router' {
     '/_authed/tournaments/': {
       id: '/_authed/tournaments/'
       path: '/tournaments'
-      fullPath: '/tournaments/'
+      fullPath: '/tournaments'
       preLoaderRoute: typeof AuthedTournamentsIndexRouteImport
       parentRoute: typeof AuthedRoute
     }
@@ -541,76 +503,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthedAdminIndexRouteImport
       parentRoute: typeof AuthedAdminRoute
     }
-    '/api/tournaments/upload-logo': {
-      id: '/api/tournaments/upload-logo'
-      path: '/api/tournaments/upload-logo'
-      fullPath: '/api/tournaments/upload-logo'
-      preLoaderRoute: typeof ApiTournamentsUploadLogoRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/teams/upload-logo': {
-      id: '/api/teams/upload-logo'
-      path: '/api/teams/upload-logo'
-      fullPath: '/api/teams/upload-logo'
-      preLoaderRoute: typeof ApiTeamsUploadLogoRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/spotify/token': {
-      id: '/api/spotify/token'
-      path: '/api/spotify/token'
-      fullPath: '/api/spotify/token'
-      preLoaderRoute: typeof ApiSpotifyTokenRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/spotify/search': {
-      id: '/api/spotify/search'
-      path: '/api/spotify/search'
-      fullPath: '/api/spotify/search'
-      preLoaderRoute: typeof ApiSpotifySearchRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/spotify/resume': {
-      id: '/api/spotify/resume'
-      path: '/api/spotify/resume'
-      fullPath: '/api/spotify/resume'
-      preLoaderRoute: typeof ApiSpotifyResumeRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/spotify/playback': {
-      id: '/api/spotify/playback'
-      path: '/api/spotify/playback'
-      fullPath: '/api/spotify/playback'
-      preLoaderRoute: typeof ApiSpotifyPlaybackRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/spotify/capture': {
-      id: '/api/spotify/capture'
-      path: '/api/spotify/capture'
-      fullPath: '/api/spotify/capture'
-      preLoaderRoute: typeof ApiSpotifyCaptureRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/spotify/callback': {
-      id: '/api/spotify/callback'
-      path: '/api/spotify/callback'
-      fullPath: '/api/spotify/callback'
-      preLoaderRoute: typeof ApiSpotifyCallbackRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/events/$': {
-      id: '/api/events/$'
-      path: '/api/events/$'
-      fullPath: '/api/events/$'
-      preLoaderRoute: typeof ApiEventsSplatRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/api/auth/$': {
-      id: '/api/auth/$'
-      path: '/api/auth/$'
-      fullPath: '/api/auth/$'
-      preLoaderRoute: typeof ApiAuthSplatRouteImport
-      parentRoute: typeof rootRouteImport
-    }
     '/_authed/tournaments/$tournamentId': {
       id: '/_authed/tournaments/$tournamentId'
       path: '/tournaments/$tournamentId'
@@ -639,24 +531,10 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthedAdminPreviewRouteImport
       parentRoute: typeof AuthedAdminRoute
     }
-    '/_authed/admin/badges': {
-      id: '/_authed/admin/badges'
-      path: '/badges'
-      fullPath: '/admin/badges'
-      preLoaderRoute: typeof AuthedAdminBadgesRouteImport
-      parentRoute: typeof AuthedAdminRoute
-    }
-    '/_authed/admin/activities': {
-      id: '/_authed/admin/activities'
-      path: '/activities'
-      fullPath: '/admin/activities'
-      preLoaderRoute: typeof AuthedAdminActivitiesRouteImport
-      parentRoute: typeof AuthedAdminRoute
-    }
     '/_authed/admin/tournaments/': {
       id: '/_authed/admin/tournaments/'
       path: '/tournaments'
-      fullPath: '/admin/tournaments/'
+      fullPath: '/admin/tournaments'
       preLoaderRoute: typeof AuthedAdminTournamentsIndexRouteImport
       parentRoute: typeof AuthedAdminRoute
     }
@@ -670,17 +548,10 @@ declare module '@tanstack/react-router' {
     '/_authed/admin/tournaments/$id/': {
       id: '/_authed/admin/tournaments/$id/'
       path: '/tournaments/$id'
-      fullPath: '/admin/tournaments/$id/'
+      fullPath: '/admin/tournaments/$id'
       preLoaderRoute: typeof AuthedAdminTournamentsIdIndexRouteImport
       parentRoute: typeof AuthedAdminRoute
     }
-    '/api/files/$collection/$recordId/$file': {
-      id: '/api/files/$collection/$recordId/$file'
-      path: '/api/files/$collection/$recordId/$file'
-      fullPath: '/api/files/$collection/$recordId/$file'
-      preLoaderRoute: typeof ApiFilesCollectionRecordIdFileRouteImport
-      parentRoute: typeof rootRouteImport
-    }
     '/_authed/admin/tournaments/run/$id': {
       id: '/_authed/admin/tournaments/run/$id'
       path: '/tournaments/run/$id'
@@ -697,10 +568,89 @@ declare module '@tanstack/react-router' {
     }
   }
 }
+declare module '@tanstack/react-start/server' {
+  interface ServerFileRoutesByPath {
+    '/api/tournaments/upload-logo': {
+      id: '/api/tournaments/upload-logo'
+      path: '/api/tournaments/upload-logo'
+      fullPath: '/api/tournaments/upload-logo'
+      preLoaderRoute: typeof ApiTournamentsUploadLogoServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/teams/upload-logo': {
+      id: '/api/teams/upload-logo'
+      path: '/api/teams/upload-logo'
+      fullPath: '/api/teams/upload-logo'
+      preLoaderRoute: typeof ApiTeamsUploadLogoServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/spotify/token': {
+      id: '/api/spotify/token'
+      path: '/api/spotify/token'
+      fullPath: '/api/spotify/token'
+      preLoaderRoute: typeof ApiSpotifyTokenServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/spotify/search': {
+      id: '/api/spotify/search'
+      path: '/api/spotify/search'
+      fullPath: '/api/spotify/search'
+      preLoaderRoute: typeof ApiSpotifySearchServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/spotify/resume': {
+      id: '/api/spotify/resume'
+      path: '/api/spotify/resume'
+      fullPath: '/api/spotify/resume'
+      preLoaderRoute: typeof ApiSpotifyResumeServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/spotify/playback': {
+      id: '/api/spotify/playback'
+      path: '/api/spotify/playback'
+      fullPath: '/api/spotify/playback'
+      preLoaderRoute: typeof ApiSpotifyPlaybackServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/spotify/capture': {
+      id: '/api/spotify/capture'
+      path: '/api/spotify/capture'
+      fullPath: '/api/spotify/capture'
+      preLoaderRoute: typeof ApiSpotifyCaptureServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/spotify/callback': {
+      id: '/api/spotify/callback'
+      path: '/api/spotify/callback'
+      fullPath: '/api/spotify/callback'
+      preLoaderRoute: typeof ApiSpotifyCallbackServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/events/$': {
+      id: '/api/events/$'
+      path: '/api/events/$'
+      fullPath: '/api/events/$'
+      preLoaderRoute: typeof ApiEventsSplatServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/auth/$': {
+      id: '/api/auth/$'
+      path: '/api/auth/$'
+      fullPath: '/api/auth/$'
+      preLoaderRoute: typeof ApiAuthSplatServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+    '/api/files/$collection/$recordId/$file': {
+      id: '/api/files/$collection/$recordId/$file'
+      path: '/api/files/$collection/$recordId/$file'
+      fullPath: '/api/files/$collection/$recordId/$file'
+      preLoaderRoute: typeof ApiFilesCollectionRecordIdFileServerRouteImport
+      parentRoute: typeof rootServerRouteImport
+    }
+  }
+}
 
 interface AuthedAdminRouteChildren {
-  AuthedAdminActivitiesRoute: typeof AuthedAdminActivitiesRoute
-  AuthedAdminBadgesRoute: typeof AuthedAdminBadgesRoute
   AuthedAdminPreviewRoute: typeof AuthedAdminPreviewRoute
   AuthedAdminIndexRoute: typeof AuthedAdminIndexRoute
   AuthedAdminTournamentsIndexRoute: typeof AuthedAdminTournamentsIndexRoute
@@ -710,8 +660,6 @@ interface AuthedAdminRouteChildren {
 }
 
 const AuthedAdminRouteChildren: AuthedAdminRouteChildren = {
-  AuthedAdminActivitiesRoute: AuthedAdminActivitiesRoute,
-  AuthedAdminBadgesRoute: AuthedAdminBadgesRoute,
   AuthedAdminPreviewRoute: AuthedAdminPreviewRoute,
   AuthedAdminIndexRoute: AuthedAdminIndexRoute,
   AuthedAdminTournamentsIndexRoute: AuthedAdminTournamentsIndexRoute,
@@ -726,7 +674,6 @@ const AuthedAdminRouteWithChildren = AuthedAdminRoute._addFileChildren(
 
 interface AuthedRouteChildren {
   AuthedAdminRoute: typeof AuthedAdminRouteWithChildren
-  AuthedBadgesRoute: typeof AuthedBadgesRoute
   AuthedSettingsRoute: typeof AuthedSettingsRoute
   AuthedStatsRoute: typeof AuthedStatsRoute
   AuthedIndexRoute: typeof AuthedIndexRoute
@@ -739,7 +686,6 @@ interface AuthedRouteChildren {
 
 const AuthedRouteChildren: AuthedRouteChildren = {
   AuthedAdminRoute: AuthedAdminRouteWithChildren,
-  AuthedBadgesRoute: AuthedBadgesRoute,
   AuthedSettingsRoute: AuthedSettingsRoute,
   AuthedStatsRoute: AuthedStatsRoute,
   AuthedIndexRoute: AuthedIndexRoute,
@@ -758,28 +704,24 @@ const rootRouteChildren: RootRouteChildren = {
   LoginRoute: LoginRoute,
   LogoutRoute: LogoutRoute,
   RefreshSessionRoute: RefreshSessionRoute,
-  ApiHealthRoute: ApiHealthRoute,
-  ApiAuthSplatRoute: ApiAuthSplatRoute,
-  ApiEventsSplatRoute: ApiEventsSplatRoute,
-  ApiSpotifyCallbackRoute: ApiSpotifyCallbackRoute,
-  ApiSpotifyCaptureRoute: ApiSpotifyCaptureRoute,
-  ApiSpotifyPlaybackRoute: ApiSpotifyPlaybackRoute,
-  ApiSpotifyResumeRoute: ApiSpotifyResumeRoute,
-  ApiSpotifySearchRoute: ApiSpotifySearchRoute,
-  ApiSpotifyTokenRoute: ApiSpotifyTokenRoute,
-  ApiTeamsUploadLogoRoute: ApiTeamsUploadLogoRoute,
-  ApiTournamentsUploadLogoRoute: ApiTournamentsUploadLogoRoute,
-  ApiFilesCollectionRecordIdFileRoute: ApiFilesCollectionRecordIdFileRoute,
 }
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)
   ._addFileTypes<FileRouteTypes>()
-
+const rootServerRouteChildren: RootServerRouteChildren = {
-import type { getRouter } from './router.tsx'
+  ApiAuthSplatServerRoute: ApiAuthSplatServerRoute,
-import type { createStart } from '@tanstack/react-start'
+  ApiEventsSplatServerRoute: ApiEventsSplatServerRoute,
-declare module '@tanstack/react-start' {
+  ApiSpotifyCallbackServerRoute: ApiSpotifyCallbackServerRoute,
-  interface Register {
+  ApiSpotifyCaptureServerRoute: ApiSpotifyCaptureServerRoute,
-    ssr: true
+  ApiSpotifyPlaybackServerRoute: ApiSpotifyPlaybackServerRoute,
-    router: Awaited<ReturnType<typeof getRouter>>
+  ApiSpotifyResumeServerRoute: ApiSpotifyResumeServerRoute,
-  }
+  ApiSpotifySearchServerRoute: ApiSpotifySearchServerRoute,
+  ApiSpotifyTokenServerRoute: ApiSpotifyTokenServerRoute,
+  ApiTeamsUploadLogoServerRoute: ApiTeamsUploadLogoServerRoute,
+  ApiTournamentsUploadLogoServerRoute: ApiTournamentsUploadLogoServerRoute,
+  ApiFilesCollectionRecordIdFileServerRoute:
+    ApiFilesCollectionRecordIdFileServerRoute,
 }
+export const serverRouteTree = rootServerRouteImport
+  ._addFileChildren(rootServerRouteChildren)
+  ._addFileTypes<FileServerRouteTypes>()

src/app/router.tsx

@@ -1,11 +1,15 @@
 import { QueryClient } from "@tanstack/react-query";
 import { createRouter as createTanStackRouter } from "@tanstack/react-router";
-import { setupRouterSsrQueryIntegration } from "@tanstack/react-router-ssr-query";
+import { routerWithQueryClient } from "@tanstack/react-router-with-query";
 import { routeTree } from "./routeTree.gen";
 import { DefaultCatchBoundary } from "../components/DefaultCatchBoundary";
 import { defaultHeaderConfig } from "@/features/core/hooks/use-router-config";
 
-export function getRouter() {
+import dotenv from 'dotenv';
+dotenv.config();
+
+
+export function createRouter() {
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
@@ -13,37 +17,33 @@ export function getRouter() {
         gcTime: 5 * 60 * 1000, // 5 minutes
         refetchOnWindowFocus: false,
         refetchOnReconnect: "always",
-        retry: 1,
+        retry: 3,
       },
     },
   });
 
-  const router = createTanStackRouter({
+  return routerWithQueryClient(
-    routeTree,
+    createTanStackRouter({
-    context: {
+      routeTree,
-      queryClient,
+      context: {
-      auth: undefined!,
+        queryClient,
-      header: defaultHeaderConfig,
+        auth: undefined!,
-      refresh: [],
+        header: defaultHeaderConfig,
-      withPadding: true,
+        refresh: [],
-      fullWidth: false,
+        withPadding: true,
-    },
+        fullWidth: false,
-    defaultPreload: "intent",
+      },
-    defaultErrorComponent: DefaultCatchBoundary,
+      defaultPreload: "intent",
-    scrollRestoration: true,
+      defaultErrorComponent: DefaultCatchBoundary,
-    defaultViewTransition: false,
+      scrollRestoration: true,
-  });
+      defaultViewTransition: false,
-
+    }),
-  setupRouterSsrQueryIntegration({
-    router,
     queryClient
-  })
+  );
-
-  return router;
 }
 
 declare module "@tanstack/react-router" {
   interface Register {
-    router: ReturnType<typeof getRouter>;
+    router: ReturnType<typeof createRouter>;
   }
 }

src/app/routes/__root.tsx

@@ -30,7 +30,6 @@ export const Route = createRootRouteWithContext<{
   fullWidth: boolean;
 }>()({
   head: () => ({
-    title: "FLXN IX",
     meta: [
       {
         charSet: "utf-8",
@@ -38,49 +37,33 @@ export const Route = createRootRouteWithContext<{
       {
         name: "viewport",
         content:
-          "width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, interactive-widget=resizes-content",
+          "width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, interactive-widget=overlays-content",
       },
-      { property: 'og:title', content: 'FLXN IX' },
-      { property: 'og:description', content: 'Register for FLXN IX and view FLXN stats' },
-      { property: 'og:url', content: 'https://flexxon.app' },
-      { property: 'og:type', content: 'website' },
-      { property: 'og:site_name', content: 'FLXN IX' },
-      { property: 'og:image', content: 'https://flexxon.app/favicon.png' },
     ],
     links: [
       {
         rel: "apple-touch-icon",
         sizes: "180x180",
-        href: "/favicon.png",
+        href: "/apple-touch-icon.png",
       },
       {
         rel: "icon",
         type: "image/png",
         sizes: "32x32",
-        href: "/favicon.png",
+        href: "/favicon-32x32.png",
       },
       {
         rel: "icon",
         type: "image/png",
         sizes: "16x16",
-        href: "/favicon.png",
+        href: "/favicon-16x16.png",
       },
       { rel: "manifest", href: "/site.webmanifest" },
       { rel: "icon", href: "/favicon.ico" },
       { rel: 'stylesheet', href: mantineCssUrl },
       { rel: 'stylesheet', href: mantineCarouselCssUrl },
       { rel: 'stylesheet', href: mantineDatesCssUrl },
-      { rel: 'stylesheet', href: mantineTiptapCssUrl },
+      { rel: 'stylesheet', href: mantineTiptapCssUrl }
-      { rel: "preconnect", href: "https://fonts.googleapis.com" },
-      {
-        rel: "preconnect",
-        href: "https://fonts.gstatic.com",
-        crossOrigin: "anonymous",
-      },
-      {
-        rel: "stylesheet",
-        href: "https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=League+Spartan:wght@100..900&display=swap",
-      }
     ],
   }),
   errorComponent: (props) => {
@@ -100,20 +83,12 @@ export const Route = createRootRouteWithContext<{
       return {};
     }
 
-    if (location.pathname === '/login' || location.pathname === '/logout') {
+    // https://github.com/TanStack/router/discussions/3531
-      return {};
+    const auth = await ensureServerQueryData(
-    }
+      context.queryClient,
-
+      playerQueries.auth()
-    try {
+    );
-      // https://github.com/TanStack/router/discussions/3531
+    return { auth };
-      const auth = await ensureServerQueryData(
-        context.queryClient,
-        playerQueries.auth()
-      );
-      return { auth };
-    } catch (error) {
-      return {};
-    }
   },
   pendingComponent: () => <Providers><FullScreenLoader /></Providers>,
 });
@@ -139,7 +114,8 @@ function RootDocument({ children }: { children: React.ReactNode }) {
       {...mantineHtmlProps}
       style={{
         overflowX: "hidden",
-        height: "100%",
+        overflowY: "hidden",
+        position: "fixed",
         width: "100%",
       }}
     >
@@ -151,10 +127,9 @@ function RootDocument({ children }: { children: React.ReactNode }) {
       <body
         style={{
           overflowX: "hidden",
-          height: "100%",
+          overflowY: "hidden",
+          position: "fixed",
           width: "100%",
-          margin: 0,
-          padding: 0,
         }}
       >
         <div className="app">{children}</div>

src/app/routes/_authed/admin/activities.tsx

@@ -1,45 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-import { prefetchServerQuery } from "@/lib/tanstack-query/utils/prefetch";
-import { ActivitiesTable, activityQueries } from "@/features/activities";
-import { PlayersActivityTable, playerQueries } from "@/features/players";
-import { Tabs } from "@mantine/core";
-import { useState } from "react";
-
-export const Route = createFileRoute("/_authed/admin/activities")({
-  component: Stats,
-  beforeLoad: ({ context }) => {
-    const queryClient = context.queryClient;
-    prefetchServerQuery(queryClient, activityQueries.search());
-    prefetchServerQuery(queryClient, playerQueries.activity());
-  },
-  loader: () => ({
-    withPadding: false,
-    fullWidth: true,
-    header: {
-      title: "Activities",
-      withBackButton: true,
-    },
-    refresh: [activityQueries.search().queryKey, playerQueries.activity().queryKey],
-  }),
-});
-
-function Stats() {
-  const [activeTab, setActiveTab] = useState<string | null>("server-functions");
-
-  return (
-    <Tabs value={activeTab} onChange={setActiveTab}>
-      <Tabs.List mb='md'>
-        <Tabs.Tab value="server-functions">Server Functions</Tabs.Tab>
-        <Tabs.Tab value="player-activity">Player Activity</Tabs.Tab>
-      </Tabs.List>
-
-      <Tabs.Panel value="server-functions">
-        <ActivitiesTable />
-      </Tabs.Panel>
-
-      <Tabs.Panel value="player-activity">
-        <PlayersActivityTable />
-      </Tabs.Panel>
-    </Tabs>
-  );
-}

src/app/routes/_authed/admin/badges.tsx

@@ -1,10 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-import AwardBadges from "@/features/admin/components/award-badges";
-
-export const Route = createFileRoute("/_authed/admin/badges")({
-  component: RouteComponent,
-});
-
-function RouteComponent() {
-  return <AwardBadges />;
-}

src/app/routes/_authed/admin/tournaments/run.$id.tsx

@@ -11,7 +11,6 @@ import { BracketData } from "@/features/bracket/types";
 import { Match } from "@/features/matches/types";
 import BracketView from "@/features/bracket/components/bracket-view";
 import { SpotifyControlsBar } from "@/features/spotify/components";
-import { useAuth } from "@/contexts/auth-context";
 
 export const Route = createFileRoute("/_authed/admin/tournaments/run/$id")({
   beforeLoad: async ({ context, params }) => {
@@ -40,8 +39,6 @@ export const Route = createFileRoute("/_authed/admin/tournaments/run/$id")({
 function RouteComponent() {
   const { id } = Route.useParams();
   const { data: tournament } = useTournament(id);
-  const { roles } = useAuth();
-  const isAdmin = roles?.includes('Admin') || false;
 
   const bracket: BracketData = useMemo(() => {
     if (!tournament.matches || tournament.matches.length === 0) {
@@ -79,7 +76,7 @@ function RouteComponent() {
 
   return (
     <Container size="md" px={0}>
-      { isAdmin && <SpotifyControlsBar />}
+      <SpotifyControlsBar />
       {tournament.matches?.length ? (
         <BracketView bracket={bracket} showControls />
       ) : (

src/app/routes/_authed/badges.tsx

@@ -1,34 +0,0 @@
-import BadgeStatsTable from '@/features/badges/components/badge-stats-table';
-import BadgeStatsTableSkeleton from '@/features/badges/components/badge-stats-table-skeleton';
-import { badgeQueries, useAllBadges } from '@/features/badges/queries';
-import PlayerStatsTableSkeleton from '@/features/players/components/player-stats-table-skeleton';
-import { prefetchServerQuery } from '@/lib/tanstack-query/utils/prefetch';
-import { createFileRoute } from '@tanstack/react-router';
-import { Suspense } from 'react';
-
-export const Route = createFileRoute('/_authed/badges')({
-  component: Badges,
-  beforeLoad: ({ context }) => {
-    const queryClient = context.queryClient;
-    prefetchServerQuery(queryClient, badgeQueries.allBadges());
-  },
-  loader: () => ({
-    withPadding: false,
-    fullWidth: true,
-    header: {
-      title: 'All Badges',
-      withBackButton: true,
-    },
-    refresh: [badgeQueries.allBadges().queryKey],
-  }),
-});
-
-function Badges() {
-  return (
-    <Suspense fallback={<BadgeStatsTableSkeleton />}>
-      <div>
-        <BadgeStatsTable />
-      </div>
-    </Suspense>
-  );
-}

src/app/routes/_authed/profile.$playerId.tsx

@@ -1,4 +1,3 @@
-import { badgeKeys, badgeQueries } from "@/features/badges/queries";
 import Profile from "@/features/players/components/profile";
 import HeaderSkeleton from "@/features/players/components/profile/header-skeleton";
 import ProfileSkeleton from "@/features/players/components/profile/skeleton";
@@ -25,14 +24,6 @@ export const Route = createFileRoute("/_authed/profile/$playerId")({
         queryClient,
         playerQueries.matches(params.playerId)
       ),
-      prefetchServerQuery(
-        queryClient,
-        playerQueries.stats(params.playerId)
-      ),
-      prefetchServerQuery(
-        queryClient,
-        badgeQueries.playerBadges(params.playerId)
-      ),
     ]);
   },
   loader: ({ params, context }) => ({
@@ -43,7 +34,7 @@ export const Route = createFileRoute("/_authed/profile/$playerId")({
         context?.auth.user.id === params.playerId ? "/settings" : undefined,
     },
     withPadding: false,
-    refresh: [playerKeys.details(params.playerId), playerKeys.matches(params.playerId), playerKeys.stats(params.playerId), badgeKeys.playerBadges(params.playerId)],
+    refresh: [playerKeys.details(params.playerId), playerKeys.matches(params.playerId), playerKeys.stats(params.playerId)],
   }),
   component: () => {
     const { playerId } = Route.useParams();

src/app/routes/_authed/stats.tsx

@@ -1,19 +1,15 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { playerQueries } from "@/features/players/queries";
 import PlayerStatsTable from "@/features/players/components/player-stats-table";
-import { Suspense, useState, useDeferredValue } from "react";
+import { Suspense } from "react";
 import PlayerStatsTableSkeleton from "@/features/players/components/player-stats-table-skeleton";
 import { prefetchServerQuery } from "@/lib/tanstack-query/utils/prefetch";
-import LeagueHeadToHead from "@/features/players/components/league-head-to-head";
-import { Box, Loader, Tabs, Button, Group, Container, Stack } from "@mantine/core";
 
 export const Route = createFileRoute("/_authed/stats")({
   component: Stats,
   beforeLoad: ({ context }) => {
     const queryClient = context.queryClient;
-    prefetchServerQuery(queryClient, playerQueries.allStats('all'));
+    prefetchServerQuery(queryClient, playerQueries.allStats());
-    prefetchServerQuery(queryClient, playerQueries.allStats('mainline'));
-    prefetchServerQuery(queryClient, playerQueries.allStats('regional'));
   },
   loader: () => ({
     withPadding: false,
@@ -21,62 +17,12 @@ export const Route = createFileRoute("/_authed/stats")({
     header: {
       title: "Player Stats"
     },
-    refresh: [playerQueries.allStats().queryKey],
+        refresh: [playerQueries.allStats().queryKey],
   }),
 });
 
 function Stats() {
-  const [viewType, setViewType] = useState<'all' | 'mainline' | 'regional'>('all');
+  return <Suspense fallback={<PlayerStatsTableSkeleton />}>
-  const deferredViewType = useDeferredValue(viewType);
+    <PlayerStatsTable />
-  const isStale = viewType !== deferredViewType;
+  </Suspense>;
-
-  return (
-    <Tabs defaultValue="stats">
-      <Tabs.List grow>
-        <Tabs.Tab value="stats">Stats</Tabs.Tab>
-        <Tabs.Tab value="h2h">Head to Head</Tabs.Tab>
-      </Tabs.List>
-
-      <Tabs.Panel value="stats">
-        <Container size="100%" px={0} mt="md">
-          <Stack gap="xs">
-            <Group gap="xs" px="md" justify="center">
-              <Button
-                variant={viewType === 'all' ? 'filled' : 'light'}
-                size="compact-xs"
-                onClick={() => setViewType('all')}
-              >
-                All
-              </Button>
-              <Button
-                variant={viewType === 'mainline' ? 'filled' : 'light'}
-                size="compact-xs"
-                onClick={() => setViewType('mainline')}
-              >
-                Mainline
-              </Button>
-              <Button
-                variant={viewType === 'regional' ? 'filled' : 'light'}
-                size="compact-xs"
-                onClick={() => setViewType('regional')}
-              >
-                Regional
-              </Button>
-            </Group>
-            <Box style={{ opacity: isStale ? 0.6 : 1, transition: 'opacity 150ms' }}>
-              <Suspense key={deferredViewType} fallback={<PlayerStatsTableSkeleton hideFilters />}>
-                <PlayerStatsTable viewType={deferredViewType} />
-              </Suspense>
-            </Box>
-          </Stack>
-        </Container>
-      </Tabs.Panel>
-
-      <Tabs.Panel value="h2h">
-        <Suspense fallback={<Box w='100vw' py='xl'><Loader ml='45vw' /></Box>}>
-          <LeagueHeadToHead />
-        </Suspense>
-      </Tabs.Panel>
-    </Tabs>
-  );
 }

src/app/routes/_authed/tournaments/$id.bracket.tsx

@@ -10,6 +10,7 @@ import { useMemo } from "react";
 import { BracketData } from "@/features/bracket/types";
 import { Match } from "@/features/matches/types";
 import BracketView from "@/features/bracket/components/bracket-view";
+import { SpotifyControlsBar } from "@/features/spotify/components";
 
 export const Route = createFileRoute("/_authed/tournaments/$id/bracket")({
   beforeLoad: async ({ context, params }) => {

src/app/routes/api/auth.$.ts

@@ -1,5 +1,5 @@
 // API file that handles all supertokens auth routes
-import { createFileRoute } from '@tanstack/react-router';
+import { createServerFileRoute } from '@tanstack/react-start/server';
 import { handleAuthAPIRequest } from 'supertokens-node/custom'
 import { ensureSuperTokensBackend } from '@/lib/supertokens/server'
 
@@ -12,16 +12,12 @@ const handleRequest = async ({ request }: {request: Request}) => {
   console.log("Handling auth request:", request.method, request.url);
   return superTokensHandler(request);
 };
-export const Route = createFileRoute('/api/auth/$')({
+export const ServerRoute = createServerFileRoute('/api/auth/$').methods({
-  server: {
+  GET: handleRequest,
-    handlers: {
+  POST: handleRequest,
-      GET: handleRequest,
+  PUT: handleRequest,
-      POST: handleRequest,
+  DELETE: handleRequest,
-      PUT: handleRequest,
+  PATCH: handleRequest,
-      DELETE: handleRequest,
+  OPTIONS: handleRequest,
-      PATCH: handleRequest,
+  HEAD: handleRequest,
-      OPTIONS: handleRequest,
-      HEAD: handleRequest,
-    }
-  }
 })

src/app/routes/api/events.$.ts

@@ -1,92 +1,66 @@
-import { createFileRoute } from "@tanstack/react-router";
+import { createServerFileRoute } from "@tanstack/react-start/server";
 import { serverEvents, type ServerEvent } from "@/lib/events/emitter";
 import { logger } from "@/lib/logger";
 import { superTokensRequestMiddleware } from "@/utils/supertokens";
 
-let activeConnections = 0;
+export const ServerRoute = createServerFileRoute("/api/events/$").middleware([superTokensRequestMiddleware]).methods({
+  GET: ({ request, context }) => {
+    logger.info('ServerEvents | New connection', context?.userAuthId);
+    
+    const stream = new ReadableStream({
+      start(controller) {
+        const connectMessage = `data: ${JSON.stringify({ type: "connected" })}\n\n`;
+        controller.enqueue(new TextEncoder().encode(connectMessage));
 
-export const Route = createFileRoute("/api/events/$")({
+        const handleEvent = (event: ServerEvent) => {
-  server: {
+          logger.info('ServerEvents | Event received', event);
-    middleware: [superTokensRequestMiddleware],
+          const message = `data: ${JSON.stringify(event)}\n\n`;
-    handlers: {
+          try {
-      GET: ({ request }) => {
+            controller.enqueue(new TextEncoder().encode(message));
-        activeConnections++;
+          } catch (error) {
-        const connectionId = `conn_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+            logger.error("ServerEvents | Error sending SSE message", error);
-        logger.info(`ServerEvents | New connection ${connectionId}. Active: ${activeConnections}`);
+          }
-        const stream = new ReadableStream({
+        };
-          start(controller) {
-            const connectMessage = `data: ${JSON.stringify({ type: "connected" })}\n\n`;
-            controller.enqueue(new TextEncoder().encode(connectMessage));
 
-            const handleEvent = (event: ServerEvent) => {
+        serverEvents.on("test", handleEvent);
-              logger.info("ServerEvents | Event received", event);
+        serverEvents.on("match", handleEvent);
-              const message = `data: ${JSON.stringify(event)}\n\n`;
+        serverEvents.on("reaction", handleEvent);
-              try {
-                if (!controller.desiredSize || controller.desiredSize <= 0) {
-                  logger.warn("ServerEvents | Stream closed, skipping event");
-                  return;
-                }
-                controller.enqueue(new TextEncoder().encode(message));
-              } catch (error) {
-                logger.error("ServerEvents | Error sending SSE message", error);
-              }
-            };
 
-            serverEvents.on("test", handleEvent);
+        const pingInterval = setInterval(() => {
-            serverEvents.on("match", handleEvent);
+          try {
-            serverEvents.on("reaction", handleEvent);
+            const pingMessage = `data: ${JSON.stringify({ type: "ping" })}\n\n`;
+            controller.enqueue(new TextEncoder().encode(pingMessage));
+          } catch (e) {
+            clearInterval(pingInterval);
+            controller.close();
+          }
+        }, 30000);
 
-            const pingInterval = setInterval(() => {
+        const cleanup = () => {
-              try {
+          serverEvents.off("test", handleEvent);
-                if (!controller.desiredSize || controller.desiredSize <= 0) {
+          clearInterval(pingInterval);
-                  clearInterval(pingInterval);
+          try {
-                  return;
+            logger.info('ServerEvents | Closing connection', context?.userAuthId);
-                }
+            controller.close();
-                const pingMessage = `data: ${JSON.stringify({ type: "ping", timestamp: Date.now() })}\n\n`;
+          } catch (e) {
-                controller.enqueue(new TextEncoder().encode(pingMessage));
+            logger.error('ServerEvents | Error closing controller', e);
-              } catch (e) {
+          }
-                logger.error("ServerEvents | Ping interval error", e);
+        };
-                clearInterval(pingInterval);
-              }
-            }, 15000);
 
-            setTimeout(() => {
+        request.signal?.addEventListener("abort", cleanup);
-              try {
-                const heartbeatMessage = `data: ${JSON.stringify({ type: "heartbeat", timestamp: Date.now() })}\n\n`;
-                controller.enqueue(new TextEncoder().encode(heartbeatMessage));
-              } catch (e) {
-                logger.error("ServerEvents | Heartbeat error", e);
-              }
-            }, 1000);
 
-            const cleanup = () => {
+        return cleanup;
-              activeConnections--;
-              serverEvents.off("test", handleEvent);
-              serverEvents.off("match", handleEvent);
-              serverEvents.off("reaction", handleEvent);
-              clearInterval(pingInterval);
-              logger.info(`ServerEvents | Connection ${connectionId} cleanup completed. Active: ${activeConnections}`);
-            };
-
-            request.signal?.addEventListener("abort", cleanup);
-            return cleanup;
-          },
-        });
-
-        return new Response(stream, {
-          headers: {
-            "Content-Type": "text/event-stream",
-            "Cache-Control": "no-cache, no-store, must-revalidate",
-            "Connection": "keep-alive",
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Headers": "Cache-Control",
-            "X-Accel-Buffering": "no",
-            "X-Proxy-Buffering": "no",
-            "Proxy-Buffering": "off",
-            "Transfer-Encoding": "chunked",
-          },
-        });
       },
-    },
+    });
+
+    return new Response(stream, {
+      headers: {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        Connection: "keep-alive",
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Headers": "Cache-Control",
+      },
+    });
   },
-});
+});

src/app/routes/api/files/$collection/$recordId/$file.ts

@@ -1,100 +1,95 @@
-import { createFileRoute } from "@tanstack/react-router";
+import { createServerFileRoute } from "@tanstack/react-start/server";
 import { logger } from "@/lib/logger";
 
-export const Route = createFileRoute(
+export const ServerRoute = createServerFileRoute("/api/files/$collection/$recordId/$file").methods({
-  "/api/files/$collection/$recordId/$file"
+  GET: async ({ params, request }) => {
-)({
+    try {
-  server: {
+      const { collection, recordId, file } = params;
-    handlers: {
+      const pocketbaseUrl = process.env.POCKETBASE_URL || 'http://127.0.0.1:8090';
-      GET: async ({ params, request }) => {
+      const fileUrl = `${pocketbaseUrl}/api/files/${collection}/${recordId}/${file}`;
-        try {
+      
-          const { collection, recordId, file } = params;
+      logger.info('File proxy', { 
-          const pocketbaseUrl =
+        collection, 
-            process.env.POCKETBASE_URL || "http://127.0.0.1:8090";
+        recordId, 
-          const fileUrl = `${pocketbaseUrl}/api/files/${collection}/${recordId}/${file}`;
+        file, 
+        targetUrl: fileUrl 
+      });
 
-          const response = await fetch(fileUrl, {
+      const response = await fetch(fileUrl, {
-            method: "GET",
+        method: 'GET',
-            headers: {
+        headers: {
-              ...(request.headers.get("range") && {
+          ...(request.headers.get('range') && { 'Range': request.headers.get('range')! }),
-                Range: request.headers.get("range")!,
+          ...(request.headers.get('if-none-match') && { 'If-None-Match': request.headers.get('if-none-match')! }),
-              }),
+          ...(request.headers.get('if-modified-since') && { 'If-Modified-Since': request.headers.get('if-modified-since')! }),
-              ...(request.headers.get("if-none-match") && {
+        },
-                "If-None-Match": request.headers.get("if-none-match")!,
+      });
-              }),
-              ...(request.headers.get("if-modified-since") && {
-                "If-Modified-Since": request.headers.get("if-modified-since")!,
-              }),
-            },
-          });
 
-          if (!response.ok) {
+      if (!response.ok) {
-            logger.error("PocketBase file request failed", {
+        logger.error('PocketBase file request failed', {
-              status: response.status,
+          status: response.status,
-              statusText: response.statusText,
+          statusText: response.statusText,
-              url: fileUrl,
+          url: fileUrl
-            });
-
-            if (response.status === 404) {
-              return new Response("File not found", { status: 404 });
-            }
-
-            return new Response(`PocketBase error: ${response.statusText}`, {
-              status: response.status,
-            });
-          }
-
-          const body = response.body;
-          const responseHeaders = new Headers();
-          const headers = [
-            "content-type",
-            "content-length",
-            "content-disposition",
-            "etag",
-            "last-modified",
-            "cache-control",
-            "accept-ranges",
-            "content-range",
-          ];
-
-          headers.forEach((header) => {
-            const value = response.headers.get(header);
-            if (value) {
-              responseHeaders.set(header, value);
-            }
-          });
-
-          responseHeaders.set("Access-Control-Allow-Origin", "*");
-          responseHeaders.set(
-            "Access-Control-Allow-Methods",
-            "GET, HEAD, OPTIONS"
-          );
-          responseHeaders.set(
-            "Access-Control-Allow-Headers",
-            "Range, If-None-Match, If-Modified-Since"
-          );
-
-          return new Response(body, {
-            status: response.status,
-            statusText: response.statusText,
-            headers: responseHeaders,
-          });
-        } catch (error) {
-          logger.error("File proxy error", error);
-          return new Response("Internal server error", { status: 500 });
-        }
-      },
-
-      OPTIONS: () => {
-        return new Response(null, {
-          status: 200,
-          headers: {
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Methods": "GET, OPTIONS",
-            "Access-Control-Max-Age": "86400",
-          },
         });
-      },
+
-    },
+        if (response.status === 404) {
+          return new Response('File not found', { status: 404 });
+        }
+
+        return new Response(`PocketBase error: ${response.statusText}`, { 
+          status: response.status 
+        });
+      }
+
+      const body = response.body;
+      const responseHeaders = new Headers();
+      const headers = [
+        'content-type',
+        'content-length',
+        'content-disposition',
+        'etag',
+        'last-modified',
+        'cache-control',
+        'accept-ranges',
+        'content-range'
+      ];
+
+      headers.forEach(header => {
+        const value = response.headers.get(header);
+        if (value) {
+          responseHeaders.set(header, value);
+        }
+      });
+
+      responseHeaders.set('Access-Control-Allow-Origin', '*');
+      responseHeaders.set('Access-Control-Allow-Methods', 'GET, HEAD, OPTIONS');
+      responseHeaders.set('Access-Control-Allow-Headers', 'Range, If-None-Match, If-Modified-Since');
+
+      logger.info('File proxy response', {
+        status: response.status,
+        contentType: response.headers.get('content-type'),
+        contentLength: response.headers.get('content-length')
+      });
+
+      return new Response(body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: responseHeaders
+      });
+
+    } catch (error) {
+      logger.error('File proxy error', error);
+      return new Response('Internal server error', { status: 500 });
+    }
   },
-});
+
+  OPTIONS: () => {
+    return new Response(null, {
+      status: 200,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'GET, OPTIONS',
+        'Access-Control-Max-Age': '86400',
+      }
+    });
+  }
+});

src/app/routes/api/health.ts

@@ -1,22 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-
-export const Route = createFileRoute("/api/health")({
-  server: {
-    handlers: {
-      GET: () => {
-        return new Response(
-          JSON.stringify({
-            status: "ok",
-            timestamp: new Date().toISOString(),
-          }),
-          {
-            status: 200,
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
-      },
-    },
-  },
-});