Skip to content

Commit

Permalink
Merge pull request #634 from marchhq/refac/fe
Browse files Browse the repository at this point in the history
refac: dirs
  • Loading branch information
sajdakabir authored Nov 22, 2024
2 parents dc002a3 + 882d462 commit a237626
Show file tree
Hide file tree
Showing 24 changed files with 20 additions and 257 deletions.
164 changes: 0 additions & 164 deletions apps/frontend/components/ui/select.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion apps/frontend/src/components/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

export const DropdownCategoryTitle = ({
children,
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { memo } from "react"

import { icons } from "lucide-react"

import { cn } from "../../lib/utils"
import { cn } from "@/src/utils/utils"

export interface IconProps {
name: keyof typeof icons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { DayPicker } from "react-day-picker"

import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

export type CalendarProps = React.ComponentProps<typeof DayPicker>

Expand Down
16 changes: 0 additions & 16 deletions apps/frontend/src/components/InboxTextArea.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +0,0 @@
import { useState } from "react"

import TextEditor from "./atoms/Editor"
import useEditorHook from "../hooks/useEditor.hook"

export const InboxTextArea = (): JSX.Element => {
const [content, setContent] = useState("<p></p>")
const [isSaved, setIsSaved] = useState(false)
const editor = useEditorHook({
content,
setContent,
setIsSaved,
placeholder: "press / for markdown format",
})
return <TextEditor editor={editor} minH="20vh" />
}
2 changes: 1 addition & 1 deletion apps/frontend/src/components/Skeleton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cn } from "@/lib/utils"
import { cn } from "../utils/utils"

function Skeleton({
className,
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/Surface.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { HTMLProps, forwardRef } from "react"

import { cn } from "../../lib/utils"
import { cn } from "@/src/utils/utils"

export type SurfaceProps = HTMLProps<HTMLDivElement> & {
withShadow?: boolean
Expand Down
57 changes: 0 additions & 57 deletions apps/frontend/src/components/TodayMeetings.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion apps/frontend/src/components/atoms/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
} from "./ui/select"
} from "../ui/select"

interface Props {
placeholder: string
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/atoms/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from "react"

import * as SwitchPrimitives from "@radix-ui/react-switch"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const Switch = React.forwardRef<
React.ElementRef<typeof SwitchPrimitives.Root>,
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/atoms/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from "react"

import * as TooltipPrimitive from "@radix-ui/react-tooltip"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const TooltipProvider = TooltipPrimitive.Provider

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

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const buttonVariants = cva(
"focus-visible:ring-ring 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-offset-2 disabled:pointer-events-none disabled:opacity-50",
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { DayPicker } from "react-day-picker"

import { ChevronLeft, ChevronRight } from "lucide-react"

import { cn } from "@/lib/utils"
import { buttonVariants } from "@/src/components/ui/button"
import { cn } from "@/src/utils/utils"
export type CalendarProps = React.ComponentProps<typeof DayPicker>
function Calendar({
className,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const Card = React.forwardRef<
HTMLDivElement,
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/context-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as React from "react"
import * as ContextMenuPrimitive from "@radix-ui/react-context-menu"
import { Check, ChevronRight, Circle } from "lucide-react"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const ContextMenu = ContextMenuPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as React from "react"
import * as DialogPrimitive from "@radix-ui/react-dialog"
import { Cross2Icon } from "@radix-ui/react-icons"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const Dialog = DialogPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as React from "react"
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
import { Check, ChevronRight, Circle } from "lucide-react"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const DropdownMenu = DropdownMenuPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/input.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

export interface InputProps
extends React.InputHTMLAttributes<HTMLInputElement> {}
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from "react"

import * as PopoverPrimitive from "@radix-ui/react-popover"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const Popover = PopoverPrimitive.Root

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as React from "react"
import * as SelectPrimitive from "@radix-ui/react-select"
import { Check, ChevronDown, ChevronUp } from "lucide-react"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

const Select = SelectPrimitive.Root

Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/textarea.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react"

import { cn } from "@/lib/utils"
import { cn } from "@/src/utils/utils"

export interface TextareaProps
extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
Expand Down
Loading

0 comments on commit a237626

Please sign in to comment.