ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar

Browse Source 
Conflicts:
	js/routes.js
This commit is contained in:
ddejongh 2015-06-19 14:05:56 +02:00
parent efc7f6d46b
commit e1dbc0e183
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@ -49,7 +49,7 @@ var config = {
filesToWatch: [ filesToWatch: [
'build/css/*.css', 'build/css/*.css',
'build/js/*.js', 'build/js/*.js',
'node_modules/react-s3-fineuploader/*.js' 'node_modules/react-s3-fine_uploader/*.js'
] ]
}; };
@ -69,7 +69,7 @@ gulp.task('js:build', function() {
bundle(false); bundle(false);
}); });
gulp.task('serve', ['browser-sync', 'run-server', 'sass:build', 'sass:watch', 'copy'], function() { gulp.task('serve', ['browser-sync', 'run-server', 'sass:watch', 'copy'], function() {
bundle(true); bundle(true);
}); });

1
index.html
View File

@ -11,6 +11,7 @@
<script> <script>
window.BASE_URL = '<%= BASE_URL %>'; window.BASE_URL = '<%= BASE_URL %>';
window.API_ENDPOINT = '<%= API_ENDPOINT %>'; window.API_ENDPOINT = '<%= API_ENDPOINT %>';
window.SERVER_URL = '<%= SERVER_URL %>';
<% DEBUG && print('window.DEBUG = true'); %> <% DEBUG && print('window.DEBUG = true'); %>
<% DEBUG && print('window.CREDENTIALS = \'' + CREDENTIALS + '\''); %> <% DEBUG && print('window.CREDENTIALS = \'' + CREDENTIALS + '\''); %>
</script> </script>

5
js/components/register_piece.js
View File

@ -9,8 +9,9 @@ import ReactS3FineUploader from 'ReactS3FineUploader';
let RegisterPiece = React.createClass( { let RegisterPiece = React.createClass( {
render() { render() {
console.log(AppConstants.serverUrl)
return ( return (
<div> <div>
<ReactS3FineUploader <ReactS3FineUploader
keyRoutine={{ keyRoutine={{
@ -74,4 +75,4 @@ let RegisterPiece = React.createClass( {
} }
}); });
export default RegisterPiece; export default RegisterPiece;

2
node_modules/react-s3-fineuploader generated vendored

@ -1 +1 @@
Subproject commit 2161e28e1bf5f69719c8b376ecb24fd3334806ba Subproject commit e2890cf3d28d010abc04e0de3b218afe8c949596

1
package.json
View File

@ -27,7 +27,6 @@
"compact": false "compact": false
} }
], ],
"reactify",
"browserify-shim" "browserify-shim"
] ]
}, },