Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
If need be (#168)
Luke Vella17dc9519d22e
diff --git a/.gitignore b/.gitignoreindex 1b5afbe91..3acf8256b 100644--- a/.gitignore+++ b/.gitignore@@ -39,4 +39,7 @@ yarn-error.log*# playwright/playwright-report-/test-results\ No newline at end of file+/test-results++# ts+tsconfig.tsbuildinfo\ No newline at end of filediff --git a/api-client/add-participant.ts b/api-client/add-participant.tsindex d6325d4f4..535eea1de 100644--- a/api-client/add-participant.ts+++ b/api-client/add-participant.ts@@ -1,10 +1,10 @@-import { Participant, Vote } from "@prisma/client";+import { Participant, Vote, VoteType } from "@prisma/client";import axios from "axios";export interface AddParticipantPayload {pollId: string;name: string;- votes: string[];+ votes: Array<{ optionId: string; type: VoteType }>;}export type AddParticipantResponse = Participant & {diff --git a/api-client/get-poll.ts b/api-client/get-poll.tsindex 1c981cc9e..b1b3ba357 100644--- a/api-client/get-poll.ts+++ b/api-client/get-poll.ts@@ -1,7 +1,7 @@import { Link, Option, Participant, Poll, User, Vote } from "@prisma/client";export interface GetPollApiResponse extends Omit<Poll, "verificationCode"> {- options: Array<Option & { votes: Vote[] }>;+ options: Option[];participants: Array<Participant & { votes: Vote[] }>;user: User;role: "admin" | "participant";diff --git a/api-client/update-participant.ts b/api-client/update-participant.tsindex 8642aea70..482776ee7 100644--- a/api-client/update-participant.ts+++ b/api-client/update-participant.ts@@ -1,15 +1,20 @@+import { Participant, Vote, VoteType } from "@prisma/client";import axios from "axios";export interface UpdateParticipantPayload {pollId: string;participantId: string;name: string;- votes: string[];+ votes: Array<{ optionId: string; type: VoteType }>;}export const updateParticipant = async (payload: UpdateParticipantPayload,-): Promise<void> => {+): Promise<Participant & { votes: Vote[] }> => {const { pollId, participantId, ...body } = payload;- await axios.patch(`/api/poll/${pollId}/participant/${participantId}`, body);+ const res = await axios.patch<Participant & { votes: Vote[] }>(+ `/api/poll/${pollId}/participant/${participantId}`,+ body,+ );+ return res.data;};diff --git a/components/date-card.tsx b/components/date-card.tsxindex f4aa18ad9..e67958507 100644--- a/components/date-card.tsx+++ b/components/date-card.tsx@@ -19,7 +19,7 @@ const DateCard: React.VoidFunctionComponent<DateCardProps> = ({return (<divclassName={clsx(- "relative inline-block h-14 w-14 rounded-md border bg-white text-center shadow-md shadow-slate-100",+ "relative mt-1 inline-block h-14 w-14 rounded-md border bg-white text-center shadow-md shadow-slate-100",className,)}>@@ -31,7 +31,7 @@ const DateCard: React.VoidFunctionComponent<DateCardProps> = ({{dow}</span></div>- <div className="-mb-1 text-center text-lg text-red-500">{day}</div>+ <div className="-mb-1 text-center text-lg text-rose-500">{day}</div><div className="text-center text-xs font-semibold uppercase text-gray-800">{month}</div>diff --git a/components/home/poll-demo.tsx b/components/home/poll-demo.tsxindex 9f4f3c108..a00ea03b9 100644--- a/components/home/poll-demo.tsx+++ b/components/home/poll-demo.tsx@@ -1,10 +1,9 @@import { format } from "date-fns";import { useTranslation } from "next-i18next";import * as React from "react";-import { useTimeoutFn } from "react-use";import DateCard from "../date-card";-import Score from "../poll/desktop-poll/score";+import { ScoreSummary } from "../poll/score-summary";import UserAvatar from "../poll/user-avatar";import VoteIcon from "../poll/vote-icon";@@ -36,10 +35,6 @@ const options = ["2022-12-14", "2022-12-15", "2022-12-16", "2022-12-17"];const PollDemo: React.VoidFunctionComponent = () => {const { t } = useTranslation("app");- const [bestOption, setBestOption] = React.useState<number>();- useTimeoutFn(() => {- setBestOption(2);- }, 1500);return (<div@@ -48,7 +43,7 @@ const PollDemo: React.VoidFunctionComponent = () => {><div className="flex border-b shadow-sm"><div- className="flex shrink-0 items-center py-4 pl-4 pr-2 font-medium"+ className="flex shrink-0 items-center py-2 pl-4 pr-2 font-medium"style={{ width: sidebarWidth }}><div className="flex h-full grow items-end">@@ -66,17 +61,17 @@ const PollDemo: React.VoidFunctionComponent = () => {return (<divkey={i}- className="shrink-0 py-4 text-center transition-colors"+ className="shrink-0 space-y-3 py-2 pt-3 text-center transition-colors"style={{ width: 100 }}><DateCardday={format(d, "dd")}dow={format(d, "E")}month={format(d, "MMM")}- annotation={- <Score count={score} highlight={i === bestOption} />- }/>+ <div>+ <ScoreSummary yesScore={score} compact={true} />+ </div></div>);})}diff --git a/components/icons/fire.svg b/components/icons/fire.svgnew file mode 100644index 000000000..f218e1d2b--- /dev/null+++ b/components/icons/fire.svg@@ -0,0 +1,3 @@+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">+ <path fill-rule="evenodd" d="M12.395 2.553a1 1 0 00-1.45-.385c-.345.23-.614.558-.822.88-.214.33-.403.713-.57 1.116-.334.804-.614 1.768-.84 2.734a31.365 31.365 0 00-.613 3.58 2.64 2.64 0 01-.945-1.067c-.328-.68-.398-1.534-.398-2.654A1 1 0 005.05 6.05 6.981 6.981 0 003 11a7 7 0 1011.95-4.95c-.592-.591-.98-.985-1.348-1.467-.363-.476-.724-1.063-1.207-2.03zM12.12 15.12A3 3 0 017 13s.879.5 2.5.5c0-1 .5-4 1.25-4.5.5 1 .786 1.293 1.371 1.879A2.99 2.99 0 0113 13a2.99 2.99 0 01-.879 2.121z" clip-rule="evenodd" />+</svg>\ No newline at end of filediff --git a/components/icons/if-need-be.svg b/components/icons/if-need-be.svgnew file mode 100644index 000000000..d87b2d482--- /dev/null+++ b/components/icons/if-need-be.svg@@ -0,0 +1,3 @@+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">+ <path fill-rule="evenodd" d="M3.433 2.099a1 1 0 0 1 .468 1.334C2.986 5.34 2.57 6.704 2.561 8.007c-.008 1.298.387 2.655 1.333 4.546a1 1 0 0 1-1.788.895C1.095 11.428.55 9.742.56 7.994c.012-1.74.575-3.422 1.538-5.427A1 1 0 0 1 3.433 2.1Zm8.274 3.194a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L7 8.586l3.293-3.293a1 1 0 0 1 1.414 0Zm.392-1.86a1 1 0 1 1 1.803-.866c.963 2.005 1.526 3.686 1.537 5.427.011 1.748-.533 3.434-1.545 5.454a1 1 0 0 1-1.788-.896c.947-1.89 1.341-3.247 1.333-4.545-.008-1.303-.424-2.667-1.34-4.574Z" clip-rule="evenodd" />+</svg>\ No newline at end of filediff --git a/components/icons/star.svg b/components/icons/star.svgnew file mode 100644index 000000000..f4e707ae0--- /dev/null+++ b/components/icons/star.svg@@ -0,0 +1,3 @@+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">+ <path d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z" />+</svg>\ No newline at end of filediff --git a/components/icons/user-solid.svg b/components/icons/user-solid.svgnew file mode 100644index 000000000..debd3efc4--- /dev/null+++ b/components/icons/user-solid.svg@@ -0,0 +1,3 @@+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">+ <path fill-rule="evenodd" d="M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM6 9a3 3 0 0 0-3 3v1a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-1a3 3 0 0 0-3-3H6Z" clip-rule="evenodd" />+</svg>\ No newline at end of filediff --git a/components/icons/x-circle.svg b/components/icons/x-circle.svgindex ee4329dd5..524b7c1ab 100644--- a/components/icons/x-circle.svg+++ b/components/icons/x-circle.svg@@ -1,3 +1,3 @@-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">- <path stroke-linecap="round" stroke-linejoin="round" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">+ <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" /></svg>\ No newline at end of filediff --git a/components/poll-context.tsx b/components/poll-context.tsxindex 16599def6..70c02a757 100644--- a/components/poll-context.tsx+++ b/components/poll-context.tsx@@ -1,4 +1,4 @@-import { Participant, Vote } from "@prisma/client";+import { Participant, Vote, VoteType } from "@prisma/client";import { GetPollResponse } from "api-client/get-poll";import { keyBy } from "lodash";import React from "react";@@ -13,8 +13,6 @@ import { usePreferences } from "./preferences/use-preferences";import { useSession } from "./session";import { useRequiredContext } from "./use-required-context";-type VoteType = "yes" | "no";-type PollContextValue = {userAlreadyVoted: boolean;poll: GetPollResponse;@@ -23,10 +21,11 @@ type PollContextValue = {pollType: "date" | "timeSlot";highScore: number;getParticipantsWhoVotedForOption: (optionId: string) => Participant[]; // maybe just attach votes to parsed options+ getScore: (optionId: string) => { yes: number; ifNeedBe: number };getParticipantById: (participantId: string,) => (Participant & { votes: Vote[] }) | undefined;- getVote: (participantId: string, optionId: string) => VoteType;+ getVote: (participantId: string, optionId: string) => VoteType | undefined;} & (| { pollType: "date"; options: ParsedDateOption[] }| { pollType: "timeSlot"; options: ParsedTimeSlotOption[] }@@ -57,21 +56,46 @@ export const PollContextProvider: React.VoidFunctionComponent<{const participantsByOptionId = React.useMemo(() => {const res: Record<string, Participant[]> = {};poll.options.forEach((option) => {- res[option.id] = option.votes.map(- ({ participantId }) => participantById[participantId],+ res[option.id] = poll.participants.filter((participant) =>+ participant.votes.some(+ ({ type, optionId }) => optionId === option.id && type !== "no",+ ),);});return res;- }, [participantById, poll.options]);+ }, [poll.options, poll.participants]);+const { locale } = usePreferences();+ const getScore = React.useCallback(+ (optionId: string) => {+ return poll.participants.reduce(+ (acc, curr) => {+ curr.votes.forEach((vote) => {+ if (vote.optionId !== optionId) {+ return;+ }+ if (vote.type === "yes") {+ acc.yes += 1;+ }+ if (vote.type === "ifNeedBe") {+ acc.ifNeedBe += 1;+ }+ });+ return acc;+ },+ { yes: 0, ifNeedBe: 0 },+ );+ },+ [poll.participants],+ );+const contextValue = React.useMemo<PollContextValue>(() => {- let highScore = 1;- poll.options.forEach((option) => {- if (option.votes.length > highScore) {- highScore = option.votes.length;- }- });+ const highScore = poll.options.reduce((acc, curr) => {+ const score = getScore(curr.id).yes;++ return score > acc ? score : acc;+ }, 1);const parsedOptions = decodeOptions(poll.options,@@ -99,11 +123,6 @@ export const PollContextProvider: React.VoidFunctionComponent<{return {userAlreadyVoted,poll,- getVotesForOption: (optionId: string) => {- // TODO (Luke Vella) [2022-04-16]: Build an index instead- const option = poll.options.find(({ id }) => id === optionId);- return option?.votes ?? [];- },getParticipantById: (participantId) => {return participantById[participantId];},@@ -111,17 +130,18 @@ export const PollContextProvider: React.VoidFunctionComponent<{getParticipantsWhoVotedForOption: (optionId: string) =>participantsByOptionId[optionId],getVote: (participantId, optionId) => {- return getParticipantById(participantId)?.votes.some(+ const vote = getParticipantById(participantId)?.votes.find((vote) => vote.optionId === optionId,- )- ? "yes"- : "no";+ );+ return vote?.type;},+ getScore,...parsedOptions,targetTimeZone,setTargetTimeZone,};}, [+ getScore,locale,participantById,participantsByOptionId,diff --git a/components/poll.tsx b/components/poll.tsxindex b6fcc1dd1..6a45fd47a 100644--- a/components/poll.tsx+++ b/components/poll.tsx@@ -1,4 +1,3 @@-import { GetPollResponse } from "api-client/get-poll";import axios from "axios";import { NextPage } from "next";import Head from "next/head";@@ -21,7 +20,8 @@ import NotificationsToggle from "./poll/notifications-toggle";import PollSubheader from "./poll/poll-subheader";import TruncatedLinkify from "./poll/truncated-linkify";import { UserAvatarProvider } from "./poll/user-avatar";-import { PollContextProvider, usePoll } from "./poll-context";+import VoteIcon from "./poll/vote-icon";+import { usePoll } from "./poll-context";import Popover from "./popover";import { useSession } from "./session";import Sharing from "./sharing";@@ -32,7 +32,7 @@ const Discussion = React.lazy(() => import("@/components/discussion"));const DesktopPoll = React.lazy(() => import("@/components/poll/desktop-poll"));const MobilePoll = React.lazy(() => import("@/components/poll/mobile-poll"));-const PollInner: NextPage = () => {+const PollPage: NextPage = () => {const { poll } = usePoll();const router = useRouter();@@ -121,13 +121,6 @@ const PollInner: NextPage = () => {const PollComponent = isWideScreen ? DesktopPoll : MobilePoll;- let highScore = 1; // set to one because we don't want to highlight- poll.options.forEach((option) => {- if (option.votes.length > highScore) {- highScore = option.votes.length;- }- });-const names = React.useMemo(() => poll.participants.map(({ name }) => name),[poll.participants],@@ -210,9 +203,28 @@ const PollInner: NextPage = () => {This poll has been locked (voting is disabled)</div>) : null}++ <div className="flex items-center space-x-3 px-4 py-2 sm:justify-end">+ <span className="text-xs font-semibold text-slate-500">+ Legend:+ </span>+ <span className="inline-flex items-center space-x-2">+ <VoteIcon type="yes" />+ <span className="text-xs text-slate-500">Yes</span>+ </span>+ <span className="inline-flex items-center space-x-2">+ <VoteIcon type="ifNeedBe" />+ <span className="text-xs text-slate-500">If need be</span>+ </span>++ <span className="inline-flex items-center space-x-2">+ <VoteIcon type="no" />+ <span className="text-xs text-slate-500">No</span>+ </span>+ </div><React.Suspense fallback={<div>Loading…</div>}><div className="mb-4 lg:mb-8">- <PollComponent pollId={poll.urlId} highScore={highScore} />+ <PollComponent pollId={poll.urlId} /></div><Discussion pollId={poll.urlId} /></React.Suspense>@@ -223,12 +235,4 @@ const PollInner: NextPage = () => {);};-const PollPage = ({ poll }: { poll: GetPollResponse }) => {- return (- <PollContextProvider value={poll}>- <PollInner />- </PollContextProvider>- );-};-export default PollPage;diff --git a/components/poll/desktop-poll.tsx b/components/poll/desktop-poll.tsxindex dfa6bae9f..ee47dea3d 100644--- a/components/poll/desktop-poll.tsx+++ b/components/poll/desktop-poll.tsx@@ -23,6 +23,8 @@ if (typeof window !== "undefined") {const MotionButton = motion(Button);+const MotionParticipantFormRow = motion(ParticipantRowForm);+const minSidebarWidth = 180;const Poll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {@@ -111,7 +113,7 @@ const Poll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {}}><div- className="relative min-w-full max-w-full" // Don't add styles like border, margin, padding – that can mess up the sizing calculations+ className="relative min-w-full max-w-full select-none" // Don't add styles like border, margin, padding – that can mess up the sizing calculationsstyle={{ width: `min(${pollWidth}px, calc(100vw - 3rem))` }}ref={ref}>@@ -131,22 +133,21 @@ const Poll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {</div>) : null}<div className="flex shrink-0">- {!shouldShowNewParticipantForm && !poll.closed ? (- <Button- type="primary"- icon={<PlusCircle />}- onClick={() => {- setShouldShowNewParticipantForm(true);- }}- >- New Participant- </Button>- ) : null}+ <Button+ type="primary"+ disabled={shouldShowNewParticipantForm || poll.closed}+ icon={<PlusCircle />}+ onClick={() => {+ setShouldShowNewParticipantForm(true);+ }}+ >+ New Participant+ </Button></div></div><div className="flex"><div- className="flex shrink-0 items-center py-4 pl-4 pr-2 font-medium"+ className="flex shrink-0 items-center py-2 pl-4 pr-2 font-medium"style={{ width: sidebarWidth }}><div className="flex h-full grow items-end">@@ -198,26 +199,31 @@ const Poll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {) : null}</div></div>- {shouldShowNewParticipantForm && !poll.closed ? (- <ParticipantRowForm- className="border-t bg-slate-100 bg-opacity-0"- onSubmit={(data) => {- return new Promise((resolve, reject) => {- addParticipant(data, {- onSuccess: () => {- setShouldShowNewParticipantForm(false);- resolve();- },- onError: reject,+ <AnimatePresence initial={false}>+ {shouldShowNewParticipantForm && !poll.closed ? (+ <MotionParticipantFormRow+ transition={{ duration: 0.2 }}+ initial={{ opacity: 0, height: 0 }}+ animate={{ opacity: 1, height: 55, y: 0 }}+ className="border-t bg-slate-100 bg-opacity-0"+ onSubmit={(data) => {+ return new Promise((resolve, reject) => {+ addParticipant(data, {+ onSuccess: () => {+ setShouldShowNewParticipantForm(false);+ resolve();+ },+ onError: reject,+ });});- });- }}- options={poll.options}- onCancel={() => {- setShouldShowNewParticipantForm(false);- }}- />- ) : null}+ }}+ options={poll.options}+ onCancel={() => {+ setShouldShowNewParticipantForm(false);+ }}+ />+ ) : null}+ </AnimatePresence></div><div className="min-h-0 overflow-y-auto">{participants.map((participant, i) => {diff --git a/components/poll/desktop-poll/participant-row-form.tsx b/components/poll/desktop-poll/participant-row-form.tsxindex 8a9c1ef5b..4da7f7428 100644--- a/components/poll/desktop-poll/participant-row-form.tsx+++ b/components/poll/desktop-poll/participant-row-form.tsx@@ -4,13 +4,14 @@ import * as React from "react";import { Controller, useForm } from "react-hook-form";import CompactButton from "@/components/compact-button";+import Check from "@/components/icons/check.svg";import X from "@/components/icons/x.svg";-import { useSession } from "@/components/session";import { requiredString } from "../../../utils/form-validation";import Button from "../../button";import NameInput from "../../name-input";import { ParticipantForm } from "../types";+import { VoteSelector } from "../vote-selector";import ControlledScrollArea from "./controlled-scroll-area";import { usePollContext } from "./poll-context";@@ -22,173 +23,162 @@ export interface ParticipantRowFormProps {onCancel?: () => void;}-const ParticipantRowForm: React.VoidFunctionComponent<ParticipantRowFormProps> =- ({ defaultValues, onSubmit, className, options, onCancel }) => {- const {- setActiveOptionId,- activeOptionId,- columnWidth,- scrollPosition,- sidebarWidth,- numberOfColumns,- goToNextPage,- setScrollPosition,- } = usePollContext();+const ParticipantRowForm: React.ForwardRefRenderFunction<+ HTMLFormElement,+ ParticipantRowFormProps+> = ({ defaultValues, onSubmit, className, options, onCancel }, ref) => {+ const {+ setActiveOptionId,+ activeOptionId,+ columnWidth,+ scrollPosition,+ sidebarWidth,+ numberOfColumns,+ goToNextPage,+ setScrollPosition,+ } = usePollContext();- const session = useSession();+ const {+ handleSubmit,+ control,+ formState: { errors, submitCount, isSubmitting },+ reset,+ } = useForm<ParticipantForm>({+ defaultValues: {+ name: "",+ votes: [],+ ...defaultValues,+ },+ });- const {- handleSubmit,- register,- control,- formState: { errors, submitCount, isSubmitting },- reset,- } = useForm<ParticipantForm>({- defaultValues: {- name: "",- votes: [],- ...defaultValues,- },+ React.useEffect(() => {+ window.addEventListener("keydown", (e) => {+ if (e.key === "Escape") {+ onCancel?.();+ }});+ }, [onCancel]);- React.useEffect(() => {- window.addEventListener("keydown", (e) => {- if (e.key === "Escape") {- onCancel?.();- }- });- }, [onCancel]);-- const isColumnVisible = (index: number) => {- return (- scrollPosition + numberOfColumns * columnWidth > columnWidth * index- );- };+ const isColumnVisible = (index: number) => {+ return scrollPosition + numberOfColumns * columnWidth > columnWidth * index;+ };- const checkboxRefs = React.useRef<HTMLInputElement[]>([]);- const isAnimatingRef = React.useRef(false);- // This hack is necessary because when there is only one checkbox,- // react-hook-form does not know to format the value into an array.- // See: https://github.com/react-hook-form/react-hook-form/issues/7834+ const checkboxRefs = React.useRef<Array<HTMLButtonElement | null>>([]);- const checkboxProps = register("votes", {- onBlur: () => setActiveOptionId(null),- });+ return (+ <form+ ref={ref}+ onSubmit={handleSubmit(async ({ name, votes }) => {+ await onSubmit({+ name,+ // no need to create votes for "no"+ votes,+ });+ reset();+ })}+ className={clsx("flex h-14 shrink-0", className)}+ >+ <div className="flex items-center px-2" style={{ width: sidebarWidth }}>+ <Controller+ name="name"+ rules={{+ validate: requiredString,+ }}+ render={({ field }) => (+ <div className="w-full">+ <NameInput+ autoFocus={true}+ className={clsx("w-full", {+ "input-error animate-wiggle": errors.name && submitCount > 0,+ })}+ placeholder="Your name"+ {...field}+ onKeyDown={(e) => {+ if (e.code === "Tab" && scrollPosition > 0) {+ e.preventDefault();+ setScrollPosition(0);+ setTimeout(() => {+ checkboxRefs.current[0]?.focus();+ }, 100);+ }+ }}+ />+ </div>+ )}+ control={control}+ />+ </div>+ <Controller+ control={control}+ name="votes"+ render={({ field }) => {+ return (+ <ControlledScrollArea>+ {options.map((option, index) => {+ const value = field.value[index];- const checkboxGroupHack = (- <input type="checkbox" className="hidden" {...checkboxProps} />- );+ return (+ <div+ key={option.id}+ className={clsx(+ "flex shrink-0 items-center justify-center transition-colors",+ {+ "bg-gray-50": activeOptionId === option.id,+ },+ )}+ style={{ width: columnWidth }}+ onMouseOver={() => setActiveOptionId(option.id)}+ onMouseOut={() => setActiveOptionId(null)}+ >+ <VoteSelector+ value={value?.type}+ onKeyDown={(e) => {+ if (+ e.code === "Tab" &&+ index < options.length - 1 &&+ !isColumnVisible(index + 1)+ ) {+ e.preventDefault();+ goToNextPage();+ setTimeout(() => {+ checkboxRefs.current[index + 1]?.focus();+ }, 100);+ }+ }}+ onChange={(vote) => {+ const newValue = [...field.value];+ newValue[index] = { optionId: option.id, type: vote };+ field.onChange(newValue);+ }}+ ref={(el) => {+ checkboxRefs.current[index] = el;+ }}+ onFocus={() => {+ setActiveOptionId(option.id);+ }}+ />+ </div>+ );+ })}+ </ControlledScrollArea>+ );+ }}+ />- return (- <form- onSubmit={handleSubmit(async ({ name, votes }) => {- await onSubmit({- name,- // if there is only one checkbox then we get a string rather than array- // See this issue with using dot notation: https://github.com/react-hook-form/react-hook-form/issues/7834- votes: Array.isArray(votes) ? votes : [votes],- });- reset();- })}- className={clsx("flex h-14 shrink-0", className)}- >- {checkboxGroupHack}- <div className="flex items-center px-2" style={{ width: sidebarWidth }}>- <Controller- name="name"- rules={{- validate: requiredString,- }}- render={({ field }) => (- <div className="w-full">- <NameInput- autoFocus={!session.user}- className={clsx("w-full", {- "input-error animate-wiggle":- errors.name && submitCount > 0,- })}- placeholder="Your name"- {...field}- onKeyDown={(e) => {- if (e.code === "Tab" && scrollPosition > 0) {- e.preventDefault();- setScrollPosition(0);- setTimeout(() => {- checkboxRefs.current[0].focus();- }, 100);- }- }}- />- </div>- )}- control={control}- />- </div>- <ControlledScrollArea>- {options.map((option, index) => {- return (- <div- key={option.id}- className={clsx(- "flex shrink-0 items-center justify-center transition-colors",- {- "bg-slate-50": activeOptionId === option.id,- },- )}- style={{ width: columnWidth }}- onMouseOver={() => setActiveOptionId(option.id)}- onMouseOut={() => setActiveOptionId(null)}- >- <input- className="checkbox"- type="checkbox"- value={option.id}- onKeyDown={(e) => {- if (isAnimatingRef.current) {- return e.preventDefault();- }- if (- e.code === "Tab" &&- index < options.length - 1 &&- !isColumnVisible(index + 1)- ) {- isAnimatingRef.current = true;- e.preventDefault();- goToNextPage();- setTimeout(() => {- checkboxRefs.current[index + 1].focus();- isAnimatingRef.current = false;- }, 100);- }- }}- {...checkboxProps}- ref={(el) => {- if (el) {- checkboxRefs.current[index] = el;- checkboxProps.ref(el);- }- }}- onFocus={() => {- setActiveOptionId(option.id);- }}- />- </div>- );- })}- </ControlledScrollArea>- <div className="flex items-center space-x-2 px-2 transition-all">- <Button- htmlType="submit"- type="primary"- loading={isSubmitting}- data-testid="submitNewParticipant"- >- Save- </Button>- <CompactButton onClick={onCancel} icon={X} />- </div>- </form>- );- };+ <div className="flex items-center space-x-2 px-2 transition-all">+ <Button+ htmlType="submit"+ icon={<Check />}+ type="primary"+ loading={isSubmitting}+ data-testid="submitNewParticipant"+ >+ Save+ </Button>+ <CompactButton onClick={onCancel} icon={X} />+ </div>+ </form>+ );+};-export default ParticipantRowForm;+export default React.forwardRef(ParticipantRowForm);diff --git a/components/poll/desktop-poll/participant-row.tsx b/components/poll/desktop-poll/participant-row.tsxindex 3a88d4e0c..24f1d1726 100644--- a/components/poll/desktop-poll/participant-row.tsx+++ b/components/poll/desktop-poll/participant-row.tsx@@ -2,7 +2,6 @@ import { Option, Participant, Vote } from "@prisma/client";import clsx from "clsx";import * as React from "react";-import Badge from "@/components/badge";import CompactButton from "@/components/compact-button";import Pencil from "@/components/icons/pencil-alt.svg";import Trash from "@/components/icons/trash.svg";@@ -20,7 +19,7 @@ import { usePollContext } from "./poll-context";export interface ParticipantRowProps {urlId: string;participant: Participant & { votes: Vote[] };- options: Array<Option & { votes: Vote[] }>;+ options: Option[];editMode: boolean;onChangeEditMode?: (value: boolean) => void;}@@ -41,7 +40,7 @@ const ParticipantRow: React.VoidFunctionComponent<ParticipantRowProps> = ({const confirmDeleteParticipant = useDeleteParticipantModal();const session = useSession();- const { poll } = usePoll();+ const { poll, getVote } = usePoll();const isYou = session.user && session.ownsObject(participant) ? true : false;@@ -55,13 +54,15 @@ const ParticipantRow: React.VoidFunctionComponent<ParticipantRowProps> = ({<ParticipantRowFormdefaultValues={{name: participant.name,- votes: participant.votes.map(({ optionId }) => optionId),+ votes: options.map(({ id }) => {+ const type = getVote(participant.id, id);+ return type ? { optionId: id, type } : undefined;+ }),}}onSubmit={async ({ name, votes }) => {return new Promise((resolve, reject) => {updateParticipantMutation({- pollId: participant.pollId,participantId: participant.id,votes,name,@@ -86,7 +87,7 @@ const ParticipantRow: React.VoidFunctionComponent<ParticipantRowProps> = ({<divkey={participant.id}data-testid="participant-row"- className="group flex h-14 transition-colors hover:bg-slate-50"+ className="group flex h-14 transition-colors hover:bg-slate-300/10"><divclassName="flex shrink-0 items-center px-4"@@ -99,7 +100,7 @@ const ParticipantRow: React.VoidFunctionComponent<ParticipantRowProps> = ({isYou={isYou}/>{canEdit ? (- <div className="hidden shrink-0 items-center space-x-2 overflow-hidden px-2 group-hover:flex">+ <div className="hidden shrink-0 items-center space-x-2 overflow-hidden group-hover:flex"><CompactButtonicon={Pencil}onClick={() => {@@ -117,26 +118,21 @@ const ParticipantRow: React.VoidFunctionComponent<ParticipantRowProps> = ({</div><ControlledScrollArea>{options.map((option) => {+ const vote = getVote(participant.id, option.id);return (<divkey={option.id}className={clsx("flex shrink-0 items-center justify-center transition-colors",{- "bg-slate-50": activeOptionId === option.id,+ "bg-gray-50": activeOptionId === option.id,},)}style={{ width: columnWidth }}onMouseOver={() => setActiveOptionId(option.id)}onMouseOut={() => setActiveOptionId(null)}>- {option.votes.some(- (vote) => vote.participantId === participant.id,- ) ? (- <VoteIcon type="yes" />- ) : (- <VoteIcon type="no" />- )}+ <VoteIcon type={vote} /></div>);})}diff --git a/components/poll/desktop-poll/poll-header.tsx b/components/poll/desktop-poll/poll-header.tsxindex d4a02084b..a5cf3cc84 100644--- a/components/poll/desktop-poll/poll-header.tsx+++ b/components/poll/desktop-poll/poll-header.tsx@@ -4,9 +4,9 @@ import * as React from "react";import DateCard from "@/components/date-card";import { usePoll } from "@/components/poll-context";+import { ScoreSummary } from "../score-summary";import ControlledScrollArea from "./controlled-scroll-area";import { usePollContext } from "./poll-context";-import Score from "./score";const TimeRange: React.VoidFunctionComponent<{startTime: string;@@ -16,7 +16,7 @@ const TimeRange: React.VoidFunctionComponent<{return (<divclassName={clsx(- "relative inline-block pr-2 text-right text-xs font-semibold after:absolute after:top-2 after:right-0 after:h-4 after:w-1 after:border-t after:border-r after:border-b after:border-slate-300 after:content-['']",+ "relative -mr-2 inline-block pr-2 text-right text-xs font-semibold after:absolute after:top-2 after:right-0 after:h-4 after:w-1 after:border-t after:border-r after:border-b after:border-slate-300 after:content-['']",className,)}>@@ -27,21 +27,21 @@ const TimeRange: React.VoidFunctionComponent<{};const PollHeader: React.VoidFunctionComponent = () => {- const { options, getParticipantsWhoVotedForOption, highScore } = usePoll();+ const { options, getScore } = usePoll();const { activeOptionId, setActiveOptionId, columnWidth } = usePollContext();return (<ControlledScrollArea>{options.map((option) => {const { optionId } = option;- const numVotes = getParticipantsWhoVotedForOption(optionId).length;+ const numVotes = getScore(optionId);return (<divkey={optionId}className={clsx(- "shrink-0 pt-4 pb-3 text-center transition-colors",+ "shrink-0 space-y-3 py-3 text-center transition-colors",{- "bg-slate-50": activeOptionId === optionId,+ "bg-gray-50": activeOptionId === optionId,},)}style={{ width: columnWidth }}@@ -53,14 +53,6 @@ const PollHeader: React.VoidFunctionComponent = () => {day={option.day}dow={option.dow}month={option.month}- annotation={- numVotes > 0 ? (- <Score- count={numVotes}- highlight={numVotes > 1 && highScore === numVotes}- />- ) : null- }/></div>{option.type === "timeSlot" ? (@@ -70,6 +62,13 @@ const PollHeader: React.VoidFunctionComponent = () => {endTime={option.endTime}/>) : null}+ <div className="flex justify-center">+ <ScoreSummary+ yesScore={numVotes.yes}+ ifNeedBeScore={numVotes.ifNeedBe}+ compact={true}+ />+ </div></div>);})}diff --git a/components/poll/desktop-poll/score.tsx b/components/poll/desktop-poll/score.tsxdeleted file mode 100644index fc6b9d958..000000000--- a/components/poll/desktop-poll/score.tsx+++ /dev/null@@ -1,34 +0,0 @@-import clsx from "clsx";-import * as React from "react";--export interface ScoreProps {- count: number;- highlight?: boolean;- style?: React.CSSProperties;- className?: string;-}--const Score: React.VoidFunctionComponent<ScoreProps> = ({- count,- highlight,- style,- className,-}) => {- return (- <div- className={clsx(- " z-20 flex h-5 w-5 items-center justify-center rounded-full text-xs shadow-sm shadow-slate-200 transition-colors",- {- "bg-rose-500 text-white": highlight,- "bg-gray-200 text-gray-500": !highlight,- },- className,- )}- style={style}- >- {count}- </div>- );-};--export default Score;diff --git a/components/poll/manage-poll.tsx b/components/poll/manage-poll.tsxindex 88e718643..2efc948fd 100644--- a/components/poll/manage-poll.tsx+++ b/components/poll/manage-poll.tsx@@ -1,5 +1,4 @@import { Placement } from "@floating-ui/react-dom-interactions";-import { format } from "date-fns";import { Trans, useTranslation } from "next-i18next";import * as React from "react";import { encodeDateOption } from "utils/date-time-utils";@@ -17,6 +16,7 @@ import { PollDetailsForm } from "../forms";import { useModal } from "../modal";import { useModalContext } from "../modal/modal-provider";import { usePoll } from "../poll-context";+import { useCsvExporter } from "./manage-poll/use-csv-exporter";import { useUpdatePollMutation } from "./mutations";const PollOptionsForm = React.lazy(() => import("../forms/poll-options-form"));@@ -25,7 +25,9 @@ const ManagePoll: React.VoidFunctionComponent<{placement?: Placement;}> = ({ placement }) => {const { t } = useTranslation("app");- const { poll, options } = usePoll();+ const { poll, getParticipantsWhoVotedForOption } = usePoll();++ const { exportToCsv } = useCsvExporter();const modalContext = useModalContext();@@ -105,7 +107,8 @@ const ManagePoll: React.VoidFunctionComponent<{};const optionsToDeleteThatHaveVotes = optionsToDelete.filter(- (option) => option.votes.length > 0,+ (option) =>+ getParticipantsWhoVotedForOption(option.id).length > 0,);if (optionsToDeleteThatHaveVotes.length > 0) {@@ -181,55 +184,7 @@ const ManagePoll: React.VoidFunctionComponent<{label="Edit options"onClick={handleChangeOptions}/>- <DropdownItem- icon={Save}- label="Export to CSV"- onClick={() => {- const header = [- t("participantCount", {- count: poll.participants.length,- }),- ...options.map((decodedOption) => {- const day = `${decodedOption.dow} ${decodedOption.day} ${decodedOption.month}`;- return decodedOption.type === "date"- ? day- : `${day} ${decodedOption.startTime} - ${decodedOption.endTime}`;- }),- ].join(",");- const rows = poll.participants.map((participant) => {- return [- participant.name,- ...poll.options.map((option) => {- if (- participant.votes.some((vote) => {- return vote.optionId === option.id;- })- ) {- return "Yes";- }- return "No";- }),- ].join(",");- });- const csv = `data:text/csv;charset=utf-8,${[header, ...rows].join(- "\r\n",- )}`;-- const encodedCsv = encodeURI(csv);- const link = document.createElement("a");- link.setAttribute("href", encodedCsv);- link.setAttribute(- "download",- `${poll.title.replace(/\s/g, "_")}-${format(- Date.now(),- "yyyyMMddhhmm",- )}`,- );- document.body.appendChild(link);- link.click();- document.body.removeChild(link);- }}- />+ <DropdownItem icon={Save} label="Export to CSV" onClick={exportToCsv} />{poll.closed ? (<DropdownItemicon={LockOpen}diff --git a/components/poll/manage-poll/use-csv-exporter.ts b/components/poll/manage-poll/use-csv-exporter.tsnew file mode 100644index 000000000..0c5f6867a--- /dev/null+++ b/components/poll/manage-poll/use-csv-exporter.ts@@ -0,0 +1,61 @@+import { format } from "date-fns";+import { useTranslation } from "next-i18next";++import { usePoll } from "@/components/poll-context";++export const useCsvExporter = () => {+ const { poll, options } = usePoll();+ const { t } = useTranslation("app");++ return {+ exportToCsv: () => {+ const header = [+ t("participantCount", {+ count: poll.participants.length,+ }),+ ...options.map((decodedOption) => {+ const day = `${decodedOption.dow} ${decodedOption.day} ${decodedOption.month}`;+ return decodedOption.type === "date"+ ? day+ : `${day} ${decodedOption.startTime} - ${decodedOption.endTime}`;+ }),+ ].join(",");+ const rows = poll.participants.map((participant) => {+ return [+ participant.name,+ ...poll.options.map((option) => {+ const vote = participant.votes.find((vote) => {+ return vote.optionId === option.id;+ });++ switch (vote?.type) {+ case "yes":+ return t("yes");+ case "ifNeedBe":+ return t("ifNeedBe");+ default:+ return t("no");+ }+ }),+ ].join(",");+ });+ const csv = `data:text/csv;charset=utf-8,${[header, ...rows].join(+ "\r\n",+ )}`;++ const encodedCsv = encodeURI(csv);+ const link = document.createElement("a");+ link.setAttribute("href", encodedCsv);+ link.setAttribute(+ "download",+ `${poll.title.replace(/\s/g, "_")}-${format(+ Date.now(),+ "yyyyMMddhhmm",+ )}`,+ );+ document.body.appendChild(link);+ link.click();+ document.body.removeChild(link);+ },+ };+};diff --git a/components/poll/mobile-poll.tsx b/components/poll/mobile-poll.tsxindex 00166ffee..4d2e420b5 100644--- a/components/poll/mobile-poll.tsx+++ b/components/poll/mobile-poll.tsx@@ -1,5 +1,4 @@import { Listbox } from "@headlessui/react";-import { Participant, Vote } from "@prisma/client";import clsx from "clsx";import { AnimatePresence, motion } from "framer-motion";import { useTranslation } from "next-i18next";@@ -7,6 +6,7 @@ import * as React from "react";import { Controller, FormProvider, useForm } from "react-hook-form";import smoothscroll from "smoothscroll-polyfill";+import Check from "@/components/icons/check.svg";import ChevronDown from "@/components/icons/chevron-down.svg";import Pencil from "@/components/icons/pencil-alt.svg";import PlusCircle from "@/components/icons/plus-circle.svg";@@ -37,17 +37,11 @@ if (typeof window !== "undefined") {const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {const pollContext = usePoll();- const { poll, targetTimeZone, setTargetTimeZone } = pollContext;+ const { poll, targetTimeZone, setTargetTimeZone, getParticipantById } =+ pollContext;const { timeZone, participants, role } = poll;- const participantById = participants.reduce<- Record<string, Participant & { votes: Vote[] }>- >((acc, curr) => {- acc[curr.id] = { ...curr };- return acc;- }, {});-const session = useSession();const form = useForm<ParticipantForm>({@@ -62,7 +56,7 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {React.useState<string>();const selectedParticipant = selectedParticipantId- ? participantById[selectedParticipantId]+ ? getParticipantById(selectedParticipantId): undefined;const [isEditing, setIsEditing] = React.useState(false);@@ -111,6 +105,7 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {});}};+return (<FormProvider {...form}><form@@ -122,7 +117,6 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {updateParticipantMutation({participantId: selectedParticipant.id,- pollId,...data,},{@@ -150,7 +144,9 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {<div className="flex space-x-3"><Listboxvalue={selectedParticipantId}- onChange={setSelectedParticipantId}+ onChange={(participantId) => {+ setSelectedParticipantId(participantId);+ }}disabled={isEditing}><div className="menu min-w-0 grow">@@ -217,9 +213,10 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {setIsEditing(true);reset({name: selectedParticipant.name,- votes: selectedParticipant.votes.map(- (vote) => vote.optionId,- ),+ votes: selectedParticipant.votes.map((vote) => ({+ optionId: vote.optionId,+ type: vote.type,+ })),});}}>@@ -241,7 +238,10 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {type="primary"icon={<PlusCircle />}onClick={() => {- reset({ name: "", votes: [] });+ reset({+ name: "",+ votes: [],+ });setIsEditing(true);}}>@@ -269,6 +269,8 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {</div>{(() => {switch (pollContext.pollType) {+ // we pass poll options as props since we are+ // discriminating on poll type herecase "date":return (<PollOptions@@ -347,7 +349,7 @@ const MobilePoll: React.VoidFunctionComponent<PollProps> = ({ pollId }) => {/></div><Button- icon={<Save />}+ icon={<Check />}htmlType="submit"type="primary"loading={formState.isSubmitting}diff --git a/components/poll/mobile-poll/poll-option.tsx b/components/poll/mobile-poll/poll-option.tsxindex 2039dda0d..7d9c64aa2 100644--- a/components/poll/mobile-poll/poll-option.tsx+++ b/components/poll/mobile-poll/poll-option.tsx@@ -1,18 +1,20 @@-import { Participant } from "@prisma/client";+import { Participant, VoteType } from "@prisma/client";import clsx from "clsx";import { AnimatePresence, motion } from "framer-motion";import * as React from "react";+import { ScoreSummary } from "../score-summary";import UserAvatar from "../user-avatar";import VoteIcon from "../vote-icon";-import PopularityScore from "./popularity-score";+import { VoteSelector } from "../vote-selector";export interface PollOptionProps {children?: React.ReactNode;- numberOfVotes: number;+ yesScore: number;+ ifNeedBeScore: number;editable?: boolean;- vote?: "yes" | "no";- onChange: (vote: "yes" | "no") => void;+ vote?: VoteType;+ onChange: (vote: VoteType) => void;participants: Participant[];selectedParticipantId?: string;}@@ -66,39 +68,31 @@ const PollOption: React.VoidFunctionComponent<PollOptionProps> = ({onChange,participants,editable,- numberOfVotes,+ yesScore,+ ifNeedBeScore,}) => {- const difference = selectedParticipantId- ? participants.some(({ id }) => id === selectedParticipantId)- ? vote === "yes"- ? 0- : -1- : vote === "yes"- ? 1- : 0- : vote === "yes"- ? 1- : 0;-const showVotes = !!(selectedParticipantId || editable);++ const selectorRef = React.useRef<HTMLButtonElement>(null);return (<divdata-testid="poll-option"onClick={() => {- onChange(vote === "yes" ? "no" : "yes");+ if (selectorRef.current) {+ selectorRef.current.click();+ }}}className={clsx(- "flex items-center space-x-3 px-4 py-3 transition duration-75",+ "flex select-none items-center space-x-3 px-4 py-3 transition duration-75",{- "active:bg-indigo-50": editable,- "bg-indigo-50/50": editable && vote === "yes",+ "active:bg-slate-400/5": editable,},)}>- <div className="pointer-events-none flex grow items-center">+ <div className="flex grow items-center"><div className="grow">{children}</div><div className="flex flex-col items-end">- <PopularityScore score={numberOfVotes + difference} />+ <ScoreSummary yesScore={yesScore} ifNeedBeScore={ifNeedBeScore} />{participants.length > 0 ? (<div className="mt-1 -mr-1"><div className="-space-x-1">@@ -127,27 +121,20 @@ const PollOption: React.VoidFunctionComponent<PollOptionProps> = ({expanded={showVotes}className="relative flex h-12 items-center justify-center rounded-lg">- <AnimatePresence>- {editable ? (- <PopInOut className="h-full">- <div className="flex h-full w-14 items-center justify-center">- <input- readOnly={true}- type="checkbox"- className="checkbox"- checked={vote === "yes"}- />- </div>- </PopInOut>- ) : vote ? (+ {editable ? (+ <div className="flex h-full w-14 items-center justify-center">+ <VoteSelector ref={selectorRef} value={vote} onChange={onChange} />+ </div>+ ) : vote ? (+ <AnimatePresence initial={false}><PopInOutkey={vote}className="absolute inset-0 flex h-full w-full items-center justify-center"><VoteIcon type={vote} /></PopInOut>- ) : null}- </AnimatePresence>+ </AnimatePresence>+ ) : null}</CollapsibleContainer></div>);diff --git a/components/poll/mobile-poll/poll-options.tsx b/components/poll/mobile-poll/poll-options.tsxindex 940b334c3..8969da539 100644--- a/components/poll/mobile-poll/poll-options.tsx+++ b/components/poll/mobile-poll/poll-options.tsx@@ -1,3 +1,4 @@+import { VoteType } from "@prisma/client";import * as React from "react";import { Controller, useFormContext } from "react-hook-form";import { ParsedDateTimeOpton } from "utils/date-time-utils";@@ -20,43 +21,39 @@ const PollOptions: React.VoidFunctionComponent<PollOptions> = ({selectedParticipantId,}) => {const { control } = useFormContext<ParticipantForm>();- const { getParticipantsWhoVotedForOption, getVote, getParticipantById } =- usePoll();+ const {+ getParticipantsWhoVotedForOption,+ getParticipantById,+ getScore,+ getVote,+ } = usePoll();const selectedParticipant = selectedParticipantId? getParticipantById(selectedParticipantId): undefined;return (<div className="divide-y">- {options.map((option) => {+ {options.map((option, index) => {const participants = getParticipantsWhoVotedForOption(option.optionId);+ const score = getScore(option.optionId);return (<Controllerkey={option.optionId}control={control}name="votes"render={({ field }) => {- const vote = editable- ? field.value.includes(option.optionId)- ? "yes"- : "no"- : selectedParticipant- ? getVote(selectedParticipant.id, option.optionId)- : undefined;+ const vote =+ !editable && selectedParticipant+ ? getVote(selectedParticipant.id, option.optionId)+ : field.value[index]?.type;- const handleChange = (newVote: "yes" | "no") => {+ const handleChange = (newVote: VoteType) => {if (!editable) {return;}- if (newVote === "no") {- field.onChange(- field.value.filter(- (optionId) => optionId !== option.optionId,- ),- );- } else {- field.onChange([...field.value, option.optionId]);- }+ const newValue = [...field.value];+ newValue[index] = { optionId: option.optionId, type: newVote };+ field.onChange(newValue);};switch (option.type) {@@ -64,7 +61,8 @@ const PollOptions: React.VoidFunctionComponent<PollOptions> = ({return (<TimeSlotOptiononChange={handleChange}- numberOfVotes={participants.length}+ yesScore={score.yes}+ ifNeedBeScore={score.ifNeedBe}participants={participants}vote={vote}startTime={option.startTime}@@ -78,7 +76,8 @@ const PollOptions: React.VoidFunctionComponent<PollOptions> = ({return (<DateOptiononChange={handleChange}- numberOfVotes={participants.length}+ yesScore={score.yes}+ ifNeedBeScore={score.ifNeedBe}participants={participants}vote={vote}dow={option.dow}diff --git a/components/poll/mobile-poll/popularity-score.tsx b/components/poll/mobile-poll/popularity-score.tsxdeleted file mode 100644index 40bd443a5..000000000--- a/components/poll/mobile-poll/popularity-score.tsx+++ /dev/null@@ -1,52 +0,0 @@-import { AnimatePresence, motion } from "framer-motion";-import * as React from "react";-import { usePrevious } from "react-use";--import Check from "@/components/icons/check.svg";--export interface PopularityScoreProps {- score: number;-}--const PopularityScore: React.VoidFunctionComponent<PopularityScoreProps> = ({- score,-}) => {- const prevScore = usePrevious(score);-- const multiplier = prevScore !== undefined ? score - prevScore : 0;-- return (- <div- data-testid="popularity-score"- className="inline-flex items-center font-mono text-sm font-semibold text-slate-500"- >- <Check className="mr-1 inline-block h-5 text-slate-400/80" />- <span className="relative inline-block">- <AnimatePresence initial={false}>- <motion.span- transition={{- duration: 0.2,- }}- initial={{- opacity: 0,- y: 10 * multiplier,- }}- animate={{ opacity: 1, y: 0 }}- exit={{- opacity: 0,- y: 10 * multiplier,- }}- key={score}- className="absolute inset-0"- >- {score}- </motion.span>- </AnimatePresence>- {/* Invisible text just to give us the right width */}- <span className="text-transparent">{score}</span>- </span>- </div>- );-};--export default React.memo(PopularityScore);diff --git a/components/poll/mutations.ts b/components/poll/mutations.tsindex 6facc742d..c4bcc97ed 100644--- a/components/poll/mutations.ts+++ b/components/poll/mutations.ts@@ -8,10 +8,7 @@ import {DeleteParticipantPayload,} from "../../api-client/delete-participant";import { GetPollResponse } from "../../api-client/get-poll";-import {- updateParticipant,- UpdateParticipantPayload,-} from "../../api-client/update-participant";+import { updateParticipant } from "../../api-client/update-participant";import { usePoll } from "../poll-context";import { useSession } from "../session";import { ParticipantForm } from "./types";@@ -20,12 +17,17 @@ export const useAddParticipantMutation = (pollId: string) => {const queryClient = useQueryClient();const session = useSession();const plausible = usePlausible();+ const { options } = usePoll();+return useMutation((payload: ParticipantForm) =>addParticipant({pollId,name: payload.name.trim(),- votes: payload.votes,+ votes: options.map(+ (option, i) =>+ payload.votes[i] ?? { optionId: option.optionId, type: "no" },+ ),}),{onSuccess: (participant) => {@@ -39,15 +41,6 @@ export const useAddParticipantMutation = (pollId: string) => {);}poll.participants = [participant, ...poll.participants];- participant.votes.forEach((vote) => {- const votedOption = poll.options.find(- (option) => option.id === vote.optionId,- );- votedOption?.votes.push(vote);- });- poll.options.forEach((option) => {- participant.votes.some(({ optionId }) => optionId === option.id);- });return poll;},);@@ -60,18 +53,38 @@ export const useAddParticipantMutation = (pollId: string) => {export const useUpdateParticipantMutation = (pollId: string) => {const queryClient = useQueryClient();const plausible = usePlausible();+ const { options } = usePoll();return useMutation(- (payload: UpdateParticipantPayload) =>+ (payload: ParticipantForm & { participantId: string }) =>updateParticipant({pollId,participantId: payload.participantId,name: payload.name.trim(),- votes: payload.votes,+ votes: options.map(+ (option, i) =>+ payload.votes[i] ?? { optionId: option.optionId, type: "no" },+ ),}),{- onSuccess: () => {+ onSuccess: (participant) => {plausible("Update participant");+ queryClient.setQueryData<GetPollResponse>(+ ["getPoll", pollId],+ (poll) => {+ if (!poll) {+ throw new Error(+ "Tried to update poll but no result found in query cache",+ );+ }++ poll.participants = poll.participants.map((p) =>+ p.id === participant.id ? participant : p,+ );++ return poll;+ },+ );},onSettled: () => {queryClient.invalidateQueries(["getPoll", pollId]);@@ -83,9 +96,28 @@ export const useUpdateParticipantMutation = (pollId: string) => {export const useDeleteParticipantMutation = () => {const queryClient = useQueryClient();const plausible = usePlausible();+ const { poll } = usePoll();return useMutation((payload: DeleteParticipantPayload) => deleteParticipant(payload),{+ onMutate: ({ participantId }) => {+ queryClient.setQueryData<GetPollResponse>(+ ["getPoll", poll.urlId],+ (poll) => {+ if (!poll) {+ throw new Error(+ "Tried to update poll but no result found in query cache",+ );+ }++ poll.participants = poll.participants.filter(+ ({ id }) => id !== participantId,+ );++ return poll;+ },+ );+ },onSuccess: () => {plausible("Remove participant");},diff --git a/components/poll/score-summary.tsx b/components/poll/score-summary.tsxnew file mode 100644index 000000000..40b8ca481--- /dev/null+++ b/components/poll/score-summary.tsx@@ -0,0 +1,102 @@+import clsx from "clsx";+import { AnimatePresence, motion } from "framer-motion";+import * as React from "react";+import { usePrevious } from "react-use";++import CheckCircle from "@/components/icons/check-circle.svg";+import IfNeedBe from "@/components/icons/if-need-be.svg";++export interface PopularityScoreProps {+ yesScore: number;+ compact?: boolean;+ ifNeedBeScore?: number;+ highlight?: boolean;+}++const Score = React.forwardRef<+ HTMLDivElement,+ {+ icon: React.ComponentType<{ className?: string }>;+ score: number;+ compact?: boolean;+ }+>(function Score({ icon: Icon, score, compact }, ref) {+ const prevScore = usePrevious(score);++ const multiplier = prevScore !== undefined ? score - prevScore : 0;++ return (+ <div+ ref={ref}+ className={clsx(+ "relative inline-flex items-center font-mono font-semibold text-slate-500",+ { "text-sm": !compact, "text-xs": compact },+ )}+ >+ <Icon+ className={clsx(+ "mr-1 inline-block text-slate-400/80 transition-opacity",+ {+ "h-4": !compact,+ "h-3": compact,+ },+ )}+ />+ <span className="relative inline-block">+ <AnimatePresence initial={false}>+ <motion.span+ transition={{+ duration: 0.2,+ }}+ initial={{+ opacity: 0,+ y: 10 * multiplier,+ }}+ animate={{ opacity: 1, y: 0 }}+ exit={{+ opacity: 0,+ y: 10 * multiplier,+ }}+ key={score}+ className="absolute inset-0"+ >+ {score}+ </motion.span>+ </AnimatePresence>+ {/* Invisible text just to give us the right width */}+ <span className="text-transparent">{score}</span>+ </span>+ </div>+ );+});++const MotionScore = motion(Score);++export const ScoreSummary: React.VoidFunctionComponent<PopularityScoreProps> =+ React.memo(function PopularityScore({ yesScore, ifNeedBeScore, compact }) {+ return (+ <div+ data-testid="popularity-score"+ className="inline-flex items-center space-x-2"+ >+ <Score icon={CheckCircle} compact={compact} score={yesScore} />+ <AnimatePresence initial={false}>+ {ifNeedBeScore ? (+ <MotionScore+ initial={{ opacity: 0, width: 0, x: -10 }}+ animate={{ opacity: 1, width: "auto", x: 0 }}+ exit={{+ opacity: 0,+ width: 0,+ x: -10,+ transition: { duration: 0.1 },+ }}+ icon={IfNeedBe}+ compact={compact}+ score={ifNeedBeScore}+ />+ ) : null}+ </AnimatePresence>+ </div>+ );+ });diff --git a/components/poll/types.ts b/components/poll/types.tsindex f469a0b5b..ec0cc9d4d 100644--- a/components/poll/types.ts+++ b/components/poll/types.ts@@ -1,8 +1,20 @@+import { VoteType } from "@prisma/client";+export interface ParticipantForm {name: string;- votes: string[];+ votes: Array<+ | {+ optionId: string;+ type: VoteType;+ }+ | undefined+ >;+}++export interface ParticipantFormSubmitted {+ name: string;+ votes: Array<{ optionId: string; type: VoteType }>;}export interface PollProps {pollId: string;- highScore: number;}diff --git a/components/poll/vote-icon.tsx b/components/poll/vote-icon.tsxindex bf224a861..1aed2d61e 100644--- a/components/poll/vote-icon.tsx+++ b/components/poll/vote-icon.tsx@@ -1,14 +1,27 @@+import { VoteType } from "@prisma/client";import * as React from "react";import CheckCircle from "@/components/icons/check-circle.svg";+import IfNeedBe from "@/components/icons/if-need-be.svg";const VoteIcon: React.VoidFunctionComponent<{- type: "yes" | "no";+ type?: VoteType;}> = ({ type }) => {- if (type === "yes") {- return <CheckCircle className="h-5 w-5 text-green-400" />;+ switch (type) {+ case "yes":+ return <CheckCircle className="h-5 w-5 text-green-400" />;++ case "ifNeedBe":+ return <IfNeedBe className="h-5 w-5 text-yellow-400" />;++ case "no":+ return (+ <span className="inline-block h-2 w-2 rounded-full bg-slate-300" />+ );++ default:+ return <span className="inline-block font-bold text-slate-300">?</span>;}- return <span className="inline-block h-2 w-2 rounded-full bg-slate-300" />;};export default VoteIcon;diff --git a/components/poll/vote-selector.tsx b/components/poll/vote-selector.tsxnew file mode 100644index 000000000..0e19df828--- /dev/null+++ b/components/poll/vote-selector.tsx@@ -0,0 +1,54 @@+import { VoteType } from "@prisma/client";+import { AnimatePresence, motion } from "framer-motion";+import * as React from "react";++import VoteIcon from "./vote-icon";++export interface VoteSelectorProps {+ value?: VoteType;+ onChange?: (value: VoteType) => void;+ onFocus?: React.FocusEventHandler<HTMLButtonElement>;+ onBlur?: React.FocusEventHandler<HTMLButtonElement>;+ onKeyDown?: React.KeyboardEventHandler<HTMLButtonElement>;+}++const orderedVoteTypes: VoteType[] = ["yes", "ifNeedBe", "no"];++const getNext = (value: VoteType) => {+ return orderedVoteTypes[+ (orderedVoteTypes.indexOf(value) + 1) % orderedVoteTypes.length+ ];+};++export const VoteSelector = React.forwardRef<+ HTMLButtonElement,+ VoteSelectorProps+>(function VoteSelector({ value, onChange, onFocus, onBlur, onKeyDown }, ref) {+ return (+ <button+ data-testid="vote-selector"+ type="button"+ onFocus={onFocus}+ onBlur={onBlur}+ onKeyDown={onKeyDown}+ className="relative inline-flex h-9 w-9 items-center justify-center rounded-lg border bg-white shadow-sm transition focus-visible:border-0 focus-visible:ring-2 focus-visible:ring-indigo-500 active:scale-95"+ onClick={() => {+ onChange?.(value ? getNext(value) : orderedVoteTypes[0]);+ }}+ ref={ref}+ >+ <AnimatePresence initial={false}>+ <motion.span+ className="absolute flex items-center justify-center"+ transition={{ duration: 0.1 }}+ initial={{ opacity: 0, scale: 0 }}+ animate={{ opacity: 1, scale: 1 }}+ exit={{ opacity: 0, scale: 0 }}+ key={value}+ >+ <VoteIcon type={value} />+ </motion.span>+ </AnimatePresence>+ </button>+ );+});diff --git a/components/standard-layout.tsx b/components/standard-layout.tsxindex 06b250068..d6e9e9eab 100644--- a/components/standard-layout.tsx+++ b/components/standard-layout.tsx@@ -29,7 +29,7 @@ const HomeLink = () => {return (<Link href="/"><a>- <Logo className="w-28 text-indigo-500 transition-colors active:text-indigo-600 lg:w-32" />+ <Logo className="inline-block w-28 text-indigo-500 transition-colors active:text-indigo-600 lg:w-32" /></a></Link>);@@ -40,7 +40,7 @@ const MobileNavigation: React.VoidFunctionComponent<{}> = ({ openLoginModal }) => {const { user } = useSession();return (- <div className="fixed top-0 z-30 flex h-12 w-full shrink-0 items-center justify-between border-b bg-gray-50 px-4 shadow-sm lg:hidden">+ <div className="fixed top-0 z-40 flex h-12 w-full shrink-0 items-center justify-between border-b bg-gray-50 px-4 lg:hidden"><div><HomeLink /></div>diff --git a/migrations/20220511113020_add_if_need_be/migration.sql b/migrations/20220511113020_add_if_need_be/migration.sqlnew file mode 100644index 000000000..aa670c937--- /dev/null+++ b/migrations/20220511113020_add_if_need_be/migration.sql@@ -0,0 +1,5 @@+-- CreateEnum+CREATE TYPE "VoteType" AS ENUM ('yes', 'no', 'ifNeedBe');++-- AlterTable+ALTER TABLE "Vote" ADD COLUMN "type" "VoteType" NOT NULL DEFAULT E'yes';diff --git a/migrations/20220511180705_naming_convention_update/migration.sql b/migrations/20220511180705_naming_convention_update/migration.sqlnew file mode 100644index 000000000..75d0f27bb--- /dev/null+++ b/migrations/20220511180705_naming_convention_update/migration.sql@@ -0,0 +1,173 @@+-- DropForeignKey+ALTER TABLE "Comment" DROP CONSTRAINT "Comment_pollId_fkey";++-- DropForeignKey+ALTER TABLE "Comment" DROP CONSTRAINT "Comment_userId_fkey";++-- DropForeignKey+ALTER TABLE "Link" DROP CONSTRAINT "Link_pollId_fkey";++-- DropForeignKey+ALTER TABLE "Option" DROP CONSTRAINT "Option_pollId_fkey";++-- DropForeignKey+ALTER TABLE "Participant" DROP CONSTRAINT "Participant_pollId_fkey";++-- DropForeignKey+ALTER TABLE "Participant" DROP CONSTRAINT "Participant_userId_fkey";++-- DropForeignKey+ALTER TABLE "Poll" DROP CONSTRAINT "Poll_userId_fkey";++-- DropForeignKey+ALTER TABLE "Vote" DROP CONSTRAINT "Vote_optionId_fkey";++-- DropForeignKey+ALTER TABLE "Vote" DROP CONSTRAINT "Vote_participantId_fkey";++-- DropForeignKey+ALTER TABLE "Vote" DROP CONSTRAINT "Vote_pollId_fkey";++-- Rename table+ALTER TABLE "Comment" RENAME TO "comments";++-- Rename table+ALTER TABLE "Link" RENAME TO "links";++-- Rename table+ALTER TABLE "Option" RENAME TO "options";++-- Rename table+ALTER TABLE "Participant" RENAME TO "participants";++-- Rename table+ALTER TABLE "Poll" RENAME TO "polls";++-- Rename table+ALTER TABLE "User" RENAME TO "users";++-- Rename table+ALTER TABLE "Vote" RENAME TO "votes";++-- Rename enum+ALTER TYPE "PollType" RENAME TO "poll_type";++-- Rename enum+ALTER TYPE "Role" RENAME TO "role";++-- Rename enum+ALTER TYPE "VoteType" RENAME TO "vote_type";++-- Rename fields+ALTER TABLE "comments" RENAME COLUMN "authorName" TO "author_name";+ALTER TABLE "comments" RENAME COLUMN "createdAt" TO "created_at";+ALTER TABLE "comments" RENAME COLUMN "guestId" TO "guest_id";+ALTER TABLE "comments" RENAME COLUMN "pollId" TO "poll_id";+ALTER TABLE "comments" RENAME COLUMN "updatedAt" TO "updated_at";+ALTER TABLE "comments" RENAME COLUMN "userId" TO "user_id";++-- Rename fields+ALTER TABLE "links" RENAME COLUMN "createdAt" TO "created_at";+ALTER TABLE "links" RENAME COLUMN "pollId" TO "poll_id";+ALTER TABLE "links" RENAME COLUMN "urlId" TO "url_id";++-- Rename fields+ALTER TABLE "options" RENAME COLUMN "createdAt" TO "created_at";+ALTER TABLE "options" RENAME COLUMN "pollId" TO "poll_id";+ALTER TABLE "options" RENAME COLUMN "updatedAt" TO "updated_at";++-- Rename fields+ALTER TABLE "participants" RENAME COLUMN "createdAt" TO "created_at";+ALTER TABLE "participants" RENAME COLUMN "guestId" TO "guest_id";+ALTER TABLE "participants" RENAME COLUMN "pollId" TO "poll_id";+ALTER TABLE "participants" RENAME COLUMN "updatedAt" TO "updated_at";+ALTER TABLE "participants" RENAME COLUMN "userId" TO "user_id";++-- Rename fields+ALTER TABLE "polls" RENAME COLUMN "authorName" TO "author_name";+ALTER TABLE "polls" RENAME COLUMN "userId" TO "user_id";+ALTER TABLE "polls" RENAME COLUMN "createdAt" TO "created_at";+ALTER TABLE "polls" RENAME COLUMN "timeZone" TO "time_zone";+ALTER TABLE "polls" RENAME COLUMN "updatedAt" TO "updated_at";+ALTER TABLE "polls" RENAME COLUMN "urlId" TO "url_id";++-- Rename fields+ALTER TABLE "users" RENAME COLUMN "createdAt" TO "created_at";+ALTER TABLE "users" RENAME COLUMN "updatedAt" TO "updated_at";++-- Rename fields+ALTER TABLE "votes" RENAME COLUMN "createdAt" TO "created_at";+ALTER TABLE "votes" RENAME COLUMN "optionId" TO "option_id";+ALTER TABLE "votes" RENAME COLUMN "participantId" TO "participant_id";+ALTER TABLE "votes" RENAME COLUMN "pollId" TO "poll_id";+ALTER TABLE "votes" RENAME COLUMN "updatedAt" TO "updated_at";+++-- CreateIndex+CREATE UNIQUE INDEX "users_email_key" ON "users"("email");++-- CreateIndex+CREATE UNIQUE INDEX "polls_url_id_key" ON "polls"("url_id");++-- CreateIndex+CREATE UNIQUE INDEX "links_url_id_key" ON "links"("url_id");++-- CreateIndex+CREATE UNIQUE INDEX "links_poll_id_role_key" ON "links"("poll_id", "role");++-- CreateIndex+CREATE UNIQUE INDEX "participants_id_poll_id_key" ON "participants"("id", "poll_id");++-- CreateIndex+CREATE UNIQUE INDEX "comments_id_poll_id_key" ON "comments"("id", "poll_id");++-- AddForeignKey+ALTER TABLE "polls" ADD CONSTRAINT "polls_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "links" ADD CONSTRAINT "links_poll_id_fkey" FOREIGN KEY ("poll_id") REFERENCES "polls"("url_id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "participants" ADD CONSTRAINT "participants_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE SET NULL ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "participants" ADD CONSTRAINT "participants_poll_id_fkey" FOREIGN KEY ("poll_id") REFERENCES "polls"("url_id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "options" ADD CONSTRAINT "options_poll_id_fkey" FOREIGN KEY ("poll_id") REFERENCES "polls"("url_id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "votes" ADD CONSTRAINT "votes_poll_id_fkey" FOREIGN KEY ("poll_id") REFERENCES "polls"("url_id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "votes" ADD CONSTRAINT "votes_participant_id_fkey" FOREIGN KEY ("participant_id") REFERENCES "participants"("id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "votes" ADD CONSTRAINT "votes_option_id_fkey" FOREIGN KEY ("option_id") REFERENCES "options"("id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "comments" ADD CONSTRAINT "comments_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE SET NULL ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "comments" ADD CONSTRAINT "comments_poll_id_fkey" FOREIGN KEY ("poll_id") REFERENCES "polls"("url_id") ON DELETE CASCADE ON UPDATE CASCADE;++-- AlterTable+ALTER TABLE "comments" RENAME CONSTRAINT "Comment_pkey" TO "comments_pkey";++-- AlterTable+ALTER TABLE "links" RENAME CONSTRAINT "Link_pkey" TO "links_pkey";++-- AlterTable+ALTER TABLE "options" RENAME CONSTRAINT "Option_pkey" TO "options_pkey";++-- AlterTable+ALTER TABLE "participants" RENAME CONSTRAINT "Participant_pkey" TO "participants_pkey";++-- AlterTable+ALTER TABLE "polls" RENAME CONSTRAINT "Poll_pkey" TO "polls_pkey";++-- AlterTable+ALTER TABLE "users" RENAME CONSTRAINT "User_pkey" TO "users_pkey";++-- AlterTable+ALTER TABLE "votes" RENAME CONSTRAINT "Vote_pkey" TO "votes_pkey";diff --git a/migrations/20220512093441_add_no_votes/migration.sql b/migrations/20220512093441_add_no_votes/migration.sqlnew file mode 100644index 000000000..e1904fcf7--- /dev/null+++ b/migrations/20220512093441_add_no_votes/migration.sql@@ -0,0 +1,13 @@+-- Previously we only stored "yes" and "ifNeedBe" votes and assumed missing votes are "no"+-- Since we want to differentiate between "no" and did not vote yet we want to include "no" votes+-- in this table+INSERT INTO votes (id, poll_id, participant_id, option_id, type)+SELECT nanoid(), poll_id, participant_id, option_id, 'no'+FROM (+ SELECT o.poll_id, p.id participant_id, o.id option_id+ FROM options o+ JOIN participants p ON o.poll_id = p.poll_id+EXCEPT+ SELECT poll_id, participant_id, option_id+ FROM votes+) AS missing;diff --git a/pages/_document.tsx b/pages/_document.tsxindex 12feb6aec..6c7e0ce9b 100644--- a/pages/_document.tsx+++ b/pages/_document.tsx@@ -25,10 +25,8 @@ export default function Document() {<link rel="icon" href="/favicon.svg" type="image/svg+xml" /><link rel="manifest" href="/site.webmanifest" /><link+ href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap"rel="stylesheet"- href="https://cdnjs.cloudflare.com/ajax/libs/inter-ui/3.19.3/inter.min.css"- integrity="sha512-8vEtrrc40OAQaCUaqVjNMQtQEPyNtllVG1RYy6bGEuWQkivCBeqOzuDJPPhD+MO6y6QGLuQYPCr8Nlzu9lTYaQ=="- crossOrigin="anonymous"/><meta name="theme-color" content="#f9fafb" /></Head>diff --git a/pages/api/legacy/[urlId].ts b/pages/api/legacy/[urlId].tsindex 8dbc1e158..0c38c9539 100644--- a/pages/api/legacy/[urlId].ts+++ b/pages/api/legacy/[urlId].ts@@ -1,3 +1,4 @@+import { VoteType } from "@prisma/client";import { GetPollApiResponse } from "api-client/get-poll";import { NextApiRequest, NextApiResponse } from "next";import { getQueryParam } from "utils/api-utils";@@ -50,18 +51,21 @@ export default async function handler(id: legacyParticipant._id.toString(),}));- const votes: Array<{ optionId: string; participantId: string }> = [];+ const votes: Array<{+ optionId: string;+ participantId: string;+ type: VoteType;+ }> = [];newParticipants?.forEach((p, i) => {// eslint-disable-next-line @typescript-eslint/no-non-null-assertionconst legacyVotes = legacyPoll.participants![i].votes;legacyVotes?.forEach((v, j) => {- if (v) {- votes.push({- optionId: newOptions[j].id,- participantId: p.id,- });- }+ votes.push({+ optionId: newOptions[j].id,+ participantId: p.id,+ type: v ? "yes" : "no",+ });});});@@ -133,9 +137,6 @@ export default async function handler(},include: {options: {- include: {- votes: true,- },orderBy: {value: "asc",},diff --git a/pages/api/poll/index.ts b/pages/api/poll.tssimilarity index 94%rename from pages/api/poll/index.tsrename to pages/api/poll.tsindex cad8d5090..fdc3501f4 100644--- a/pages/api/poll/index.ts+++ b/pages/api/poll.ts@@ -2,9 +2,9 @@ import { sendEmailTemplate } from "utils/api-utils";import { createToken, withSessionRoute } from "utils/auth";import { nanoid } from "utils/nanoid";-import { CreatePollPayload } from "../../../api-client/create-poll";-import { prisma } from "../../../db";-import absoluteUrl from "../../../utils/absolute-url";+import { CreatePollPayload } from "../../api-client/create-poll";+import { prisma } from "../../db";+import absoluteUrl from "../../utils/absolute-url";export default withSessionRoute(async (req, res) => {switch (req.method) {diff --git a/pages/api/poll/[urlId]/index.ts b/pages/api/poll/[urlId].tssimilarity index 92%rename from pages/api/poll/[urlId]/index.tsrename to pages/api/poll/[urlId].tsindex dcb47c60f..9ff1cec7e 100644--- a/pages/api/poll/[urlId]/index.ts+++ b/pages/api/poll/[urlId].ts@@ -1,9 +1,9 @@import { GetPollApiResponse } from "api-client/get-poll";import { resetDates } from "utils/legacy-utils";-import { UpdatePollPayload } from "../../../../api-client/update-poll";-import { prisma } from "../../../../db";-import { withLink } from "../../../../utils/api-utils";+import { UpdatePollPayload } from "../../../api-client/update-poll";+import { prisma } from "../../../db";+import { withLink } from "../../../utils/api-utils";export default withLink<GetPollApiResponse | { status: number; message: string }@@ -18,9 +18,6 @@ export default withLink<},include: {options: {- include: {- votes: true,- },orderBy: {value: "asc",},@@ -111,9 +108,6 @@ export default withLink<},include: {options: {- include: {- votes: true,- },orderBy: {value: "asc",},diff --git a/pages/api/poll/[urlId]/comments/index.ts b/pages/api/poll/[urlId]/comments.tssimilarity index 91%rename from pages/api/poll/[urlId]/comments/index.tsrename to pages/api/poll/[urlId]/comments.tsindex 3614f89f4..228012ebd 100644--- a/pages/api/poll/[urlId]/comments/index.ts+++ b/pages/api/poll/[urlId]/comments.ts@@ -1,7 +1,7 @@import { createGuestUser, withSessionRoute } from "utils/auth";-import { prisma } from "../../../../../db";-import { sendNotification, withLink } from "../../../../../utils/api-utils";+import { prisma } from "../../../../db";+import { sendNotification, withLink } from "../../../../utils/api-utils";export default withSessionRoute(withLink(async ({ req, res, link }) => {diff --git a/pages/api/poll/[urlId]/participant/index.ts b/pages/api/poll/[urlId]/participant.tssimilarity index 81%rename from pages/api/poll/[urlId]/participant/index.tsrename to pages/api/poll/[urlId]/participant.tsindex b90b7c63f..72b2296dd 100644--- a/pages/api/poll/[urlId]/participant/index.ts+++ b/pages/api/poll/[urlId]/participant.ts@@ -1,8 +1,8 @@import { createGuestUser, withSessionRoute } from "utils/auth";-import { AddParticipantPayload } from "../../../../../api-client/add-participant";-import { prisma } from "../../../../../db";-import { sendNotification, withLink } from "../../../../../utils/api-utils";+import { AddParticipantPayload } from "../../../../api-client/add-participant";+import { prisma } from "../../../../db";+import { sendNotification, withLink } from "../../../../utils/api-utils";export default withSessionRoute(withLink(async ({ req, res, link }) => {@@ -28,8 +28,9 @@ export default withSessionRoute(: undefined,votes: {createMany: {- data: payload.votes.map((optionId) => ({+ data: payload.votes.map(({ optionId, type }) => ({optionId,+ type,pollId: link.pollId,})),},diff --git a/pages/api/poll/[urlId]/participant/[participantId].ts b/pages/api/poll/[urlId]/participant/[participantId].tsindex 06849d6b6..e22cfed30 100644--- a/pages/api/poll/[urlId]/participant/[participantId].ts+++ b/pages/api/poll/[urlId]/participant/[participantId].ts@@ -1,3 +1,5 @@+import { UpdateParticipantPayload } from "api-client/update-participant";+import { prisma } from "../../../../../db";import { getQueryParam, withLink } from "../../../../../utils/api-utils";@@ -7,7 +9,9 @@ export default withLink(async ({ req, res, link }) => {const pollId = link.pollId;switch (req.method) {case "PATCH":- await prisma.participant.update({+ const payload: UpdateParticipantPayload = req.body;++ const participant = await prisma.participant.update({where: {id_pollId: {id: participantId,@@ -20,17 +24,21 @@ export default withLink(async ({ req, res, link }) => {pollId,},createMany: {- data: req.body.votes.map((optionId: string) => ({+ data: payload.votes.map(({ optionId, type }) => ({optionId,+ type,pollId,})),},},name: req.body.name,},+ include: {+ votes: true,+ },});- return res.end();+ return res.json(participant);case "DELETE":await prisma.participant.delete({diff --git a/pages/api/poll/demo.ts b/pages/api/poll/demo.tsindex 612d9cc78..b0b426adb 100644--- a/pages/api/poll/demo.ts+++ b/pages/api/poll/demo.ts@@ -1,3 +1,4 @@+import { VoteType } from "@prisma/client";import { addMinutes } from "date-fns";import { NextApiRequest, NextApiResponse } from "next";import absoluteUrl from "utils/absolute-url";@@ -5,22 +6,22 @@ import { nanoid } from "utils/nanoid";import { prisma } from "../../../db";-const participantData = [+const participantData: Array<{ name: string; votes: VoteType[] }> = [{name: "Reed",- votes: [0, 2],+ votes: ["yes", "no", "ifNeedBe", "no"],},{name: "Susan",- votes: [0, 1, 2],+ votes: ["yes", "yes", "yes", "no"],},{name: "Johnny",- votes: [2, 3],+ votes: ["no", "no", "yes", "yes"],},{name: "Ben",- votes: [0, 1, 2, 3],+ votes: ["yes", "yes", "yes", "yes"],},];@@ -49,7 +50,11 @@ export default async function handler(createdAt: Date;}> = [];- const votes: Array<{ optionId: string; participantId: string }> = [];+ const votes: Array<{+ optionId: string;+ participantId: string;+ type: VoteType;+ }> = [];for (let i = 0; i < participantData.length; i++) {const { name, votes: participantVotes } = participantData[i];@@ -61,9 +66,12 @@ export default async function handler(createdAt: addMinutes(today, i * -1),});- participantVotes.forEach((voteIndex) => {- const option = options[voteIndex];- votes.push({ optionId: option.id, participantId });+ options.forEach((option, index) => {+ votes.push({+ optionId: option.id,+ participantId,+ type: participantVotes[index],+ });});}diff --git a/pages/poll.tsx b/pages/poll.tsxindex 374e27baf..033ff4f6e 100644--- a/pages/poll.tsx+++ b/pages/poll.tsx@@ -11,6 +11,7 @@ import { withSessionSsr } from "utils/auth";import ErrorPage from "@/components/error-page";import FullPageLoader from "@/components/full-page-loader";+import { PollContextProvider } from "@/components/poll-context";import { SessionProps, withSession } from "@/components/session";import { GetPollResponse } from "../api-client/get-poll";@@ -74,7 +75,11 @@ const PollPageLoader: NextPage<SessionProps> = () => {}if (poll) {- return <PollPage poll={poll} />;+ return (+ <PollContextProvider value={poll}>+ <PollPage />+ </PollContextProvider>+ );}if (didError) {diff --git a/public/locales/en/app.json b/public/locales/en/app.jsonindex 268c78cb7..888ad888d 100644--- a/public/locales/en/app.json+++ b/public/locales/en/app.json@@ -31,7 +31,7 @@"voteCount_other": "{{count}} votes","participantCount": "{{count}} participant","participantCount_other": "{{count}} participants",- "createdBy": "Created by <b>{{name}}</b>",+ "createdBy": "by <b>{{name}}</b>","timeZone": "Time Zone:","creatingDemo": "Creating demo poll…","ok": "Ok",@@ -49,5 +49,8 @@"monday": "Monday","sunday": "Sunday","12h": "12-hour",- "24h": "24-hour"+ "24h": "24-hour",+ "yes": "Yes",+ "no": "No",+ "ifNeedBe": "If need be"}diff --git a/schema.prisma b/schema.prismaindex 68ec23ec1..495c9ce2f 100644--- a/schema.prisma+++ b/schema.prisma@@ -11,105 +11,129 @@ model User {id String @id @default(cuid())name Stringemail String @unique() @db.Citext- createdAt DateTime @default(now())- updatedAt DateTime? @updatedAt+ createdAt DateTime @default(now()) @map("created_at")+ updatedAt DateTime? @updatedAt @map("updated_at")polls Poll[]participants Participant[]comments Comment[]++ @@map("users")}enum PollType {date++ @@map("poll_type")}model Poll {- urlId String @id @unique- createdAt DateTime @default(now())- updatedAt DateTime @updatedAt- deadline DateTime?- title String- type PollType- description String?- location String?- user User @relation(fields: [userId], references: [id])- userId String- votes Vote[]- timeZone String?- verified Boolean @default(false)- options Option[]- participants Participant[]- authorName String @default("")- demo Boolean @default(false)- comments Comment[]- links Link[]- legacy Boolean @default(false)- closed Boolean @default(false)- notifications Boolean @default(false)+ urlId String @id @unique @map("url_id")+ createdAt DateTime @default(now()) @map("created_at")+ updatedAt DateTime @updatedAt @map("updated_at")+ deadline DateTime?+ title String+ type PollType+ description String?+ location String?+ user User @relation(fields: [userId], references: [id])+ userId String @map("user_id")+ votes Vote[]+ timeZone String? @map("time_zone")+ verified Boolean @default(false)+ options Option[]+ participants Participant[]+ authorName String @default("") @map("author_name")+ demo Boolean @default(false)+ comments Comment[]+ links Link[]+ legacy Boolean @default(false)+ closed Boolean @default(false)+ notifications Boolean @default(false)++ @@map("polls")}enum Role {adminparticipant++ @@map("role")}model Link {- urlId String @id @unique+ urlId String @id @unique @map("url_id")role Role- pollId String+ pollId String @map("poll_id")poll Poll @relation(fields: [pollId], references: [urlId], onDelete: Cascade)- createdAt DateTime @default(now())+ createdAt DateTime @default(now()) @map("created_at")@@unique([pollId, role])+ @@map("links")}model Participant {id String @id @default(cuid())name Stringuser User? @relation(fields: [userId], references: [id])- userId String?- guestId String?+ userId String? @map("user_id")+ guestId String? @map("guest_id")poll Poll @relation(fields: [pollId], references: [urlId], onDelete: Cascade)- pollId String+ pollId String @map("poll_id")votes Vote[]- createdAt DateTime @default(now())- updatedAt DateTime? @updatedAt+ createdAt DateTime @default(now()) @map("created_at")+ updatedAt DateTime? @updatedAt @map("updated_at")@@unique([id, pollId])+ @@map("participants")}model Option {id String @id @default(cuid())value String- pollId String+ pollId String @map("poll_id")poll Poll @relation(fields: [pollId], references: [urlId], onDelete: Cascade)- createdAt DateTime @default(now())- updatedAt DateTime? @updatedAt+ createdAt DateTime @default(now()) @map("created_at")+ updatedAt DateTime? @updatedAt @map("updated_at")votes Vote[]++ @@map("options")+}++enum VoteType {+ yes+ no+ ifNeedBe++ @@map("vote_type")}model Vote {id String @id @default(cuid())participant Participant @relation(fields: [participantId], references: [id], onDelete: Cascade)- participantId String+ participantId String @map("participant_id")option Option @relation(fields: [optionId], references: [id], onDelete: Cascade)- optionId String+ optionId String @map("option_id")poll Poll @relation(fields: [pollId], references: [urlId], onDelete: Cascade)- pollId String- createdAt DateTime @default(now())- updatedAt DateTime? @updatedAt+ pollId String @map("poll_id")+ type VoteType @default(yes)+ createdAt DateTime @default(now()) @map("created_at")+ updatedAt DateTime? @updatedAt @map("updated_at")++ @@map("votes")}model Comment {id String @id @default(cuid())content Stringpoll Poll @relation(fields: [pollId], references: [urlId], onDelete: Cascade)- pollId String- authorName String+ pollId String @map("poll_id")+ authorName String @map("author_name")user User? @relation(fields: [userId], references: [id])- userId String?- guestId String?- createdAt DateTime @default(now())- updatedAt DateTime? @updatedAt+ userId String? @map("user_id")+ guestId String? @map("guest_id")+ createdAt DateTime @default(now()) @map("created_at")+ updatedAt DateTime? @updatedAt @map("updated_at")@@unique([id, pollId])+ @@map("comments")}diff --git a/style.css b/style.cssindex 1007f42f4..d76c558d2 100644--- a/style.css+++ b/style.css@@ -32,13 +32,13 @@@apply outline-none;}a {- @apply font-medium text-indigo-500 hover:text-indigo-400 hover:underline;+ @apply rounded-sm font-medium text-indigo-500 outline-none hover:text-indigo-400 hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500 focus-visible:ring-offset-1;}label {@apply mb-1 block text-sm text-slate-800;}button {- @apply cursor-default focus:outline-none focus:ring-indigo-600;+ @apply cursor-default outline-none focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500 focus-visible:ring-offset-1;}#floating-ui-root {@@ -66,14 +66,14 @@@apply h-4 w-4 rounded border-slate-300 text-indigo-500 shadow-sm focus:ring-indigo-500;}.btn {- @apply inline-flex h-9 cursor-default items-center justify-center whitespace-nowrap rounded-md border px-3 font-medium shadow-sm transition-all focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-1;+ @apply inline-flex h-9 cursor-default select-none items-center justify-center whitespace-nowrap rounded-md border px-3 font-medium shadow-sm transition-all active:scale-95;}a.btn {@apply hover:no-underline;}.btn-default {- @apply btn border-gray-300 bg-white text-gray-700 hover:text-indigo-500 focus-visible:border-transparent focus-visible:ring-indigo-500 focus-visible:ring-offset-0 active:bg-gray-100;+ @apply btn border-slate-300 bg-white text-slate-700 hover:bg-indigo-50/10 active:bg-slate-100;}.btn-danger {@apply btn border-rose-600 bg-rose-500 text-white hover:bg-rose-600 focus-visible:ring-rose-500;@@ -81,20 +81,15 @@.btn-link {@apply inline-flex items-center text-indigo-500 underline;}- .btn-default.btn-disabled {- @apply bg-gray-50;- }- .btn-disabled {- @apply pointer-events-none;+ .btn.btn-disabled {+ text-shadow: none;+ @apply pointer-events-none border-gray-200 bg-slate-500/5 text-gray-400 shadow-none;}.btn-primary {text-shadow: rgb(0 0 0 / 20%) 0px 1px 1px;@apply btn border-indigo-600 bg-indigo-500 text-white hover:bg-opacity-90 focus-visible:ring-indigo-500 active:bg-indigo-600;}- .btn-primary.btn-disabled {- text-shadow: none;- @apply border-gray-300/70 bg-gray-200/70 text-gray-400;- }+a.btn-primary {@apply text-white;}@@ -104,7 +99,7 @@}.segment-button button {- @apply inline-flex grow items-center justify-center border-t border-b border-r bg-white px-4 font-medium transition-colors first:rounded-l first:border-l last:rounded-r hover:bg-slate-50 focus:z-10 focus:ring-2 active:bg-slate-100;+ @apply inline-flex grow items-center justify-center border-t border-b border-r bg-white px-4 font-medium transition-colors first:rounded-l first:border-l last:rounded-r hover:bg-slate-50 focus:z-10 focus-visible:ring-2 focus-visible:ring-offset-0 active:bg-slate-100;}.segment-button .segment-button-active {diff --git a/tailwind.config.js b/tailwind.config.jsindex 0f0652281..9f3ecddbb 100644--- a/tailwind.config.js+++ b/tailwind.config.js@@ -35,7 +35,8 @@ module.exports = {xs: "375px",},fontFamily: {- sans: ["Inter var", ...defaultTheme.fontFamily.sans],+ sans: ["Inter", ...defaultTheme.fontFamily.sans],+ mono: [...defaultTheme.fontFamily.mono],},transitionTimingFunction: {"in-expo": "cubic-bezier(0.68, -0.6, 0.32, 1.6)",diff --git a/tests/vote-and-comment.spec.ts b/tests/vote-and-comment.spec.tsindex 4785da4a5..cb2f25299 100644--- a/tests/vote-and-comment.spec.ts+++ b/tests/vote-and-comment.spec.ts@@ -8,8 +8,8 @@ test("should be able to vote and comment on a poll", async ({ page }) => {await page.type('[placeholder="Your name"]', "Test user");// There is a hidden checkbox (nth=0) that exists so that the behaviour of the form is consistent even// when we only have a single option/checkbox.- await page.locator('[name="votes"] >> nth=1').click();- await page.locator('[name="votes"] >> nth=3').click();+ await page.locator("data-testid=vote-selector >> nth=0").click();+ await page.locator("data-testid=vote-selector >> nth=2").click();await page.click('[data-testid="submitNewParticipant"]');await expect(page.locator("text='Test user'")).toBeVisible();await expect(page.locator("text=Guest")).toBeVisible();diff --git a/utils/legacy-utils.ts b/utils/legacy-utils.tsindex bdd278704..28ae8a57e 100644--- a/utils/legacy-utils.ts+++ b/utils/legacy-utils.ts@@ -1,6 +1,7 @@import { ObjectId } from "mongodb";-import { getMongoClient } from "./mongodb-client";+import { prisma } from "../db";+import { getMongoClient } from "./mongodb-client";export interface LegacyPoll {__private: {@@ -91,8 +92,8 @@ export const resetDates = async (legacyPollId: string) => {},include: {options: {- include: {- votes: true,+ orderBy: {+ value: "asc",},},participants: {