3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-05-31 17:56:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Run autofix

Browse source
This commit is contained in:
Luke Vella 2024-10-13 10:59:15 +01:00
parent cfb9ec8e8a
commit 1a5b2f206d
No known key found for this signature in database
GPG key ID: 469CAD687F0D784C
20 changed files with 132 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/landing/src/lib/api.ts
View file

@ -1,6 +1,6 @@
import fs from "fs";
import fs from "node:fs";
import matter from "gray-matter";
import { join } from "path";
import { join } from "node:path";
const postsDirectory = join(process.cwd(), "src", "posts");

2
apps/web/next-i18next.config.js
View file

@ -1,5 +1,5 @@
const ICU = require("i18next-icu/i18nextICU.js");
const path = require("path");
const path = require("node:path");
const i18n = require("./i18n.config.js");
module.exports = {

2
apps/web/src/app/[locale]/(admin)/events/event-list.tsx
View file

@ -55,7 +55,7 @@ export function EventList({ data }: { data: ScheduledEvent[] }) {
style={{
background: generateGradient(row.original.id),
}}
></span>
/>
<h2 className="truncate text-base font-semibold">
{row.original.title}
</h2>

6
apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
View file

@ -81,7 +81,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
const datepickerSelection = React.useMemo(() => {
return Object.keys(optionsByDay).map(
(dateString) => new Date(dateString + "T12:00:00"),
(dateString) => new Date(`${dateString}T12:00:00`),
);
}, [optionsByDay]);
@ -192,7 +192,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
? "border-primary-300 group-hover:border-primary-400 border-dashed shadow-sm"
: "border-dashed border-transparent group-hover:border-gray-400 group-active:bg-gray-200",
)}
></span>
/>
<span className="z-10">{day.day}</span>
</button>
</div>
@ -272,7 +272,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
className="space-y-3 p-3 sm:flex sm:items-start sm:space-x-4 sm:space-y-0 sm:p-4"
>
<DateCard
{...getDateProps(new Date(dateString + "T12:00:00"))}
{...getDateProps(new Date(`${dateString}T12:00:00`))}
/>
<div className="grow space-y-3">
{optionsForDay.map(({ option, index }) => {

4
apps/web/src/components/poll/desktop-poll/participant-row.tsx
View file

@ -95,7 +95,7 @@ export const ParticipantRowView: React.FunctionComponent<{
</td>
);
})}
<td className="bg-diagonal-lines border-l"></td>
<td className="bg-diagonal-lines border-l" />
</tr>
);
};
@ -109,7 +109,7 @@ const ParticipantRow: React.FunctionComponent<ParticipantRowProps> = ({
const { user, ownsObject } = useUser();
const { getVote, optionIds } = usePoll();
const isYou = user && ownsObject(participant) ? true : false;
const isYou = !!(user && ownsObject(participant) );
const { canEditParticipant } = usePermissions();
const canEdit = canEditParticipant(participant.id);

4
apps/web/src/components/poll/desktop-poll/poll-header.tsx
View file

@ -50,9 +50,9 @@ const TimelineRow = ({
<th
style={{ minWidth: 240, top }}
className="sticky left-0 z-30 bg-white pl-4 pr-4"
></th>
/>
{children}
<th className="w-full min-w-4 border-l"></th>
<th className="w-full min-w-4 border-l" />
</tr>
);
};

7
apps/web/src/components/poll/manage-poll.tsx
View file

@ -93,7 +93,7 @@ function PauseResumeToggle() {
<Trans i18nKey="resumePoll" />
</DropdownMenuItem>
);
} else {
}
return (
<DropdownMenuItem
onClick={() => {
@ -119,7 +119,6 @@ function PauseResumeToggle() {
<Trans i18nKey="pausePoll" />
</DropdownMenuItem>
);
}
}
const ManagePoll: React.FunctionComponent<{
@ -189,8 +188,7 @@ const ManagePoll: React.FunctionComponent<{
</Link>
</DropdownMenuItem>
<DropdownMenuSeparator />
<>
{poll.status === "finalized" ? (
{poll.status === "finalized" ? (
<DropdownMenuItem
onClick={() => {
reopen.mutate({ pollId: poll.id });
@ -227,7 +225,6 @@ const ManagePoll: React.FunctionComponent<{
<PauseResumeToggle />
</>
)}
</>
<DropdownMenuSeparator />
<DropdownMenuItem onClick={exportToCsv}>
<DropdownMenuItemIconLabel icon={DownloadIcon}>

3
apps/web/src/components/poll/truncated-linkify.tsx
View file

@ -23,7 +23,7 @@ export const truncateLink = (href: string, text: string, key: number) => {
{finalText}
</Link>
);
} else {
}
finalText += "…";
return (
<Tooltip>
@ -42,7 +42,6 @@ export const truncateLink = (href: string, text: string, key: number) => {
</TooltipContent>
</Tooltip>
);
}
};
const TruncatedLinkify = ({ children }: { children: React.ReactNode }) => {

2
apps/web/src/components/register-link.tsx
View file

@ -16,7 +16,7 @@ export const RegisterLink = React.forwardRef<
onClick={async (e) => {
e.preventDefault();
props.onClick?.(e);
router.push("/register?callbackUrl=" + encodeURIComponent(pathname));
router.push(`/register?callbackUrl=${encodeURIComponent(pathname)}`);
}}
>
{children}

6
apps/web/src/components/vote-summary-progress-bar.tsx
View file

@ -33,7 +33,7 @@ export const VoteSummaryProgressBar = (props: {
<div
className="h-full bg-green-500 opacity-75 hover:opacity-100"
style={{
width: (props.yes.length / props.total) * 100 + "%",
width: `${(props.yes.length / props.total) * 100}%`,
}}
/>
</TooltipTrigger>
@ -46,7 +46,7 @@ export const VoteSummaryProgressBar = (props: {
<div
className="h-full bg-amber-400 opacity-75 hover:opacity-100"
style={{
width: (props.ifNeedBe.length / props.total) * 100 + "%",
width: `${(props.ifNeedBe.length / props.total) * 100}%`,
}}
/>
</TooltipTrigger>
@ -59,7 +59,7 @@ export const VoteSummaryProgressBar = (props: {
<div
className="h-full bg-gray-300 opacity-75 hover:opacity-100"
style={{
width: (props.no.length / props.total) * 100 + "%",
width: `${(props.no.length / props.total) * 100}%`,
}}
/>
</TooltipTrigger>

2
apps/web/src/contexts/posthog.tsx
View file

@ -34,7 +34,7 @@ function usePostHogPageView() {
if (pathname && posthog) {
let url = window.origin + pathname;
if (searchParams?.toString()) {
url = url + `?${searchParams.toString()}`;
url = `${url}?${searchParams.toString()}`;
}
if (previousUrl.current !== url) {
posthog.capture("$pageview", {

2
apps/web/src/pages/[locale]/auth/disable-notifications.tsx
View file

@ -20,7 +20,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
props: {},
redirect: {
destination:
"/login?callbackUrl=" + encodeURIComponent(ctx.req.url ?? "/"),
`/login?callbackUrl=${encodeURIComponent(ctx.req.url ?? "/")}`,
},
};
}

2
apps/web/src/pages/_document.tsx
View file

@ -103,7 +103,7 @@ export default function Document() {
<body>
<Main />
<NextScript />
<div id="portal"></div>
<div id="portal" />
</body>
</Html>
);

7
apps/web/src/pages/api/paddle.ts
View file

@ -1,6 +1,6 @@
// Original source: https://gist.github.com/dsumer/3594cda57e84a93a9019cddc71831882
import { prisma } from "@rallly/database";
import crypto from "crypto";
import crypto from "node:crypto";
import type { NextApiRequest, NextApiResponse } from "next";
import * as Serialize from "php-serialize";
@ -50,7 +50,7 @@ export function validateWebhook(req: NextApiRequest) {
// Grab p_signature
const mySig = Buffer.from(jsonObj.p_signature, "base64");
// Remove p_signature from object - not included in array of fields used in verification.
delete jsonObj.p_signature;
jsonObj.p_signature = undefined;
// Need to sort array by key in ascending order
jsonObj = ksort(jsonObj);
for (const property in jsonObj) {
@ -113,7 +113,7 @@ export default async function handler(
passthrough = JSON.parse(payload.passthrough) as PaddlePassthrough;
} catch {}
if (!passthrough) {
res.status(400).send("Invalid passthrough: " + payload.passthrough);
res.status(400).send(`Invalid passthrough: ${payload.passthrough}`);
return;
}
@ -204,6 +204,5 @@ export default async function handler(
// If everything went well, send a 200 OK
return res.status(200).json({ success: true });
} else {
}
}

208
apps/web/src/trpc/routers/polls.ts
View file

@ -142,7 +142,7 @@ export const polls = router({
let nextCursor: typeof cursor | undefined = undefined;
if (polls.length > input.limit) {
const nextItem = polls.pop();
nextCursor = nextItem!.id;
nextCursor = nextItem?.id;
}
return {
polls,
@ -304,12 +304,11 @@ export const polls = router({
duration: dayjs(end).diff(dayjs(start), "minute"),
pollId,
};
} else {
return {
startTime: dayjs(start).utc(true).toDate(),
pollId,
};
}
return {
startTime: dayjs(start).utc(true).toDate(),
pollId,
};
}),
});
}
@ -513,9 +512,8 @@ export const polls = router({
if (ctx.user.id === res.userId || res.adminUrlId === input.adminToken) {
return { ...res, inviteLink };
} else {
return { ...res, adminUrlId: "", inviteLink };
}
return { ...res, adminUrlId: "", inviteLink };
}),
transfer: possiblyPublicProcedure
.input(
@ -876,104 +874,104 @@ export const polls = router({
code: "INTERNAL_SERVER_ERROR",
message: "Failed to generate ics",
});
} else {
const timeZoneAbbrev = poll.timeZone
? getTimeZoneAbbreviation(eventStart.toDate(), poll.timeZone)
: "";
const date = eventStart.format("dddd, MMMM D, YYYY");
const day = eventStart.format("D");
const dow = eventStart.format("ddd");
const startTime = eventStart.format("hh:mm A");
const endTime = eventEnd.format("hh:mm A");
const time =
option.duration > 0
? `${startTime} - ${endTime} ${timeZoneAbbrev}`
: "All-day";
const participantsToEmail: Array<{
name: string;
email: string;
locale: string | undefined;
}> = [];
if (input.notify === "all") {
poll.participants.forEach((p) => {
if (p.email) {
participantsToEmail.push({
name: p.name,
email: p.email,
locale: p.locale ?? undefined,
});
}
});
}
if (input.notify === "attendees") {
attendees.forEach((p) => {
if (p.email) {
participantsToEmail.push({
name: p.name,
email: p.email,
locale: p.locale ?? undefined,
});
}
});
}
ctx.user.getEmailClient().queueTemplate("FinalizeHostEmail", {
to: poll.user.email,
props: {
name: poll.user.name,
pollUrl: absoluteUrl(`/poll/${poll.id}`),
location: poll.location,
title: poll.title,
attendees: poll.participants
.filter((p) =>
p.votes.some(
(v) => v.optionId === input.optionId && v.type !== "no",
),
)
.map((p) => p.name),
date,
day,
dow,
time,
},
attachments: [{ filename: "event.ics", content: event.value }],
});
for (const p of participantsToEmail) {
getEmailClient(p.locale ?? undefined).queueTemplate(
"FinalizeParticipantEmail",
{
to: p.email,
props: {
pollUrl: absoluteUrl(`/invite/${poll.id}`),
title: poll.title,
hostName: poll.user?.name ?? "",
date,
day,
dow,
time,
},
attachments: [{ filename: "event.ics", content: event.value }],
},
);
}
posthog?.capture({
distinctId: ctx.user.id,
event: "finalize poll",
properties: {
poll_id: poll.id,
poll_time_zone: poll.timeZone,
number_of_participants: poll.participants.length,
number_of_attendees: attendees.length,
days_since_created: dayjs().diff(poll.createdAt, "day"),
},
});
}
const timeZoneAbbrev = poll.timeZone
? getTimeZoneAbbreviation(eventStart.toDate(), poll.timeZone)
: "";
const date = eventStart.format("dddd, MMMM D, YYYY");
const day = eventStart.format("D");
const dow = eventStart.format("ddd");
const startTime = eventStart.format("hh:mm A");
const endTime = eventEnd.format("hh:mm A");
const time =
option.duration > 0
? `${startTime} - ${endTime} ${timeZoneAbbrev}`
: "All-day";
const participantsToEmail: Array<{
name: string;
email: string;
locale: string | undefined;
}> = [];
// if (input.notify === "all") {
// poll.participants.forEach((p) => {
// if (p.email) {
// participantsToEmail.push({
// name: p.name,
// email: p.email,
// locale: p.locale ?? undefined,
// });
// }
// });
// }
// if (input.notify === "attendees") {
// attendees.forEach((p) => {
// if (p.email) {
// participantsToEmail.push({
// name: p.name,
// email: p.email,
// locale: p.locale ?? undefined,
// });
// }
// });
// }
ctx.user.getEmailClient().queueTemplate("FinalizeHostEmail", {
to: poll.user.email,
props: {
name: poll.user.name,
pollUrl: absoluteUrl(`/poll/${poll.id}`),
location: poll.location,
title: poll.title,
attendees: poll.participants
.filter((p) =>
p.votes.some(
(v) => v.optionId === input.optionId && v.type !== "no",
),
)
.map((p) => p.name),
date,
day,
dow,
time,
},
attachments: [{ filename: "event.ics", content: event.value }],
});
for (const p of participantsToEmail) {
getEmailClient(p.locale ?? undefined).queueTemplate(
"FinalizeParticipantEmail",
{
to: p.email,
props: {
pollUrl: absoluteUrl(`/invite/${poll.id}`),
title: poll.title,
hostName: poll.user?.name ?? "",
date,
day,
dow,
time,
},
attachments: [{ filename: "event.ics", content: event.value }],
},
);
}
posthog?.capture({
distinctId: ctx.user.id,
event: "finalize poll",
properties: {
poll_id: poll.id,
poll_time_zone: poll.timeZone,
number_of_participants: poll.participants.length,
number_of_attendees: attendees.length,
days_since_created: dayjs().diff(poll.createdAt, "day"),
},
});
}),
reopen: possiblyPublicProcedure
.input(

2
apps/web/src/utils/absolute-url.ts
View file

@ -21,7 +21,7 @@ export function objectToQueryString(obj: Record<string, string>) {
if (obj.hasOwnProperty(key)) {
const value = obj[key];
if (value !== undefined) {
parts.push(encodeURIComponent(key) + "=" + encodeURIComponent(value));
parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
}
}
}

2
apps/web/src/utils/color-hash.ts
View file

@ -26,7 +26,7 @@ const avatarBackgroundColors: RGBColor[] = [
function isBright(color: RGBColor): boolean {
const [r, g, b] = color;
const L = (0.2126 * r) / 255 + (0.7152 * g) / 255 + (0.0722 * b) / 255;
return L > 0.6 ? true : false;
return L > 0.6;
}
export const getRandomAvatarColor = (str: string) => {

3
apps/web/src/utils/dayjs.tsx
View file

@ -224,9 +224,8 @@ export const DayjsProvider: React.FunctionComponent<{
(date: dayjs.ConfigType, localTime = false) => {
if (!localTime) {
return dayjs(date).tz(preferredTimeZone);
} else {
return dayjs(date).utc();
}
return dayjs(date).utc();
},
[preferredTimeZone],
);

2
apps/web/vitest.config.mts
View file

@ -1,4 +1,4 @@
import path from "path";
import path from "node:path";
import { defineConfig } from "vitest/config";
export default defineConfig({

3
packages/billing/src/scripts/normalize-subscription-metadata.ts
View file

@ -25,9 +25,8 @@ async function getSubscriptionsWithMissingMetadata(
subscriptions.data[subscriptions.data.length - 1].id,
)),
];
} else {
return res;
}
return res;
}
async function normalizeSubscriptionMetadata() {