From ac43e33512a8e70ba34574de60cba0f5f7a03490 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 10 Aug 2020 18:45:26 +0200 Subject: sortable --- .../app/views/media/components/media.form.js | 2 +- .../views/media/components/media.formGallery.js | 81 ++++++++++------------ .../app/views/media/containers/media.index.js | 17 +++++ 3 files changed, 53 insertions(+), 47 deletions(-) (limited to 'animism-align/frontend') diff --git a/animism-align/frontend/app/views/media/components/media.form.js b/animism-align/frontend/app/views/media/components/media.form.js index 60b8736..2d21838 100644 --- a/animism-align/frontend/app/views/media/components/media.form.js +++ b/animism-align/frontend/app/views/media/components/media.form.js @@ -259,7 +259,7 @@ export default class MediaForm extends Component { onChange={this.handleSettingsChangeEvent} /> this.setState({ img })) - } - } - handleChange(e) { const { name, value } = e.target this.handleSelect(name, value) @@ -49,22 +42,8 @@ export default class MediaGalleryForm extends Component { this.props.onSettingsChange(name, value) } - handleUpload({ file, img, canvas, blob }) { - // sizes: fullsize, display, thumbnail - this.replaceTaggedSize(file, 'fullsize') - .then(data => { - this.setState({ img }) - this.props.onSettingsChange('multiple', { - fullsize: data, - crop: {}, - }) - return this.replaceTaggedSize(blob, 'display', file.name) - }).then(data => { - this.props.onSettingsChange('multiple', { - display: data, - }) - this.uploadThumbnail(img) - }) + handleUpload(files) { + // this.uploadThumbnail(img) } uploadThumbnail(img) { @@ -115,32 +94,42 @@ export default class MediaGalleryForm extends Component { }) } + handleOrderChanged(image_order) { + this.handleSettingsChange('image_order', image_order) + } + render() { const { data } = this.props + const { image_order, image_lookup, thumbnail_lookup } = data.settings // console.log(data) return ( -
- {!data.url && - - } - {data.settings.fullsize && -
- {data.settings.fullsize.url} -
- } +
+ + this.handleOrderChanged(new_order)} + > + {(image_order || []).map(image_id => { + + })} +
) } } + +const GalleryImageForm =({ id, key, image, thumbnail }) => { + return ( +
+ ) +} diff --git a/animism-align/frontend/app/views/media/containers/media.index.js b/animism-align/frontend/app/views/media/containers/media.index.js index 7935563..2b80362 100644 --- a/animism-align/frontend/app/views/media/containers/media.index.js +++ b/animism-align/frontend/app/views/media/containers/media.index.js @@ -74,6 +74,8 @@ class MediaIndex extends Component {

Images

{order.filter(id => lookup[id].type === 'image').map(id => )} +

Galleries

+ {order.filter(id => lookup[id].type === 'gallery').map(id => )}

Video

{order.filter(id => lookup[id].type === 'video').map(id => )}

Files

@@ -106,6 +108,21 @@ const MediaItem = ({ data }) => { ) } +const GalleryItem = ({ data }) => { + // console.log(data) + return ( +
+
+ +
+ {data.title}
+
+ +
+
+ ) +} + const FileItem = ({ data }) => { // console.log(data) return ( -- cgit v1.2.3-70-g09d2