mirror of
https://github.com/bpatrik/pigallery2.git
synced 2024-12-25 02:04:15 +02:00
updating to angular2.rc.1
This commit is contained in:
parent
ea28a8e5e6
commit
ff17089abf
10
common/entities/AutoCompleteItem.ts
Normal file
10
common/entities/AutoCompleteItem.ts
Normal file
@ -0,0 +1,10 @@
|
||||
export enum AutoCompeleteTypes {
|
||||
image,
|
||||
directory,
|
||||
imageTag
|
||||
}
|
||||
|
||||
export class AutoCompleteItem{
|
||||
constructor(text:string, type:AutoCompeleteTypes){}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {Pipe, PipeTransform} from "angular2/core";
|
||||
import {Pipe, PipeTransform} from "@angular/core";
|
||||
import {UserRoles} from "../../../common/entities/User";
|
||||
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
///<reference path="../../browser.d.ts"/>
|
||||
|
||||
import {Component, OnInit, Pipe, PipeTransform} from "angular2/core";
|
||||
import {Component, OnInit} from "@angular/core";
|
||||
import {AuthenticationService} from "../model/network/authentication.service.ts";
|
||||
import {Router} from "angular2/router";
|
||||
import {Router} from "@angular/router-deprecated";
|
||||
import {FrameComponent} from "../frame/frame.component";
|
||||
import {User, UserRoles} from "../../../common/entities/User";
|
||||
import {FORM_DIRECTIVES} from "angular2/common";
|
||||
import {FORM_DIRECTIVES} from "@angular/common";
|
||||
import {Utils} from "../../../common/Utils";
|
||||
import {AdminService} from "./admin.service";
|
||||
import {Message} from "../../../common/entities/Message";
|
||||
|
@ -1,8 +1,8 @@
|
||||
///<reference path="../../browser.d.ts"/>
|
||||
|
||||
import {Injectable} from 'angular2/core';
|
||||
import {Injectable} from '@angular/core';
|
||||
import {NetworkService} from "../model/network/network.service.ts";
|
||||
import {Http} from "angular2/http";
|
||||
import {Http} from "@angular/http";
|
||||
import {Message} from "../../../common/entities/Message";
|
||||
import {User} from "../../../common/entities/User";
|
||||
|
||||
|
@ -1,14 +0,0 @@
|
||||
|
||||
import {Component} from 'angular2/core';
|
||||
|
||||
@Component({
|
||||
selector: 'admin-new-user',
|
||||
templateUrl: 'app/admin/newuser/new.user.admin.component.html',
|
||||
styleUrls:['app/admin/newuser/new.user.admin.component.css']
|
||||
})
|
||||
export class NewUserComponent{
|
||||
constructor() {
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,14 +1,12 @@
|
||||
///<reference path="../browser.d.ts"/>
|
||||
|
||||
import { Component } from 'angular2/core';
|
||||
import {RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS, RouterLink} from 'angular2/router';
|
||||
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";
|
||||
import {OnInit} from "angular2/core";
|
||||
import {User} from "../../common/entities/User";
|
||||
import {Router} from "angular2/router";
|
||||
import {HTTP_PROVIDERS} from "angular2/http";
|
||||
import {Router, RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS} from "@angular/router-deprecated";
|
||||
import {HTTP_PROVIDERS} from "@angular/http";
|
||||
import {UserService} from "./model/network/user.service.ts";
|
||||
import {GalleryService} from "./gallery/gallery.service";
|
||||
import {AdminComponent} from "./admin/admin.component";
|
||||
@ -17,7 +15,7 @@ import {AdminComponent} from "./admin/admin.component";
|
||||
@Component({
|
||||
selector: 'pi-gallery2-app',
|
||||
template: `<router-outlet></router-outlet>`,
|
||||
directives: [ROUTER_DIRECTIVES, RouterLink],
|
||||
directives: [ROUTER_DIRECTIVES],
|
||||
providers: [
|
||||
HTTP_PROVIDERS,
|
||||
ROUTER_PROVIDERS,
|
||||
|
@ -1,7 +1,7 @@
|
||||
///<reference path="../../browser.d.ts"/>
|
||||
|
||||
import {Component, ViewEncapsulation} from 'angular2/core';
|
||||
import {RouterLink} from "angular2/router";
|
||||
import {Component, ViewEncapsulation} from '@angular/core';
|
||||
import {RouterLink} from "@angular/router-deprecated";
|
||||
|
||||
@Component({
|
||||
selector: 'app-frame',
|
||||
|
@ -1,8 +1,8 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Component, Input, OnInit} from 'angular2/core';
|
||||
import {Component, Input} from '@angular/core';
|
||||
import {Directory} from "../../../../common/entities/Directory";
|
||||
import {RouterLink} from "angular2/router";
|
||||
import {RouterLink} from "@angular/router-deprecated";
|
||||
import {Utils} from "../../../../common/Utils";
|
||||
|
||||
@Component({
|
||||
|
@ -1,8 +1,8 @@
|
||||
///<reference path="../../browser.d.ts"/>
|
||||
|
||||
import {Component, OnInit, QueryList, ViewChild, AfterViewInit} from 'angular2/core';
|
||||
import {Component, OnInit, QueryList, ViewChild, AfterViewInit} from '@angular/core';
|
||||
import {AuthenticationService} from "../model/network/authentication.service.ts";
|
||||
import {Router, RouteParams} from "angular2/router";
|
||||
import {Router, RouteParams} from "@angular/router-deprecated";
|
||||
import {GalleryService} from "./gallery.service";
|
||||
import {Directory} from "../../../common/entities/Directory";
|
||||
import {Message} from "../../../common/entities/Message";
|
||||
|
@ -1,8 +1,8 @@
|
||||
///<reference path="../../browser.d.ts"/>
|
||||
|
||||
import {Injectable} from 'angular2/core';
|
||||
import {Injectable} from '@angular/core';
|
||||
import {NetworkService} from "../model/network/network.service.ts";
|
||||
import {Http} from "angular2/http";
|
||||
import {Http} from "@angular/http";
|
||||
import {Message} from "../../../common/entities/Message";
|
||||
import {Directory} from "../../../common/entities/Directory";
|
||||
|
||||
|
@ -1,16 +1,21 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {
|
||||
Component, Input, ElementRef, OnChanges, ViewChild, ViewChildren, QueryList, Output, AfterViewInit, EventEmitter
|
||||
} from 'angular2/core';
|
||||
Component,
|
||||
Input,
|
||||
ElementRef,
|
||||
OnChanges,
|
||||
ViewChild,
|
||||
ViewChildren,
|
||||
QueryList,
|
||||
AfterViewInit
|
||||
} from "@angular/core";
|
||||
import {Directory} from "../../../../common/entities/Directory";
|
||||
import {Photo} from "../../../../common/entities/Photo";
|
||||
import {GalleryPhotoComponent} from "../photo/photo.gallery.component";
|
||||
import {GridRowBuilder} from "./GridRowBuilder";
|
||||
import {AnimationBuilder} from "angular2/animate";
|
||||
import {Utils} from "../../../../common/Utils";
|
||||
import {GalleryLightboxComponent} from "../lightbox/lightbox.gallery.component";
|
||||
import {Observable} from "rxjs/Observable";
|
||||
|
||||
@Component({
|
||||
selector: 'gallery-grid',
|
||||
templateUrl: 'app/gallery/grid/grid.gallery.component.html',
|
||||
@ -54,6 +59,7 @@ export class GalleryGridComponent implements OnChanges,AfterViewInit{
|
||||
}
|
||||
|
||||
private renderedConteinerWidth = 0;
|
||||
|
||||
private renderPhotos() {
|
||||
let maxRowHeight = window.innerHeight / this.MIN_ROW_COUNT;
|
||||
let minRowHeight = window.innerHeight / this.MAX_ROW_COUNT;
|
||||
@ -93,9 +99,6 @@ export class GalleryGridComponent implements OnChanges,AfterViewInit{
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Component, ElementRef, ViewChild, QueryList} from "angular2/core";
|
||||
import {Component, ElementRef, ViewChild, QueryList} from "@angular/core";
|
||||
import {Photo} from "../../../../common/entities/Photo";
|
||||
import {GalleryPhotoComponent} from "../photo/photo.gallery.component";
|
||||
import {AnimationBuilder} from "angular2/animate";
|
||||
import {BrowserDomAdapter} from "angular2/src/platform/browser/browser_adapter";
|
||||
import {AnimationBuilder} from "@angular/platform-browser/src/animate/animation_builder";
|
||||
import {BrowserDomAdapter} from "@angular/platform-browser/src/browser_common";
|
||||
import {Dimension} from "../../model/IRenderable";
|
||||
|
||||
@Component({
|
||||
|
@ -1,6 +1,6 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Component, Input, ElementRef, ViewChild} from 'angular2/core';
|
||||
import {Component, Input, ElementRef, ViewChild} from '@angular/core';
|
||||
import {Photo} from "../../../../common/entities/Photo";
|
||||
import {Directory} from "../../../../common/entities/Directory";
|
||||
import {Utils} from "../../../../common/Utils";
|
||||
|
@ -1,7 +1,7 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Injectable} from "angular2/core";
|
||||
import {Http} from "angular2/http";
|
||||
import {Injectable} from "@angular/core";
|
||||
import {Http} from "@angular/http";
|
||||
import {NetworkService} from "../../model/network/network.service";
|
||||
|
||||
@Injectable()
|
||||
|
@ -1,6 +1,6 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Component} from "angular2/core";
|
||||
import {Component} from "@angular/core";
|
||||
import {AutoCompleteService} from "./autocomplete.service";
|
||||
|
||||
@Component({
|
||||
|
@ -1,10 +1,10 @@
|
||||
///<reference path="../../browser.d.ts"/>
|
||||
|
||||
import {Component, OnInit} from 'angular2/core';
|
||||
import {Component, OnInit} from '@angular/core';
|
||||
import {LoginCredential} from '../../../common/entities/LoginCredential';
|
||||
import {AuthenticationService} from "../model/network/authentication.service.ts";
|
||||
import {Router} from "angular2/router";
|
||||
import {FORM_DIRECTIVES} from "angular2/common";
|
||||
import {Router} from "@angular/router-deprecated";
|
||||
import {FORM_DIRECTIVES} from "@angular/common";
|
||||
|
||||
@Component({
|
||||
selector: 'login',
|
||||
|
@ -4,11 +4,11 @@ import {
|
||||
it,
|
||||
inject,
|
||||
injectAsync,
|
||||
beforeEachProviders,
|
||||
TestComponentBuilder
|
||||
} from 'angular2/testing';
|
||||
beforeEachProviders
|
||||
} from '@angular/core/testing';
|
||||
|
||||
import {provide} from 'angular2/core';
|
||||
|
||||
import {provide} from '@angular/core';
|
||||
import {AuthenticationService} from "./authentication.service.ts";
|
||||
import {UserService} from "./user.service.ts";
|
||||
import {User} from "../../../../common/entities/User";
|
||||
|
@ -1,6 +1,6 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Injectable} from 'angular2/core';
|
||||
import {Injectable} from '@angular/core';
|
||||
import {User} from "../../../../common/entities/User";
|
||||
import {Event} from "../../../../common/event/Event";
|
||||
import {UserService} from "./user.service.ts";
|
||||
|
@ -1,9 +1,8 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Http, Headers, RequestOptions, Response} from "angular2/http";
|
||||
import {Http, Headers, RequestOptions} from "@angular/http";
|
||||
import {Message} from "../../../../common/entities/Message";
|
||||
import "rxjs/Rx";
|
||||
import {Utils} from "../../../../common/Utils";
|
||||
|
||||
export class NetworkService{
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
///<reference path="../../../browser.d.ts"/>
|
||||
|
||||
import {Injectable} from 'angular2/core';
|
||||
import {Injectable} from '@angular/core';
|
||||
import {LoginCredential} from "../../../../common/entities/LoginCredential";
|
||||
import {Http} from "angular2/http";
|
||||
import {Http} from "@angular/http";
|
||||
import {NetworkService} from "./network.service.ts";
|
||||
import {User} from "../../../../common/entities/User";
|
||||
import {Message} from "../../../../common/entities/Message";
|
||||
|
5
frontend/browser.d.ts
vendored
5
frontend/browser.d.ts
vendored
@ -1,6 +1,9 @@
|
||||
/// <reference path="../typings/browser.d.ts"/>
|
||||
/// <reference path="../common/common-classes.d.ts" />
|
||||
/// <reference path="../node_modules/angular2/typings/browser.d.ts" />
|
||||
/// <reference path="../node_modules/tslint/lib/tslint.d.ts" />
|
||||
/// <reference path="../node_modules/@angular/core/index.d.ts" />
|
||||
/// <reference path="../node_modules/@angular/common/index.d.ts" />
|
||||
/// <reference path="../node_modules/@angular/router/index.d.ts" />
|
||||
/// <reference path="../node_modules/@angular/router-deprecated/index.d.ts" />
|
||||
/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts"/>
|
||||
|
||||
|
@ -1,6 +1,8 @@
|
||||
///<reference path="../typings/browser.d.ts"/>
|
||||
|
||||
import { bootstrap } from 'angular2/platform/browser';
|
||||
import { bootstrap } from '@angular/platform-browser-dynamic';
|
||||
import {AppComponent} from "./app/app.component.ts";
|
||||
|
||||
bootstrap(AppComponent);
|
||||
bootstrap(AppComponent)
|
||||
.catch(err => console.error(err));
|
||||
|
||||
|
@ -8,6 +8,7 @@
|
||||
},
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
"typings"
|
||||
"typings/main.d.ts",
|
||||
"typings/main"
|
||||
]
|
||||
}
|
12
package.json
12
package.json
@ -22,7 +22,15 @@
|
||||
"url": "https://github.com/bpatrik/PiGallery2/issues"
|
||||
},
|
||||
"dependencies": {
|
||||
"angular2": "^2.0.0-beta.17",
|
||||
"@angular/common": "2.0.0-rc.1",
|
||||
"@angular/compiler": "2.0.0-rc.1",
|
||||
"@angular/core": "2.0.0-rc.1",
|
||||
"@angular/http": "2.0.0-rc.1",
|
||||
"@angular/platform-browser": "2.0.0-rc.1",
|
||||
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
|
||||
"@angular/platform-server": "2.0.0-rc.1",
|
||||
"@angular/router": "2.0.0-rc.1",
|
||||
"@angular/router-deprecated": "2.0.0-rc.1",
|
||||
"body-parser": "^1.15.0",
|
||||
"core-js": "^2.3.0",
|
||||
"debug": "^2.2.0",
|
||||
@ -38,7 +46,7 @@
|
||||
"optimist": "^0.6.1",
|
||||
"rxjs": "5.0.0-beta.6",
|
||||
"ts-loader": "^0.8.2",
|
||||
"tslint": "^3.8.1",
|
||||
"tslint": "^3.9.0",
|
||||
"typescript": "^1.8.10",
|
||||
"typings": "^0.8.1",
|
||||
"webpack": "^1.13.0",
|
||||
|
@ -8,6 +8,7 @@
|
||||
},
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
"typings"
|
||||
"typings/main.d.ts",
|
||||
"typings/main"
|
||||
]
|
||||
}
|
@ -8,6 +8,7 @@
|
||||
},
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
"typings"
|
||||
"typings/main.d.ts",
|
||||
"typings/main"
|
||||
]
|
||||
}
|
@ -3,6 +3,7 @@
|
||||
"version": false,
|
||||
"ambientDependencies": {
|
||||
"body-parser": "registry:dt/body-parser#0.0.0+20160317120654",
|
||||
"core-js": "registry:dt/core-js#0.0.0+20160317120654",
|
||||
"debug": "github:DefinitelyTyped/DefinitelyTyped/debug/debug.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e",
|
||||
"express": "github:DefinitelyTyped/DefinitelyTyped/express/express.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e",
|
||||
"express-session": "registry:dt/express-session#0.0.0+20160331200931",
|
||||
@ -13,5 +14,8 @@
|
||||
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e",
|
||||
"optimist": "registry:dt/optimist#0.0.0+20160316171810",
|
||||
"serve-static": "github:DefinitelyTyped/DefinitelyTyped/serve-static/serve-static.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e"
|
||||
},
|
||||
"dependencies": {
|
||||
"es6-promise": "registry:npm/es6-promise#3.0.0+20160211003958"
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user