From 40c85eb5e087373140820d107f016ca4ec60d496 Mon Sep 17 00:00:00 2001 From: atridadl Date: Sat, 25 Nov 2023 23:48:10 -0700 Subject: [PATCH 1/2] Split out error bound component for rooms and improved the message --- app/components/FourOhFour.tsx | 28 ++++++++++++++++++++++++++++ app/routes/dashboard.tsx | 4 ++-- app/routes/room.$roomId.tsx | 19 +++---------------- 3 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 app/components/FourOhFour.tsx diff --git a/app/components/FourOhFour.tsx b/app/components/FourOhFour.tsx new file mode 100644 index 0000000..310534c --- /dev/null +++ b/app/components/FourOhFour.tsx @@ -0,0 +1,28 @@ +import { Link } from "@remix-run/react"; + +export default function FourOhFour() { + return ( + +

4️⃣0️⃣4️⃣

+

+ Oops! This room does not appear to exist, or may have been deleted! 😢 +

+

+ If you believe you reached this page in error, please file an issue{" "} + + here + +

+ + Back to Home + + + ); +} diff --git a/app/routes/dashboard.tsx b/app/routes/dashboard.tsx index 1020e78..829fe62 100644 --- a/app/routes/dashboard.tsx +++ b/app/routes/dashboard.tsx @@ -1,7 +1,7 @@ import { getAuth } from "@clerk/remix/ssr.server"; import { LoaderFunction, redirect } from "@remix-run/node"; import { Link } from "@remix-run/react"; -import { LogInIcon, ShieldIcon, TrashIcon } from "lucide-react"; +import { LogInIcon, ShieldIcon, StarIcon, TrashIcon } from "lucide-react"; import { useState } from "react"; import LoadingIndicator from "~/components/LoadingIndicator"; import { useEventSource } from "remix-utils/sse/react"; @@ -114,7 +114,7 @@ export default function Dashboard() { )} {isVIP(user?.publicMetadata) && ( - + )} diff --git a/app/routes/room.$roomId.tsx b/app/routes/room.$roomId.tsx index a1510ad..f4c69fd 100644 --- a/app/routes/room.$roomId.tsx +++ b/app/routes/room.$roomId.tsx @@ -1,6 +1,6 @@ import { getAuth } from "@clerk/remix/ssr.server"; import { LoaderFunction, redirect } from "@remix-run/node"; -import { Link, useParams } from "@remix-run/react"; +import { useParams } from "@remix-run/react"; import { CheckCircleIcon, CopyIcon, @@ -28,6 +28,7 @@ import { db } from "~/services/db.server"; import { rooms } from "~/services/schema"; import { eq } from "drizzle-orm"; import { shitList } from "~/services/consts.server"; +import FourOhFour from "~/components/FourOhFour"; // Loader export const loader: LoaderFunction = async (args) => { @@ -69,21 +70,7 @@ export const loader: LoaderFunction = async (args) => { // Checks for 404 export function ErrorBoundary() { - return ( - -

4️⃣0️⃣4️⃣

-

- Oops! This room does not appear to exist, or may have been deleted! 😢 -

- - Back to Home - - - ); + return ; } export default function Room() { From 6aec37403e711da404ef82422491c585d38356dc Mon Sep 17 00:00:00 2001 From: atridadl Date: Sat, 25 Nov 2023 23:50:40 -0700 Subject: [PATCH 2/2] Deps --- package.json | 4 ++-- pnpm-lock.yaml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index c5eec41..4fa237a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "lucide-react": "^0.293.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "remix-utils": "^7.2.0", + "remix-utils": "^7.3.0", "svix": "^1.14.0" }, "devDependencies": { @@ -35,7 +35,7 @@ "@types/react-dom": "^18.2.17", "autoprefixer": "^10.4.16", "better-sqlite3": "^9.1.1", - "daisyui": "^4.4.6", + "daisyui": "^4.4.8", "dotenv": "^16.3.1", "drizzle-kit": "^0.20.4", "eslint": "^8.54.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b4b4b40..678d056 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -45,8 +45,8 @@ dependencies: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) remix-utils: - specifier: ^7.2.0 - version: 7.2.0(@remix-run/node@2.3.1)(@remix-run/react@2.3.1)(react@18.2.0) + specifier: ^7.3.0 + version: 7.3.0(@remix-run/node@2.3.1)(@remix-run/react@2.3.1)(react@18.2.0) svix: specifier: ^1.14.0 version: 1.14.0 @@ -74,8 +74,8 @@ devDependencies: specifier: ^9.1.1 version: 9.1.1 daisyui: - specifier: ^4.4.6 - version: 4.4.6(postcss@8.4.31) + specifier: ^4.4.8 + version: 4.4.8(postcss@8.4.31) dotenv: specifier: ^16.3.1 version: 16.3.1 @@ -2923,8 +2923,8 @@ packages: type: 1.2.0 dev: true - /daisyui@4.4.6(postcss@8.4.31): - resolution: {integrity: sha512-Zum9dWsYufduID4IfwI1h/+qQIuoXBpVaG9l/rOlLOVbCmpvE7LQK/GDYE7YOT8NDXHOH+EqMqT8uzGqlbTFig==} + /daisyui@4.4.8(postcss@8.4.31): + resolution: {integrity: sha512-snl26WEyX/IoT789Fw5yBoSZA5YHKHJokcVfJ7p7xZa9Dwee3rvlWzBlRUuvJk0FeEGbaSpULcKo42qXkR5wDg==} engines: {node: '>=16.9.0'} dependencies: css-selector-tokenizer: 0.8.0 @@ -6752,8 +6752,8 @@ packages: unified: 10.1.2 dev: true - /remix-utils@7.2.0(@remix-run/node@2.3.1)(@remix-run/react@2.3.1)(react@18.2.0): - resolution: {integrity: sha512-eFfwUZnGwKvINpC10HaF6fzywp0CsJ3cI/voNM7tv3NN+mbrqiwuOb/ANkVCOj51wdoXyGyvi1rix6j1IJf21w==} + /remix-utils@7.3.0(@remix-run/node@2.3.1)(@remix-run/react@2.3.1)(react@18.2.0): + resolution: {integrity: sha512-Ea5eNL04Ke4YYKI79ZR5doWtULe3ABkYkqhaP7mKiYcNVYAg6pA0PMuFYR2uyJYCGW43+/WlTfr3D4X5A0PsUA==} engines: {node: '>=18.0.0'} peerDependencies: '@remix-run/cloudflare': ^2.0.0