From ed3e2d798efe08ff70caf64b20fc65ff1f56c16b Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 3 Jun 2020 20:37:53 +0200 Subject: tiling background images --- frontend/views/page/components/page.editor.js | 17 ++++++++++++++--- frontend/views/page/components/tile.form.js | 4 ++-- frontend/views/page/page.css | 4 ++++ 3 files changed, 20 insertions(+), 5 deletions(-) (limited to 'frontend/views') diff --git a/frontend/views/page/components/page.editor.js b/frontend/views/page/components/page.editor.js index 5929b15..7d6afcf 100644 --- a/frontend/views/page/components/page.editor.js +++ b/frontend/views/page/components/page.editor.js @@ -194,23 +194,34 @@ const TileHandle = ({ tile, bounds, box, onMouseDown }) => { } console.log(generateTransform(tile)) let content; + let className = 'tile ' + tile.type switch (tile.type) { case 'image': - content = + if (tile.settings.is_tiled) { + style.backgroundImage = 'url(' + tile.settings.url + ')' + className += ' is_tiled' + } else { + className += ' ' + tile.settings.align + content = + } break case 'text': content = + className += ' ' + tile.settings.align break } return ( -
+
{content}
) } const generateTransform = tile => { - const { x, y, align, rotation, scale } = tile.settings + const { x, y, align, rotation, scale, is_tiled } = tile.settings + if (is_tiled) { + return 'translateZ(0)' + } const [yalign, xalign] = align.split('_') let transform = ['translateZ(0)'] if (yalign === 'center') { diff --git a/frontend/views/page/components/tile.form.js b/frontend/views/page/components/tile.form.js index dc81c1a..1c2c826 100644 --- a/frontend/views/page/components/tile.form.js +++ b/frontend/views/page/components/tile.form.js @@ -35,7 +35,7 @@ const newImage = (data) => ({ id: 'new', settings: { ...newPosition(), - tile: false, + is_tiled: false, url: "https://s3.amazonaws.com/i.asdf.us/im/1c/gradient_gold1-SpringGreen1_1321159749.jpg", }, type: 'image', @@ -267,7 +267,7 @@ class TileForm extends Component { />