Merge branch 'v.1.1/i18n' of https://github.com/calendso/calendso into v.1.1/i18n

components/booking/pages/BookingPage.tsx

@@ -318,6 +318,7 @@ const BookingPage = (props: any): JSX.Element => {
                                 id={"custom_" + input.id}
                                 className="focus:ring-black h-4 w-4 text-black border-gray-300 rounded mr-2"
                                 placeholder=""
+                                required={input.required}
                               />
                               <label
                                 htmlFor={"custom_" + input.id}

next.config.js

@@ -2,9 +2,12 @@
 const withTM = require("next-transpile-modules")(["react-timezone-select"]);
 const { i18n } = require("./next-i18next.config");
 
-// TODO: Revisit this later with getStaticProps in App
-if (process.env.NEXTAUTH_URL) {
-  process.env.BASE_URL = process.env.NEXTAUTH_URL.replace("/api/auth", "");
+// So we can test deploy previews preview
+if (process.env.VERCEL_URL && !process.env.BASE_URL) {
+  process.env.BASE_URL = process.env.VERCEL_URL;
+}
+if (process.env.BASE_URL) {
+  process.env.NEXTAUTH_URL = process.env.BASE_URL + "/api/auth";
 }
 
 if (!process.env.EMAIL_FROM) {
@@ -14,9 +17,6 @@ if (!process.env.EMAIL_FROM) {
     "EMAIL_FROM environment variable is not set, this may indicate mailing is currently disabled. Please refer to the .env.example file."
   );
 }
-if (process.env.BASE_URL) {
-  process.env.NEXTAUTH_URL = process.env.BASE_URL + "/api/auth";
-}
 
 const validJson = (jsonString) => {
   try {

pages/settings/profile.tsx

@@ -404,7 +404,6 @@ export default function Settings(props: Props) {
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const session = await getSession(context);
   const locale = await extractLocaleInfo(context.req);
-  console.log("LOCALE", locale);
 
   if (!session?.user?.id) {
     return { redirect: { permanent: false, destination: "/auth/login" } };