fossilfranv/pigallery2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updating packages

Browse Source
This commit is contained in:
Braun Patrik 2017-05-27 10:15:57 +02:00
parent f1d8364a2e
commit ffd01c5765
7 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app/app.module.ts
View File

@ -2,7 +2,7 @@ import {NgModule} from "@angular/core";
import {BrowserModule} from "@angular/platform-browser"; import {BrowserModule} from "@angular/platform-browser";
import {FormsModule} from "@angular/forms"; import {FormsModule} from "@angular/forms";
import {HttpModule} from "@angular/http"; import {HttpModule} from "@angular/http";
import {AgmCoreModule} from "angular2-google-maps/core"; import {AgmCoreModule} from "@agm/core";
import {AppComponent} from "./app.component"; import {AppComponent} from "./app.component";
import {appRoutes} from "./app.routing"; import {appRoutes} from "./app.routing";
import {UserService} from "./model/network/user.service"; import {UserService} from "./model/network/user.service";

10
frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
View File

@ -11,22 +11,22 @@
<div class="photo-position" *ngIf="gridPhoto.photo.metadata.positionData"> <div class="photo-position" *ngIf="gridPhoto.photo.metadata.positionData">
<span class="glyphicon glyphicon-map-marker"></span> <span class="glyphicon glyphicon-map-marker"></span>
<template [ngIf]="getPositionText()"> <ng-template [ngIf]="getPositionText()">
<a [routerLink]="['/search', getPositionText(), {type:SearchTypes[SearchTypes.position]}]" <a [routerLink]="['/search', getPositionText(), {type:SearchTypes[SearchTypes.position]}]"
*ngIf="searchEnabled"> *ngIf="searchEnabled">
{{getPositionText()}} {{getPositionText()}}
</a> </a>
<span *ngIf="!searchEnabled">{{getPositionText()}}</span> <span *ngIf="!searchEnabled">{{getPositionText()}}</span>
</template> </ng-template>
</div> </div>
<div class="photo-keywords"> <div class="photo-keywords">
<template ngFor let-keyword [ngForOf]="gridPhoto.photo.metadata.keywords" let-last="last"> <ng-template ngFor let-keyword [ngForOf]="gridPhoto.photo.metadata.keywords" let-last="last">
<a *ngIf="searchEnabled" <a *ngIf="searchEnabled"
[routerLink]="['/search', keyword, {type: SearchTypes[SearchTypes.keyword]}]">#{{keyword}}</a> [routerLink]="['/search', keyword, {type: SearchTypes[SearchTypes.keyword]}]">#{{keyword}}</a>
<span *ngIf="!searchEnabled">#{{keyword}}</span> <span *ngIf="!searchEnabled">#{{keyword}}</span>
<template [ngIf]="!last">,</template> <ng-template [ngIf]="!last">,</ng-template>
</template> </ng-template>
</div> </div>
</div> </div>

8
frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html
View File

@ -7,19 +7,19 @@
[style.top.px]="lightboxDimension.top" [style.top.px]="lightboxDimension.top"
[style.left.px]="lightboxDimension.left" [style.left.px]="lightboxDimension.left"
[style.opacity]="opacity"> [style.opacity]="opacity">
<sebm-google-map <agm-map
[style.width.px]="mapDimension.width" [style.width.px]="mapDimension.width"
[style.height.px]="mapDimension.height" [style.height.px]="mapDimension.height"
[zoom]="5" [zoom]="5"
[latitude]="mapCenter.latitude" [latitude]="mapCenter.latitude"
[longitude]="mapCenter.longitude"> [longitude]="mapCenter.longitude">
<sebm-google-map-marker <agm-marker
*ngFor="let photo of mapPhotos" *ngFor="let photo of mapPhotos"
[latitude]="photo.latitude" [latitude]="photo.latitude"
[longitude]="photo.longitude" [longitude]="photo.longitude"
[iconUrl]="photo.iconUrl"> [iconUrl]="photo.iconUrl">
</sebm-google-map-marker> </agm-marker>
</sebm-google-map> </agm-map>
</div> </div>

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

