Merge pull request #34 from castrogarciajs/main

close #26
openlabs-dev · Mar 27, 2024 · 63862b2 · 63862b2
2 parents 5290f89 + 59db071
commit 63862b2
Show file tree

Hide file tree

Showing 75 changed files with 355 additions and 81 deletions.
diff --git a/.gitignore b/.gitignore
@@ -86,6 +86,7 @@ web_modules/
 
 # Next.js build output
 .next
+.turbo
 out
 
 # Nuxt.js build / generate output

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Desing System
 
-<img src="./doc/OpenLand.jpeg" alt="Open Land logo" align="right"  width="100">
+<img src="./docs/OpenLand.jpeg" alt="Open Land logo" align="right"  width="100">
 
 This is the source code for https://desing-system.dev by Open Land
 
@@ -15,7 +15,7 @@ This is the source code for https://desing-system.dev by Open Land
 
 ## Getting Started
 
-<img src="./doc/preview.png" alt="Open Land logo" align="right"  width="300">
+<img src="./docs/preview.png" alt="Open Land logo" align="right"  width="300">
 This design system is totally easy to use with the aim of facilitating upcoming new projects. The design system is a challenge for our team. You can gladly contribute and guide us with ideas to improve... We would be keen to hear any feedback on this project.
 
 <br>
@@ -75,7 +75,7 @@ _Navigation_
 
 _Overlay_
 
-- [ ] Modal
+- [x] Dialog
 - [ ] Context Menu
 - [ ] Drawer / SidePanel
 - [ ] Toast messages / Notification

