Skip to content

Added loader for localhost #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2021
Merged

Added loader for localhost #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
968793c
Added loader for localhost
ioedeveloper Mar 10, 2021
da381b1
Move loading event to preInit
ioedeveloper Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/files/remixDProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module.exports = class RemixDProvider {
}

preInit () {
this._registerEvent()
this.event.trigger('loading')
}

init (cb) {
Expand Down
1 change: 1 addition & 0 deletions apps/remix-ide/src/app/files/remixd-handle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export class RemixdHandle extends WebsocketPlugin {
label: 'Connect',
fn: () => {
try {
this.locahostProvider.preInit()
super.activate()
setTimeout(() => {
if (!this.socket || (this.socket && this.socket.readyState === 3)) { // 3 means connection closed
Expand Down
45 changes: 29 additions & 16 deletions libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ export const Workspace = (props: WorkspaceProps) => {
setWorkspace(props.workspaces.length > 0 ? props.workspaces[0] : NO_WORKSPACE)
})

props.localhost.event.register('loading', () => {
remixdExplorer.loading()
})

if (props.initialWorkspace) {
props.workspace.setWorkspace(props.initialWorkspace)
setState(prevState => {
Expand Down Expand Up @@ -120,7 +124,8 @@ export const Workspace = (props: WorkspaceProps) => {
fn: () => {}
},
handleHide: null
}
},
loadingLocalhost: false
})

/* workspace creation, renaming and deletion */
Expand Down Expand Up @@ -231,13 +236,18 @@ export const Workspace = (props: WorkspaceProps) => {
if (state.currentWorkspace === LOCALHOST) setWorkspace(NO_WORKSPACE)
props.fileManager.setMode('browser')
setState(prevState => {
return { ...prevState, hideRemixdExplorer: true }
return { ...prevState, hideRemixdExplorer: true, loadingLocalhost: false }
})
},
show: () => {
props.fileManager.setMode('localhost')
setState(prevState => {
return { ...prevState, hideRemixdExplorer: false }
return { ...prevState, hideRemixdExplorer: false, loadingLocalhost: false }
})
},
loading: () => {
setState(prevState => {
return { ...prevState, loadingLocalhost: true }
})
}
}
Expand Down Expand Up @@ -372,19 +382,22 @@ export const Workspace = (props: WorkspaceProps) => {
/>
}
</div>
<div className='pl-2 filesystemexplorer remixui_treeview'>
{ !state.hideRemixdExplorer &&
<FileExplorer
name='localhost'
registry={props.registry}
filesProvider={props.localhost}
menuItems={['createNewFile', 'createNewFolder']}
plugin={props.plugin}
focusRoot={state.reset}
contextMenuItems={props.registeredMenuItems}
/>
}
</div>
{
state.loadingLocalhost ? <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div>
: <div className='pl-2 filesystemexplorer remixui_treeview'>
{ !state.hideRemixdExplorer &&
<FileExplorer
name='localhost'
registry={props.registry}
filesProvider={props.localhost}
menuItems={['createNewFile', 'createNewFolder']}
plugin={props.plugin}
focusRoot={state.reset}
contextMenuItems={props.registeredMenuItems}
/>
}
</div>
}
<div className='pl-2 remixui_treeview'>
{ false && <FileExplorer
name='browser'
Expand Down