Skip to content

Commit

Permalink
import fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sophiabeluli committed Aug 20, 2024
1 parent deb72d7 commit 9b82190
Show file tree
Hide file tree
Showing 33 changed files with 108 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Accordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as AccordionPrimitive from "@radix-ui/react-accordion"
import { ChevronDown } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const Accordion = AccordionPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority"

import { cx } from "classnames"
import cx from "classnames"

const alertVariants = cva(
"relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/AlertDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"

import { cx } from "classnames"
import cx from "classnames"
import { buttonVariants } from "./Button"

const AlertDialog = AlertDialogPrimitive.Root
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority"

import { cx } from "classnames"
import cx from "classnames"

const badgeVariants = cva(
"inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from "react"
import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority"

import { cx } from "classnames"
import cx from "classnames"

const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as React from "react"

import { cx } from "classnames"
import cx from "classnames"

const Card = React.forwardRef<
HTMLDivElement,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Carousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import useEmblaCarousel, {
} from "embla-carousel-react"
import { ArrowLeft, ArrowRight } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"
import { Button } from "./Button"

type CarouselApi = UseEmblaCarouselType[1]
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
import { Check } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const Checkbox = React.forwardRef<
React.ElementRef<typeof CheckboxPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Command.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { type DialogProps } from "@radix-ui/react-dialog"
import { Command as CommandPrimitive } from "cmdk"
import { Search } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"
import { Dialog, DialogContent } from "./Dialog"

const Command = React.forwardRef<
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as DialogPrimitive from "@radix-ui/react-dialog"
import { X } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const Dialog = DialogPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import { Drawer as DrawerPrimitive } from "vaul"

import { cx } from "classnames"
import cx from "classnames"

const Drawer = ({
shouldScaleBackground = true,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
import { Check, ChevronRight, Circle } from "lucide-react"

import { cx } from "classnames";
import cx from "classnames";

const DropdownMenu = DropdownMenuPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
useFormContext,
} from "react-hook-form"

import { cx } from "classnames"
import cx from "classnames"
import { Label } from "./Label"

const Form = FormProvider
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as React from "react"

import { cx } from "classnames"
import cx from "classnames"

export interface InputProps
extends React.InputHTMLAttributes<HTMLInputElement> {}
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Label.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as LabelPrimitive from "@radix-ui/react-label"
import { cva, type VariantProps } from "class-variance-authority"

import { cx } from "classnames"
import cx from "classnames"

const labelVariants = cva(
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/NavigationMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu"
import { cva } from "class-variance-authority"
import { ChevronDown } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const NavigationMenu = React.forwardRef<
React.ElementRef<typeof NavigationMenuPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as PopoverPrimitive from "@radix-ui/react-popover"

import { cx } from "classnames"
import cx from "classnames"

const Popover = PopoverPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Progress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as ProgressPrimitive from "@radix-ui/react-progress"

import { cx } from "classnames"
import cx from "classnames"

const Progress = React.forwardRef<
React.ElementRef<typeof ProgressPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/RadioGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"
import { Circle } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const RadioGroup = React.forwardRef<
React.ElementRef<typeof RadioGroupPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/ScrollArea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"

import { cx } from "classnames"
import cx from "classnames"

const ScrollArea = React.forwardRef<
React.ElementRef<typeof ScrollAreaPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as SelectPrimitive from "@radix-ui/react-select"
import { Check, ChevronDown, ChevronUp } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const Select = SelectPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as SheetPrimitive from "@radix-ui/react-dialog"
import { cva, type VariantProps } from "class-variance-authority"
import { X } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const Sheet = SheetPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Slider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as SliderPrimitive from "@radix-ui/react-slider"

import { cx } from "classnames"
import cx from "classnames"

const Slider = React.forwardRef<
React.ElementRef<typeof SliderPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as SwitchPrimitives from "@radix-ui/react-switch"

import { cx } from "classnames"
import cx from "classnames"

const Switch = React.forwardRef<
React.ElementRef<typeof SwitchPrimitives.Root>,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as React from "react"

import { cx } from "classnames"
import cx from "classnames"

const Table = React.forwardRef<
HTMLTableElement,
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as TabsPrimitive from "@radix-ui/react-tabs"

import { cx } from "classnames"
import cx from "classnames"

const Tabs = TabsPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/TextArea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as React from "react"

import { cx } from "classnames"
import cx from "classnames"

export interface TextareaProps
extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Toast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as ToastPrimitives from "@radix-ui/react-toast"
import { cva, type VariantProps } from "class-variance-authority"
import { X } from "lucide-react"

import { cx } from "classnames"
import cx from "classnames"

const ToastProvider = ToastPrimitives.Provider

Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as TogglePrimitive from "@radix-ui/react-toggle"
import { cva, type VariantProps } from "class-variance-authority"

import { cx } from "classnames"
import cx from "classnames"

const toggleVariants = cva(
"inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground",
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/ToggleGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as React from "react"
import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"
import { type VariantProps } from "class-variance-authority"

import { cx } from "classnames"
import cx from "classnames"
import { toggleVariants } from "./Toggle"

const ToggleGroupContext = React.createContext<
Expand Down
2 changes: 1 addition & 1 deletion src/app/src/components/shadcn/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import * as React from "react"
import * as TooltipPrimitive from "@radix-ui/react-tooltip"

import { cx } from "classnames"
import cx from "classnames"

const TooltipProvider = TooltipPrimitive.Provider

Expand Down
80 changes: 76 additions & 4 deletions src/app/src/workspace/Column/index.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,89 @@
import { Widget } from "../../components/Widget";
import { Location } from "../../features/Location";
// import { Widget } from "../../components/Widget";
// import { Location } from "../../features/Location";

import { Button } from "../../components/shadcn/Button"
import {
Card,
CardContent,
CardDescription,
CardFooter,
CardHeader,
CardTitle,
} from "../../components/shadcn/Card"
import { Input } from "../../components/shadcn/Input"
import { Label } from "../../components/shadcn/Label"
import {
Tabs,
TabsContent,
TabsList,
TabsTrigger,
} from "../../components/shadcn/Tabs"

export const Column = () => {
return (
<div className="p-1 flex-1 box-border">
<Widget>
{/* <Widget>
<Widget.Content
className=""
style={{ width: '100%' }}
>
<Location />
</Widget.Content>
</Widget>
</Widget> */}


<Tabs defaultValue="account" className="w-[400px]">
<TabsList className="grid w-full grid-cols-2">
<TabsTrigger value="account">Account</TabsTrigger>
<TabsTrigger value="password">Password</TabsTrigger>
</TabsList>
<TabsContent value="account">
<Card>
<CardHeader>
<CardTitle>Account</CardTitle>
<CardDescription>
Make changes to your account here. Click save when you're done.
</CardDescription>
</CardHeader>
<CardContent className="space-y-2">
<div className="space-y-1">
<Label htmlFor="name">Name</Label>
<Input id="name" defaultValue="Pedro Duarte" />
</div>
<div className="space-y-1">
<Label htmlFor="username">Username</Label>
<Input id="username" defaultValue="@peduarte" />
</div>
</CardContent>
<CardFooter>
<Button>Save changes</Button>
</CardFooter>
</Card>
</TabsContent>
<TabsContent value="password">
<Card>
<CardHeader>
<CardTitle>Password</CardTitle>
<CardDescription>
Change your password here. After saving, you'll be logged out.
</CardDescription>
</CardHeader>
<CardContent className="space-y-2">
<div className="space-y-1">
<Label htmlFor="current">Current password</Label>
<Input id="current" type="password" />
</div>
<div className="space-y-1">
<Label htmlFor="new">New password</Label>
<Input id="new" type="password" />
</div>
</CardContent>
<CardFooter>
<Button>Save password</Button>
</CardFooter>
</Card>
</TabsContent>
</Tabs>
</div>
);
};
2 changes: 1 addition & 1 deletion src/app/src/workspace/Sidebar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {NavBar} from "../../features/NavBar";
import {NavBar} from "../../features/navbar";

export const Sidebar = () => {
return <div className="border flex flex-col justify-end box-border">
Expand Down

0 comments on commit 9b82190

Please sign in to comment.