when uploading file, add file to project

This commit is contained in:
catarak 2016-07-19 16:49:46 -04:00
parent b3956fb91b
commit 625608ebbb
4 changed files with 80 additions and 47 deletions

View file

@ -13,10 +13,12 @@ export function updateFileContent(name, content) {
export function createFile(formProps) { export function createFile(formProps) {
return (dispatch, getState) => { return (dispatch, getState) => {
debugger; // eslint-disable-line
const state = getState(); const state = getState();
if (state.project.id) { if (state.project.id) {
const postParams = { const postParams = {
name: formProps.name name: formProps.name,
url: formProps.url
}; };
axios.post(`${ROOT_URL}/projects/${state.project.id}/files`, postParams, { withCredentials: true }) axios.post(`${ROOT_URL}/projects/${state.project.id}/files`, postParams, { withCredentials: true })
.then(response => { .then(response => {

View file

@ -1,9 +1,11 @@
import axios from 'axios'; import axios from 'axios';
import { createFile } from './files';
const s3Bucket = 'http://p5js-web-editor-test.s3.amazonaws.com/'; const s3Bucket = 'http://p5js-web-editor-test.s3.amazonaws.com/';
const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api'; const ROOT_URL = location.href.indexOf('localhost') > 0 ? 'http://localhost:8000/api' : '/api';
export function dropzoneAcceptCallback(file, done) { export function dropzoneAcceptCallback(file, done) {
return () => {
file.postData = []; // eslint-disable-line file.postData = []; // eslint-disable-line
axios.post(`${ROOT_URL}/S3/sign`, { axios.post(`${ROOT_URL}/S3/sign`, {
name: file.name, name: file.name,
@ -28,18 +30,22 @@ export function dropzoneAcceptCallback(file, done) {
} }
done('error preparing the upload'); done('error preparing the upload');
}); });
};
} }
export function dropzoneSendingCallback(file, xhr, formData) { export function dropzoneSendingCallback(file, xhr, formData) {
return () => {
Object.keys(file.postData).forEach(key => { Object.keys(file.postData).forEach(key => {
formData.append(key, file.postData[key]); formData.append(key, file.postData[key]);
}); });
formData.append('Content-type', ''); formData.append('Content-type', '');
formData.append('Content-length', ''); formData.append('Content-length', '');
formData.append('acl', 'public-read'); formData.append('acl', 'public-read');
};
} }
export function dropzoneCompleteCallback(file) { export function dropzoneCompleteCallback(file) {
return (dispatch, getState) => { // eslint-disable-line
let inputHidden = '<input type="hidden" name="attachments[]" value="'; let inputHidden = '<input type="hidden" name="attachments[]" value="';
const json = { const json = {
url: `${s3Bucket}${file.postData.key}`, url: `${s3Bucket}${file.postData.key}`,
@ -49,4 +55,11 @@ export function dropzoneCompleteCallback(file) {
inputHidden += `${window.btoa(JSON.stringify(json))}" />`; inputHidden += `${window.btoa(JSON.stringify(json))}" />`;
// document.getElementById('uploader').appendChild(inputHidden); // document.getElementById('uploader').appendChild(inputHidden);
document.getElementById('uploader').innerHTML += inputHidden; document.getElementById('uploader').innerHTML += inputHidden;
const formParams = {
name: file.name,
url: `${s3Bucket}${file.postData.key}`
};
createFile(formParams)(dispatch, getState);
};
} }

View file

@ -1,9 +1,9 @@
import React from 'react'; import React, { PropTypes } from 'react';
import Dropzone from 'dropzone'; import Dropzone from 'dropzone';
const s3Bucket = 'http://p5js-web-editor-test.s3.amazonaws.com/'; const s3Bucket = 'http://p5js-web-editor-test.s3.amazonaws.com/';
import { dropzoneAcceptCallback, import * as UploaderActions from '../actions/uploader';
dropzoneSendingCallback, import { bindActionCreators } from 'redux';
dropzoneCompleteCallback } from '../actions/uploader'; import { connect } from 'react-redux';
class FileUploader extends React.Component { class FileUploader extends React.Component {
componentDidMount() { componentDidMount() {
@ -20,9 +20,9 @@ class FileUploader extends React.Component {
thumbnailWidth: 150, thumbnailWidth: 150,
thumbnailHeight: 150, thumbnailHeight: 150,
acceptedMimeTypes: 'image/bmp,image/gif,image/jpg,image/jpeg,image/png', acceptedMimeTypes: 'image/bmp,image/gif,image/jpg,image/jpeg,image/png',
accept: dropzoneAcceptCallback, accept: this.props.dropzoneAcceptCallback,
sending: dropzoneSendingCallback, sending: this.props.dropzoneSendingCallback,
complete: dropzoneCompleteCallback complete: this.props.dropzoneCompleteCallback
}); });
} }
@ -33,4 +33,21 @@ class FileUploader extends React.Component {
} }
} }
export default FileUploader; FileUploader.propTypes = {
dropzoneAcceptCallback: PropTypes.func.isRequired,
dropzoneSendingCallback: PropTypes.func.isRequired,
dropzoneCompleteCallback: PropTypes.func.isRequired
};
function mapStateToProps(state) {
return {
files: state.files,
project: state.project
};
}
function mapDispatchToProps(dispatch) {
return bindActionCreators(UploaderActions, dispatch);
}
export default connect(mapStateToProps, mapDispatchToProps)(FileUploader);

View file

@ -33,7 +33,8 @@ const defaultCSS =
const fileSchema = new Schema({ const fileSchema = new Schema({
name: { type: String, default: 'sketch.js' }, name: { type: String, default: 'sketch.js' },
content: { type: String, default: defaultSketch } content: { type: String },
url: { type: String }
}, { timestamps: true, _id: true }); }, { timestamps: true, _id: true });
fileSchema.virtual('id').get(function(){ fileSchema.virtual('id').get(function(){