Merge branch 'main' into memo

Author: KaichiManabe

.cspell.json

@@ -2,19 +2,25 @@
   "version": "0.2",
   "language": "en",
   "words": [
-    "supabase",
-    "direnv",
+    "autoincrement",
     "bunx",
-    "qiita",
+    "chrono",
     "coursemate",
-    "safify",
-    "notistack",
-    "autoincrement",
+    "daisyui",
     "datasource",
+    "direnv",
+    "ECCS",
+    "isready",
     "lockb",
+    "mytheme",
+    "notistack",
     "psql",
-    "isready",
-    "ECCS"
+    "qiita",
+    "reqwest",
+    "safify",
+    "supabase",
+    "swiper",
+    "lefthook"
   ],
   "dictionaries": [
     "softwareTerms",
@@ -30,6 +36,7 @@
   ],
   "ignorePaths": [
     "flake.*",
+    "nix/*",
     "**/.git/**",
     "**/node_modules/**",
     "server/target/**",
@@ -38,6 +45,10 @@
     "**/bun.lockb",
     "**/*.svg",
     "**/migration.sql",
-    "**/data.json"
+    "**/data.json",
+    "**/Cargo.*",
+    "scraper/target",
+    "**/rust-toolchain.toml",
+    "web/out"
   ]
 }

.github/pull_request_template.md

@@ -1,21 +1,12 @@
-<!--変更したい場合は、`/.github/pull_request_template.md` を修正して下さい。-->
 # PRの概要
 
-<!-- 変更の目的 もしくは 関連する Issue 番号 -->
-<!-- 以下のように書くと Issue にリンクでき、マージ時に自動で Issue を閉じられる-->
-<!-- closes #001 -->
-
 ## 具体的な変更内容
-<!-- ビューの変更がある場合はスクショによる比較などがあるとわかりやすい -->
 
 ## 影響範囲
-<!-- この関数を変更したのでこの機能にも影響がある、など -->
 
 ## 動作要件
-<!-- 動作に必要な 環境変数 / 依存関係 / DBの更新 など -->
 
 ## 補足
-<!-- レビューをする際に見てほしい点、ローカル環境で試す際の注意点、など -->
 
 ## レビューリクエストを出す前にチェック！
 

.github/workflows/ci.yml

@@ -7,6 +7,14 @@ on:
 
 env:
   DATABASE_URL: ${{ secrets.DATABASE_URL_FOR_PRISMA_SQL_GENERATION }}
+  NEXT_PUBLIC_API_ENDPOINT: "sample"
+  NEXT_PUBLIC_FIREBASE_API_KEY: "sample"
+  NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: "sample"
+  NEXT_PUBLIC_FIREBASE_PROJECT_ID: "sample"
+  NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET: "sample"
+  NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID: "sample"
+  NEXT_PUBLIC_FIREBASE_APP_ID: "sample"
+  NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID: "sample"
 jobs:
   build:
     name: Build
@@ -59,7 +67,7 @@ jobs:
           bun-version: latest
 
       - run: make setup-ci
-      - run: make spell-check
+      - run: bunx cspell --quiet .
 
   test:
     name: Bun Test
@@ -78,7 +86,7 @@ jobs:
       - uses: actions/setup-node@v3
       - uses: oven-sh/setup-bun@v2
       - run: make prepare-deploy-web
-      - run: test `ls web/dist | wc -l` != 0
+      - run: test `ls web/out | wc -l` != 0
 
   deploy-test-server:
     name: Deploy Test (server)

.github/workflows/keep-alive.yml

@@ -2,7 +2,7 @@ name: Keep Alive
 
 on:
   schedule:
-    - cron: "*/5 * * * *"
+    - cron: "*/2 * * * *"
   workflow_dispatch:
 
 env:

.github/workflows/rust.yml

@@ -0,0 +1,32 @@
+name: Rust
+on: 
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  all:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      RUSTFLAGS: -D warnings
+    defaults:
+      run: 
+        working-directory: scraper
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/
+            ~/.rustup/
+            scraper/target
+          key: cargo-cache-${{ github.job }}-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          components: clippy,rustfmt
+      - run: cargo build
+      - run: cargo build --release
+      - run: cargo test
+      - run: cargo clippy
+      - run: cargo fmt --check

.gitignore

@@ -25,3 +25,4 @@ dist-ssr
 
 .env
 /.direnv
+.husky

.husky/pre-commit

@@ -5,20 +5,18 @@ LOCAL_DB := postgres://user:password@localhost:5432/database
 setup: 
 	if [ ! `command -v bun` ]; then echo 'ERR: Bun is required!'; exit 1; fi
 	make sync
-	bunx husky
-	cd web; if [ ! -f .env ]; then cp ./.env.sample ./.env ; fi
-	cd server; if [ ! -f .env.dev ]; then cp ./.env.sample ./.env.dev ; fi
 	@echo "auto setup is done. now do:"
 	@echo "- edit server/.env.dev"
 	@echo "- edit web/.env"
 	@echo "- run make sync"
 
-setup-ci:
-	if [ ${DATABASE_URL} == "" ]; then echo 'Please set DATABASE_URL_FOR_SQL_GENERATION!'; exit 1; fi
+setup-ci: 
+	if [ "" == ${DATABASE_URL} ]; then echo 'Please set DATABASE_URL_FOR_SQL_GENERATION!'; exit 1; fi
 	make sync
 	make generate-sql
 
