diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx index 18aae23ed8..34bf717785 100644 --- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx @@ -58,8 +58,9 @@ const DragBar = (props: IRemixDragBarUi) => { return () => window.removeEventListener('resize', handleResize) }, []) - function stopDrag(e: MouseEvent, data: any) { + function stopDrag(data: any) { setDragState(false) + console.log("drag") if (data.x < props.minWidth) { setDragBarPosX(offset) props.setHideStatus(true) @@ -70,7 +71,6 @@ const DragBar = (props: IRemixDragBarUi) => { setDragBarPosX(offset + props.refObject.current.offsetWidth) }, 300) } - } function startDrag() { diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx index c9517b2b19..06d990e5a2 100644 --- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx @@ -1,4 +1,4 @@ -import React, { useContext, useEffect, useRef, useState } from 'react' +import React, { useEffect, useRef, useState } from 'react' import './style/remix-app.css' import { RemixUIMainPanel } from '@remix-ui/panel' import MatomoDialog from './components/modals/matomo' @@ -8,7 +8,6 @@ import { AppProvider } from './context/provider' import AppDialogs from './components/modals/dialogs' import DialogViewPlugin from './components/modals/dialogViewPlugin' import { AppContext } from './context/context' -import { RemixUiVerticalIconsPanel } from '@remix-ui/vertical-icons-panel' import { IntlProvider } from 'react-intl' interface IRemixAppUi { @@ -83,11 +82,10 @@ const RemixApp = (props: IRemixAppUi) => { -
{props.app.menuicons.render()}
{props.app.sidePanel.render()}
- +
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx index 97513bb050..2638c85ff7 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx @@ -46,7 +46,6 @@ function HomeTabFeaturedPlugins ({plugin}: HomeTabFeaturedPluginsProps) { e.stopPropagation() let nextSlide = 0 if (e.wheelDelta < 0) { - console.log("scroll") nextSlide = carouselRef.current.state.currentSlide + 1; if (Math.abs(carouselRef.current.state.transform) >= carouselRef.current.containerRef.current.scrollWidth - carouselRef.current.state.containerWidth) return carouselRef.current.goToSlide(nextSlide) diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx index 776b20ec55..c9f29f6b22 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx @@ -23,13 +23,13 @@ function HomeTabFile ({plugin}: HomeTabFileProps) { const [state, setState] = useState<{ searchInput: string, showModalDialog: boolean, - modalInfo: { title: string, loadItem: string, examples: Array }, + modalInfo: { title: string, loadItem: string, examples: Array, prefix?: string }, importSource: string, toasterMsg: string }>({ searchInput: '', showModalDialog: false, - modalInfo: { title: '', loadItem: '', examples: [] }, + modalInfo: { title: '', loadItem: '', examples: [], prefix: '' }, importSource: '', toasterMsg: '' }) @@ -42,8 +42,15 @@ function HomeTabFile ({plugin}: HomeTabFileProps) { _paq.push(['trackEvent', 'hometab', 'filesSection', 'importFrom' + type]) const contentImport = plugin.contentImport const workspace = plugin.fileManager.getProvider('workspace') + const startsWith = state.importSource.substring(0, 4) + + if ((type === 'ipfs' || type === 'IPFS') && (startsWith !== 'ipfs' && startsWith !== "IPFS")) { + setState(prevState => { + return { ...prevState, importSource: startsWith + state.importSource} + }) + } contentImport.import( - state.importSource, + state.modalInfo.prefix + state.importSource, (loadingMsg) => dispatch({ tooltip: loadingMsg }), async (error, content, cleanUrl, type, url) => { if (error) { @@ -93,9 +100,9 @@ function HomeTabFile ({plugin}: HomeTabFileProps) { plugin.verticalIcons.select('filePanel') } - const showFullMessage = (title: string, loadItem: string, examples: Array) => { + const showFullMessage = (title: string, loadItem: string, examples: Array, prefix = '') => { setState(prevState => { - return { ...prevState, showModalDialog: true, modalInfo: { title: title, loadItem: loadItem, examples: examples } } + return { ...prevState, showModalDialog: true, modalInfo: { title: title, loadItem: loadItem, examples: examples, prefix } } }) } @@ -126,7 +133,9 @@ function HomeTabFile ({plugin}: HomeTabFileProps) { { examples }
} - + { state.modalInfo.prefix && ipfs:// } + + @@ -155,9 +165,15 @@ function HomeTabFile ({plugin}: HomeTabFileProps) {
- + - +
diff --git a/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx b/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx index 7d646043f3..05f3fbf678 100644 --- a/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx +++ b/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx @@ -75,6 +75,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => { try { const result = await publishToIPFS(contract, api) modal(`Published ${contract.name}'s Metadata and Sources`, publishMessage(result.uploaded)) + console.log("ptot") } catch (err) { modal('IPFS Publish Failed', publishMessageFailed(storage, err.message)) } diff --git a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx index dbea8a4766..d54332e96f 100644 --- a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx +++ b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx @@ -1,7 +1,5 @@ import IpfsHttpClient from 'ipfs-http-client' - - let ipfsNodes = [] export const publishToIPFS = async (contract, api) => { @@ -93,7 +91,6 @@ export const publishToIPFS = async (contract, api) => { try { const result = await ipfsVerifiedPublish(metadataContent, '', api) - try { contract.metadataHash = result.url.match('dweb:/ipfs/(.+)')[1] } catch (e) { diff --git a/libs/remix-ui/run-tab/src/lib/css/run-tab.css b/libs/remix-ui/run-tab/src/lib/css/run-tab.css index 1c9cd7fe5b..203e315de1 100644 --- a/libs/remix-ui/run-tab/src/lib/css/run-tab.css +++ b/libs/remix-ui/run-tab/src/lib/css/run-tab.css @@ -45,8 +45,6 @@ width: 164px; min-width: 164px; } -.udapp_col2_2 { -} .udapp_select { font-weight: normal; width: 100%; @@ -314,7 +312,7 @@ .udapp_cActionsWrapper { border-top-left-radius: 0; border-bottom-left-radius: 0.25rem; - border-top-rightt-radius: 0; + border-top-right-radius: 0; border-bottom-right-radius: 0.25rem; padding: 8px 10px 7px; }