diff --git a/frontend/src/views/angle_person_event_left/canvas.js b/frontend/src/views/angle_person_event_left/canvas.js index a9d9e9df6142678af2d19bb3dda1e9d32c362c1b..61a79eddefdf9a1a234ff1a1f7b3990c601633c3 100644 --- a/frontend/src/views/angle_person_event_left/canvas.js +++ b/frontend/src/views/angle_person_event_left/canvas.js @@ -78,9 +78,15 @@ const redraw = async (canvas, options) => { personImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/angle_person_event_right/canvas.js b/frontend/src/views/angle_person_event_right/canvas.js index 25af41b25499ca11b8d8f96b1f4a85451f8642d9..6f30ad3ae23ee7e6c964bd179d7f9d0573ede7f0 100644 --- a/frontend/src/views/angle_person_event_right/canvas.js +++ b/frontend/src/views/angle_person_event_right/canvas.js @@ -78,9 +78,15 @@ const redraw = async (canvas, options) => { personImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/avatar/canvas.js b/frontend/src/views/avatar/canvas.js index bdd45b6e699f5075bb98897785af1fbb5aa10aac..8f8090cedb68187787f3d967fe836298e55c4385 100644 --- a/frontend/src/views/avatar/canvas.js +++ b/frontend/src/views/avatar/canvas.js @@ -47,9 +47,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/back_in_full_force_banner/canvas.js b/frontend/src/views/back_in_full_force_banner/canvas.js index abdce937e09d2df916d9f4d41fb236f40e1cc193..4bc3f3b3eecf23c161c78f010a4403f4b7d6fbb5 100644 --- a/frontend/src/views/back_in_full_force_banner/canvas.js +++ b/frontend/src/views/back_in_full_force_banner/canvas.js @@ -238,9 +238,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/back_in_full_force_tour_social/canvas.js b/frontend/src/views/back_in_full_force_tour_social/canvas.js index e1f89de7b682c2797e4bbea52453defd2bcd2946..ed24c34af1be45d32a79ae3700c99885625e8259 100644 --- a/frontend/src/views/back_in_full_force_tour_social/canvas.js +++ b/frontend/src/views/back_in_full_force_tour_social/canvas.js @@ -428,9 +428,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/back_in_full_force_tour_social_A2/canvas.js b/frontend/src/views/back_in_full_force_tour_social_A2/canvas.js index 93cb61bf411d7d5f1b651aaa1eb610737bc6aa90..6cd498c473af8f8061f1808f883d12f6917082f3 100644 --- a/frontend/src/views/back_in_full_force_tour_social_A2/canvas.js +++ b/frontend/src/views/back_in_full_force_tour_social_A2/canvas.js @@ -428,9 +428,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/back_in_full_force_tour_social_wide/canvas.js b/frontend/src/views/back_in_full_force_tour_social_wide/canvas.js index bec432da2dcafa0311470faace6cc49e3fbd3814..265e4552d93ead6957e6a1d675ac70d489e5fc0c 100644 --- a/frontend/src/views/back_in_full_force_tour_social_wide/canvas.js +++ b/frontend/src/views/back_in_full_force_tour_social_wide/canvas.js @@ -418,9 +418,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/base_person_event/canvas.js b/frontend/src/views/base_person_event/canvas.js index 2c6ebebc0ae4c99d0da27c6500ef7b2116a2752e..de8019f7a49a510797b07edd61541507e2e3f29c 100644 --- a/frontend/src/views/base_person_event/canvas.js +++ b/frontend/src/views/base_person_event/canvas.js @@ -78,9 +78,15 @@ const redraw = async (canvas, options) => { personImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/basic_photo_banner/canvas.js b/frontend/src/views/basic_photo_banner/canvas.js index 9e6738cb852714806b91c94010b668ebef75f0ca..17f1c6f8bc00a884b8dfa13e3ed9240dc95f50d2 100644 --- a/frontend/src/views/basic_photo_banner/canvas.js +++ b/frontend/src/views/basic_photo_banner/canvas.js @@ -350,9 +350,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/event_poster/canvas.js b/frontend/src/views/event_poster/canvas.js index 834da794bace347f035fa8098801c269f02d9629..8c2dbc597a35c61d31d4ab17b55b6dce31c4f6b5 100644 --- a/frontend/src/views/event_poster/canvas.js +++ b/frontend/src/views/event_poster/canvas.js @@ -96,9 +96,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/facebook_survey/canvas.js b/frontend/src/views/facebook_survey/canvas.js index 5fcb3a3d9515d4f26f33c131199cd317ad9326a3..99943879dc608b457ad625e3d27b264458a464bc 100644 --- a/frontend/src/views/facebook_survey/canvas.js +++ b/frontend/src/views/facebook_survey/canvas.js @@ -365,9 +365,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/make_a_wish_banner/canvas.js b/frontend/src/views/make_a_wish_banner/canvas.js index 6cfe2a3580c9b256e33147ee76697b729bb4923e..9c67d29969342b9c0dc4264f10bb466cb093c2cc 100644 --- a/frontend/src/views/make_a_wish_banner/canvas.js +++ b/frontend/src/views/make_a_wish_banner/canvas.js @@ -306,9 +306,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/make_a_wish_tour_social/canvas.js b/frontend/src/views/make_a_wish_tour_social/canvas.js index eea94bab27f2e73f6cc50038d6ecbc4e3f659cbd..1ca93ae037aa618ce250420fea97976122054800 100644 --- a/frontend/src/views/make_a_wish_tour_social/canvas.js +++ b/frontend/src/views/make_a_wish_tour_social/canvas.js @@ -420,9 +420,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/make_a_wish_tour_social_A2/canvas.js b/frontend/src/views/make_a_wish_tour_social_A2/canvas.js index 06affff7233f05172977bc4e558069c9765c9eae..51d97d55f63c4df1bf039e85b0809f25fbe58baf 100644 --- a/frontend/src/views/make_a_wish_tour_social_A2/canvas.js +++ b/frontend/src/views/make_a_wish_tour_social_A2/canvas.js @@ -444,9 +444,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/make_a_wish_tour_social_wide/canvas.js b/frontend/src/views/make_a_wish_tour_social_wide/canvas.js index 348f78d92a5e8776048d97ab0929ff71a424679e..5bd330f77a172a80c80a220ceba2f0006abb7972 100644 --- a/frontend/src/views/make_a_wish_tour_social_wide/canvas.js +++ b/frontend/src/views/make_a_wish_tour_social_wide/canvas.js @@ -414,9 +414,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/nakopneme_basic_photo_banner/canvas.js b/frontend/src/views/nakopneme_basic_photo_banner/canvas.js index c0703dcc5d51ac8c3f0fd7fc92fbc34c22d8e0ef..794267cfceed9bf00043bcef015af26788ba895e 100644 --- a/frontend/src/views/nakopneme_basic_photo_banner/canvas.js +++ b/frontend/src/views/nakopneme_basic_photo_banner/canvas.js @@ -7,8 +7,8 @@ import { getSingleLineTextBoxWidth, } from "../../components/canvas/utils"; import { PaddedHighlightingTextbox } from "../../components/canvas/textbox"; -import leftQuoteImage from '../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_left.png'; -import rightQuoteImage from '../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_right.png'; +import leftQuoteImage from "../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_left.png"; +import rightQuoteImage from "../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_right.png"; let mainTextBox = null; let mainTextBoxBackground = null; @@ -149,14 +149,12 @@ const redraw = async (canvas, options) => { await imageLoadPromiseR; rightQuote = new fabric.Image(rightQuote, { - left: getSingleLineTextBoxWidth( - mainTextBox.textLines[mainTextBox.textLines.length - 1], - mainTextSize, - "Bebas Neue" - ) + ( - (mainTextBox.textLines.length == 1) ? - 260 : 170 - ), + left: + getSingleLineTextBoxWidth( + mainTextBox.textLines[mainTextBox.textLines.length - 1], + mainTextSize, + "Bebas Neue", + ) + (mainTextBox.textLines.length == 1 ? 260 : 170), top: mainTextBox.top + mainTextBox.height - mainTextSize + 6, zIndex: 20, selectable: false, @@ -189,19 +187,22 @@ const redraw = async (canvas, options) => { zIndex: 10, }); - personNameText.set('fill', new fabric.Gradient({ - type: 'linear', - coords: { - x1: 0, - y1: 0, - x2: canvas.width * 0.3, - y2: 0 - }, - colorStops: [ - { offset: 0, color: '#CF7BCC' }, - { offset: 1, color: '#FDC801' } - ] - })); + personNameText.set( + "fill", + new fabric.Gradient({ + type: "linear", + coords: { + x1: 0, + y1: 0, + x2: canvas.width * 0.3, + y2: 0, + }, + colorStops: [ + { offset: 0, color: "#CF7BCC" }, + { offset: 1, color: "#FDC801" }, + ], + }), + ); canvas.add(personNameText); } @@ -330,14 +331,19 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); - if (mainImage.width >= mainImage.height) { mainImage.scaleToHeight(canvas.height); } else { diff --git a/frontend/src/views/nakopneme_basic_photo_banner_fz/canvas.js b/frontend/src/views/nakopneme_basic_photo_banner_fz/canvas.js index 0bf1bf4bbe7dd542cddfe427c039f5d68a525a2d..93dd7dc57605e8293e480e9f2d5e3e3768d804db 100644 --- a/frontend/src/views/nakopneme_basic_photo_banner_fz/canvas.js +++ b/frontend/src/views/nakopneme_basic_photo_banner_fz/canvas.js @@ -7,8 +7,8 @@ import { getSingleLineTextBoxWidth, } from "../../components/canvas/utils"; import { PaddedHighlightingTextbox } from "../../components/canvas/textbox"; -import leftQuoteImage from '../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_left.png'; -import rightQuoteImage from '../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_right.png'; +import leftQuoteImage from "../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_left.png"; +import rightQuoteImage from "../../assets/template/nakopneme_basic_photo_banner/nakopneme_quote_right.png"; let mainTextBox = null; let mainTextBoxBackground = null; @@ -138,7 +138,7 @@ const redraw = async (canvas, options) => { colorStops: [ { offset: 0, - color: "#ffffff00" + color: "#ffffff00", }, { offset: 0.5, @@ -243,14 +243,19 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); - if (mainImage.width >= mainImage.height) { mainImage.scaleToHeight(canvas.height); } else { diff --git a/frontend/src/views/newspaper_quote_bottom/canvas.js b/frontend/src/views/newspaper_quote_bottom/canvas.js index 524cfd6be4ed2294a531fb0430fbcb889496ef48..bcc04905daf6914a72b658854d8c36d2f17db4a5 100644 --- a/frontend/src/views/newspaper_quote_bottom/canvas.js +++ b/frontend/src/views/newspaper_quote_bottom/canvas.js @@ -406,9 +406,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/people_banner_with_custom_text/canvas.js b/frontend/src/views/people_banner_with_custom_text/canvas.js index ecc1ccd3838e0be1e03742e7dce94fb71b0b0370..b446baf226ea4e69dfa73d802edf026efceb79d8 100644 --- a/frontend/src/views/people_banner_with_custom_text/canvas.js +++ b/frontend/src/views/people_banner_with_custom_text/canvas.js @@ -77,9 +77,15 @@ const redraw = async (canvas, options) => { personImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/people_banner_with_predefined_text/canvas.js b/frontend/src/views/people_banner_with_predefined_text/canvas.js index 25f960bb950cc394f313fcb045553fe16be0a372..02c76ca5de96cb9fe6610f8d677f781d832c582f 100644 --- a/frontend/src/views/people_banner_with_predefined_text/canvas.js +++ b/frontend/src/views/people_banner_with_predefined_text/canvas.js @@ -77,9 +77,15 @@ const redraw = async (canvas, options) => { personImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/poster/canvas.js b/frontend/src/views/poster/canvas.js index 66f85d3004697de88b49ba33e58c123513481840..46b57f070e1af47faf36c66086dbd46c50598ef9 100644 --- a/frontend/src/views/poster/canvas.js +++ b/frontend/src/views/poster/canvas.js @@ -125,9 +125,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/reel/canvas.js b/frontend/src/views/reel/canvas.js index 0f202fa7aa0fe2a9ecbd26b4d03796668fc3a291..3bf6bd44d2e1458210d8fa99086e00a92c08193e 100644 --- a/frontend/src/views/reel/canvas.js +++ b/frontend/src/views/reel/canvas.js @@ -62,9 +62,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/regional_success/canvas.js b/frontend/src/views/regional_success/canvas.js index c2eeaece9e187cde937be32c7bc6f57aa81730fb..b78dc46d28931769849610cee8c880a3212cbbd4 100644 --- a/frontend/src/views/regional_success/canvas.js +++ b/frontend/src/views/regional_success/canvas.js @@ -229,9 +229,15 @@ const redraw = async (canvas, options) => { mainImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, }); diff --git a/frontend/src/views/right_person_event/canvas.js b/frontend/src/views/right_person_event/canvas.js index f13d4ddaa946633463ab3c853e4dd05738e64890..8bd8a3c994846135b284b0f0809839e3d44980b8 100644 --- a/frontend/src/views/right_person_event/canvas.js +++ b/frontend/src/views/right_person_event/canvas.js @@ -78,9 +78,15 @@ const redraw = async (canvas, options) => { personImage.setControlsVisibility({ // corners (uniform scale) - tl: true, tr: true, bl: true, br: true, + tl: true, + tr: true, + bl: true, + br: true, // mids (scale X/Y independently) - ml: true, mr: true, mt: true, mb: true, + ml: true, + mr: true, + mt: true, + mb: true, // rotation mtr: false, });