Add macos build for arm

.github/workflows/build.yml

@@ -25,9 +25,35 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and Push Docker image -- finn-board
+      - name: Build and Push Docker image
         uses: docker/build-push-action@675965c0e16f1a0f94ecafff969d8c966f92c17b
         with:
           context: .
           push: true
           tags: git.joshuacoles.me/joshuacoles/revision-ui:latest
+
+  build-arm:
+    runs-on: macos-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker
+        uses: docker/login-action@v1
+        with:
+          registry: git.joshuacoles.me
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and Push Docker image
+        uses: docker/build-push-action@675965c0e16f1a0f94ecafff969d8c966f92c17b
+        with:
+          context: .
+          push: true
+          tags: git.joshuacoles.me/joshuacoles/revision-ui:arm

.gitignore

@@ -40,3 +40,6 @@ next-env.d.ts
 
 # Private env files
 .env
+
+# Caddyfile for local development when testing weird deploys
+/Caddyfile

src/components/Donut.tsx

@@ -8,7 +8,12 @@ export type DonutChartData = {
     value: number;
 }[];
 
-export function Donut({data, centerLabel, formatter, hoverSuffix}: {
+export function Donut({
+                          data,
+                          centerLabel,
+                          formatter,
+                          hoverSuffix
+                      }: {
     data: DonutChartData,
     formatter: (value: number) => string,
     centerLabel: string,
@@ -71,12 +76,13 @@ export function Donut({data, centerLabel, formatter, hoverSuffix}: {
                                 strokeWidth="3"
                                 strokeDasharray={`${value * normalisingFactor} ${100 - value * normalisingFactor}`}
                                 strokeDashoffset={100 - (offset * normalisingFactor) + 25}
+                                style={{outline: 'none'}}
                             />
                         )
                     })
                 }
 
-                <g className="chart-text">
+                <g className="chart-text" style={{ userSelect: 'none'}}>
                     <text x="50%" y="50%" className="chart-number">
                         {formatter(total)}
                     </text>

src/components/HeatMap.tsx

@@ -40,33 +40,33 @@ function GitHubCalendarHeatmap({
     const dayGoalTime = goal;
     const weekGoalTime = 5 * dayGoalTime;
 
-    const getColorForValue = (value: number, goalTime: number): string => {
+    const getColorForValue = (value: number, goalTime: number, zeroColor: string): string => {
         const buckets = [
             {
                 min: -Infinity,
                 max: 0,
-                color: '#eeeeee'
+                color: zeroColor,
             },
             {
                 min: 0,
                 max: 0.40,
-                color: '#d6e685'
+                color: '#d6e685',
             },
             {
                 min: 0.40,
                 max: 0.50,
-                color: '#8cc665'
+                color: '#8cc665',
             },
             {
                 min: 0.50,
                 max: 0.90,
-                color: '#44a340'
+                color: '#44a340',
             },
             {
                 min: 0.90,
                 // If penalising overtime, the max is 1.125, otherwise it's infinity (ie this is the last bucket)
                 max: penaliseOvertime ? 1.125 : Infinity,
-                color: '#1e6823'
+                color: '#1e6823',
             },
             {
                 min: 1.125,
@@ -116,7 +116,7 @@ function GitHubCalendarHeatmap({
                 const dayOfWeek = (date.getDay() + 6) % 7;
                 const x = weekIndex * (squareSize + padding);
                 const y = dayOfWeek * (squareSize + padding);
-                const color = getColorForValue(count, dayGoalTime);
+                const color = getColorForValue(count, dayGoalTime, dFns.isWeekend(date) ? '#d4d4d4' : '#eeeeee');
 
                 return (
                     <rect
@@ -137,7 +137,7 @@ function GitHubCalendarHeatmap({
                     const x = weekIndex * (squareSize + padding);
                     const y = 7 * (squareSize + padding) + weekTotalPadding; // Position for the week total
                     const count = getWeekTotal(weekIndex);
-                    const color = getColorForValue(count, weekGoalTime);
+                    const color = getColorForValue(count, weekGoalTime, '#eeeeee');
 
                     return (
                         <rect

src/components/cards/calendarOverviewCard.tsx

@@ -5,7 +5,7 @@ import {Tooltip} from 'react-tooltip';
 import {Data} from "@/data/fetchData";
 import HeatMap from "@/components/HeatMap";
 
-function useCalendarData(data: Data, initialDate: Date, endDate: Date) {
+function useCalendarData(data: Data) {
     const timeEntries = data.timeEntries;
 
     // Group by day, sum up seconds
@@ -17,17 +17,6 @@ function useCalendarData(data: Data, initialDate: Date, endDate: Date) {
         return R.sum((entries ?? []).map((entry) => entry.duration))
     }, grouped);
 
-    // Fill in missing days, hacky
-    dFns.eachDayOfInterval({
-        start: initialDate,
-        end: endDate,
-    }).forEach((date) => {
-        const key = dFns.formatISO(date);
-        if (summed[key] == undefined) {
-            summed[key] = 0;
-        }
-    })
-
     return Object.entries(summed)
         .map(([key, value]) => ({
             date: dFns.parseISO(key),
@@ -50,7 +39,7 @@ export function CalendarOverviewCard({
 }) {
     const initialDate = dFns.parseISO(startTime);
     const endDate = dFns.parseISO(endTime);
-    const calendarData = useCalendarData(data, initialDate, endDate);
+    const calendarData = useCalendarData(data);
 
     return <Card className="col-span-1">
         <Tooltip id="calendar-tooltip"/>

src/data/db.d.ts

@@ -1,8 +1,8 @@
-import type {ColumnType, JSONColumnType} from "kysely";
+import type {ColumnType} from "kysely";
 
 export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
-  ? ColumnType<S, I | undefined, U>
+    ? ColumnType<S, I | undefined, U>
-  : ColumnType<T, T | undefined, T>;
+    : ColumnType<T, T | undefined, T>;
 
 export type Int8 = ColumnType<string, bigint | number | string, bigint | number | string>;
 
@@ -11,7 +11,7 @@ export type Json = ColumnType<JsonValue, string, string>;
 export type JsonArray = JsonValue[];
 
 export type JsonObject = {
-  [K in string]?: JsonValue;
+    [K in string]?: JsonValue;
 };
 
 export type JsonPrimitive = boolean | number | string | null;
@@ -21,50 +21,49 @@ export type JsonValue = JsonArray | JsonObject | JsonPrimitive;
 export type Timestamp = ColumnType<Date, Date | string, Date | string>;
 
 export interface Client {
-  archived: boolean;
+    archived: boolean;
-  at: Timestamp;
+    at: Timestamp;
-  id: number;
+    id: number;
-  name: string;
+    name: string;
-  server_deleted_at: Timestamp | null;
+    server_deleted_at: Timestamp | null;
-  workspace_id: number;
+    workspace_id: number;
 }
 
 export interface Project {
-  active: boolean;
+    active: boolean;
-  client_id: number | null;
+    client_id: number | null;
-  id: Generated<number>;
+    color: string;
-  name: string;
+    id: Generated<number>;
-  raw_json: JSONColumnType<{
+    name: string;
-      color: string;
+    raw_json: Json;
-      id: number;
+    server_created_at: Timestamp;
-      name: string;
+    server_deleted_at: Timestamp | null;
-  }>;
+    server_updated_at: Timestamp;
-  toggl_id: Int8;
+    toggl_id: Int8;
-  workspace_id: Int8;
+    workspace_id: Int8;
 }
 
 export interface TimeEntry {
-  description: string;
+    description: string;
-  id: Generated<number>;
+    id: Generated<number>;
-  project_id: Int8 | null;
+    project_id: Int8 | null;
-  raw_json: JSONColumnType<{
+    raw_json: Json;
-      start: string;
+    server_deleted_at: Timestamp | null;
-      end: string;
+    server_updated_at: Timestamp;
-      seconds: number;
+    start: Timestamp;
-  }>;
+    stop: Timestamp;
-  start: Timestamp;
+    tags: Generated<Json>;
-  stop: Timestamp;
+    toggl_id: Int8;
-  toggl_id: Int8;
 }
 
 export interface TogglPortalSeaqlMigrations {
-  applied_at: Int8;
+    applied_at: Int8;
-  version: string;
+    version: string;
 }
 
 export interface DB {
-  client: Client;
+    client: Client;
-  project: Project;
+    project: Project;
-  time_entry: TimeEntry;
+    time_entry: TimeEntry;
-  toggl_portal_seaql_migrations: TogglPortalSeaqlMigrations;
+    toggl_portal_seaql_migrations: TogglPortalSeaqlMigrations;
 }

src/data/fetchData.ts

@@ -52,12 +52,12 @@ export async function getData(config: OverviewConfig): Promise<Data> {
     let projectIds = config.subjects.map((subject) => subject.projectId.toString());
 
     const projects = await db.selectFrom('project')
-        .select('raw_json')
+        .select(['toggl_id', 'name', 'color'])
-        .where('project.toggl_id', 'in', projectIds)
+        .where('toggl_id', 'in', projectIds)
-        .execute();
+        .execute()
 
     const timeEntries = await db.selectFrom('time_entry')
-        .select(['project_id', 'raw_json'])
+        .select(['project_id', 'start', 'stop'])
         .where('project_id', 'in', projectIds)
         .where('start', '>', dFns.parseISO(config.timePeriod.start))
         .where('start', '<', dFns.parseISO(config.timePeriod.end))
@@ -65,16 +65,16 @@ export async function getData(config: OverviewConfig): Promise<Data> {
 
     return {
         projects: projects.map((project) => ({
-            projectId: project.raw_json.id,
+            projectId: parseInt(project.toggl_id),
-            name: project.raw_json.name,
+            name: project.name,
-            color: project.raw_json.color,
+            color: project.color,
         })),
 
         timeEntries: timeEntries.map((timeEntry) => ({
             projectId: parseInt(timeEntry.project_id!),
-            start: timeEntry.raw_json.start,
+            start: dFns.formatISO(timeEntry.start),
-            end: timeEntry.raw_json.end,
+            end: dFns.formatISO(timeEntry.stop),
-            duration: timeEntry.raw_json.seconds,
+            duration: dFns.differenceInSeconds(timeEntry.stop, timeEntry.start)
         })),
     }
 }