From 5c67a95028a5396bfaba15225cf59a2b015cb9a2 Mon Sep 17 00:00:00 2001 From: zomars Date: Tue, 22 Feb 2022 13:25:00 -0700 Subject: [PATCH] WIP WIP --- apps/web/lib/apps/utils/AppUtils.ts | 2 +- apps/web/pages/api/integrations/[...args].ts | 3 ++- packages/app-store/_appRegistry.ts | 2 +- packages/app-store/_example/index.ts | 4 ++-- packages/app-store/index.ts | 4 ++-- packages/app-store/{zoomvideo => zoom_video}/api/add.ts | 0 packages/app-store/{zoomvideo => zoom_video}/api/callback.ts | 0 packages/app-store/{zoomvideo => zoom_video}/api/index.ts | 0 packages/app-store/{zoomvideo => zoom_video}/index.ts | 0 .../{zoomvideo => zoom_video}/lib/VideoApiAdapter.ts | 0 packages/app-store/{zoomvideo => zoom_video}/lib/index.ts | 0 packages/app-store/{zoomvideo => zoom_video}/package.json | 0 packages/app-store/{zoomvideo => zoom_video}/static/icon.svg | 0 13 files changed, 8 insertions(+), 7 deletions(-) rename packages/app-store/{zoomvideo => zoom_video}/api/add.ts (100%) rename packages/app-store/{zoomvideo => zoom_video}/api/callback.ts (100%) rename packages/app-store/{zoomvideo => zoom_video}/api/index.ts (100%) rename packages/app-store/{zoomvideo => zoom_video}/index.ts (100%) rename packages/app-store/{zoomvideo => zoom_video}/lib/VideoApiAdapter.ts (100%) rename packages/app-store/{zoomvideo => zoom_video}/lib/index.ts (100%) rename packages/app-store/{zoomvideo => zoom_video}/package.json (100%) rename packages/app-store/{zoomvideo => zoom_video}/static/icon.svg (100%) diff --git a/apps/web/lib/apps/utils/AppUtils.ts b/apps/web/lib/apps/utils/AppUtils.ts index fb368b3b16..140c1ccc0a 100644 --- a/apps/web/lib/apps/utils/AppUtils.ts +++ b/apps/web/lib/apps/utils/AppUtils.ts @@ -9,7 +9,7 @@ import { APPS as ConferencingApps } from "@lib/apps/conferencing/config"; import { APPS as PaymentApps } from "@lib/apps/payment/config"; const ALL_APPS_MAP = { - zoomvideo: appStore.zoomvideo.metadata, + ...Object.values(appStore).map((app) => app.metadata), ...CalendarApps, ...ConferencingApps, ...PaymentApps, diff --git a/apps/web/pages/api/integrations/[...args].ts b/apps/web/pages/api/integrations/[...args].ts index 27acececbc..8edfec1286 100644 --- a/apps/web/pages/api/integrations/[...args].ts +++ b/apps/web/pages/api/integrations/[...args].ts @@ -20,7 +20,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => { return res.status(404).json({ message: `API route not found` }); } - const [appName, apiEndpoint] = args; + const [_appName, apiEndpoint] = args; + const appName = _appName.split("_").join(""); // Transform `zoom_video` to `zoomvideo`; try { // TODO: Find a way to dynamically import these modules diff --git a/packages/app-store/_appRegistry.ts b/packages/app-store/_appRegistry.ts index 9e5ddf912c..a4bc6f9d00 100644 --- a/packages/app-store/_appRegistry.ts +++ b/packages/app-store/_appRegistry.ts @@ -2,7 +2,7 @@ import appStore from "."; export function getAppRegistry() { return [ - appStore.zoomvideo.metadata, + ...Object.values(appStore).map((app) => app.metadata), { name: "Cal Video", slug: "cal-video", diff --git a/packages/app-store/_example/index.ts b/packages/app-store/_example/index.ts index 98904674e7..3a5bd47824 100644 --- a/packages/app-store/_example/index.ts +++ b/packages/app-store/_example/index.ts @@ -7,9 +7,9 @@ export const metadata = { description: _package.description, installed: true, category: "video", - imageSrc: "/cal-com-icon.svg", + imageSrc: "cal-com-icon.svg", label: "Example App", - logo: "/cal-com-icon.svg", + logo: "cal-com-icon.svg", publisher: "Cal.com", rating: 5, reviews: 69, diff --git a/packages/app-store/index.ts b/packages/app-store/index.ts index 5512edd02d..3d0e0b62d4 100644 --- a/packages/app-store/index.ts +++ b/packages/app-store/index.ts @@ -1,9 +1,9 @@ import * as example from "./_example"; -import * as zoomvideo from "./zoomvideo"; +import * as zoom_video from "./zoom_video"; const appStore = { example, - zoomvideo, + zoom_video, }; export default appStore; diff --git a/packages/app-store/zoomvideo/api/add.ts b/packages/app-store/zoom_video/api/add.ts similarity index 100% rename from packages/app-store/zoomvideo/api/add.ts rename to packages/app-store/zoom_video/api/add.ts diff --git a/packages/app-store/zoomvideo/api/callback.ts b/packages/app-store/zoom_video/api/callback.ts similarity index 100% rename from packages/app-store/zoomvideo/api/callback.ts rename to packages/app-store/zoom_video/api/callback.ts diff --git a/packages/app-store/zoomvideo/api/index.ts b/packages/app-store/zoom_video/api/index.ts similarity index 100% rename from packages/app-store/zoomvideo/api/index.ts rename to packages/app-store/zoom_video/api/index.ts diff --git a/packages/app-store/zoomvideo/index.ts b/packages/app-store/zoom_video/index.ts similarity index 100% rename from packages/app-store/zoomvideo/index.ts rename to packages/app-store/zoom_video/index.ts diff --git a/packages/app-store/zoomvideo/lib/VideoApiAdapter.ts b/packages/app-store/zoom_video/lib/VideoApiAdapter.ts similarity index 100% rename from packages/app-store/zoomvideo/lib/VideoApiAdapter.ts rename to packages/app-store/zoom_video/lib/VideoApiAdapter.ts diff --git a/packages/app-store/zoomvideo/lib/index.ts b/packages/app-store/zoom_video/lib/index.ts similarity index 100% rename from packages/app-store/zoomvideo/lib/index.ts rename to packages/app-store/zoom_video/lib/index.ts diff --git a/packages/app-store/zoomvideo/package.json b/packages/app-store/zoom_video/package.json similarity index 100% rename from packages/app-store/zoomvideo/package.json rename to packages/app-store/zoom_video/package.json diff --git a/packages/app-store/zoomvideo/static/icon.svg b/packages/app-store/zoom_video/static/icon.svg similarity index 100% rename from packages/app-store/zoomvideo/static/icon.svg rename to packages/app-store/zoom_video/static/icon.svg