Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

importing from goodui looks good so far #6

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export * from '@pppaaattt/goodui'

export * from './ui/index.ts'
export * from './layout/index.ts'
export * from './templates/index.ts'
Expand Down
3 changes: 1 addition & 2 deletions app/components/layout/nav-user-controls.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Link } from '@remix-run/react'
import { Button } from '#app/components/index.ts'
import { Button, DropdownNavigation } from '#app/components/index.ts'
import { getUserImgSrc } from '#app/utils/misc.tsx'
import { useOptionalUser, useUser } from '#app/utils/user.ts'
import DropdownNavigation from '../templates/dropdown-navigation.tsx'

function NavUserControls() {
const user = useOptionalUser()
Expand Down
2 changes: 1 addition & 1 deletion app/components/templates/dropdown-navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface DropdownNavigationProps {
logout: boolean
}

export default function DropdownNavigation({
export function DropdownNavigation({
menuItems,
button,
logout,
Expand Down
2 changes: 2 additions & 0 deletions app/components/templates/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export * from './layout/index.ts'
export * from './theme-switch.tsx'
export * from './dropdown-navigation.tsx'
2 changes: 1 addition & 1 deletion app/components/templates/layout/page-content-index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Content } from '#app/components/layout/index.ts'
import { Content } from '#app/components/index.ts'

interface PageContentIndexProps {
message: string
Expand Down
2 changes: 1 addition & 1 deletion app/components/templates/layout/page-content-show.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ContentBody,
ContentHeader,
ContentImages,
} from '#app/components/layout/index.ts'
} from '#app/components/index.ts'

interface PageContentShowProps {
itemId: string
Expand Down
8 changes: 6 additions & 2 deletions app/components/templates/layout/page-footer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { Footer, NavLogo } from '#app/components/layout/index.ts'
import { ThemeSwitch, type ThemeSwitchProps } from '../theme-switch.tsx'
import {
Footer,
NavLogo,
ThemeSwitch,
type ThemeSwitchProps,
} from '#app/components/index.ts'

function PageFooter({ userPreference }: ThemeSwitchProps) {
return (
Expand Down
2 changes: 1 addition & 1 deletion app/components/templates/layout/page-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
NavLogo,
NavSearch,
NavUserControls,
} from '#app/components/layout/index.ts'
} from '#app/components/index.ts'

interface PageHeaderProps {
userId?: string | undefined
Expand Down
4 changes: 2 additions & 2 deletions app/components/templates/layout/page-sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {
Sidebar,
SidebarAvatar,
SidebarHeader,
SidebarList,
type SidebarListItem,
} from '#app/components/layout/index.ts'
import { Sidebar } from '#app/components/layout/sidebar.tsx'
} from '#app/components/index.ts'
import { type OwnerData, useOptionalUser } from '#app/utils/user.ts'

interface PageSidebarProps {
Expand Down
9 changes: 5 additions & 4 deletions app/components/ui/custom/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export * from './checkbox-field.tsx'
export * from './errors.tsx'
export * from './field.tsx'
// export * from './checkbox-field.tsx'
// export * from './errors.tsx'
// export * from './field.tsx'
export * from './status-button.tsx'
export * from './textarea-field.tsx'
// export * from './textarea-field.tsx'
export * from './icon.tsx'
1 change: 0 additions & 1 deletion app/components/ui/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from './custom/index.ts'
export * from './primitives/index.ts'
58 changes: 0 additions & 58 deletions app/components/ui/primitives/button.tsx

This file was deleted.

41 changes: 0 additions & 41 deletions app/components/ui/primitives/checkbox.tsx

This file was deleted.

206 changes: 0 additions & 206 deletions app/components/ui/primitives/dropdown-menu.tsx

This file was deleted.

Loading