Merge branch 'main' into int-187-create-recurring-events

Author: archessmn

.env.example

@@ -1,6 +1,6 @@
 # NB: These are _not_ prefixed with NEXT_PUBLIC because we don't want their values to be sewn into the Docker image
 # Base configuration
-DATABASE_URL="postgresql://postgres:postgres@localhost:5432/calendar_2023"
+DATABASE_URL="postgresql://postgres:postgres@localhost:5432/internal_site"
 PUBLIC_URL=http://localhost:3000
 SESSION_SECRET=             # A random string, in production should be a secure secret e.g. `openssl rand -base64 32`
 

Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update -y && apt-get install -y build-essential python3
 WORKDIR /app
 COPY ./.yarn/ .yarn/
 COPY . /app/
-RUN --mount=type=cache,id=calendar2023-yarn,target=.yarn/cache yarn install --immutable --inline-builds
+RUN --mount=type=cache,id=internal-site-yarn,target=.yarn/cache yarn install --immutable --inline-builds
 
 ENV NODE_ENV=production
 ARG GIT_REV

Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
   agent {
     node {
       label 'docker && ramdisk'
-      customWorkspace '/mnt/ramdisk/build/workspace/calendar'
+      customWorkspace '/mnt/ramdisk/build/workspace/internal-site'
     }
   }
 
@@ -28,14 +28,14 @@ pipeline {
     }
     stage('Build Images') {
       environment {
-        SENTRY_AUTH_TOKEN = credentials('calendar-sentry-auth-token')
+        SENTRY_AUTH_TOKEN = credentials('internal-site-sentry-auth-token')
       }
       steps {
         sh """docker build \\
           --build-arg GIT_REV=${env.GIT_COMMIT} \\
           --build-arg VERSION=${env.TAG_NAME ?: 'v0.0.0'} \\
           --secret id=sentry-auth-token,env=SENTRY_AUTH_TOKEN \\
-          -t registry.comp.ystv.co.uk/ystv/calendar2023:${imageTag}\\
+          -t registry.comp.ystv.co.uk/ystv/internal-site:${imageTag}\\
           .
         """
       }
@@ -50,7 +50,7 @@ pipeline {
         }
       }
       steps {
-        dockerPush image: 'registry.comp.ystv.co.uk/ystv/calendar2023', tag: imageTag
+        dockerPush image: 'registry.comp.ystv.co.uk/ystv/internal-site', tag: imageTag
       }
     }
 
@@ -59,7 +59,7 @@ pipeline {
         changeRequest target: 'main'
       }
       steps {
-        deployPreview action: 'deploy', job: 'calendar-preview', urlSuffix: 'internal.dev.ystv.co.uk'
+        deployPreview action: 'deploy', job: 'internal-site-preview', urlSuffix: 'internal.dev.ystv.co.uk'
       }
     }
 
@@ -69,12 +69,12 @@ pipeline {
       }
       steps {
         build job: 'Deploy Nomad Job', parameters: [
-          string(name: 'JOB_FILE', value: 'calendar-dev.nomad'),
-          text(name: 'TAG_REPLACEMENTS', value: "registry.comp.ystv.co.uk/ystv/calendar2023:${imageTag}")
+          string(name: 'JOB_FILE', value: 'internal-site-dev.nomad'),
+          text(name: 'TAG_REPLACEMENTS', value: "registry.comp.ystv.co.uk/ystv/internal-site:${imageTag}")
         ], wait: true
         deployPreview action: 'cleanup'
         deployPreview action: 'cleanupMerge'
-        sh "nomad alloc exec -task calendar-dev -job calendar-dev npx -y prisma migrate deploy --schema lib/db/schema.prisma"
+        sh "nomad alloc exec -task internal-site-dev -job internal-site-dev npx -y prisma migrate deploy --schema lib/db/schema.prisma"
       }
     }
 
@@ -85,10 +85,10 @@ pipeline {
       }
       steps {
         build job: 'Deploy Nomad Job', parameters: [
-          string(name: 'JOB_FILE', value: 'calendar-prod.nomad'),
-          text(name: 'TAG_REPLACEMENTS', value: "registry.comp.ystv.co.uk/ystv/calendar2023:${imageTag}")
+          string(name: 'JOB_FILE', value: 'internal-site-prod.nomad'),
+          text(name: 'TAG_REPLACEMENTS', value: "registry.comp.ystv.co.uk/ystv/internal-site:${imageTag}")
         ], wait: true
-        sh "nomad alloc exec -task calendar-prod -job calendar-prod npx -y prisma migrate deploy --schema lib/db/schema.prisma"
+        sh "nomad alloc exec -task internal-site-prod -job internal-site-prod npx -y prisma migrate deploy --schema lib/db/schema.prisma"
       }
     }
   }

README.md

@@ -1,11 +1,11 @@
-# YSTV Calendar
+# YSTV Internal Site
 
 This is the repo for https://internal.ystv.co.uk.
 Formerly known as `experimental-hypothetical-new-internal-site-idea`.
 
 ## Getting Started
 
-To set up a local copy of the new calendar, you will need
+To set up a local copy of the new internal site, you will need
 
 - Node.js (18 or later) - https://nodejs.org/en/download
 - Yarn - once you have Node installed, run `corepack enable`
@@ -31,7 +31,7 @@ You will also need to set up the following:
 
 ### Postgres Database
 
-Once you have PostgreSQL installed, run `createdb calendar_2023`.
+Once you have PostgreSQL installed, run `createdb internal_site`.
 
 Now run `yarn prisma db push` to set up the database tables.
 If you get a permissions error, check your PostgreSQL authentication settings - you should have a `local all all peer` line in your pg_hba.conf.
