Skip to content

Commit

Permalink
Merge pull request #92 from Katsuyuki-Karasawa/tailwind
Browse files Browse the repository at this point in the history
fix
  • Loading branch information
L4Ph authored Jul 29, 2023
2 parents 079e68d + 4aafdd1 commit 0658028
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 25 deletions.
37 changes: 19 additions & 18 deletions .github/workflows/lint-actions.yml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/lock-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/setup.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
// .vscode/setting.json
{
"nuxt.isNuxtApp": false
}
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": true
},
"eslint.alwaysShowStatus": true
}
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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!

Expand Down

0 comments on commit 0658028

Please sign in to comment.