-sync: sync-server sync-web sync-root copy-common 
+sync: sync-server sync-web sync-root sync-common
+	lefthook install || true
 	@echo '----------------------------------------------------------------------------------------------------------'
 	@echo '| Most work is done. now running prisma-generate-sql (which might fail if .env.dev is not set configured)|'
 	@echo '----------------------------------------------------------------------------------------------------------'
@@ -38,23 +36,23 @@ test: export DATABASE_URL=$(LOCAL_DB)
 test: export NEVER_LOAD_DOTENV=1
 test: export UNSAFE_SKIP_AUTH=1
 test: export FIREBASE_PROJECT_ID=mock-proj
+test: export CORS_ALLOW_ORIGINS=http://localhost:3000,https://localhost:5173
 test: dev-db
 	cd server/src; ENV_FILE=../.env.dev bun test
 	cd ./test; ENV_FILE=../server/.env.dev bun test
 	docker stop postgres
 
-prepare-deploy-web: copy-common
+prepare-deploy-web: sync-common
 	cd web; bun install; bun run build
-prepare-deploy-server: copy-common
-	cd server; bun install; npx prisma generate;
+prepare-deploy-server: sync-common sync-server generate-sql
 deploy-server:
-	cd server; bun src/index.ts
+	cd server; bun src/main.ts
 
-docker: copy-common
+docker:
 	@# deferring `docker compose down`. https://qiita.com/KEINOS/items/532dc395fe0f89c2b574
 	trap 'docker compose down' EXIT; docker compose up --build
 
-docker-watch: copy-common
+docker-watch:
 	docker compose up --build --watch
 
 seed:
@@ -82,29 +80,21 @@ dev-db:
 	@make seed;
 	@echo "Seeding completed."
 
-
-precommit: check-branch lint-staged spell-check
-
-lint-staged:
-	bunx lint-staged
-check-branch:
-	@ if [ "$(git branch --show-current)" == "main" ]; then echo "Cannot make commit on main! aborting..."; exit 1; fi
-spell-check:
-	bunx cspell --quiet .
-
 # Sync (install/update packages, generate prisma, etc)
 
 sync-web:
-	cd web; bun install
+	cd web; bun install --frozen-lockfile
 	# copy .env.sample -> .env only if .env is not there
 
 sync-server:
-	cd server; bun install
+	cd server; bun install --frozen-lockfile
 	cd server; bunx prisma generate
 	# copy .env.sample -> .env only if .env is not there
 
 sync-root:
-	bun install
+	bun install --frozen-lockfile
+sync-common:
+	cd common; bun install --frozen-lockfile
 
 
 # Static checks
@@ -129,7 +119,7 @@ format-check:
 	@exit 1
 
 # type checks
-type-check: copy-common
+type-check: 
 	make type-check-server
 	make type-check-web
 
@@ -145,9 +135,9 @@ type-check-web:
 start-all: build-web build-server
 	make serve-all
 
-build-web: copy-common-to-web
+build-web: 
 	cd web; bun run build
-build-server: copy-common-to-server
+build-server: 
 	cd server; bun run build
 
 serve-all:
@@ -157,17 +147,9 @@ serve-web:
 serve-server:
 	cd server; bun run serve 
 
-watch-web: copy-common-to-web
+watch-web: 
 	cd web; bun run dev
-watch-server: copy-common-to-server
+watch-server: 
 	cd server; bun run dev
 
-copy-common: copy-common-to-server copy-common-to-web
-copy-common-to-server:
-	@ if [ -d server/src/common ]; then rm -r server/src/common; fi
-	@ cp -r common server/src/common
-copy-common-to-web:
-	@ if [ -d web/src/common ]; then rm -r web/src/common; fi
-	@ cp -r common web/src/common
-
 .PHONY: test

Makefile

@@ -13,7 +13,6 @@ GNU Make が導入されています。以下は、ユーザーが使うこと
 - make setup (セットアップします。)
 - make start (build -> serve します。)
 - make watch (ホットリロードします。)
-- make precommit (type-check, format-check, lint を実行します。husky で自動実行されます。)
 
 ### 環境構築
 
@@ -27,6 +26,7 @@ GNU Make が導入されています。以下は、ユーザーが使うこと
   - Bun (js)
   - GNU Make
   - nvm (optional)
+  - lefthook
 
 - `make setup` を実行します。
 
@@ -59,3 +59,18 @@ make docker
 # または
 make docker-watch
 ```
+
+## Deploy
+
+web:
+```sh
+NEXT_PUBLIC_ALLOW_ANY_MAIL_ADDR=true # optional
+make prepare-deploy-web`
+# serve ./web/dist
+```
+
+server:
+```sh
+make prepare-deploy-server
+make deploy-server
+```

README.md

@@ -4,12 +4,28 @@
     "indentStyle": "space",
     "indentWidth": 2
   },
+  "linter": {
+    "rules": {
+      "nursery": {
+        "useSortedClasses": "warn"
+      }
+    }
+  },
   "vcs": {
     "enabled": true,
     "clientKind": "git",
     "useIgnoreFile": true
   },
   "files": {
-    "ignore": ["bun.lockb", "server/target", "data.json"]
+    "ignore": [
+      "bun.lockb",
+      "server/target",
+      "data.json",
+      "scraper/target",
+      ".next",
+      "next-env.d.ts",
+      "out",
+      "package-lock.json"
+    ]
   }
 }