Skip to content

Commit

Permalink
Merge pull request #18 from dcrgll/update-eslint-prettier
Browse files Browse the repository at this point in the history
Update eslint & prettier to use dc_ config
  • Loading branch information
dcrgll authored Sep 12, 2024
2 parents 203facc + cd660ea commit 0ede9ab
Show file tree
Hide file tree
Showing 11 changed files with 151 additions and 211 deletions.
40 changes: 0 additions & 40 deletions .eslintrc.json

This file was deleted.

5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"workbench.colorCustomizations": {
"editor.lineHighlightBackground": "#223851"
}
}
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion components.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
"components": "@/components",
"utils": "@/lib/utils"
}
}
}
33 changes: 17 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,44 @@
"version": "0.1.0",
"private": true,
"scripts": {
"build": "next build",
"dev": "next dev",
"dev:turbo": "next dev --turbo",
"build": "next build",
"start": "next start",
"lint": "next lint",
"format": "prettier --write .",
"format:check": "prettier --check .",
"outdated": "bunx npm-check-updates --root --format group -i"
"lint": "next lint",
"outdated": "bunx npm-check-updates --root --format group -i",
"start": "next start"
},
"prettier": "@dc_/prettier-config",
"eslintConfig": {
"extends": "@dc_/eslint-config"
},
"dependencies": {
"@next/third-parties": "^14.2.5",
"@next/third-parties": "^14.2.10",
"@radix-ui/react-accordion": "^1.2.0",
"@t3-oss/env-nextjs": "^0.10.1",
"@t3-oss/env-nextjs": "^0.11.1",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"jiti": "^1.21.6",
"lucide-react": "^0.411.0",
"next": "14.2.5",
"lucide-react": "^0.440.0",
"next": "14.2.10",
"react": "^18",
"react-dom": "^18",
"tailwind-merge": "^2.4.0",
"tailwind-merge": "^2.5.2",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.23.8"
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
"@types/node": "^20",
"@dc_/eslint-config": "^1.0.1",
"@dc_/prettier-config": "^1.0.2",
"@types/node": "^22",
"@types/react": "^18",
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"eslint": "^8",
"eslint-config-next": "14.2.5",
"postcss": "^8",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.5",
"tailwindcss": "^3.4.6",
"tailwindcss": "^3.4.11",
"typescript": "^5"
}
}
33 changes: 0 additions & 33 deletions prettier.config.mjs

This file was deleted.

10 changes: 5 additions & 5 deletions src/app/about/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ export default function AboutPage() {
<li>can normally be found in a room full of guitar pedals.</li>

<li>
building <Link href="https://flxsh.co">flxsh.co</Link> because
organising a tattoo is a pain.
I also build tools for creatives at{' '}
<Link href="https://payday.so">payday.so</Link>.
</li>

<li>recently became an elden lord.</li>
<li>
i buy a lot of domains and{' '}
<Link href="https://domains.cargill.dev">
{"promise i'm doing something with them"}
I like to{' '}
<Link href="https://instagram.com/dncrgll">
travel and play music
</Link>
.
</li>
Expand Down
133 changes: 67 additions & 66 deletions src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,73 +1,74 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind components;
@tailwind utilities;

@layer base {
:root {
--background: 215, 40%, 12%;
--foreground: 222.2 84% 4.9%;
--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;
--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;
--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;
--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;
--accent: 210 40% 96.1%;
--accent-foreground: 39, 93%, 59%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;
--border: 215, 33%, 22%;
--input: 215, 33%, 22%;
--ring: 222.2 84% 4.9%;
--radius: 0.5rem;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
}

.dark {
--background: 215, 40%, 12%;
--foreground: 210 40% 98%;
--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;
--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;
--secondary: 215, 33%, 22%;
--secondary-foreground: 210 40% 98%;
--muted: 215, 33%, 22%;
--muted-foreground: 215 20.2% 65.1%;
--accent: 215, 33%, 22%;
--accent-foreground: 210 40% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;
--border: 215, 33%, 22%;
--input: 215, 33%, 22%;
--ring: 212.7 26.8% 83.9%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%;
}
@layer base {
:root {
--background: 215, 40%, 12%;
--foreground: 222.2 84% 4.9%;
--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;
--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;
--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;
--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;
--accent: 210 40% 96.1%;
--accent-foreground: 39, 93%, 59%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;
--border: 215, 33%, 22%;
--input: 215, 33%, 22%;
--ring: 222.2 84% 4.9%;
--radius: 0.5rem;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
}

@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
.dark {
--background: 215, 40%, 12%;
--foreground: 210 40% 98%;
--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;
--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;
--secondary: 215, 33%, 22%;
--secondary-foreground: 210 40% 98%;
--muted: 215, 33%, 22%;
--muted-foreground: 215 20.2% 65.1%;
--accent: 215, 33%, 22%;
--accent-foreground: 210 40% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;
--border: 215, 33%, 22%;
--input: 215, 33%, 22%;
--ring: 212.7 26.8% 83.9%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%;
}
}

html, body {
background-color: #121C2A;
@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
}

html,
body {
background-color: #121c2a;
}
8 changes: 4 additions & 4 deletions src/lib/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ export const projects: Record<string, Project> = {
description: "the world's leading student loyalty network.",
tags: ['typescript', 'next.js', 'tailwindcss', 'emotion', 'aws']
},
flxsh: {
href: 'https://flxsh.co',
label: 'flxsh',
description: "let's make tattoos easier.",
payday: {
href: 'https://payday.so',
label: 'payday',
description: 'building tools for creatives.',
tags: ['typescript', 'react', 'next.js', 'tailwindcss', 'vercel']
},
conjurer: {
Expand Down
Loading

0 comments on commit 0ede9ab

Please sign in to comment.