Skip to content
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

Jump to bottom

migration modal improvements #1026

Merged
merged 2 commits into from
Mar 24, 2021
Merged

migration modal improvements #1026

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc70c35
dded cancel`
LianaHus Mar 24, 2021
4717be9
changed the icon for download
LianaHus Mar 24, 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
44 changes: 33 additions & 11 deletions apps/remix-ide/src/app/ui/landing-page/landing-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ const css = csjs`
transition: .5s ease-out;
z-index: 1000;
}
.migrationBtn {
width: 100px;
}
}
`

Expand Down Expand Up @@ -414,23 +417,42 @@ export class LandingPage extends ViewPlugin {
}, 1000)
}
}
const onAcceptDownloadn = async () => {
await downloadFiles()
const el = document.getElementById('modal-dialog')
el.parentElement.removeChild(el)
migrate()
}

const onDownload = () => {
const el = document.getElementById('modal-dialog')
el.parentElement.removeChild(el)
migrate()
}

const onCancel = () => {
const el = document.getElementById('modal-dialog')
el.parentElement.removeChild(el)
}

const migrateWorkspace = async () => {
modalDialog(
'File system Migration',
yo`<span>Do you want to download your files to local device first?</span>`,
yo`
<span>Do you want to download your files to local device first?</span>
<div class="d-flex justify-content-around pt-3 mt-3 border-top">
<button class="btn btn-sm btn-primary" onclick=${async () => onAcceptDownloadn()}>Download and Migrate</button>
<button class="btn btn-sm btn-secondary ${css.migrationBtn}" onclick=${() => onDownload()}>Migrate</button>
<button class="btn btn-sm btn-secondary ${css.migrationBtn}" onclick=${() => onCancel()}>Cancel</button>
</div>
`,
{
label: 'Download and Migrate',
fn: async () => {
await downloadFiles()
migrate()
}
label: '',
fn: null
},
{
label: 'Migrate',
fn: () => {
migrate()
}
label: '',
fn: null
}
)
}
Expand Down Expand Up @@ -487,7 +509,7 @@ export class LandingPage extends ViewPlugin {
<span class="ml-1 ${css.text}" onclick=${() => connectToLocalhost()}>Connect to Localhost</span>
</p>
<p class="mb-1">
<i class="mr-1 far fa-file"></i>
<i class="mr-1 fas fa-download""></i>
<span class="ml-1 mb-1 ${css.text}" onclick=${() => downloadFiles()}>Download all Files</span>
</p>
<p class="mt-3 mb-0"><label>IMPORT FROM:</label></p>
Expand Down