self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2024-11-28 08:58:49 +02:00
Code Issues Releases Activity

updating packages

Browse Source
This commit is contained in:
Patrik J. Braun 2019-07-19 00:12:22 +02:00
parent b4ebdb0f12
commit 88b432b634
14 changed files with 8353 additions and 4368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/model/threading/MetadataLoader.ts
View File

@ -209,10 +209,10 @@ export class MetadataLoader {
}
const name = region.attributes['mwg-rs:Name'];
const box = {
width: Math.round(regionBox['stArea:w'] * metadata.size.width),
height: Math.round(regionBox['stArea:h'] * metadata.size.height),
left: Math.round(regionBox['stArea:x'] * metadata.size.width),
top: Math.round(regionBox['stArea:y'] * metadata.size.height)
width: Math.round(parseInt('' + regionBox['stArea:w'], 10) * metadata.size.width),
height: Math.round(parseInt('' + regionBox['stArea:h'], 10) * metadata.size.height),
left: Math.round(parseInt('' + regionBox['stArea:x'], 10) * metadata.size.width),
top: Math.round(parseInt('' + regionBox['stArea:y'], 10) * metadata.size.height)
};
// convert center base box to corner based box
box.left = Math.max(0, box.left - box.width / 2);

2
frontend/app/ui/faces/faces.component.ts
View File

