From 33bc642d0dd4dc59020f73afef7d572fb47483c3 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 23 May 2024 19:20:26 +0300 Subject: [PATCH] Fix errors after merge develop --- .../sub-components/EmptyScreen.tsx | 4 ++-- packages/client/src/routes/portalSettings.js | 18 ++++++++++++++++++ packages/runtime.json | 10 +++++----- packages/shared/components/tag/Tag.styled.ts | 1 + ...n_userfields.svg => empty_screen_oauth.svg} | 0 5 files changed, 26 insertions(+), 7 deletions(-) rename public/images/{empty_screen_userfields.svg => empty_screen_oauth.svg} (100%) diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/EmptyScreen.tsx b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/EmptyScreen.tsx index 811a202cce..3537bc00c8 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/EmptyScreen.tsx +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/EmptyScreen.tsx @@ -1,13 +1,13 @@ import { EmptyScreenContainer } from "@docspace/shared/components/empty-screen-container"; import { TTranslation } from "@docspace/shared/types"; -import EmptyScreenPersonsSvgUrl from "PUBLIC_DIR/images/empty_screen_userfields.svg?url"; +import EmptyScreenPersonsSvgUrl from "PUBLIC_DIR/images/empty_screen_oauth.svg?url"; const EmptyScreen = ({ t }: { t: TTranslation }) => { return ( diff --git a/packages/client/src/routes/portalSettings.js b/packages/client/src/routes/portalSettings.js index fc1de0bcbc..bc2c349f29 100644 --- a/packages/client/src/routes/portalSettings.js +++ b/packages/client/src/routes/portalSettings.js @@ -354,6 +354,24 @@ const Viewer = loadable(() => ), ); +const OAuthCreatePage = loadable(() => + componentLoader( + () => + import( + "../pages/PortalSettings/categories/developer-tools/OAuth/OAuthCreatePage" + ), + ), +); + +const OAuthEditPage = loadable(() => + componentLoader( + () => + import( + "../pages/PortalSettings/categories/developer-tools/OAuth/OAuthEditPage" + ), + ), +); + const PortalSettingsRoutes = { path: "portal-settings/", element: ( diff --git a/packages/runtime.json b/packages/runtime.json index 0117704532..899cbfc3ea 100644 --- a/packages/runtime.json +++ b/packages/runtime.json @@ -1,9 +1,9 @@ { - "date": "2024220_125512", + "date": "2024523_191527", "checksums": { - "api.js": "de6605ba5a347753a047d31d2b3daca6", - "api.poly.js": "586ce6831fa68f6bc33486e2cebc856e", - "browserDetector.js": "9e853f32d806dd83652ccc2d67510a84", - "config.json": "3f54595a6ea8207c37f1197069a2db86" + "api.js": "0efbae3383bf6c6b6f26d573eee164d2", + "api.poly.js": "2a2ac2c0e4a7007b61d2d1ff7b00a22e", + "browserDetector.js": "d9387cce805699498e798230a8639c8a", + "config.json": "f68319a04078162e4145c36f4133f19d" } } \ No newline at end of file diff --git a/packages/shared/components/tag/Tag.styled.ts b/packages/shared/components/tag/Tag.styled.ts index 4b4a49a664..ef7f049dea 100644 --- a/packages/shared/components/tag/Tag.styled.ts +++ b/packages/shared/components/tag/Tag.styled.ts @@ -24,6 +24,7 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode +import { ReactSVG } from "react-svg"; import styled, { css } from "styled-components"; import { Text } from "../text"; diff --git a/public/images/empty_screen_userfields.svg b/public/images/empty_screen_oauth.svg similarity index 100% rename from public/images/empty_screen_userfields.svg rename to public/images/empty_screen_oauth.svg