-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into duosi/fix/refactorTeamPage
- Loading branch information
Showing
93 changed files
with
9,511 additions
and
6,231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,5 +3,5 @@ root = true | |
|
|
||
| [*.{ts,tsx,json}] | ||
| tab_width = 2 | ||
| indent_style = tab | ||
| indent_style = space | ||
| end_of_line = lf | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| name: checks | ||
| on: | ||
| push: | ||
| pull_request: | ||
| jobs: | ||
| lint: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v2 | ||
| - name: Setup pnpm | ||
| uses: pnpm/action-setup@v2 | ||
| with: | ||
| version: 9 | ||
|
|
||
| - run: pnpm install | ||
| - run: pnpx eslint . | ||
| format: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v2 | ||
| - name: Setup pnpm | ||
| uses: pnpm/action-setup@v2 | ||
| with: | ||
| version: 9 | ||
|
|
||
| - run: pnpm install | ||
| - run: pnpx prettier . --check |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| { | ||
| "plugins": ["prettier-plugin-tailwindcss"], | ||
| "overrides": [ | ||
| { | ||
| "files": "*.astro", | ||
| "options": { | ||
| "parser": "astro" | ||
| } | ||
| } | ||
| ], | ||
| "tailwindFunctions": ["class"], | ||
| "semi": false, | ||
| "arrowParens": "avoid", | ||
| "trailingComma": "none", | ||
| "bracketSameLine": true | ||
| "plugins": ["prettier-plugin-tailwindcss"], | ||
| "overrides": [ | ||
| { | ||
| "files": "*.astro", | ||
| "options": { | ||
| "parser": "astro" | ||
| } | ||
| } | ||
| ], | ||
| "tailwindFunctions": ["class"], | ||
| "semi": false, | ||
| "arrowParens": "avoid", | ||
| "trailingComma": "none", | ||
| "bracketSameLine": true | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "recommendations": [ | ||
| "esbenp.prettier-vscode", | ||
| "dbaeumer.vscode-eslint", | ||
| "editorconfig.editorconfig", | ||
| "yoavbls.pretty-ts-errors", | ||
| "bradlc.vscode-tailwindcss" | ||
| ], | ||
| "unwantedRecommendations": [] | ||
| "recommendations": [ | ||
| "esbenp.prettier-vscode", | ||
| "dbaeumer.vscode-eslint", | ||
| "editorconfig.editorconfig", | ||
| "yoavbls.pretty-ts-errors", | ||
| "bradlc.vscode-tailwindcss" | ||
| ], | ||
| "unwantedRecommendations": [] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| { | ||
| "editor.formatOnSave": true, | ||
| "editor.formatOnPaste": true, | ||
| "editor.codeActionsOnSave": { | ||
| "source.fixAll.eslint": "explicit" | ||
| }, | ||
| "typescript.format.enable": true, | ||
| "typescript.preferences.importModuleSpecifier": "non-relative", | ||
| "[typescriptreact]": { | ||
| "editor.codeActionsOnSave": { | ||
| "source.organizeImports": "always" | ||
| }, | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| }, | ||
| "[typescript]": { | ||
| "editor.codeActionsOnSave": { | ||
| "source.organizeImports": "always" | ||
| }, | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| } | ||
| "editor.formatOnSave": true, | ||
| "editor.formatOnPaste": true, | ||
| "editor.codeActionsOnSave": { | ||
| "source.fixAll.eslint": "explicit" | ||
| }, | ||
| "typescript.format.enable": true, | ||
| "typescript.preferences.importModuleSpecifier": "non-relative", | ||
| "[typescriptreact]": { | ||
| "editor.codeActionsOnSave": { | ||
| "source.organizeImports": "always" | ||
| }, | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| }, | ||
| "[typescript]": { | ||
| "editor.codeActionsOnSave": { | ||
| "source.organizeImports": "always" | ||
| }, | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| { | ||
| "$schema": "https://ui.shadcn.com/schema.json", | ||
| "style": "default", | ||
| "rsc": true, | ||
| "tsx": true, | ||
| "tailwind": { | ||
| "config": "tailwind.config.ts", | ||
| "css": "src/app/globals.css", | ||
| "baseColor": "stone", | ||
| "cssVariables": false, | ||
| "prefix": "" | ||
| }, | ||
| "aliases": { | ||
| "components": "@/components", | ||
| "utils": "@/lib/utils" | ||
| } | ||
| "$schema": "https://ui.shadcn.com/schema.json", | ||
| "style": "default", | ||
| "rsc": true, | ||
| "tsx": true, | ||
| "tailwind": { | ||
| "config": "tailwind.config.ts", | ||
| "css": "src/app/globals.css", | ||
| "baseColor": "stone", | ||
| "cssVariables": false, | ||
| "prefix": "" | ||
| }, | ||
| "aliases": { | ||
| "components": "@/components", | ||
| "utils": "@/lib/utils" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import globals from "globals" | ||
| import pluginJs from "@eslint/js" | ||
| import tseslint from "typescript-eslint" | ||
| import pluginReact from "eslint-plugin-react" | ||
|
|
||
| export default [ | ||
| { files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] }, | ||
| { ignores: [".next/*"] }, | ||
| { languageOptions: { globals: globals.browser } }, | ||
| pluginJs.configs.recommended, | ||
| ...tseslint.configs.recommended, | ||
| pluginReact.configs.flat["jsx-runtime"], | ||
| { | ||
| rules: { | ||
| "@typescript-eslint/no-unused-vars": "warn" | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,74 @@ | ||
| { | ||
| "name": "armada.nu", | ||
| "version": "1.0.0", | ||
| "private": true, | ||
| "scripts": { | ||
| "dev": "next dev -p 8000", | ||
| "build": "next build", | ||
| "start": "next start", | ||
| "lint": "next lint" | ||
| }, | ||
| "dependencies": { | ||
| "@radix-ui/react-accordion": "^1.1.2", | ||
| "@radix-ui/react-checkbox": "^1.0.4", | ||
| "@radix-ui/react-collapsible": "^1.0.3", | ||
| "@radix-ui/react-dialog": "^1.0.5", | ||
| "@radix-ui/react-icons": "^1.3.0", | ||
| "@radix-ui/react-navigation-menu": "^1.1.4", | ||
| "@radix-ui/react-popover": "^1.0.7", | ||
| "@radix-ui/react-scroll-area": "^1.0.5", | ||
| "@radix-ui/react-select": "^2.0.0", | ||
| "@radix-ui/react-separator": "^1.0.3", | ||
| "@radix-ui/react-slot": "^1.0.2", | ||
| "@t3-oss/env-nextjs": "^0.9.2", | ||
| "@tanstack/react-query": "^5.20.1", | ||
| "@vercel/analytics": "^1.2.2", | ||
| "@vercel/flags": "^2.3.0", | ||
| "@vercel/speed-insights": "^1.0.10", | ||
| "@vercel/toolbar": "^0.1.14", | ||
| "class-variance-authority": "^0.7.0", | ||
| "clsx": "^2.1.0", | ||
| "contentful": "^10.6.21", | ||
| "embla-carousel-react": "^8.0.0", | ||
| "lucide-react": "^0.323.0", | ||
| "luxon": "^3.4.4", | ||
| "next": "14.1.0", | ||
| "next-themes": "^0.2.1", | ||
| "react": "18", | ||
| "react-countup": "^6.5.3", | ||
| "react-dom": "^18", | ||
| "react-google-recaptcha": "^3.1.0", | ||
| "react-multi-carousel": "^2.8.5", | ||
| "sharp": "^0.33.3", | ||
| "sonner": "^1.4.41", | ||
| "tailwind-merge": "^2.2.1", | ||
| "tailwindcss-animate": "^1.0.7", | ||
| "vaul": "^0.9.0", | ||
| "zod": "^3.22.4" | ||
| }, | ||
| "engines": { | ||
| "node": "20.12", | ||
| "pnpm": "8.15" | ||
| }, | ||
| "devDependencies": { | ||
| "@total-typescript/ts-reset": "^0.5.1", | ||
| "@types/luxon": "^3.4.2", | ||
| "@types/node": "^20", | ||
| "@types/react": "^18", | ||
| "@types/react-dom": "^18", | ||
| "autoprefixer": "^10.0.1", | ||
| "eslint": "^8.56.0", | ||
| "eslint-config-next": "14.1.0", | ||
| "postcss": "^8", | ||
| "prettier": "^3.2.5", | ||
| "prettier-plugin-tailwindcss": "^0.5.11", | ||
| "tailwindcss": "^3.3.0", | ||
| "typescript": "^5" | ||
| } | ||
| "name": "armada.nu", | ||
| "version": "1.0.0", | ||
| "private": true, | ||
| "scripts": { | ||
| "dev": "next dev -p 8000", | ||
| "build": "next build", | ||
| "start": "next start", | ||
| "lint": "next lint" | ||
| }, | ||
| "dependencies": { | ||
| "@radix-ui/react-accordion": "^1.1.2", | ||
| "@radix-ui/react-checkbox": "^1.0.4", | ||
| "@radix-ui/react-collapsible": "^1.0.3", | ||
| "@radix-ui/react-dialog": "^1.0.5", | ||
| "@radix-ui/react-icons": "^1.3.0", | ||
| "@radix-ui/react-navigation-menu": "^1.1.4", | ||
| "@radix-ui/react-popover": "^1.0.7", | ||
| "@radix-ui/react-scroll-area": "^1.0.5", | ||
| "@radix-ui/react-select": "^2.0.0", | ||
| "@radix-ui/react-separator": "^1.0.3", | ||
| "@radix-ui/react-slot": "^1.0.2", | ||
| "@t3-oss/env-nextjs": "^0.9.2", | ||
| "@tanstack/react-query": "^5.20.1", | ||
| "@vercel/analytics": "^1.2.2", | ||
| "@vercel/flags": "^2.3.0", | ||
| "@vercel/speed-insights": "^1.0.10", | ||
| "@vercel/toolbar": "^0.1.14", | ||
| "class-variance-authority": "^0.7.0", | ||
| "clsx": "^2.1.0", | ||
| "contentful": "^10.6.21", | ||
| "embla-carousel-react": "^8.0.0", | ||
| "js-cookie": "^3.0.5", | ||
| "lucide-react": "^0.323.0", | ||
| "luxon": "^3.4.4", | ||
| "next": "14.1.0", | ||
| "next-themes": "^0.2.1", | ||
| "react": "18", | ||
| "react-countup": "^6.5.3", | ||
| "react-dom": "^18", | ||
| "react-google-recaptcha": "^3.1.0", | ||
| "react-multi-carousel": "^2.8.5", | ||
| "sharp": "^0.33.3", | ||
| "sonner": "^1.4.41", | ||
| "tailwind-merge": "^2.2.1", | ||
| "tailwindcss-animate": "^1.0.7", | ||
| "vaul": "^0.9.0", | ||
| "zod": "^3.22.4" | ||
| }, | ||
| "engines": { | ||
| "node": "20.x", | ||
| "pnpm": "9.x" | ||
| }, | ||
| "devDependencies": { | ||
| "@eslint/js": "^9.8.0", | ||
| "@total-typescript/ts-reset": "^0.5.1", | ||
| "@types/js-cookie": "^3.0.6", | ||
| "@types/luxon": "^3.4.2", | ||
| "@types/node": "^20", | ||
| "@types/react": "^18", | ||
| "@types/react-dom": "^18", | ||
| "autoprefixer": "^10.0.1", | ||
| "eslint": "^9.8.0", | ||
| "eslint-config-next": "14.1.0", | ||
| "eslint-plugin-react": "^7.35.0", | ||
| "globals": "^15.9.0", | ||
| "postcss": "^8", | ||
| "prettier": "^3.2.5", | ||
| "prettier-plugin-tailwindcss": "^0.5.11", | ||
| "tailwindcss": "^3.3.0", | ||
| "typescript": "^5.5.4", | ||
| "typescript-eslint": "^8.0.1" | ||
| } | ||
| } |
Oops, something went wrong.