build

3 files changed, 7 insertions, 5 deletions

diff --git a/animism-align/frontend/views/upload/components/upload.index.js b/animism-align/frontend/views/upload/components/upload.index.js
index d17c4ca..3a7ae4b 100644
--- a/animism-align/frontend/views/upload/components/upload.index.js
+++ b/animism-align/frontend/views/upload/components/upload.index.js
@@ -79,12 +79,12 @@ export default class UploadIndex extends Component {
 
 const UploadItem = ({ data }) => {
   // console.log(data)
-  const imageUri = uploadUri(data)
+  // const imageUri = uploadUri(data)
   return (
     <div className='cell'>
       <div className='img'>
         <Link to={"/upload/" + data.id + "/show/"}>
-          <img src={imageUri} alt={"Uploaded image"} />
+          <img src={data.url} alt={"Uploaded image"} />
         </Link>
       </div>
       <div className='meta center'>
diff --git a/animism-align/frontend/views/upload/upload.actions.js b/animism-align/frontend/views/upload/upload.actions.js
index a04e4d8..c5d12e3 100644
--- a/animism-align/frontend/views/upload/upload.actions.js
+++ b/animism-align/frontend/views/upload/upload.actions.js
@@ -4,10 +4,11 @@ import { api, post, pad, preloadImage } from '../../util'
 import actions from '../../actions'
 import { session } from '../../session'
 
-export const upload = file => dispatch => {
+export const upload = (image, tag='upload') => dispatch => {
   const formData = {
-    'image': file,
-    'username': 'animism', // session('username'),
+    image,
+    tag,
+    username: 'animism', // session('username'),
   }
   // console.log(formData)
   return actions.upload.upload(formData).then(data => {
diff --git a/animism-align/frontend/views/upload/upload.css b/animism-align/frontend/views/upload/upload.css
index 8d77754..1dc8ac0 100644
--- a/animism-align/frontend/views/upload/upload.css
+++ b/animism-align/frontend/views/upload/upload.css
@@ -7,4 +7,5 @@
 }
 .upload > div:last-child {
   flex: 1;
+  width: 100%;
 }
\ No newline at end of file