2848 - Added photo cropper
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
4628c8ab6f
commit
a87ebba4ab
|
|
@ -14,6 +14,7 @@
|
|||
"angular-animate": "^1.7.8",
|
||||
"angular-translate": "^2.18.1",
|
||||
"angular-translate-loader-partial": "^2.18.1",
|
||||
"croppie": "^2.6.5",
|
||||
"js-yaml": "^3.13.1",
|
||||
"mg-crud": "^1.1.2",
|
||||
"oclazyload": "^0.6.3",
|
||||
|
|
@ -77,6 +78,11 @@
|
|||
"sprintf-js": "~1.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/croppie": {
|
||||
"version": "2.6.5",
|
||||
"resolved": "https://registry.npmjs.org/croppie/-/croppie-2.6.5.tgz",
|
||||
"integrity": "sha512-IlChnVUGG5T3w2gRZIaQgBtlvyuYnlUWs2YZIXXR3H9KrlO1PtBT3j+ykxvy9eZIWhk+V5SpBmhCQz5UXKrEKQ=="
|
||||
},
|
||||
"node_modules/esprima": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
|
||||
|
|
@ -200,6 +206,11 @@
|
|||
"sprintf-js": "~1.0.2"
|
||||
}
|
||||
},
|
||||
"croppie": {
|
||||
"version": "2.6.5",
|
||||
"resolved": "https://registry.npmjs.org/croppie/-/croppie-2.6.5.tgz",
|
||||
"integrity": "sha512-IlChnVUGG5T3w2gRZIaQgBtlvyuYnlUWs2YZIXXR3H9KrlO1PtBT3j+ykxvy9eZIWhk+V5SpBmhCQz5UXKrEKQ=="
|
||||
},
|
||||
"esprima": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"angular-animate": "^1.7.8",
|
||||
"angular-translate": "^2.18.1",
|
||||
"angular-translate-loader-partial": "^2.18.1",
|
||||
"croppie": "^2.6.5",
|
||||
"js-yaml": "^3.13.1",
|
||||
"mg-crud": "^1.1.2",
|
||||
"oclazyload": "^0.6.3",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,252 @@
|
|||
@import "./variables";
|
||||
|
||||
|
||||
.croppie-container {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.croppie-container .cr-image {
|
||||
z-index: -1;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
transform-origin: 0 0;
|
||||
max-height: none;
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.croppie-container .cr-boundary {
|
||||
border: 2px solid $color-primary;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
margin: 0 auto;
|
||||
z-index: 1;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.croppie-container .cr-viewport,
|
||||
.croppie-container .cr-resizer {
|
||||
position: absolute;
|
||||
border: 2px solid #fff;
|
||||
margin: auto;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
left: 0;
|
||||
box-shadow: 0 0 2000px 2000px rgba(0, 0, 0, 0.5);
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.croppie-container .cr-resizer {
|
||||
z-index: 2;
|
||||
box-shadow: none;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.croppie-container .cr-resizer-vertical,
|
||||
.croppie-container .cr-resizer-horisontal {
|
||||
position: absolute;
|
||||
pointer-events: all;
|
||||
}
|
||||
|
||||
.croppie-container .cr-resizer-vertical::after,
|
||||
.croppie-container .cr-resizer-horisontal::after {
|
||||
display: block;
|
||||
position: absolute;
|
||||
box-sizing: border-box;
|
||||
border: 1px solid black;
|
||||
background: #fff;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
content: '';
|
||||
}
|
||||
|
||||
.croppie-container .cr-resizer-vertical {
|
||||
bottom: -5px;
|
||||
cursor: row-resize;
|
||||
width: 100%;
|
||||
height: 10px;
|
||||
}
|
||||
|
||||
.croppie-container .cr-resizer-vertical::after {
|
||||
left: 50%;
|
||||
margin-left: -5px;
|
||||
}
|
||||
|
||||
.croppie-container .cr-resizer-horisontal {
|
||||
right: -5px;
|
||||
cursor: col-resize;
|
||||
width: 10px;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.croppie-container .cr-resizer-horisontal::after {
|
||||
top: 50%;
|
||||
margin-top: -5px;
|
||||
}
|
||||
|
||||
.croppie-container .cr-original-image {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.croppie-container .cr-vp-circle {
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.croppie-container .cr-overlay {
|
||||
z-index: 1;
|
||||
position: absolute;
|
||||
cursor: move;
|
||||
touch-action: none;
|
||||
}
|
||||
|
||||
.croppie-container .cr-slider-wrap {
|
||||
margin: 15px auto;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.croppie-result {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.croppie-result img {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.croppie-container .cr-image,
|
||||
.croppie-container .cr-overlay,
|
||||
.croppie-container .cr-viewport {
|
||||
-webkit-transform: translateZ(0);
|
||||
-moz-transform: translateZ(0);
|
||||
-ms-transform: translateZ(0);
|
||||
transform: translateZ(0);
|
||||
}
|
||||
|
||||
/*************************************/
|
||||
/***** STYLING RANGE INPUT ***********/
|
||||
/*************************************/
|
||||
/*http://brennaobrien.com/blog/2014/05/style-input-type-range-in-every-browser.html */
|
||||
/*************************************/
|
||||
|
||||
.cr-slider {
|
||||
-webkit-appearance: none;
|
||||
/*removes default webkit styles*/
|
||||
/*border: 1px solid white; *//*fix for FF unable to apply focus style bug */
|
||||
width: 300px;
|
||||
/*required for proper track sizing in FF*/
|
||||
max-width: 100%;
|
||||
padding-top: 8px;
|
||||
padding-bottom: 8px;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.cr-slider::-webkit-slider-runnable-track {
|
||||
width: 100%;
|
||||
height: 3px;
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.cr-slider::-webkit-slider-thumb {
|
||||
-webkit-appearance: none;
|
||||
border: none;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
border-radius: 50%;
|
||||
background: $color-primary;
|
||||
margin-top: -6px;
|
||||
}
|
||||
|
||||
.cr-slider:focus {
|
||||
outline: none;
|
||||
}
|
||||
/*
|
||||
.cr-slider:focus::-webkit-slider-runnable-track {
|
||||
background: #ccc;
|
||||
}
|
||||
*/
|
||||
|
||||
.cr-slider::-moz-range-track {
|
||||
width: 100%;
|
||||
height: 3px;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border: 0;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.cr-slider::-moz-range-thumb {
|
||||
border: none;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
border-radius: 50%;
|
||||
background: #ddd;
|
||||
margin-top: -6px;
|
||||
}
|
||||
|
||||
/*hide the outline behind the border*/
|
||||
.cr-slider:-moz-focusring {
|
||||
outline: 1px solid white;
|
||||
outline-offset: -1px;
|
||||
}
|
||||
|
||||
.cr-slider::-ms-track {
|
||||
width: 100%;
|
||||
height: 5px;
|
||||
background: transparent;
|
||||
/*remove bg colour from the track, we'll use ms-fill-lower and ms-fill-upper instead */
|
||||
border-color: transparent;/*leave room for the larger thumb to overflow with a transparent border */
|
||||
border-width: 6px 0;
|
||||
color: transparent;/*remove default tick marks*/
|
||||
}
|
||||
.cr-slider::-ms-fill-lower {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border-radius: 10px;
|
||||
}
|
||||
.cr-slider::-ms-fill-upper {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
border-radius: 10px;
|
||||
}
|
||||
.cr-slider::-ms-thumb {
|
||||
border: none;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
border-radius: 50%;
|
||||
background: #ddd;
|
||||
margin-top:1px;
|
||||
}
|
||||
.cr-slider:focus::-ms-fill-lower {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.cr-slider:focus::-ms-fill-upper {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
/*******************************************/
|
||||
|
||||
/***********************************/
|
||||
/* Rotation Tools */
|
||||
/***********************************/
|
||||
.cr-rotate-controls {
|
||||
position: absolute;
|
||||
bottom: 5px;
|
||||
left: 5px;
|
||||
z-index: 1;
|
||||
}
|
||||
.cr-rotate-controls button {
|
||||
border: 0;
|
||||
background: none;
|
||||
}
|
||||
.cr-rotate-controls i:before {
|
||||
display: inline-block;
|
||||
font-style: normal;
|
||||
font-weight: 900;
|
||||
font-size: 22px;
|
||||
}
|
||||
.cr-rotate-l i:before {
|
||||
content: '↺';
|
||||
}
|
||||
.cr-rotate-r i:before {
|
||||
content: '↻';
|
||||
}
|
||||
|
|
@ -1,19 +1,25 @@
|
|||
<vn-dialog class="edit"
|
||||
vn-id="dialog"
|
||||
on-accept="$ctrl.onUploadAccept()"
|
||||
message="Upload new photo">
|
||||
message="Edit photo">
|
||||
<tpl-body class="upload-photo">
|
||||
<vn-horizontal ng-show="file.value" class="photo vn-mb-md">
|
||||
<div><img vn-id="photo" ng-src=""/></div>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-textfield
|
||||
vn-one
|
||||
label="File name"
|
||||
ng-model="$ctrl.newPhoto.fileName"
|
||||
required="true">
|
||||
</vn-input-file>
|
||||
<vn-one ng-if="file.value">
|
||||
<vn-horizontal>
|
||||
<vn-icon-button vn-none
|
||||
icon="rotate_left"
|
||||
vn-tooltip="Rotate left"
|
||||
ng-click="$ctrl.rotateLeft()">
|
||||
</vn-icon-button>
|
||||
<div id="photoContainer"></div>
|
||||
<vn-icon-button vn-none
|
||||
icon="rotate_right"
|
||||
vn-tooltip="Rotate right"
|
||||
ng-click="$ctrl.rotateRight()">
|
||||
</vn-icon-button>
|
||||
</vn-horizontal>
|
||||
</vn-one>
|
||||
<vn-one>
|
||||
<vn-horizontal>
|
||||
<vn-input-file vn-id="file"
|
||||
vn-one
|
||||
|
|
@ -31,6 +37,26 @@
|
|||
</append>
|
||||
</vn-input-file>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-autocomplete
|
||||
label="Type"
|
||||
ng-model="$ctrl.viewportType"
|
||||
data="$ctrl.viewportTypes"
|
||||
selection="$ctrl.viewportSelection"
|
||||
show-field="description"
|
||||
value-field="code">
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-textfield
|
||||
vn-one
|
||||
label="File name"
|
||||
ng-model="$ctrl.newPhoto.fileName"
|
||||
required="true">
|
||||
</vn-input-file>
|
||||
</vn-horizontal>
|
||||
</vn-one>
|
||||
</vn-horizontal>
|
||||
</tpl-body>
|
||||
<tpl-buttons>
|
||||
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
|
||||
|
|
|
|||
|
|
@ -1,24 +1,74 @@
|
|||
import ngModule from '../../module';
|
||||
import Component from 'core/lib/component';
|
||||
import Croppie from 'croppie';
|
||||
import './style.scss';
|
||||
import './croppie.scss';
|
||||
|
||||
/**
|
||||
* Small card with basing entity information and actions.
|
||||
*/
|
||||
export default class UploadPhoto extends Component {
|
||||
constructor($element, $) {
|
||||
super($element, $);
|
||||
|
||||
this.viewportTypes = [
|
||||
{
|
||||
code: 'normal',
|
||||
description: this.$t('Normal'),
|
||||
viewport: {
|
||||
width: 400,
|
||||
height: 400
|
||||
},
|
||||
output: {
|
||||
width: 1200,
|
||||
height: 1200
|
||||
}
|
||||
|
||||
},
|
||||
{
|
||||
code: 'panoramic',
|
||||
description: this.$t('Panoramic'),
|
||||
viewport: {
|
||||
width: 675,
|
||||
height: 450
|
||||
},
|
||||
output: {
|
||||
width: 1350,
|
||||
height: 900
|
||||
}
|
||||
}
|
||||
];
|
||||
this.viewportType = 'normal';
|
||||
this.getAllowedContentTypes();
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens the dialog and sets the default data
|
||||
* @param {*} collection - Collection name
|
||||
* @param {*} id - Entity id
|
||||
*/
|
||||
show(collection, id) {
|
||||
this.editor = null;
|
||||
this.newPhoto = {
|
||||
id: id,
|
||||
collection: collection,
|
||||
fileName: id
|
||||
};
|
||||
this.$.dialog.show();
|
||||
this.getAllowedContentTypes();
|
||||
}
|
||||
|
||||
get viewportSelection() {
|
||||
return this._viewportSelection;
|
||||
}
|
||||
|
||||
set viewportSelection(value) {
|
||||
this._viewportSelection = value;
|
||||
|
||||
if (value && this.newPhoto.files) {
|
||||
this.displayEditor();
|
||||
const files = this.newPhoto.files;
|
||||
this.updatePhotoPreview(files);
|
||||
}
|
||||
}
|
||||
|
||||
getAllowedContentTypes() {
|
||||
|
|
@ -41,12 +91,39 @@ export default class UploadPhoto extends Component {
|
|||
*/
|
||||
updatePhotoPreview(value) {
|
||||
if (value && value[0]) {
|
||||
if (!this.editor)
|
||||
this.displayEditor();
|
||||
|
||||
const reader = new FileReader();
|
||||
reader.onload = e => this.$.photo.src = e.target.result;
|
||||
reader.onload = e => this.editor.bind({url: e.target.result});
|
||||
reader.readAsDataURL(value[0]);
|
||||
}
|
||||
}
|
||||
|
||||
displayEditor() {
|
||||
const viewportType = this.viewportSelection;
|
||||
const viewport = viewportType.viewport;
|
||||
const boundaryWidth = viewport.width + 200;
|
||||
const boundaryHeight = viewport.height + 200;
|
||||
|
||||
const container = document.getElementById('photoContainer');
|
||||
if (this.editor) this.editor.destroy();
|
||||
this.editor = new Croppie(container, {
|
||||
viewport: {width: viewport.width, height: viewport.height},
|
||||
boundary: {width: boundaryWidth, height: boundaryHeight},
|
||||
enableOrientation: true,
|
||||
showZoomer: true
|
||||
});
|
||||
}
|
||||
|
||||
rotateLeft() {
|
||||
this.editor.rotate(90);
|
||||
}
|
||||
|
||||
rotateRight() {
|
||||
this.editor.rotate(-90);
|
||||
}
|
||||
|
||||
/**
|
||||
* Dialog response handler
|
||||
*
|
||||
|
|
@ -57,7 +134,18 @@ export default class UploadPhoto extends Component {
|
|||
if (!this.newPhoto.files)
|
||||
throw new Error(`Select an image`);
|
||||
|
||||
this.makeRequest();
|
||||
const viewportType = this.viewportSelection;
|
||||
const output = viewportType.output;
|
||||
const options = {
|
||||
type: 'blob',
|
||||
size: {
|
||||
width: output.width,
|
||||
height: output.height
|
||||
}
|
||||
};
|
||||
this.editor.result(options)
|
||||
.then(blob => this.newPhoto.blob = blob)
|
||||
.then(() => this.makeRequest());
|
||||
} catch (e) {
|
||||
this.vnApp.showError(this.$t(e.message));
|
||||
return false;
|
||||
|
|
@ -79,10 +167,11 @@ export default class UploadPhoto extends Component {
|
|||
params: this.newPhoto,
|
||||
headers: {'Content-Type': undefined},
|
||||
timeout: this.canceler.promise,
|
||||
transformRequest: files => {
|
||||
transformRequest: ([file]) => {
|
||||
const formData = new FormData();
|
||||
for (let i = 0; i < files.length; i++)
|
||||
formData.append(files[i].name, files[i]);
|
||||
const now = new Date();
|
||||
const timestamp = now.getTime();
|
||||
formData.append('blob', this.newPhoto.blob, file.name + '_' + timestamp);
|
||||
|
||||
return formData;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
Upload new photo: Subir una nueva foto
|
||||
Edit photo: Editar foto
|
||||
Select an image: Selecciona una imagen
|
||||
File name: Nombre del fichero
|
||||
Rotate left: Girar a la izquierda
|
||||
Rotate right: Girar a la derecha
|
||||
Panoramic: Panorámico
|
||||
|
|
@ -1,24 +1,9 @@
|
|||
@import "./variables";
|
||||
|
||||
.upload-photo {
|
||||
.photo {
|
||||
position: relative;
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
|
||||
& > div {
|
||||
border: 3px solid $color-primary;
|
||||
max-width: 256px;
|
||||
max-height: 256px;
|
||||
border-radius: 50%;
|
||||
overflow: hidden
|
||||
}
|
||||
|
||||
& > div > img[ng-src] {
|
||||
width: 256px;
|
||||
height: 256px;
|
||||
display: block
|
||||
}
|
||||
& > vn-horizontal {
|
||||
align-items: initial;
|
||||
}
|
||||
|
||||
& > vn-spinner {
|
||||
|
|
@ -28,10 +13,13 @@
|
|||
}
|
||||
|
||||
vn-input-file {
|
||||
max-width: 256px;
|
||||
|
||||
div.control {
|
||||
overflow: hidden
|
||||
}
|
||||
}
|
||||
|
||||
.form {
|
||||
align-items: initial;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue