removed license consent (#5931)
Co-authored-by: alannnc <alannnc@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com>
This commit is contained in:
Peer Richelsen
GitHub
parent
3a67e5617e
commit
9bb83aba7e
|
|
@ -7,14 +7,13 @@
|
|||
# - E-MAIL SETTINGS
|
||||
|
||||
# - LICENSE *************************************************************************************************
|
||||
# Set this value to 'agree' to accept our license:
|
||||
# LICENSE: https://github.com/calendso/calendso/blob/main/LICENSE
|
||||
# https://github.com/calendso/calendso/blob/main/LICENSE
|
||||
#
|
||||
# Summary of terms:
|
||||
# - The codebase has to stay open source, whether it was modified or not
|
||||
# - You can not repackage or sell the codebase
|
||||
# - Acquire a commercial license to remove these terms by visiting: cal.com/sales
|
||||
NEXT_PUBLIC_LICENSE_CONSENT=''
|
||||
#
|
||||
# To enable enterprise-only features, fill your license key in here.
|
||||
# @see https://console.cal.com
|
||||
CALCOM_LICENSE_KEY=
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ You can deploy Cal on [Railway](https://railway.app/) using the button above. Th
|
|||
|
||||
Currently Vercel Pro Plan is required to be able to Deploy this application with Vercel, due to limitations on the number of serverless functions on the free plan.
|
||||
|
||||
[](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fcalcom%2Fcal.com&env=DATABASE_URL,NEXT_PUBLIC_WEBAPP_URL,NEXTAUTH_URL,NEXTAUTH_SECRET,CRON_API_KEY,CALENDSO_ENCRYPTION_KEY,NEXT_PUBLIC_LICENSE_CONSENT&envDescription=See%20all%20available%20env%20vars&envLink=https%3A%2F%2Fgithub.com%2Fcalcom%2Fcal.com%2Fblob%2Fmain%2F.env.example&project-name=cal&repo-name=cal.com&build-command=cd%20../..%20%26%26%20yarn%20build&root-directory=apps%2Fweb%2F)
|
||||
[](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fcalcom%2Fcal.com&env=DATABASE_URL,NEXT_PUBLIC_WEBAPP_URL,NEXTAUTH_URL,NEXTAUTH_SECRET,CRON_API_KEY,CALENDSO_ENCRYPTION_KEY&envDescription=See%20all%20available%20env%20vars&envLink=https%3A%2F%2Fgithub.com%2Fcalcom%2Fcal.com%2Fblob%2Fmain%2F.env.example&project-name=cal&repo-name=cal.com&build-command=cd%20../..%20%26%26%20yarn%20build&root-directory=apps%2Fweb%2F)
|
||||
|
||||
<!-- ROADMAP -->
|
||||
|
||||
|
|
|
|||
5
app.json
5
app.json
|
|
@ -33,11 +33,6 @@
|
|||
"generator": "secret",
|
||||
"required": "true"
|
||||
},
|
||||
"NEXT_PUBLIC_LICENSE_CONSENT": {
|
||||
"description": "License consent",
|
||||
"value": "true",
|
||||
"required": "true"
|
||||
},
|
||||
"CRON_API_KEY": {
|
||||
"description": "ApiKey for cronjobs",
|
||||
"value": ""
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
import { Trans } from "react-i18next";
|
||||
|
||||
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
||||
import { BadgeCheckIcon, ConfirmationDialogContent, Dialog, DialogTrigger, Icon } from "@calcom/ui";
|
||||
|
||||
export default function LicenseBanner() {
|
||||
const { t } = useLocale();
|
||||
/*
|
||||
Set this value to 'agree' to accept our license:
|
||||
LICENSE: https://github.com/calcom/cal.com/blob/main/LICENSE
|
||||
|
||||
Summary of terms:
|
||||
- The codebase has to stay open source, whether it was modified or not
|
||||
- You can not repackage or sell the codebase
|
||||
- Acquire a commercial license to remove these terms by visiting: cal.com/sales
|
||||
NEXT_PUBLIC_LICENSE_CONSENT=''
|
||||
*/
|
||||
if (process.env.NEXT_PUBLIC_LICENSE_CONSENT === "agree" || process.env.NEXT_PUBLIC_IS_E2E) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="fixed inset-x-0 bottom-0 left-0 pb-2 sm:pb-5 md:left-56">
|
||||
<div className="mx-auto max-w-7xl px-2 sm:px-8">
|
||||
<div className="rounded-sm bg-green-600 p-2 shadow-lg sm:p-3">
|
||||
<div className="flex flex-wrap items-center justify-between">
|
||||
<div className="flex w-0 flex-1 items-center">
|
||||
<span className="flex rounded-sm bg-green-800 p-2">
|
||||
<BadgeCheckIcon className="h-6 w-6 text-white" aria-hidden="true" />
|
||||
</span>
|
||||
<p className="ml-3 truncate font-medium text-white">
|
||||
<span className="inline">
|
||||
<Trans i18nKey="accept_our_license" values={{ agree: "agree" }}>
|
||||
Accept our license by changing the .env variable
|
||||
<span className="bg-gray-50 bg-opacity-20 px-1">NEXT_PUBLIC_LICENSE_CONSENT</span> to
|
||||
'agree'.
|
||||
</Trans>
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
<div className="order-3 mt-2 w-full flex-shrink-0 sm:order-2 sm:mt-0 sm:w-auto">
|
||||
<Dialog>
|
||||
<DialogTrigger asChild>
|
||||
<button className="flex w-full items-center justify-center rounded-sm border border-transparent bg-white px-4 py-2 text-sm font-medium text-green-600 hover:bg-green-50">
|
||||
{t("accept_license")}
|
||||
</button>
|
||||
</DialogTrigger>
|
||||
<DialogContent />
|
||||
</Dialog>
|
||||
</div>
|
||||
<div className="order-2 flex-shrink-0 sm:order-3 sm:ml-2">
|
||||
<Dialog>
|
||||
<DialogTrigger asChild>
|
||||
<button className="-mr-1 flex rounded-sm p-2 hover:bg-green-500 focus:outline-none focus:ring-2 focus:ring-white">
|
||||
<span className="sr-only">{t("dismiss")}</span>
|
||||
<Icon.FiX className="h-6 w-6 text-white" aria-hidden="true" />
|
||||
</button>
|
||||
</DialogTrigger>
|
||||
<DialogContent />
|
||||
</Dialog>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
function DialogContent() {
|
||||
return (
|
||||
<ConfirmationDialogContent
|
||||
variety="success"
|
||||
title={t("open_env")}
|
||||
confirmBtnText={t("env_changed")}
|
||||
cancelBtnText={t("cancel")}>
|
||||
<Trans i18nKey="remove_banner_instructions" values={{ agree: "agree" }}>
|
||||
To remove this banner, please open your .env file and change the
|
||||
<span className="bg-green-400 bg-opacity-20 p-[2px] text-green-500">
|
||||
NEXT_PUBLIC_LICENSE_CONSENT
|
||||
</span>
|
||||
variable to 'agreeapos;.
|
||||
</Trans>
|
||||
<h2 className="font-cal mt-8 mb-2 text-black">{t("terms_summary")}:</h2>
|
||||
<ul className="ml-5 list-disc">
|
||||
<li>{t("codebase_has_to_stay_opensource")}</li>
|
||||
<li>{t("cannot_repackage_codebase")}</li>
|
||||
<li>
|
||||
{t("acquire_license")}:{" "}
|
||||
<a className="text-blue-500 underline" href="https://cal.com/sales">
|
||||
cal.com/sales
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</ConfirmationDialogContent>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -96,7 +96,6 @@ export const extendEventData = (
|
|||
ipAddress: "",
|
||||
queryString: "",
|
||||
page_url: pageUrl,
|
||||
licenseConsent: !!process.env.NEXT_PUBLIC_LICENSE_CONSENT,
|
||||
licensekey: process.env.CALCOM_LICENSE_KEY,
|
||||
isTeamBooking:
|
||||
original?.isTeamBooking === undefined
|
||||
|
|
|
|||
|
|
@ -1,15 +1,5 @@
|
|||
declare namespace NodeJS {
|
||||
interface ProcessEnv {
|
||||
/**
|
||||
* Set this value to 'agree' to accept our license:
|
||||
* LICENSE: https://github.com/calendso/calendso/blob/main/LICENSE
|
||||
*
|
||||
* Summary of terms:
|
||||
* - The codebase has to stay open source, whether it was modified or not
|
||||
* - You can not repackage or sell the codebase
|
||||
* - Acquire a commercial license to remove these terms by visiting: cal.com/sales
|
||||
**/
|
||||
readonly NEXT_PUBLIC_LICENSE_CONSENT: "agree" | undefined;
|
||||
/** Needed to enable enterprise-only features */
|
||||
readonly CALCOM_LICENSE_KEY: string | undefined;
|
||||
readonly CALCOM_TELEMETRY_DISABLED: string | undefined;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
"dependsOn": [
|
||||
"^build",
|
||||
"$NEXT_PUBLIC_IS_E2E",
|
||||
"$NEXT_PUBLIC_LICENSE_CONSENT",
|
||||
"$NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE_MONTHLY",
|
||||
"$NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRODUCT_ID",
|
||||
"$NEXT_PUBLIC_STRIPE_TEAM_MONTHLY_PRICE_ID",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user