source style cleanup

backend/config/Config.ts

@@ -1,4 +1,3 @@
-
 import {ConfigLoader} from "./ConfigLoader";
 import * as path from "path";
 

backend/config/ConfigLoader.ts

@@ -1,9 +1,8 @@
-import * as fs from 'fs';
+import * as fs from "fs";
-import * as optimist from 'optimist';
+import * as optimist from "optimist";
 
 export class ConfigLoader {
 
-
     static init(configObject:any, configFilePath?:string) {
         this.processConfigFile(configFilePath, configObject);
         this.processArguments(configObject);
@@ -64,7 +63,6 @@ export class ConfigLoader {
     }
 
 
-
     private static saveConfigFile(configFilePath, configObject) {
         try {
             fs.writeFileSync(configFilePath, JSON.stringify(configObject, null, 4));

backend/middlewares/AuthenticationMWs.ts

@@ -1,7 +1,6 @@
 ///<reference path="ExtendedRequest.d.ts"/>
 ///<reference path="../../typings/main.d.ts"/>
 
-
 import {NextFunction, Request, Response} from "express";
 import {Error, ErrorCodes} from "../../common/entities/Error";
 import {UserRoles} from "../../common/entities/User";
@@ -9,7 +8,6 @@ import {ObjectManagerRepository} from "../model/ObjectManagerRepository";
 
 export class AuthenticationMWs {
 
-    
     public static authenticate(req:Request, res:Response, next:NextFunction) {
         /*   if (typeof req.session.user === 'undefined') {
          return next(new Error(ErrorCodes.NOT_AUTHENTICATED));
@@ -57,7 +55,4 @@ export class AuthenticationMWs {
     }
 
 
-
-    
-
 }

backend/middlewares/ExtendedRequest.d.ts

@@ -1,4 +1,3 @@
-
 declare module Express {
     export interface Request {
         resultPipe?:any

backend/middlewares/GalleryMWs.ts

@@ -1,9 +1,7 @@
-
+import * as path from "path";
-import * as path from 'path';
+import * as fs from "fs";
-import * as fs from 'fs';
 import {NextFunction, Request, Response} from "express";
 import {Error, ErrorCodes} from "../../common/entities/Error";
-import {GalleryManager} from "../model/memory/GalleryManager";
 import {Directory} from "../../common/entities/Directory";
 import {Config} from "../config/Config";
 import {ObjectManagerRepository} from "../model/ObjectManagerRepository";
@@ -49,8 +47,6 @@ export class GalleryMWs {
     }
 
 
-  
-
     public static search(req:Request, res:Response, next:NextFunction) {
         //TODO: implement
         return next(new Error(ErrorCodes.GENERAL_ERROR));
@@ -71,5 +67,4 @@ export class GalleryMWs {
     }
 
 
-
 }

backend/middlewares/RenderingMWs.ts

@@ -1,4 +1,3 @@
-
 import {NextFunction, Request, Response} from "express";
 import {Error, ErrorCodes} from "../../common/entities/Error";
 import {Utils} from "../../common/Utils";

backend/middlewares/ThumbnailGeneratorMWs.ts

@@ -1,16 +1,15 @@
 ///<reference path="jimp.d.ts"/>
 
 
-import * as path from 'path';
+import * as path from "path";
-import * as Jimp from 'jimp';
+import * as Jimp from "jimp";
-import * as crypto from 'crypto';
+import * as crypto from "crypto";
-import * as fs from 'fs';
+import * as fs from "fs";
 import {NextFunction, Request, Response} from "express";
 import {Error, ErrorCodes} from "../../common/entities/Error";
 import {Config} from "../config/Config";
 
 
-
 export class ThumbnailGeneratorMWs {
 
     private static getThumbnailFolder() {

backend/middlewares/UserMWs.ts

@@ -1,5 +1,3 @@
-
-import {UserManager} from "../model/memory/UserManager";
 import {NextFunction, Request, Response} from "express";
 import {Error, ErrorCodes} from "../../common/entities/Error";
 import {ObjectManagerRepository} from "../model/ObjectManagerRepository";
@@ -87,6 +85,4 @@ export class UserMWs {
     }
 
 
-
-
 }

backend/middlewares/UserRequestConstrainsMWs.ts

@@ -1,5 +1,3 @@
-
-import {UserManager} from "../model/memory/UserManager";
 import {NextFunction, Request, Response} from "express";
 import {Error, ErrorCodes} from "../../common/entities/Error";
 import {UserRoles} from "../../common/entities/User";
@@ -7,7 +5,6 @@ import {ObjectManagerRepository} from "../model/ObjectManagerRepository";
 
 export class UserRequestConstrainsMWs {
 
-
     public static forceSelfRequest(req:Request, res:Response, next:NextFunction) {
         if ((typeof req.params === 'undefined') || (typeof req.params.id === 'undefined')) {
             return next();
@@ -55,5 +52,4 @@ export class UserRequestConstrainsMWs {
     }
 
 
-
 }

backend/middlewares/jimp.d.ts

@@ -1,4 +1,5 @@
 declare module "jimp" {
     function read(filaname);
+
     var AUTO:any;
 }

backend/model/DiskManger.ts

@@ -1,8 +1,7 @@
-import * as fs from 'fs';
+import * as fs from "fs";
-import * as path from 'path';
+import * as path from "path";
-import * as mime from 'mime';
+import * as mime from "mime";
-import * as sizeOf  from 'image-size';
+import * as sizeOf from "image-size";
-
 import {Directory} from "../../common/entities/Directory";
 import {Photo} from "../../common/entities/Photo";
 

backend/model/memory/GalleryManager.ts

@@ -10,5 +10,4 @@ export class GalleryManager implements IGalleryManager{
     }
 
 
-
 }

backend/model/memory/SearchManager.ts

@@ -9,5 +9,4 @@ export class SearchManager implements ISearchManager{
     }
 
 
-
 }

backend/model/memory/UserManager.ts

@@ -34,6 +34,7 @@ export class UserManager implements IUserManager{
             }
         }
     }
+
     public changePassword(request:any, cb:(error:any, result:string) => void) {
         throw new Error("not implemented"); //TODO: implement
     }

backend/model/mongoose/MongoGalleryManager.ts

@@ -1,5 +1,4 @@
-import * as path from 'path';
+import * as path from "path";
-
 import {Directory} from "../../../common/entities/Directory";
 import {IGalleryManager} from "../IGalleryManager";
 import {DiskManager} from "../DiskManger";
@@ -16,7 +15,10 @@ export class MongoGalleryManager implements IGalleryManager{
         let directoryName = path.basename(relativeDirectoryName);
         let directoryParent = path.join(path.dirname(relativeDirectoryName), "/");
 
-        DirectoryModel.findOne({name:directoryName, path: directoryParent}).populate('photos').populate('directories').exec( (err,res:any) =>{
+        DirectoryModel.findOne({
+            name: directoryName,
+            path: directoryParent
+        }).populate('photos').populate('directories').exec((err, res:any) => {
             if (err || !res) {
                 return this.indexDirectory(relativeDirectoryName, cb);
             }
@@ -52,5 +54,4 @@ export class MongoGalleryManager implements IGalleryManager{
     }
 
 
-
 }

backend/model/mongoose/MongoSearchManager.ts

@@ -5,11 +5,9 @@ import {PhotoModel} from "./entities/PhotoModel";
 
 export class MongoSearchManager implements ISearchManager {
 
-
     constructor() {
     }
 
-
     autocomplete(text, cb:(error:any, result:Array<AutoCompleteItem>) => void) {
 
         console.log("autocomplete: " + text);
@@ -20,7 +18,12 @@ export class MongoSearchManager implements ISearchManager{
             }
             items = items.concat(this.encapsulateAutoComplete(res.map(r => r.name), AutoCompeleteTypes.image));
 
-            DirectoryModel.find({name:  { $regex: text, $options: "i" } }).limit(10).select('name').exec( (err,res:Array<any>) =>{
+            DirectoryModel.find({
+                name: {
+                    $regex: text,
+                    $options: "i"
+                }
+            }).limit(10).select('name').exec((err, res:Array<any>) => {
                 if (err || !res) {
                     return cb(err, null);
                 }
@@ -41,5 +44,4 @@ export class MongoSearchManager implements ISearchManager{
     }
 
 
-
 }

backend/model/mongoose/MongoUserManager.ts

@@ -4,7 +4,6 @@ import {UserModel} from "./entities/UserModel";
 
 export class MongoUserManager implements IUserManager {
 
-
     constructor() {
     }
 

backend/routes/AdminRouter.ts

@@ -27,7 +27,4 @@ export class AdminRouter{
     };
 
 
-
-
-
 }

backend/routes/GalleryRouter.ts

@@ -59,5 +59,4 @@ export class GalleryRouter{
     };
 
 
-
 }

backend/routes/PublicRouter.ts

@@ -1,13 +1,9 @@
 ///<reference path="../../typings/main.d.ts"/>
 
-
+import * as _express from "express";
-import * as _express from 'express';
-import * as _path from 'path';
-
-
-import {Utils} from "../../common/Utils";
-
 import {NextFunction, Request, Response} from "express";
+import * as _path from "path";
+import {Utils} from "../../common/Utils";
 
 export class PublicRouter {
     constructor(private app) {

backend/routes/SharingRouter.ts

@@ -27,7 +27,4 @@ export class SharingRouter{
     };
 
 
-
-
-
 }

common/entities/AutoCompleteItem.ts

@@ -5,6 +5,7 @@ export enum AutoCompeleteTypes {
 }
 
 export class AutoCompleteItem {
-    constructor(public text:string,public  type:AutoCompeleteTypes){}
+    constructor(public text:string, public  type:AutoCompeleteTypes) {
+    }
 }
 

common/entities/Directory.ts

@@ -6,5 +6,6 @@ export class Directory{
                 public path?:string,
                 public lastUpdate?:Date,
                 public directories:Array<Directory> = [],
-                public photos:Array<Photo> = []){}
+                public photos:Array<Photo> = []) {
+    }
 }

common/entities/Error.ts

@@ -1,4 +1,3 @@
-
 export enum ErrorCodes{
     NOT_AUTHENTICATED,
     ALREADY_AUTHENTICATED,
@@ -15,5 +14,6 @@ export enum ErrorCodes{
 }
 
 export class Error {
-    constructor(public code:ErrorCodes, public message?:String) {}
+    constructor(public code:ErrorCodes, public message?:String) {
+    }
 }

common/entities/Message.ts

@@ -3,6 +3,7 @@ import {Error} from "./Error";
 export class Message<T> {
     public error:Error = null;
     public result:T = null;
+
     constructor(error:Error, result:T) {
         this.error = error;
         this.result = result;

common/entities/Photo.ts

@@ -7,6 +7,7 @@ export class Photo {
     public static getThumbnailPath(directory:Directory, photo:Photo) {
         return Utils.concatUrls("/api/gallery/content/", directory.path, directory.name, photo.name, "thumbnail");
     }
+
     public static  getPhotoPath(directory:Directory, photo:Photo) {
         return Utils.concatUrls("/api/gallery/content/", directory.path, directory.name, photo.name);
     }

common/entities/User.ts

@@ -1,4 +1,3 @@
-
 export enum UserRoles{
     Guest = 1,
     User = 2,
@@ -8,5 +7,6 @@ export enum UserRoles{
 }
 
 export class User {
-    constructor(public id?:number,public name?:string, public password?:string, public role:UserRoles = UserRoles.User){}
+    constructor(public id?:number, public name?:string, public password?:string, public role:UserRoles = UserRoles.User) {
+    }
 }

common/entities/UserModificationRequest.ts

@@ -1,3 +1,4 @@
 export class UserModificationRequest {
-    constructor(public id:number){}
+    constructor(public id:number) {
+    }
 }

frontend/app/admin/admin.component.ts

@@ -9,7 +9,7 @@ import {FORM_DIRECTIVES} from "@angular/common";
 import {Utils} from "../../../common/Utils";
 import {AdminService} from "./admin.service";
 import {Message} from "../../../common/entities/Message";
-import {StringifyRole} from "./StringifyRolePipe";
+import {StringifyRole} from "./../pipes/StringifyRolePipe";
 
 @Component({
     selector: 'admin',

frontend/app/admin/admin.service.ts

@@ -1,8 +1,7 @@
 ///<reference path="../../browser.d.ts"/>
 
-import {Injectable} from '@angular/core'; 
+import {Injectable} from "@angular/core";
 import {NetworkService} from "../model/network/network.service.ts";
-import {Http} from "@angular/http";
 import {Message} from "../../../common/entities/Message";
 import {User} from "../../../common/entities/User";
 

frontend/app/app.component.ts

@@ -1,6 +1,6 @@
 ///<reference path="../browser.d.ts"/>
 
-import { Component,OnInit } from '@angular/core'; 
+import {Component, OnInit} from "@angular/core";
 import {LoginComponent} from "./login/login.component";
 import {AuthenticationService} from "./model/network/authentication.service.ts";
 import {GalleryComponent} from "./gallery/gallery.component";

frontend/app/frame/frame.component.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../browser.d.ts"/>
 
-import {Component,  ViewEncapsulation} from '@angular/core'; 
+import {Component, ViewEncapsulation} from "@angular/core";
 import {RouterLink} from "@angular/router-deprecated";
 
 @Component({

frontend/app/gallery/directory/directory.gallery.component.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../../browser.d.ts"/>
 
-import {Component, Input} from '@angular/core'; 
+import {Component, Input} from "@angular/core";
 import {Directory} from "../../../../common/entities/Directory";
 import {RouterLink} from "@angular/router-deprecated";
 import {Utils} from "../../../../common/Utils";
@@ -21,6 +21,5 @@ export class GalleryDirectoryComponent{
     }
 
 
-    
 }
 

frontend/app/gallery/gallery.component.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../browser.d.ts"/>
 
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit} from "@angular/core";
 import {AuthenticationService} from "../model/network/authentication.service.ts";
 import {Router, RouteParams} from "@angular/router-deprecated";
 import {GalleryService} from "./gallery.service";
@@ -54,7 +54,5 @@ export class GalleryComponent implements OnInit{
     }
 
 
-
-    
 }
 

frontend/app/gallery/gallery.service.ts

@@ -1,8 +1,7 @@
 ///<reference path="../../browser.d.ts"/>
 
-import {Injectable} from '@angular/core';
+import {Injectable} from "@angular/core";
 import {NetworkService} from "../model/network/network.service.ts";
-import {Http} from "@angular/http";
 import {Message} from "../../../common/entities/Message";
 import {Directory} from "../../../common/entities/Directory";
 

frontend/app/gallery/grid/GridRowBuilder.ts

@@ -1,4 +1,3 @@
-
 import {Photo} from "../../../../common/entities/Photo";
 
 export class GridRowBuilder {

frontend/app/gallery/lightbox/lightbox.gallery.component.ts

@@ -45,7 +45,6 @@ export class GalleryLightboxComponent {
         from.top -= this.getBodyScrollTop();
 
 
-
         let fromImage = {width: from.width + "px", height: from.height + "px", top: "0px", left: "0px"};
         let toImage = this.calcLightBoxPhotoDimension(this.activePhoto.photo).toStyle();
 

frontend/app/gallery/photo/photo.gallery.component.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../../browser.d.ts"/>
 
-import {Component, Input, ElementRef, ViewChild} from '@angular/core';
+import {Component, Input, ElementRef, ViewChild} from "@angular/core";
 import {Photo} from "../../../../common/entities/Photo";
 import {Directory} from "../../../../common/entities/Directory";
 import {IRenderable, Dimension} from "../../model/IRenderable";

frontend/app/gallery/search/autocomplete.service.ts

@@ -1,7 +1,6 @@
 ///<reference path="../../../browser.d.ts"/>
 
 import {Injectable} from "@angular/core";
-import {Http} from "@angular/http";
 import {NetworkService} from "../../model/network/network.service";
 import {AutoCompleteItem} from "../../../../common/entities/AutoCompleteItem";
 import {Message} from "../../../../common/entities/Message";

frontend/app/gallery/search/search.gallery.component.ts

@@ -14,6 +14,7 @@ import {Message} from "../../../../common/entities/Message";
 export class GallerySearchComponent {
 
     autoCompleteItems:Array<AutoCompleteRenderItem> = [];
+
     constructor(private _autoCompleteService:AutoCompleteService) {
     }
 
@@ -58,8 +59,6 @@ export class GallerySearchComponent {
     }
 
 
-
-
 }
 
 class AutoCompleteRenderItem {

frontend/app/login/login.component.ts

@@ -1,7 +1,7 @@
 ///<reference path="../../browser.d.ts"/>
 
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit} from "@angular/core";
-import {LoginCredential} from '../../../common/entities/LoginCredential';
+import {LoginCredential} from "../../../common/entities/LoginCredential";
 import {AuthenticationService} from "../model/network/authentication.service.ts";
 import {Router} from "@angular/router-deprecated";
 import {FORM_DIRECTIVES} from "@angular/common";
@@ -14,6 +14,7 @@ import {FORM_DIRECTIVES} from "@angular/common";
 })
 export class LoginComponent implements OnInit {
     loginCredential:LoginCredential;
+
     constructor(private _authService:AuthenticationService, private _router:Router) {
         this.loginCredential = new LoginCredential();
     }

frontend/app/model/network/autehentication.service.spec.ts

@@ -1,13 +1,7 @@
 ///<reference path="../../../browser.d.ts"/>
 
-import {
+import {it, inject, beforeEachProviders} from "@angular/core/testing";
-    it,
+import {provide} from "@angular/core";
-    inject,
-    beforeEachProviders
-} from '@angular/core/testing';
- 
-
-import {provide} from '@angular/core'; 
 import {UserService} from "./user.service.ts";
 import {User} from "../../../../common/entities/User";
 import {Message} from "../../../../common/entities/Message";

frontend/app/model/network/authentication.service.ts

@@ -1,12 +1,12 @@
 ///<reference path="../../../browser.d.ts"/>
 
-import {Injectable} from '@angular/core';
+import {Injectable} from "@angular/core";
 import {User} from "../../../../common/entities/User";
 import {Event} from "../../../../common/event/Event";
 import {UserService} from "./user.service.ts";
 import {LoginCredential} from "../../../../common/entities/LoginCredential";
 import {Message} from "../../../../common/entities/Message";
-import { Cookie } from 'ng2-cookies/ng2-cookies';
+import {Cookie} from "ng2-cookies/ng2-cookies";
 import {ErrorCodes} from "../../../../common/entities/Error";
 
 declare module ServerInject {

frontend/app/model/network/network.service.spec.ts

@@ -1,7 +1,7 @@
 ///<reference path="../../../browser.d.ts"/>
 
 import {it, inject, beforeEachProviders, beforeEach, afterEach} from "@angular/core/testing";
-import {BaseRequestOptions, Http, Response, ResponseOptions, ResponseType, BaseResponseOptions} from "@angular/http";
+import {BaseRequestOptions, Http, Response, ResponseOptions} from "@angular/http";
 import {MockBackend, MockConnection} from "@angular/http/testing";
 import {provide} from "@angular/core";
 import "rxjs/Rx";

frontend/app/model/network/network.service.ts

@@ -1,6 +1,6 @@
 ///<reference path="../../../browser.d.ts"/>
 
-import {Injectable} from '@angular/core';
+import {Injectable} from "@angular/core";
 import {Http, Headers, RequestOptions} from "@angular/http";
 import {Message} from "../../../../common/entities/Message";
 import "rxjs/Rx";

frontend/app/model/network/user.service.spec.ts

@@ -1,14 +1,12 @@
 ///<reference path="../../../browser.d.ts"/>
 
-import {it, inject, beforeEachProviders, beforeEach, afterEach} from "@angular/core/testing";
+import {it, inject, beforeEachProviders} from "@angular/core/testing";
-import {BaseRequestOptions, Http, Response, ResponseOptions} from "@angular/http";
+import {BaseRequestOptions, Http} from "@angular/http";
-import {MockBackend, MockConnection} from "@angular/http/testing";
+import {MockBackend} from "@angular/http/testing";
 import {provide} from "@angular/core";
 import "rxjs/Rx";
 import {NetworkService} from "./network.service";
-import {Message} from "../../../../common/entities/Message";
 import {UserService} from "./user.service";
-import {LoginComponent} from "../../login/login.component";
 import {LoginCredential} from "../../../../common/entities/LoginCredential";
 
 
@@ -28,9 +26,6 @@ describe('UserService', () => {
     ]);
 
 
-
-
-
     it('should call postJson at login', inject([UserService, NetworkService], (userService, networkService) => {
         spyOn(networkService, "postJson");
         let credential = new LoginCredential("name", "pass");
@@ -47,6 +42,4 @@ describe('UserService', () => {
     }));
 
 
-
-
 });

frontend/app/model/network/user.service.ts

@@ -1,8 +1,7 @@
 ///<reference path="../../../browser.d.ts"/>
 
-import {Injectable} from '@angular/core';
+import {Injectable} from "@angular/core";
 import {LoginCredential} from "../../../../common/entities/LoginCredential";
-import {Http} from "@angular/http";
 import {NetworkService} from "./network.service.ts";
 import {User} from "../../../../common/entities/User";
 import {Message} from "../../../../common/entities/Message";
@@ -11,7 +10,6 @@ import {Message} from "../../../../common/entities/Message";
 export class UserService {
 
 
-
     constructor(private _networkService:NetworkService) {
     }
 

frontend/main.ts

@@ -1,6 +1,6 @@
 ///<reference path="../typings/browser.d.ts"/>
 
-import { bootstrap }    from '@angular/platform-browser-dynamic';
+import {bootstrap} from "@angular/platform-browser-dynamic";
 import {AppComponent} from "./app/app.component.ts";
 
 bootstrap(AppComponent)