Skip to content

Put info with migration help #1095

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 6 commits into from
Apr 12, 2021
Merged

Put info with migration help #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
335f0a9
draft
LianaHus Apr 7, 2021
fb46b74
updated links
LianaHus Apr 7, 2021
ebfe3c2
layout updated
LianaHus Apr 8, 2021
ac97881
fixed the plugin activation
LianaHus Apr 12, 2021
97256ee
updated with Rob
LianaHus Apr 12, 2021
70f37ad
linter
LianaHus Apr 12, 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
4 changes: 2 additions & 2 deletions apps/remix-ide/src/app/tabs/runTab/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,13 @@ class SettingsUI {
if (!accounts) accounts = []
if (this.accountListCallId > callid) return
this.accountListCallId++
for (var loadedaddress in this.loadedAccounts) {
for (const loadedaddress in this.loadedAccounts) {
if (accounts.indexOf(loadedaddress) === -1) {
txOrigin.removeChild(txOrigin.querySelector('option[value="' + loadedaddress + '"]'))
delete this.loadedAccounts[loadedaddress]
}
}
for (var i in accounts) {
for (const i in accounts) {
const address = accounts[i]
if (!this.loadedAccounts[address]) {
txOrigin.appendChild(yo`<option value="${address}" >${address}</option>`)
Expand Down
71 changes: 45 additions & 26 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 @@ -22,6 +22,7 @@ const css = csjs`
user-select: none;
}
.text:hover {
cursor: pointer;
text-decoration: underline;
}
.homeContainer {
Expand Down Expand Up @@ -300,6 +301,11 @@ export class LandingPage extends ViewPlugin {
await this.appManager.activatePlugin('pluginManager')
this.verticalIcons.select('pluginManager')
}
const startRestoreBackupZip = async () => {
await this.appManager.activatePlugin(['restorebackupzip'])
this.verticalIcons.select('restorebackupzip')
_paq.push(['trackEvent', 'pluginManager', 'userActivate', 'restorebackupzip'])
}

const createNewFile = () => {
this.call('fileExplorers', 'createNewFile')
Expand Down Expand Up @@ -456,7 +462,7 @@ export class LandingPage extends ViewPlugin {
)
}

const img = yo`<img class=${css.logoImg} src="assets/img/guitarRemiCroped.webp" onclick="${() => playRemi()}"></img>`
const img = yo`<img class="m-4 ${css.logoImg}" src="assets/img/guitarRemiCroped.webp" onclick="${() => playRemi()}"></img>`
const playRemi = async () => { await document.getElementById('remiAudio').play() }
// to retrieve medium posts
document.body.appendChild(yo`<script src="https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
Expand All @@ -466,24 +472,46 @@ export class LandingPage extends ViewPlugin {
<div class="d-flex justify-content-between">
<div class="d-flex flex-column">
<div class="border-bottom d-flex justify-content-between clearfix py-3 mb-4">
<div class="mx-4 w-100">
<div class="mx-4 w-100 d-flex">
${img}
<audio id="remiAudio" muted=false src="assets/audio/remiGuitar-single-power-chord-A-minor.wav"></audio>
<div class="w-80 pl-5 ml-5">
Copy link
Collaborator

@ryestew ryestew Apr 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here are 2 updates:

<div class="w-80 pl-5 ml-5"><h4 class="mb-1">Quicklinks</h4><a href="https://medium.com/remix-ide/migrating-files-to-workspaces-8e34737c751c?source=friends_link&amp;sk=b75cfd9093aa23c78be13cce49e4a5e8">Guide for migrating</a> your files to a File Explorer workspace
<h6 class="mt-1 mb-1">Migration tools:</h6><li><u class="text_2A2Ew px-1">Download all Files</u></li><li><u class="text_2A2Ew px-1">Restore Backup Zip</u>- a plugin to current workspace</li> <h6 class="mt-1 mb-0">Help</h6><li><a target="__blank" href="https://gitter.im/ethereum/remix" class="text_2A2Ew mx-1">Gitter channel</a></li><li><a target="__blank" href="/ethereum/remix-project/issues" class="text_2A2Ew mx-1">Report on Github</a></li></div>

or without bullet points (which I think looks a bit better)

<div class="w-80 pl-5 ml-5"><h4 class="mb-1">Quicklinks</h4><a href="https://medium.com/remix-ide/migrating-files-to-workspaces-8e34737c751c?source=friends_link&amp;sk=b75cfd9093aa23c78be13cce49e4a5e8">Guide for migrating</a> your files to a File Explorer workspace
<h6 class="mt-1 mb-1">Migration tools:</h6><p class="mb-0"><u class="text_2A2Ew px-1">Download all Files</u></p><p class="mb-2"><u class="text_2A2Ew px-1">Restore Backup Zip</u>- a plugin to current workspace</p> <h6 class="mt-1 mb-0">Help</h6><p class="mb-0"><a target="__blank" href="https://gitter.im/ethereum/remix" class="text_2A2Ew mx-1">Gitter channel</a></p><p class="mb-0"><a target="__blank" href="/ethereum/remix-project/issues" class="text_2A2Ew mx-1">Report on Github</a></p></div>

Or use the li tags but remove the bullet points in the css.

Anyway I think the text should be adjusted as I indicated or similar to that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've put ballots to show that it is 2 step action not just some links

<h5 class="mb-1">Quicklinks</h5>
<a class="${css.text} mr-1" target="__blank" href="https://medium.com/remix-ide/migrating-files-to-workspaces-8e34737c751c?source=friends_link&sk=b75cfd9093aa23c78be13cce49e4a5e8">Guide </a>for migrating the old File System
<p class="font-weight-bold mb-0 py-1">Migration tools:</p>
<li class="pl-1">
<spam class="pl-0">
<u class="${css.text} pr-1" onclick=${() => migrateWorkspace()}>Basic migration</u>
</spam>
</li>
<li class="pl-1">
<u class="${css.text} pr-1" onclick=${() => downloadFiles()}>Download all Files</u>
as a backup zip
</li>
<li class="pl-1">
<u class="${css.text} pr-1" onclick=${() => startRestoreBackupZip()}>Restore files</u>from backup zip
</li>
<p class="font-weight-bold mb-0 mt-2">Help:</p>
<dir class="d-flex flex-column mt-1 pl-0">
<a class="${css.text} mx-1" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
<a class="${css.text} mx-1" target="__blank" href="https://github.com/ethereum/remix-project/issues">Report on Github</a>
</dir>
</div>
</div>
</div>
<div class="row ${css.hpSections} mx-4" data-id="landingPageHpSections">
<div class="ml-3">
<div class="plugins mb-5">
<h4>Featured Plugins</h4>
<div class="d-flex flex-row pt-2">
${this.solEnv}
${this.learnEthEnv}
${this.solhintEnv}
${this.sourcifyEnv}
${this.debuggerEnv}
${this.moreEnv}
<h4>Featured Plugins</h4>
<div class="d-flex flex-row pt-2">
${this.solEnv}
${this.learnEthEnv}
${this.solhintEnv}
${this.sourcifyEnv}
${this.debuggerEnv}
${this.moreEnv}
</div>
</div>
</div>
<div class="d-flex">
<div class="file">
<h4>File</h4>
Expand All @@ -495,22 +523,17 @@ export class LandingPage extends ViewPlugin {
<i class="mr-1 far fa-file-alt"></i>
<label class="ml-1 ${css.labelIt} ${css.bigLabelSize} ${css.text}">
Open Files
<input title="open file" type="file" onchange="${
(event) => {
event.stopPropagation()
uploadFile(event.target)
}
}" multiple />
<input title="open file" type="file" onchange="${(event) => {
event.stopPropagation()
uploadFile(event.target)
}
}" multiple />
</label>
</p>
<p class="mb-1">
<i class="far fa-hdd"></i>
<span class="ml-1 ${css.text}" onclick=${() => connectToLocalhost()}>Connect to Localhost</span>
</p>
<p class="mb-1">
<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>
<div class="btn-group">
<button class="btn mr-1 btn-secondary" data-id="landingPageImportFromGistButton" onclick="${() => importFromGist()}">Gist</button>
Expand All @@ -529,7 +552,7 @@ export class LandingPage extends ViewPlugin {
<p class="mb-1">
<i class="mr-1 fab fa-gitter"></i>
<a class="${css.text}" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
</p>
</p>
<p class="mb-1">
${this.websiteIcon}
<a class="${css.text}" target="__blank" href="https://remix-project.org">Featuring website</a>
Expand All @@ -538,10 +561,6 @@ export class LandingPage extends ViewPlugin {
<i class="fab fa-ethereum ${css.image}"></i>
<span class="${css.text}" onclick=${() => switchToPreviousVersion()}>Old experience</span>
</p>
<p>
<i class="fas fa-exclamation-triangle text-warning ${css.image}"></i>
<span class="${css.text}" onclick=${() => migrateWorkspace()}>Migrate old filesystem to workspace</span>
</p>
</div>
</div>
</div>
Expand Down