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.

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

feat: IPFS Desktop settings #883

Merged
merged 13 commits into from
Nov 22, 2018
Merged

feat: IPFS Desktop settings #883

merged 13 commits into from
Nov 22, 2018

Conversation

hacdias
Copy link
Member

@hacdias hacdias commented Nov 9, 2018

More info see: ipfs/ipfs-desktop#674.

IPFS Desktop injects a bundle on window.ipfsDesktop. If it's present, we show IPFS Desktop specific settings.

image

(Screenshot taken with IPFS Desktop)

License: MIT
Signed-off-by: Henrique Dias hacdias@gmail.com

@hacdias hacdias self-assigned this Nov 9, 2018
@hacdias hacdias requested review from olizilla and fsdiogo November 9, 2018 18:58
@ghost ghost added the status/in-progress In progress label Nov 9, 2018
@hacdias
Copy link
Member Author

hacdias commented Nov 9, 2018

The injected code can be found here.

@hacdias hacdias mentioned this pull request Nov 9, 2018
15 tasks
Copy link
Member

@olizilla olizilla left a comment

Choose a reason for hiding this comment

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

Looks good. Minor tweaks needed. Please add a storybook example.

src/settings/DesktopSettings.js Outdated Show resolved Hide resolved
src/bundles/ipfs-desktop.js Outdated Show resolved Hide resolved
src/bundles/ipfs-desktop.js Outdated Show resolved Hide resolved
Copy link
Contributor

@fsdiogo fsdiogo left a comment

Choose a reason for hiding this comment

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

LGTM after fixing @olizilla comments!

Copy link
Member

@olizilla olizilla left a comment

Choose a reason for hiding this comment

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

Try not to rush. Run your changes before pusing them.

src/settings/SettingsPage.js Show resolved Hide resolved
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
@hacdias hacdias force-pushed the feat/desktop-settings branch from 1671ff9 to 25c6966 Compare November 14, 2018 08:27
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
@hacdias
Copy link
Member Author

hacdias commented Nov 14, 2018

@olizilla working and with a storybook 😄

License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
@hacdias
Copy link
Member Author

hacdias commented Nov 14, 2018

@olizilla let's merge this! Somehow it started passing 😄 I'm happy for it 😃 It would be rad if you released a new version so we can use it on IPFS Desktop right away!

Copy link
Member

@olizilla olizilla left a comment

Choose a reason for hiding this comment

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

Tried this out from desktop, and it works well. Just needs more polish.

@olizilla
Copy link
Member

@hacdias please revert the change to the package-lock.json. We need to upgrade ipld and ipld-explorer-components together or we hit breaking changes that causes errors when trying to view some ipld types.

hacdias and others added 3 commits November 22, 2018 10:35
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
@ghost ghost assigned fsdiogo Nov 22, 2018
Copy link
Member

@olizilla olizilla left a comment

Choose a reason for hiding this comment

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

LGTM

@olizilla olizilla merged commit 4c801ca into master Nov 22, 2018
@olizilla olizilla deleted the feat/desktop-settings branch November 22, 2018 15:32
@ghost ghost removed the status/in-progress In progress label Nov 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants