restore some files

editorcontextDummy
filip mertens 2 years ago
parent 44b764c5b6
commit e5676293a4
  1. 42
      libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
  2. 2
      libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
  3. 2
      libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
  4. 6
      libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx

@ -86,7 +86,6 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
const rightPanel = useRef(null) const rightPanel = useRef(null)
useEffect(() => { useEffect(() => {
plugin.call('theme', 'currentTheme').then((theme) => { plugin.call('theme', 'currentTheme').then((theme) => {
// update theme quality. To be used for for images // update theme quality. To be used for for images
setState(prevState => { setState(prevState => {
@ -99,7 +98,6 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
return { ...prevState, themeQuality: theme.quality === 'dark' ? themes.dark : themes.light } return { ...prevState, themeQuality: theme.quality === 'dark' ? themes.dark : themes.light }
}) })
}) })
window.addEventListener('click', (event) => { window.addEventListener('click', (event) => {
const target = event.target as Element const target = event.target as Element
const id = target.id const id = target.id
@ -188,21 +186,21 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
<> <>
<ModalDialog <ModalDialog
id='homeTab' id='homeTab'
title={'Import from ' + state.modalInfo.title} title={ 'Import from ' + state.modalInfo.title }
okLabel='Import' okLabel='Import'
hide={!state.showModalDialog} hide={ !state.showModalDialog }
handleHide={() => hideFullMessage()} handleHide={ () => hideFullMessage() }
okFn={() => processLoading()} okFn={ () => processLoading() }
> >
<div className="p-2 user-select-auto"> <div className="p-2 user-select-auto">
{state.modalInfo.loadItem !== '' && <span>Enter the {state.modalInfo.loadItem} you would like to load.</span>} { state.modalInfo.loadItem !== '' && <span>Enter the { state.modalInfo.loadItem } you would like to load.</span> }
{state.modalInfo.examples.length !== 0 && { state.modalInfo.examples.length !== 0 &&
<> <>
<div>e.g</div> <div>e.g</div>
<div> <div>
{examples} { examples }
</div> </div>
</>} </> }
<input <input
ref={inputValue} ref={inputValue}
type='text' type='text'
@ -224,10 +222,10 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
<div className="border-bottom d-flex flex-column mr-4 pb-3 mb-3"> <div className="border-bottom d-flex flex-column mr-4 pb-3 mb-3">
<div className="d-flex justify-content-between "> <div className="d-flex justify-content-between ">
<div className="mx-4 my-4 d-flex"> <div className="mx-4 my-4 d-flex">
<label style={{ fontSize: 'xxx-large', height: 'auto', alignSelf: 'flex-end' }}>Remix IDE</label> <label style={ { fontSize: 'xxx-large', height: 'auto', alignSelf: 'flex-end' } }>Remix IDE</label>
</div> </div>
<div className="mr-4 d-flex"> <div className="mr-4 d-flex">
<img className="mt-4 mb-2 remixui_home_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={() => playRemi()} alt=""></img> <img className="mt-4 mb-2 remixui_home_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={ () => playRemi() } alt=""></img>
<audio <audio
id="remiAudio" id="remiAudio"
muted={false} muted={false}
@ -249,7 +247,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
<div className="mb-3"> <div className="mb-3">
<h4>Featured Plugins</h4> <h4>Featured Plugins</h4>
<div className="d-flex flex-row pt-2"> <div className="d-flex flex-row pt-2">
<ThemeContext.Provider value={state.themeQuality}> <ThemeContext.Provider value={ state.themeQuality }>
<PluginButton imgPath="assets/img/solidityLogo.webp" envID="solidityLogo" envText="Solidity" callback={() => startSolidity()} /> <PluginButton imgPath="assets/img/solidityLogo.webp" envID="solidityLogo" envText="Solidity" callback={() => startSolidity()} />
<PluginButton imgPath="assets/img/starkNetLogo.webp" envID="starkNetLogo" envText="StarkNet" l2={true} callback={() => startStarkNet()} /> <PluginButton imgPath="assets/img/starkNetLogo.webp" envID="starkNetLogo" envText="StarkNet" l2={true} callback={() => startStarkNet()} />
<PluginButton imgPath="assets/img/solhintLogo.webp" envID="solhintLogo" envText="Solhint linter" callback={() => startSolhint()} /> <PluginButton imgPath="assets/img/solhintLogo.webp" envID="solhintLogo" envText="Solhint linter" callback={() => startSolhint()} />
@ -300,7 +298,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
<a className="remixui_home_text" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a> <a className="remixui_home_text" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
</p> </p>
<p className="mb-1"> <p className="mb-1">
<img id='remixHhomeWebsite' className="mr-2 remixui_home_image" src={plugin.profile.icon} style={{ filter: state.themeQuality.filter }} alt=''></img> <img id='remixHhomeWebsite' className="mr-2 remixui_home_image" src={ plugin.profile.icon } style={ { filter: state.themeQuality.filter } } alt=''></img>
<a className="remixui_home_text" target="__blank" href="https://remix-project.org">Featuring website</a> <a className="remixui_home_text" target="__blank" href="https://remix-project.org">Featuring website</a>
</p> </p>
</div> </div>
@ -334,7 +332,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
</div> </div>
<div <div
className="mr-3 d-flex bg-light remixui_home_panels" className="mr-3 d-flex bg-light remixui_home_panels"
style={{ visibility: state.showMediaPanel === 'none' ? 'hidden' : 'visible' }} style={ { visibility: state.showMediaPanel === 'none' ? 'hidden' : 'visible' } }
id="remixIDEMediaPanels" id="remixIDEMediaPanels"
ref={rightPanel} ref={rightPanel}
> >
@ -343,11 +341,11 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
<RSSFeed feedUrl='https://rss.remixproject.org/' maxItems={10} /> <RSSFeed feedUrl='https://rss.remixproject.org/' maxItems={10} />
</div> </div>
</div> </div>
<div id="remixIDE_TwitterBlock" className="p-2 mx-1 mt-3 mb-0 remixui_home_remixHomeMedia" hidden={state.showMediaPanel !== 'twitter'} style={{ maxHeight: maxHeight, marginRight: '28px' }} > <div id="remixIDE_TwitterBlock" className="p-2 mx-1 mt-3 mb-0 remixui_home_remixHomeMedia" hidden={state.showMediaPanel !== 'twitter'} style={ { maxHeight: maxHeight, marginRight: '28px' } } >
<div className="remixui_home_media" style={{ minHeight: elHeight }} > <div className="remixui_home_media" style={ { minHeight: elHeight } } >
<a className="twitter-timeline" <a className="twitter-timeline"
data-width="375" data-width="375"
data-theme={state.themeQuality.name} data-theme={ state.themeQuality.name }
data-chrome="nofooter noheader transparent" data-chrome="nofooter noheader transparent"
data-tweet-limit="18" data-tweet-limit="18"
href="https://twitter.com/EthereumRemix" href="https://twitter.com/EthereumRemix"

@ -510,10 +510,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
// Workers cannot load js on "file:"-URLs and we get a // Workers cannot load js on "file:"-URLs and we get a
// "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium, // "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
// resort to non-worker version in that case. // resort to non-worker version in that case.
console.log('VERSION', selectedVersion)
if (selectedVersion === 'builtin') selectedVersion = state.defaultVersion if (selectedVersion === 'builtin') selectedVersion = state.defaultVersion
if (selectedVersion !== 'builtin' && canUseWorker(selectedVersion)) { if (selectedVersion !== 'builtin' && canUseWorker(selectedVersion)) {
console.log('loading ' + url + ' with worker')
compileTabLogic.compiler.loadVersion(true, url) compileTabLogic.compiler.loadVersion(true, url)
} else { } else {
compileTabLogic.compiler.loadVersion(false, url) compileTabLogic.compiler.loadVersion(false, url)

@ -99,7 +99,7 @@ export class CompileTabLogic {
* Compile a specific file of the file manager * Compile a specific file of the file manager
* @param {string} target the path to the file to compile * @param {string} target the path to the file to compile
*/ */
compileFile (target: string) { compileFile (target) {
if (!target) throw new Error('No target provided for compiliation') if (!target) throw new Error('No target provided for compiliation')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.api.readFile(target).then((content) => { this.api.readFile(target).then((content) => {

@ -33,12 +33,6 @@ export const TabsUI = (props: TabsUIProps) => {
} }
}, [selectedIndex]) }, [selectedIndex])
useEffect(() => {
console.log(props.themeQuality)
}, [props.themeQuality])
const renderTab = (tab, index) => { const renderTab = (tab, index) => {
const classNameImg = 'my-1 mr-1 text-dark ' + tab.iconClass const classNameImg = 'my-1 mr-1 text-dark ' + tab.iconClass
const classNameTab = 'nav-item nav-link d-flex justify-content-center align-items-center px-2 py-1 tab' + (index === currentIndexRef.current ? ' active' : '') const classNameTab = 'nav-item nav-link d-flex justify-content-center align-items-center px-2 py-1 tab' + (index === currentIndexRef.current ? ' active' : '')

Loading…
Cancel
Save