Skip to content

Commit 91f416d

Browse files
committed
feat(ui): consolidate MagicUI template components into @allsource/ui
- Migrated all MagicUI components (blur-fade, border-beam, dot-pattern, flickering-grid, hero-video, marquee, ripple) to packages/ui - Added UI components: accordion, carousel, chart, drawer, input, label, navigation-menu, safari, section, separator, skeleton, switch, textarea - Updated apps/web imports to use @allsource/ui instead of local components - Removed duplicate components from apps/web/src/components/ui/ - Removed magicuidesign-saas-template directory - Added missing dependencies: framer-motion, recharts, @radix-ui/react-dialog - Fixed TypeScript type issues with drawer component - Added next as peer/dev dependency for Image component support
1 parent f7fde35 commit 91f416d

File tree

152 files changed

+1645
-13291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+1645
-13291
lines changed

apps/web/src/app/(auth)/login/page.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import Link from "next/link";
22

3-
import { Icons } from "@/components/icons";
4-
import { Button } from "@/components/ui/button";
5-
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
6-
import { Input } from "@/components/ui/input";
7-
import { Label } from "@/components/ui/label";
3+
import {
4+
Icons,
5+
Button,
6+
Card,
7+
CardContent,
8+
CardDescription,
9+
CardHeader,
10+
CardTitle,
11+
Input,
12+
Label,
13+
} from "@allsource/ui";
814

915
export default function LoginForm() {
1016
return (

apps/web/src/app/(auth)/signup/page.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
import Link from "next/link";
22

3-
import { Button } from "@/components/ui/button";
4-
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
5-
import { Input } from "@/components/ui/input";
6-
import { Label } from "@/components/ui/label";
3+
import {
4+
Button,
5+
Card,
6+
CardContent,
7+
CardDescription,
8+
CardHeader,
9+
CardTitle,
10+
Input,
11+
Label,
12+
} from "@allsource/ui";
713

814
export default function LoginForm() {
915
return (

apps/web/src/app/demo/page.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ import { SecurityDemo } from "@/components/demo/security-demo";
1111
import { TimeTravelDemo } from "@/components/demo/time-travel-demo";
1212
import { AnalyticsDemo } from "@/components/demo/analytics-demo";
1313
import { PipelinesDemo } from "@/components/demo/pipelines-demo";
14-
import DotPattern from "@/components/magicui/dot-pattern";
15-
import Ripple from "@/components/magicui/ripple";
16-
import BlurFade from "@/components/magicui/blur-fade";
14+
import { DotPattern, Ripple, BlurFade } from "@allsource/ui";
1715

1816
const features = [
1917
{

apps/web/src/app/og/route.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Icons } from "@/components/icons";
1+
import { Icons } from "@allsource/ui";
22
import { siteConfig } from "@/lib/config";
33
import { ImageResponse } from "next/og";
44
import { NextRequest } from "next/server";

apps/web/src/components/avatar-circles.tsx

Lines changed: 0 additions & 27 deletions
This file was deleted.

apps/web/src/components/drawer.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { Icons } from "@/components/icons";
2-
import { buttonVariants } from "@/components/ui/button";
31
import {
2+
Icons,
3+
buttonVariants,
44
Drawer,
55
DrawerContent,
66
DrawerFooter,
77
DrawerHeader,
88
DrawerTrigger,
99
DrawerDescription,
1010
DrawerTitle,
11-
} from "@/components/ui/drawer";
11+
cn,
12+
} from "@allsource/ui";
1213
import { siteConfig } from "@/lib/config";
13-
import { cn } from "@/lib/utils";
1414
import Link from "next/link";
1515
import { IoMenuSharp } from "react-icons/io5";
1616
import { VisuallyHidden } from "@radix-ui/react-visually-hidden";

apps/web/src/components/features-horizontal.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
"use client";
22

3-
import { BorderBeam } from "@/components/magicui/border-beam";
3+
import { BorderBeam, cn } from "@allsource/ui";
44
import * as Accordion from "@radix-ui/react-accordion";
55
import { motion, useInView } from "framer-motion";
6-
import React, { forwardRef, ReactNode, useEffect, useRef, useState } from "react";
7-
8-
import { cn } from "@/lib/utils";
6+
import React, { forwardRef, type ReactNode, useEffect, useRef, useState } from "react";
97

108
type AccordionItemProps = {
119
children: React.ReactNode;

apps/web/src/components/features-vertical.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
"use client";
22

3+
import { cn } from "@allsource/ui";
34
import * as Accordion from "@radix-ui/react-accordion";
45
import { motion, useInView } from "framer-motion";
5-
import React, { forwardRef, ReactNode, useEffect, useRef, useState } from "react";
6-
7-
import { cn } from "@/lib/utils";
6+
import React, { forwardRef, type ReactNode, useEffect, useRef, useState } from "react";
87

98
type AccordionItemProps = {
109
children: React.ReactNode;

apps/web/src/components/icons.tsx

Lines changed: 0 additions & 138 deletions
This file was deleted.

apps/web/src/components/magicui/blur-fade.tsx

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)