From 9375f337d704faf1e808d51fcba3a95625a8e582 Mon Sep 17 00:00:00 2001
From: Bailey Pumfleet <pumfleet@hey.com>
Date: Mon, 19 Jul 2021 16:56:58 +0100
Subject: [PATCH 1/2] Fix Codacy issues

---
 components/DonateBanner.tsx        |  4 ++--
 components/ui/Text/Text.module.css |  3 ---
 next.config.js                     |  2 +-
 pages/auth/logout.tsx              |  4 ++--
 pages/availability/index.tsx       |  6 +++---
 pages/integrations/index.tsx       | 10 +++++-----
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/components/DonateBanner.tsx b/components/DonateBanner.tsx
index db3835c1..03a932c9 100644
--- a/components/DonateBanner.tsx
+++ b/components/DonateBanner.tsx
@@ -3,7 +3,7 @@ export default function DonateBanner() {
 
 if (location.hostname.endsWith(".calendso.com")) {
 return null;
-}  
+}
 
   return (
     <>
@@ -21,7 +21,7 @@ return null;
                     Support the ongoing development
                   </span>
                   <span className="hidden md:inline">
-                    You're using the free self-hosted version. Support the
+                    You&apos;re using the free self-hosted version. Support the
                     ongoing development by making a donation.
                   </span>
                 </p>
diff --git a/components/ui/Text/Text.module.css b/components/ui/Text/Text.module.css
index 0afe4759..c850000e 100644
--- a/components/ui/Text/Text.module.css
+++ b/components/ui/Text/Text.module.css
@@ -2,9 +2,6 @@
   @apply font-medium;
 } */
 
-.text {
-}
-
 .text--body {
   @apply text-lg leading-relaxed;
 }
diff --git a/next.config.js b/next.config.js
index ab513115..56369deb 100644
--- a/next.config.js
+++ b/next.config.js
@@ -20,7 +20,7 @@ const validJson = (jsonString) => {
             return o;
         }
     }
-    catch (e) {}
+    catch (e) { console.error(e); }
     return false;
 }
 
