xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

updating dependencies

Browse Source
This commit is contained in:
Braun Patrik 2017-02-05 16:19:35 +01:00
parent 374aa35dd2
commit 8e40923cdf
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/model/mysql/SearchManager.ts
View File

@ -23,7 +23,7 @@ export class SearchManager implements ISearchManager {
.select('DISTINCT(photo.metadataKeywords)') .select('DISTINCT(photo.metadataKeywords)')
.where('photo.metadata.keywords LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"}) .where('photo.metadata.keywords LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"})
.setLimit(5) .setLimit(5)
.getRawMany<{metadataKeywords: string}>()) .getRawMany())
.map(r => <Array<string>>JSON.parse(r.metadataKeywords)) .map(r => <Array<string>>JSON.parse(r.metadataKeywords))
.forEach(keywords => { .forEach(keywords => {
result = result.concat(this.encapsulateAutoComplete(keywords.filter(k => k.toLowerCase().indexOf(text.toLowerCase()) != -1), SearchTypes.keyword)); result = result.concat(this.encapsulateAutoComplete(keywords.filter(k => k.toLowerCase().indexOf(text.toLowerCase()) != -1), SearchTypes.keyword));
@ -35,7 +35,7 @@ export class SearchManager implements ISearchManager {
.select('DISTINCT(photo.metadataPositionData)') .select('DISTINCT(photo.metadataPositionData)')
.where('photo.metadata.positionData LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"}) .where('photo.metadata.positionData LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"})
.setLimit(5) .setLimit(5)
.getRawMany<{metadataPositionData: string}>()) .getRawMany())
.map(r => <PositionMetaData>JSON.parse(r.metadataPositionData)) .map(r => <PositionMetaData>JSON.parse(r.metadataPositionData))
.map(pm => <Array<string>>[pm.city || "", pm.country || "", pm.state || ""]) .map(pm => <Array<string>>[pm.city || "", pm.country || "", pm.state || ""])
.forEach(positions => { .forEach(positions => {
@ -48,7 +48,7 @@ export class SearchManager implements ISearchManager {
.select('DISTINCT(photo.name)') .select('DISTINCT(photo.name)')
.where('photo.name LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"}) .where('photo.name LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"})
.setLimit(5) .setLimit(5)
.getRawMany<{name: string}>()) .getRawMany())
.map(r => r.name), SearchTypes.image)); .map(r => r.name), SearchTypes.image));
result = result.concat(this.encapsulateAutoComplete((await directoryRepository result = result.concat(this.encapsulateAutoComplete((await directoryRepository
@ -56,7 +56,7 @@ export class SearchManager implements ISearchManager {
.select('DISTINCT(dir.name)') .select('DISTINCT(dir.name)')
.where('dir.name LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"}) .where('dir.name LIKE :text COLLATE utf8_general_ci', {text: "%" + text + "%"})
.setLimit(5) .setLimit(5)
.getRawMany<{name: string}>()) .getRawMany())
.map(r => r.name), SearchTypes.directory)); .map(r => r.name), SearchTypes.directory));

4
backend/model/mysql/enitites/DirectoryEntity.ts
View File

@ -1,8 +1,8 @@
import {Table, Column, PrimaryGeneratedColumn, OneToMany, ManyToOne} from "typeorm"; import {Entity, Column, PrimaryGeneratedColumn, OneToMany, ManyToOne} from "typeorm";
import {DirectoryDTO} from "../../../../common/entities/DirectoryDTO"; import {DirectoryDTO} from "../../../../common/entities/DirectoryDTO";
import {PhotoEntity} from "./PhotoEntity"; import {PhotoEntity} from "./PhotoEntity";
@Table() @Entity()
export class DirectoryEntity implements DirectoryDTO { export class DirectoryEntity implements DirectoryDTO {
@PrimaryGeneratedColumn() @PrimaryGeneratedColumn()

8
backend/model/mysql/enitites/PhotoEntity.ts
View File

@ -1,4 +1,4 @@
import {Table, EmbeddableTable, Column, Embedded, PrimaryGeneratedColumn, ManyToOne} from "typeorm"; import {Entity, EmbeddableEntity, Column, Embedded, PrimaryGeneratedColumn, ManyToOne} from "typeorm";
import {DirectoryDTO} from "../../../../common/entities/DirectoryDTO"; import {DirectoryDTO} from "../../../../common/entities/DirectoryDTO";
import { import {
PhotoDTO, PhotoDTO,
@ -9,7 +9,7 @@ import {
} from "../../../../common/entities/PhotoDTO"; } from "../../../../common/entities/PhotoDTO";
import {DirectoryEntity} from "./DirectoryEntity"; import {DirectoryEntity} from "./DirectoryEntity";
@Table() @Entity()
export class PhotoEntity implements PhotoDTO { export class PhotoEntity implements PhotoDTO {
@PrimaryGeneratedColumn() @PrimaryGeneratedColumn()
@ -29,7 +29,7 @@ export class PhotoEntity implements PhotoDTO {
} }
@EmbeddableTable() @EmbeddableEntity()
export class PhotoMetadataEntity implements PhotoMetadata { export class PhotoMetadataEntity implements PhotoMetadata {
@Column("string") @Column("string")
@ -73,7 +73,7 @@ export class PhotoMetadataEntity implements PhotoMetadata {
@Column("string") @Column("string")
lens: string; lens: string;
} }
/*
@EmbeddableTable() @EmbeddableTable()
export class PositionMetaDataEntity implements PositionMetaData { export class PositionMetaDataEntity implements PositionMetaData {

4
backend/model/mysql/enitites/UserEntity.ts
View File

@ -1,7 +1,7 @@
import {UserDTO, UserRoles} from "../../../../common/entities/UserDTO"; import {UserDTO, UserRoles} from "../../../../common/entities/UserDTO";
import {Table, Column, PrimaryGeneratedColumn} from "typeorm"; import {Entity, Column, PrimaryGeneratedColumn} from "typeorm";
@Table() @Entity()
export class UserEntity implements UserDTO { export class UserEntity implements UserDTO {
@PrimaryGeneratedColumn() @PrimaryGeneratedColumn()

52
package.json
View File

@ -21,62 +21,62 @@
"url": "https://github.com/bpatrik/PiGallery2/issues" "url": "https://github.com/bpatrik/PiGallery2/issues"
}, },
"dependencies": { "dependencies": {
"@angular/common": "~2.4.1", "@angular/common": "~2.4.6",
"@angular/compiler": "~2.4.1", "@angular/compiler": "~2.4.6",
"@angular/core": "~2.4.1", "@angular/core": "~2.4.6",
"@angular/forms": "~2.4.1", "@angular/forms": "~2.4.6",
"@angular/http": "~2.4.1", "@angular/http": "~2.4.6",
"@angular/platform-browser": "~2.4.1", "@angular/platform-browser": "~2.4.6",
"@angular/platform-browser-dynamic": "~2.4.1", "@angular/platform-browser-dynamic": "~2.4.6",
"@angular/platform-server": "~2.4.1", "@angular/platform-server": "~2.4.6",
"@angular/router": "~3.4.1", "@angular/router": "~3.4.6",
"angular2-google-maps": "^0.17.0", "angular2-google-maps": "^0.17.0",
"body-parser": "^1.15.2", "body-parser": "^1.16.0",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"debug": "^2.6.0", "debug": "^2.6.0",
"ejs": "^2.5.5", "ejs": "^2.5.5",
"exif-parser": "^0.1.9", "exif-parser": "^0.1.9",
"express": "^4.14.0", "express": "^4.14.1",
"express-session": "^1.14.2", "express-session": "^1.15.0",
"flat-file-db": "^1.0.0", "flat-file-db": "^1.0.0",
"jimp": "^0.2.27", "jimp": "^0.2.27",
"mime": "^1.3.4", "mime": "^1.3.4",
"mocha": "^3.2.0", "mocha": "^3.2.0",
"morgan": "^1.7.0", "morgan": "^1.8.0",
"mysql": "^2.12.0", "mysql": "^2.13.0",
"ng2-cookies": "^1.0.4", "ng2-cookies": "^1.0.4",
"node-iptc": "^1.0.4", "node-iptc": "^1.0.4",
"optimist": "^0.6.1", "optimist": "^0.6.1",
"reflect-metadata": "^0.1.9", "reflect-metadata": "^0.1.9",
"rxjs": "^5.0.2", "rxjs": "^5.1.0",
"systemjs": "0.19.41", "systemjs": "0.19.41",
"threads": "^0.7.2", "threads": "^0.7.2",
"typeorm": "0.0.6", "typeorm": "0.0.8",
"zone.js": "^0.7.4" "zone.js": "^0.7.6"
}, },
"devDependencies": { "devDependencies": {
"@types/express": "^4.0.34", "@types/express": "^4.0.35",
"@types/express-session": "0.0.32", "@types/express-session": "0.0.32",
"@types/jasmine": "^2.5.39", "@types/jasmine": "^2.5.41",
"@types/node": "^6.0.54", "@types/node": "^7.0.5",
"@types/optimist": "0.0.29", "@types/optimist": "0.0.29",
"angular-cli": "^1.0.0-beta.24", "angular-cli": "^1.0.0-beta.28.3",
"chai": "^3.5.0", "chai": "^3.5.0",
"jasmine-core": "^2.5.2", "jasmine-core": "^2.5.2",
"karma": "^1.3.0", "karma": "^1.4.1",
"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.2", "karma-phantomjs-launcher": "^1.0.2",
"karma-remap-istanbul": "^0.4.0", "karma-remap-istanbul": "^0.5.0",
"karma-systemjs": "^0.16.0", "karma-systemjs": "^0.16.0",
"mocha": "^3.2.0", "mocha": "^3.2.0",
"phantomjs-prebuilt": "^2.1.14", "phantomjs-prebuilt": "^2.1.14",
"protractor": "^4.0.14", "protractor": "^5.1.0",
"remap-istanbul": "^0.8.4", "remap-istanbul": "^0.8.4",
"rimraf": "^2.5.4", "rimraf": "^2.5.4",
"ts-helpers": "^1.1.2", "ts-helpers": "^1.1.2",
"tslint": "^4.2.0", "tslint": "^4.4.2",
"typescript": "^2.1.4" "typescript": "^2.1.5"
} }
} }