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 2023-10-04 15:03:39 +03:00
parent 8dd604dc53
commit 86bded9492
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/Preview.tsx
View File

@ -64,9 +64,6 @@ const Preview = ({ clientId, redirectURI, scopes }: PreviewProps) => {
</Frame> </Frame>
); );
<<<<<<< HEAD
const codeBlock = "123";
=======
const htmlBlock = `<button id="docspace-button" class="docspace-button"> const htmlBlock = `<button id="docspace-button" class="docspace-button">
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" fill="none" class="injected-svg logo-svg" <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" fill="none" class="injected-svg logo-svg"
data-src="http://192.168.0.15/static/js/../../static/images/logo/leftmenu.svg?hash=c31b569ea8c6322337cd" data-src="http://192.168.0.15/static/js/../../static/images/logo/leftmenu.svg?hash=c31b569ea8c6322337cd"
@ -140,16 +137,10 @@ const Preview = ({ clientId, redirectURI, scopes }: PreviewProps) => {
} }
button.addEventListener('click', openOAuthPage)`; button.addEventListener('click', openOAuthPage)`;
>>>>>>> develop
const code = ( const code = (
<> <>
<CategorySubHeader className="copy-window-code"> <CategorySubHeader className="copy-window-code">
<<<<<<< HEAD
{"Copy window code"}
</CategorySubHeader>
<Textarea value={codeBlock} />
=======
{"Copy HTML code"} {"Copy HTML code"}
</CategorySubHeader> </CategorySubHeader>
<Textarea value={htmlBlock} /> <Textarea value={htmlBlock} />
@ -161,7 +152,6 @@ const Preview = ({ clientId, redirectURI, scopes }: PreviewProps) => {
{"Copy JS code"} {"Copy JS code"}
</CategorySubHeader> </CategorySubHeader>
<Textarea value={scriptCode} /> <Textarea value={scriptCode} />
>>>>>>> develop
</> </>
); );