diff --git a/app/index.html b/app/index.html index b05703f..e91a4c8 100644 --- a/app/index.html +++ b/app/index.html @@ -65,15 +65,21 @@ + + + + + + diff --git a/app/scripts/app.js b/app/scripts/app.js index 8dfc2ea..bce16e1 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -137,9 +137,7 @@ ShareDrop.App.IndexRoute = Ember.Route.extend({ outlet: 'about_you' }); - // TODO: modify key name when cross-network feature is ready - // and info about it is added to 'about_app' template - var key = 'seenInstructions'; + var key = 'show-instructions-for-app'; if (!localStorage.getItem(key)) { this.send('openModal', 'about_app'); localStorage.setItem(key, 'yup'); diff --git a/app/scripts/app/components/room_url_component.js b/app/scripts/app/components/room_url_component.js new file mode 100644 index 0000000..8c7228e --- /dev/null +++ b/app/scripts/app/components/room_url_component.js @@ -0,0 +1,17 @@ +ShareDrop.App.RoomUrlComponent = Ember.TextField.extend({ + classNames: ['room-url'], + + becomeSelected: function () { + this.$().focus().select(); + }.on('didInsertElement'), + + copyValueToClipboard: function () { + if (window.ClipboardEvent) { + var pasteEvent = new window.ClipboardEvent('paste', { + dataType: 'text/plain', + data: this.$().val() + }); + document.dispatchEvent(pasteEvent); + } + } +}); diff --git a/app/scripts/app/templates/about_app.hbs b/app/scripts/app/templates/about_app.hbs index d478503..1a6e168 100644 --- a/app/scripts/app/templates/about_app.hbs +++ b/app/scripts/app/templates/about_app.hbs @@ -2,14 +2,21 @@

What is it?

- ShareDrop is a free app that allows you to easily and securely share files directly between devices in the same local network*, without having to upload them to any server first. + ShareDrop is a free app that allows you to easily and securely share files directly between devices without having to upload them to any server first.

How to use it?

+

Sharing files between devices in local network*

- To send a file to another device, open this page on both devices. Drag and drop the file directly on other user's avatar or click the avatar and select the file you want to send. The file transfer will start once the recipient accepts the file. + To send a file to another device in the same local network, open this page (i.e. www.sharedrop.io) on both devices. Drag and drop a file directly on other persons's avatar or click the avatar and select the file you want to send. The file transfer will start once the recipient accepts the file.

+

Sharing files between devices in different networks

+

+ To send a file to another device in a different network, click + button in the upper right corner of the page and follow futher instructions. +

+ +

Signing in

Additionally, you can sign in using Persona to allow others to easily recognize you by your email. This will show others your email address and also your Gravatar, if you have one.

diff --git a/app/scripts/app/templates/about_room.hbs b/app/scripts/app/templates/about_room.hbs index fb9571a..d1697c8 100644 --- a/app/scripts/app/templates/about_room.hbs +++ b/app/scripts/app/templates/about_room.hbs @@ -1,12 +1,21 @@ {{#modal-dialog action="closeModal"}} -

How rooms work?

+

Sharing files between devices in different networks

+

- Share this URL with others blah blah: + Copy provided address and send it any way you like to the other person.

- {{input value=currentURL disabled="disabled"}} + {{room-url value=currentURL disabled="disabled" style="display: block; margin: auto;"}} +

+ +

+ When the other person enters this address, you'll see each other on this page. +

+ +

+ Drag and drop a file directly on other persons's avatar or click the avatar and select the file you want to send. The file transfer will start once the recipient accepts the file.

diff --git a/app/scripts/app/templates/application.hbs b/app/scripts/app/templates/application.hbs index 50720d0..c28fa2f 100644 --- a/app/scripts/app/templates/application.hbs +++ b/app/scripts/app/templates/application.hbs @@ -10,7 +10,7 @@ +
  • - ? + ?
  • {{#if you.email}}
  • diff --git a/app/styles/layout/_media.sass b/app/styles/layout/_media.sass index 8e35072..357ece7 100644 --- a/app/styles/layout/_media.sass +++ b/app/styles/layout/_media.sass @@ -133,5 +133,3 @@ width: auto font-size: 1.4rem padding: 0 15px - - diff --git a/app/styles/modules/_modal.sass b/app/styles/modules/_modal.sass index ee3e53e..e77ca27 100644 --- a/app/styles/modules/_modal.sass +++ b/app/styles/modules/_modal.sass @@ -22,6 +22,10 @@ font-size: 1.8rem font-weight: bold margin-bottom: 1.11em + h4 + font-size: 1.5rem + font-weight: bold + margin-bottom: 0.5em p font-size: 1.4rem line-height: 1.4em @@ -58,4 +62,3 @@ background: transparent image-url("/images/sharedrop.svg") no-repeat left span display: none - diff --git a/app/styles/modules/_modules.sass b/app/styles/modules/_modules.sass index b26c7fe..4498500 100644 --- a/app/styles/modules/_modules.sass +++ b/app/styles/modules/_modules.sass @@ -55,3 +55,9 @@ 51% +scale(.5) opacity: 0 + +.room-url + display: block + margin: auto + font-size: 14px + width: 80%