diff --git a/doc/OpenLand.jpeg → docs/OpenLand.jpeg b/doc/OpenLand.jpeg → docs/OpenLand.jpeg
diff --git a/doc/preview.png → docs/preview.png b/doc/preview.png → docs/preview.png
diff --git a/docs/workspace.md b/docs/workspace.md
@@ -0,0 +1,27 @@
+# Configure workspaces
+
+## Install turbo
+
+Install turbo globally.
+
+```shell
+pnpm install turbo --global
+```
+
+For more details about installation, see Installing Turborepo
+
+## Scripts
+
+1. Run mode dev.
+
+```shell
+turbo dev
+```
+
+2. Run build packages
+
+```shell
+turbo build
+```
+
+Your ready for worker and add components 🎉
diff --git a/test/with-nextjs/.eslintrc.json → examples/with-nextjs/.eslintrc.json b/test/with-nextjs/.eslintrc.json → examples/with-nextjs/.eslintrc.json
diff --git a/test/with-nextjs/.gitignore → examples/with-nextjs/.gitignore b/test/with-nextjs/.gitignore → examples/with-nextjs/.gitignore
diff --git a/test/with-nextjs/README.md → examples/with-nextjs/README.md b/test/with-nextjs/README.md → examples/with-nextjs/README.md
diff --git a/test/with-nextjs/app/favicon.ico → examples/with-nextjs/app/favicon.ico b/test/with-nextjs/app/favicon.ico → examples/with-nextjs/app/favicon.ico
diff --git a/test/with-nextjs/app/globals.css → examples/with-nextjs/app/globals.css b/test/with-nextjs/app/globals.css → examples/with-nextjs/app/globals.css
diff --git a/test/with-nextjs/app/layout.tsx → examples/with-nextjs/app/layout.tsx b/test/with-nextjs/app/layout.tsx → examples/with-nextjs/app/layout.tsx
diff --git a/test/with-nextjs/app/page.tsx → examples/with-nextjs/app/page.tsx b/test/with-nextjs/app/page.tsx → examples/with-nextjs/app/page.tsx
@@ -1,5 +1,6 @@
 import Image from 'next/image'
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger, Avatar, AvatarFallback, AvatarImage, Badge, Button, Input, Label, Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow } from '@design-system/react'
+import { DialogDemo } from '@/components/test-dialog'
 
 export default function Home() {
   return (
@@ -9,6 +10,7 @@ export default function Home() {
           Get started by editing&nbsp;
           <code className="font-mono font-bold">app/page.tsx</code>
         </p>
+        <DialogDemo />
         <Button>
           Examples UI
         </Button>

diff --git a/test/with-nextjs/components/button.tsx → examples/with-nextjs/components/button.tsx b/test/with-nextjs/components/button.tsx → examples/with-nextjs/components/button.tsx
diff --git a/examples/with-nextjs/components/test-dialog.tsx b/examples/with-nextjs/components/test-dialog.tsx
@@ -0,0 +1,57 @@
+'use client'
+
+import {
+  Button,
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+  Input,
+  Label,
+} from '@design-system/react'
+
+export function DialogDemo() {
+  return (
+    <Dialog>
+      <DialogTrigger asChild>
+        <Button variant="dark">Edit Profile</Button>
+      </DialogTrigger>
+      <DialogContent className="sm:max-w-[425px]">
+        <DialogHeader>
+          <DialogTitle>Edit profile</DialogTitle>
+          <DialogDescription>
+            Make changes to your profile here. Click save when you're done.
+          </DialogDescription>
+        </DialogHeader>
+        <div className="grid gap-4 py-4">
+          <div className="grid grid-cols-4 items-center gap-4">
+            <Label htmlFor="name" className="text-right">
+              Name
+            </Label>
+            <Input
+              id="name"
+              defaultValue="Pedro Duarte"
+              className="col-span-3"
+            />
+          </div>
+          <div className="grid grid-cols-4 items-center gap-4">
+            <Label htmlFor="username" className="text-right">
+              Username
+            </Label>
+            <Input
+              id="username"
+              defaultValue="@peduarte"
+              className="col-span-3"
+            />
+          </div>
+        </div>
+        <DialogFooter>
+          <Button type="submit">Save changes</Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/test/with-nextjs/next.config.mjs → examples/with-nextjs/next.config.mjs b/test/with-nextjs/next.config.mjs → examples/with-nextjs/next.config.mjs
diff --git a/test/with-nextjs/package.json → examples/with-nextjs/package.json b/test/with-nextjs/package.json → examples/with-nextjs/package.json
diff --git a/test/with-nextjs/postcss.config.js → examples/with-nextjs/postcss.config.js b/test/with-nextjs/postcss.config.js → examples/with-nextjs/postcss.config.js
diff --git a/test/with-nextjs/public/next.svg → examples/with-nextjs/public/next.svg b/test/with-nextjs/public/next.svg → examples/with-nextjs/public/next.svg
diff --git a/test/with-nextjs/public/vercel.svg → examples/with-nextjs/public/vercel.svg b/test/with-nextjs/public/vercel.svg → examples/with-nextjs/public/vercel.svg
diff --git a/test/with-nextjs/tailwind.config.ts → examples/with-nextjs/tailwind.config.ts b/test/with-nextjs/tailwind.config.ts → examples/with-nextjs/tailwind.config.ts
diff --git a/test/with-nextjs/tsconfig.json → examples/with-nextjs/tsconfig.json b/test/with-nextjs/tsconfig.json → examples/with-nextjs/tsconfig.json
diff --git a/test/with-vitejs/.eslintrc.cjs → examples/with-vitejs/.eslintrc.cjs b/test/with-vitejs/.eslintrc.cjs → examples/with-vitejs/.eslintrc.cjs
diff --git a/test/with-vitejs/.gitignore → examples/with-vitejs/.gitignore b/test/with-vitejs/.gitignore → examples/with-vitejs/.gitignore
diff --git a/test/with-vitejs/README.md → examples/with-vitejs/README.md b/test/with-vitejs/README.md → examples/with-vitejs/README.md
diff --git a/test/with-vitejs/index.html → examples/with-vitejs/index.html b/test/with-vitejs/index.html → examples/with-vitejs/index.html
diff --git a/test/with-vitejs/package.json → examples/with-vitejs/package.json b/test/with-vitejs/package.json → examples/with-vitejs/package.json
diff --git a/test/with-vitejs/postcss.config.js → examples/with-vitejs/postcss.config.js b/test/with-vitejs/postcss.config.js → examples/with-vitejs/postcss.config.js
diff --git a/test/with-vitejs/public/vite.svg → examples/with-vitejs/public/vite.svg b/test/with-vitejs/public/vite.svg → examples/with-vitejs/public/vite.svg
diff --git a/test/with-vitejs/src/App.tsx → examples/with-vitejs/src/App.tsx b/test/with-vitejs/src/App.tsx → examples/with-vitejs/src/App.tsx
@@ -2,6 +2,7 @@ import { useState } from 'react'
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger, Badge, Button, Input, Label, Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow } from '@design-system/react'
 import reactLogo from './assets/react.svg'
 import viteLogo from '/vite.svg'
+import { DialogCloseButton } from './test-dialog'
 
 function App() {
   const [count, setCount] = useState(0)
@@ -11,6 +12,7 @@ function App() {
       <Button>
         Examples UI
       </Button>
+      <DialogCloseButton />
       <AlertDialog>
         <AlertDialogTrigger>Open</AlertDialogTrigger>
         <AlertDialogContent>

diff --git a/test/with-vitejs/src/assets/react.svg → examples/with-vitejs/src/assets/react.svg b/test/with-vitejs/src/assets/react.svg → examples/with-vitejs/src/assets/react.svg
diff --git a/test/with-vitejs/src/index.css → examples/with-vitejs/src/index.css b/test/with-vitejs/src/index.css → examples/with-vitejs/src/index.css
diff --git a/test/with-vitejs/src/main.tsx → examples/with-vitejs/src/main.tsx b/test/with-vitejs/src/main.tsx → examples/with-vitejs/src/main.tsx
diff --git a/examples/with-vitejs/src/test-dialog.tsx b/examples/with-vitejs/src/test-dialog.tsx
@@ -0,0 +1,56 @@
+import { Copy } from 'lucide-react'
+
+import {
+  Button,
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+  Input,
+  Label,
+} from '@design-system/react'
+
+export function DialogCloseButton() {
+  return (
+    <Dialog>
+      <DialogTrigger asChild>
+        <Button variant="dark">Share</Button>
+      </DialogTrigger>
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle>Share link</DialogTitle>
+          <DialogDescription>
+            Anyone who has this link will be able to view this.
+          </DialogDescription>
+        </DialogHeader>
+        <div className="flex items-center space-x-2">
+          <div className="grid flex-1 gap-2">
+            <Label htmlFor="link" className="sr-only">
+              Link
+            </Label>
+            <Input
+              id="link"
+              defaultValue="https://ui.shadcn.com/docs/installation"
+              readOnly
+            />
+          </div>
+          <Button type="submit" size="sm" className="px-3">
+            <span className="sr-only">Copy</span>
+            <Copy className="h-4 w-4" />
+          </Button>
+        </div>
+        <DialogFooter className="sm:justify-start">
+          <DialogClose asChild>
+            <Button type="button" variant="error">
+              Close
+            </Button>
+          </DialogClose>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/test/with-vitejs/src/vite-env.d.ts → examples/with-vitejs/src/vite-env.d.ts b/test/with-vitejs/src/vite-env.d.ts → examples/with-vitejs/src/vite-env.d.ts
diff --git a/test/with-vitejs/tailwind.config.js → examples/with-vitejs/tailwind.config.js b/test/with-vitejs/tailwind.config.js → examples/with-vitejs/tailwind.config.js
diff --git a/test/with-vitejs/tsconfig.json → examples/with-vitejs/tsconfig.json b/test/with-vitejs/tsconfig.json → examples/with-vitejs/tsconfig.json
diff --git a/test/with-vitejs/tsconfig.node.json → examples/with-vitejs/tsconfig.node.json b/test/with-vitejs/tsconfig.node.json → examples/with-vitejs/tsconfig.node.json
diff --git a/test/with-vitejs/vite.config.ts → examples/with-vitejs/vite.config.ts b/test/with-vitejs/vite.config.ts → examples/with-vitejs/vite.config.ts
diff --git a/package.json b/package.json
@@ -12,8 +12,6 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "lint": "eslint .",
-    "test-dev": "pnpm -r --filter=./test/* dev",
-    "build": "pnpm -r --filter=./lib/* build",
     "prepare": "husky"
   },
   "devDependencies": {

diff --git a/lib/react/.npmignore → packages/react/.npmignore b/lib/react/.npmignore → packages/react/.npmignore
diff --git a/lib/react/package.json → packages/react/package.json b/lib/react/package.json → packages/react/package.json
@@ -24,6 +24,7 @@
     "@radix-ui/react-alert-dialog": "1.0.5",
     "@radix-ui/react-aspect-ratio": "1.0.3",
     "@radix-ui/react-avatar": "1.0.4",
+    "@radix-ui/react-dialog": "1.0.5",
     "@radix-ui/react-label": "2.0.2",
     "@radix-ui/react-slot": "1.0.2",
     "class-variance-authority": "0.7.0",

diff --git a/lib/react/src/components/alert-dialog.tsx → ...ges/react/src/components/alert-dialog.tsx b/lib/react/src/components/alert-dialog.tsx → ...ges/react/src/components/alert-dialog.tsx
diff --git a/lib/react/src/components/alert.tsx → packages/react/src/components/alert.tsx b/lib/react/src/components/alert.tsx → packages/react/src/components/alert.tsx
diff --git a/lib/react/src/components/aspect-ratio.tsx → ...ges/react/src/components/aspect-ratio.tsx b/lib/react/src/components/aspect-ratio.tsx → ...ges/react/src/components/aspect-ratio.tsx
diff --git a/lib/react/src/components/avatar.tsx → packages/react/src/components/avatar.tsx b/lib/react/src/components/avatar.tsx → packages/react/src/components/avatar.tsx
diff --git a/lib/react/src/components/badge.tsx → packages/react/src/components/badge.tsx b/lib/react/src/components/badge.tsx → packages/react/src/components/badge.tsx
diff --git a/lib/react/src/components/button.tsx → packages/react/src/components/button.tsx b/lib/react/src/components/button.tsx → packages/react/src/components/button.tsx
diff --git a/lib/react/src/components/carousel.tsx → packages/react/src/components/carousel.tsx b/lib/react/src/components/carousel.tsx → packages/react/src/components/carousel.tsx
diff --git a/packages/react/src/components/dialog.tsx b/packages/react/src/components/dialog.tsx
@@ -0,0 +1,114 @@
+import * as React from 'react'
+import * as DialogPrimitive from '@radix-ui/react-dialog'
+
+import { cn } from '../lib/cn'
+
+const Dialog = DialogPrimitive.Root
+
+const DialogTrigger = DialogPrimitive.Trigger
+
+const DialogPortal = DialogPrimitive.Portal
+
+const DialogClose = DialogPrimitive.Close
+
+const DialogOverlay = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Overlay
+    ref={ref}
+    className={cn(
+      'fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+      className,
+    )}
+    {...props}
+  />
+))
+
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
+
+const DialogContent = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <DialogPortal>
+    <DialogOverlay />
+    <DialogPrimitive.Content
+      ref={ref}
+      className={cn(
+        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 bg-dark-900 p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+        className,
+      )}
+      {...props}
+    >
+      {children}
+      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className={cn('lucide lucide-x size-5')}>
+          <path d="M18 6 6 18" />
+          <path d="m6 6 12 12" />
+        </svg>
+        <span className="sr-only">Close</span>
+      </DialogPrimitive.Close>
+    </DialogPrimitive.Content>
+  </DialogPortal>
+))
+
+DialogContent.displayName = DialogPrimitive.Content.displayName
+
+function DialogHeader({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div
+      className={cn('flex flex-col space-y-1.5 text-center sm:text-left text-medium', className)}
+      {...props}
+    />
+  )
+}
+
+DialogHeader.displayName = 'DialogHeader'
+
+function DialogFooter({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div
+      className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)}
+      {...props}
+    />
+  )
+}
+
+DialogFooter.displayName = 'DialogFooter'
+
+const DialogTitle = React.forwardRef<React.ElementRef<typeof DialogPrimitive.Title>, React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Title
+    ref={ref}
+    className={cn(
+      'text-lg font-semibold leading-none tracking-tight text-white',
+      className,
+    )}
+    {...props}
+  />
+))
+
+DialogTitle.displayName = DialogPrimitive.Title.displayName
+
+const DialogDescription = React.forwardRef<React.ElementRef<typeof DialogPrimitive.Description>, React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Description
+    ref={ref}
+    className={cn('text-sm text-dark-400', className)}
+    {...props}
+  />
+))
+
+DialogDescription.displayName = DialogPrimitive.Description.displayName
+
+export {
+  Dialog,
+  DialogPortal,
+  DialogOverlay,
+  DialogClose,
+  DialogTrigger,
+  DialogContent,
+  DialogHeader,
+  DialogFooter,
+  DialogTitle,
+  DialogDescription,
+}
diff --git a/lib/react/src/components/input.tsx → packages/react/src/components/input.tsx b/lib/react/src/components/input.tsx → packages/react/src/components/input.tsx
diff --git a/lib/react/src/components/label.tsx → packages/react/src/components/label.tsx b/lib/react/src/components/label.tsx → packages/react/src/components/label.tsx
diff --git a/lib/react/src/components/table.tsx → packages/react/src/components/table.tsx b/lib/react/src/components/table.tsx → packages/react/src/components/table.tsx
diff --git a/lib/react/src/index.ts → packages/react/src/index.ts b/lib/react/src/index.ts → packages/react/src/index.ts
@@ -13,3 +13,4 @@ export * from './components/table'
 export * from './components/avatar'
 export * from './components/input'
 export * from './components/label'
