Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-01-23 02:25:07 +00:00
Code Issues Projects Releases Wiki Activity

Change uppy-server port to 3020

Browse source
This commit is contained in:
Kevin van Zonneveld 2016-04-08 19:52:49 +02:00
parent bde0d2cb8b
commit 6707e35b7c
8 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/bootandkill-servers
View file

@ -38,8 +38,8 @@ function cleanup_servers () {
echo "[${__base}] --> Killing any server listening on port 4000"
killProcessListeningOnPort 4000 || true
echo "[${__base}] --> Killing any server listening on port 8080"
killProcessListeningOnPort 8080 || true
echo "[${__base}] --> Killing any server listening on port 3020"
killProcessListeningOnPort 3020 || true
kill -9 ${tailPid}
}
@ -62,8 +62,8 @@ function waitForPortOpen () {
echo "[${__base}] --> Killing any server listening on port 4000"
killProcessListeningOnPort 4000 || true
echo "[${__base}] --> Killing any server listening on port 8080"
killProcessListeningOnPort 8080 || true
echo "[${__base}] --> Killing any server listening on port 3020"
killProcessListeningOnPort 3020 || true
echo "[${__base}] --> Start webserver and uppy-server in the background"
rm -f nohup.out || true
@ -80,7 +80,7 @@ echo "[${__base}] --> Wait for hexo webserver to be online"
waitForPortOpen 4000
echo "[${__base}] --> Wait for uppy-server to be online"
waitForPortOpen 8080
waitForPortOpen 3020
echo "[${__base}] --> Running acceptance tests"

2
package.json
View file

@ -20,7 +20,7 @@
"release:minor": "env SEMANTIC=minor npm run release",
"release:patch": "env SEMANTIC=patch npm run release",
"release": "npm version ${SEMANTIC:-patch} -m \"Release %s\" && git push && git push --tags && npm publish",
"start:server": "uppy-server --port 8080",
"start:server": "uppy-server --port 3020",
"start": "parallelshell 'npm run watch' 'npm run start:server' 'npm run web:preview'",
"test:acceptance:handleservers": "bin/bootandkill-servers node test/acceptance/index.js",
"test:acceptance": "node test/acceptance/index.js",

2
src/plugins/Dropbox.js
View file

@ -24,7 +24,7 @@ export default class Dropbox extends Plugin {
}
getDirectory () {
// request.get('//localhost:8080/dropbox/readdir')
// request.get('//localhost:3020/dropbox/readdir')
// .query(opts)
// .set('Content-Type', 'application/json')
// .end((err, res) => {

9
website/src/examples/env.js
View file

@ -1 +1,8 @@
export const UPPY_SERVER = 'http://localhost:3020'
let uppyServerEndpoint = 'http://localhost:3020'
if (location.hostname === 'uppy.io') {
uppyServerEndpoint = 'http://server.uppy.io:3020'
}
// uppyServerEndpoint = 'http://server.uppy.io:3020'
export const UPPY_SERVER = uppyServerEndpoint

2
website/src/examples/i18n/app.es6
View file

@ -5,7 +5,7 @@ import { ru_RU } from 'uppy/locales'
const uppy = new Uppy({wait: false, locales: ru_RU})
uppy
.use(Tus10, {endpoint: 'http://master.tus.io:8080/files/'})
.use(Tus10, {endpoint: 'http://master.tus.io:3020/files/'})
.run()
console.log('--> Uppy Bundled version with Tus10 & Russian language pack has loaded')

2
website/src/examples/i18n/app.html
View file

@ -11,7 +11,7 @@
<script>
var uppy = new Uppy.Core({locales: Uppy.locales.ru_RU});
uppy.use(Uppy.plugins.DragDrop, {target: '.UppyDragDrop'});
uppy.use(Uppy.plugins.Tus10, {endpoint: 'http://master.tus.io:8080/files/'});
uppy.use(Uppy.plugins.Tus10, {endpoint: 'http://master.tus.io:3020/files/'});
uppy.run();
console.log('--> Uppy pre-built version with Tus10, DragDrop & Russian language pack has loaded');

2
website/src/examples/modal/app.es6
View file

@ -10,6 +10,6 @@ uppy
// .use(GoogleDrive, {target: Modal})
.use(Dummy, {target: Modal})
// .use(Present, {target: Modal})
.use(Tus10, {endpoint: 'http://master.tus.io:8080/files/'})
.use(Tus10, {endpoint: 'http://master.tus.io:3020/files/'})
.use(ProgressDrawer, {target: Modal})
.run()

2
website/themes/uppy/source/js/uppy.js
View file

@ -2375,7 +2375,7 @@ var Dropbox = (function (_Plugin) {
var opts = {
dir: 'pizza'
};
_superagent2['default'].get('//localhost:8080/dropbox/readdir').query(opts).set('Content-Type', 'application/json').end(function (err, res) {
_superagent2['default'].get('//localhost:3020/dropbox/readdir').query(opts).set('Content-Type', 'application/json').end(function (err, res) {
console.log(err);
console.log('yo!');
console.log(res);