diff --git a/backend/config/Config.ts b/backend/config/Config.ts index ab79509..cd0defb 100644 --- a/backend/config/Config.ts +++ b/backend/config/Config.ts @@ -1,4 +1,4 @@ -/// +/// import {ConfigLoader} from "./../../backend/config/ConfigLoader"; import * as path from "path"; diff --git a/backend/middlewares/user/AuthenticationMWs.ts b/backend/middlewares/user/AuthenticationMWs.ts index c55fab1..52efd34 100644 --- a/backend/middlewares/user/AuthenticationMWs.ts +++ b/backend/middlewares/user/AuthenticationMWs.ts @@ -1,5 +1,5 @@ /// -/// +/// import {NextFunction, Request, Response} from "express"; import {Error, ErrorCodes} from "../../../common/entities/Error"; diff --git a/backend/model/mongoose/DatabaseManager.ts b/backend/model/mongoose/DatabaseManager.ts index dd2d46f..502ac9f 100644 --- a/backend/model/mongoose/DatabaseManager.ts +++ b/backend/model/mongoose/DatabaseManager.ts @@ -1,4 +1,4 @@ -/// +/// import * as mongoose from "mongoose"; import {Schema} from "mongoose"; diff --git a/backend/routes/AdminRouter.ts b/backend/routes/AdminRouter.ts index 31f3757..b191350 100644 --- a/backend/routes/AdminRouter.ts +++ b/backend/routes/AdminRouter.ts @@ -1,4 +1,4 @@ -/// +/// import {AuthenticationMWs} from "../middlewares/user/AuthenticationMWs"; import {UserRoles} from "../../common/entities/User"; diff --git a/backend/routes/ErrorRouter.ts b/backend/routes/ErrorRouter.ts index ed4d2f8..41803cc 100644 --- a/backend/routes/ErrorRouter.ts +++ b/backend/routes/ErrorRouter.ts @@ -1,4 +1,4 @@ -/// +/// import {RenderingMWs} from "../middlewares/RenderingMWs"; import {Error, ErrorCodes} from "../../common/entities/Error"; diff --git a/backend/routes/GalleryRouter.ts b/backend/routes/GalleryRouter.ts index 6a8d351..82871b1 100644 --- a/backend/routes/GalleryRouter.ts +++ b/backend/routes/GalleryRouter.ts @@ -1,4 +1,4 @@ -/// +/// import {AuthenticationMWs} from "../middlewares/user/AuthenticationMWs"; import {GalleryMWs} from "../middlewares/GalleryMWs"; diff --git a/backend/routes/PublicRouter.ts b/backend/routes/PublicRouter.ts index 406e094..67cf554 100644 --- a/backend/routes/PublicRouter.ts +++ b/backend/routes/PublicRouter.ts @@ -1,4 +1,4 @@ -/// +/// import * as _express from "express"; import {NextFunction, Request, Response} from "express"; diff --git a/backend/routes/SharingRouter.ts b/backend/routes/SharingRouter.ts index d760309..9776002 100644 --- a/backend/routes/SharingRouter.ts +++ b/backend/routes/SharingRouter.ts @@ -1,4 +1,4 @@ -/// +/// import {AuthenticationMWs} from "../middlewares/user/AuthenticationMWs"; import {UserRoles} from "../../common/entities/User"; diff --git a/backend/routes/UserRouter.ts b/backend/routes/UserRouter.ts index 738650a..df66c99 100644 --- a/backend/routes/UserRouter.ts +++ b/backend/routes/UserRouter.ts @@ -1,4 +1,4 @@ -/// +/// import {UserMWs} from "../middlewares/user/UserMWs"; import {UserRoles} from "../../common/entities/User"; diff --git a/backend/server.ts b/backend/server.ts index 90951b0..6befc1a 100644 --- a/backend/server.ts +++ b/backend/server.ts @@ -1,4 +1,4 @@ -/// +/// import * as _express from "express"; import * as _session from "express-session"; diff --git a/frontend/app/model/network/authentication.service.ts b/frontend/app/model/network/authentication.service.ts index cf2581e..686a0ef 100644 --- a/frontend/app/model/network/authentication.service.ts +++ b/frontend/app/model/network/authentication.service.ts @@ -23,7 +23,7 @@ export class AuthenticationService { this.OnUserChanged = new Event(); //picking up session.. - if (this.isAuthenticated() == false && Cookie.getCookie('pigallery2-session') != null) { + if (this.isAuthenticated() == false && Cookie.get('pigallery2-session') != null) { if (typeof ServerInject !== "undefined" && typeof ServerInject.user !== "undefined") { console.log("user found"); this.setUser(ServerInject.user); diff --git a/frontend/browser.d.ts b/frontend/browser.d.ts index b128e8c..f523079 100644 --- a/frontend/browser.d.ts +++ b/frontend/browser.d.ts @@ -1,4 +1,4 @@ -/// +/// /// /// /// diff --git a/frontend/main.ts b/frontend/main.ts index 264ab16..39f6419 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -1,4 +1,4 @@ -/// +/// import {bootstrap} from "@angular/platform-browser-dynamic"; import {AppComponent} from "./app/app.component.ts"; diff --git a/package.json b/package.json index fd2306f..6b2b3d5 100644 --- a/package.json +++ b/package.json @@ -34,23 +34,24 @@ "body-parser": "^1.15.1", "core-js": "^2.4.0", "debug": "^2.2.0", - "ejs": "^2.4.1", + "ejs": "^2.4.2", "exif-parser": "^0.1.9", "express": "^4.13.4", "express-session": "^1.13.0", + "html-webpack-plugin": "^2.17.0", "jimp": "^0.2.24", "mime": "^1.3.4", - "mongoose": "^4.4.16", + "mongoose": "^4.4.19", "morgan": "^1.7.0", - "ng2-cookies": "^0.1.5", + "ng2-cookies": "^0.1.9", "node-iptc": "^1.0.4", "optimist": "^0.6.1", "rxjs": "5.0.0-beta.6", "ts-loader": "^0.8.2", - "tslint": "^3.10.1", + "tslint": "^3.10.2", "typescript": "^1.8.10", - "typings": "^0.8.1", - "webpack": "^1.13.0", + "typings": "^1.0.4", + "webpack": "^1.13.1", "zone.js": "^0.6.12" }, "devDependencies": { @@ -75,12 +76,12 @@ "karma-phantomjs-launcher": "^1.0.0", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "1.7.0", - "mocha": "^2.4.5", + "mocha": "^2.5.3", "ng2lint": "0.0.10", "phantomjs-prebuilt": "^2.1.7", "protractor": "^3.2.2", "raw-loader": "0.5.1", - "remap-istanbul": "^0.6.2", + "remap-istanbul": "^0.6.4", "rimraf": "^2.5.2", "source-map-loader": "^0.1.5", "style-loader": "^0.13.0", diff --git a/typings.json b/typings.json index 8d37456..9b63bfd 100644 --- a/typings.json +++ b/typings.json @@ -1,7 +1,7 @@ { "name": "PiGallery2", "version": false, - "ambientDependencies": { + "globalDependencies": { "body-parser": "registry:dt/body-parser#0.0.0+20160317120654", "chai": "registry:dt/chai#3.4.0+20160317120654", "core-js": "registry:dt/core-js#0.0.0+20160317120654",