[NOT READY] fix dates + charts + ui

dashboard/composables/snapshots/BaseSnapshots.ts

@@ -14,50 +14,20 @@ export function getDefaultSnapshots(project_id: TProjectSnapshot['project_id'],
         name: 'Today',
         from: fns.startOfDay(Date.now()),
         to: fns.endOfDay(Date.now()),
-        color: '#CC11CC',
+        color: '#FFA600',
         default: true
     }
 
     const lastDay: DefaultSnapshot = {
         project_id,
         _id: '___lastDay' as any,
-        name: 'Last Day',
+        name: 'Yesterday',
         from: fns.startOfDay(fns.subDays(Date.now(), 1)),
         to: fns.endOfDay(fns.subDays(Date.now(), 1)),
-        color: '#CC11CC',
-        default: true
-    }
-
-    const currentWeek: DefaultSnapshot = {
-        project_id,
-        _id: '___currentWeek' as any,
-        name: 'Current Week',
-        from: fns.startOfWeek(Date.now()),
-        to: fns.endOfWeek(Date.now()),
-        color: '#CC11CC',
-        default: true
-    }
-
-    const lastWeek: DefaultSnapshot = {
-        project_id,
-        _id: '___lastWeek' as any,
-        name: 'Last Week',
-        from: fns.startOfWeek(fns.subWeeks(Date.now(), 1)),
-        to: fns.endOfWeek(fns.subWeeks(Date.now(), 1)),
-        color: '#CC11CC',
-        default: true
-    }
-
-
-    const currentMonth: DefaultSnapshot = {
-        project_id,
-        _id: '___currentMonth' as any,
-        name: 'Current Month',
-        from: fns.startOfMonth(Date.now()),
-        to: fns.endOfMonth(Date.now()),
-        color: '#CC11CC',
+        color: '#FF8531',
         default: true
     }
+    
 
     const lastMonth: DefaultSnapshot = {
         project_id,
@@ -65,9 +35,41 @@ export function getDefaultSnapshots(project_id: TProjectSnapshot['project_id'],
         name: 'Last Month',
         from: fns.startOfMonth(fns.subMonths(Date.now(), 1)),
         to: fns.endOfMonth(fns.subMonths(Date.now(), 1)),
-        color: '#CC11CC',
+        color: '#BC5090',
         default: true
     }
+    const currentMonth: DefaultSnapshot = {
+        project_id,
+        _id: '___currentMonth' as any,
+        name: 'Current Month',
+        from: fns.startOfMonth(Date.now()),
+        to: fns.endOfMonth(Date.now()),
+        color: '#58508D',
+        default: true
+    }
+
+
+    const lastWeek: DefaultSnapshot = {
+        project_id,
+        _id: '___lastWeek' as any,
+        name: 'Last Week',
+        from: fns.startOfWeek(fns.subWeeks(Date.now(), 1)),
+        to: fns.endOfWeek(fns.subWeeks(Date.now(), 1)),
+        color: '#3E909D',
+        default: true
+    }
+
+
+    const currentWeek: DefaultSnapshot = {
+        project_id,
+        _id: '___currentWeek' as any,
+        name: 'Current Week',
+        from: fns.startOfWeek(Date.now()),
+        to: fns.endOfWeek(Date.now()),
+        color: '#007896',
+        default: true
+    }
+
 
 
     const allTime: DefaultSnapshot = {
@@ -76,7 +78,7 @@ export function getDefaultSnapshots(project_id: TProjectSnapshot['project_id'],
         name: 'All Time',
         from: new Date(project_created_at.toString()),
         to: new Date(Date.now()),
-        color: '#CC11CC',
+        color: '#9362FF',
         default: true
     }
 

dashboard/composables/useCustomFetch.ts

@@ -1,10 +1,10 @@
-import type { StringExpressionOperator } from "mongoose";
 
 type RefOrPrimitive<T> = T | Ref<T> | ComputedRef<T>
 
 export type CustomOptions = {
     useSnapshotDates?: boolean,
     useActivePid?: boolean,
+    useTimeOffset?: boolean,
     slice?: RefOrPrimitive<string>,
     limit?: RefOrPrimitive<number | string>,
     custom?: Record<string, RefOrPrimitive<string>>
@@ -23,6 +23,7 @@ function getValueFromRefOrPrimitive<T>(data?: T | Ref<T> | ComputedRef<T>) {
 export function useComputedHeaders(customOptions?: CustomOptions) {
     const useSnapshotDates = customOptions?.useSnapshotDates || true;
     const useActivePid = customOptions?.useActivePid || true;
+    const useTimeOffset = customOptions?.useTimeOffset || true;
 
     const headers = computed<Record<string, string>>(() => {
         console.trace('Computed recalculated');
@@ -37,6 +38,7 @@ export function useComputedHeaders(customOptions?: CustomOptions) {
             'x-pid': useActivePid ? (projectId.value ?? '') : '',
             'x-from': useSnapshotDates ? (safeSnapshotDates.value.from ?? '') : '',
             'x-to': useSnapshotDates ? (safeSnapshotDates.value.to ?? '') : '',
+            'x-time-offset': useTimeOffset ? (new Date().getTimezoneOffset().toString()) : '',
             'x-slice': getValueFromRefOrPrimitive(customOptions?.slice) ?? '',
             'x-limit': getValueFromRefOrPrimitive(customOptions?.limit)?.toString() ?? '',
             ...parsedCustom

dashboard/composables/useSnapshot.ts

@@ -15,7 +15,7 @@ const remoteSnapshots = useFetch<TProjectSnapshot[]>('/api/project/snapshots', {
 
 watch(project, async () => {
     await remoteSnapshots.refresh();
-    snapshot.value = isLiveDemo.value ? snapshots.value[2] : snapshots.value[2];
+    snapshot.value = isLiveDemo.value ? snapshots.value[3] : snapshots.value[3];
 });
 
 const snapshots = computed<GenericSnapshot[]>(() => {
@@ -23,7 +23,7 @@ const snapshots = computed<GenericSnapshot[]>(() => {
     return [...defaultSnapshots, ...(remoteSnapshots.data.value || [])];
 })
 
-const snapshot = ref<GenericSnapshot>(snapshots.value[1]);
+const snapshot = ref<GenericSnapshot>(snapshots.value[3]);
 
 const safeSnapshotDates = computed(() => {
     const from = new Date(snapshot.value?.from || 0).toISOString();
@@ -37,7 +37,7 @@ async function updateSnapshots() {
 
 const snapshotDuration = computed(() => {
     const from = new Date(snapshot.value?.from || 0).getTime();
-    const to = new Date(snapshot.value?.to || 0).getTime();
+    const to = new Date(snapshot.value?.to || 0).getTime() + 1000;
     return fns.differenceInDays(to, from);
 });