+export * from './components/dialog'
diff --git a/lib/react/src/lib/cn.ts → packages/react/src/lib/cn.ts b/lib/react/src/lib/cn.ts → packages/react/src/lib/cn.ts
diff --git a/lib/react/src/plugin.ts → packages/react/src/plugin.ts b/lib/react/src/plugin.ts → packages/react/src/plugin.ts
diff --git a/lib/react/tsconfig.json → packages/react/tsconfig.json b/lib/react/tsconfig.json → packages/react/tsconfig.json
diff --git a/lib/react/tsup.config.ts → packages/react/tsup.config.ts b/lib/react/tsup.config.ts → packages/react/tsup.config.ts
diff --git a/lib/theme/package.json → packages/theme/package.json b/lib/theme/package.json → packages/theme/package.json
diff --git a/lib/theme/src/box-shadows.ts → packages/theme/src/box-shadows.ts b/lib/theme/src/box-shadows.ts → packages/theme/src/box-shadows.ts
diff --git a/lib/theme/src/colors/dark.ts → packages/theme/src/colors/dark.ts b/lib/theme/src/colors/dark.ts → packages/theme/src/colors/dark.ts
diff --git a/lib/theme/src/colors/error.ts → packages/theme/src/colors/error.ts b/lib/theme/src/colors/error.ts → packages/theme/src/colors/error.ts
diff --git a/lib/theme/src/colors/index.ts → packages/theme/src/colors/index.ts b/lib/theme/src/colors/index.ts → packages/theme/src/colors/index.ts
diff --git a/lib/theme/src/colors/primary.ts → packages/theme/src/colors/primary.ts b/lib/theme/src/colors/primary.ts → packages/theme/src/colors/primary.ts
diff --git a/lib/theme/src/colors/secondary.ts → packages/theme/src/colors/secondary.ts b/lib/theme/src/colors/secondary.ts → packages/theme/src/colors/secondary.ts
diff --git a/lib/theme/src/colors/success.ts → packages/theme/src/colors/success.ts b/lib/theme/src/colors/success.ts → packages/theme/src/colors/success.ts
diff --git a/lib/theme/src/colors/warn.ts → packages/theme/src/colors/warn.ts b/lib/theme/src/colors/warn.ts → packages/theme/src/colors/warn.ts
diff --git a/lib/theme/src/index.ts → packages/theme/src/index.ts b/lib/theme/src/index.ts → packages/theme/src/index.ts
diff --git a/lib/theme/src/radius.ts → packages/theme/src/radius.ts b/lib/theme/src/radius.ts → packages/theme/src/radius.ts
diff --git a/lib/theme/src/screens.ts → packages/theme/src/screens.ts b/lib/theme/src/screens.ts → packages/theme/src/screens.ts
diff --git a/lib/theme/src/shadcn-ui.ts → packages/theme/src/shadcn-ui.ts b/lib/theme/src/shadcn-ui.ts → packages/theme/src/shadcn-ui.ts
diff --git a/lib/theme/src/tailwindcss.ts → packages/theme/src/tailwindcss.ts b/lib/theme/src/tailwindcss.ts → packages/theme/src/tailwindcss.ts
diff --git a/lib/theme/tsup.config.ts → packages/theme/tsup.config.ts b/lib/theme/tsup.config.ts → packages/theme/tsup.config.ts