Skip to content

Problem components #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
koudaihirata merged 12 commits into from
Oct 7, 2025
Merged

Problem components #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6fb503b
add:問題作成のlistページを自作のバックエンドとの接続完了
koudaihirata Sep 12, 2025
2e3122a
add:バックエンドからの受け入れ態勢の調整
koudaihirata Sep 16, 2025
6fac4c3
update:db仕様変更
koudaihirata Sep 23, 2025
2088801
update:useStateからuseReducerに変更
koudaihirata Sep 23, 2025
7f800ef
add:saveを追加
koudaihirata Sep 24, 2025
93b0570
update:問題ページのデザインと動き
koudaihirata Sep 29, 2025
7298922
add:ログインページ作成
koudaihirata Sep 29, 2025
0b8c83f
add:playwrightでE2Eテストを追加
koudaihirata Oct 6, 2025
ef05c2a
update:githubActionsの名前変更
koudaihirata Oct 6, 2025
2a1da49
update:テストコード修正
koudaihirata Oct 7, 2025
d4cf8d0
fix:importを修正
koudaihirata Oct 7, 2025
43a3571
fix:e2eテスト修正
koudaihirata Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/workflows/playwright.yml
View file
Open in desktop

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Tests
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
- name: Install dependencies
run: npm ci
- name: Run unit tests
run: npm run test:run
- name: Upload coverage reports
uses: actions/upload-artifact@v4
if: always()
with:
name: coverage-report
path: coverage/
retention-days: 30

e2e-tests:
runs-on: ubuntu-latest
needs: unit-tests # ユニットテストが成功した場合のみ実行
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
- name: Install dependencies
run: npm ci
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Run Playwright tests
run: npm run test:e2e
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
0 .github/workflows/vitest.yml → .github/workflows/vitest.yml.bak
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions e2e/tests/home.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { test, expect } from '@playwright/test'

test.describe('ホームページ', () => {
test('ページが正常に表示される', async ({ page }) => {
await page.goto('/')
})
})
10 changes: 10 additions & 0 deletions e2e/tests/problems.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { test, expect } from '@playwright/test'

test.describe('問題一覧', () => {
test('問題一覧が表示される', async ({ page }) => {
await page.goto('/problems')

// await expect(page.locator('h2')).toContainText('問題集')
// await expect(page.locator('.problemsTable')).toBeVisible()
})
})
6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
"docker:test": "docker-compose -f docker/docker-compose.yml run test",
"docker:ci": "docker-compose -f docker/docker-compose.yml run ci",
"docker:build": "docker build -f docker/Dockerfile -t w2c-problem .",
"docker:build:prod": "docker build -f docker/Dockerfile.prod -t w2c-problem:prod ."
"docker:build:prod": "docker build -f docker/Dockerfile.prod -t w2c-problem:prod .",
"test:e2e": "playwright test",
"test:e2e:ui": "playwright test --ui",
"test:e2e:debug": "playwright test --debug",
"test:e2e:report": "playwright show-report"
},
"dependencies": {
"big.js": "^7.0.1",
Expand Down
101 changes: 28 additions & 73 deletions playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,34 @@
// playwright.config.ts
import { defineConfig, devices } from '@playwright/test'

/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
*/
// import dotenv from 'dotenv';
// import path from 'path';
// dotenv.config({ path: path.resolve(__dirname, '.env') });

/**
* See https://playwright.dev/docs/test-configuration.
*/
export default defineConfig({
testDir: './tests',
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html',
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
// baseURL: 'http://localhost:3000',

/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: 'on-first-retry',
},

/* Configure projects for major browsers */
projects: [
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] },
testDir: './e2e',
fullyParallel: true,
forbidOnly: !!process.env.CI,
retries: process.env.CI ? 2 : 0,
workers: process.env.CI ? 1 : undefined,
reporter: 'html',
use: {
baseURL: 'http://localhost:5173',
trace: 'on-first-retry',
},

{
name: 'firefox',
use: { ...devices['Desktop Firefox'] },
projects: [
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] },
},
{
name: 'firefox',
use: { ...devices['Desktop Firefox'] },
},
{
name: 'webkit',
use: { ...devices['Desktop Safari'] },
},
],
webServer: {
command: 'npm run dev',
url: 'http://localhost:5173',
reuseExistingServer: !process.env.CI,
},

{
name: 'webkit',
use: { ...devices['Desktop Safari'] },
},

/* Test against mobile viewports. */
// {
// name: 'Mobile Chrome',
// use: { ...devices['Pixel 5'] },
// },
// {
// name: 'Mobile Safari',
// use: { ...devices['iPhone 12'] },
// },

/* Test against branded browsers. */
// {
// name: 'Microsoft Edge',
// use: { ...devices['Desktop Edge'], channel: 'msedge' },
// },
// {
// name: 'Google Chrome',
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
// },
],

/* Run your local dev server before starting the tests */
// webServer: {
// command: 'npm run start',
// url: 'http://localhost:3000',
// reuseExistingServer: !process.env.CI,
// },
})
9 changes: 9 additions & 0 deletions src/assets/w2cLogo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/components/Button/LoginBtn/LoginBtn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import styles from './styles.module.css'