diff --git a/pages/auth/logout.tsx b/pages/auth/logout.tsx
index fe1aaf78..86f8b0da 100644
--- a/pages/auth/logout.tsx
+++ b/pages/auth/logout.tsx
@@ -18,7 +18,7 @@ export default function Logout() {
                         </div>
                         <div className="mt-3 text-center sm:mt-5">
                             <h3 className="text-lg leading-6 font-medium text-gray-900" id="modal-title">
-                                You've been logged out
+                                You&apos;ve been logged out
                             </h3>
                             <div className="mt-2">
                                 <p className="text-sm text-gray-500">
@@ -38,4 +38,4 @@ export default function Logout() {
             </div>
         </div>
     );
-}
\ No newline at end of file
+}
diff --git a/pages/availability/index.tsx b/pages/availability/index.tsx
index 0a8ad471..7a7824db 100644
--- a/pages/availability/index.tsx
+++ b/pages/availability/index.tsx
@@ -142,7 +142,7 @@ export default function Availability(props) {
                                     </thead>
                                     <tbody className="bg-white divide-y divide-gray-200">
                                         {props.types.map((eventType) =>
-                                            <tr>
+                                            <tr key={eventType.id}>
                                                 <td className="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900 align-top">
                                                     {eventType.title}
                                                     {eventType.hidden &&
@@ -192,7 +192,7 @@ export default function Availability(props) {
                   <div className="w-1/2 ml-2 bg-white shadow rounded-lg">
                     <div className="px-4 py-5 sm:p-6">
                       <h3 className="text-lg leading-6 font-medium text-gray-900">
-                        Something doesn't look right?
+                        Something doesn&apos;t look right?
                       </h3>
                       <div className="mt-2 max-w-xl text-sm text-gray-500">
                         <p>
@@ -289,7 +289,7 @@ export default function Availability(props) {
                                                 <label htmlFor="ishidden" className="font-medium text-gray-700">
                                                     Hide this event type
                                                 </label>
-                                                <p className="text-gray-500">Hide the event type from your page, so it can only be booked through it's URL.</p>
+                                                <p className="text-gray-500">Hide the event type from your page, so it can only be booked through it&apos;s URL.</p>
                                             </div>
                                         </div>
                                     </div>
diff --git a/pages/integrations/index.tsx b/pages/integrations/index.tsx
index 7ddb3c41..25ff03e8 100644
--- a/pages/integrations/index.tsx
+++ b/pages/integrations/index.tsx
@@ -94,7 +94,7 @@ export default function Home({ integrations }) {
                 </div>
                 <div className="bg-white shadow overflow-hidden rounded-lg mb-8">
                     {integrations.filter( (ig) => ig.credential ).length !== 0 ? <ul className="divide-y divide-gray-200">
-                        {integrations.filter(ig => ig.credential).map( (ig) => (<li>
+                        {integrations.filter(ig => ig.credential).map( (ig) => (<li key={ig.id}>
                             <Link href={"/integrations/" + ig.credential.id}>
                                 <a className="block hover:bg-gray-50">
                                     <div className="flex items-center px-4 py-4 sm:px-6">
@@ -138,7 +138,7 @@ export default function Home({ integrations }) {
                             </div>
                             <div className="py-5 sm:p-6">
                                 <h3 className="text-lg leading-6 font-medium text-gray-900">
-                                     You don't have any integrations added.
+                                     You don&apos;t have any integrations added.
                                 </h3>
                                 <div className="mt-2 text-sm text-gray-500">
                                     <p>
@@ -196,7 +196,7 @@ export default function Home({ integrations }) {
                             </div>
                             <div className="my-4">
                                 <ul className="divide-y divide-gray-200">
-                                    {integrations.filter( (integration) => integration.installed ).map( (integration) => (<li className="flex py-4">
+                                    {integrations.filter( (integration) => integration.installed ).map( (integration) => (<li key={integration.type} className="flex py-4">
                                         <div className="w-1/12 mr-4 pt-2">
                                             <img className="h-8 w-8 mr-2" src={integration.imageSrc} alt={integration.title} />
                                         </div>
@@ -279,7 +279,7 @@ export default function Home({ integrations }) {
                             </div>
                             <div className="my-4">
                                 <ul className="divide-y divide-gray-200">
-                                    {selectableCalendars.map( (calendar) => (<li className="flex py-4">
+                                    {selectableCalendars.map( (calendar) => (<li key={calendar.name} className="flex py-4">
                                         <div className="w-1/12 mr-4 pt-2">
                                             <img className="h-8 w-8 mr-2" src={getCalendarIntegrationImage(calendar.integration)} alt={calendar.integration} />
                                         </div>
@@ -329,7 +329,7 @@ const validJson = (jsonString: string) => {
             return o;
         }
     }
-    catch (e) {}
+    catch (e) { console.error(e); }
     return false;
 }
 

From 7098e75841a15c86ed8c687bab298ebaa33cae43 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Tue, 20 Jul 2021 13:27:36 +0000
Subject: [PATCH 2/2] Fixes 404 issue with slug when trailing whitespaces exist

---
 pages/api/availability/eventtype.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/api/availability/eventtype.ts b/pages/api/availability/eventtype.ts
index 10d3a2f6..5ceb333d 100644
--- a/pages/api/availability/eventtype.ts
+++ b/pages/api/availability/eventtype.ts
@@ -12,7 +12,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   if (req.method == "PATCH" || req.method == "POST") {
     const data = {
       title: req.body.title,
-      slug: req.body.slug,
+      slug: req.body.slug.trim(),
       description: req.body.description,
       length: parseInt(req.body.length),
       hidden: req.body.hidden,