@ -2,7 +2,7 @@ import {Component, ElementRef, HostListener, Input, OnChanges, ViewChild} from "
import {PhotoDTO} from "../../../../../common/entities/PhotoDTO"; import {PhotoDTO} from "../../../../../common/entities/PhotoDTO";
import {Dimension} from "../../../model/IRenderable"; import {Dimension} from "../../../model/IRenderable";
import {FullScreenService} from "../../fullscreen.service"; import {FullScreenService} from "../../fullscreen.service";
import {SebmGoogleMap} from "angular2-google-maps/core"; import {AgmMap} from "@agm/core";
import {IconThumbnail, ThumbnailManagerService} from "../../thumnailManager.service"; import {IconThumbnail, ThumbnailManagerService} from "../../thumnailManager.service";
import {IconPhoto} from "../../IconPhoto"; import {IconPhoto} from "../../IconPhoto";
@ -24,7 +24,7 @@ export class GalleryMapLightboxComponent implements OnChanges {
@ViewChild("root") elementRef: ElementRef; @ViewChild("root") elementRef: ElementRef;
@ViewChild(SebmGoogleMap) map: SebmGoogleMap; @ViewChild(AgmMap) map: AgmMap;
constructor(private fullScreenService: FullScreenService, private thumbnailService: ThumbnailManagerService) { constructor(private fullScreenService: FullScreenService, private thumbnailService: ThumbnailManagerService) {

8
frontend/app/gallery/map/map.gallery.component.html
View File

@ -1,6 +1,6 @@
<gallery-map-lightbox [photos]="photos"></gallery-map-lightbox> <gallery-map-lightbox [photos]="photos"></gallery-map-lightbox>
<div id="map" #map> <div id="map" #map>
<sebm-google-map <agm-map
(click)="click()" (click)="click()"
[disableDefaultUI]="true" [disableDefaultUI]="true"
[zoomControl]="false" [zoomControl]="false"
@ -10,10 +10,10 @@
[zoom]="0" [zoom]="0"
[latitude]="mapCenter.latitude" [latitude]="mapCenter.latitude"
[longitude]="mapCenter.longitude"> [longitude]="mapCenter.longitude">
<sebm-google-map-marker <agm-marker
*ngFor="let photo of mapPhotos" *ngFor="let photo of mapPhotos"
[latitude]="photo.latitude" [latitude]="photo.latitude"
[longitude]="photo.longitude"> [longitude]="photo.longitude">
</sebm-google-map-marker> </agm-marker>
</sebm-google-map> </agm-map>
</div> </div>

3
frontend/systemjs.config.js
View File

@ -25,7 +25,8 @@
// other libraries // other libraries
'rxjs': 'npm:rxjs', 'rxjs': 'npm:rxjs',
'angular2-google-maps': 'npm:angular2-google-maps',
'@agm/core': 'npm:@agm/core/core.umd.js',
'ng2-cookies': 'npm:ng2-cookies/ng2-cookies' 'ng2-cookies': 'npm:ng2-cookies/ng2-cookies'
}, },
// packages tells the System loader how to load when no filename and/or no extension // packages tells the System loader how to load when no filename and/or no extension

66
package.json
View File

@ -21,62 +21,60 @@
"url": "https://github.com/bpatrik/PiGallery2/issues" "url": "https://github.com/bpatrik/PiGallery2/issues"
}, },
"dependencies": { "dependencies": {
"@angular/common": "~4.0.0", "@agm/core": "^1.0.0-beta.0",
"@angular/compiler": "~4.0.0", "@angular/common": "~4.1.3",
"@angular/core": "~4.0.0", "@angular/compiler": "~4.1.3",
"@angular/forms": "~4.0.0", "@angular/core": "~4.1.3",
"@angular/http": "~4.0.0", "@angular/forms": "~4.1.3",
"@angular/platform-browser": "~4.0.0", "@angular/http": "~4.1.3",
"@angular/platform-browser-dynamic": "~4.0.0", "@angular/platform-browser": "~4.1.3",
"@angular/platform-server": "~4.0.0", "@angular/platform-browser-dynamic": "~4.1.3",
"@angular/router": "~4.0.0", "@angular/router": "~4.1.3",
"angular2-google-maps": "^0.17.0", "body-parser": "^1.17.2",
"body-parser": "^1.17.1",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"debug": "^2.6.3", "debug": "^2.6.8",
"ejs": "^2.5.6", "ejs": "^2.5.6",
"exif-parser": "^0.1.9", "exif-parser": "^0.1.9",
"express": "^4.15.2", "express": "^4.15.3",
"express-session": "^1.15.1", "express-session": "^1.15.3",
"flat-file-db": "^1.0.0", "flat-file-db": "^1.0.0",
"jimp": "^0.2.27", "jimp": "^0.2.28",
"mime": "^1.3.4", "mime": "^1.3.6",
"mocha": "^3.2.0", "mocha": "^3.4.2",
"morgan": "^1.8.1", "morgan": "^1.8.2",
"mysql": "^2.13.0", "mysql": "^2.13.0",
"ng2-cookies": "^1.0.8", "ng2-cookies": "^1.0.12",
"node-iptc": "^1.0.4", "node-iptc": "^1.0.4",
"optimist": "^0.6.1", "optimist": "^0.6.1",
"reflect-metadata": "^0.1.10", "reflect-metadata": "^0.1.10",
"rxjs": "^5.2.0", "rxjs": "^5.4.0",
"systemjs": "0.20.10", "systemjs": "0.20.12",
"threads": "^0.7.2", "threads": "^0.7.3",
"typeorm": "0.0.11", "typeorm": "0.0.11",
"zone.js": "^0.8.5" "zone.js": "^0.8.11"
}, },
"devDependencies": { "devDependencies": {
"@types/express": "^4.0.35", "@types/express": "^4.0.35",
"@types/express-session": "0.0.32", "@types/express-session": "1.15.0",
"@types/jasmine": "^2.5.46", "@types/jasmine": "^2.5.47",
"@types/node": "^7.0.11", "@types/node": "^7.0.22",
"@types/optimist": "0.0.29", "@types/optimist": "0.0.29",
"angular-cli": "^1.0.0-beta.28.3", "chai": "^4.0.0",
"chai": "^3.5.0", "jasmine-core": "^2.6.2",
"jasmine-core": "^2.5.2", "karma": "^1.7.0",
"karma": "^1.5.0",
"karma-cli": "^1.0.1", "karma-cli": "^1.0.1",
"karma-jasmine": "^1.1.0", "karma-jasmine": "^1.1.0",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"karma-phantomjs-launcher": "^1.0.4", "karma-phantomjs-launcher": "^1.0.4",
"karma-remap-istanbul": "^0.6.0", "karma-remap-istanbul": "^0.6.0",
"karma-systemjs": "^0.16.0", "karma-systemjs": "^0.16.0",
"mocha": "^3.2.0", "mocha": "^3.4.2",
"phantomjs-prebuilt": "^2.1.14", "phantomjs-prebuilt": "^2.1.14",
"protractor": "^5.1.1", "protractor": "^5.1.2",
"remap-istanbul": "^0.9.5", "remap-istanbul": "^0.9.5",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"ts-helpers": "^1.1.2", "ts-helpers": "^1.1.2",
"tslint": "^4.5.1", "tslint": "^5.3.2",
"typescript": "^2.2.1" "typescript": "^2.3.3"
} }
} }