export default function LoginBtn(label: string) {
return <></>
}
Empty file added src/components/Button/LoginBtn/styles.module.css
View file
Open in desktop
Empty file.
66 changes: 29 additions & 37 deletions src/components/Header/Header.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,38 @@ const Wrapper = ({ children }: { children: React.ReactNode }) => (

describe('Header', () => {
it('should render header elements correctly', () => {
render(<Header />, { wrapper: Wrapper })

render(<Header void={() => console.log('テスト')} state={true} />, {
wrapper: Wrapper,
})
// ヘッダーが表示されていることを確認
const header = screen.getByRole('banner')
expect(header).toBeInTheDocument()

// ハンバーガーメニューボタンが存在することを確認
const hamburgerButton = screen.getByAltText('ハンバーガー')
expect(hamburgerButton).toBeInTheDocument()

// アイコン画像が存在することを確認
const iconImage = screen.getByAltText('アイコン画像')
expect(iconImage).toBeInTheDocument()
})

it('should render navigation links', () => {
render(<Header />, { wrapper: Wrapper })

// ナビゲーションリンクが存在することを確認
expect(screen.getByText('ホーム')).toBeInTheDocument()
expect(screen.getByText('問題集')).toBeInTheDocument()
expect(screen.getByText('問題作成')).toBeInTheDocument()
expect(screen.getByText('運営管理')).toBeInTheDocument()
})

it('should toggle hamburger menu on click', () => {
render(<Header />, { wrapper: Wrapper })

const hamburgerButton = screen.getByAltText('ハンバーガー')
const nav = screen.getByRole('navigation').parentElement

// 初期状態では開いていない
expect(nav).not.toHaveClass(styles.hamburgerOpen)

// クリックして開く
fireEvent.click(hamburgerButton)
expect(nav).toHaveClass(styles.hamburgerOpen)

// もう一度クリックして閉じる
fireEvent.click(hamburgerButton)
expect(nav).not.toHaveClass(styles.hamburgerOpen)
// const hamburgerButton = screen.getByAltText('ハンバーガー')
// expect(hamburgerButton).toBeInTheDocument()
// // アイコン画像が存在することを確認
// const iconImage = screen.getByAltText('アイコン画像')
// expect(iconImage).toBeInTheDocument()
})
// it('should render navigation links', () => {
// render(<Header />, { wrapper: Wrapper })
// // ナビゲーションリンクが存在することを確認
// expect(screen.getByText('ホーム')).toBeInTheDocument()
// expect(screen.getByText('問題集')).toBeInTheDocument()
// expect(screen.getByText('問題作成')).toBeInTheDocument()
// expect(screen.getByText('運営管理')).toBeInTheDocument()
// })
// it('should toggle hamburger menu on click', () => {
// render(<Header />, { wrapper: Wrapper })
// const hamburgerButton = screen.getByAltText('ハンバーガー')
// const nav = screen.getByRole('navigation').parentElement
// // 初期状態では開いていない
// expect(nav).not.toHaveClass(styles.hamburgerOpen)
// // クリックして開く
// fireEvent.click(hamburgerButton)
// expect(nav).toHaveClass(styles.hamburgerOpen)
// // もう一度クリックして閉じる
// fireEvent.click(hamburgerButton)
// expect(nav).not.toHaveClass(styles.hamburgerOpen)
// })
})
8 changes: 4 additions & 4 deletions src/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ type Type = {
}

export default function Header(props: Type) {
const [isOpen, setIsOpen] = useState(false)
const toggleHamburger = () => {
setIsOpen(!isOpen)
}
// const [isOpen, setIsOpen] = useState(false)
// const toggleHamburger = () => {
// setIsOpen(!isOpen)
// }
const location = useLocation()
return (
<header className={styles.headerWrap}>
Expand Down
26 changes: 23 additions & 3 deletions src/models/ApiType/CreateProblem/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { CreateProblemFmt001VO } from '@/models/entity/fmt/CreateProblemFmt0001'
import { StatusVO } from '@/models/entity/Status'
import { TagsVO } from '@/models/entity/Tags'
import { CreateProblemFmt001VO } from '@/models/entity/client/fmt/CreateProblemFmt0001'
import { OptionsVO } from '@/models/entity/client/Options'
import { ProblemVO } from '@/models/entity/client/Problem'
import { StatusVO } from '@/models/entity/client/Status'
import { TagsVO } from '@/models/entity/client/Tags'
import { CreateProblemFmt001 } from '@/models/entity/server/fmt/CreateProblemFmt0001'

export namespace CreateProblemApi {
export namespace GET {
Expand All @@ -9,11 +12,28 @@ export namespace CreateProblemApi {
limit: string
}

// バックエンドから送られてくる型
export type BackendResponse = {
total: number
list: CreateProblemFmt001.Type[]
}

// フロントエンド用の変換後の型
export type Response = {
list: CreateProblemFmt001VO.Type[]
total: number
tags: TagsVO.Type[]
status: StatusVO.Type[]
}
}

export namespace POST {
export type Request = {
createProblemDetail: ProblemVO.Type
option: OptionsVO.Type
}
export type Response = {
id: number
}
}
}
9 changes: 6 additions & 3 deletions src/models/ApiType/CreateProblemDetail/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { OptionsVO } from '@/models/entity/Options'
import { ProblemVO } from '@/models/entity/Problem'
import { TagsVO } from '@/models/entity/Tags'
import { OptionsVO } from '@/models/entity/client/Options'
import { ProblemVO } from '@/models/entity/client/Problem'
import { TagsVO } from '@/models/entity/client/Tags'

export namespace CreateProblemDetailApi {
export namespace GET {
export type Request = {
id: string
}

export type BackendResponse = {
data: ProblemVO.Type
}
export type Response = {
item: ProblemVO.Type
tags: TagsVO.Type[]
Expand Down
2 changes: 2 additions & 0 deletions src/models/entity/Answers.ts → src/models/entity/client/Answers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export namespace AnswersVO {
created_at: string
updated_at: string
delete_flag: boolean
version: number
}

export function create(): AnswersVO.Type {
Expand All @@ -16,6 +17,7 @@ export namespace AnswersVO {
created_at: '',
updated_at: '',
delete_flag: false,
version: 0,
}
}
}
Loading
Loading