{t("environments.surveys.summary.what_is_a_panel")}
-{t("environments.surveys.summary.what_is_a_pannel_answer")}
+{t("environments.surveys.summary.what_is_a_panel_answer")}
{t("environments.surveys.summary.when_do_i_need_it")}
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate.tsx index 3c65ef968c..0861c1b7b4 100644 --- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate.tsx +++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate.tsx @@ -4,7 +4,7 @@ import { getProjectByEnvironmentId } from "@formbricks/lib/project/service"; import { getSurvey } from "@formbricks/lib/survey/service"; import { getStyling } from "@formbricks/lib/utils/styling"; -export const getEmailTemplateHtml = async (surveyId: string) => { +export const getEmailTemplateHtml = async (surveyId: string, locale: string) => { const survey = await getSurvey(surveyId); if (!survey) { throw new Error("Survey not found"); @@ -16,7 +16,7 @@ export const getEmailTemplateHtml = async (surveyId: string) => { const styling = getStyling(project, survey); const surveyUrl = WEBAPP_URL + "/s/" + survey.id; - const html = await getPreviewEmailTemplateHtml(survey, surveyUrl, styling); + const html = await getPreviewEmailTemplateHtml(survey, surveyUrl, styling, locale); const doctype = ''; const htmlCleaned = html.toString().replace(doctype, ""); diff --git a/apps/web/app/(auth)/auth/login/page.tsx b/apps/web/app/(auth)/auth/login/page.tsx index 3ef2005e4b..d676c3e07b 100644 --- a/apps/web/app/(auth)/auth/login/page.tsx +++ b/apps/web/app/(auth)/auth/login/page.tsx @@ -1,3 +1,4 @@ -import { LoginPage } from "@/modules/auth/login/page"; +import { LoginPage, metadata } from "@/modules/auth/login/page"; +export { metadata }; export default LoginPage; diff --git a/apps/web/app/(auth)/invite/page.tsx b/apps/web/app/(auth)/invite/page.tsx index a480cba9d3..485b8f90b5 100644 --- a/apps/web/app/(auth)/invite/page.tsx +++ b/apps/web/app/(auth)/invite/page.tsx @@ -1,133 +1,3 @@ -import { authOptions } from "@/modules/auth/lib/authOptions"; -import { sendInviteAcceptedEmail } from "@/modules/email"; -import { createTeamMembership } from "@/modules/invite/lib/team"; -import { Button } from "@/modules/ui/components/button"; -import { getServerSession } from "next-auth"; -import { getTranslations } from "next-intl/server"; -import Link from "next/link"; -import { after } from "next/server"; -import { DEFAULT_LOCALE, WEBAPP_URL } from "@formbricks/lib/constants"; -import { deleteInvite, getInvite } from "@formbricks/lib/invite/service"; -import { verifyInviteToken } from "@formbricks/lib/jwt"; -import { createMembership } from "@formbricks/lib/membership/service"; -import { getUser, updateUser } from "@formbricks/lib/user/service"; -import { ContentLayout } from "./components/ContentLayout"; +import { InvitePage } from "@/modules/auth/invite/page"; -const Page = async (props) => { - const searchParams = await props.searchParams; - const t = await getTranslations(); - const session = await getServerSession(authOptions); - const user = session?.user.id ? await getUser(session.user.id) : null; - - try { - const { inviteId, email } = verifyInviteToken(searchParams.token); - - const invite = await getInvite(inviteId); - - if (!invite) { - return ( -{t.rich(text, { b: (chunks) => {chunks} })}
; -}; - -const Page = async () => { - const t = await getTranslations(); - return ( -{t("setup.intro.made_with_love_in_kiel")}
-{t("setup.signup.this_user_has_all_the_power")}
-{t("auth.verify.verifying")}
-{t("auth.verify.no_token_provided")}
diff --git a/apps/web/modules/ee/billing/components/pricing-table.tsx b/apps/web/modules/ee/billing/components/pricing-table.tsx index 748a4cfb52..3e2eac2b6a 100644 --- a/apps/web/modules/ee/billing/components/pricing-table.tsx +++ b/apps/web/modules/ee/billing/components/pricing-table.tsx @@ -102,7 +102,6 @@ export const PricingTable = ({ throw new Error(t("common.something_went_wrong_please_try_again")); } } catch (err) { - console.log({ err }); toast.error(t("environments.settings.billing.unable_to_upgrade_plan")); } }; diff --git a/apps/web/modules/ee/contacts/actions.ts b/apps/web/modules/ee/contacts/actions.ts index d6e7322aad..2ff6d85d0c 100644 --- a/apps/web/modules/ee/contacts/actions.ts +++ b/apps/web/modules/ee/contacts/actions.ts @@ -45,12 +45,12 @@ export const getContactsAction = authenticatedActionClient return getContacts(parsedInput.environmentId, parsedInput.offset, parsedInput.searchValue); }); -const ZPersonDeleteAction = z.object({ +const ZContactDeleteAction = z.object({ contactId: ZId, }); export const deleteContactAction = authenticatedActionClient - .schema(ZPersonDeleteAction) + .schema(ZContactDeleteAction) .action(async ({ ctx, parsedInput }) => { const organizationId = await getOrganizationIdFromContactId(parsedInput.contactId); const projectId = await getProjectIdFromContactId(parsedInput.contactId); diff --git a/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/lib/contact.ts b/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/lib/contact.ts index 70a9c46384..324a73701b 100644 --- a/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/lib/contact.ts +++ b/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/lib/contact.ts @@ -35,7 +35,7 @@ export const getContactByUserIdWithAttributes = reactCache( return contact; }, - [`getContactByUserId-${environmentId}-${userId}-${JSON.stringify(updatedAttributes)}`], + [`getContactByUserIdWithAttributes-${environmentId}-${userId}-${JSON.stringify(updatedAttributes)}`], { tags: [ contactCache.tag.byEnvironmentIdAndUserId(environmentId, userId), diff --git a/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/route.ts b/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/route.ts index b526dfd89b..a71891c8d3 100644 --- a/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/route.ts +++ b/apps/web/modules/ee/contacts/api/client/[environmentId]/contacts/[userId]/attributes/route.ts @@ -1,10 +1,10 @@ import { responses } from "@/app/lib/api/response"; import { transformErrorToDetails } from "@/app/lib/api/validator"; +import { updateAttributes } from "@/modules/ee/contacts/lib/attributes"; import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils"; import { NextRequest } from "next/server"; import { ResourceNotFoundError } from "@formbricks/types/errors"; import { ZJsContactsUpdateAttributeInput } from "@formbricks/types/js"; -import { updateAttributes } from "./lib/attributes"; import { getContactByUserIdWithAttributes } from "./lib/contact"; export const OPTIONS = async () => { @@ -74,36 +74,15 @@ export const PUT = async ( ); } - const { details: updateAttrDetails } = await updateAttributes( - contact.id, - userId, - environmentId, - updatedAttributes - ); - - // if userIdAttr or idAttr was in the payload, we need to inform the user that it was ignored - const details: Record{t.rich(text, { b: (chunks) => {chunks} })}
; +}; + +export const IntroPage = async () => { + const t = await getTranslations(); + return ( +{t("setup.intro.made_with_love_in_kiel")}
+{t("setup.signup.this_user_has_all_the_power")}
+