Skip to content

Commit 69310a2

Browse files
szimekszimek
committed
Update ember to 3.7.1
1 parent deb0635 commit 69310a2

22 files changed

+1586
-1004
lines changed

‎.bowerrc

-4
This file was deleted.

‎.eslintrc.js

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module.exports = {
88
extends: ['airbnb-base', 'plugin:ember/recommended', 'prettier'],
99
env: {
1010
browser: true,
11-
node: true,
1211
},
1312
rules: {
1413
'func-names': 'off',

‎.gitignore

+11-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@
55
/tmp
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
12+
/.env
1213
/.sass-cache
1314
/connect.lock
1415
/coverage/*
1516
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
17+
/npm-debug.log*
18+
/testem.log
19+
/yarn-error.log
20+
/newrelic_agent.log
1921

20-
.env
21-
newrelic_agent.log
22+
# ember-try
23+
/.node_modules.ember-try/
24+
/bower.json.ember-try
25+
/package.json.ember-try

‎.template-lintrc.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended',
5+
rules: {
6+
'no-html-comments': false,
7+
'no-partial': false,
8+
},
9+
ignore: [
10+
'./node_modules/**',
11+
'./vendor/**',
12+
'./tmp/**',
13+
'./dist/**',
14+
'./tests/**',
15+
],
16+
};

‎.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
language: node_js
33
node_js:
4-
- "8"
4+
- '10'
55

66
sudo: false
77
dist: trusty
@@ -25,5 +25,6 @@ install:
2525
- yarn install --non-interactive
2626

2727
script:
28+
- yarn lint:hbs
2829
- yarn lint:js
2930
- yarn test

‎Procfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: node index.js
1+
web: node server.js

‎Procfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
server: node index.js
1+
server: node server.js
22
web: ember build --watch

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ The main difference between ShareDrop and AirDrop is that ShareDrop requires Int
99
### Supported browsers
1010
* Chrome (desktop and Android) 33+
1111
* Opera (desktop and Android) 20+
12-
* Firefox (desktop and Android) 28+ (though we suggest using Chrome or Opera for transferring larger files)
12+
* Firefox (desktop and Android) 28+
13+
* Safari (desktop) 12+
1314

1415
### How to set it up for local development
1516
1. Setup Firebase:

‎app/components/peer-avatar.js

+29-24
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,44 @@ export default Component.extend({
2020
'data-sending-progress': alias('peer.transfer.sendingProgress'),
2121
'data-receiving-progress': alias('peer.transfer.receivingProgress'),
2222

23+
toggleTransferCompletedClass() {
24+
const className = 'transfer-completed';
25+
26+
later(
27+
this,
28+
function toggleClass() {
29+
this.$()
30+
.parent('.avatar')
31+
.addClass(className)
32+
.delay(2000)
33+
.queue(function removeClass() {
34+
$(this)
35+
.removeClass(className)
36+
.dequeue();
37+
});
38+
},
39+
250
40+
);
41+
},
42+
2343
didInsertElement(...args) {
2444
this._super(args);
2545
const peer = this.get('peer');
26-
const toggleTransferCompletedClass = () => {
27-
const klass = 'transfer-completed';
28-
29-
later(
30-
this,
31-
function toggleClass() {
32-
this.$()
33-
.parent('.avatar')
34-
.addClass(klass)
35-
.delay(2000)
36-
.queue(function removeClass() {
37-
$(this)
38-
.removeClass(klass)
39-
.dequeue();
40-
});
41-
},
42-
250
43-
);
44-
};
45-
46-
peer.on('didReceiveFile', toggleTransferCompletedClass);
47-
peer.on('didSendFile', toggleTransferCompletedClass);
46+
47+
this.toggleTransferCompletedClass = this.toggleTransferCompletedClass.bind(
48+
this
49+
);
50+
51+
peer.on('didReceiveFile', this.toggleTransferCompletedClass);
52+
peer.on('didSendFile', this.toggleTransferCompletedClass);
4853
},
4954

5055
willDestroyElement(...args) {
5156
this._super(args);
5257
const peer = this.get('peer');
5358

54-
peer.off('didReceiveFile');
55-
peer.off('didSendFile');
59+
peer.off('didReceiveFile', this.toggleTransferCompletedClass);
60+
peer.off('didSendFile', this.toggleTransferCompletedClass);
5661
},
5762

5863
// Delegate click to hidden file field in peer template

‎app/styles/layout/_footer.sass

+5
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,16 @@
4646
position: absolute
4747
left: 280px
4848
bottom: 11px
49+
height: 21px
50+
border: none
51+
overflow: hidden
4952

5053
.twitter
5154
position: absolute
5255
left: 210px
5356
bottom: 12px
57+
width: 60px
58+
height: 20px
5459

5560
.webrtc
5661
position: absolute

‎app/styles/modules/_modal.sass

+4
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,7 @@
6464
background: transparent url("../assets/images/sharedrop.svg") no-repeat left
6565
span
6666
display: none
67+
68+
.plus-icon
69+
font-weight: bold
70+
font-size: 2rem

‎app/templates/about-app.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<h4>Sharing files between devices in different networks</h4>
1515
<p>
16-
To send a file to another device in a different network, click <span style="font-weight: bold; font-size: 2rem">+</span> button in the upper right corner of the page and follow futher instructions.
16+
To send a file to another device in a different network, click <span class="plus-icon">+</span> button in the upper right corner of the page and follow futher instructions.
1717
</p>
1818

1919
<h3>Feedback</h3>
@@ -23,6 +23,6 @@
2323

2424
<div class="actions">
2525
<button {{action "closeModal"}}>Got it!</button>
26-
<p class="note"><sup>*</sup>Devices need to have the same <a href="https://www.google.com/search?q=what+is+my+ip" target="_blank">public IP</a> to see each other.</p>
26+
<p class="note"><sup>*</sup>Devices need to have the same <a href="https://www.google.com/search?q=what+is+my+ip" target="_blank" rel="noopener">public IP</a> to see each other.</p>
2727
</div>
2828
{{/modal-dialog}}

‎app/templates/about-you.hbs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ShareDrop lets you share files with others.
22
Other people will see you as
33
<b>
4-
{{#if hasCustomRoomName}}
5-
{{you.labelWithPublicIp}}
6-
{{else}}
7-
{{you.label}}
8-
{{/if}}
9-
</b>
4+
{{#if hasCustomRoomName}}
5+
{{you.labelWithPublicIp}}
6+
{{else}}
7+
{{you.label}}
8+
{{/if}}
9+
</b>

‎app/templates/application.hbs

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ul class="nav">
99
<li>
10-
<a href="javascript:void(0)" class="icon-create-room" {{action "redirect"}} title="Create a room. You'll leave the room you're currently in.">+</a>
10+
<a href="javascript:void(0)" class="icon-create-room" {{action "redirect"}} title="Create a room. You'll leave the room you're currently in.">+</a>
1111
</li>
1212
<li>
1313
<a href="javascript:void(0)" class="icon-help" {{action "openModal" "about_app"}} title="About">?</a>
@@ -23,11 +23,11 @@
2323
<p class="about">{{outlet "about_you"}}</p>
2424
<div class="cowbell-labs">
2525
<span>Made by</span>
26-
<a href="https://cowbell-labs.com/" target="_blank"><span>Cowbell Labs</span></a>
26+
<a href="https://cowbell-labs.com/" target="_blank" rel="noopener"><span>Cowbell Labs</span></a>
2727
</div>
28-
<a href="https://github.com/cowbell/sharedrop" class="github" target="_blank"><span>Cowbell Labs Github</span></a>
29-
<iframe class="twitter" src="https://platform.twitter.com/widgets/tweet_button.html?url=https%3A%2F%2Fwww.sharedrop.io&text=ShareDrop%20%E2%80%93%20easily%20and%20securely%20share%20files%20of%20any%20size%20directly%20between%20devices%20using%20your%20browser&count=none" scrolling="no" frameborder="0" style="width:60px; height:20px;" allowtransparency="true" ></iframe>
30-
<iframe class="facebook" src="//www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.sharedrop.io&amp;width&amp;layout=button_count&amp;action=like&amp;show_faces=false&amp;share=false&amp;height=21&amp;appId=325150657685651" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:21px;" allowTransparency="true"></iframe>
31-
<a href="http://www.webrtc.org/" class="webrtc" target="_blank"><span>WebRTC</span></a>
32-
<a href="https://www.firebase.com/" class="firebase" target="_blank"><span>Powered by Firebase</span></a>
28+
<a href="https://github.com/cowbell/sharedrop" class="github" target="_blank" rel="noopener"><span>Cowbell Labs Github</span></a>
29+
<iframe class="twitter" src="https://platform.twitter.com/widgets/tweet_button.html?url=https%3A%2F%2Fwww.sharedrop.io&text=ShareDrop%20%E2%80%93%20easily%20and%20securely%20share%20files%20of%20any%20size%20directly%20between%20devices%20using%20your%20browser&count=none" scrolling="no" frameborder="0" allowtransparency="true" ></iframe>
30+
<iframe class="facebook" src="//www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.sharedrop.io&amp;width&amp;layout=button_count&amp;action=like&amp;show_faces=false&amp;share=false&amp;height=21&amp;appId=325150657685651" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
31+
<a href="http://www.webrtc.org/" class="webrtc" target="_blank" rel="noopener"><span>WebRTC</span></a>
32+
<a href="https://www.firebase.com/" class="firebase" target="_blank" rel="noopener"><span>Powered by Firebase</span></a>
3333
</footer>

‎app/templates/components/ip-select.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<select {{action 'change' on='change'}}>
1+
<select {{action "change" on="change"}}>
22
{{#each content key="@index" as |item|}}
3-
<option value="{{item}}" selected={{is-equal item selectedValue}}>
3+
<option value={{item}} selected={{is-equal item selectedValue}}>
44
{{item}}
55
</option>
66
{{/each}}

‎app/templates/components/modal-dialog.hbs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
{{! template-lint-disable no-invalid-interactive }}
12
<div class="modal-overlay" {{action "close"}}></div>
23
<div class="modal-body">
34
{{yield}}
45
</div>
6+
{{! template-lint-enable no-invalid-interactive }}

‎app/templates/components/popover-confirm.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{{#bs-popover visible=isVisible placement="top" renderInPlace=true triggerEvents=''}}
1+
{{#bs-popover visible=isVisible placement="top" renderInPlace=true triggerEvents=""}}
22
<div class="popover-body">
33
<div class="popover-icon">
4-
<i class="{{iconClass}}"></i>
4+
<i class={{iconClass}}></i>
55
</div>
66

77
<p>{{yield}}</p>

‎ember-cli-build.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/* eslint-env node */
24
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
35

‎package.json

+30-26
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "share-drop",
33
"version": "1.0.0",
4+
"private": true,
45
"description": "P2P file sharing",
56
"license": "MIT",
67
"author": "Szymon Nowak",
@@ -17,45 +18,48 @@
1718
"develop": "nf --procfile=Procfile.dev start",
1819
"lint:hbs": "ember-template-lint .",
1920
"lint:js": "eslint .",
20-
"start": "ember server",
21+
"start": "ember serve",
2122
"test": "ember test",
2223
"heroku-postbuild": "ember build --environment production"
2324
},
2425
"devDependencies": {
26+
"@ember/jquery": "^0.5.2",
27+
"@ember/optional-features": "^0.6.3",
2528
"bootstrap": "4.0.0-alpha.6",
2629
"bootstrap-sass": "3.3.7",
27-
"broccoli-asset-rev": "^2.4.5",
28-
"ember-ajax": "^3.0.0",
29-
"ember-cli": "~2.18.2",
30-
"ember-cli-app-version": "^3.0.0",
31-
"ember-cli-babel": "^6.6.0",
32-
"ember-cli-dependency-checker": "^2.0.0",
30+
"broccoli-asset-rev": "^2.7.0",
31+
"ember-ajax": "^3.1.0",
32+
"ember-cli": "~3.7.1",
33+
"ember-cli-app-version": "^3.2.0",
34+
"ember-cli-babel": "^7.1.2",
35+
"ember-cli-dependency-checker": "^3.0.0",
3336
"ember-cli-dotenv": "^1.0.4",
34-
"ember-cli-eslint": "^4.2.1",
35-
"ember-cli-htmlbars": "^2.0.1",
36-
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
37-
"ember-cli-inject-live-reload": "^1.4.1",
37+
"ember-cli-eslint": "^4.2.3",
38+
"ember-cli-htmlbars": "^3.0.0",
39+
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
40+
"ember-cli-inject-live-reload": "^1.8.2",
3841
"ember-cli-inline-content": "^0.4.0",
39-
"ember-cli-qunit": "^4.1.1",
4042
"ember-cli-sass": "^6.1.1",
41-
"ember-cli-shims": "^1.2.0",
42-
"ember-cli-sri": "^2.1.0",
43-
"ember-cli-test-loader": "^1.1.0",
44-
"ember-cli-uglify": "^2.0.0",
43+
"ember-cli-sri": "^2.1.1",
44+
"ember-cli-template-lint": "^1.0.0-beta.1",
45+
"ember-cli-uglify": "^2.1.0",
4546
"ember-export-application-global": "^2.0.0",
46-
"ember-load-initializers": "^1.0.0",
47-
"ember-resolver": "^4.0.0",
48-
"ember-source": "~2.18.0",
47+
"ember-load-initializers": "^1.1.0",
48+
"ember-maybe-import-regenerator": "^0.1.6",
49+
"ember-qunit": "^3.4.1",
50+
"ember-resolver": "^5.0.1",
51+
"ember-source": "~3.7.0",
4952
"eslint-config-airbnb-base": "^13.1.0",
5053
"eslint-config-prettier": "^3.4.0",
51-
"eslint-plugin-ember": "^5.0.0",
54+
"eslint-plugin-ember": "^5.2.0",
5255
"eslint-plugin-import": "^2.14.0",
5356
"eslint-plugin-prettier": "^3.0.1",
5457
"foreman": "2.0.0",
5558
"husky": "^1.3.1",
5659
"lint-staged": "^8.1.0",
57-
"loader.js": "^4.2.3",
58-
"prettier": "^1.15.3"
60+
"loader.js": "^4.7.0",
61+
"prettier": "^1.15.3",
62+
"qunit-dom": "^0.8.0"
5963
},
6064
"dependencies": {
6165
"body-parser": "^1.10.0",
@@ -77,12 +81,12 @@
7781
"lint-staged": {
7882
"*.js": [
7983
"yarn run prettier --write",
80-
"yarn run eslint",
84+
"yarn run lint:hbs",
85+
"yarn run lint:js",
8186
"git add"
8287
]
8388
},
8489
"engines": {
85-
"node": "^8.0.0"
86-
},
87-
"private": true
90+
"node": "10.*"
91+
}
8892
}

‎index.js renamed to ‎server.js

File renamed without changes.

‎testem.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ module.exports = {
55
launch_in_dev: ['Chrome'],
66
browser_args: {
77
Chrome: {
8-
mode: 'ci',
9-
args: [
8+
ci: [
109
// --no-sandbox is needed when running Chrome inside a container
11-
process.env.TRAVIS ? '--no-sandbox' : null,
12-
13-
'--disable-gpu',
10+
process.env.CI ? '--no-sandbox' : null,
1411
'--headless',
12+
'--disable-gpu',
13+
'--disable-dev-shm-usage',
14+
'--disable-software-rasterizer',
15+
'--mute-audio',
1516
'--remote-debugging-port=0',
1617
'--window-size=1440,900',
1718
].filter(Boolean),

0 commit comments

Comments
 (0)