feat(resources): update resource types and improve data fetching, add capitalize utility function

Author: tyronejosee

src/actions/resources.ts

@@ -1,25 +1,34 @@
 "use server";
 
+import type { Resource } from "@/types";
+
 import { createClient } from "@/lib/supabase/server";
 
 export const getResources = async () => {
   const supabase = await createClient();
   const { data, error } = await supabase.from("resources").select(`
-    *,
+    id,
+    name,
+    slug,
+    image,
+    tags,
     category:categories (id, name)
     `);
 
   if (error) throw error;
   return data;
 };
 
-export const getResourceBySlug = async (slug: string) => {
+export const getResourceBySlug = async (
+  slug: string,
+): Promise<Resource | null> => {
   const supabase = await createClient();
   const { data, error } = await supabase
     .from("resources")
     .select("*")
     .eq("slug", slug)
     .single();
-  if (error) throw error;
+
+  if (error) throw new Error(error.message);
   return data;
 };

src/app/(public)/auth/callback/route.ts

@@ -1,10 +1,11 @@
 import { NextResponse } from "next/server";
 import { createClient } from "@/lib/supabase/server";
+import { HOME_PATH } from "@/config/constants";
 
 export async function GET(request: Request) {
   const { searchParams, origin } = new URL(request.url);
   const code = searchParams.get("code");
-  const next = searchParams.get("next") ?? "/";
+  const next = searchParams.get("next") ?? HOME_PATH;
 
   if (code) {
     const supabase = await createClient();

src/app/not-found.tsx

@@ -3,13 +3,14 @@
 import { useEffect } from "react";
 import { useRouter } from "next/navigation";
 import { motion } from "framer-motion";
+import { HOME_PATH } from "@/config/constants";
 
 export default function NotFoundPage() {
   const router = useRouter();
 
   useEffect(() => {
     const timer = setTimeout(() => {
-      router.push("/");
+      router.push(HOME_PATH);
     }, 5000);
 
     return () => clearTimeout(timer);

src/components/resources/resource-list.tsx

@@ -1,11 +1,11 @@
 "use client";
 
-import type { ResourceResponse } from "@/types";
+import type { Resource } from "@/types";
 
 import { ResourceCard } from "@/components/resources";
 
 type Props = {
-  resources: ResourceResponse[];
+  resources: Resource[];
 };
 
 export default function ResourceList({ resources }: Props) {

src/lib/utils.ts

@@ -0,0 +1,3 @@
+export function capitalize(str: string) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}

src/types/index.ts

@@ -1,20 +1,6 @@
-// Api Responses
-export type ResourceResponse = {
-  id: string;
-  title: string;
-  slug: string;
-  description: string;
-  image: string;
-  category: string;
-  tags: string[];
-  author: {
-    id: string;
-    name: string;
-  };
-  created_at: string;
-};
+// Supabase Types
 
-export type UserResponse = {
+export type User = {
   id: string;
   email?: string;
   user_metadata: {
@@ -23,3 +9,24 @@ export type UserResponse = {
     avatar_url: string;
   };
 };
+
+export type Category = {
+  id: string;
+  name: string;
+  slug: string;
+  created_at: string;
+};
+
+export type Resource = {
+  id: string;
+  name: string;
+  slug: string;
+  url: string;
+  description: string;
+  image: string;
+  tags: string[];
+  author: string;
+  category: Omit<Category, "id" | "created_at">;
+  status: "pending" | "approved" | "rejected";
+  created_at: string;
+};