feat: finalize theme colors

domhhv · Jan 18, 2025 · 0dba4b2 · 0dba4b2
1 parent d39034a
commit 0dba4b2
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 28 deletions.
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -23,7 +23,7 @@ const App = () => {
   return (
     <Providers>
       <AppHeader />
-      <main className="flex h-full flex-1 flex-col items-start bg-background-50 dark:bg-background-800">
+      <main className="flex h-full flex-1 flex-col items-start bg-background-50 dark:bg-background-700">
         <Routes>
           <Route
             path="/calendar/month/:year?/:month?/:day?"

diff --git a/src/components/calendar-month/MonthCalendar.tsx b/src/components/calendar-month/MonthCalendar.tsx
@@ -92,8 +92,8 @@ const MonthCalendar = () => {
 
   const handleOccurrenceModalClose = () => {
     window.setTimeout(() => {
-      closeOccurrenceDialog();
       setActiveDate(null);
+      closeOccurrenceDialog();
     }, 0);
   };
 
@@ -102,14 +102,14 @@ const MonthCalendar = () => {
     monthIndex: number,
     fullYear: number
   ) => {
-    openOccurrenceDialog();
     setActiveDate(new Date(fullYear, monthIndex - 1, dateNumber, 12));
+    openOccurrenceDialog();
   };
 
   const handleNoteModalClose = () => {
     window.setTimeout(() => {
-      closeNoteDialog();
       setActiveDate(null);
+      closeNoteDialog();
     }, 0);
   };
 

diff --git a/src/components/calendar-month/NoteDialog.tsx b/src/components/calendar-month/NoteDialog.tsx
@@ -42,10 +42,10 @@ const NoteDialog = ({ open, onClose, date }: NoteDialogProps) => {
   });
 
   React.useEffect(() => {
-    if (existingNote) {
+    if (existingNote?.content && !content) {
       setContent(existingNote.content);
     }
-  }, [existingNote]);
+  }, [existingNote, content]);
 
   const handleSubmit: MouseEventHandler<HTMLButtonElement> = async (event) => {
     event.preventDefault();

diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx
@@ -16,7 +16,7 @@ const Header = () => {
   return (
     <>
       {session.isLoading && (
-        <div className="absolute bottom-0 left-0 right-0 top-0 z-50 flex h-full flex-1 items-center justify-center bg-slate-50 opacity-90 dark:bg-slate-950">
+        <div className="absolute bottom-0 left-0 right-0 top-0 z-50 flex h-full flex-1 items-center justify-center bg-background-100 opacity-90 dark:bg-background-800">
           <div className="flex -translate-y-[73px] items-center justify-center">
             <Spinner
               color="primary"

diff --git a/src/services/occurrences.service.ts b/src/services/occurrences.service.ts
@@ -36,6 +36,7 @@ export const listOccurrences = async (
   const { error, data } = await supabaseClient
     .from('occurrences')
     .select('*, habit:habits(name, icon_path, trait:traits(id, name, color))')
+    .order('timestamp')
     .gt('timestamp', range[0])
     .lt('timestamp', range[1]);
 

diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -47,17 +47,17 @@ export default {
               DEFAULT: '#23C98F',
             },
             success: {
-              100: '#CFFDD0',
-              200: '#A1FCAC',
-              300: '#71F68E',
-              400: '#4DEC7F',
-              500: '#17e16b',
-              600: '#10C16B',
-              700: '#0BA268',
-              800: '#07825F',
-              900: '#046C58',
-              foreground: '#D5FBD6',
-              DEFAULT: '#17e16b',
+              100: '#D6FCCB',
+              200: '#A5FA98',
+              300: '#69F063',
+              400: '#3CE245',
+              500: '#05d023',
+              600: '#03B22D',
+              700: '#029533',
+              800: '#017834',
+              900: '#006334',
+              foreground: '#fff',
+              DEFAULT: '#05d023',
             },
             secondary: {
               100: '#D0EBFE',
@@ -142,17 +142,17 @@ export default {
               DEFAULT: '#149065',
             },
             success: {
-              100: '#CDFBCF',
-              200: '#9DF8A9',
-              300: '#69EA88',
-              400: '#43D574',
-              500: '#10BA5A',
-              600: '#0B9F5B',
-              700: '#088557',
-              800: '#056B50',
-              900: '#03594B',
+              100: '#CAFBD3',
+              200: '#97F7B2',
+              300: '#60E894',
+              400: '#39D282',
+              500: '#05B56B',
+              600: '#039B6A',
+              700: '#028266',
+              800: '#01685C',
+              900: '#005655',
               foreground: '#D5FBD6',
-              DEFAULT: '#10BA5A',
+              DEFAULT: '#05B56B',
             },
             secondary: {
               100: '#CDE9FD',