From 4aafdd195784037bb777ab9d9a4531f67dac8aa7 Mon Sep 17 00:00:00 2001
From: Katsuyuki-Karasawa <4ranci0ne@gmail.com>
Date: Sat, 29 Jul 2023 22:14:59 +0900
Subject: [PATCH] fix

---
 .github/workflows/lint-actions.yml | 37 +++++++++++++-------------
 .github/workflows/lock-update.yml  |  2 +-
 .github/workflows/setup.yml        | 42 ++++++++++++++++++++++++++++++
 .github/workflows/test-build.yml   |  4 +--
 .vscode/settings.json              | 10 +++++--
 README.md                          |  5 ++--
 6 files changed, 75 insertions(+), 25 deletions(-)
 create mode 100644 .github/workflows/setup.yml

diff --git a/.github/workflows/lint-actions.yml b/.github/workflows/lint-actions.yml
index 6534e5f..8f8fadb 100644
--- a/.github/workflows/lint-actions.yml
+++ b/.github/workflows/lint-actions.yml
@@ -1,21 +1,22 @@
 name: Linter
 on: [pull_request]
 jobs:
-  eslint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8.5.1
-      - run: pnpm install --no-frozen-lockfile
-      
-      - name: eslint
-        uses: reviewdog/action-eslint@v1
-        with:
-          github_token: ${{ secrets.github_token }}
-          reporter: github-pr-review
-          fail_on_error: 'true'
+    eslint:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: "18"
+            - uses: pnpm/action-setup@v2
+              with:
+                  version: 8
+            - run: pnpm add -D eslint-config-prettier
+            - run: pnpm install --no-frozen-lockfile
+
+            - name: eslint
+              uses: reviewdog/action-eslint@v1
+              with:
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+                  reporter: github-pr-review
+                  fail_on_error: "true"
diff --git a/.github/workflows/lock-update.yml b/.github/workflows/lock-update.yml
index 4984788..4d504d6 100644
--- a/.github/workflows/lock-update.yml
+++ b/.github/workflows/lock-update.yml
@@ -15,7 +15,7 @@ jobs:
 
             - uses: pnpm/action-setup@v2
               with:
-                  version: 8.5.1
+                  version: 8
             - run: pnpm i --no-frozen-lockfile
             - name: commit
               run: |
diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml
new file mode 100644
index 0000000..0ad43ce
--- /dev/null
+++ b/.github/workflows/setup.yml
@@ -0,0 +1,42 @@
+name: main
+on:
+    workflow_dispatch:
+    push:
+jobs:
+    main:
+        concurrency: main
+        runs-on: ubuntu-latest
+        steps:
+            - name: checkout
+              uses: actions/checkout@v3
+
+            - name: setup-node
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 18
+
+            - uses: pnpm/action-setup@v2
+              with:
+                  version: 8
+            - run: pnpm install
+
+    format:
+        needs: [setup]
+              uses: ./.github/workflows/format.yml
+
+    lint:
+        needs: [setup]
+        uses: ./.github/workflows/lint.yml
+
+    build-test:
+        needs: [setup]
+        uses: ./github/workflows/test-build.yml
+
+    push:
+        needs: [format, lint]
+        uses: ./.github/workflows/push.yml
+
+    discord:
+        needs: [test-build, push]
+        concurrency: last
+        uses: ./.github/workflows/notice-discord.yml
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index e5aec0c..2d5cac5 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -19,12 +19,12 @@ jobs:
 
             - uses: pnpm/action-setup@v2
               with:
-                  version: 8.5.1
+                  version: 8
             - run: pnpm i --frozen-lockfile
 
             - name: Build Next.js application
               run: |
-                  touch .env.local          
+                  touch .env.local
                   echo "NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}" >> .env.local
                   echo "NEXT_PUBLIC_SUPABASE_PROJECT_URL=${{ secrets.NEXT_PUBLIC_SUPABASE_PROJECT_URL }}" >> .env.local
                   echo "NEXT_PUBLIC_TURNSTILE_SITE_KEY"= ${{ secrets.NEXT_PUBLIC_TURNSTILE_SITE_KEY }} >> .env.local
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1f2b05c..819af67 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,9 @@
+// .vscode/setting.json
 {
-  "nuxt.isNuxtApp": false
-}
\ No newline at end of file
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll": true
+    },
+    "eslint.alwaysShowStatus": true
+}
diff --git a/README.md b/README.md
index 30b7fd7..4fa3904 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 
 -   [Next.js](https://nextjs.org/)
 -   [Tailwind](https://tailwindcss.com/)
+-   [shadcn/ui](https://ui.shadcn.com/)
 -   [Cloudflare Images](https://www.cloudflare.com/ja-jp/products/cloudflare-images/)
 -   [Supabase](https://supabase.com/)
 -   [Stripe](https://stripe.com)
@@ -38,8 +39,8 @@ This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-opti
 
 To learn more about Next.js, take a look at the following resources:
 
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+-   [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+-   [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
 
 You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!