Skip to content

Commit 14cebf4

Browse files
authored
Merge pull request #51 from ut-code/develop
release 2025/11
2 parents 13dba9c + 8b03763 commit 14cebf4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2454
-5208
lines changed

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ client/*.ts
2525
client/*.js
2626
client/wrangler.toml
2727
server/dist
28-
bun.lock
2928
compose.yml
30-
shell.nix
3129
CLAUDE.local.md
3230
biome.jsonc

.envrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/check.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,28 @@ jobs:
1111
timeout-minutes: 10
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: oven-sh/setup-bun@v2
15-
- run: bun install --frozen-lockfile
16-
- run: bun biome ci
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: "20"
17+
- run: npm ci
18+
- run: npx biome ci
19+
client-build:
20+
runs-on: ubuntu-latest
21+
timeout-minutes: 10
22+
steps:
23+
- uses: actions/checkout@v4
24+
- uses: actions/setup-node@v4
25+
with:
26+
node-version: "20"
27+
- run: npm ci
28+
- run: cd client && bash build.sh
29+
server-build:
30+
runs-on: ubuntu-latest
31+
timeout-minutes: 10
32+
steps:
33+
- uses: actions/checkout@v4
34+
- uses: actions/setup-node@v4
35+
with:
36+
node-version: "20"
37+
- run: npm ci
38+
- run: cd server && npm run build

README.md

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# イツヒマ
2+
3+
![ロゴ](./logo.png)
4+
5+
## 概要
6+
7+
とりあえずみんなの空いている時間を訊いてから、何を何時間やるか決めたい。そんな仲間うちでの日程調整に最適なツールです。
8+
9+
## 開発
10+
11+
### 要件
12+
13+
- Node.js
14+
- npm
15+
- Docker (開発用 DB のみに使用)
16+
17+
### セットアップ
18+
19+
依存関係のインストール
20+
21+
```sh
22+
npm ci
23+
```
24+
25+
`server/.env.sample` をコピーして `server/.env` を作成
26+
27+
`client/.env.local.sample` をコピーして `client/.env.local` を作成
28+
29+
開発用データベースの起動
30+
31+
```sh
32+
docker compose up
33+
```
34+
35+
スキーマの反映
36+
37+
```sh
38+
cd server
39+
npx prisma migrate dev
40+
```
41+
42+
### 起動
43+
44+
開発用データベースの起動
45+
46+
```sh
47+
docker compose up
48+
```
49+
50+
サーバー側とクライアント側をそれぞれ起動
51+
52+
```sh
53+
npm run dev:server
54+
```
55+
56+
```sh
57+
npm run dev:client
58+
```
59+
60+
cloudflare functions が必要な場合
61+
62+
```sh
63+
npm run dev:functions
64+
```
65+
66+
http://localhost:5173 にアクセスします。
67+
68+
69+
70+
### コードスタイル
71+
72+
コードのリント・フォーマット
73+
74+
```sh
75+
npm run check
76+
npm run fix
77+
```

biome.jsonc

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,42 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
33
"vcs": {
44
"enabled": true,
55
"clientKind": "git",
66
"useIgnoreFile": true
77
},
88
"files": {
99
"ignoreUnknown": false,
10-
"ignore": ["dist", "node_modules"]
10+
"includes": ["**", "!**/dist", "!**/node_modules"]
1111
},
1212
"formatter": {
1313
"enabled": true,
1414
"lineWidth": 120,
1515
"indentStyle": "space",
1616
"indentWidth": 2
1717
},
18-
"organizeImports": {
19-
"enabled": true
20-
},
18+
"assist": { "actions": { "source": { "organizeImports": "on" } } },
2119
"linter": {
2220
"enabled": true,
2321
"rules": {
2422
"recommended": true,
2523
"correctness": {
2624
"noUnknownProperty": "off"
2725
},
28-
"complexity": {
29-
"noForEach": "off"
26+
"style": {
27+
"noParameterAssign": "error",
28+
"useAsConstAssertion": "error",
29+
"useDefaultParameterLast": "error",
30+
"useEnumInitializers": "error",
31+
"useSelfClosingElements": "error",
32+
"useSingleVarDeclarator": "error",
33+
"noUnusedTemplateLiteral": "error",
34+
"useNumberNamespace": "error",
35+
"noInferrableTypes": "error",
36+
"noUselessElse": "error"
3037
},
31-
"a11y": {
32-
"useButtonType": "off"
38+
"nursery": {
39+
"useSortedClasses": "warn"
3340
}
3441
}
3542
},

bun.lock

Lines changed: 0 additions & 1085 deletions
This file was deleted.

client/build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# TODO: common のみに依存するようにする
2+
cd ..
3+
npm ci
4+
cd server
5+
npm run build
6+
cd ../client
7+
18
if [[ "$CF_PAGES_BRANCH" == "main" ]]; then
29
npm run build
310
else

client/package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
"build:local": "tsc -b && vite build --mode dev",
1010
"build:preview": "tsc -b && vite build --mode preview",
1111
"build": "tsc -b && vite build",
12-
"lint": "eslint .",
13-
"format": "prettier . --check",
14-
"lint:fix": "eslint . --fix",
15-
"format:fix": "prettier . --write",
1612
"preview": "vite preview"
1713
},
1814
"dependencies": {
@@ -37,14 +33,13 @@
3733
},
3834
"devDependencies": {
3935
"@cloudflare/workers-types": "^4.20250610.0",
40-
"@eslint/js": "^9.21.0",
4136
"@types/react": "^19.0.10",
4237
"@types/react-dom": "^19.0.4",
4338
"@vitejs/plugin-react": "^4.3.4",
4439
"daisyui": "^5.0.3",
4540
"globals": "^15.15.0",
41+
"hono": "^4.9.6",
4642
"typescript": "~5.7.2",
47-
"typescript-eslint": "^8.24.1",
4843
"vite": "^6.3.5"
4944
}
5045
}

client/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { BrowserRouter, Outlet, Route, Routes } from "react-router";
2+
import SubmissionPage from "./pages/eventId/Submission.tsx";
23
import HomePage from "./pages/Home.tsx";
34
import LandingPage from "./pages/Landing.tsx";
45
import NotFoundPage from "./pages/NotFound.tsx";
56
import ProjectPage from "./pages/Project.tsx";
6-
import SubmissionPage from "./pages/eventId/Submission.tsx";
77

88
export default function App() {
99
return (

0 commit comments

Comments
 (0)