style: fix alignment

JusJira · Oct 30, 2023 · a030615 · a030615
1 parent 4c3bcd9
commit a030615
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/app/(seller)/merchant/order/page.tsx b/app/(seller)/merchant/order/page.tsx
@@ -62,11 +62,12 @@ const OrderPage = async () => {
       image: true,
       orderLineContains: {
         orderBy: {
-            order: {
-                orderedAt: "desc"
-            }
+          order: {
+            orderedAt: "desc",
+          },
         },
         select: {
+          totalPrice: true,
           productId: true,
           orderId: true,
           quantity: true,
@@ -75,7 +76,7 @@ const OrderPage = async () => {
               user: {
                 select: {
                   displayName: true,
-                  address: true
+                  address: true,
                 },
               },
             },
@@ -119,18 +120,18 @@ const OrderPage = async () => {
                           <div>Product # {d.productId}</div>
                           <div>Order # {d.orderId}</div>
                           <div>Quantity : {d.quantity}</div>
+                          <div>Money Paid : {d.totalPrice}</div>
                         </div>
                         <Card className="w-[350px]">
-                            <CardHeader>
-                              <CardTitle>Customer Info</CardTitle>
-                            </CardHeader>
-                            <CardContent>
-                              <div>Name : {d.order.user.displayName}</div>
-                              <div>Address : {d.order.user.address}</div>
-                            </CardContent>
-                          </Card>
+                          <CardHeader>
+                            <CardTitle>Customer Info</CardTitle>
+                          </CardHeader>
+                          <CardContent>
+                            <div>Name : {d.order.user.displayName}</div>
+                            <div>Address : {d.order.user.address}</div>
+                          </CardContent>
+                        </Card>
                       </div>
-
                     </AccordionContent>
                   </AccordionItem>
                 </Accordion>

diff --git a/app/(seller)/merchant/page.tsx b/app/(seller)/merchant/page.tsx
@@ -46,7 +46,8 @@ export default async function account() {
         <h3 className="text-lg font-medium">Merchant</h3>
       </div>
       <Separator />
-      <div className="flex h-full  min-h-full flex-row items-center justify-center gap-3 rounded-md bg-white p-3 dark:bg-neutral-900">
+      <div className="w-full flex items-center justify-center  rounded-md bg-white p-3 dark:bg-neutral-900">
+      <div className="grid grid-cols-3 w-fit h-full  min-h-full items-center justify-center gap-3">
         <Link
           className="flex flex-col items-center justify-center"
           href={"/merchant/product"}
@@ -77,6 +78,7 @@ export default async function account() {
           </Link>
         </div>
       </div>
+      </div>
       <div className="flex h-full  min-h-full flex-row items-center justify-center gap-3 rounded-md bg-white p-3 dark:bg-neutral-900">
         <Card className="w-[350px]">
           <CardHeader>