ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +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 13:13:37 +02:00
parent 48d44c0a30
commit efc7f6d46b
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gulpfile.js
View File

@ -56,6 +56,7 @@ var config = {
var constants = { var constants = {
BASE_URL: (function () { var baseUrl = process.env.ONION_BASE_URL || '/'; return baseUrl + (baseUrl.match(/\/$/) ? '' : '/'); })(), BASE_URL: (function () { var baseUrl = process.env.ONION_BASE_URL || '/'; return baseUrl + (baseUrl.match(/\/$/) ? '' : '/'); })(),
API_ENDPOINT: process.env.ONION_API_ENDPOINT || 'http://staging.ascribe.io/api/', API_ENDPOINT: process.env.ONION_API_ENDPOINT || 'http://staging.ascribe.io/api/',
SERVER_URL: process.env.ONION_SERVER_URL || 'http://staging.ascribe.io/',
DEBUG: !argv.production, DEBUG: !argv.production,
CREDENTIALS: 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw' // dimi@mailinator:0000000000 CREDENTIALS: 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw' // dimi@mailinator:0000000000
}; };
@ -172,14 +173,21 @@ function bundle(watch) {
return bundler.bundle() return bundler.bundle()
.on('error', notify.onError('Error: <%= error.message %>')) .on('error', notify.onError('Error: <%= error.message %>'))
.pipe(source('app.js')) .pipe(source('app.js'))
.on('error', notify.onError('Error: <%= error.message %>'))
.pipe(buffer()) .pipe(buffer())
.on('error', notify.onError('Error: <%= error.message %>'))
.pipe(gulpif(!argv.production, sourcemaps.init({ .pipe(gulpif(!argv.production, sourcemaps.init({
loadMaps: true loadMaps: true
}))) // loads map from browserify file }))) // loads map from browserify file
.on('error', notify.onError('Error: <%= error.message %>'))
.pipe(gulpif(!argv.production, sourcemaps.write())) // writes .map file .pipe(gulpif(!argv.production, sourcemaps.write())) // writes .map file
.on('error', notify.onError('Error: <%= error.message %>'))
.pipe(gulpif(argv.production, uglify())) .pipe(gulpif(argv.production, uglify()))
.on('error', notify.onError('Error: <%= error.message %>'))
.pipe(gulp.dest('./build/js')) .pipe(gulp.dest('./build/js'))
.pipe(browserSync.stream()); .on('error', notify.onError('Error: <%= error.message %>'))
.pipe(browserSync.stream())
.on('error', notify.onError('Error: <%= error.message %>'));
} }
return rebundle(bro); return rebundle(bro);

7
js/components/register_piece.js
View File

@ -9,11 +9,12 @@ import ReactS3FineUploader from 'ReactS3FineUploader';
let RegisterPiece = React.createClass( { let RegisterPiece = React.createClass( {
render() { render() {
return ( return (
<div> <div>
<ReactS3FineUploader <ReactS3FineUploader
keyRoutine={{ keyRoutine={{
url: AppConstants.apiEndpoint + '/s3/key/', url: AppConstants.serverUrl + 's3/key/',
fileClass: 'digitalwork' fileClass: 'digitalwork'
}} }}
autoUpload={true} autoUpload={true}
@ -27,7 +28,7 @@ let RegisterPiece = React.createClass( {
accessKey: 'AKIAIVCZJ33WSCBQ3QDA' accessKey: 'AKIAIVCZJ33WSCBQ3QDA'
}} }}
signature={{ signature={{
endpoint: AppConstants.apiEndpoint + '/s3/signature/' endpoint: AppConstants.serverUrl + 's3/signature/'
}} }}
uploadSuccess={{ uploadSuccess={{
params: { params: {
@ -49,7 +50,7 @@ let RegisterPiece = React.createClass( {
deleteFile={{ deleteFile={{
enabled: true, enabled: true,
method: 'DELETE', method: 'DELETE',
endpoint: AppConstants.apiEndpoint + '/s3/delete' endpoint: AppConstants.serverUrl + 's3/delete'
}} }}
validation={{ validation={{
itemLimit: 100000, itemLimit: 100000,

1
js/constants/application_constants.js
View File

@ -7,6 +7,7 @@ let constants = {
// super pro. What if we render stuff on the server? // super pro. What if we render stuff on the server?
//'baseUrl': window.BASE_URL, //'baseUrl': window.BASE_URL,
'apiEndpoint': window.API_ENDPOINT, 'apiEndpoint': window.API_ENDPOINT,
'serverUrl': window.SERVER_URL,
'baseUrl': window.BASE_URL, 'baseUrl': window.BASE_URL,
'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer', 'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection'] 'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "Onion", "name": "Onion",
"version": "0.0.1", "version": "0.0.1",
"description": "Das neue web client for Ascribe", "description": "Das neue web client for Ascribe. Onions make you cry",
"main": "js/app.js", "main": "js/app.js",
"engines": { "engines": {
"node": "0.10.x" "node": "0.10.x"
@ -14,7 +14,7 @@
}, },
"browser": { "browser": {
"fineUploader": "./node_modules/react-s3-fineuploader/vendor/s3.fine-uploader.js", "fineUploader": "./node_modules/react-s3-fineuploader/vendor/s3.fine-uploader.js",
"ReactS3FineUploader": "./node_modules/react-s3-fineuploader/react_s3_fineuploader.js" "ReactS3FineUploader": "./node_modules/react-s3-fineuploader/react_s3_fine_uploader.js"
}, },
"browserify-shim": { "browserify-shim": {
"fineUploader": "qq" "fineUploader": "qq"

1
sass/main.scss
View File

@ -19,6 +19,7 @@ $BASE_URL: '<%= BASE_URL %>';
@import 'ascribe-global-notification'; @import 'ascribe-global-notification';
@import 'offset_right'; @import 'offset_right';
@import 'ascribe_settings'; @import 'ascribe_settings';
@import '../node_modules/react-s3-fineuploader/scss/ascribe-theme';
body { body {
background-color: #FDFDFD; background-color: #FDFDFD;