Skip to content

Commit

Permalink
Merge pull request #99 from Katsuyuki-Karasawa/tailwind
Browse files Browse the repository at this point in the history
some changes
  • Loading branch information
L4Ph authored Dec 11, 2023
2 parents ab77d7c + 3e254f6 commit 44b747a
Show file tree
Hide file tree
Showing 68 changed files with 4,266 additions and 4,859 deletions.
32 changes: 16 additions & 16 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"extends": [
"next/core-web-vitals",
"plugin:import/recommended",
"plugin:import/warnings",
"prettier"
],
"rules": {
"import/order": [
"error",
{
"alphabetize": {
"order": "asc"
}
}
]
}
"extends": [
"next/core-web-vitals",
"plugin:import/recommended",
"plugin:import/warnings",
"prettier"
],
"rules": {
"import/order": [
"error",
{
"alphabetize": {
"order": "asc"
}
}
]
}
}
21 changes: 13 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
target:
branches:
- "main"
- "dev"
labels:
directory: "/"
schedule:
interval: "daily"
groups:
dependencies:
patterns:
- "*"
target:
branches:
- "main"
- "dev"
- "tailwind"
labels:
- "Dependabot"
26 changes: 26 additions & 0 deletions .github/workflows/biome.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Biome

on:
push:
branches:
- main
paths:
- "./src"
pull_request:
branches:
- main
paths:
- "./src"

jobs:
run:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Biome
uses: biomejs/setup-biome@v1
with:
version: 1.3.3
- name: Run Biome
run: biome ci .
22 changes: 0 additions & 22 deletions .github/workflows/lint-actions.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/lock-update.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": true
"source.fixAll": "explicit"
},
"eslint.alwaysShowStatus": true
}
23 changes: 23 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"$schema": "https://biomejs.dev/schemas/1.4.1/schema.json",
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"formatter": {
"enabled": true,
"formatWithErrors": false,
"indentStyle": "tab",
"indentWidth": 2,
"lineWidth": 80,
"ignore": []
},
"files": {
"ignore": [".next", "node_modules", "@/__generated__"]
}
}
28 changes: 14 additions & 14 deletions components.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "new-york",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "src\\app\\globals.css",
"baseColor": "slate",
"cssVariables": true
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
"$schema": "https://ui.shadcn.com/schema.json",
"style": "new-york",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "src\\app\\globals.css",
"baseColor": "slate",
"cssVariables": true
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
8 changes: 4 additions & 4 deletions i18n.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getRequestConfig } from 'next-intl/server';
import { getRequestConfig } from "next-intl/server";

export default getRequestConfig(async ({locale}) => ({
messages: (await import(`./locales/${locale}/common.json`)).default
}));
export default getRequestConfig(async ({ locale }) => ({
messages: (await import(`./locales/${locale}/common.json`)).default,
}));
6 changes: 3 additions & 3 deletions i18next.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "i18next";

declare module "i18next" {
interface CustomTypeOptions {
returnNull: false;
}
interface CustomTypeOptions {
returnNull: false;
}
}
138 changes: 69 additions & 69 deletions locales/en-US/common.json
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
{
"Home": {
"forai": "AIBoX is an ongoing support service for AI creators.",
"find": "Find a Creators",
"slogan1": "Unlock the potential of your work.",
"slogan2": "AI unleashes your creativity.",
"slogan3": "Share your work with the world"
},
"About": {
"creater": "AIクリエイターのための",
"patron": "支援サービス",
"aibox": "「AIBoX」"
},
"Login": {
"login": "Login",
"email": "Email",
"password": "Password",
"forgot": "Forgot Password?",
"remember": "Remember Me",
"google": "Login with Google"
},
"Signup": {
"signup": "Sign Up",
"email": "Email",
"start": "Start your journey",
"google": "Sign Up with Google",
"password": "Password",
"confirm_password": "パスワードの確認",
"agree": "次の規約に同意する:",
"agreements": "利用規約とプライバシーポリシー"
},
"Header": {
"home": "Home",
"about": "About",
"creators": "Creators",
"notice": "Notice",
"login": "Login",
"signup": "Sign Up",
"google": "Sign Up with Google"
},
"Check": {
"wrongemail": "メールアドレスの形式が間違っています",
"password_length": "パスワードは12文字以上で設定してください",
"confirm_notmatch": "パスワードが一致しません",
"pw_length": "パスワードは八文字以上で設定してください",
"pw_include_symbol": "パスワードには記号を入れてください"
},
"Setup": {
"setup": "セットアップ",
"user_id": "ユーザーID",
"display_name": "表示名",
"dob": "生年月日",
"start": "Start your journey"
},
"Dashboard": {
"dashboard": "ダッシュボード",
"profile": "プロフィール",
"assets": "投稿",
"plans": "支援プラン",
"packages": "パッケージ",
"earnings": "収益",
"addProfile": "プロフィールを追加"
},
"MailSent": {
"mailsent": "登録メールを送信完了",
"mailsentto": "登録メールを {{ email }} に送信しました",
"resend": "再送信する",
"back": "戻る",
"resent": "再送信完了"
}
"Home": {
"forai": "AIBoX is an ongoing support service for AI creators.",
"find": "Find a Creators",
"slogan1": "Unlock the potential of your work.",
"slogan2": "AI unleashes your creativity.",
"slogan3": "Share your work with the world"
},
"About": {
"creater": "AIクリエイターのための",
"patron": "支援サービス",
"aibox": "「AIBoX」"
},
"Login": {
"login": "Login",
"email": "Email",
"password": "Password",
"forgot": "Forgot Password?",
"remember": "Remember Me",
"google": "Login with Google"
},
"Signup": {
"signup": "Sign Up",
"email": "Email",
"start": "Start your journey",
"google": "Sign Up with Google",
"password": "Password",
"confirm_password": "パスワードの確認",
"agree": "次の規約に同意する:",
"agreements": "利用規約とプライバシーポリシー"
},
"Header": {
"home": "Home",
"about": "About",
"creators": "Creators",
"notice": "Notice",
"login": "Login",
"signup": "Sign Up",
"google": "Sign Up with Google"
},
"Check": {
"wrongemail": "メールアドレスの形式が間違っています",
"password_length": "パスワードは12文字以上で設定してください",
"confirm_notmatch": "パスワードが一致しません",
"pw_length": "パスワードは八文字以上で設定してください",
"pw_include_symbol": "パスワードには記号を入れてください"
},
"Setup": {
"setup": "セットアップ",
"user_id": "ユーザーID",
"display_name": "表示名",
"dob": "生年月日",
"start": "Start your journey"
},
"Dashboard": {
"dashboard": "ダッシュボード",
"profile": "プロフィール",
"assets": "投稿",
"plans": "支援プラン",
"packages": "パッケージ",
"earnings": "収益",
"addProfile": "プロフィールを追加"
},
"MailSent": {
"mailsent": "登録メールを送信完了",
"mailsentto": "登録メールを {{ email }} に送信しました",
"resend": "再送信する",
"back": "戻る",
"resent": "再送信完了"
}
}
Loading

0 comments on commit 44b747a

Please sign in to comment.