clmn

getsieutoc · Sep 12, 2023 · 63173a9 · 63173a9
1 parent 9102191
commit 63173a9
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 76 deletions.
diff --git a/app/[locale]/(default)/dashboard/dashboard/files/page.tsx b/app/[locale]/(default)/dashboard/dashboard/files/page.tsx
diff --git a/app/[locale]/(default)/dashboard/dashboard/pages/page.tsx b/app/[locale]/(default)/dashboard/dashboard/pages/page.tsx
diff --git a/app/[locale]/(default)/dashboard/dashboard/posts/page.tsx b/app/[locale]/(default)/dashboard/dashboard/posts/page.tsx
diff --git a/app/[locale]/(default)/dashboard/pages/AddPageButton.tsx b/app/[locale]/(default)/dashboard/pages/AddPageButton.tsx
diff --git a/...fault)/dashboard/pages/PageForm/index.tsx → ...fault)/dashboard/pages/PageForm/index.tsx b/...fault)/dashboard/pages/PageForm/index.tsx → ...fault)/dashboard/pages/PageForm/index.tsx
diff --git a/app/(default)/dashboard/pages/new/page.tsx → ...e]/(default)/dashboard/pages/new/page.tsx b/app/(default)/dashboard/pages/new/page.tsx → ...e]/(default)/dashboard/pages/new/page.tsx
diff --git a/app/[locale]/(default)/dashboard/pages/page.tsx b/app/[locale]/(default)/dashboard/pages/page.tsx
@@ -1,20 +1,18 @@
-import { Box, Flex, Heading, Spacer, Text } from '@/components/chakra';
-import { VirtualTable } from '@/components/client';
+import { Flex, Heading, Spacer, Text } from '@/components/chakra';
+import { AddNewButton, VirtualTable } from '@/components/client';
 import { prisma } from '@/utils/prisma';
 
-import { AddPageButton } from './AddPageButton';
-
 export default async function PagesDashboard() {
   const pages = await prisma.page.findMany({});
 
   return (
-    <Box>
+    <Flex direction="column">
       <Flex justify="space-between" align="center" width="100%">
         <Heading as="h3" size="lg" alignItems="center" color="gray">
           Pages
         </Heading>
 
-        <AddPageButton />
+        <AddNewButton title="Add New Page" />
       </Flex>
 
       <Spacer />
@@ -33,6 +31,6 @@ export default async function PagesDashboard() {
       ) : (
         <Text>No pages</Text>
       )}
-    </Box>
+    </Flex>
   );
 }
diff --git a/app/[locale]/(default)/layout.tsx b/app/[locale]/(default)/layout.tsx
@@ -1,8 +1,8 @@
-import { Box, Flex, HStack } from '@/components/chakra';
-import { Navbar } from '@/components/client';
 import { ProfileMenu, LocaleSwitcher } from '@/components/server';
-import type { ReactNode } from '@/types';
+import { Box, Flex } from '@/components/chakra';
+import { Sidebar } from '@/components/client';
 import type { Locale } from '@/configs/i18n.config';
+import type { ReactNode } from '@/types';
 
 export default function DefaultLayout({
   children,
@@ -12,17 +12,13 @@ export default function DefaultLayout({
   params: { locale: Locale };
 }) {
   return (
-    <Flex direction="column">
-      <Navbar>
-        <HStack spacing={1}>
-          <Box>
-            <LocaleSwitcher locale={params.locale} />
-          </Box>
-          <Box>
-            <ProfileMenu />
-          </Box>
-        </HStack>
-      </Navbar>
+    <Flex>
+      <Sidebar>
+        <Flex gap={1} align="center">
+          <LocaleSwitcher locale={params.locale} />
+          <ProfileMenu />
+        </Flex>
+      </Sidebar>
 
       <Box padding={6} width="100%" height="100vh" overflowY="scroll">
         {children}

diff --git a/components/client/Logo/index.tsx b/components/client/Logo/index.tsx
@@ -15,7 +15,6 @@ export const Logo = ({ size = 12, href = '/', ...rest }: LogoProps) => (
         as="img"
         alt="Logo"
         placeholder="empty"
-        borderRadius="full"
         src="/next.svg" // this is from /public folder
         width={size}
         {...rest}