diff --git a/.eslintrc.js b/.eslintrc.js index cd75e50..e176bf1 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -2,7 +2,7 @@ /** @type {import("eslint").Linter.Config} */ module.exports = { ignorePatterns: ["apps/**", "packages/**"], - extends: ["@makify/eslint-config/library.js"], + extends: ["@makefy/eslint-config/library.js"], parser: "@typescript-eslint/parser", parserOptions: { project: true, diff --git a/README.md b/README.md index a5d140e..84d5abb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Makify ✨ - Make Things Simplify +# Makefy ✨ - Make Things Simplify -Makify is a hub of AI tools designed to simplify various tasks and processes. Utilizing cutting-edge artificial intelligence, Makify aims to provide users with powerful, easy-to-use solutions for their everyday needs. +Makefy is a hub of AI tools designed to simplify various tasks and processes. Utilizing cutting-edge artificial intelligence, Makefy aims to provide users with powerful, easy-to-use solutions for their everyday needs. ## Repository Structure @@ -9,19 +9,19 @@ This repository is managed using [Turborepo](https://turbo.build/) for efficient ### Apps and Packages - `chat-with-pdf`: the Chat with PDF AI tool -- `landing`: the landing page of Makify -- `@makify/ui`: a stub React component library all apps share made with [shadcn](https://ui.shadcn.com/). -- `@makify/eslint-config`: `eslint` configurations (includes `eslint-config-next` and `eslint-config-prettier`) -- `@makify/typescript-config`: `tsconfig.json`s used throughout the monorepo +- `landing`: the landing page of Makefy +- `@makefy/ui`: a stub React component library all apps share made with [shadcn](https://ui.shadcn.com/). +- `@makefy/eslint-config`: `eslint` configurations (includes `eslint-config-next` and `eslint-config-prettier`) +- `@makefy/typescript-config`: `tsconfig.json`s used throughout the monorepo ## Getting Started -To get started with Makify, follow these steps: +To get started with Makefy, follow these steps: 1. **Clone the Repository**: ```bash - git clone https://github.com/dartilesm/makify.git - cd makify + git clone https://github.com/dartilesm/makefy.git + cd makefy ``` 2. **Install Dependencies**: ```bash @@ -43,5 +43,7 @@ To get started with Makify, follow these steps: ```bash bun run lint ``` -------------------------------------------------------------------------------- -Thank you for using Makify! We hope our tools help you simplify your tasks and improve productivity. + +--- + +Thank you for using Makefy! We hope our tools help you simplify your tasks and improve productivity. diff --git a/apps/chat-with-pdf/app/(default)/layout.tsx b/apps/chat-with-pdf/app/(default)/layout.tsx index 49b0aee..10c8aeb 100644 --- a/apps/chat-with-pdf/app/(default)/layout.tsx +++ b/apps/chat-with-pdf/app/(default)/layout.tsx @@ -1,10 +1,10 @@ import { Header } from "@/components/header/header"; import { AppSidebar } from "@/components/sidebar/app-sidebar"; -import { SidebarProvider } from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; -import type { User } from "@makify/supabase/types"; +import { SidebarProvider } from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; +import type { User } from "@makefy/supabase/types"; import { Metadata } from "next"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; export const metadata: Metadata = { title: "Chats", diff --git a/apps/chat-with-pdf/app/actions/auth.ts b/apps/chat-with-pdf/app/actions/auth.ts index 384b6be..05e2ca1 100644 --- a/apps/chat-with-pdf/app/actions/auth.ts +++ b/apps/chat-with-pdf/app/actions/auth.ts @@ -1,6 +1,6 @@ "use server"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; export const verifyOtp = async (data: { email: string; diff --git a/apps/chat-with-pdf/app/actions/delete-chat.ts b/apps/chat-with-pdf/app/actions/delete-chat.ts index 852c8f3..6bc71dd 100644 --- a/apps/chat-with-pdf/app/actions/delete-chat.ts +++ b/apps/chat-with-pdf/app/actions/delete-chat.ts @@ -1,7 +1,7 @@ "use server"; -import { createSupabaseServer } from "@makify/supabase/server"; -import { Tables } from "@makify/supabase/types"; +import { createSupabaseServer } from "@makefy/supabase/server"; +import { Tables } from "@makefy/supabase/types"; import { revalidatePath, revalidateTag } from "next/cache"; import { redirect } from "next/navigation"; diff --git a/apps/chat-with-pdf/app/actions/edit-chat.ts b/apps/chat-with-pdf/app/actions/edit-chat.ts index 52ab56e..1f026a6 100644 --- a/apps/chat-with-pdf/app/actions/edit-chat.ts +++ b/apps/chat-with-pdf/app/actions/edit-chat.ts @@ -1,7 +1,7 @@ "use server"; -import { createSupabaseServer } from "@makify/supabase/server"; -import { Tables } from "@makify/supabase/types"; +import { createSupabaseServer } from "@makefy/supabase/server"; +import { Tables } from "@makefy/supabase/types"; import { revalidatePath, revalidateTag } from "next/cache"; export async function editChat(document: Tables<"Document">, title: string) { diff --git a/apps/chat-with-pdf/app/actions/generate-document-title.ts b/apps/chat-with-pdf/app/actions/generate-document-title.ts index 3efad48..d8b5407 100644 --- a/apps/chat-with-pdf/app/actions/generate-document-title.ts +++ b/apps/chat-with-pdf/app/actions/generate-document-title.ts @@ -1,7 +1,7 @@ "use server"; import { getContext } from "@/lib/context"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; import { google } from "@ai-sdk/google"; import { generateObject } from "ai"; import { revalidatePath, revalidateTag } from "next/cache"; diff --git a/apps/chat-with-pdf/app/actions/get-document-by-chat-id.ts b/apps/chat-with-pdf/app/actions/get-document-by-chat-id.ts index e82d29d..da054b7 100644 --- a/apps/chat-with-pdf/app/actions/get-document-by-chat-id.ts +++ b/apps/chat-with-pdf/app/actions/get-document-by-chat-id.ts @@ -1,8 +1,8 @@ "use server"; import { unstable_cache } from "next/cache"; -import { createSupabaseServer } from "@makify/supabase/server"; -import type { SupabaseClient } from "@makify/supabase/types"; +import { createSupabaseServer } from "@makefy/supabase/server"; +import type { SupabaseClient } from "@makefy/supabase/types"; async function retrieveDocumentByChatId( supabase: SupabaseClient, diff --git a/apps/chat-with-pdf/app/actions/login.ts b/apps/chat-with-pdf/app/actions/login.ts index 52a92f6..50cde3b 100644 --- a/apps/chat-with-pdf/app/actions/login.ts +++ b/apps/chat-with-pdf/app/actions/login.ts @@ -1,6 +1,6 @@ "use server"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; import { revalidatePath } from "next/cache"; import { redirect } from "next/navigation"; diff --git a/apps/chat-with-pdf/app/actions/sign-in-with-oauth.ts b/apps/chat-with-pdf/app/actions/sign-in-with-oauth.ts index 93d7901..8dd9f38 100644 --- a/apps/chat-with-pdf/app/actions/sign-in-with-oauth.ts +++ b/apps/chat-with-pdf/app/actions/sign-in-with-oauth.ts @@ -1,9 +1,9 @@ "use server"; import { getOAuthRedirectUrl } from "@/lib/oauth-redirect-url"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; import { ReadonlyURLSearchParams, redirect } from "next/navigation"; -import type { SignInWithOAuthCredentials } from "@makify/supabase/types"; +import type { SignInWithOAuthCredentials } from "@makefy/supabase/types"; export async function signInWithOAuth( provider: SignInWithOAuthCredentials["provider"], searchParams: ReadonlyURLSearchParams, diff --git a/apps/chat-with-pdf/app/actions/signup.ts b/apps/chat-with-pdf/app/actions/signup.ts index ee3775c..9d89b2c 100644 --- a/apps/chat-with-pdf/app/actions/signup.ts +++ b/apps/chat-with-pdf/app/actions/signup.ts @@ -1,6 +1,6 @@ "use server"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; import { revalidatePath } from "next/cache"; import { redirect } from "next/navigation"; diff --git a/apps/chat-with-pdf/app/actions/update-chat-messages.ts b/apps/chat-with-pdf/app/actions/update-chat-messages.ts index bf490c5..6a5f594 100644 --- a/apps/chat-with-pdf/app/actions/update-chat-messages.ts +++ b/apps/chat-with-pdf/app/actions/update-chat-messages.ts @@ -1,7 +1,7 @@ "use server"; -import { createSupabaseServer } from "@makify/supabase/server"; -import { Tables } from "@makify/supabase/types"; +import { createSupabaseServer } from "@makefy/supabase/server"; +import { Tables } from "@makefy/supabase/types"; import { revalidatePath } from "next/cache"; type UpdateChatMessagesParams = { diff --git a/apps/chat-with-pdf/app/api/auth/callback/route.ts b/apps/chat-with-pdf/app/api/auth/callback/route.ts index 1c0c4cc..eaeff99 100644 --- a/apps/chat-with-pdf/app/api/auth/callback/route.ts +++ b/apps/chat-with-pdf/app/api/auth/callback/route.ts @@ -1,6 +1,6 @@ import { NextResponse } from "next/server"; // The client you created from the Server-Side Auth instructions -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; export async function GET(request: Request) { const { searchParams, origin } = new URL(request.url); diff --git a/apps/chat-with-pdf/app/api/auth/confirm/route.ts b/apps/chat-with-pdf/app/api/auth/confirm/route.ts index 7aaa596..4eae2a2 100644 --- a/apps/chat-with-pdf/app/api/auth/confirm/route.ts +++ b/apps/chat-with-pdf/app/api/auth/confirm/route.ts @@ -1,8 +1,8 @@ -import type { EmailOtpType } from "@makify/supabase/types"; +import type { EmailOtpType } from "@makefy/supabase/types"; import { type NextRequest } from "next/server"; import { redirect } from "next/navigation"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; export async function GET(request: NextRequest) { const { searchParams } = new URL(request.url); diff --git a/apps/chat-with-pdf/app/api/auth/signup/route.tsx b/apps/chat-with-pdf/app/api/auth/signup/route.tsx index 1e54a9f..711c27c 100644 --- a/apps/chat-with-pdf/app/api/auth/signup/route.tsx +++ b/apps/chat-with-pdf/app/api/auth/signup/route.tsx @@ -1,5 +1,5 @@ import { VerifyEmailTemplate } from "@/components/email-templates/verify-email-template"; -import { createSupabaseAdmin } from "@makify/supabase/admin"; +import { createSupabaseAdmin } from "@makefy/supabase/admin"; import { Resend } from "resend"; const resend = new Resend(process.env.RESEND_API_KEY); @@ -19,7 +19,7 @@ export async function POST(request: Request) { if (res.data.properties?.email_otp) { // resend email const resendRes = await resend.emails.send({ - from: `Makify `, + from: `Makefy `, to: [data.email], subject: "Verify Email", react: ( diff --git a/apps/chat-with-pdf/app/api/chat/new-chat/route.ts b/apps/chat-with-pdf/app/api/chat/new-chat/route.ts index 45121e5..24a3044 100644 --- a/apps/chat-with-pdf/app/api/chat/new-chat/route.ts +++ b/apps/chat-with-pdf/app/api/chat/new-chat/route.ts @@ -4,12 +4,12 @@ import { embedDocument, prepareDocument } from "@/lib/embed-document"; import { getLoadingMessages } from "@/lib/get-loading-messages"; import { getPdfData } from "@/lib/get-pdf-metadata"; import { rateLimitRequests } from "@/lib/rate-limit-requests"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; import { WebPDFLoader } from "@langchain/community/document_loaders/web/pdf"; import { PineconeRecord } from "@pinecone-database/pinecone"; import { revalidateTag } from "next/cache"; import { NextRequest, NextResponse } from "next/server"; -import { Tables } from "@makify/supabase/types"; +import { Tables } from "@makefy/supabase/types"; export const revalidate = 0; export const dynamic = "force-dynamic"; diff --git a/apps/chat-with-pdf/app/api/chat/route.ts b/apps/chat-with-pdf/app/api/chat/route.ts index efc44e2..701747b 100644 --- a/apps/chat-with-pdf/app/api/chat/route.ts +++ b/apps/chat-with-pdf/app/api/chat/route.ts @@ -1,7 +1,7 @@ import { rateLimitRequests } from "@/lib/rate-limit-requests"; import { google } from "@ai-sdk/google"; import { Message, StreamData, convertToCoreMessages, streamText } from "ai"; -import { Tables } from "@makify/supabase/types"; +import { Tables } from "@makefy/supabase/types"; import { getContext } from "utils/context"; export const revalidate = 0; diff --git a/apps/chat-with-pdf/app/auth/callback/route.ts b/apps/chat-with-pdf/app/auth/callback/route.ts index 104bcdc..c833bca 100644 --- a/apps/chat-with-pdf/app/auth/callback/route.ts +++ b/apps/chat-with-pdf/app/auth/callback/route.ts @@ -1,4 +1,4 @@ -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; import { NextResponse } from "next/server"; export async function GET(request: Request) { diff --git a/apps/chat-with-pdf/app/components/chat/assistant-message.tsx b/apps/chat-with-pdf/app/components/chat/assistant-message.tsx index 5c42f75..7ac28a3 100644 --- a/apps/chat-with-pdf/app/components/chat/assistant-message.tsx +++ b/apps/chat-with-pdf/app/components/chat/assistant-message.tsx @@ -3,8 +3,8 @@ import { TooltipContent, TooltipProvider, TooltipTrigger, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { useGlobalChat } from "hooks/use-global-chat"; import Markdown, { ExtraProps } from "react-markdown"; import rehypeRaw from "rehype-raw"; diff --git a/apps/chat-with-pdf/app/components/chat/chat-footer.tsx b/apps/chat-with-pdf/app/components/chat/chat-footer.tsx index 88bc84e..0f46578 100644 --- a/apps/chat-with-pdf/app/components/chat/chat-footer.tsx +++ b/apps/chat-with-pdf/app/components/chat/chat-footer.tsx @@ -6,8 +6,8 @@ import { AlertTitle, Button, Textarea, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { Message } from "ai"; import { AnimatePresence, motion } from "framer-motion"; import { useGlobalChat } from "hooks/use-global-chat"; diff --git a/apps/chat-with-pdf/app/components/chat/chat-footer/suggested-questions.tsx b/apps/chat-with-pdf/app/components/chat/chat-footer/suggested-questions.tsx index 6e107d3..dc11269 100644 --- a/apps/chat-with-pdf/app/components/chat/chat-footer/suggested-questions.tsx +++ b/apps/chat-with-pdf/app/components/chat/chat-footer/suggested-questions.tsx @@ -1,7 +1,7 @@ "use client"; -import { Button } from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +import { Button } from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { motion } from "framer-motion"; import { useGlobalChat } from "hooks/use-global-chat"; import { diff --git a/apps/chat-with-pdf/app/components/chat/chat-header/chat-header.tsx b/apps/chat-with-pdf/app/components/chat/chat-header/chat-header.tsx index c27ac16..b763d6f 100644 --- a/apps/chat-with-pdf/app/components/chat/chat-header/chat-header.tsx +++ b/apps/chat-with-pdf/app/components/chat/chat-header/chat-header.tsx @@ -11,7 +11,7 @@ import { TooltipContent, TooltipProvider, TooltipTrigger, -} from "@makify/ui"; +} from "@makefy/ui"; import { BookmarkIcon, DownloadIcon } from "lucide-react"; import Link from "next/link"; import { useParams } from "next/navigation"; diff --git a/apps/chat-with-pdf/app/components/chat/chat-header/chat-pdf.tsx b/apps/chat-with-pdf/app/components/chat/chat-header/chat-pdf.tsx index dfbc3d9..d8640d7 100644 --- a/apps/chat-with-pdf/app/components/chat/chat-header/chat-pdf.tsx +++ b/apps/chat-with-pdf/app/components/chat/chat-header/chat-pdf.tsx @@ -25,7 +25,7 @@ export function ChatPDF({ documentId, messages }: ChatPDFProps) { }} fixed > - ~ Makify - Chat with PDF ~ + ~ Makefy - Chat with PDF ~ null); diff --git a/apps/chat-with-pdf/app/components/chat/loading/pdf.loading.tsx b/apps/chat-with-pdf/app/components/chat/loading/pdf.loading.tsx index 24d094a..a60cde4 100644 --- a/apps/chat-with-pdf/app/components/chat/loading/pdf.loading.tsx +++ b/apps/chat-with-pdf/app/components/chat/loading/pdf.loading.tsx @@ -1,4 +1,4 @@ -import { Skeleton } from "@makify/ui"; +import { Skeleton } from "@makefy/ui"; export function PDFLoading() { return ( diff --git a/apps/chat-with-pdf/app/components/chat/message-bubble.tsx b/apps/chat-with-pdf/app/components/chat/message-bubble.tsx index a22dec8..ddbe2cc 100644 --- a/apps/chat-with-pdf/app/components/chat/message-bubble.tsx +++ b/apps/chat-with-pdf/app/components/chat/message-bubble.tsx @@ -3,8 +3,8 @@ import { TooltipContent, TooltipProvider, TooltipTrigger, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { Message } from "ai"; import { useGlobalChat } from "hooks/use-global-chat"; import { AssistantMessage } from "./assistant-message"; diff --git a/apps/chat-with-pdf/app/components/chat/message-quick-actions.tsx b/apps/chat-with-pdf/app/components/chat/message-quick-actions.tsx index ee1063c..ff184da 100644 --- a/apps/chat-with-pdf/app/components/chat/message-quick-actions.tsx +++ b/apps/chat-with-pdf/app/components/chat/message-quick-actions.tsx @@ -9,8 +9,8 @@ import { TooltipProvider, TooltipTrigger, useToast, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { Message } from "ai"; import { AnimatePresence, CustomDomComponent, motion } from "framer-motion"; import { useGlobalChat } from "hooks/use-global-chat"; @@ -26,7 +26,7 @@ import { useParams } from "next/navigation"; import { forwardRef, RefAttributes, useState } from "react"; import { QUICK_ACTIONS } from "./constants/message-quick-actions"; import { MessageActions } from "./types/message-actions"; -import { Tables } from "@makify/supabase/types"; +import { Tables } from "@makefy/supabase/types"; type MessageQuickActionsProps = { message: Message; diff --git a/apps/chat-with-pdf/app/components/chat/user-message.tsx b/apps/chat-with-pdf/app/components/chat/user-message.tsx index dcd5d36..af4e9b8 100644 --- a/apps/chat-with-pdf/app/components/chat/user-message.tsx +++ b/apps/chat-with-pdf/app/components/chat/user-message.tsx @@ -1,5 +1,5 @@ -import { Alert, AlertDescription, AlertTitle } from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +import { Alert, AlertDescription, AlertTitle } from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { Message } from "ai"; type UserMessageProps = { diff --git a/apps/chat-with-pdf/app/components/header/document-title/document-title.tsx b/apps/chat-with-pdf/app/components/header/document-title/document-title.tsx index b2f6d41..15d5d33 100644 --- a/apps/chat-with-pdf/app/components/header/document-title/document-title.tsx +++ b/apps/chat-with-pdf/app/components/header/document-title/document-title.tsx @@ -1,18 +1,18 @@ "use client"; -import { Button } from "@makify/ui/components/button"; +import { Button } from "@makefy/ui/components/button"; import { Command, CommandItem, CommandList, -} from "@makify/ui/components/command"; +} from "@makefy/ui/components/command"; import { Popover, PopoverContent, PopoverTrigger, -} from "@makify/ui/components/popover"; -import { cn } from "@makify/ui/lib/utils"; -import { Tables } from "@makify/supabase/types"; +} from "@makefy/ui/components/popover"; +import { cn } from "@makefy/ui/lib/utils"; +import { Tables } from "@makefy/supabase/types"; import { ChevronDownIcon, PencilIcon, TrashIcon } from "lucide-react"; import { useParams } from "next/navigation"; import { useEffect, useMemo, useRef, useState } from "react"; diff --git a/apps/chat-with-pdf/app/components/header/document-title/edit-document-dialog/edit-document-dialog.tsx b/apps/chat-with-pdf/app/components/header/document-title/edit-document-dialog/edit-document-dialog.tsx index cc03a79..d984af1 100644 --- a/apps/chat-with-pdf/app/components/header/document-title/edit-document-dialog/edit-document-dialog.tsx +++ b/apps/chat-with-pdf/app/components/header/document-title/edit-document-dialog/edit-document-dialog.tsx @@ -23,8 +23,8 @@ import { TabsList, TabsTrigger, useToast, -} from "@makify/ui"; -import { Tables } from "@makify/supabase/types"; +} from "@makefy/ui"; +import { Tables } from "@makefy/supabase/types"; import { LoaderCircleIcon, PencilIcon, TrashIcon } from "lucide-react"; import { useEffect } from "react"; import { useForm } from "react-hook-form"; diff --git a/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog-content.tsx b/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog-content.tsx index 41ebb09..89423e9 100644 --- a/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog-content.tsx +++ b/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog-content.tsx @@ -6,8 +6,8 @@ import { TabsContent, TabsList, TabsTrigger, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { TrashIcon } from "lucide-react"; import { PDFDocument } from "pdf-lib"; import { RefObject, useEffect, useState } from "react"; diff --git a/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog.tsx b/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog.tsx index 6382d61..ca4ded7 100644 --- a/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog.tsx +++ b/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog.tsx @@ -9,7 +9,7 @@ import { DialogFooter, DialogHeader, DialogTitle, -} from "@makify/ui"; +} from "@makefy/ui"; import { Loader2Icon } from "lucide-react"; import { useRouter } from "next/navigation"; import { useState } from "react"; diff --git a/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-loading-state.tsx b/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-loading-state.tsx index 17705ef..eebafad 100644 --- a/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-loading-state.tsx +++ b/apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-loading-state.tsx @@ -1,4 +1,4 @@ -import { Button } from "@makify/ui"; +import { Button } from "@makefy/ui"; import { AnimatePresence, motion } from "framer-motion"; import { SadFaceIcon } from "icons/sad-face"; import { SparkleIcon } from "icons/sparkle"; @@ -112,7 +112,7 @@ export function NewDocumentLoadingState({
{loadingMessages.map((step, index) => ( - {index === 0 &&
} + {index === 0 &&
} {index === loadingMessages.length - 1 && ( -
+
)} ))} diff --git a/apps/chat-with-pdf/app/components/header/feedback-dialog.tsx b/apps/chat-with-pdf/app/components/header/feedback-dialog.tsx index 947802d..6d609bb 100644 --- a/apps/chat-with-pdf/app/components/header/feedback-dialog.tsx +++ b/apps/chat-with-pdf/app/components/header/feedback-dialog.tsx @@ -25,7 +25,7 @@ import { SelectValue, Textarea, useToast, -} from "@makify/ui"; +} from "@makefy/ui"; import { Loader2Icon } from "lucide-react"; import { useState } from "react"; import { useForm } from "react-hook-form"; diff --git a/apps/chat-with-pdf/app/components/header/header.tsx b/apps/chat-with-pdf/app/components/header/header.tsx index 81db711..4ec84f2 100644 --- a/apps/chat-with-pdf/app/components/header/header.tsx +++ b/apps/chat-with-pdf/app/components/header/header.tsx @@ -5,7 +5,7 @@ import { TooltipContent, TooltipProvider, TooltipTrigger, -} from "@makify/ui"; +} from "@makefy/ui"; import { DocumentTitle } from "./document-title/document-title"; export async function Header() { diff --git a/apps/chat-with-pdf/app/components/header/theme-switcher.tsx b/apps/chat-with-pdf/app/components/header/theme-switcher.tsx index 16fce81..02813c7 100644 --- a/apps/chat-with-pdf/app/components/header/theme-switcher.tsx +++ b/apps/chat-with-pdf/app/components/header/theme-switcher.tsx @@ -9,7 +9,7 @@ import { Tooltip, TooltipContent, TooltipTrigger, -} from "@makify/ui"; +} from "@makefy/ui"; import { MoonIcon, SunIcon } from "lucide-react"; import { useTheme } from "next-themes"; diff --git a/apps/chat-with-pdf/app/components/header/user-nav/user-nav-menu-items.tsx b/apps/chat-with-pdf/app/components/header/user-nav/user-nav-menu-items.tsx index a510113..7bf87a1 100644 --- a/apps/chat-with-pdf/app/components/header/user-nav/user-nav-menu-items.tsx +++ b/apps/chat-with-pdf/app/components/header/user-nav/user-nav-menu-items.tsx @@ -1,6 +1,6 @@ "use client"; -import { createSupabaseClient } from "@makify/supabase/client"; +import { createSupabaseClient } from "@makefy/supabase/client"; import { DropdownMenuGroup, DropdownMenuItem, @@ -8,7 +8,7 @@ import { DropdownMenuShortcut, ToggleGroup, ToggleGroupItem, -} from "@makify/ui"; +} from "@makefy/ui"; import { LaptopMinimalIcon, MoonIcon, SunIcon } from "lucide-react"; import { useTheme } from "next-themes"; import { useRouter } from "next/navigation"; diff --git a/apps/chat-with-pdf/app/components/header/user-nav/user-nav.tsx b/apps/chat-with-pdf/app/components/header/user-nav/user-nav.tsx index 4b2763d..1631887 100644 --- a/apps/chat-with-pdf/app/components/header/user-nav/user-nav.tsx +++ b/apps/chat-with-pdf/app/components/header/user-nav/user-nav.tsx @@ -1,14 +1,14 @@ -import { Button } from "@makify/ui/components/button"; +import { Button } from "@makefy/ui/components/button"; import { DropdownMenu, DropdownMenuContent, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger, -} from "@makify/ui/components/dropdown-menu"; +} from "@makefy/ui/components/dropdown-menu"; import { UserAvatar } from "@/components/ui/user-avatar"; import { UserNavMenuItems } from "./user-nav-menu-items"; -import { createSupabaseServer } from "@makify/supabase/server"; +import { createSupabaseServer } from "@makefy/supabase/server"; export async function UserNav() { const supabase = createSupabaseServer(); diff --git a/apps/chat-with-pdf/app/components/pages-containers/chat-id-container.tsx b/apps/chat-with-pdf/app/components/pages-containers/chat-id-container.tsx index e3fc2ec..29c93c9 100644 --- a/apps/chat-with-pdf/app/components/pages-containers/chat-id-container.tsx +++ b/apps/chat-with-pdf/app/components/pages-containers/chat-id-container.tsx @@ -1,6 +1,6 @@ import { ChatProvider } from "@/app/context/chat-context"; import { ChatScreen } from "../chat/chat-screen"; -import { Tables } from "@makify/supabase/types"; +import { Tables } from "@makefy/supabase/types"; type ChatIdContainerProps = | { diff --git a/apps/chat-with-pdf/app/components/pages-containers/chats-container.tsx b/apps/chat-with-pdf/app/components/pages-containers/chats-container.tsx index a9fc18f..edc9ccf 100644 --- a/apps/chat-with-pdf/app/components/pages-containers/chats-container.tsx +++ b/apps/chat-with-pdf/app/components/pages-containers/chats-container.tsx @@ -12,7 +12,7 @@ import { TooltipContent, TooltipProvider, TooltipTrigger, -} from "@makify/ui"; +} from "@makefy/ui"; import { FileTextIcon, PlusCircleIcon } from "lucide-react"; import Link from "next/link"; import { useState } from "react"; @@ -20,7 +20,7 @@ import { Container } from "../ui/container"; import { Heading } from "../ui/heading"; import { SadFaceIcon } from "icons/sad-face"; import { NewDocumentDialog } from "../header/document-title/new-document-dialog/new-document-dialog"; -import { Tables } from "@makify/supabase/types"; +import { Tables } from "@makefy/supabase/types"; type ChatsContainerProps = | { diff --git a/apps/chat-with-pdf/app/components/pages-containers/login/login-container.tsx b/apps/chat-with-pdf/app/components/pages-containers/login/login-container.tsx index db1ead0..90de2c9 100644 --- a/apps/chat-with-pdf/app/components/pages-containers/login/login-container.tsx +++ b/apps/chat-with-pdf/app/components/pages-containers/login/login-container.tsx @@ -20,7 +20,7 @@ export function LoginContainer() {
-

Sign in to Makify

+

Sign in to Makefy

Welcome back! Please sign in to continue

diff --git a/apps/chat-with-pdf/app/components/pages-containers/login/login-form.tsx b/apps/chat-with-pdf/app/components/pages-containers/login/login-form.tsx index 72b8ecd..9c9c292 100644 --- a/apps/chat-with-pdf/app/components/pages-containers/login/login-form.tsx +++ b/apps/chat-with-pdf/app/components/pages-containers/login/login-form.tsx @@ -19,10 +19,10 @@ import { FormMessage, Input, useToast, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import Link from "next/link"; -import { createSupabaseClient } from "@makify/supabase/client"; +import { createSupabaseClient } from "@makefy/supabase/client"; const FormSchema = z.object({ email: z.string().email({ message: "Invalid Email Address" }), diff --git a/apps/chat-with-pdf/app/components/pages-containers/signup/signup-form.tsx b/apps/chat-with-pdf/app/components/pages-containers/signup/signup-form.tsx index d8e4594..2444dc0 100644 --- a/apps/chat-with-pdf/app/components/pages-containers/signup/signup-form.tsx +++ b/apps/chat-with-pdf/app/components/pages-containers/signup/signup-form.tsx @@ -25,8 +25,8 @@ import { InputOTPGroup, InputOTPSlot, InputOTPSeparator, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { verifyOtp } from "@/app/actions/auth"; const FormSchema = z diff --git a/apps/chat-with-pdf/app/components/pages-containers/signup/social.tsx b/apps/chat-with-pdf/app/components/pages-containers/signup/social.tsx index 911ace9..aed2f84 100644 --- a/apps/chat-with-pdf/app/components/pages-containers/signup/social.tsx +++ b/apps/chat-with-pdf/app/components/pages-containers/signup/social.tsx @@ -2,8 +2,8 @@ import React from "react"; import { IoLogoGithub } from "react-icons/io5"; -import { Button, useToast } from "@makify/ui"; -import { createSupabaseClient } from "@makify/supabase/client"; +import { Button, useToast } from "@makefy/ui"; +import { createSupabaseClient } from "@makefy/supabase/client"; export function Social({ redirectTo }: { redirectTo: string }) { const { toast } = useToast(); diff --git a/apps/chat-with-pdf/app/components/pdf/pdf-toolbar.tsx b/apps/chat-with-pdf/app/components/pdf/pdf-toolbar.tsx index 44743b1..66aa0f0 100644 --- a/apps/chat-with-pdf/app/components/pdf/pdf-toolbar.tsx +++ b/apps/chat-with-pdf/app/components/pdf/pdf-toolbar.tsx @@ -7,8 +7,8 @@ import { TooltipContent, TooltipProvider, TooltipTrigger, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { ArrowLeftIcon, ArrowRightIcon, diff --git a/apps/chat-with-pdf/app/components/pdf/pdf-viewer.tsx b/apps/chat-with-pdf/app/components/pdf/pdf-viewer.tsx index 7db0a64..dce1410 100644 --- a/apps/chat-with-pdf/app/components/pdf/pdf-viewer.tsx +++ b/apps/chat-with-pdf/app/components/pdf/pdf-viewer.tsx @@ -7,8 +7,8 @@ import { PopoverContent, PopoverPortal, Skeleton, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { useGlobalChat } from "hooks/use-global-chat"; import { MessageSquareQuoteIcon } from "lucide-react"; import { PDFDocument } from "pdf-lib"; diff --git a/apps/chat-with-pdf/app/components/sidebar/app-sidebar.tsx b/apps/chat-with-pdf/app/components/sidebar/app-sidebar.tsx index 6ffb163..d720853 100644 --- a/apps/chat-with-pdf/app/components/sidebar/app-sidebar.tsx +++ b/apps/chat-with-pdf/app/components/sidebar/app-sidebar.tsx @@ -11,13 +11,13 @@ import { } from "lucide-react"; import { NewDocumentDialog } from "@/components/header/document-title/new-document-dialog/new-document-dialog"; -import { createSupabaseClient } from "@makify/supabase/client"; +import { createSupabaseClient } from "@makefy/supabase/client"; import Logo from "@/public/logo.svg"; import { Avatar, AvatarFallback, AvatarImage, -} from "@makify/ui/components/avatar"; +} from "@makefy/ui/components/avatar"; import { DropdownMenu, DropdownMenuContent, @@ -26,7 +26,7 @@ import { DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger, -} from "@makify/ui/components/dropdown-menu"; +} from "@makefy/ui/components/dropdown-menu"; import { Sidebar, SidebarContent, @@ -37,8 +37,8 @@ import { SidebarMenuButton, SidebarMenuItem, SidebarRail, -} from "@makify/ui/components/sidebar"; -import type { User } from "@makify/supabase/types"; +} from "@makefy/ui/components/sidebar"; +import type { User } from "@makefy/supabase/types"; import Link from "next/link"; import { useRouter } from "next/navigation"; import { useState } from "react"; @@ -89,7 +89,7 @@ export function AppSidebar({ userInfo }: { userInfo: User }) { Chat with PDF - by Makify ✨ + by Makefy ✨
diff --git a/apps/chat-with-pdf/app/components/sidebar/recent-conversation-sidebar-group.tsx b/apps/chat-with-pdf/app/components/sidebar/recent-conversation-sidebar-group.tsx index f9ff441..a528264 100644 --- a/apps/chat-with-pdf/app/components/sidebar/recent-conversation-sidebar-group.tsx +++ b/apps/chat-with-pdf/app/components/sidebar/recent-conversation-sidebar-group.tsx @@ -1,4 +1,4 @@ -import { createSupabaseClient } from "@makify/supabase/client"; +import { createSupabaseClient } from "@makefy/supabase/client"; import { Button, SidebarGroup, @@ -7,8 +7,8 @@ import { SidebarMenuAction, SidebarMenuButton, SidebarMenuItem, -} from "@makify/ui"; -import { Tables } from "@makify/supabase/types"; +} from "@makefy/ui"; +import { Tables } from "@makefy/supabase/types"; import { ChevronRight, MessageSquareIcon, MoreHorizontal } from "lucide-react"; import Link from "next/link"; import { useEffect, useState } from "react"; diff --git a/apps/chat-with-pdf/app/components/sidebar/secondary-sidebar-menu.tsx b/apps/chat-with-pdf/app/components/sidebar/secondary-sidebar-menu.tsx index 42fb482..376cea3 100644 --- a/apps/chat-with-pdf/app/components/sidebar/secondary-sidebar-menu.tsx +++ b/apps/chat-with-pdf/app/components/sidebar/secondary-sidebar-menu.tsx @@ -11,8 +11,8 @@ import { DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, -} from "@makify/ui"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui"; +import { cn } from "@makefy/ui/lib/utils"; import { LaptopMinimalIcon, MessageSquareIcon, diff --git a/apps/chat-with-pdf/app/components/ui/container.tsx b/apps/chat-with-pdf/app/components/ui/container.tsx index a136c9b..0f3a79b 100644 --- a/apps/chat-with-pdf/app/components/ui/container.tsx +++ b/apps/chat-with-pdf/app/components/ui/container.tsx @@ -1,4 +1,4 @@ -import { cn } from "@makify/ui/lib/utils"; +import { cn } from "@makefy/ui/lib/utils"; type ContainerProps = { children: React.ReactNode; diff --git a/apps/chat-with-pdf/app/components/ui/heading.tsx b/apps/chat-with-pdf/app/components/ui/heading.tsx index 895be6d..e2c320e 100644 --- a/apps/chat-with-pdf/app/components/ui/heading.tsx +++ b/apps/chat-with-pdf/app/components/ui/heading.tsx @@ -1,4 +1,4 @@ -import { Button, Skeleton } from "@makify/ui"; +import { Button, Skeleton } from "@makefy/ui"; import { ArrowLeft } from "lucide-react"; import Link from "next/link"; import { ReactElement } from "react"; diff --git a/apps/chat-with-pdf/app/components/ui/logo.tsx b/apps/chat-with-pdf/app/components/ui/logo.tsx index 82ff616..b7fd0ef 100644 --- a/apps/chat-with-pdf/app/components/ui/logo.tsx +++ b/apps/chat-with-pdf/app/components/ui/logo.tsx @@ -1,4 +1,4 @@ -import { cn } from "@makify/ui/lib/utils"; +import { cn } from "@makefy/ui/lib/utils"; type LogoProps = { className?: string; @@ -14,7 +14,7 @@ export function Logo({ className }: LogoProps) { > Chat with PDF - by Makify ✨ + by Makefy ✨
); diff --git a/apps/chat-with-pdf/app/components/ui/user-avatar.tsx b/apps/chat-with-pdf/app/components/ui/user-avatar.tsx index cfdb827..7d54212 100644 --- a/apps/chat-with-pdf/app/components/ui/user-avatar.tsx +++ b/apps/chat-with-pdf/app/components/ui/user-avatar.tsx @@ -2,9 +2,9 @@ import { Avatar, AvatarFallback, AvatarImage, -} from "@makify/ui/components/avatar"; -import { createSupabaseServer } from "@makify/supabase/server"; -import { cn } from "@makify/ui/lib/utils"; +} from "@makefy/ui/components/avatar"; +import { createSupabaseServer } from "@makefy/supabase/server"; +import { cn } from "@makefy/ui/lib/utils"; interface UserAvatarProps { className?: string; diff --git a/apps/chat-with-pdf/app/context/chat-context.tsx b/apps/chat-with-pdf/app/context/chat-context.tsx index 7fb6671..1a9f724 100644 --- a/apps/chat-with-pdf/app/context/chat-context.tsx +++ b/apps/chat-with-pdf/app/context/chat-context.tsx @@ -12,8 +12,8 @@ import { useState, } from "react"; import { updateChatMessages } from "../actions/update-chat-messages"; -import { Tables } from "@makify/supabase/types"; -import { createSupabaseClient } from "@makify/supabase/client"; +import { Tables } from "@makefy/supabase/types"; +import { createSupabaseClient } from "@makefy/supabase/client"; import { generateDocumentTitle as generateDocumentTitleAction } from "../actions/generate-document-title"; const EMPTY_CHAT_DATA: Partial> = { diff --git a/apps/chat-with-pdf/app/layout.tsx b/apps/chat-with-pdf/app/layout.tsx index 14430ac..0059ff0 100644 --- a/apps/chat-with-pdf/app/layout.tsx +++ b/apps/chat-with-pdf/app/layout.tsx @@ -1,10 +1,10 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; import "./globals.css"; -import "@makify/ui/globals.css"; -import { SidebarProvider, Toaster } from "@makify/ui"; +import "@makefy/ui/globals.css"; +import { SidebarProvider, Toaster } from "@makefy/ui"; import { ThemeProvider } from "./components/theme-provider"; -import { cn } from "@makify/ui/lib/utils"; +import { cn } from "@makefy/ui/lib/utils"; import PlausibleProvider from "next-plausible"; const inter = Inter({ subsets: ["latin"] }); @@ -42,7 +42,7 @@ export default function RootLayout({ return ( - + - - - - - - - - - - - - - - - - - - diff --git a/apps/landing/.gitignore b/apps/web/.gitignore similarity index 100% rename from apps/landing/.gitignore rename to apps/web/.gitignore diff --git a/apps/landing/LICENSE.md b/apps/web/LICENSE.md similarity index 100% rename from apps/landing/LICENSE.md rename to apps/web/LICENSE.md diff --git a/apps/landing/README.md b/apps/web/README.md similarity index 100% rename from apps/landing/README.md rename to apps/web/README.md diff --git a/apps/landing/actions/resend-create-contact.ts b/apps/web/actions/resend-create-contact.ts similarity index 100% rename from apps/landing/actions/resend-create-contact.ts rename to apps/web/actions/resend-create-contact.ts diff --git a/apps/landing/app/components/hero.tsx b/apps/web/app/components/hero.tsx similarity index 97% rename from apps/landing/app/components/hero.tsx rename to apps/web/app/components/hero.tsx index e9b38d1..dc34288 100644 --- a/apps/landing/app/components/hero.tsx +++ b/apps/web/app/components/hero.tsx @@ -50,7 +50,7 @@ export default function Hero() { className="animate-in fade-in slide-in-from-bottom-10 delay-250 mt-6 text-center text-gray-500 duration-1000 [text-wrap:balance] md:text-xl" style={{ animationFillMode: "forwards" }} > - Makify is a collection of tools with AI to make your life easier than + Makefy is a collection of tools with AI to make your life easier than ever. Join the waitlist to get early access.

diff --git a/apps/landing/app/components/layout/nav.tsx b/apps/web/app/components/layout/nav.tsx similarity index 100% rename from apps/landing/app/components/layout/nav.tsx rename to apps/web/app/components/layout/nav.tsx diff --git a/apps/landing/app/components/layout/navbar.tsx b/apps/web/app/components/layout/navbar.tsx similarity index 98% rename from apps/landing/app/components/layout/navbar.tsx rename to apps/web/app/components/layout/navbar.tsx index 8b04851..b169d25 100644 --- a/apps/landing/app/components/layout/navbar.tsx +++ b/apps/web/app/components/layout/navbar.tsx @@ -1,4 +1,4 @@ -import { Button } from "@makify/ui"; +import { Button } from "@makefy/ui"; import Link from "next/link"; export default function NavBar() { @@ -12,7 +12,7 @@ export default function NavBar() {