maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:calendso/calendso

This commit is contained in:
Peer Richelsen 2021-09-24 11:38:18 +01:00
parent f5a7ed2e36 2b2fde179a
commit 521bb4069a
15 changed files with 75 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/app-providers.tsx
View File

@ -1,18 +1,26 @@
import { Provider } from "next-auth/client";
import React from "react";
import { QueryClient, QueryClientProvider } from "react-query";
import { HydrateProps, QueryClient, QueryClientProvider } from "react-query";
import { Hydrate } from "react-query/hydration";
import { Session } from "@lib/auth";
import { createTelemetryClient, TelemetryProvider } from "@lib/telemetry";
export const queryClient = new QueryClient();
const AppProviders: React.FC = (props, pageProps) => {
type AppProviderProps = {
pageProps: {
session?: Session;
dehydratedState?: HydrateProps;
};
};
const AppProviders: React.FC<AppProviderProps> = ({ pageProps, children }) => {
return (
<TelemetryProvider value={createTelemetryClient()}>
<QueryClientProvider client={queryClient}>
<Hydrate state={pageProps.dehydratedState}>
<Provider session={pageProps.session}>{props.children}</Provider>
<Provider session={pageProps.session}>{children}</Provider>
</Hydrate>
</QueryClientProvider>
</TelemetryProvider>

19
pages/[user].tsx
View File

@ -92,16 +92,23 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
const eventTypesWithHidden = await prisma.eventType.findMany({
where: {
OR: [
AND: [
{
userId: user.id,
teamId: null,
},
{
users: {
some: {
id: user.id,
OR: [
{
userId: user.id,
},
},
{
users: {
some: {
id: user.id,
},
},
},
],
},
],
},

2
pages/_app.tsx
View File

@ -15,7 +15,7 @@ export type AppProps = NextAppProps & {
function MyApp({ Component, pageProps, err }: AppProps) {
return (
<AppProviders>
<AppProviders pageProps={pageProps}>
<DefaultSeo {...seoConfig.defaultNextSeo} />
<Component {...pageProps} err={err} />
</AppProviders>

29
pages/api/availability/[user].ts
View File

@ -6,6 +6,8 @@ import { asStringOrNull } from "@lib/asStringOrNull";
import { getBusyCalendarTimes } from "@lib/calendarClient";
import prisma from "@lib/prisma";
import { Prisma } from ".prisma/client";
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
const user = asStringOrNull(req.query.user);
const dateFrom = dayjs(asStringOrNull(req.query.dateFrom));
@ -32,19 +34,24 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
},
});
const eventType = await prisma.eventType.findUnique({
where: { id: eventTypeId },
select: {
timeZone: true,
availability: {
select: {
startTime: true,
endTime: true,
days: true,
const getEventType = (id: number) =>
prisma.eventType.findUnique({
where: { id },
select: {
timeZone: true,
availability: {
select: {
startTime: true,
endTime: true,
days: true,
},
},
},
},
});
});
type EventType = Prisma.PromiseReturnType<typeof getEventType>;
let eventType: EventType | null = null;
if (eventTypeId) eventType = await getEventType(eventTypeId);
if (!rawUser) throw new Error("No user found");

2
pages/availability/index.tsx
View File

@ -339,6 +339,6 @@ export async function getServerSideProps(context) {
},
});
return {
props: { user, types }, // will be passed to the page component as props
props: { session, user, types },
};
}

19
pages/availability/troubleshoot.tsx
View File

@ -1,24 +1,23 @@
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { GetServerSideProps } from "next";
import { GetServerSidePropsContext } from "next";
import { useEffect, useState } from "react";
import { getSession } from "@lib/auth";
import prisma from "@lib/prisma";
import { inferSSRProps } from "@lib/types/inferSSRProps";
import Loader from "@components/Loader";
import Shell from "@components/Shell";
dayjs.extend(utc);
export default function Troubleshoot({ user }) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export default function Troubleshoot({ user }: inferSSRProps<typeof getServerSideProps>) {
const [loading, setLoading] = useState(true);
const [availability, setAvailability] = useState([]);
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [selectedDate, setSelectedDate] = useState(dayjs());
const [selectedDate] = useState(dayjs());
function convertMinsToHrsMins(mins) {
function convertMinsToHrsMins(mins: number) {
let h = Math.floor(mins / 60);
let m = mins % 60;
h = h < 10 ? "0" + h : h;
@ -97,9 +96,9 @@ export default function Troubleshoot({ user }) {
);
}
export const getServerSideProps: GetServerSideProps = async (context) => {
export const getServerSideProps = async (context: GetServerSidePropsContext) => {
const session = await getSession(context);
if (!session) {
if (!session?.user?.id) {
return { redirect: { permanent: false, destination: "/auth/login" } };
}
@ -114,7 +113,9 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
},
});
if (!user) return { redirect: { permanent: false, destination: "/auth/login" } };
return {
props: { user },
props: { session, user },
};
};

2
pages/bookings/index.tsx
View File

@ -346,5 +346,5 @@ export async function getServerSideProps(context) {
return { ...booking, startTime: booking.startTime.toISOString(), endTime: booking.endTime.toISOString() };
});
return { props: { bookings } };
return { props: { session, bookings } };
}

1
pages/event-types/[type].tsx
View File

@ -1350,6 +1350,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
return {
props: {
session,
localeProp: locale,
eventType: eventTypeObject,
locationOptions,

3
pages/event-types/index.tsx
View File

@ -475,7 +475,7 @@ const CreateNewEventDialog = ({
<div className="mt-1">
<div className="flex rounded-sm shadow-sm">
<span className="inline-flex items-center px-3 text-gray-500 border border-r-0 border-gray-300 rounded-l-md bg-gray-50 sm:text-sm">
{location.hostname}/{router.query.eventPage || profiles[0].slug}/
{process.env.NEXT_PUBLIC_APP_URL}/{router.query.eventPage || profiles[0].slug}/
</span>
<input
ref={slugRef}
@ -723,6 +723,7 @@ export async function getServerSideProps(context) {
return {
props: {
session,
localeProp: locale,
canAddEvents,
user: userObj,

2
pages/integrations/[integration].tsx
View File

@ -98,6 +98,6 @@ export async function getServerSideProps(context) {
},
});
return {
props: { integration }, // will be passed to the page component as props
props: { session, integration },
};
}

2
pages/integrations/index.tsx
View File

@ -495,6 +495,6 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
const integrations = getIntegrations(credentials);
return {
props: { integrations },
props: { session, integrations },
};
}

2
pages/settings/billing.tsx
View File

@ -44,6 +44,6 @@ export async function getServerSideProps(context) {
});
return {
props: { user }, // will be passed to the page component as props
props: { session, user },
};
}

34
pages/settings/embed.tsx
View File

@ -1,20 +1,24 @@
import { GetServerSidePropsContext } from "next";
import { useSession } from "next-auth/client";
import { getSession } from "@lib/auth";
import prisma from "@lib/prisma";
import { inferSSRProps } from "@lib/types/inferSSRProps";
import Loader from "@components/Loader";
import SettingsShell from "@components/Settings";
import Shell from "@components/Shell";
export default function Embed(props) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [session, loading] = useSession();
export default function Embed(props: inferSSRProps<typeof getServerSideProps>) {
const [, loading] = useSession();
if (loading) {
return <Loader />;
}
const iframeTemplate = `<iframe src="${process.env.NEXT_PUBLIC_APP_URL}/${props.user?.username}" frameborder="0" allowfullscreen></iframe>`;
const htmlTemplate = `<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Schedule a meeting</title><style>body {margin: 0;}iframe {height: calc(100vh - 4px);width: calc(100vw - 4px);box-sizing: border-box;}</style></head><body>${iframeTemplate}</body></html>`;
return (
<Shell heading="Embed" subtitle="Integrate with your website using our embed options.">
<SettingsShell>
@ -33,13 +37,7 @@ export default function Embed(props) {
id="iframe"
className="h-32 shadow-sm focus:ring-black focus:border-black block w-full sm:text-sm border-gray-300 rounded-sm"
placeholder="Loading..."
defaultValue={
'<iframe src="' +
props.BASE_URL +
"/" +
session.user.username +
'" frameborder="0" allowfullscreen></iframe>'
}
defaultValue={iframeTemplate}
readOnly
/>
</div>
@ -53,13 +51,7 @@ export default function Embed(props) {
id="fullscreen"
className="h-32 shadow-sm focus:ring-black focus:border-black block w-full sm:text-sm border-gray-300 rounded-sm"
placeholder="Loading..."
defaultValue={
'<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Schedule a meeting</title><style>body {margin: 0;}iframe {height: calc(100vh - 4px);width: calc(100vw - 4px);box-sizing: border-box;}</style></head><body><iframe src="' +
props.BASE_URL +
"/" +
session.user.username +
'" frameborder="0" allowfullscreen></iframe></body></html>'
}
defaultValue={htmlTemplate}
readOnly
/>
</div>
@ -80,9 +72,9 @@ export default function Embed(props) {
);
}
export async function getServerSideProps(context) {
export async function getServerSideProps(context: GetServerSidePropsContext) {
const session = await getSession(context);
if (!session) {
if (!session?.user?.email) {
return { redirect: { permanent: false, destination: "/auth/login" } };
}
@ -102,9 +94,7 @@ export async function getServerSideProps(context) {
},
});
const BASE_URL = process.env.BASE_URL;
return {
props: { user, BASE_URL }, // will be passed to the page component as props
props: { session, user },
};
}

1
pages/settings/profile.tsx
View File

@ -433,6 +433,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
return {
props: {
session,
localeProp: locale,
localeOptions,
localeLabels,

2
pages/settings/security.tsx
View File

@ -46,6 +46,6 @@ export async function getServerSideProps(context) {
});
return {
props: { user }, // will be passed to the page component as props
props: { session, user },
};
}