Skip to content

Commit

Permalink
Merge branch 'main' into file-uploads
Browse files Browse the repository at this point in the history
  • Loading branch information
FleetAdmiralJakob committed Dec 11, 2024
2 parents ac0a29e + 4768453 commit 50cfd5d
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 35 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<img width="1392" alt="image" src="https://github.com/user-attachments/assets/da547f11-3d64-4a28-8a04-132185e2179a">
<img width="1392" alt="image" src="https://github.com/user-attachments/assets/3ae685cd-0a61-4ee2-b996-1e9cf73c4d6f">


# Create T3 App

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@
"emoji-regex": "^10.4.0",
"framer-motion": "^12.0.0-alpha.2",
"geist": "^1.3.1",
"jiti": "^2.4.0",
"jiti": "^2.4.1",
"lucide-react": "^0.468.0",
"next": "^15.0.3",
"next-axiom": "^1.6.0",
"next-themes": "^0.4.3",
"next-axiom": "^1.7.0",
"next-themes": "^0.4.4",
"npm-run-all2": "^7.0.1",
"posthog-js": "^1.189.0",
"posthog-js": "^1.195.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-hook-form": "^7.53.2",
"react-hook-form": "7.53.2",
"react-intersection-observer": "^9.13.1",
"react-resizable-panels": "^2.1.7",
"react-responsive": "^10.0.0",
"react-scan": "^0.0.42",
"react-scan": "^0.0.43",
"sonner": "^1.7.0",
"tailwind-merge": "^2.5.4",
"tailwindcss-animate": "^1.0.7",
Expand Down
46 changes: 24 additions & 22 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,10 @@ export default function RootLayout({
</CSPostHogProvider>
</ClerkProvider>
</ThemeProvider>
<Suspense>
<Monitoring
apiKey="w-1y_WGLno534NOfDIi-JKYqMI4xpUf_"
url="https://monitoring.react-scan.com/api/v1/ingest"
/>
</Suspense>
<Monitoring
apiKey="w-1y_WGLno534NOfDIi-JKYqMI4xpUf_"
url="https://monitoring.react-scan.com/api/v1/ingest"
/>
</body>
</html>
);
Expand Down

0 comments on commit 50cfd5d

Please sign in to comment.