Skip to content

Commit

Permalink
Merge branch 'hexaaagon/main'
Browse files Browse the repository at this point in the history
feat: new landing, cleaner code, etc
  • Loading branch information
cnrad authored Nov 14, 2024
2 parents 5484b94 + dc1854e commit e8ded26
Show file tree
Hide file tree
Showing 40 changed files with 6,337 additions and 3,718 deletions.
7 changes: 0 additions & 7 deletions .eslintrc

This file was deleted.

7 changes: 7 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": ["next", "next/core-web-vitals"],
"rules": {
"react/no-unescaped-entities": "off",
"@next/next/no-img-element": "off"
}
}
13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
.env

# dependencies
/node_modules
/.yarn
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage
Expand All @@ -27,10 +26,12 @@ yarn-debug.log*
yarn-error.log*

# local env files
.env.local
.env.development.local
.env.test.local
.env.production.local
.env*.local
.env

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
src/renderCard.tsx
15 changes: 8 additions & 7 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"quoteProps": "consistent",
"printWidth": 120,
"bracketSpacing": true,
"singleQuote": false,
"useTabs": false,
"arrowParens": "avoid",
"tabWidth": 4
"plugins": ["prettier-plugin-tailwindcss"],
"quoteProps": "consistent",
"printWidth": 120,
"bracketSpacing": true,
"singleQuote": false,
"useTabs": false,
"arrowParens": "avoid",
"tabWidth": 2
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ If you don't want people seeing your discriminator (most likely for privacy reas
\
Note: Current Nitro & Boosting badges **do not work due** to Discord API limitations, unless you currently have an animated avatar, in which case it will display the Nitro badge.

_If you're using this in your profile, feel free to show support and give this repo a ⭐ star! It means a lot, thank you :)_
_If you're using this in your profile, feel free to show support and give this repo a ⭐ star! It means a lot, thank you :)_
20 changes: 20 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "new-york",
"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",
"ui": "@/components/ui",
"lib": "@/lib",
"hooks": "@/hooks"
}
}
2 changes: 1 addition & 1 deletion next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
3 changes: 0 additions & 3 deletions next.config.js

This file was deleted.

4 changes: 4 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {};

export default nextConfig;
50 changes: 28 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,41 @@
{
"name": "next-app",
"name": "lanyard-profile-readme",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"dev": "next dev --turbopack -p 3001",
"build": "next build",
"start": "next start",
"start": "next start -p 3001",
"lint": "next lint"
},
"packageManager": "[email protected]",
"dependencies": {
"@types/escape-html": "^1.0.1",
"@types/ioredis": "^4.28.8",
"@types/styled-components": "^5.1.10",
"axios": "^0.21.1",
"@radix-ui/react-popover": "^1.1.2",
"@types/escape-html": "^1.0.4",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "1.0.0",
"escape-html": "^1.0.3",
"framer-motion": "^4.1.17",
"image-to-base64": "^2.2.0",
"ioredis": "^4.28.5",
"next": "12.2.5",
"react": "18.2.0",
"react-dom": "18.2.0",
"styled-components": "^5.3.0",
"use-smooth-count": "^0.3.0"
"framer-motion": "12.0.0-alpha.1",
"ioredis": "^5.4.1",
"lucide-react": "^0.453.0",
"next": "15.0.3",
"react": "18.3.1",
"react-dom": "18.3.1",
"swr": "^2.2.5",
"tailwind-merge": "^2.5.4",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@types/escape-html": "^1.0.1",
"@types/image-to-base64": "^2.1.0",
"@types/react": "^18.2.45",
"eslint": "7.28.0",
"eslint-config-next": "11.0.0",
"prettier": "^2.3.1",
"typescript": "4.3.3"
"@types/node": "^20",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"eslint": "^8",
"eslint-config-next": "15.0.1",
"postcss": "^8",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"tailwindcss": "^3.4.1",
"typescript": "^5"
}
}
18 changes: 0 additions & 18 deletions pages/_app.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions pages/_document.tsx

This file was deleted.

67 changes: 0 additions & 67 deletions pages/api/[...id].ts

This file was deleted.

9 changes: 0 additions & 9 deletions pages/api/getUserCount.ts

This file was deleted.

Loading

0 comments on commit e8ded26

Please sign in to comment.