Merge pull request #93 from dotslashf/development

New Achievement

prisma/migrations/20241004154110_add_new_achievement/migration.sql

@@ -0,0 +1,11 @@
+-- AlterEnum
+-- This migration adds more than one value to an enum.
+-- With PostgreSQL versions 11 and earlier, this is not possible
+-- in a single migration. This can be worked around by creating
+-- multiple migrations, each migration adding only one value to
+-- the enum.
+
+
+ALTER TYPE "AchievementType" ADD VALUE 'FiveCopyPastaADay';
+ALTER TYPE "AchievementType" ADD VALUE 'TagCollector';
+ALTER TYPE "AchievementType" ADD VALUE 'CollectionCurator';

prisma/schema.prisma

@@ -201,6 +201,9 @@ enum AchievementType {
     OneMonthStreak
     ThreeMonthStreak
     SixMonthStreak
+    FiveCopyPastaADay
+    TagCollector
+    CollectionCurator
 }
 
 enum EngagementAction {

src/app/(main)/collection/[id]/page.tsx

@@ -3,7 +3,7 @@ import { api, HydrateClient } from "~/trpc/server";
 import { Suspense } from "react";
 import SkeletonCopyPasta from "~/components/Skeleton/CopyPasta";
 import { type Metadata } from "next";
-import { trimContent } from "~/lib/utils";
+import { trimContent } from "~/utils";
 import { notFound } from "next/navigation";
 import { baseUrl } from "~/lib/constant";
 import CollectionByIdPage from "~/app/_components/CollectionByIdPage";

src/app/(main)/copy-pasta/[id]/page.tsx

@@ -4,11 +4,7 @@ import CopyPastaPage from "~/app/_components/CopyPastaByIdPage";
 import { Suspense } from "react";
 import SkeletonCopyPasta from "~/components/Skeleton/CopyPasta";
 import { type Metadata } from "next";
-import {
-  formatDateToHuman,
-  generateSchemaById,
-  trimContent,
-} from "~/lib/utils";
+import { formatDateToHuman, generateSchemaById, trimContent } from "~/utils";
 import { notFound } from "next/navigation";
 import { baseUrl } from "~/lib/constant";
 import { type Article } from "schema-dts";

src/app/(main)/user/[id]/page.tsx

@@ -1,7 +1,7 @@
 import Layout from "~/components/Common/Layout";
 import { api, HydrateClient } from "~/trpc/server";
 import { type Metadata } from "next";
-import { trimContent } from "~/lib/utils";
+import { trimContent } from "~/utils";
 import { notFound } from "next/navigation";
 import { baseUrl } from "~/lib/constant";
 import UserCopyPastaPage from "~/app/_components/UserCopyPastaPage";

src/app/_components/CollectionByIdPage.tsx

@@ -6,7 +6,7 @@ import CardById from "~/components/Collection/CardById";
 import CardCollectionDescription from "~/components/Collection/CardCollectionDescription";
 import CardList from "~/components/Collection/CardLists";
 import { type CardCopyPastaMinimal } from "~/lib/interface";
-import { getBreadcrumbs } from "~/lib/utils";
+import { getBreadcrumbs } from "~/utils";
 import { api } from "~/trpc/react";
 
 interface CollectionByIdProps {

src/app/_components/CopyPastaByIdPage.tsx

@@ -5,7 +5,7 @@ import BreadCrumbs from "~/components/Common/BreadCrumbs";
 import CardById from "~/components/CopyPasta/CardById";
 import CardRelated from "~/components/CopyPasta/CardRelated";
 import SkeletonCopyPasta from "~/components/Skeleton/CopyPasta";
-import { getBreadcrumbs, getTweetId, trimContent } from "~/lib/utils";
+import { getBreadcrumbs, getTweetId, trimContent } from "~/utils";
 import { api } from "~/trpc/react";
 import TweetPage from "./TweetPage";
 

src/app/_components/CreateCollectionPage.tsx

@@ -28,7 +28,7 @@ import { ScrollBar, ScrollArea } from "~/components/ui/scroll-area";
 import EmptyState from "~/components/Common/EmptyState";
 import CardList from "~/components/Collection/CardLists";
 import BreadCrumbs from "~/components/Common/BreadCrumbs";
-import { getBreadcrumbs } from "~/lib/utils";
+import { getBreadcrumbs } from "~/utils";
 
 export default function CreateCollection() {
   const createMutation = api.collection.create.useMutation();

src/app/_components/CreateCopyPastaPage.tsx

@@ -30,7 +30,7 @@ import {
   formatDateToHuman,
   getBreadcrumbs,
   getTweetId,
-} from "~/lib/utils";
+} from "~/utils";
 import { createCopyPastaFormClient } from "../../server/form/copyPasta";
 import { type z } from "zod";
 import useToast from "~/components/ui/use-react-hot-toast";

src/app/_components/Dashboard/CollectionPage.tsx

@@ -9,7 +9,7 @@ import EmptyState from "~/components/Common/EmptyState";
 import GetContent from "~/components/Common/GetContent";
 import { useSession } from "~/components/Common/SessionContext";
 import { Button, buttonVariants } from "~/components/ui/button";
-import { cn, getBreadcrumbs } from "~/lib/utils";
+import { cn, getBreadcrumbs } from "~/utils";
 import { api } from "~/trpc/react";
 
 export default function CollectionPage() {

src/app/_components/Dashboard/CopyPastaPage.tsx

@@ -6,7 +6,7 @@ import BreadCrumbs from "~/components/Common/BreadCrumbs";
 import DashboardCopyPastaAdmin from "~/components/Dashboard/CopyPasta/DashboardCopyPastaAdmin";
 import DashboardCopyPastaUser from "~/components/Dashboard/CopyPasta/DashboardCopyPastaUser";
 import { useSession } from "~/components/Common/SessionContext";
-import { getBreadcrumbs } from "~/lib/utils";
+import { getBreadcrumbs } from "~/utils";
 
 export default function ProfileCopyPastaPage() {
   const session = useSession();

src/app/_components/Dashboard/EditCollectionPage.tsx

@@ -28,7 +28,7 @@ import { ScrollBar, ScrollArea } from "~/components/ui/scroll-area";
 import EmptyState from "~/components/Common/EmptyState";
 import CardList from "~/components/Collection/CardLists";
 import BreadCrumbs from "~/components/Common/BreadCrumbs";
-import { getBreadcrumbs } from "~/lib/utils";
+import { getBreadcrumbs } from "~/utils";
 
 export default function EditCollectionPage({ id }: { id: string }) {
   const [collection] = api.collection.byId.useSuspenseQuery({

src/app/_components/Dashboard/ProfilePage.tsx

@@ -9,7 +9,7 @@ import { useSession } from "~/components/Common/SessionContext";
 import { buttonVariants } from "~/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
 import UserProfileCard from "~/components/Common/UserProfileCard";
-import { cn, getBreadcrumbs } from "~/lib/utils";
+import { cn, getBreadcrumbs } from "~/utils";
 
 export default function ProfilePage() {
   const session = useSession();

src/app/_components/EditCopyPastaPage.tsx

@@ -15,7 +15,7 @@ import { Input } from "~/components/ui/input";
 import { Textarea } from "~/components/ui/textarea";
 import { api } from "~/trpc/react";
 import { Pencil } from "lucide-react";
-import { determineSource, formatDateToHuman } from "~/lib/utils";
+import { determineSource, formatDateToHuman } from "~/utils";
 import { editCopyPastaForm } from "../../server/form/copyPasta";
 import { type z } from "zod";
 import useToast from "~/components/ui/use-react-hot-toast";

src/app/_components/ListCollectionPage.tsx

@@ -7,7 +7,7 @@ import GetContent from "~/components/Common/GetContent";
 import { Button } from "~/components/ui/button";
 import { ANALYTICS_EVENT } from "~/lib/constant";
 import { trackEvent } from "~/lib/track";
-import { getBreadcrumbs } from "~/lib/utils";
+import { getBreadcrumbs } from "~/utils";
 import { api } from "~/trpc/react";
 
 export default function ListCollectionPage() {

src/app/_components/ListCopyPastaPage.tsx

@@ -6,7 +6,7 @@ import SkeletonListCopyPasta from "~/components/Skeleton/ListCopyPasta";
 import { usePathname, useSearchParams } from "next/navigation";
 import SkeletonTrending from "~/components/Skeleton/Trending";
 import BreadCrumbs from "~/components/Common/BreadCrumbs";
-import { getBreadcrumbs } from "~/lib/utils";
+import { getBreadcrumbs } from "~/utils";
 
 const TrendingHome = dynamic(() => import("~/components/Trending/Trending"), {
   ssr: false,

src/app/_components/RankingPage.tsx

@@ -9,7 +9,7 @@ import {
   TableBody,
   TableCell,
 } from "~/components/ui/table";
-import { getBreadcrumbs, getMedal } from "~/lib/utils";
+import { getBreadcrumbs, getMedal } from "~/utils";
 import { api } from "~/trpc/react";
 import {
   Accordion,

src/app/_components/StatisticsPage.tsx

@@ -30,7 +30,7 @@ import {
   ChartTooltipContent,
 } from "~/components/ui/chart";
 import { DAYS } from "~/lib/constant";
-import { formatDateToHuman, getBreadcrumbs, parseDate } from "~/lib/utils";
+import { formatDateToHuman, getBreadcrumbs, parseDate } from "~/utils";
 import { api } from "~/trpc/react";
 
 const chartConfigDonutReaction = {

src/app/_components/SupportPage.tsx

@@ -7,7 +7,7 @@ import { usePathname } from "next/navigation";
 import BreadCrumbs from "~/components/Common/BreadCrumbs";
 import { buttonVariants } from "~/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
-import { cn, getBreadcrumbs } from "~/lib/utils";
+import { cn, getBreadcrumbs } from "~/utils";
 
 export default function SupportPage() {
   const pathname = usePathname();

src/app/_components/TweetPage.tsx

@@ -6,7 +6,7 @@ import { type Tweet } from "react-tweet/api";
 import EmptyState from "~/components/Common/EmptyState";
 import CustomTweet from "~/components/Tweet/CustomTweet";
 import SkeletonTweet from "~/components/Tweet/SkeletonTweet";
-import { sanitizeTweetEnrich } from "~/lib/utils";
+import { sanitizeTweetEnrich } from "~/utils";
 
 interface TweetPageProps {
   id: string;

src/app/page.tsx

@@ -4,7 +4,7 @@ import Hero from "~/components/Common/Hero";
 import { type Metadata } from "next";
 import { baseUrl } from "~/lib/constant";
 import { Homepage } from "./_components/Homepage";
-import { generateSchemaOrgWebSite } from "~/lib/utils";
+import { generateSchemaOrgWebSite } from "~/utils";
 
 type Props = {
   params: { id: string };

src/components/Collection/CardById.tsx

@@ -13,7 +13,7 @@ import {
   NotebookPen,
 } from "lucide-react";
 import { ANALYTICS_EVENT, sourceEnumHash } from "~/lib/constant";
-import { cn, trimContent } from "~/lib/utils";
+import { cn, trimContent } from "~/utils";
 import { Button, buttonVariants } from "~/components/ui/button";
 import Link from "next/link";
 import Tag from "~/components/ui/tags";

src/components/Collection/CardCollectionDescription.tsx

@@ -1,5 +1,5 @@
 import { CalendarDays, Check, ChevronRight, Pencil, Trash } from "lucide-react";
-import { formatDateToHuman, cn } from "~/lib/utils";
+import { formatDateToHuman, cn } from "~/utils";
 import Avatar from "~/components/ui/avatar-image";
 import { Badge, badgeVariants } from "~/components/ui/badge";
 import {

src/components/Collection/CardLists.tsx

@@ -1,4 +1,4 @@
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 
 interface CollectionListProps<T> {
   listOfCollections: T[];

src/components/Collection/CardSearchResult.tsx

@@ -17,7 +17,7 @@ import {
   Plus,
 } from "lucide-react";
 import { ANALYTICS_EVENT } from "~/lib/constant";
-import { cn, trimContent } from "~/lib/utils";
+import { cn, trimContent } from "~/utils";
 import { Button, buttonVariants } from "~/components/ui/button";
 import Link from "next/link";
 import Tag from "~/components/ui/tags";

src/components/Common/EmptyState.tsx

@@ -1,5 +1,5 @@
 import { type ReactElement, type HTMLAttributes } from "react";
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 
 interface EmptyStateProps extends HTMLAttributes<HTMLDivElement> {
   message?: string | ReactElement;

src/components/Common/Hero.tsx

@@ -4,7 +4,7 @@ import { NotebookPen, Search } from "lucide-react";
 import React from "react";
 import { buttonVariants } from "~/components/ui/button";
 import Link from "next/link";
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 import Marquee from "~/components/magicui/marquee";
 import DotPattern from "~/components/magicui/dot-pattern";
 import CardDisplay from "~/components/CopyPasta/CardDisplay";

src/components/Common/SearchBar.tsx

@@ -4,7 +4,7 @@ import { LoaderCircle, Search } from "lucide-react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
 import Link from "next/link";
-import { trimContent } from "~/lib/utils";
+import { trimContent } from "~/utils";
 import { api } from "~/trpc/react";
 import { useMediaQuery, useDebounce } from "@uidotdev/usehooks";
 import { ANALYTICS_EVENT } from "~/lib/constant";

src/components/Common/UserProfileCard.tsx

@@ -18,7 +18,7 @@ import {
 import { Input } from "~/components/ui/input";
 import useToast from "~/components/ui/use-react-hot-toast";
 import { api } from "~/trpc/react";
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 import ReactionSummaryProfile from "~/components/Reaction/ReactionSummaryProfile";
 import { v4 as uuidv4 } from "uuid";
 import { editProfile } from "~/server/form/user";

src/components/CopyPasta/CardById.tsx

@@ -7,7 +7,7 @@ import {
 } from "~/components/ui/card";
 import Link from "next/link";
 import { type Tag as TagType } from "@prisma/client";
-import { cn, formatDateToHuman, trimContent } from "~/lib/utils";
+import { cn, formatDateToHuman, trimContent } from "~/utils";
 import { buttonVariants } from "~/components/ui/button";
 import {
   BookCheck,

src/components/CopyPasta/CardDashboard.tsx

@@ -8,7 +8,7 @@ import {
 } from "~/components/ui/card";
 import { ArrowRight, Link as LinkIcon, NotebookPen } from "lucide-react";
 import { ANALYTICS_EVENT, sourceEnumHash } from "~/lib/constant";
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 import { buttonVariants } from "~/components/ui/button";
 import Link from "next/link";
 import Tag from "~/components/ui/tags";

src/components/CopyPasta/CardDisplay.tsx

@@ -1,4 +1,4 @@
-import { cn, trimContent } from "~/lib/utils";
+import { cn, trimContent } from "~/utils";
 import { Card, CardContent, CardFooter } from "~/components/ui/card";
 import Tag from "~/components/ui/tags";
 import Link from "next/link";

src/components/CopyPasta/CardMinimal.tsx

@@ -13,7 +13,7 @@ import {
   NotebookPen,
 } from "lucide-react";
 import { ANALYTICS_EVENT, sourceEnumHash } from "~/lib/constant";
-import { cn, trimContent } from "~/lib/utils";
+import { cn, trimContent } from "~/utils";
 import ReactionSummary from "../Reaction/ReactionSummary";
 import { Button, buttonVariants } from "~/components/ui/button";
 import Link from "next/link";

src/components/CopyPasta/CardRelated.tsx

@@ -13,7 +13,7 @@ import {
   NotebookPen,
 } from "lucide-react";
 import { ANALYTICS_EVENT, sourceEnumHash } from "~/lib/constant";
-import { cn, trimContent } from "~/lib/utils";
+import { cn, trimContent } from "~/utils";
 import { buttonVariants } from "~/components/ui/button";
 import Link from "next/link";
 import { useRouter, useSearchParams } from "next/navigation";

src/components/CopyPasta/DialogImage.tsx

@@ -8,7 +8,7 @@ import {
   DialogTrigger,
 } from "~/components/ui/dialog";
 import { Button } from "~/components/ui/button";
-import { trimContent } from "~/lib/utils";
+import { trimContent } from "~/utils";
 import Image from "next/image";
 import { useState, useEffect } from "react";
 

src/components/Dashboard/EngagementLogHistory.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { formatDateDistance, parseEngagementLogs } from "~/lib/utils";
+import { formatDateDistance, parseEngagementLogs } from "~/utils";
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
 import { api } from "~/trpc/react";
 import { type ActionType, type EngagementActionDataDb } from "~/lib/interface";

src/components/Reaction/ReactionSummary.tsx

@@ -2,7 +2,7 @@ import { type $Enums, EmotionType } from "@prisma/client";
 import dynamic from "next/dynamic";
 import { Badge } from "~/components/ui/badge";
 import { Skeleton } from "~/components/ui/skeleton";
-import { mergeReactions } from "~/lib/utils";
+import { mergeReactions } from "~/utils";
 
 const ReactionSummaryChild = dynamic(() => import("./ReactionSummaryChild"), {
   ssr: false,

src/components/Reaction/ReactionSummaryChild.tsx

@@ -8,7 +8,7 @@ import { api } from "~/trpc/react";
 import { type EmotionType } from "@prisma/client";
 import { session } from "../Common/HOCSession";
 import { useEffect, useState } from "react";
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 import { trackEvent } from "~/lib/track";
 import Lottie from "react-lottie-player";
 

src/components/Skeleton/CopyPasta.tsx

@@ -1,4 +1,4 @@
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 import { Card, CardContent } from "~/components/ui/card";
 import { Skeleton } from "~/components/ui/skeleton";
 

src/components/Trending/Trending.tsx

@@ -3,7 +3,7 @@
 import { useMediaQuery } from "@uidotdev/usehooks";
 import { ArrowRight, Eye, Hash, Library, TrendingUp } from "lucide-react";
 import Link from "next/link";
-import { cn, trimContent } from "~/lib/utils";
+import { cn, trimContent } from "~/utils";
 import { api } from "~/trpc/react";
 import { ScrollArea } from "~/components/ui/scroll-area";
 import ListTags from "~/components/Common/ListTags";

src/components/Tweet/CustomTweet.tsx

@@ -10,7 +10,7 @@ import { Heart, Link2, MessageCircle, Repeat2 } from "lucide-react";
 import Link from "next/link";
 import { AvatarImage, AvatarFallback, Avatar } from "~/components/ui/avatar";
 import { parseISO } from "date-fns";
-import { formatDateToHuman, cn, sanitizeTweet } from "~/lib/utils";
+import { formatDateToHuman, cn, sanitizeTweet } from "~/utils";
 import { buttonVariants } from "~/components/ui/button";
 import QuotedTweet from "./QuotedTweet";
 import CustomTweetBody from "./CustomTweetBody";

src/components/Tweet/QuotedTweet.tsx

@@ -9,7 +9,7 @@ import { type QuotedTweet } from "react-tweet/api";
 import { Heart, MessageCircle, Repeat2 } from "lucide-react";
 import { AvatarImage, AvatarFallback, Avatar } from "~/components/ui/avatar";
 import { parseISO } from "date-fns";
-import { formatDateToHuman } from "~/lib/utils";
+import { formatDateToHuman } from "~/utils";
 
 type CustomTweetProps = {
   tweet: QuotedTweet;

src/components/magicui/animated-gradient-text.tsx

@@ -1,6 +1,6 @@
 import { type ReactNode } from "react";
 
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 
 export default function AnimatedGradientText({
   children,
@@ -17,7 +17,7 @@ export default function AnimatedGradientText({
       )}
     >
       <div
-        className={`absolute inset-0 block h-full w-full animate-gradient bg-gradient-to-r from-[#ffaa40]/50 via-[#9c40ff]/50 to-[#ffaa40]/50 bg-[length:var(--bg-size)_100%] p-[1px] ![mask-composite:subtract] [border-radius:inherit] [mask:linear-gradient(#fff_0_0)_content-box,linear-gradient(#fff_0_0)]`}
+        className={`absolute inset-0 block h-full w-full animate-gradient bg-gradient-to-r from-[#ffaa40]/50 via-[#9c40ff]/50 to-[#ffaa40]/50 bg-[length:var(--bg-size)_100%] p-[1px] [border-radius:inherit] ![mask-composite:subtract] [mask:linear-gradient(#fff_0_0)_content-box,linear-gradient(#fff_0_0)]`}
       />
 
       {children}

src/components/magicui/blur-in.tsx

@@ -2,7 +2,7 @@
 
 import { motion } from "framer-motion";
 
-import { cn } from "~/lib/utils";
+import { cn } from "~/utils";
 
 interface BlurIntProps {
   word: string;