Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f0a6d62246 | |||
| 20565df5a1 | |||
| 28fecdfaad | |||
| 79dd9be11e | |||
| 08152fba51 | |||
| 9bfb890143 | |||
| 4fe47377d1 | |||
| c32239d557 | |||
| e3895d30b4 |
+1
-1
@@ -11,7 +11,7 @@ DATABASE_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp
|
|||||||
# Shadow database for Prisma migrations (optional for PostgreSQL)
|
# Shadow database for Prisma migrations (optional for PostgreSQL)
|
||||||
DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp_shadow
|
DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp_shadow
|
||||||
|
|
||||||
# Database provider (postgresql, mysql, sqlite, etc.)
|
# Database provider (postgresql)
|
||||||
DATABASE_PROVIDER=postgresql
|
DATABASE_PROVIDER=postgresql
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
|
|||||||
@@ -53,10 +53,6 @@ next-env.d.ts
|
|||||||
/src/generated/prisma
|
/src/generated/prisma
|
||||||
|
|
||||||
# database
|
# database
|
||||||
*.db
|
|
||||||
*.db-journal
|
|
||||||
prisma/dev.db*
|
|
||||||
prisma/prisma/dev.db*
|
|
||||||
playwright-report/
|
playwright-report/
|
||||||
.env.development
|
.env.development
|
||||||
.env.dev
|
.env.dev
|
||||||
|
|||||||
@@ -1,3 +1,24 @@
|
|||||||
|
## [0.1.17] - 2026-05-02
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||||
|
- refactor: remove all SQLite code, standardize on PostgreSQL
|
||||||
|
|
||||||
|
## [0.1.16] - 2026-05-02
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||||
|
- feat: add bracket visualization for tournament schedule (#8)
|
||||||
|
|
||||||
|
## [0.1.15] - 2026-05-02
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||||
|
- feat: add view-as-role feature for site admins (#15)
|
||||||
|
|
||||||
## [0.1.14] - 2026-05-02
|
## [0.1.14] - 2026-05-02
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
+1
-2
@@ -22,8 +22,7 @@ RUN echo "=== Bun Version ===" && bun --version && \
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Set default environment variables
|
# Set default environment variables
|
||||||
ENV DATABASE_PROVIDER=sqlite
|
ENV DATABASE_PROVIDER=postgresql
|
||||||
ENV DATABASE_URL=file:./prisma/ci.db
|
|
||||||
ENV BETTER_AUTH_SECRET=test-secret-key-for-ci-only
|
ENV BETTER_AUTH_SECRET=test-secret-key-for-ci-only
|
||||||
ENV NODE_ENV=test
|
ENV NODE_ENV=test
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
Feature: Bracket Visualization
|
||||||
|
As a tournament admin
|
||||||
|
I want to see a visual bracket of the tournament schedule
|
||||||
|
So that I can track tournament progress at a glance
|
||||||
|
|
||||||
|
@happy-path @tournament @issue-8
|
||||||
|
Scenario: Tournament admin views bracket with a generated schedule
|
||||||
|
Given I am logged in as a tournament admin
|
||||||
|
And a tournament exists with 4 teams
|
||||||
|
When I go to the tournament schedule page
|
||||||
|
And I click the "Generate Schedule" button
|
||||||
|
Then I should see "Generated"
|
||||||
|
When I go to the tournament detail page
|
||||||
|
And I click the "Bracket" tab
|
||||||
|
Then I should see "Tournament Bracket"
|
||||||
|
And I should see "Round 1"
|
||||||
|
And I should see "Round 2"
|
||||||
|
And I should see "Round 3"
|
||||||
|
And I should see bracket matchup cards
|
||||||
|
|
||||||
|
@happy-path @tournament @issue-8
|
||||||
|
Scenario: Bracket shows team names in matchup cards
|
||||||
|
Given I am logged in as a tournament admin
|
||||||
|
And a tournament exists with 4 teams
|
||||||
|
When I go to the tournament schedule page
|
||||||
|
And I click the "Generate Schedule" button
|
||||||
|
Then I should see "Generated"
|
||||||
|
When I go to the tournament detail page
|
||||||
|
And I click the "Bracket" tab
|
||||||
|
Then I should see bracket matchup cards with team names
|
||||||
|
|
||||||
|
@happy-path @tournament @issue-8
|
||||||
|
Scenario: Bracket tab is not visible without a schedule
|
||||||
|
Given I am logged in as a tournament admin
|
||||||
|
And a tournament exists with 4 teams
|
||||||
|
When I go to the tournament detail page
|
||||||
|
Then I should not see the "Bracket" tab
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
Feature: View As Role
|
||||||
|
As a site admin
|
||||||
|
I want to temporarily view the site as a player or club admin
|
||||||
|
So that I can understand and improve the experience for each role
|
||||||
|
|
||||||
|
@happy-path @admin-features @issue-15
|
||||||
|
Scenario: Site admin sees role switcher in navigation
|
||||||
|
Given I am logged in as a site admin
|
||||||
|
When I view the navigation
|
||||||
|
Then I should see the role switcher dropdown
|
||||||
|
Then the role switcher should default to "Viewing as Site Admin"
|
||||||
|
|
||||||
|
@happy-path @admin-features @issue-15
|
||||||
|
Scenario: Site admin switches to player view
|
||||||
|
Given I am logged in as a site admin
|
||||||
|
When I select "View as Player" from the role switcher
|
||||||
|
Then I should see the player navigation links
|
||||||
|
And I should not see the "Admin" link
|
||||||
|
And I should not see the "Users" link
|
||||||
|
And I should see a banner indicating I am viewing as "Player"
|
||||||
|
|
||||||
|
@happy-path @admin-features @issue-15
|
||||||
|
Scenario: Site admin switches to tournament admin view
|
||||||
|
Given I am logged in as a site admin
|
||||||
|
When I select "View as Tournament Admin" from the role switcher
|
||||||
|
Then I should see the "Tournaments" link
|
||||||
|
And I should not see the "Admin" link
|
||||||
|
And I should not see the "Users" link
|
||||||
|
And I should see a banner indicating I am viewing as "Tournament Admin"
|
||||||
|
|
||||||
|
@happy-path @admin-features @issue-15
|
||||||
|
Scenario: Site admin switches to club admin view
|
||||||
|
Given I am logged in as a site admin
|
||||||
|
When I select "View as Club Admin" from the role switcher
|
||||||
|
Then I should see the "Admin" link
|
||||||
|
And I should see the "Users" link
|
||||||
|
And I should see a banner indicating I am viewing as "Club Admin"
|
||||||
|
|
||||||
|
@happy-path @admin-features @issue-15
|
||||||
|
Scenario: Site admin resets to site admin view
|
||||||
|
Given I am logged in as a site admin
|
||||||
|
When I select "View as Player" from the role switcher
|
||||||
|
And I click the "Reset to Site Admin" button
|
||||||
|
Then the role switcher should default to "Viewing as Site Admin"
|
||||||
|
And I should see the "Admin" link
|
||||||
|
And I should not see the viewing as banner
|
||||||
@@ -124,17 +124,99 @@ Given('I am logged in as a tournament admin', async function () {
|
|||||||
await world.page.fill('input[name="password"]', credentials.password);
|
await world.page.fill('input[name="password"]', credentials.password);
|
||||||
|
|
||||||
await world.page.click('button[type="submit"]');
|
await world.page.click('button[type="submit"]');
|
||||||
// Wait for redirect
|
|
||||||
|
// Wait for any redirect away from register page
|
||||||
|
await world.page.waitForURL((url) => !url.toString().includes('/auth/register'), { timeout: 15000 });
|
||||||
|
await world.page.waitForLoadState('networkidle');
|
||||||
|
await world.page.waitForTimeout(1000);
|
||||||
|
|
||||||
|
const currentUrl = world.page.url();
|
||||||
|
console.log(`🌍 After registration, URL: ${currentUrl}`);
|
||||||
|
|
||||||
|
// Try to extract player ID from URL
|
||||||
|
const match = currentUrl.match(/\/players\/(\d+)\/profile/);
|
||||||
|
if (match) {
|
||||||
|
world.playerId = match[1];
|
||||||
|
console.log(`🌍 Player ID from URL: ${world.playerId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the user ID from the database (works regardless of redirect destination)
|
||||||
|
const prisma = await world.getPrisma();
|
||||||
|
console.log(`🌍 Looking up user by email: ${credentials.email}`);
|
||||||
|
const user = await prisma.user.findUnique({
|
||||||
|
where: { email: credentials.email },
|
||||||
|
include: { player: true }
|
||||||
|
});
|
||||||
|
|
||||||
|
if (user) {
|
||||||
|
(world.user as any).id = user.id;
|
||||||
|
console.log(`🌍 User ID from DB: ${user.id}, role: ${user.role}, playerId: ${user.playerId}`);
|
||||||
|
|
||||||
|
if (user.player) {
|
||||||
|
world.playerId = user.player.id.toString();
|
||||||
|
console.log(`🌍 Player ID from DB: ${world.playerId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Assign tournament_admin role
|
||||||
|
await prisma.user.update({
|
||||||
|
where: { id: user.id },
|
||||||
|
data: { role: 'tournament_admin' }
|
||||||
|
});
|
||||||
|
console.log(`🌍 Assigned tournament_admin role to user: ${user.id}`);
|
||||||
|
|
||||||
|
// Navigate to trigger a fresh role fetch
|
||||||
|
await world.page.goto(`${world.baseURL}/rankings`);
|
||||||
|
await world.page.waitForLoadState('networkidle');
|
||||||
|
await world.page.waitForTimeout(500);
|
||||||
|
} else {
|
||||||
|
console.log(`🌍 WARNING: User not found in DB by email. Trying to find latest user...`);
|
||||||
|
// Fallback: find the latest user (most recently created)
|
||||||
|
const latestUser = await prisma.user.findFirst({
|
||||||
|
orderBy: { createdAt: 'desc' },
|
||||||
|
include: { player: true }
|
||||||
|
});
|
||||||
|
if (latestUser) {
|
||||||
|
(world.user as any).id = latestUser.id;
|
||||||
|
world.playerId = latestUser.playerId?.toString() || latestUser.player?.id?.toString();
|
||||||
|
console.log(`🌍 Using latest user: ${latestUser.id} (${latestUser.email})`);
|
||||||
|
|
||||||
|
await prisma.user.update({
|
||||||
|
where: { id: latestUser.id },
|
||||||
|
data: { role: 'tournament_admin' }
|
||||||
|
});
|
||||||
|
console.log(`🌍 Assigned tournament_admin role`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`🌍 User created: ${credentials.email}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Precondition: I am logged in as a site admin
|
||||||
|
* Creates a new user and assigns site_admin role via Prisma
|
||||||
|
*/
|
||||||
|
Given('I am logged in as a site admin', async function () {
|
||||||
|
console.log('🌍 Creating and logging in as a site admin...');
|
||||||
|
|
||||||
|
const credentials = generateTestCredentials();
|
||||||
|
world.user = credentials;
|
||||||
|
|
||||||
|
await world.page.goto(`${world.baseURL}/auth/register`);
|
||||||
|
await world.page.waitForLoadState('domcontentloaded');
|
||||||
|
|
||||||
|
await world.page.fill('input[name="name"]', credentials.name);
|
||||||
|
await world.page.fill('input[name="email"]', credentials.email);
|
||||||
|
await world.page.fill('input[name="password"]', credentials.password);
|
||||||
|
|
||||||
|
await world.page.click('button[type="submit"]');
|
||||||
await world.page.waitForURL(/\/players\/\d+\/profile/, { timeout: 15000 });
|
await world.page.waitForURL(/\/players\/\d+\/profile/, { timeout: 15000 });
|
||||||
|
|
||||||
// Extract user ID from the URL (e.g., /players/2147/profile)
|
|
||||||
const currentUrl = world.page.url();
|
const currentUrl = world.page.url();
|
||||||
const match = currentUrl.match(/\/players\/(\d+)\/profile/);
|
const match = currentUrl.match(/\/players\/(\d+)\/profile/);
|
||||||
if (match) {
|
if (match) {
|
||||||
const playerId = match[1];
|
const playerId = match[1];
|
||||||
world.playerId = playerId;
|
world.playerId = playerId;
|
||||||
|
|
||||||
// Get the user ID from the database
|
|
||||||
const prisma = await world.getPrisma();
|
const prisma = await world.getPrisma();
|
||||||
const player = await prisma.player.findUnique({
|
const player = await prisma.player.findUnique({
|
||||||
where: { id: parseInt(playerId) },
|
where: { id: parseInt(playerId) },
|
||||||
@@ -144,18 +226,21 @@ Given('I am logged in as a tournament admin', async function () {
|
|||||||
if (player && player.user) {
|
if (player && player.user) {
|
||||||
const userId = player.user.id;
|
const userId = player.user.id;
|
||||||
(world.user as any).id = userId;
|
(world.user as any).id = userId;
|
||||||
console.log(`🌍 User ID extracted: ${userId}`);
|
|
||||||
|
|
||||||
// Assign tournament_admin role to the user
|
|
||||||
await prisma.user.update({
|
await prisma.user.update({
|
||||||
where: { id: userId },
|
where: { id: userId },
|
||||||
data: { role: 'tournament_admin' }
|
data: { role: 'site_admin' }
|
||||||
});
|
});
|
||||||
console.log(`🌍 Assigned tournament_admin role to user: ${userId}`);
|
console.log(`🌍 Assigned site_admin role to user: ${userId}`);
|
||||||
|
|
||||||
|
// Navigate to home page to trigger Navigation re-mount with new role
|
||||||
|
await world.page.goto(`${world.baseURL}/`);
|
||||||
|
await world.page.waitForLoadState('networkidle');
|
||||||
|
await world.page.waitForTimeout(1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`🌍 User created: ${credentials.email}`);
|
console.log(`🌍 Site admin created: ${credentials.email}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -690,3 +690,102 @@ Then('I should be on the match result entry page', async function () {
|
|||||||
console.log(`🌍 Checking current URL: ${currentUrl}`);
|
console.log(`🌍 Checking current URL: ${currentUrl}`);
|
||||||
expect(currentUrl).toMatch(/\/matches\/|\/admin\/tournaments\/\d+\/(entry|results)/);
|
expect(currentUrl).toMatch(/\/matches\/|\/admin\/tournaments\/\d+\/(entry|results)/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// View As Role Steps
|
||||||
|
When('I view the navigation', async function () {
|
||||||
|
await world.page.waitForLoadState('networkidle');
|
||||||
|
await world.page.waitForTimeout(1000);
|
||||||
|
console.log('🌍 Viewing navigation');
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should see the role switcher dropdown', async function () {
|
||||||
|
const switcher = world.page.locator('[data-testid="role-switcher"]');
|
||||||
|
await expect(switcher).toBeVisible({ timeout: 5000 });
|
||||||
|
console.log('🌍 Verified role switcher dropdown is visible');
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('the role switcher should default to {string}', async function (expectedText: string) {
|
||||||
|
const switcher = world.page.locator('[data-testid="role-switcher"]');
|
||||||
|
const selectedValue = await switcher.inputValue();
|
||||||
|
const selectedText = await switcher.locator('option:checked').textContent();
|
||||||
|
console.log(`🌍 Dropdown selected text: "${selectedText}", value: "${selectedValue}"`);
|
||||||
|
expect(selectedText?.trim()).toBe(expectedText);
|
||||||
|
});
|
||||||
|
|
||||||
|
When('I select {string} from the role switcher', async function (optionText: string) {
|
||||||
|
const switcher = world.page.locator('[data-testid="role-switcher"]');
|
||||||
|
await switcher.selectOption({ label: optionText });
|
||||||
|
await world.page.waitForTimeout(500);
|
||||||
|
console.log(`🌍 Selected "${optionText}" from role switcher`);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should see the player navigation links', async function () {
|
||||||
|
await expect(world.page.locator('nav a:has-text("Rankings")')).toBeVisible();
|
||||||
|
await expect(world.page.locator('nav a:has-text("Tournaments")')).toBeVisible();
|
||||||
|
console.log('🌍 Verified player navigation links are visible');
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should not see the {string} link', async function (linkText: string) {
|
||||||
|
const link = world.page.locator(`nav a:has-text("${linkText}")`);
|
||||||
|
await expect(link).not.toBeVisible({ timeout: 3000 });
|
||||||
|
console.log(`🌍 Verified "${linkText}" nav link is not visible`);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should see the {string} link', async function (linkText: string) {
|
||||||
|
const link = world.page.locator(`nav a:has-text("${linkText}")`);
|
||||||
|
await expect(link).toBeVisible({ timeout: 5000 });
|
||||||
|
console.log(`🌍 Verified "${linkText}" nav link is visible`);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should see a banner indicating I am viewing as {string}', async function (roleName: string) {
|
||||||
|
const banner = world.page.locator(`text=Viewing as ${roleName}`);
|
||||||
|
await expect(banner).toBeVisible({ timeout: 5000 });
|
||||||
|
console.log(`🌍 Verified viewing as ${roleName} banner is visible`);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should not see the viewing as banner', async function () {
|
||||||
|
const banner = world.page.locator('[data-testid="reset-view-as"]');
|
||||||
|
await expect(banner).not.toBeVisible({ timeout: 3000 });
|
||||||
|
console.log('🌍 Verified viewing as banner is not visible');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Bracket Visualization Steps
|
||||||
|
When('I go to the tournament detail page', async function () {
|
||||||
|
const tournamentId = world.tournament?.id || 1;
|
||||||
|
await world.page.goto(`${world.baseURL}/admin/tournaments/${tournamentId}`);
|
||||||
|
await world.page.waitForLoadState('networkidle');
|
||||||
|
await world.page.waitForTimeout(500);
|
||||||
|
console.log(`🌍 Navigated to tournament detail page: ${tournamentId}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
When('I click the {string} tab', async function (tabName: string) {
|
||||||
|
const tab = world.page.locator(`button:has-text("${tabName}")`);
|
||||||
|
await tab.click();
|
||||||
|
await world.page.waitForTimeout(500);
|
||||||
|
console.log(`🌍 Clicked "${tabName}" tab`);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should see bracket matchup cards', async function () {
|
||||||
|
const cards = world.page.locator('[data-testid="bracket-matchup"]');
|
||||||
|
const count = await cards.count();
|
||||||
|
expect(count).toBeGreaterThan(0);
|
||||||
|
console.log(`🌍 Found ${count} bracket matchup cards`);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should see bracket matchup cards with team names', async function () {
|
||||||
|
const cards = world.page.locator('[data-testid="bracket-matchup"]');
|
||||||
|
const count = await cards.count();
|
||||||
|
expect(count).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
const firstCard = cards.first();
|
||||||
|
const text = await firstCard.textContent();
|
||||||
|
expect(text).toBeTruthy();
|
||||||
|
expect(text!.length).toBeGreaterThan(2);
|
||||||
|
console.log(`🌍 Verified bracket matchup cards have team names`);
|
||||||
|
});
|
||||||
|
|
||||||
|
Then('I should not see the {string} tab', async function (tabName: string) {
|
||||||
|
const tab = world.page.locator(`button:has-text("${tabName}")`);
|
||||||
|
await expect(tab).not.toBeVisible({ timeout: 3000 });
|
||||||
|
console.log(`🌍 Verified "${tabName}" tab is not visible`);
|
||||||
|
});
|
||||||
|
|||||||
@@ -22,8 +22,7 @@ IMAGE_TAG_COMMIT := `git rev-parse --short HEAD`
|
|||||||
# --- Variables ---
|
# --- Variables ---
|
||||||
# Database
|
# Database
|
||||||
DB_CONTAINER := "euchre-camp-postgres"
|
DB_CONTAINER := "euchre-camp-postgres"
|
||||||
DATABASE_PROVIDER := env_var_or_default("DATABASE_PROVIDER", "sqlite")
|
DATABASE_URL := env_var_or_default("DATABASE_URL", "")
|
||||||
DATABASE_URL := env_var_or_default("DATABASE_URL", "file:./prisma/dev.db")
|
|
||||||
|
|
||||||
# --- Setup & Installation ---
|
# --- Setup & Installation ---
|
||||||
|
|
||||||
@@ -32,7 +31,7 @@ setup:
|
|||||||
@echo "Installing dependencies..."
|
@echo "Installing dependencies..."
|
||||||
npm install
|
npm install
|
||||||
@echo "Setting up database..."
|
@echo "Setting up database..."
|
||||||
npm run db:setup-postgres
|
npm run db:setup-dev
|
||||||
@echo "Generating Prisma client..."
|
@echo "Generating Prisma client..."
|
||||||
npx prisma generate
|
npx prisma generate
|
||||||
|
|
||||||
@@ -56,56 +55,33 @@ format:
|
|||||||
|
|
||||||
# --- Testing ---
|
# --- Testing ---
|
||||||
|
|
||||||
# Run all tests (unit + acceptance with SQLite)
|
# Run all tests (unit + acceptance)
|
||||||
# Note: Uses Docker containers for consistent environment
|
test: test-unit test-acceptance
|
||||||
test: test-unit test-acceptance-sqlite
|
|
||||||
|
|
||||||
# Run all tests with PostgreSQL (Docker)
|
# Run unit tests
|
||||||
test-pg: test-unit test-acceptance-postgres
|
|
||||||
|
|
||||||
# Run unit tests (Vitest)
|
|
||||||
test-unit:
|
test-unit:
|
||||||
npm run test:run
|
npm run test:run
|
||||||
|
|
||||||
# Run acceptance tests with SQLite (fast, no Docker needed)
|
# Run acceptance tests (Playwright)
|
||||||
test-acceptance-sqlite:
|
test-acceptance:
|
||||||
@echo "Running acceptance tests with SQLite..."
|
|
||||||
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db BETTER_AUTH_SECRET=test-secret-key npm run test:acceptance
|
|
||||||
|
|
||||||
# Run acceptance tests with PostgreSQL (Docker)
|
|
||||||
test-acceptance-postgres:
|
|
||||||
@echo "Starting Docker containers for acceptance tests..."
|
|
||||||
docker compose up -d
|
|
||||||
@echo "Waiting for services to be ready..."
|
|
||||||
sleep 10
|
|
||||||
@echo "Running acceptance tests..."
|
@echo "Running acceptance tests..."
|
||||||
npm run test:acceptance
|
npm run test:acceptance
|
||||||
@echo "Stopping Docker containers..."
|
|
||||||
docker compose down
|
|
||||||
|
|
||||||
# Run Cucumber e2e tests with SQLite
|
# Run Cucumber e2e tests
|
||||||
test-cucumber-sqlite:
|
test-cucumber:
|
||||||
@echo "Clearing Next.js cache..."
|
@echo "Clearing Next.js cache..."
|
||||||
rm -rf .next/
|
rm -rf .next/
|
||||||
@echo "Running Cucumber e2e tests with SQLite..."
|
@echo "Running Cucumber e2e tests..."
|
||||||
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance:cucumber
|
|
||||||
|
|
||||||
# Run Cucumber e2e tests with PostgreSQL (uses .env.development)
|
|
||||||
test-cucumber-postgres:
|
|
||||||
@echo "Clearing Next.js cache..."
|
|
||||||
rm -rf .next/
|
|
||||||
@echo "Running Cucumber e2e tests with PostgreSQL..."
|
|
||||||
npm run test:acceptance:cucumber
|
npm run test:acceptance:cucumber
|
||||||
|
|
||||||
# Run Cucumber e2e tests with PostgreSQL against production build
|
# Run Cucumber e2e tests against production build
|
||||||
# This is more reliable than dev server (no HMR, faster API responses)
|
test-cucumber-prod:
|
||||||
test-cucumber-postgres-prod:
|
|
||||||
@echo "Clearing Next.js cache..."
|
@echo "Clearing Next.js cache..."
|
||||||
rm -rf .next/
|
rm -rf .next/
|
||||||
@echo "Building application for production..."
|
@echo "Building application for production..."
|
||||||
bun run build
|
bun run build
|
||||||
@echo "Starting production server in background..."
|
@echo "Starting production server in background..."
|
||||||
DATABASE_URL=$(grep DATABASE_URL .env.development | cut -d'=' -f2 | tr -d '"') DATABASE_PROVIDER=postgresql bun run start > /tmp/next-prod.log 2>&1 &
|
bun run start > /tmp/next-prod.log 2>&1 &
|
||||||
SERVER_PID=$$!
|
SERVER_PID=$$!
|
||||||
@echo "Waiting for server to be ready..."
|
@echo "Waiting for server to be ready..."
|
||||||
sleep 15
|
sleep 15
|
||||||
@@ -115,9 +91,6 @@ test-cucumber-postgres-prod:
|
|||||||
kill $$SERVER_PID 2>/dev/null || true
|
kill $$SERVER_PID 2>/dev/null || true
|
||||||
@echo "Tests completed."
|
@echo "Tests completed."
|
||||||
|
|
||||||
# Run all e2e tests (both Playwright and Cucumber)
|
|
||||||
test-e2e: test-acceptance-sqlite test-cucumber-sqlite
|
|
||||||
|
|
||||||
# Run database migrations (Prisma)
|
# Run database migrations (Prisma)
|
||||||
migrate:
|
migrate:
|
||||||
npx prisma migrate dev
|
npx prisma migrate dev
|
||||||
@@ -126,13 +99,6 @@ migrate:
|
|||||||
seed:
|
seed:
|
||||||
npm run db:seed
|
npm run db:seed
|
||||||
|
|
||||||
# Switch database provider
|
|
||||||
db-switch-sqlite:
|
|
||||||
npm run db:switch sqlite
|
|
||||||
|
|
||||||
db-switch-postgres:
|
|
||||||
npm run db:switch postgresql
|
|
||||||
|
|
||||||
# --- Docker ---
|
# --- Docker ---
|
||||||
|
|
||||||
# Build the Docker image (standard build)
|
# Build the Docker image (standard build)
|
||||||
@@ -148,7 +114,6 @@ docker-build-commit:
|
|||||||
docker-build-full: docker-build docker-build-commit
|
docker-build-full: docker-build docker-build-commit
|
||||||
|
|
||||||
# Fast rebuild using Docker BuildKit cache
|
# Fast rebuild using Docker BuildKit cache
|
||||||
# Uses build cache to speed up rebuilds when only code changes
|
|
||||||
docker-rebuild-fast:
|
docker-rebuild-fast:
|
||||||
@echo "Fast rebuilding Docker image {{PROJECT}}:{{IMAGE_TAG}}..."
|
@echo "Fast rebuilding Docker image {{PROJECT}}:{{IMAGE_TAG}}..."
|
||||||
DOCKER_BUILDKIT=1 docker build \
|
DOCKER_BUILDKIT=1 docker build \
|
||||||
@@ -195,19 +160,14 @@ docker-push: docker-build-full
|
|||||||
|
|
||||||
# --- CI/CD Pipeline Simulation ---
|
# --- CI/CD Pipeline Simulation ---
|
||||||
|
|
||||||
# Run full CI pipeline locally (lint, test, build, push)
|
# Run full CI pipeline locally (lint, test, build)
|
||||||
# Matches the Gitea Actions workflow
|
ci: lint typecheck test-unit test-acceptance docker-build
|
||||||
ci: lint typecheck test-unit test-acceptance-sqlite docker-build
|
|
||||||
@echo "CI Pipeline completed successfully!"
|
@echo "CI Pipeline completed successfully!"
|
||||||
|
|
||||||
# PR validation (what runs on pull requests)
|
# PR validation (what runs on pull requests)
|
||||||
pr-validate: lint typecheck test-unit test-acceptance-sqlite
|
pr-validate: lint typecheck test-unit test-acceptance
|
||||||
@echo "PR validation completed successfully!"
|
@echo "PR validation completed successfully!"
|
||||||
|
|
||||||
# Run CI with PostgreSQL (for release workflow simulation)
|
|
||||||
ci-postgres: lint typecheck test-unit test-acceptance-postgres docker-build
|
|
||||||
@echo "CI Pipeline with PostgreSQL completed successfully!"
|
|
||||||
|
|
||||||
# --- Utilities ---
|
# --- Utilities ---
|
||||||
|
|
||||||
# Show help information
|
# Show help information
|
||||||
@@ -279,13 +239,3 @@ workflow-status:
|
|||||||
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
|
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
|
||||||
@echo "Test Workflow: Runs unit tests on all branch pushes"
|
@echo "Test Workflow: Runs unit tests on all branch pushes"
|
||||||
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
|
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
|
||||||
@echo ""
|
|
||||||
@echo "Note: CI image approach deprecated due to Gitea Actions workspace mounting"
|
|
||||||
|
|
||||||
# Check current database provider
|
|
||||||
db-status:
|
|
||||||
@echo "Database Provider: ${DATABASE_PROVIDER}"
|
|
||||||
@echo "Database URL: ${DATABASE_URL}"
|
|
||||||
@echo ""
|
|
||||||
@echo "Current schema.prisma provider:"
|
|
||||||
grep -A 2 "datasource db" prisma/schema.prisma | head -3
|
|
||||||
|
|||||||
+1
-5
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "euchre_camp",
|
"name": "euchre_camp",
|
||||||
"version": "0.1.14",
|
"version": "0.1.17",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
||||||
@@ -19,12 +19,8 @@
|
|||||||
"test:acceptance:cucumber:pretty": "DATABASE_URL=$(grep DATABASE_URL .env.development | cut -d'=' -f2 | tr -d '\"') DATABASE_PROVIDER=postgresql bun cucumber-js --config e2e/cucumber/cucumber.config.ts --format pretty:cucumber-pretty",
|
"test:acceptance:cucumber:pretty": "DATABASE_URL=$(grep DATABASE_URL .env.development | cut -d'=' -f2 | tr -d '\"') DATABASE_PROVIDER=postgresql bun cucumber-js --config e2e/cucumber/cucumber.config.ts --format pretty:cucumber-pretty",
|
||||||
"test:acceptance:cucumber:prod": "bun run build && (trap 'kill $(jobs -p) 2>/dev/null || true' EXIT; DATABASE_URL=${DATABASE_URL:-$(grep DATABASE_URL .env.development | cut -d'=' -f2 | tr -d '\"')} DATABASE_PROVIDER=${DATABASE_PROVIDER:-postgresql} bun run start & echo 'Waiting for server to start...'; for i in {1..30}; do if curl -s http://localhost:3000 > /dev/null 2>&1; then echo 'Server ready!'; break; fi; sleep 1; done; npm run test:acceptance:cucumber)",
|
"test:acceptance:cucumber:prod": "bun run build && (trap 'kill $(jobs -p) 2>/dev/null || true' EXIT; DATABASE_URL=${DATABASE_URL:-$(grep DATABASE_URL .env.development | cut -d'=' -f2 | tr -d '\"')} DATABASE_PROVIDER=${DATABASE_PROVIDER:-postgresql} bun run start & echo 'Waiting for server to start...'; for i in {1..30}; do if curl -s http://localhost:3000 > /dev/null 2>&1; then echo 'Server ready!'; break; fi; sleep 1; done; npm run test:acceptance:cucumber)",
|
||||||
"cucumber": "DATABASE_URL=$(grep DATABASE_URL .env.development | cut -d'=' -f2 | tr -d '\"') DATABASE_PROVIDER=postgresql bun cucumber-js --config e2e/cucumber/cucumber.config.ts",
|
"cucumber": "DATABASE_URL=$(grep DATABASE_URL .env.development | cut -d'=' -f2 | tr -d '\"') DATABASE_PROVIDER=postgresql bun cucumber-js --config e2e/cucumber/cucumber.config.ts",
|
||||||
"db:switch": "bun run scripts/switch-database.js",
|
|
||||||
"db:setup-postgres": "bun run scripts/setup-postgres.js",
|
|
||||||
"db:setup-dev": "bun run scripts/setup-postgres.js",
|
"db:setup-dev": "bun run scripts/setup-postgres.js",
|
||||||
"db:setup-dev:clean": "bun run scripts/setup-postgres.js --drop",
|
"db:setup-dev:clean": "bun run scripts/setup-postgres.js --drop",
|
||||||
"db:reset-dev": "bun run scripts/reset-dev-db.js",
|
|
||||||
"db:use-dev": "bun run scripts/use-dev-db.js",
|
|
||||||
"db:cleanup-prod": "bun run scripts/cleanup-prod-db.js",
|
"db:cleanup-prod": "bun run scripts/cleanup-prod-db.js",
|
||||||
"db:check-prod": "bun run scripts/check-test-records.js",
|
"db:check-prod": "bun run scripts/check-test-records.js",
|
||||||
"db:seed": "bun run scripts/seed.js",
|
"db:seed": "bun run scripts/seed.js",
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ export default defineConfig({
|
|||||||
expect: {
|
expect: {
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
},
|
},
|
||||||
// Run tests sequentially to avoid database conflicts with SQLite
|
// Run tests sequentially to avoid database conflicts
|
||||||
fullyParallel: false,
|
fullyParallel: false,
|
||||||
// Fail the build on CI if you accidentally left test.only in the source code.
|
// Fail the build on CI if you accidentally left test.only in the source code.
|
||||||
forbidOnly: !!process.env.CI,
|
forbidOnly: !!process.env.CI,
|
||||||
// Retry on CI only.
|
// Retry on CI only.
|
||||||
retries: process.env.CI ? 2 : 0,
|
retries: process.env.CI ? 2 : 0,
|
||||||
// Always run with 1 worker to avoid database conflicts with SQLite
|
// Always run with 1 worker to avoid database conflicts
|
||||||
workers: 1,
|
workers: 1,
|
||||||
// Reporter to use
|
// Reporter to use
|
||||||
reporter: 'html',
|
reporter: 'html',
|
||||||
|
|||||||
@@ -1,138 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Generate 100+ games to test ELO rating calculations
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlite3
|
|
||||||
import random
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
|
|
||||||
DB_PATH = "prisma/prisma/dev.db"
|
|
||||||
|
|
||||||
|
|
||||||
def get_players():
|
|
||||||
"""Get all players from the database"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute("SELECT id, name, currentElo FROM players")
|
|
||||||
players = cursor.fetchall()
|
|
||||||
conn.close()
|
|
||||||
return players
|
|
||||||
|
|
||||||
|
|
||||||
def generate_game(players, game_num, base_date):
|
|
||||||
"""Generate a single game with random players and scores"""
|
|
||||||
# Randomly select 4 different players
|
|
||||||
selected_players = random.sample(players, 4)
|
|
||||||
p1, p2, p3, p4 = selected_players
|
|
||||||
|
|
||||||
# Randomly assign teams (Team 1 vs Team 2)
|
|
||||||
team1_p1 = p1
|
|
||||||
team1_p2 = p2
|
|
||||||
team2_p1 = p3
|
|
||||||
team2_p2 = p4
|
|
||||||
|
|
||||||
# Generate realistic scores (Euchre games typically 10 points max)
|
|
||||||
# Team 1 wins 60% of the time for variety
|
|
||||||
team1_wins = random.random() < 0.6
|
|
||||||
if team1_wins:
|
|
||||||
# Team 1 wins - generate scores
|
|
||||||
team1_score = random.randint(10, 15)
|
|
||||||
team2_score = random.randint(0, 9)
|
|
||||||
else:
|
|
||||||
# Team 2 wins - generate scores
|
|
||||||
team2_score = random.randint(10, 15)
|
|
||||||
team1_score = random.randint(0, 9)
|
|
||||||
|
|
||||||
# Generate random date in the past 30 days
|
|
||||||
days_ago = random.randint(0, 30)
|
|
||||||
game_date = base_date - timedelta(
|
|
||||||
days=days_ago, hours=random.randint(0, 23), minutes=random.randint(0, 59)
|
|
||||||
)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"team1P1Id": team1_p1[0],
|
|
||||||
"team1P2Id": team1_p2[0],
|
|
||||||
"team2P1Id": team2_p1[0],
|
|
||||||
"team2P2Id": team2_p2[0],
|
|
||||||
"team1Score": team1_score,
|
|
||||||
"team2Score": team2_score,
|
|
||||||
"playedAt": game_date.isoformat() + "Z",
|
|
||||||
"status": "completed",
|
|
||||||
"eventId": None,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def insert_games(games):
|
|
||||||
"""Insert games into the database"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
|
|
||||||
for game in games:
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
INSERT INTO matches
|
|
||||||
(team1P1Id, team1P2Id, team2P1Id, team2P2Id, team1Score, team2Score, playedAt, status, eventId, createdAt, updatedAt)
|
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
||||||
""",
|
|
||||||
(
|
|
||||||
game["team1P1Id"],
|
|
||||||
game["team1P2Id"],
|
|
||||||
game["team2P1Id"],
|
|
||||||
game["team2P2Id"],
|
|
||||||
game["team1Score"],
|
|
||||||
game["team2Score"],
|
|
||||||
game["playedAt"],
|
|
||||||
game["status"],
|
|
||||||
game["eventId"],
|
|
||||||
datetime.now().isoformat() + "Z",
|
|
||||||
datetime.now().isoformat() + "Z",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
print("Generating 150 games to test ELO ratings...")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
players = get_players()
|
|
||||||
print(f"Found {len(players)} players in database")
|
|
||||||
|
|
||||||
# Generate 150 games
|
|
||||||
num_games = 150
|
|
||||||
base_date = datetime.now()
|
|
||||||
|
|
||||||
games = []
|
|
||||||
for i in range(num_games):
|
|
||||||
game = generate_game(players, i, base_date)
|
|
||||||
games.append(game)
|
|
||||||
|
|
||||||
print(f"Generated {len(games)} games")
|
|
||||||
|
|
||||||
# Insert games into database
|
|
||||||
print("Inserting games into database...")
|
|
||||||
insert_games(games)
|
|
||||||
print("Games inserted successfully!")
|
|
||||||
|
|
||||||
# Show sample games
|
|
||||||
print("\nSample games:")
|
|
||||||
print("-" * 80)
|
|
||||||
for i, game in enumerate(games[:3]):
|
|
||||||
print(
|
|
||||||
f"Game {i + 1}: Team 1 ({game['team1Score']}) vs Team 2 ({game['team2Score']})"
|
|
||||||
)
|
|
||||||
print(f" Team 1: Player {game['team1P1Id']} + Player {game['team1P2Id']}")
|
|
||||||
print(f" Team 2: Player {game['team2P1Id']} + Player {game['team2P2Id']}")
|
|
||||||
print(f" Date: {game['playedAt']}")
|
|
||||||
print()
|
|
||||||
|
|
||||||
print("=" * 60)
|
|
||||||
print(f"Total games generated: {num_games}")
|
|
||||||
print("Now check the ELO ratings by running the application!")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,234 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Update partnership statistics based on matches in the database
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlite3
|
|
||||||
import math
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
DB_PATH = "prisma/prisma/dev.db"
|
|
||||||
K_FACTOR = 32
|
|
||||||
|
|
||||||
|
|
||||||
def get_all_matches():
|
|
||||||
"""Get all matches from the database"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT id, team1P1Id, team1P2Id, team2P1Id, team2P2Id,
|
|
||||||
team1Score, team2Score, playedAt
|
|
||||||
FROM matches
|
|
||||||
ORDER BY playedAt
|
|
||||||
""")
|
|
||||||
matches = cursor.fetchall()
|
|
||||||
conn.close()
|
|
||||||
return matches
|
|
||||||
|
|
||||||
|
|
||||||
def get_or_create_partnership(player1_id, player2_id):
|
|
||||||
"""Get or create a partnership record"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
|
|
||||||
# Sort IDs to ensure consistent partnership lookup
|
|
||||||
p1 = min(player1_id, player2_id)
|
|
||||||
p2 = max(player1_id, player2_id)
|
|
||||||
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
SELECT id, gamesPlayed, wins, losses, totalEloChange
|
|
||||||
FROM partnership_stats
|
|
||||||
WHERE player1Id = ? AND player2Id = ?
|
|
||||||
""",
|
|
||||||
(p1, p2),
|
|
||||||
)
|
|
||||||
|
|
||||||
result = cursor.fetchone()
|
|
||||||
if result:
|
|
||||||
conn.close()
|
|
||||||
return result
|
|
||||||
|
|
||||||
# Create new partnership record
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
INSERT INTO partnership_stats (player1Id, player2Id, gamesPlayed, wins, losses, totalEloChange, lastPlayed, createdAt, updatedAt)
|
|
||||||
VALUES (?, ?, 0, 0, 0, 0, NULL, ?, ?)
|
|
||||||
""",
|
|
||||||
(p1, p2, datetime.now().isoformat() + "Z", datetime.now().isoformat() + "Z"),
|
|
||||||
)
|
|
||||||
|
|
||||||
partnership_id = cursor.lastrowid
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
return (partnership_id, 0, 0, 0, 0)
|
|
||||||
|
|
||||||
|
|
||||||
def update_partnership_stats(player1_id, player2_id, won, elo_change):
|
|
||||||
"""Update partnership statistics"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
|
|
||||||
# Sort IDs to ensure consistent partnership lookup
|
|
||||||
p1 = min(player1_id, player2_id)
|
|
||||||
p2 = max(player1_id, player2_id)
|
|
||||||
|
|
||||||
# Get current partnership stats
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
SELECT id, gamesPlayed, wins, losses, totalEloChange
|
|
||||||
FROM partnership_stats
|
|
||||||
WHERE player1Id = ? AND player2Id = ?
|
|
||||||
""",
|
|
||||||
(p1, p2),
|
|
||||||
)
|
|
||||||
|
|
||||||
result = cursor.fetchone()
|
|
||||||
if not result:
|
|
||||||
# Create new partnership record
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
INSERT INTO partnership_stats (player1Id, player2Id, gamesPlayed, wins, losses, totalEloChange, lastPlayed, createdAt, updatedAt)
|
|
||||||
VALUES (?, ?, 1, ?, ?, ?, ?, ?, ?)
|
|
||||||
""",
|
|
||||||
(
|
|
||||||
p1,
|
|
||||||
p2,
|
|
||||||
1 if won else 0,
|
|
||||||
0 if won else 1,
|
|
||||||
elo_change,
|
|
||||||
datetime.now().isoformat() + "Z",
|
|
||||||
datetime.now().isoformat() + "Z",
|
|
||||||
datetime.now().isoformat() + "Z",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
partnership_id, games_played, wins, losses, total_elo_change = result
|
|
||||||
|
|
||||||
# Update partnership stats
|
|
||||||
new_games = games_played + 1
|
|
||||||
new_wins = wins + 1 if won else wins
|
|
||||||
new_losses = losses if won else losses + 1
|
|
||||||
new_total_elo_change = total_elo_change + elo_change
|
|
||||||
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
UPDATE partnership_stats
|
|
||||||
SET gamesPlayed = ?, wins = ?, losses = ?, totalEloChange = ?, lastPlayed = ?, updatedAt = ?
|
|
||||||
WHERE id = ?
|
|
||||||
""",
|
|
||||||
(
|
|
||||||
new_games,
|
|
||||||
new_wins,
|
|
||||||
new_losses,
|
|
||||||
new_total_elo_change,
|
|
||||||
datetime.now().isoformat() + "Z",
|
|
||||||
datetime.now().isoformat() + "Z",
|
|
||||||
partnership_id,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
print("Updating partnership statistics based on matches...")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
# Get all matches
|
|
||||||
matches = get_all_matches()
|
|
||||||
print(f"Found {len(matches)} matches in database")
|
|
||||||
|
|
||||||
# Reset partnership stats
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute("DELETE FROM partnership_stats")
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
print("Reset all partnership statistics")
|
|
||||||
|
|
||||||
# Process each match
|
|
||||||
match_count = 0
|
|
||||||
for (
|
|
||||||
match_id,
|
|
||||||
team1_p1,
|
|
||||||
team1_p2,
|
|
||||||
team2_p1,
|
|
||||||
team2_p2,
|
|
||||||
team1_score,
|
|
||||||
team2_score,
|
|
||||||
played_at,
|
|
||||||
) in matches:
|
|
||||||
# Determine winners
|
|
||||||
team1_won = team1_score > team2_score
|
|
||||||
team2_won = team2_score > team1_score
|
|
||||||
|
|
||||||
# Update partnership stats for Team 1
|
|
||||||
if team1_won:
|
|
||||||
update_partnership_stats(
|
|
||||||
team1_p1, team1_p2, True, 0
|
|
||||||
) # Elo change will be calculated separately
|
|
||||||
else:
|
|
||||||
update_partnership_stats(team1_p1, team1_p2, False, 0)
|
|
||||||
|
|
||||||
# Update partnership stats for Team 2
|
|
||||||
if team2_won:
|
|
||||||
update_partnership_stats(team2_p1, team2_p2, True, 0)
|
|
||||||
else:
|
|
||||||
update_partnership_stats(team2_p1, team2_p2, False, 0)
|
|
||||||
|
|
||||||
match_count += 1
|
|
||||||
if match_count % 20 == 0:
|
|
||||||
print(f"Processed {match_count}/{len(matches)} matches...")
|
|
||||||
|
|
||||||
print(f"Processed {match_count} matches")
|
|
||||||
|
|
||||||
# Display partnership stats for top players
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("Partnership Stats for Top Players:")
|
|
||||||
print("-" * 60)
|
|
||||||
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
|
|
||||||
# Get top players by ELO
|
|
||||||
cursor.execute("SELECT id, name FROM players ORDER BY currentElo DESC LIMIT 5")
|
|
||||||
top_players = cursor.fetchall()
|
|
||||||
|
|
||||||
for player_id, player_name in top_players:
|
|
||||||
print(f"\n{player_name}:")
|
|
||||||
|
|
||||||
# Get partnership stats for this player
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
SELECT
|
|
||||||
CASE
|
|
||||||
WHEN player1Id = ? THEN (SELECT name FROM players WHERE id = player2Id)
|
|
||||||
ELSE (SELECT name FROM players WHERE id = player1Id)
|
|
||||||
END as partner_name,
|
|
||||||
gamesPlayed, wins, losses, totalEloChange
|
|
||||||
FROM partnership_stats
|
|
||||||
WHERE player1Id = ? OR player2Id = ?
|
|
||||||
ORDER BY gamesPlayed DESC
|
|
||||||
LIMIT 3
|
|
||||||
""",
|
|
||||||
(player_id, player_id, player_id),
|
|
||||||
)
|
|
||||||
|
|
||||||
partnerships = cursor.fetchall()
|
|
||||||
for partner_name, games, wins, losses, elo_change in partnerships:
|
|
||||||
win_rate = (wins / games * 100) if games > 0 else 0
|
|
||||||
print(
|
|
||||||
f" - with {partner_name}: {games} games, {wins}/{losses} ({win_rate:.1f}%) ELO: {elo_change:+d}"
|
|
||||||
)
|
|
||||||
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("Partnership statistics updated successfully!")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,195 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Update player statistics (ELO, gamesPlayed, wins, losses) based on matches in the database
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlite3
|
|
||||||
import math
|
|
||||||
|
|
||||||
DB_PATH = "prisma/prisma/dev.db"
|
|
||||||
K_FACTOR = 32 # Standard K-factor for Elo calculations
|
|
||||||
|
|
||||||
|
|
||||||
def get_all_matches():
|
|
||||||
"""Get all matches from the database"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT id, team1P1Id, team1P2Id, team2P1Id, team2P2Id,
|
|
||||||
team1Score, team2Score, playedAt
|
|
||||||
FROM matches
|
|
||||||
ORDER BY playedAt
|
|
||||||
""")
|
|
||||||
matches = cursor.fetchall()
|
|
||||||
conn.close()
|
|
||||||
return matches
|
|
||||||
|
|
||||||
|
|
||||||
def get_player(player_id):
|
|
||||||
"""Get a player by ID"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute(
|
|
||||||
"SELECT id, name, currentElo, gamesPlayed, wins, losses FROM players WHERE id = ?",
|
|
||||||
(player_id,),
|
|
||||||
)
|
|
||||||
player = cursor.fetchone()
|
|
||||||
conn.close()
|
|
||||||
return player
|
|
||||||
|
|
||||||
|
|
||||||
def update_player(player_id, current_elo, games_played, wins, losses):
|
|
||||||
"""Update a player's statistics"""
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute(
|
|
||||||
"""
|
|
||||||
UPDATE players
|
|
||||||
SET currentElo = ?, gamesPlayed = ?, wins = ?, losses = ?
|
|
||||||
WHERE id = ?
|
|
||||||
""",
|
|
||||||
(current_elo, games_played, wins, losses, player_id),
|
|
||||||
)
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
|
|
||||||
def calculate_elo_change(rating_a, rating_b, score_a, score_b):
|
|
||||||
"""Calculate Elo change for a match"""
|
|
||||||
# Calculate expected scores
|
|
||||||
expected_a = 1 / (1 + math.pow(10, (rating_b - rating_a) / 400))
|
|
||||||
expected_b = 1 - expected_a
|
|
||||||
|
|
||||||
# Actual scores (1 for win, 0.5 for tie, 0 for loss)
|
|
||||||
actual_a = 0.5 if score_a == score_b else (1 if score_a > score_b else 0)
|
|
||||||
actual_b = 0.5 if score_a == score_b else (1 if score_b > score_a else 0)
|
|
||||||
|
|
||||||
# Calculate Elo change
|
|
||||||
elo_change_a = K_FACTOR * (actual_a - expected_a)
|
|
||||||
elo_change_b = K_FACTOR * (actual_b - expected_b)
|
|
||||||
|
|
||||||
return elo_change_a, elo_change_b
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
print("Updating player statistics based on matches in database...")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
# Get all matches
|
|
||||||
matches = get_all_matches()
|
|
||||||
print(f"Found {len(matches)} matches in database")
|
|
||||||
|
|
||||||
# Reset all player stats to 0 before recalculating
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute(
|
|
||||||
"UPDATE players SET currentElo = 1000, gamesPlayed = 0, wins = 0, losses = 0"
|
|
||||||
)
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
print("Reset all player statistics to initial values (ELO: 1000, games: 0)")
|
|
||||||
|
|
||||||
# Process each match
|
|
||||||
match_count = 0
|
|
||||||
for (
|
|
||||||
match_id,
|
|
||||||
team1_p1,
|
|
||||||
team1_p2,
|
|
||||||
team2_p1,
|
|
||||||
team2_p2,
|
|
||||||
team1_score,
|
|
||||||
team2_score,
|
|
||||||
played_at,
|
|
||||||
) in matches:
|
|
||||||
# Get player data
|
|
||||||
p1 = get_player(team1_p1)
|
|
||||||
p2 = get_player(team1_p2)
|
|
||||||
p3 = get_player(team2_p1)
|
|
||||||
p4 = get_player(team2_p2)
|
|
||||||
|
|
||||||
if not all([p1, p2, p3, p4]):
|
|
||||||
print(f"Warning: Could not find all players for match {match_id}")
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Calculate team ratings
|
|
||||||
team1_rating = (p1[2] + p2[2]) / 2 # currentElo
|
|
||||||
team2_rating = (p3[2] + p4[2]) / 2 # currentElo
|
|
||||||
|
|
||||||
# Calculate Elo changes
|
|
||||||
team1_elo_change, team2_elo_change = calculate_elo_change(
|
|
||||||
team1_rating, team2_rating, team1_score, team2_score
|
|
||||||
)
|
|
||||||
|
|
||||||
# Individual Elo changes (split evenly between team members)
|
|
||||||
p1_elo_change = team1_elo_change / 2
|
|
||||||
p2_elo_change = team1_elo_change / 2
|
|
||||||
p3_elo_change = team2_elo_change / 2
|
|
||||||
p4_elo_change = team2_elo_change / 2
|
|
||||||
|
|
||||||
# Determine winners
|
|
||||||
team1_won = team1_score > team2_score
|
|
||||||
team2_won = team2_score > team1_score
|
|
||||||
|
|
||||||
# Update player 1 stats
|
|
||||||
p1_new_elo = int(p1[2] + p1_elo_change)
|
|
||||||
p1_new_games = p1[3] + 1
|
|
||||||
p1_new_wins = p1[4] + 1 if team1_won else p1[4]
|
|
||||||
p1_new_losses = p1[5] if team1_won else p1[5] + 1
|
|
||||||
update_player(p1[0], p1_new_elo, p1_new_games, p1_new_wins, p1_new_losses)
|
|
||||||
|
|
||||||
# Update player 2 stats
|
|
||||||
p2_new_elo = int(p2[2] + p2_elo_change)
|
|
||||||
p2_new_games = p2[3] + 1
|
|
||||||
p2_new_wins = p2[4] + 1 if team1_won else p2[4]
|
|
||||||
p2_new_losses = p2[5] if team1_won else p2[5] + 1
|
|
||||||
update_player(p2[0], p2_new_elo, p2_new_games, p2_new_wins, p2_new_losses)
|
|
||||||
|
|
||||||
# Update player 3 stats
|
|
||||||
p3_new_elo = int(p3[2] + p3_elo_change)
|
|
||||||
p3_new_games = p3[3] + 1
|
|
||||||
p3_new_wins = p3[4] + 1 if team2_won else p3[4]
|
|
||||||
p3_new_losses = p3[5] if team2_won else p3[5] + 1
|
|
||||||
update_player(p3[0], p3_new_elo, p3_new_games, p3_new_wins, p3_new_losses)
|
|
||||||
|
|
||||||
# Update player 4 stats
|
|
||||||
p4_new_elo = int(p4[2] + p4_elo_change)
|
|
||||||
p4_new_games = p4[3] + 1
|
|
||||||
p4_new_wins = p4[4] + 1 if team2_won else p4[4]
|
|
||||||
p4_new_losses = p4[5] if team2_won else p4[5] + 1
|
|
||||||
update_player(p4[0], p4_new_elo, p4_new_games, p4_new_wins, p4_new_losses)
|
|
||||||
|
|
||||||
match_count += 1
|
|
||||||
if match_count % 20 == 0:
|
|
||||||
print(f"Processed {match_count}/{len(matches)} matches...")
|
|
||||||
|
|
||||||
print(f"Processed {match_count} matches")
|
|
||||||
|
|
||||||
# Display updated player rankings
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("Top 10 Players by ELO Rating:")
|
|
||||||
print("-" * 60)
|
|
||||||
|
|
||||||
conn = sqlite3.connect(DB_PATH)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT id, name, currentElo, gamesPlayed, wins, losses
|
|
||||||
FROM players
|
|
||||||
ORDER BY currentElo DESC
|
|
||||||
LIMIT 10
|
|
||||||
""")
|
|
||||||
top_players = cursor.fetchall()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
for rank, (player_id, name, elo, games, wins, losses) in enumerate(top_players, 1):
|
|
||||||
win_rate = (wins / games * 100) if games > 0 else 0
|
|
||||||
print(
|
|
||||||
f"{rank:2}. {name:15} | ELO: {elo:4} | Games: {games:3} | W/L: {wins}/{losses} ({win_rate:.1f}%)"
|
|
||||||
)
|
|
||||||
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("Player statistics updated successfully!")
|
|
||||||
print("Now run the application to see updated rankings.")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Script to switch between SQLite and PostgreSQL databases
|
|
||||||
* Usage: node scripts/switch-database.js [sqlite|postgres]
|
|
||||||
*/
|
|
||||||
|
|
||||||
const fs = require('fs');
|
|
||||||
const path = require('path');
|
|
||||||
|
|
||||||
const envFile = '.env';
|
|
||||||
const envExampleFile = '.env.example';
|
|
||||||
|
|
||||||
function updateEnvFile(provider) {
|
|
||||||
const envPath = path.join(process.cwd(), envFile);
|
|
||||||
|
|
||||||
// Read current .env file or create from example
|
|
||||||
let envContent = '';
|
|
||||||
if (fs.existsSync(envPath)) {
|
|
||||||
envContent = fs.readFileSync(envPath, 'utf8');
|
|
||||||
} else if (fs.existsSync(envExampleFile)) {
|
|
||||||
envContent = fs.readFileSync(envExampleFile, 'utf8');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update DATABASE_PROVIDER (note: this is for reference only, not used by Prisma)
|
|
||||||
const providerRegex = /^DATABASE_PROVIDER=.*$/m;
|
|
||||||
if (providerRegex.test(envContent)) {
|
|
||||||
envContent = envContent.replace(providerRegex, `DATABASE_PROVIDER=${provider}`);
|
|
||||||
} else {
|
|
||||||
envContent += `\nDATABASE_PROVIDER=${provider}\n`;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update DATABASE_URL based on provider
|
|
||||||
if (provider === 'sqlite') {
|
|
||||||
const sqliteUrl = 'DATABASE_URL="file:./prisma/dev.db"';
|
|
||||||
const urlRegex = /^DATABASE_URL=.*$/m;
|
|
||||||
if (urlRegex.test(envContent)) {
|
|
||||||
envContent = envContent.replace(urlRegex, sqliteUrl);
|
|
||||||
} else {
|
|
||||||
envContent += `${sqliteUrl}\n`;
|
|
||||||
}
|
|
||||||
} else if (provider === 'postgresql') {
|
|
||||||
const pgUrl = 'DATABASE_URL="postgresql://username:password@localhost:5432/euchre_camp"';
|
|
||||||
const urlRegex = /^DATABASE_URL=.*$/m;
|
|
||||||
if (urlRegex.test(envContent)) {
|
|
||||||
envContent = envContent.replace(urlRegex, pgUrl);
|
|
||||||
} else {
|
|
||||||
envContent += `${pgUrl}\n`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write updated content
|
|
||||||
fs.writeFileSync(envPath, envContent);
|
|
||||||
console.log(`✅ Updated ${envFile} to use ${provider} database`);
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateSchemaFile(provider) {
|
|
||||||
const schemaPath = path.join(process.cwd(), 'prisma', 'schema.prisma');
|
|
||||||
|
|
||||||
if (!fs.existsSync(schemaPath)) {
|
|
||||||
console.error(`❌ Schema file not found: ${schemaPath}`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
let schemaContent = fs.readFileSync(schemaPath, 'utf8');
|
|
||||||
|
|
||||||
// Update the provider in the datasource block
|
|
||||||
const providerRegex = /(datasource db\s*\{[^}]*provider\s*=\s*)"[^"]+"/;
|
|
||||||
if (providerRegex.test(schemaContent)) {
|
|
||||||
schemaContent = schemaContent.replace(
|
|
||||||
providerRegex,
|
|
||||||
`$1"${provider}"`
|
|
||||||
);
|
|
||||||
|
|
||||||
fs.writeFileSync(schemaPath, schemaContent);
|
|
||||||
console.log(`✅ Updated schema.prisma to use ${provider} provider`);
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
console.error(`❌ Could not find provider declaration in schema.prisma`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function main() {
|
|
||||||
const args = process.argv.slice(2);
|
|
||||||
const provider = args[0];
|
|
||||||
|
|
||||||
if (!provider) {
|
|
||||||
console.error('❌ Usage: node scripts/switch-database.js [sqlite|postgres]');
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!['sqlite', 'postgres', 'postgresql'].includes(provider)) {
|
|
||||||
console.error(`❌ Invalid provider: ${provider}. Must be 'sqlite' or 'postgres'`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
const normalizedProvider = provider === 'postgres' ? 'postgresql' : provider;
|
|
||||||
updateEnvFile(normalizedProvider);
|
|
||||||
updateSchemaFile(normalizedProvider);
|
|
||||||
|
|
||||||
console.log('\nNext steps:');
|
|
||||||
console.log('1. Run: npx prisma generate');
|
|
||||||
console.log('2. Run: npx prisma migrate deploy');
|
|
||||||
console.log('3. Restart your development server');
|
|
||||||
}
|
|
||||||
|
|
||||||
main();
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Switch to development database
|
|
||||||
* Creates a .env.development.local file with development database settings
|
|
||||||
*/
|
|
||||||
|
|
||||||
const fs = require('fs');
|
|
||||||
const path = require('path');
|
|
||||||
const { execSync } = require('child_process');
|
|
||||||
|
|
||||||
const envDevPath = path.join(__dirname, '..', '.env.development');
|
|
||||||
const envDevLocalPath = path.join(__dirname, '..', '.env.development.local');
|
|
||||||
|
|
||||||
console.log('🔧 Setting up development database...\n');
|
|
||||||
|
|
||||||
// Check if .env.development exists
|
|
||||||
if (!fs.existsSync(envDevPath)) {
|
|
||||||
console.error('❌ .env.development file not found');
|
|
||||||
console.error('Please create it first or run: npm run db:setup-dev');
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Copy .env.development to .env.development.local if it doesn't exist
|
|
||||||
if (!fs.existsSync(envDevLocalPath)) {
|
|
||||||
fs.copyFileSync(envDevPath, envDevLocalPath);
|
|
||||||
console.log('✅ Created .env.development.local');
|
|
||||||
} else {
|
|
||||||
console.log('ℹ️ .env.development.local already exists');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set NODE_ENV for the current session
|
|
||||||
process.env.NODE_ENV = 'development';
|
|
||||||
process.env.DATABASE_PROVIDER = 'postgresql';
|
|
||||||
|
|
||||||
// Read the development database URL
|
|
||||||
const envContent = fs.readFileSync(envDevPath, 'utf8');
|
|
||||||
const match = envContent.match(/DATABASE_URL="([^"]+)"/);
|
|
||||||
if (match) {
|
|
||||||
process.env.DATABASE_URL = match[1];
|
|
||||||
console.log(`✅ Development database URL: ${process.env.DATABASE_URL}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('\n✅ Development database configured!');
|
|
||||||
console.log('\nNext steps:');
|
|
||||||
console.log('1. Setup the dev database: npm run db:setup-dev');
|
|
||||||
console.log('2. Start development server: npm run dev');
|
|
||||||
console.log('\nNote: This script sets environment variables for the current session.');
|
|
||||||
console.log('For persistent configuration, use .env.development.local');
|
|
||||||
@@ -7,6 +7,7 @@ import Navigation from "@/components/Navigation"
|
|||||||
import TeamsSection from "@/components/TeamsSection"
|
import TeamsSection from "@/components/TeamsSection"
|
||||||
import { DeleteTournamentButton } from "@/components/DeleteTournamentButton"
|
import { DeleteTournamentButton } from "@/components/DeleteTournamentButton"
|
||||||
import { ScheduleGenerator } from "@/components/ScheduleGenerator"
|
import { ScheduleGenerator } from "@/components/ScheduleGenerator"
|
||||||
|
import { BracketVisualization } from "@/components/BracketVisualization"
|
||||||
import MatchEditor from "@/components/MatchEditor"
|
import MatchEditor from "@/components/MatchEditor"
|
||||||
|
|
||||||
interface PageProps {
|
interface PageProps {
|
||||||
@@ -420,6 +421,11 @@ export default function TournamentDetailPage({ params }: PageProps) {
|
|||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
case "bracket":
|
||||||
|
return (
|
||||||
|
<BracketVisualization rounds={rounds} />
|
||||||
|
)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -555,6 +561,18 @@ export default function TournamentDetailPage({ params }: PageProps) {
|
|||||||
>
|
>
|
||||||
Results
|
Results
|
||||||
</button>
|
</button>
|
||||||
|
{hasSchedule && (
|
||||||
|
<button
|
||||||
|
onClick={() => setActiveTab("bracket")}
|
||||||
|
className={`whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm ${
|
||||||
|
activeTab === "bracket"
|
||||||
|
? "border-green-500 text-green-600"
|
||||||
|
: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
Bracket
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
<span className="border-transparent text-gray-400 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm cursor-not-allowed">
|
<span className="border-transparent text-gray-400 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm cursor-not-allowed">
|
||||||
Analytics
|
Analytics
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
+5
-2
@@ -1,6 +1,7 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import "./globals.css";
|
import "./globals.css";
|
||||||
import { SessionProvider } from "@/components/SessionProvider";
|
import { SessionProvider } from "@/components/SessionProvider";
|
||||||
|
import { RoleSwitcherProvider } from "@/components/RoleSwitcher";
|
||||||
import Footer from "@/components/Footer";
|
import Footer from "@/components/Footer";
|
||||||
|
|
||||||
const inter = {
|
const inter = {
|
||||||
@@ -24,8 +25,10 @@ export default function RootLayout({
|
|||||||
>
|
>
|
||||||
<body className="min-h-full flex flex-col overflow-x-hidden">
|
<body className="min-h-full flex flex-col overflow-x-hidden">
|
||||||
<SessionProvider>
|
<SessionProvider>
|
||||||
{children}
|
<RoleSwitcherProvider>
|
||||||
<Footer />
|
{children}
|
||||||
|
<Footer />
|
||||||
|
</RoleSwitcherProvider>
|
||||||
</SessionProvider>
|
</SessionProvider>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -0,0 +1,168 @@
|
|||||||
|
"use client"
|
||||||
|
|
||||||
|
interface Player {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
}
|
||||||
|
|
||||||
|
interface BracketMatchup {
|
||||||
|
id: number
|
||||||
|
roundId: number
|
||||||
|
player1P1: Player | null
|
||||||
|
player1P2: Player | null
|
||||||
|
player2P1: Player | null
|
||||||
|
player2P2: Player | null
|
||||||
|
match: { id: number; team1Score: number; team2Score: number } | null
|
||||||
|
bracketPosition: number | null
|
||||||
|
status: string
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TournamentRound {
|
||||||
|
id: number
|
||||||
|
roundNumber: number
|
||||||
|
status: string
|
||||||
|
bracketMatchups: BracketMatchup[]
|
||||||
|
}
|
||||||
|
|
||||||
|
interface BracketVisualizationProps {
|
||||||
|
rounds: TournamentRound[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export function BracketVisualization({ rounds }: BracketVisualizationProps) {
|
||||||
|
if (rounds.length === 0) {
|
||||||
|
return (
|
||||||
|
<div className="bg-white shadow rounded-lg p-6">
|
||||||
|
<p className="text-gray-500">No schedule generated yet. Generate a schedule to see the bracket.</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const currentRoundIdx = rounds.findIndex(r => r.status === "in_progress")
|
||||||
|
const completedRounds = rounds.filter(r => r.status === "completed").length
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="bg-white shadow rounded-lg p-6">
|
||||||
|
<div className="flex items-center justify-between mb-6">
|
||||||
|
<h2 className="text-lg font-semibold text-gray-900">Tournament Bracket</h2>
|
||||||
|
<div className="flex items-center space-x-4 text-sm text-gray-500">
|
||||||
|
<span>{rounds.length} rounds</span>
|
||||||
|
<span>{completedRounds} completed</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="overflow-x-auto pb-4">
|
||||||
|
<div
|
||||||
|
className="inline-grid gap-4"
|
||||||
|
style={{
|
||||||
|
gridTemplateColumns: `repeat(${rounds.length}, minmax(200px, 1fr))`,
|
||||||
|
minWidth: `${rounds.length * 220}px`,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{rounds.map((round, roundIdx) => {
|
||||||
|
const isCurrent = roundIdx === currentRoundIdx
|
||||||
|
const isCompleted = round.status === "completed"
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div key={round.id} className="flex flex-col">
|
||||||
|
{/* Round Header */}
|
||||||
|
<div
|
||||||
|
className={`text-center py-2 px-3 rounded-t-lg font-medium text-sm ${
|
||||||
|
isCurrent
|
||||||
|
? "bg-green-100 text-green-800 border border-green-300"
|
||||||
|
: isCompleted
|
||||||
|
? "bg-gray-100 text-gray-600 border border-gray-200"
|
||||||
|
: "bg-gray-50 text-gray-500 border border-gray-200"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
Round {round.roundNumber}
|
||||||
|
{isCurrent && (
|
||||||
|
<span className="ml-1 text-xs">(current)</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Matchups */}
|
||||||
|
<div className="flex flex-col gap-2 mt-2">
|
||||||
|
{round.bracketMatchups
|
||||||
|
.sort((a, b) => (a.bracketPosition || 0) - (b.bracketPosition || 0))
|
||||||
|
.map((matchup) => (
|
||||||
|
<MatchupCard key={matchup.id} matchup={matchup} isCurrentRound={isCurrent} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function MatchupCard({ matchup, isCurrentRound }: { matchup: BracketMatchup; isCurrentRound: boolean }) {
|
||||||
|
const team1Name = matchup.player1P1 && matchup.player1P2
|
||||||
|
? `${matchup.player1P1.name.split(" ").pop()} & ${matchup.player1P2.name.split(" ").pop()}`
|
||||||
|
: "TBD"
|
||||||
|
const team2Name = matchup.player2P1 && matchup.player2P2
|
||||||
|
? `${matchup.player2P1.name.split(" ").pop()} & ${matchup.player2P2.name.split(" ").pop()}`
|
||||||
|
: "TBD"
|
||||||
|
|
||||||
|
const hasResult = matchup.match !== null
|
||||||
|
const team1Won = hasResult && matchup.match!.team1Score > matchup.match!.team2Score
|
||||||
|
const team2Won = hasResult && matchup.match!.team2Score > matchup.match!.team1Score
|
||||||
|
|
||||||
|
const borderColor = isCurrentRound
|
||||||
|
? "border-green-400"
|
||||||
|
: hasResult
|
||||||
|
? "border-gray-300"
|
||||||
|
: "border-gray-200"
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={`border rounded-md p-2 text-xs transition-colors ${borderColor} ${
|
||||||
|
isCurrentRound ? "shadow-sm" : ""
|
||||||
|
}`}
|
||||||
|
data-testid="bracket-matchup"
|
||||||
|
>
|
||||||
|
{/* Team 1 */}
|
||||||
|
<div
|
||||||
|
className={`flex justify-between items-center py-1 px-1 ${
|
||||||
|
team1Won ? "font-semibold" : ""
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<span className={`truncate ${team1Won ? "text-green-700" : "text-gray-700"}`}>
|
||||||
|
{team1Name}
|
||||||
|
</span>
|
||||||
|
{hasResult && (
|
||||||
|
<span className={`ml-1 font-mono ${team1Won ? "text-green-700" : "text-gray-500"}`}>
|
||||||
|
{matchup.match!.team1Score}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Divider */}
|
||||||
|
<div className="border-t border-gray-200 my-0.5" />
|
||||||
|
|
||||||
|
{/* Team 2 */}
|
||||||
|
<div
|
||||||
|
className={`flex justify-between items-center py-1 px-1 ${
|
||||||
|
team2Won ? "font-semibold" : ""
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<span className={`truncate ${team2Won ? "text-green-700" : "text-gray-700"}`}>
|
||||||
|
{team2Name}
|
||||||
|
</span>
|
||||||
|
{hasResult && (
|
||||||
|
<span className={`ml-1 font-mono ${team2Won ? "text-green-700" : "text-gray-500"}`}>
|
||||||
|
{matchup.match!.team2Score}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Status indicator */}
|
||||||
|
{!hasResult && matchup.status === "pending" && (
|
||||||
|
<div className="text-center text-gray-400 text-[10px] mt-1">
|
||||||
|
pending
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
+136
-94
@@ -4,12 +4,13 @@ import Link from "next/link"
|
|||||||
import { useSession } from "./SessionProvider"
|
import { useSession } from "./SessionProvider"
|
||||||
import { authClient } from "@/lib/auth-client"
|
import { authClient } from "@/lib/auth-client"
|
||||||
import { useEffect, useState } from "react"
|
import { useEffect, useState } from "react"
|
||||||
|
import { useRoleSwitcher } from "./RoleSwitcher"
|
||||||
|
|
||||||
export default function Navigation() {
|
export default function Navigation() {
|
||||||
const { session, loading } = useSession()
|
const { session, loading } = useSession()
|
||||||
const [userRole, setUserRole] = useState<string | null>(null)
|
const [userRole, setUserRole] = useState<string | null>(null)
|
||||||
|
const { viewAsRole, setViewAsRole, effectiveRole } = useRoleSwitcher()
|
||||||
|
|
||||||
// Fetch user role whenever session changes
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchUserRole = async () => {
|
const fetchUserRole = async () => {
|
||||||
const userId = (session?.user as { id?: string })?.id
|
const userId = (session?.user as { id?: string })?.id
|
||||||
@@ -34,117 +35,158 @@ export default function Navigation() {
|
|||||||
}, [session])
|
}, [session])
|
||||||
|
|
||||||
const handleLogout = async () => {
|
const handleLogout = async () => {
|
||||||
|
setViewAsRole(null)
|
||||||
await authClient.signOut()
|
await authClient.signOut()
|
||||||
window.location.href = '/auth/login'
|
window.location.href = '/auth/login'
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determine wordmark href based on session and role
|
const displayRole = effectiveRole || userRole
|
||||||
// If session exists but role is not yet loaded, use /rankings as default for players
|
const isSiteAdmin = userRole === "site_admin"
|
||||||
|
|
||||||
const wordmarkHref = session
|
const wordmarkHref = session
|
||||||
? (userRole === "club_admin" || userRole === "site_admin")
|
? (displayRole === "club_admin" || displayRole === "site_admin")
|
||||||
? "/admin"
|
? "/admin"
|
||||||
: "/rankings"
|
: "/rankings"
|
||||||
: "/";
|
: "/"
|
||||||
|
|
||||||
|
const roleLabels: Record<string, string> = {
|
||||||
|
player: "Player",
|
||||||
|
tournament_admin: "Tournament Admin",
|
||||||
|
club_admin: "Club Admin",
|
||||||
|
site_admin: "Site Admin",
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<nav className="bg-white shadow-sm">
|
<>
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
{viewAsRole && (
|
||||||
<div className="flex justify-between h-16">
|
<div className="bg-yellow-50 border-b border-yellow-200 px-4 py-2">
|
||||||
<div className="flex items-center min-w-0 overflow-hidden">
|
<div className="max-w-7xl mx-auto flex items-center justify-between">
|
||||||
<Link
|
<p className="text-sm text-yellow-800">
|
||||||
href="/"
|
<span className="font-medium">Viewing as {roleLabels[viewAsRole]}</span>
|
||||||
className="text-xl font-bold text-gray-900 no-underline flex-shrink-0"
|
{" "}— you are seeing what a {roleLabels[viewAsRole]?.toLowerCase()} would see.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
onClick={() => setViewAsRole(null)}
|
||||||
|
className="text-sm font-medium text-yellow-800 hover:text-yellow-900 underline"
|
||||||
|
data-testid="reset-view-as"
|
||||||
>
|
>
|
||||||
EuchreCamp
|
Reset to Site Admin
|
||||||
</Link>
|
</button>
|
||||||
<div className="hidden md:ml-6 md:flex md:space-x-8 min-w-0 overflow-hidden">
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<nav className="bg-white shadow-sm">
|
||||||
|
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||||
|
<div className="flex justify-between h-16">
|
||||||
|
<div className="flex items-center min-w-0 overflow-hidden">
|
||||||
<Link
|
<Link
|
||||||
href="/rankings"
|
href="/"
|
||||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
className="text-xl font-bold text-gray-900 no-underline flex-shrink-0"
|
||||||
>
|
>
|
||||||
Rankings
|
EuchreCamp
|
||||||
</Link>
|
</Link>
|
||||||
{session && (
|
<div className="hidden md:ml-6 md:flex md:space-x-8 min-w-0 overflow-hidden">
|
||||||
<>
|
<Link
|
||||||
<Link
|
href="/rankings"
|
||||||
href="/admin/tournaments"
|
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
>
|
||||||
|
Rankings
|
||||||
|
</Link>
|
||||||
|
{session && (
|
||||||
|
<>
|
||||||
|
<Link
|
||||||
|
href="/admin/tournaments"
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Tournaments
|
||||||
|
</Link>
|
||||||
|
{(displayRole === "club_admin" || displayRole === "site_admin") && (
|
||||||
|
<>
|
||||||
|
<Link
|
||||||
|
href="/admin"
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Admin
|
||||||
|
</Link>
|
||||||
|
<Link
|
||||||
|
href="/admin/matches"
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Matches
|
||||||
|
</Link>
|
||||||
|
<Link
|
||||||
|
href="/admin/players"
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Players
|
||||||
|
</Link>
|
||||||
|
<Link
|
||||||
|
href="/admin/users"
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Users
|
||||||
|
</Link>
|
||||||
|
<Link
|
||||||
|
href="/admin/matches/upload"
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Upload Matches
|
||||||
|
</Link>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center min-w-0 overflow-hidden space-x-4">
|
||||||
|
{isSiteAdmin && (
|
||||||
|
<select
|
||||||
|
value={viewAsRole || ""}
|
||||||
|
onChange={(e) => setViewAsRole(e.target.value ? e.target.value as "player" | "tournament_admin" | "club_admin" : null)}
|
||||||
|
className="text-sm border border-gray-300 rounded-md px-2 py-1 bg-white text-gray-700 focus:outline-none focus:ring-green-500 focus:border-green-500"
|
||||||
|
data-testid="role-switcher"
|
||||||
|
>
|
||||||
|
<option value="">Viewing as Site Admin</option>
|
||||||
|
<option value="player">View as Player</option>
|
||||||
|
<option value="tournament_admin">View as Tournament Admin</option>
|
||||||
|
<option value="club_admin">View as Club Admin</option>
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
{loading ? (
|
||||||
|
<div className="text-gray-500">Loading...</div>
|
||||||
|
) : session ? (
|
||||||
|
<div className="flex items-center space-x-4">
|
||||||
|
<span className="text-gray-700 text-sm font-medium">
|
||||||
|
{(session.user as { name?: string; email?: string })?.name ||
|
||||||
|
(session.user as { name?: string; email?: string })?.email}
|
||||||
|
</span>
|
||||||
|
<button
|
||||||
|
onClick={handleLogout}
|
||||||
|
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
||||||
>
|
>
|
||||||
Tournaments
|
Sign out
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="flex items-center space-x-4">
|
||||||
|
<Link
|
||||||
|
href="/auth/login"
|
||||||
|
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
||||||
|
>
|
||||||
|
Sign in
|
||||||
</Link>
|
</Link>
|
||||||
{(userRole === "club_admin" || userRole === "site_admin") && (
|
<Link
|
||||||
<>
|
href="/auth/register"
|
||||||
<Link
|
className="bg-green-600 text-white px-3 py-1 rounded-md text-sm font-medium hover:bg-green-700"
|
||||||
href="/admin"
|
>
|
||||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
Sign up
|
||||||
>
|
</Link>
|
||||||
Admin
|
</div>
|
||||||
</Link>
|
|
||||||
<Link
|
|
||||||
href="/admin/matches"
|
|
||||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
|
||||||
>
|
|
||||||
Matches
|
|
||||||
</Link>
|
|
||||||
<Link
|
|
||||||
href="/admin/players"
|
|
||||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
|
||||||
>
|
|
||||||
Players
|
|
||||||
</Link>
|
|
||||||
<Link
|
|
||||||
href="/admin/users"
|
|
||||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
|
||||||
>
|
|
||||||
Users
|
|
||||||
</Link>
|
|
||||||
<Link
|
|
||||||
href="/admin/matches/upload"
|
|
||||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
|
||||||
>
|
|
||||||
Upload Matches
|
|
||||||
</Link>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center min-w-0 overflow-hidden">
|
|
||||||
{loading ? (
|
|
||||||
<div className="text-gray-500">Loading...</div>
|
|
||||||
) : session ? (
|
|
||||||
<div className="flex items-center space-x-4">
|
|
||||||
<span className="text-gray-700 text-sm font-medium">
|
|
||||||
{(session.user as { name?: string; email?: string })?.name ||
|
|
||||||
(session.user as { name?: string; email?: string })?.email}
|
|
||||||
</span>
|
|
||||||
<button
|
|
||||||
onClick={handleLogout}
|
|
||||||
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
|
||||||
>
|
|
||||||
Sign out
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="flex items-center space-x-4">
|
|
||||||
<Link
|
|
||||||
href="/auth/login"
|
|
||||||
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
|
||||||
>
|
|
||||||
Sign in
|
|
||||||
</Link>
|
|
||||||
<Link
|
|
||||||
href="/auth/register"
|
|
||||||
className="bg-green-600 text-white px-3 py-1 rounded-md text-sm font-medium hover:bg-green-700"
|
|
||||||
>
|
|
||||||
Sign up
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</nav>
|
||||||
</nav>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
"use client"
|
||||||
|
|
||||||
|
import { createContext, useContext, useState, useCallback, ReactNode } from "react"
|
||||||
|
|
||||||
|
type ViewAsRole = "player" | "tournament_admin" | "club_admin" | null
|
||||||
|
|
||||||
|
interface RoleSwitcherContextType {
|
||||||
|
viewAsRole: ViewAsRole
|
||||||
|
setViewAsRole: (role: ViewAsRole) => void
|
||||||
|
effectiveRole: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
const RoleSwitcherContext = createContext<RoleSwitcherContextType | undefined>(undefined)
|
||||||
|
|
||||||
|
export function RoleSwitcherProvider({ children }: { children: ReactNode }) {
|
||||||
|
const [viewAsRole, setViewAsRole] = useState<ViewAsRole>(null)
|
||||||
|
|
||||||
|
const value = {
|
||||||
|
viewAsRole,
|
||||||
|
setViewAsRole: useCallback((role: ViewAsRole) => setViewAsRole(role), []),
|
||||||
|
effectiveRole: viewAsRole,
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<RoleSwitcherContext.Provider value={value}>
|
||||||
|
{children}
|
||||||
|
</RoleSwitcherContext.Provider>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useRoleSwitcher() {
|
||||||
|
const context = useContext(RoleSwitcherContext)
|
||||||
|
if (!context) {
|
||||||
|
throw new Error("useRoleSwitcher must be used within RoleSwitcherProvider")
|
||||||
|
}
|
||||||
|
return context
|
||||||
|
}
|
||||||
+6
-20
@@ -3,42 +3,34 @@ import { prismaAdapter } from "better-auth/adapters/prisma";
|
|||||||
import { prisma } from "./prisma";
|
import { prisma } from "./prisma";
|
||||||
import { testUtils } from "better-auth/plugins";
|
import { testUtils } from "better-auth/plugins";
|
||||||
|
|
||||||
// Detect database provider from environment
|
|
||||||
const databaseProvider = process.env.DATABASE_PROVIDER || "sqlite";
|
|
||||||
|
|
||||||
export const auth = betterAuth({
|
export const auth = betterAuth({
|
||||||
database: prismaAdapter(prisma, {
|
database: prismaAdapter(prisma, {
|
||||||
provider: databaseProvider as "sqlite" | "postgresql",
|
provider: "postgresql",
|
||||||
}),
|
}),
|
||||||
emailAndPassword: {
|
emailAndPassword: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
autoSignIn: true, // Automatically sign in after registration
|
autoSignIn: true,
|
||||||
requireEmailVerification: false, // Don't require email verification for tests
|
requireEmailVerification: false,
|
||||||
minPasswordLength: 8, // Set minimum password length
|
minPasswordLength: 8,
|
||||||
maxPasswordLength: 128, // Set maximum password length
|
maxPasswordLength: 128,
|
||||||
},
|
},
|
||||||
secret: process.env.BETTER_AUTH_SECRET || process.env.NEXTAUTH_SECRET,
|
secret: process.env.BETTER_AUTH_SECRET || process.env.NEXTAUTH_SECRET,
|
||||||
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000/api/auth",
|
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000/api/auth",
|
||||||
// Configure trusted origins - parse from environment or use defaults
|
|
||||||
trustedOrigins: (() => {
|
trustedOrigins: (() => {
|
||||||
const origins = [];
|
const origins = [];
|
||||||
|
|
||||||
// Add environment-specified origins
|
|
||||||
if (process.env.TRUSTED_ORIGINS) {
|
if (process.env.TRUSTED_ORIGINS) {
|
||||||
origins.push(...process.env.TRUSTED_ORIGINS.split(',').map(o => o.trim()));
|
origins.push(...process.env.TRUSTED_ORIGINS.split(',').map(o => o.trim()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add BETTER_AUTH_URL if set
|
|
||||||
if (process.env.BETTER_AUTH_URL) {
|
if (process.env.BETTER_AUTH_URL) {
|
||||||
origins.push(process.env.BETTER_AUTH_URL);
|
origins.push(process.env.BETTER_AUTH_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add NEXTAUTH_URL if set
|
|
||||||
if (process.env.NEXTAUTH_URL) {
|
if (process.env.NEXTAUTH_URL) {
|
||||||
origins.push(process.env.NEXTAUTH_URL);
|
origins.push(process.env.NEXTAUTH_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add defaults
|
|
||||||
origins.push(
|
origins.push(
|
||||||
"https://euchre.notsosm.art",
|
"https://euchre.notsosm.art",
|
||||||
"http://euchre.notsosm.art",
|
"http://euchre.notsosm.art",
|
||||||
@@ -48,16 +40,13 @@ export const auth = betterAuth({
|
|||||||
"http://0.0.0.0:3000"
|
"http://0.0.0.0:3000"
|
||||||
);
|
);
|
||||||
|
|
||||||
// Remove duplicates and empty strings
|
|
||||||
return [...new Set(origins.filter(o => o))];
|
return [...new Set(origins.filter(o => o))];
|
||||||
})(),
|
})(),
|
||||||
session: {
|
session: {
|
||||||
cookieCache: {
|
cookieCache: {
|
||||||
enabled: false, // Disable cookie cache to avoid session cache issues
|
enabled: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
// Configure rate limiting - disable for test environment
|
|
||||||
// Note: Rate limiting is disabled for all environments to ensure test reliability
|
|
||||||
rateLimit: {
|
rateLimit: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
},
|
},
|
||||||
@@ -66,13 +55,11 @@ export const auth = betterAuth({
|
|||||||
user: {
|
user: {
|
||||||
create: {
|
create: {
|
||||||
async after(user) {
|
async after(user) {
|
||||||
// Generate a unique player name using timestamp and random string
|
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
const randomId = Math.random().toString(36).substring(2, 8);
|
const randomId = Math.random().toString(36).substring(2, 8);
|
||||||
const baseName = user.name || user.email.split('@')[0];
|
const baseName = user.name || user.email.split('@')[0];
|
||||||
const uniqueName = `${baseName}-${timestamp}-${randomId}`;
|
const uniqueName = `${baseName}-${timestamp}-${randomId}`;
|
||||||
|
|
||||||
// Create a Player record for the new user
|
|
||||||
const newPlayer = await prisma.player.create({
|
const newPlayer = await prisma.player.create({
|
||||||
data: {
|
data: {
|
||||||
name: uniqueName,
|
name: uniqueName,
|
||||||
@@ -80,7 +67,6 @@ export const auth = betterAuth({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// Update the User with the playerId
|
|
||||||
await prisma.user.update({
|
await prisma.user.update({
|
||||||
where: { id: user.id },
|
where: { id: user.id },
|
||||||
data: { playerId: newPlayer.id },
|
data: { playerId: newPlayer.id },
|
||||||
|
|||||||
+7
-25
@@ -1,37 +1,19 @@
|
|||||||
import { PrismaClient } from '@prisma/client'
|
import { PrismaClient } from '@prisma/client'
|
||||||
|
import { PrismaPg } from '@prisma/adapter-pg'
|
||||||
|
|
||||||
const globalForPrisma = globalThis as unknown as {
|
const globalForPrisma = globalThis as unknown as {
|
||||||
prisma: PrismaClient | undefined
|
prisma: PrismaClient | undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect database provider from environment (default to sqlite for local development)
|
|
||||||
// Next.js automatically loads environment variables from .env, .env.development, .env.production
|
|
||||||
const databaseProvider = process.env.DATABASE_PROVIDER || 'sqlite'
|
|
||||||
const databaseUrl = process.env.DATABASE_URL
|
const databaseUrl = process.env.DATABASE_URL
|
||||||
|
|
||||||
// Create PrismaClient with appropriate adapter
|
if (!databaseUrl) {
|
||||||
|
throw new Error('DATABASE_URL environment variable is required.')
|
||||||
|
}
|
||||||
|
|
||||||
const createPrismaClient = () => {
|
const createPrismaClient = () => {
|
||||||
let client: PrismaClient
|
const adapter = new PrismaPg({ connectionString: databaseUrl })
|
||||||
|
return new PrismaClient({ adapter })
|
||||||
if (databaseProvider === 'postgresql') {
|
|
||||||
// Validate DATABASE_URL is present for PostgreSQL
|
|
||||||
if (!databaseUrl) {
|
|
||||||
throw new Error(
|
|
||||||
'DATABASE_URL environment variable is required when DATABASE_PROVIDER is set to postgresql. ' +
|
|
||||||
'Current DATABASE_PROVIDER: ' + databaseProvider
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use PrismaPg adapter for PostgreSQL
|
|
||||||
const { PrismaPg } = require('@prisma/adapter-pg')
|
|
||||||
const adapter = new PrismaPg({ connectionString: databaseUrl })
|
|
||||||
client = new PrismaClient({ adapter })
|
|
||||||
} else {
|
|
||||||
// No adapter needed for SQLite
|
|
||||||
client = new PrismaClient()
|
|
||||||
}
|
|
||||||
|
|
||||||
return client
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const prisma = globalForPrisma.prisma ?? createPrismaClient()
|
export const prisma = globalForPrisma.prisma ?? createPrismaClient()
|
||||||
|
|||||||
Reference in New Issue
Block a user