IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix after merge

Browse Source
This commit is contained in:
Timofey Boyko 2024-02-20 12:58:40 +03:00
parent aa772acb03
commit ac47e07815
8 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
View File

@ -150,7 +150,7 @@ const PortalIntegration = (props) => {
<CSP t={t} /> <CSP t={t} />
</CategoryDescription> </CategoryDescription>
<CategoryHeader>{t("CreateSampleHeader")}</CategoryHeader> <CategoryHeader>{t("CreateSampleHeader")}</CategoryHeader>
<Text lineHeight="20px" color={theme.sdkPresets.secondaryColor}> <Text lineHeight="20px" color={theme.sdkPresets?.secondaryColor}>
{t("InitializeSDK")} {t("InitializeSDK")}
</Text> </Text>
<PresetsContainer> <PresetsContainer>

2
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/StyledPresets.js
View File

@ -139,7 +139,7 @@ export const Frame = styled(Box)`
position: relative; position: relative;
border-radius: 6px; border-radius: 6px;
border: 1px solid ${(props) => props.theme.sdkPresets.borderColor}; border: 1px solid ${(props) => props.theme.sdkPresets?.borderColor};
width: calc(${(props) => (props.width ? props.width : "100%")} + 2px); width: calc(${(props) => (props.width ? props.width : "100%")} + 2px);
height: calc(${(props) => (props.height ? props.height : "400px")} + 2px); height: calc(${(props) => (props.height ? props.height : "400px")} + 2px);

2
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/csp.js
View File

@ -24,7 +24,7 @@ const Container = styled.div`
&.description-holder { &.description-holder {
display: block; display: block;
color: ${(props) => props.theme.sdkPresets.secondaryColor}; color: ${(props) => props.theme.sdkPresets?.secondaryColor};
} }
&.description-holder > div { &.description-holder > div {

4
packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/OAuthSectionHeader/index.tsx
View File

@ -1,9 +1,7 @@
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
// @ts-ignore import Headline from "@docspace/shared/components/headline/Headline";
import Headline from "@docspace/common/components/Headline";
import { IconButton } from "@docspace/shared/components/icon-button"; import { IconButton } from "@docspace/shared/components/icon-button";
import ArrowPathReactSvgUrl from "PUBLIC_DIR/images/arrow.path.react.svg?url"; import ArrowPathReactSvgUrl from "PUBLIC_DIR/images/arrow.path.react.svg?url";

12
packages/client/src/routes/portalSettings.js
View File

@ -90,9 +90,15 @@ const ThirdParty = loadable(() =>
"../pages/PortalSettings/categories/integration/ThirdPartyServicesSettings" "../pages/PortalSettings/categories/integration/ThirdPartyServicesSettings"
) )
); );
const OAuthCreatePage = loadable(() =>
const DocumentService = loadable(() => import(
import("../pages/PortalSettings/categories/integration/DocumentService") "../pages/PortalSettings/categories/developer-tools/OAuth/OAuthCreatePage"
)
);
const OAuthEditPage = loadable(() =>
import(
"../pages/PortalSettings/categories/developer-tools/OAuth/OAuthEditPage"
)
); );
const SingleSignOn = loadable(() => const SingleSignOn = loadable(() =>

4
packages/runtime.json
View File

@ -1,7 +1,7 @@
{ {
"date": "202429_151253", "date": "2024220_125512",
"checksums": { "checksums": {
"api.js": "cdccad9c117fa172ed7ea7f392a6c702", "api.js": "de6605ba5a347753a047d31d2b3daca6",
"api.poly.js": "586ce6831fa68f6bc33486e2cebc856e", "api.poly.js": "586ce6831fa68f6bc33486e2cebc856e",
"browserDetector.js": "9e853f32d806dd83652ccc2d67510a84", "browserDetector.js": "9e853f32d806dd83652ccc2d67510a84",
"config.json": "3f54595a6ea8207c37f1197069a2db86" "config.json": "3f54595a6ea8207c37f1197069a2db86"

3
packages/shared/themes/base.ts
View File

@ -3230,12 +3230,11 @@ export const getBaseTheme = () => {
headerBorder: "1px solid #d0d5da", headerBorder: "1px solid #d0d5da",
scopeDesc: "#a3a9ae", scopeDesc: "#a3a9ae",
}, },
},
sdkPresets: { sdkPresets: {
borderColor: "#d0d5da", borderColor: "#d0d5da",
secondaryColor: "#657077", secondaryColor: "#657077",
}, },
},
}; };
}; };

2
packages/shared/themes/dark.ts
View File

@ -3207,11 +3207,11 @@ const Dark: TTheme = {
headerBorder: "1px solid #474747", headerBorder: "1px solid #474747",
scopeDesc: "#858585", scopeDesc: "#858585",
}, },
},
sdkPresets: { sdkPresets: {
borderColor: "#474747", borderColor: "#474747",
secondaryColor: "#ADADAD", secondaryColor: "#ADADAD",
}, },
},
}; };
export default Dark; export default Dark;