feat: ui changes today & inbox

marchhq · Oct 29, 2024 · 5289ec9 · 5289ec9
1 parent b73abd4
commit 5289ec9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/apps/frontend/src/components/Today/TodayPage.tsx b/apps/frontend/src/components/Today/TodayPage.tsx
@@ -4,7 +4,6 @@ import * as React from "react"
 
 import { DateCycle } from "@/src/components/atoms/Date"
 import { ShowAgenda } from "@/src/components/atoms/ShowAgenda"
-import { DatePicker } from "@/src/components/DatePicker"
 import { TodayItems } from "@/src/components/TodayItems"
 import { TodayMeetings } from "@/src/components/TodayMeetings"
 import { TodayTextArea } from "@/src/components/TodayTextArea"
@@ -19,13 +18,9 @@ const TodayPage: React.FC = () => {
   }
 
   return (
-    <main className="ml-[160px] h-full overflow-y-hidden bg-background p-10">
-      {/* <section className="mt-4 flex max-w-[96%] items-center justify-between gap-4">
-        <span className="text-[11px] font-medium text-white">show agenda</span>
-        <ShowAgenda toggle={showAgenda} onToggle={handleToggleAgenda} />
-      </section> */}
-      <section className="flex justify-between ">
-        <div className="w-2/3">
+    <main className="ml-[180px] h-full overflow-y-hidden bg-background p-10">
+      <section className="flex justify-between">
+        <div className="">
           <header className="flex items-center justify-start">
             <DateCycle
               selectedDate={selectedDate}
@@ -39,11 +34,19 @@ const TodayPage: React.FC = () => {
             <TodayItems selectedDate={selectedDate} />
           </section>
         </div>
-        {/*showAgenda && (
-          <div className=" text-secondary-foreground">
-            <TodayMeetings selectedDate={selectedDate} />
+        <section className="w-[96%] max-w-[300px]">
+          <div className="flex items-center justify-end gap-4">
+            <span className="mt-2 text-[11px] font-medium text-foreground">
+              show agenda
+            </span>
+            <ShowAgenda toggle={showAgenda} onToggle={handleToggleAgenda} />
           </div>
-        )*/}
+          {showAgenda && (
+            <div className="my-4 text-secondary-foreground">
+              <TodayMeetings selectedDate={selectedDate} />
+            </div>
+          )}
+        </section>
       </section>
     </main>
   )

diff --git a/apps/frontend/src/components/atoms/Date.tsx b/apps/frontend/src/components/atoms/Date.tsx
@@ -52,7 +52,7 @@ export const DateCycle: React.FC<DateCycleProps> = ({
         </div>
       </div>
       {isToday && (
-        <p className="text-sm font-semibold text-primary-foreground">Today</p>
+        <p className="text-sm font-semibold text-foreground">Today</p>
       )}
     </div>
   )
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ export const DateCycle: React.FC<DateCycleProps> = ({ @@
             </div>
           </div>
           {isToday && (
-            <p className="text-sm font-semibold text-primary-foreground">Today</p>
+            <p className="text-sm font-semibold text-foreground">Today</p>
           )}
         </div>
       )
@@ Expand Down @@