Merge branch 'dev'

app/components/FourOhFour.tsx

@@ -0,0 +1,28 @@
+import { Link } from "@remix-run/react";
+
+export default function FourOhFour() {
+  return (
+    <span className="text-center">
+      <h1 className="text-5xl font-bold m-2">4️⃣0️⃣4️⃣</h1>
+      <h1 className="text-5xl font-bold m-2">
+        Oops! This room does not appear to exist, or may have been deleted! 😢
+      </h1>
+      <h2 className="text-2xl font-bold m-2">
+        If you believe you reached this page in error, please file an issue{" "}
+        <a
+          href="https://github.com/atridadl/sprintpadawan/issues/new"
+          className="link link-secondary"
+        >
+          here
+        </a>
+      </h2>
+      <Link
+        about="Back to home."
+        to="/"
+        className="btn btn-secondary normal-case text-xl m-2"
+      >
+        Back to Home
+      </Link>
+    </span>
+  );
+}

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() {
           <ShieldIcon className="inline-block text-primary" />
         )}
         {isVIP(user?.publicMetadata) && (
-          <ShieldIcon className="inline-block text-secondary" />
+          <StarIcon className="inline-block text-secondary" />
         )}
       </h1>
 

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 (
+  return <FourOhFour />;
-    <span className="text-center">
-      <h1 className="text-5xl font-bold m-2">4️⃣0️⃣4️⃣</h1>
-      <h1 className="text-5xl font-bold m-2">
-        Oops! This room does not appear to exist, or may have been deleted! 😢
-      </h1>
-      <Link
-        about="Back to home."
-        to="/"
-        className="btn btn-secondary normal-case text-xl m-2"
-      >
-        Back to Home
-      </Link>
-    </span>
-  );
 }
 
 export default function Room() {

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",

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
+    specifier: ^7.3.0
-    version: 7.2.0(@remix-run/node@2.3.1)(@remix-run/react@2.3.1)(react@18.2.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
+    specifier: ^4.4.8
-    version: 4.4.6(postcss@8.4.31)
+    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):
+  /daisyui@4.4.8(postcss@8.4.31):
-    resolution: {integrity: sha512-Zum9dWsYufduID4IfwI1h/+qQIuoXBpVaG9l/rOlLOVbCmpvE7LQK/GDYE7YOT8NDXHOH+EqMqT8uzGqlbTFig==}
+    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):
+  /remix-utils@7.3.0(@remix-run/node@2.3.1)(@remix-run/react@2.3.1)(react@18.2.0):
-    resolution: {integrity: sha512-eFfwUZnGwKvINpC10HaF6fzywp0CsJ3cI/voNM7tv3NN+mbrqiwuOb/ANkVCOj51wdoXyGyvi1rix6j1IJf21w==}
+    resolution: {integrity: sha512-Ea5eNL04Ke4YYKI79ZR5doWtULe3ABkYkqhaP7mKiYcNVYAg6pA0PMuFYR2uyJYCGW43+/WlTfr3D4X5A0PsUA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       '@remix-run/cloudflare': ^2.0.0