@ -11,7 +11,7 @@ import {Observable} from 'rxjs/Observable';
styleUrls: ['./faces.component.css']
})
export class FacesComponent implements OnInit {
@ViewChild('container') container: ElementRef;
@ViewChild('container', {static: true}) container: ElementRef;
public size: number;
favourites: Observable<PersonDTO[]>;
nonFavourites: Observable<PersonDTO[]>;

2
frontend/app/ui/gallery/gallery.component.ts
View File

@ -25,7 +25,7 @@ import {SeededRandomService} from '../../model/seededRandom.service';
})
export class GalleryComponent implements OnInit, OnDestroy {
@ViewChild(GalleryGridComponent) grid: GalleryGridComponent;
@ViewChild(GalleryGridComponent, {static: false}) grid: GalleryGridComponent;
public showSearchBar = false;
public showShare = false;

2
frontend/app/ui/gallery/grid/grid.gallery.component.ts
View File

@ -36,7 +36,7 @@ import {SeededRandomService} from '../../../model/seededRandom.service';
})
export class GalleryGridComponent implements OnChanges, OnInit, AfterViewInit, OnDestroy {
@ViewChild('gridContainer') gridContainer: ElementRef;
@ViewChild('gridContainer', {static: false}) gridContainer: ElementRef;
@ViewChildren(GalleryPhotoComponent) gridPhotoQL: QueryList<GalleryPhotoComponent>;
@Input() media: MediaDTO[];
@Input() lightbox: GalleryLightboxComponent;

6
frontend/app/ui/gallery/grid/photo/photo.grid.gallery.component.ts
View File

@ -16,9 +16,9 @@ import {PhotoDTO, PhotoMetadata} from '../../../../../../common/entities/PhotoDT
})
export class GalleryPhotoComponent implements IRenderable, OnInit, OnDestroy {
@Input() gridPhoto: GridMedia;
@ViewChild('img') imageRef: ElementRef;
@ViewChild('info') infoDiv: ElementRef;
@ViewChild('photoContainer') container: ElementRef;
@ViewChild('img', {static: false}) imageRef: ElementRef;
@ViewChild('info', {static: false}) infoDiv: ElementRef;
@ViewChild('photoContainer', {static: true}) container: ElementRef;
thumbnail: Thumbnail;
keywords: { value: string, type: SearchTypes }[] = null;

8
frontend/app/ui/gallery/lightbox/lightbox.gallery.component.ts
View File

@ -28,10 +28,10 @@ export enum LightboxStates {
})
export class GalleryLightboxComponent implements OnDestroy, OnInit {
@ViewChild('photo') mediaElement: GalleryLightboxMediaComponent;
@ViewChild('controls') controls: ControlsLightboxComponent;
@ViewChild('lightbox') lightboxElement: ElementRef;
@ViewChild('root') root: ElementRef;
@ViewChild('photo', {static: false}) mediaElement: GalleryLightboxMediaComponent;
@ViewChild('controls', {static: false}) controls: ControlsLightboxComponent;
@ViewChild('lightbox', {static: false}) lightboxElement: ElementRef;
@ViewChild('root', {static: false}) root: ElementRef;
public navigation = {hasPrev: true, hasNext: true};
public blackCanvasOpacity = 0;

2
frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
View File

@ -17,7 +17,7 @@ export class GalleryLightboxMediaComponent implements OnChanges {
@Input() zoom = 1;
@Input() drag = {x: 0, y: 0};
@ViewChild('video') video: ElementRef<HTMLVideoElement>;
@ViewChild('video', {static: false}) video: ElementRef<HTMLVideoElement>;
prevGirdPhoto: GridMedia = null;

4
frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.ts
View File

@ -34,8 +34,8 @@ export class GalleryMapLightboxComponent implements OnChanges, AfterViewInit {
mapPhotos: MapPhoto[] = [];
paths: LatLng[][] = [];
@ViewChild('root') elementRef: ElementRef;
@ViewChild('yagaMap') yagaMap: MapComponent;
@ViewChild('root', {static: false}) elementRef: ElementRef;
@ViewChild('yagaMap', {static: false}) yagaMap: MapComponent;
public smallIconSize = new Point(Config.Client.Thumbnail.iconSize * 0.75, Config.Client.Thumbnail.iconSize * 0.75);
public iconSize = new Point(Config.Client.Thumbnail.iconSize, Config.Client.Thumbnail.iconSize);

6
frontend/app/ui/gallery/map/map.gallery.component.ts
View File

@ -15,11 +15,11 @@ export class GalleryMapComponent implements OnChanges, IRenderable, AfterViewIni
@Input() photos: PhotoDTO[];
@Input() metaFiles: FileDTO[];
@ViewChild(GalleryMapLightboxComponent) mapLightbox: GalleryMapLightboxComponent;
@ViewChild(GalleryMapLightboxComponent, {static: false}) mapLightbox: GalleryMapLightboxComponent;
mapPhotos: Array<{ lat: number, lng: number }> = [];
@ViewChild('map') mapElement: ElementRef;
@ViewChild('yagaMap') yagaMap: MapComponent;
@ViewChild('map', {static: false}) mapElement: ElementRef;
@ViewChild('yagaMap', {static: false}) yagaMap: MapComponent;
height: number = null;

19
frontend/app/ui/settings/_abstract/abstract.settings.component.ts
View File

@ -17,7 +17,7 @@ export abstract class SettingsComponent<T extends { [key: string]: any }, S exte
@Input()
public simplifiedMode = true;
@ViewChild('settingsForm')
@ViewChild('settingsForm', {static: false})
form: HTMLFormElement;
@Output()
@ -26,18 +26,16 @@ export abstract class SettingsComponent<T extends { [key: string]: any }, S exte
public inProgress = false;
public error: string = null;
public changed = false;
private _subscription: Subscription = null;
private readonly _settingsSubscription: Subscription = null;
public settings: T = <any>{};
public original: T = <any>{};
text = {
Enabled: 'Enabled',
Disabled: 'Disabled',
Low: 'Low',
High: 'High'
};
private _subscription: Subscription = null;
private readonly _settingsSubscription: Subscription = null;
protected constructor(private name: string,
private _authService: AuthenticationService,
@ -120,16 +118,10 @@ export abstract class SettingsComponent<T extends { [key: string]: any }, S exte
}
}
private async getSettings() {
await this._settingsService.getSettings();
this.changed = false;
}
public reset() {
this.getSettings();
}
public async save() {
this.inProgress = true;
this.error = '';
@ -150,6 +142,11 @@ export abstract class SettingsComponent<T extends { [key: string]: any }, S exte
return false;
}
private async getSettings() {
await this._settingsService.getSettings();
this.changed = false;
}
}

2
frontend/app/ui/settings/usermanager/usermanager.settings.component.ts
View File

@ -17,7 +17,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill';
providers: [UserManagerSettingsService],
})
export class UserMangerSettingsComponent implements OnInit {
@ViewChild('userModal') public childModal: ModalDirective;
@ViewChild('userModal', {static: false}) public childModal: ModalDirective;
public newUser = <UserDTO>{};
public userRoles: Array<any> = [];
public users: Array<UserDTO> = [];

31
frontend/polyfills.ts
View File

@ -17,27 +17,26 @@
* BROWSER POLYFILLS
*/
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
// import 'core-js/es6/symbol';
import 'core-js/es6/object';
// import 'core-js/es6/function';
// import 'core-js/es6/parse-int';
// import 'core-js/es6/parse-float';
// import 'core-js/es6/number';
// import 'core-js/es6/math';
import 'core-js/es6/string';
// import 'core-js/es6/date';
import 'core-js/es6/array';
// import 'core-js/es6/regexp';
// import 'core-js/es6/map';
// import 'core-js/es6/weak-map';
// import 'core-js/es6/set';
// import 'core-js/es/symbol';
import 'core-js/es/object';
// import 'core-js/es/function';
// import 'core-js/es/parse-int';
// import 'core-js/es/parse-float';
// import 'core-js/es/number';
// import 'core-js/es/math';
import 'core-js/es/string';
// import 'core-js/es/date';
import 'core-js/es/array';
// import 'core-js/es/regexp';
// import 'core-js/es/map';
// import 'core-js/es/weak-map';
// import 'core-js/es/set';
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
/** IE10 and IE11 requires the following to support `@angular/animation`. */
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/** Evergreen browsers require these. **/
import 'core-js/es6/reflect';
import 'core-js/es7/reflect';
import 'core-js/es/reflect';
/** ALL Firefox browsers require the following to support `@angular/animation`. **/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/***************************************************************************************************

12514
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

115
package.json
View File

@ -27,101 +27,102 @@
},
"dependencies": {
"bcryptjs": "2.4.3",
"body-parser": "1.18.3",
"body-parser": "1.19.0",
"cookie-parser": "1.4.4",
"cookie-session": "2.0.0-beta.3",
"ejs": "2.6.1",
"exifreader": "2.7.0",
"express": "4.16.4",
"ejs": "2.6.2",
"exifreader": "2.8.2",
"express": "4.17.1",
"fluent-ffmpeg": "2.1.2",
"image-size": "0.7.2",
"image-size": "0.7.4",
"jdataview": "2.5.0",
"jimp": "0.6.0",
"jimp": "0.6.4",
"locale": "0.1.0",
"npm-check-updates": "^3.1.20",
"reflect-metadata": "0.1.13",
"sqlite3": "4.0.6",
"sqlite3": "4.0.9",
"ts-exif-parser": "0.1.4",
"ts-node-iptc": "1.0.11",
"typeconfig": "1.0.7",
"typeorm": "0.2.13",
"typeorm": "0.2.18",
"winston": "2.4.4",
"xmldom": "0.1.27"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.13.3",
"@angular-devkit/build-optimizer": "0.13.3",
"@angular/animations": "7.2.6",
"@angular/cli": "7.3.3",
"@angular/common": "7.2.6",
"@angular/compiler": "7.2.6",
"@angular/compiler-cli": "7.2.6",
"@angular/core": "7.2.6",
"@angular/forms": "7.2.6",
"@angular/http": "7.2.6",
"@angular/language-service": "7.2.6",
"@angular/platform-browser": "7.2.6",
"@angular/platform-browser-dynamic": "7.2.6",
"@angular/router": "7.2.6",
"@angular-devkit/build-angular": "0.801.2",
"@angular-devkit/build-optimizer": "0.801.2",
"@angular/animations": "8.1.2",
"@angular/cli": "8.1.2",
"@angular/common": "8.1.2",
"@angular/compiler": "8.1.2",
"@angular/compiler-cli": "8.1.2",
"@angular/core": "8.1.2",
"@angular/forms": "8.1.2",
"@angular/http": "7.2.15",
"@angular/language-service": "8.1.2",
"@angular/platform-browser": "8.1.2",
"@angular/platform-browser-dynamic": "8.1.2",
"@angular/router": "8.1.2",
"@ngx-translate/i18n-polyfill": "1.0.0",
"@types/bcryptjs": "2.4.2",
"@types/chai": "4.1.7",
"@types/cookie-parser": "1.4.1",
"@types/cookie-session": "2.0.36",
"@types/ejs": "2.6.2",
"@types/express": "4.16.1",
"@types/fluent-ffmpeg": "2.1.9",
"@types/gm": "1.18.2",
"@types/gulp": "4.0.5",
"@types/cookie-session": "2.0.37",
"@types/ejs": "2.6.3",
"@types/express": "4.17.0",
"@types/fluent-ffmpeg": "2.1.10",
"@types/gm": "1.18.3",
"@types/gulp": "4.0.6",
"@types/gulp-zip": "4.0.0",
"@types/image-size": "0.7.0",
"@types/jasmine": "3.3.9",
"@types/node": "11.9.5",
"@types/sharp": "0.21.2",
"@types/jasmine": "3.3.13",
"@types/node": "12.6.8",
"@types/sharp": "0.22.2",
"@types/winston": "2.4.4",
"@yaga/leaflet-ng2": "1.0.0",
"bootstrap": "4.3.1",
"chai": "4.2.0",
"codelyzer": "4.5.0",
"core-js": "2.6.5",
"ejs-loader": "0.3.1",
"gulp": "4.0.0",
"codelyzer": "5.1.0",
"core-js": "3.1.4",
"ejs-loader": "0.3.3",
"gulp": "4.0.2",
"gulp-json-modify": "1.0.2",
"gulp-typescript": "5.0.0",
"gulp-zip": "4.2.0",
"gulp-typescript": "5.0.1",
"gulp-zip": "5.0.0",
"hammerjs": "2.0.8",
"intl": "1.2.5",
"jasmine-core": "3.3.0",
"jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1",
"jw-bootstrap-switch-ng2": "2.0.5",
"karma": "4.0.0",
"karma-chrome-launcher": "2.2.0",
"karma": "4.2.0",
"karma-chrome-launcher": "3.0.0",
"karma-cli": "2.0.0",
"karma-coverage-istanbul-reporter": "2.0.5",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.0",
"karma-jasmine-html-reporter": "1.4.2",
"karma-remap-istanbul": "0.6.0",
"karma-systemjs": "0.16.0",
"merge2": "1.2.3",
"mocha": "6.0.1",
"mocha": "6.1.4",
"ng2-cookies": "1.0.12",
"ng2-slim-loading-bar": "4.0.0",
"ngx-bootstrap": "3.2.0",
"ngx-clipboard": "11.1.9",
"ngx-toastr": "9.1.2",
"ngx-bootstrap": "5.1.0",
"ngx-clipboard": "12.2.0",
"ngx-toastr": "10.0.4",
"open-iconic": "1.1.1",
"protractor": "5.4.2",
"remap-istanbul": "0.13.0",
"rimraf": "2.6.3",
"run-sequence": "2.2.1",
"rxjs": "6.4.0",
"rxjs-compat": "6.4.0",
"terser": "3.16.1",
"rxjs": "6.5.2",
"rxjs-compat": "6.5.2",
"terser": "4.1.2",
"ts-helpers": "1.1.2",
"ts-node": "8.0.2",
"tslint": "5.12.1",
"typescript": "3.2.4",
"ts-node": "8.3.0",
"tslint": "5.18.0",
"typescript": "3.4.5",
"xlf-google-translate": "1.0.0-beta.13",
"zone.js": "0.8.29"
"zone.js": "0.9.1"
},
"//": [
"TODO: remove terser version lock once webpack is fixed",
@ -131,12 +132,12 @@
"natives": "1.1.3"
},
"optionalDependencies": {
"@ffmpeg-installer/ffmpeg": "1.0.17",
"@ffprobe-installer/ffprobe": "1.0.9",
"bcrypt": "3.0.4",
"@ffmpeg-installer/ffmpeg": "1.0.19",
"@ffprobe-installer/ffprobe": "1.0.12",
"bcrypt": "3.0.6",
"gm": "1.23.1",
"mysql": "2.16.0",
"sharp": "0.21.3"
"mysql": "2.17.1",
"sharp": "0.22.1"
},
"engines": {
"node": ">= 6.9 <11.0"