Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"dotenv.dotenvx-vscode",
"ms-vsliveshare.vsliveshare",
"corschenzi.mermaid-graphical-editor",
"anthropic.claude-code"
"anthropic.claude-code",
"ms-python.mypy-type-checker"
],
"settings": {
"[python]": {
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/postCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fi
# --- アプリケーションのセットアップ ---
# アプリケーション固有のセットアップ(依存関係のインストール、マイグレーションなど)を実行する
echo "🚀 Starting application setup..."
./scripts/setup.sh
sh ./scripts/setup_application.sh


# --- データベースのセットアップ ---
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches: [main, develop]
pull_request:
branches: [main, develop]
workflow_dispatch:

jobs:
Expand All @@ -18,7 +17,7 @@ jobs:
uses: ./.github/actions/setup-node-deps

- name: Format check
run: npm run format:check
run: npm run format:check:front

lint-check:
runs-on: ubuntu-latest
Expand All @@ -30,7 +29,7 @@ jobs:
uses: ./.github/actions/setup-node-deps

- name: Lint check
run: npm run lint:check
run: npm run lint:check:front

build:
runs-on: ubuntu-latest
Expand All @@ -43,4 +42,4 @@ jobs:
uses: ./.github/actions/setup-node-deps

- name: Build
run: npm run build
run: npm run build:front
14 changes: 13 additions & 1 deletion .github/workflows/ci_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [main, develop]
pull_request:
branches: [main, develop]
workflow_dispatch:

env:
PYTHON_VERSION: '3.13'
Expand Down Expand Up @@ -89,6 +89,18 @@ jobs:
working-directory: ./server
run: uv sync

- name: Run Ruff check (Linter)
working-directory: ./server
run: uv run ruff check .

- name: Run Ruff format check (Formatter)
working-directory: ./server
run: uv run ruff format --check .

- name: Run mypy (Type check)
working-directory: ./server
run: uv run mypy .

- name: Run Alembic migrations
working-directory: ./server
run: dotenvx run --env-file ../.env -- uv run alembic -n testdb upgrade head
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm run install:all && npm run build
- run: npm run install:all && npm run build:front
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm run install:all && npm run build
- run: npm run install:all && npm run build:front
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
Expand Down
13 changes: 11 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
"editor.defaultFormatter": "vscode.html-language-features"
},
"[markdown]": {
"editor.defaultFormatter": "vscode.markdown-language-features"
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
},
"biome.lsp.bin": "frontend/node_modules/@biomejs/biome/bin/biome",
"tailwindCSS.experimental.classRegex": [
Expand All @@ -53,5 +55,12 @@
"python.testing.pytestEnabled": true,
"python.testing.pytestArgs": ["./server/tests", "-svvv"],
"python.testing.autoTestDiscoverOnSaveEnabled": true,
"python.defaultInterpreterPath": "${workspaceFolder}/server/.venv/bin/python"
"python.defaultInterpreterPath": "${workspaceFolder}/server/.venv/bin/python",
"mypy-type-checker.reportingScope": "workspace",
"mypy-type-checker.importStrategy": "fromEnvironment",
"mypy-type-checker.args": [
"--ignore-missing-imports",
"--follow-imports=silent"
],
"python.analysis.typeCheckingMode": "off"
}
24 changes: 17 additions & 7 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,28 @@
"version": "0.2",
"language": "en,ja",
"words": [
"Tabishare",
"devcontainers",
"itsmechlark",
"anthropics",
"pylance",
"dbaeumer",
"autodocs",
"bradlc",
"dbaeumer",
"devcontainers",
"devdb",
"dotenvx",
"eamodio",
"uvicorn",
"fastapi",
"itsmechlark",
"mypy",
"Nonoctal",
"NOPASSWD",
"psql",
"pylance",
"pytest",
"rolname",
"Tabi",
"autodocs"
"Tabishare",
"tablename",
"testdb",
"uvicorn"
],
"ignoreWords": [],
"import": []
Expand Down
36 changes: 26 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,34 @@
"private": true,
"version": "0.0.0",
"scripts": {
"dev": "concurrently --names \"FRONT,SERVER,STORYBOOK\" --prefix-colors \"cyan,yellow\" \"npm run dev:front\" \"npm run dev:server\" \"npm run dev:storybook\"",
"// --- ALL --- //": "",
"dev": "concurrently --names \"FRONT,SERVER,STORYBOOK\" --prefix-colors \"cyan,yellow,magenta\" \"npm run dev:front\" \"npm run dev:server\" \"npm run dev:storybook\"",
"install:all": "npm ci && cd frontend && npm ci",

"// --- FRONTEND --- //": "",
"dev:front": "cd frontend && npm run dev",
"dev:server": "cd server && python -m uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload",
"dev:storybook": "cd frontend && npm run storybook",
"install:all": "npm ci && cd frontend && npm ci",
"build": "cd frontend && npm run build",
"lint:check": "cd frontend && npm run lint:check",
"lint:fix": "cd frontend && npm run lint:fix",
"format:check": "cd frontend && npm run format:check",
"format:fix": "cd frontend && npm run format:fix",
"preview": "cd frontend && npm run preview",
"db:connect": "npx dotenvx run -- sh -c 'psql -U $POSTGRES_USER -h $POSTGRES_HOST -d $POSTGRES_DB'"
"build:front": "cd frontend && npm run build",
"lint:check:front": "cd frontend && npm run lint:check",
"lint:fix:front": "cd frontend && npm run lint:fix",
"format:check:front": "cd frontend && npm run format:check",
"format:fix:front": "cd frontend && npm run format:fix",
"preview:front": "cd frontend && npm run preview",

"// --- SERVER --- //": "",
"dev:server": "cd server && npx dotenvx run --env-file ../.env -- uv run uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload",
"test:server": "cd server && npx dotenvx run --env-file ../.env -- uv run pytest",
"type-check:server": "cd server && uv run mypy .",
"lint:check:server": "cd server && uv run ruff check .",
"lint:fix:server": "cd server && uv run ruff check --fix .",
"format:check:server": "cd server && uv run ruff format --check .",
"format:fix:server": "cd server && uv run ruff format .",

"// --- DATABASE --- //": "",
"connect:db": "npx dotenvx run -- sh -c 'psql -U $POSTGRES_USER -h $POSTGRES_HOST -d $POSTGRES_DB'",
"migrate:db": "cd server && npx dotenvx run --env-file ../.env -- alembic -n devdb upgrade head",
"status:db": "cd server && npx dotenvx run --env-file ../.env -- alembic -n devdb current",
"rollback:db": "cd server && npx dotenvx run --env-file ../.env -- alembic -n devdb downgrade -1"
},
"devDependencies": {
"@dotenvx/dotenvx": "^1.48.4",
Expand Down
File renamed without changes.
Loading
Loading