@@ -95,6 +95,6 @@ Feature specific docs:
 - lib/ - low level utilities (auth, db, etc.)
 - server/ - custom server that handles socket.io communication
 
-## Issue Tracking
+## Contributing
 
-We use [Linear](https://linear.app/ystv) to track issues - to access it, sign in with your @ystv.co.uk Google account (ask a Computing Team member if you don't have one).
+Some documentation about how to contribute and some standards to follow is available [here](/docs/contributing.md)

app/(authenticated)/admin/positions/PositionView.tsx

@@ -25,7 +25,6 @@ import {
 import { useDisclosure } from "@mantine/hooks";
 import { SearchBar } from "@/components/SearchBar";
 import { CreatePositionForm, UpdatePositionForm } from "./form";
-import { useValidSearchParams } from "@/lib/searchParams/validate";
 import { getSearchParamsString } from "@/lib/searchParams/util";
 import { PositionCard } from "./PositionCard";
 import {
@@ -36,6 +35,7 @@ import {
   updatePositionAction,
 } from "./actions";
 import { useQuery } from "@tanstack/react-query";
+import { useValidSearchParams } from "@/lib/searchParams/validateHook";
 
 export function PositionView(props: { initialPositions: TFetchPositions }) {
   const pathname = usePathname();

app/(authenticated)/admin/roles/RoleView.tsx

@@ -22,7 +22,6 @@ import {
 } from "@/components/Pagination";
 import { useDisclosure } from "@mantine/hooks";
 import { SearchBar } from "@/components/SearchBar";
-import { useValidSearchParams } from "@/lib/searchParams/validate";
 import { getSearchParamsString } from "@/lib/searchParams/util";
 import { RoleCard } from "./RoleCard";
 import { CreateRoleForm, UpdateRoleForm } from "./form";
@@ -36,6 +35,7 @@ import {
   updateRoleAction,
 } from "./actions";
 import { useQuery } from "@tanstack/react-query";
+import { useValidSearchParams } from "@/lib/searchParams/validateHook";
 
 export function RoleView(props: { initialRoles: TFetchRoles }) {
   const pathname = usePathname();

app/(authenticated)/admin/users/UserView.tsx

@@ -19,7 +19,7 @@ import {
   PaginationProvider,
 } from "@/components/Pagination";
 import { SearchBar } from "@/components/SearchBar";
-import { useValidSearchParams } from "@/lib/searchParams/validate";
+import { useValidSearchParams } from "@/lib/searchParams/validateHook";
 import { getSearchParamsString } from "@/lib/searchParams/util";
 import { UserCard } from "./UserCard";
 import { useQuery } from "@tanstack/react-query";

app/(authenticated)/calendar/YSTVCalendar.tsx

@@ -32,6 +32,8 @@ import { z } from "zod";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import { fetchEvents } from "./actions";
 import { calendarEventsQueryKey } from "./helpers";
+import { EventColours } from "@/features/calendar/types";
+import { EventType } from "@/features/calendar/types";
 
 dayjs.extend(weekOfYear);
 
@@ -86,6 +88,12 @@ const HistoryStateSchema = z.object({
   filter: z.enum(["all", "mine", "vacant"]).optional(),
 });
 
+const getEventColor = (evt: Event): string => {
+  if (evt.is_cancelled) return "#B00020";
+  if (evt.is_tentative) return "#8b8b8b";
+  return EventColours[evt.event_type as EventType] || "#FFC0CB";
+};
+
 export default function YSTVCalendar() {
   const currentDate = new Date();
 
@@ -363,13 +371,13 @@ export default function YSTVCalendar() {
               end: evt.end_date,
               url: `/calendar/${evt.event_id}`,
             };
-            if (evt.is_tentative) {
-              eventObject.color = "#8b8b8b";
-            }
+
+            eventObject.color = getEventColor(evt);
+
             if (evt.is_cancelled) {
-              eventObject.color = "#B00020";
               eventObject.className = "ystv-calendar-strike-through";
             }
+
             if (evt.end_date.valueOf() < currentDate.valueOf()) {
               eventObject.className += " opacity-50";
             }
@@ -381,8 +389,6 @@ export default function YSTVCalendar() {
   );
 }
 
-type EventType = "show" | "meeting" | "social" | "other";
-
 interface Event {
   event_id: number;
   event_type: EventType | string;

app/(authenticated)/calendar/new/page.tsx

@@ -52,7 +52,7 @@ export default async function NewEventPage() {
   );
   if (permittedEventTypes.length === 0) {
     throw new Forbidden([
-      "Calendar.Admin or Calendar.{Show,Meeting,Social}.{Creator,Admin}" as any,
+      "Calendar.Admin or Calendar.{Show,Meeting,Workshop,Social}.{Creator,Admin}" as any,
     ]);
   }
   const allMembers = await getAllUsers();

app/(authenticated)/calendar/page.tsx

@@ -13,6 +13,7 @@ import {
 } from "@tanstack/react-query";
 import { fetchEvents } from "./actions";
 import { calendarEventsQueryKey } from "./helpers";
+import EventColoursKey from "@/components/EventColoursKey";
 
 export default async function CalendarPage() {
   await mustGetCurrentUser();
@@ -83,6 +84,7 @@ export default async function CalendarPage() {
         <br />
       </PermissionGate>
       <YSTVCalendar />
+      <EventColoursKey />
     </HydrationBoundary>
   );
 }