Merge branch 'main' into render-on-yaml

Author: aster-void

.cspell.json

@@ -4,18 +4,23 @@
   "words": [
     "autoincrement",
     "bunx",
+    "chrono",
     "coursemate",
+    "daisyui",
     "datasource",
     "direnv",
     "ECCS",
     "isready",
     "lockb",
+    "mytheme",
     "notistack",
     "psql",
     "qiita",
+    "reqwest",
     "safify",
     "supabase",
-    "swiper"
+    "swiper",
+    "lefthook"
   ],
   "dictionaries": [
     "softwareTerms",
@@ -31,6 +36,7 @@
   ],
   "ignorePaths": [
     "flake.*",
+    "nix/*",
     "**/.git/**",
     "**/node_modules/**",
     "server/target/**",
@@ -39,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/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,9 +5,6 @@ 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"
@@ -19,6 +16,7 @@ setup-ci:
 	make generate-sql
 
 sync: sync-server sync-web sync-root copy-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,6 +36,7 @@ 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
@@ -81,16 +80,6 @@ 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:
@@ -166,7 +155,7 @@ 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
+	@ if [ -d web/common ]; then rm -r web/common; fi
+	@ cp -r common web/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"
+    ]
   }
 }