From dc06eba105de1d160d40fd49ea9e2c6ed07f7a42 Mon Sep 17 00:00:00 2001
From: molvqingtai <molvqingtai@gmail.com>
Date: Fri, 28 Jul 2023 04:26:53 +0800
Subject: [PATCH] chore: use grid layouts all

---
 index.css                             |  0
 src/components/AppContainer/index.tsx |  2 +-
 src/components/Footer/index.tsx       | 26 +++++++++++++++-----------
 src/components/Header/index.tsx       | 10 +++++-----
 src/components/Main/LikeButton.tsx    |  7 ++++---
 src/components/Main/Message.tsx       |  8 ++++----
 src/components/Main/index.tsx         |  6 +++---
 7 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 index.css

diff --git a/index.css b/index.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/AppContainer/index.tsx b/src/components/AppContainer/index.tsx
index f2cc429..7fc2aea 100644
--- a/src/components/AppContainer/index.tsx
+++ b/src/components/AppContainer/index.tsx
@@ -6,7 +6,7 @@ export interface AppContainerProps {
 
 const AppContainer: FC<AppContainerProps> = ({ children }) => {
   return (
-    <div className="fixed bottom-10 right-10 top-10 z-top box-border grid w-1/4 grid-flow-col grid-rows-[auto_1fr_auto] overflow-hidden  rounded-xl bg-slate-50 shadow-2xl transition-transform">
+    <div className="fixed bottom-10 right-10 top-10 z-top box-border grid w-1/4 grid-flow-col grid-rows-[auto_1fr_auto] overflow-hidden rounded-xl  bg-slate-50 font-sans shadow-2xl transition-transform">
       {children}
     </div>
   )
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
index cdc5c7e..48b2437 100644
--- a/src/components/Footer/index.tsx
+++ b/src/components/Footer/index.tsx
@@ -13,23 +13,27 @@ const Footer: FC = () => {
   }
 
   return (
-    <div className="grid grid-cols-2 gap-y-2  p-4">
+    <div className="grid gap-y-2 p-4">
       <Textarea
-        className="col-span-2 rounded-lg bg-gray-50"
+        className="rounded-lg bg-gray-50"
         rows={is2XL ? 3 : 2}
         value={message}
         placeholder="Type your message here."
         onInput={handleInput}
       />
-
-      <Button variant="ghost" size="icon" className="place-self-start">
-        <SmileIcon size={20} />
-      </Button>
-      <Button size="sm" className="place-self-end">
-        <span className="mr-2">Send</span>
-        <CommandIcon className="text-slate-400" size={12}></CommandIcon>
-        <CornerDownLeftIcon className="text-slate-400" size={12}></CornerDownLeftIcon>
-      </Button>
+      <div className="grid grid-cols-[auto_auto_1fr] items-center justify-items-end">
+        <Button variant="ghost" size="icon">
+          <SmileIcon size={20} />
+        </Button>
+        <Button variant="ghost" size="icon">
+          <SmileIcon size={20} />
+        </Button>
+        <Button size="sm">
+          <span className="mr-2">Send</span>
+          <CommandIcon className="text-slate-400" size={12}></CommandIcon>
+          <CornerDownLeftIcon className="text-slate-400" size={12}></CornerDownLeftIcon>
+        </Button>
+      </div>
     </div>
   )
 }
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index 6650a05..5f67536 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -7,7 +7,7 @@ const Header: FC = () => {
   const websiteInfo = getWebSiteInfo()
 
   return (
-    <div className="shadow-xs flex  h-12 items-center bg-white px-4 2xl:h-14">
+    <div className="shadow-xs grid h-12 grid-cols-[auto_1fr_auto] items-center bg-white px-4 backdrop-blur-lg 2xl:h-14">
       <img className="h-8 w-8 overflow-hidden rounded-full" src={websiteInfo.icon} />
       <HoverCard>
         <HoverCardTrigger asChild>
@@ -16,16 +16,16 @@ const Header: FC = () => {
           </Button>
         </HoverCardTrigger>
         <HoverCardContent className="w-80">
-          <div className="flex justify-between space-x-4">
-            <img className="h-14 w-14 flex-shrink-0 overflow-hidden rounded-full" src={websiteInfo.icon} />
-            <div className="space-y-1">
+          <div className="grid grid-cols-[auto_1fr] gap-x-4">
+            <img className="h-14 w-14 overflow-hidden rounded-full" src={websiteInfo.icon} />
+            <div className="grid">
               <h4 className="text-sm font-semibold">{websiteInfo.title}</h4>
               <p className="text-xs text-slate-500">{websiteInfo.description}</p>
             </div>
           </div>
         </HoverCardContent>
       </HoverCard>
-      <div className="ml-auto flex-shrink-0 text-sm text-slate-500">Online 99</div>
+      <div className="text-sm text-slate-500">Online 99</div>
     </div>
   )
 }
diff --git a/src/components/Main/LikeButton.tsx b/src/components/Main/LikeButton.tsx
index 1078e62..59f019b 100644
--- a/src/components/Main/LikeButton.tsx
+++ b/src/components/Main/LikeButton.tsx
@@ -29,13 +29,14 @@ const LikeButton: FC<LikeButtonProps> = ({ type, checked, count, onClick, onChan
       onClick={handleOnClick}
       variant="secondary"
       className={cn(
-        'flex items-center gap-x-1 rounded-full transition-all ',
-        checked ? 'text-orange-500' : 'text-slate-500'
+        'grid items-center overflow-hidden rounded-full leading-none transition-all',
+        checked ? 'text-orange-500' : 'text-slate-500',
+        count ? 'grid-cols-[auto_1fr] gap-x-1' : 'grid-cols-[auto_0fr] gap-x-0'
       )}
       size="xs"
     >
       <Icon size={14} />
-      {!!count && <span className="text-xs">{count}</span>}
+      {!!count && <span className="min-w-0 text-xs">{count}</span>}
     </Button>
   )
 }
diff --git a/src/components/Main/Message.tsx b/src/components/Main/Message.tsx
index b141dbb..428170c 100644
--- a/src/components/Main/Message.tsx
+++ b/src/components/Main/Message.tsx
@@ -34,13 +34,13 @@ const Message: FC<MessageProps> = ({ data }) => {
   }
 
   return (
-    <div className="flex w-full gap-x-2">
+    <div className="grid grid-cols-[auto_1fr] gap-x-2">
       <Avatar>
         <AvatarImage src={formatData.avatar} />
         <AvatarFallback>{formatData.username}</AvatarFallback>
       </Avatar>
-      <div className="flex-1">
-        <div className="flex items-baseline gap-x-2 leading-none">
+      <div className="grid">
+        <div className="grid grid-cols-[auto_1fr] items-baseline gap-x-2 leading-none">
           <div className="text-sm font-medium text-slate-600">{formatData.username}</div>
           <div className="text-xs text-slate-400">{formatData.date}</div>
         </div>
@@ -48,7 +48,7 @@ const Message: FC<MessageProps> = ({ data }) => {
           <div className="pb-2">
             <pre className="text-sm">{formatData.body}</pre>
           </div>
-          <div className="flex justify-end gap-x-2 leading-none">
+          <div className="grid grid-flow-col justify-end gap-x-2 leading-none">
             <LikeButton
               type="like"
               checked={formatData.likeChecked}
diff --git a/src/components/Main/index.tsx b/src/components/Main/index.tsx
index 6252c42..1e7a8ba 100644
--- a/src/components/Main/index.tsx
+++ b/src/components/Main/index.tsx
@@ -26,19 +26,19 @@ const Main: FC = () => {
       hateCount: 0
     },
     {
-      id: '1',
+      id: '3',
       body: 'Do you like XJP?',
       username: 'molvqingtai',
       avatar: 'https://github.com/shadcn.png',
       date: Date.now(),
       likeChecked: false,
       hateChecked: false,
-      likeCount: 98,
+      likeCount: 9999,
       hateCount: 2
     }
   ]
   return (
-    <div className="flex flex-col gap-y-4 p-4">
+    <div className="grid content-start p-4">
       {messages.map((message) => (
         <Message key={message.id} data={message} />
       ))}