Skip to content

Commit

Permalink
fix: 调整文件解构
Browse files Browse the repository at this point in the history
  • Loading branch information
besscroft committed Apr 11, 2024
1 parent f7034e8 commit a6d30bd
Show file tree
Hide file tree
Showing 21 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions app/(default)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Header from '~/components/Header'
import Transitions, { Animate } from '~/components/Transitions'
import Header from '~/components/layout/Header'
import Transitions, { Animate } from '~/components/layout/Transitions'

export default async function DefaultLayout({
children,
Expand Down
6 changes: 3 additions & 3 deletions app/admin/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DashHeader from '~/components/DashHeader'
import { BaseSide } from '~/components/BaseSide'
import Transitions, { Animate } from '~/components/Transitions'
import DashHeader from '~/components/layout/DashHeader'
import { BaseSide } from '~/components/layout/BaseSide'
import Transitions, { Animate } from '~/components/layout/Transitions'

import { AntdRegistry } from '@ant-design/nextjs-registry'

Expand Down
6 changes: 3 additions & 3 deletions app/admin/settings/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import React from 'react'
import { Tabs, Tab } from '@nextui-org/react'
import SettingsTab from '~/components/SettingsTab'
import AListTabs from '~/components/AListTabs'
import S3Tabs from '~/components/S3Tabs'
import SettingsTab from '~/components/admin/settings/SettingsTab'
import AListTabs from '~/components/admin/settings/AListTabs'
import S3Tabs from '~/components/admin/settings/S3Tabs'

export default async function Settings() {
return (
Expand Down
2 changes: 1 addition & 1 deletion app/admin/tag/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fetchTagsList } from '~/server/lib/query'
import TagList from '~/components/TagList'
import TagList from '~/components/admin/tag/TagList'
import { Card, CardHeader } from '@nextui-org/card'
import RefreshButton from '~/components/RefreshButton'
import { HandleProps } from '~/types'
Expand Down
4 changes: 2 additions & 2 deletions app/admin/upload/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Card, CardBody, CardHeader } from '@nextui-org/card'
import FileUpload from '~/components/FileUpload'
import FileUpload from '~/components/admin/upload/FileUpload'
import { Button } from '@nextui-org/react'
import UploadSelect from '~/components/UploadSelect'
import UploadSelect from '~/components/admin/upload/UploadSelect'

export default async function Upload() {

Expand Down
2 changes: 1 addition & 1 deletion app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Image from "next/image"
import fufu from '~/public/112962239_p0.jpg'
import { UserFrom } from '~/components/UserFrom'
import { UserFrom } from '~/components/login/UserFrom'

export default function Login() {
return (
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Navbar, NavbarBrand, NavbarContent, NavbarItem, Link } from '@nextui-org/react'
import Logo from '~/components/Logo'
import DynamicNavbar from '~/components/DynamicNavbar'
import Logo from '~/components/layout/Logo'
import DynamicNavbar from '~/components/layout/DynamicNavbar'

export default function DashHeader() {
return (
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import VaulDrawer from '~/components/VaulDrawer'
import { DropMenu } from '~/components/DropMenu'
import VaulDrawer from '~/components/layout/VaulDrawer'
import { DropMenu } from '~/components/layout/DropMenu'

export default async function DynamicNavbar() {
return (
Expand Down
6 changes: 3 additions & 3 deletions components/Header.tsx → components/layout/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Navbar, NavbarBrand, NavbarContent, NavbarItem } from '@nextui-org/react'
import Logo from '~/components/Logo'
import DynamicNavbar from '~/components/DynamicNavbar'
import Logo from '~/components/layout/Logo'
import DynamicNavbar from '~/components/layout/DynamicNavbar'
import Link from 'next/link'

export default function Header() {
Expand All @@ -11,7 +11,7 @@ export default function Header() {
</NavbarBrand>
<NavbarContent className="hidden sm:flex gap-4 select-none" justify="center">
<NavbarItem className="cursor-pointer">
<Link href="/">首页</Link>
<Link href="/public">首页</Link>
</NavbarItem>
<NavbarItem className="cursor-pointer">
<Link href="/about">关于</Link>
Expand Down
2 changes: 1 addition & 1 deletion components/Logo.tsx → components/layout/Logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Link from 'next/link'

export default function Logo() {
return (
<Link href="/">
<Link href="/public">
<Image
src={favicon}
alt="Picture of the author"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a6d30bd

Please sign in to comment.