From 33530ad8c85fdf143e1ece82b2e7e594c07aee1f Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Mon, 2 Jan 2023 20:24:35 +0530 Subject: [PATCH] Make cal.com version available on all pages, even on login page. (#6221) * Make cal.com version available on all pages, even on login page. * Extract out calcom version as a utility * added version to login screen * added ee and ce to version * fixed lint * Fix import * removed version info component Co-authored-by: Peer Richelsen Co-authored-by: Peer Richelsen --- apps/web/components/ui/AuthContainer.tsx | 10 ++++++++-- apps/web/pages/_app.tsx | 6 +++++- packages/lib/constants.ts | 7 +++++++ packages/lib/tsconfig.json | 3 ++- packages/ui/v2/core/Shell.tsx | 25 +++++------------------- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/apps/web/components/ui/AuthContainer.tsx b/apps/web/components/ui/AuthContainer.tsx index b3e257efd5..241f77946a 100644 --- a/apps/web/components/ui/AuthContainer.tsx +++ b/apps/web/components/ui/AuthContainer.tsx @@ -1,7 +1,7 @@ import classNames from "classnames"; import React from "react"; -import { APP_NAME, LOGO } from "@calcom/lib/constants"; +import { APP_NAME, LOGO, COMPANY_NAME, CalComVersion } from "@calcom/lib/constants"; import Loader from "@components/Loader"; import { HeadSeo } from "@components/seo/head-seo"; @@ -23,6 +23,7 @@ export default function AuthContainer(props: React.PropsWithChildren) { // eslint-disable-next-line @next/next/no-img-element {`${APP_NAME} )} +
{props.heading &&

{props.heading}

}
@@ -35,7 +36,12 @@ export default function AuthContainer(props: React.PropsWithChildren) {
{props.children}
-
{props.footerText}
+
+ {props.footerText} + + © {new Date().getFullYear()} {COMPANY_NAME} {CalComVersion} + +
); diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx index d1dbe671ca..07ef01a5b5 100644 --- a/apps/web/pages/_app.tsx +++ b/apps/web/pages/_app.tsx @@ -5,6 +5,7 @@ import superjson from "superjson"; import "@calcom/embed-core/src/embed-iframe"; import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired"; +import { CalComVersion } from "@calcom/lib/constants"; import { httpBatchLink } from "@calcom/trpc/client/links/httpBatchLink"; import { httpLink } from "@calcom/trpc/client/links/httpLink"; import { loggerLink } from "@calcom/trpc/client/links/loggerLink"; @@ -32,7 +33,6 @@ function MyApp(props: AppProps) { } // Use the layout defined at the page level, if available const getLayout = Component.getLayout ?? ((page) => page); - return ( @@ -44,6 +44,10 @@ function MyApp(props: AppProps) { +