diff --git a/frontend/app/admin/admin.component.html b/frontend/app/admin/admin.component.html index a355eb82..b8f7e3a1 100644 --- a/frontend/app/admin/admin.component.html +++ b/frontend/app/admin/admin.component.html @@ -1,9 +1,12 @@ - - User management - - - - - +
+
+
+

User management

+
+
+ +
+
+
diff --git a/frontend/app/admin/admin.component.ts b/frontend/app/admin/admin.component.ts index 90d9ce63..bab5c71c 100644 --- a/frontend/app/admin/admin.component.ts +++ b/frontend/app/admin/admin.component.ts @@ -3,16 +3,13 @@ import {Component, OnInit} from 'angular2/core'; import {AuthenticationService} from "../model/network/authentication.service.ts"; import {Router} from "angular2/router"; -import {MATERIAL_DIRECTIVES} from "ng2-material/all"; -import {MATERIAL_BROWSER_PROVIDERS} from "ng2-material/all"; import {FrameComponent} from "../frame/frame.component"; @Component({ selector: 'admin', templateUrl: 'app/admin/admin.component.html', styleUrls:['app/admin/admin.component.css'], - directives:[MATERIAL_DIRECTIVES, FrameComponent], - providers:[MATERIAL_BROWSER_PROVIDERS] + directives:[FrameComponent] }) export class AdminComponent implements OnInit{ constructor(private _authService: AuthenticationService, private _router: Router) { diff --git a/frontend/app/admin/newuser/new.user.admin.component.ts b/frontend/app/admin/newuser/new.user.admin.component.ts index 1111808a..ede34669 100644 --- a/frontend/app/admin/newuser/new.user.admin.component.ts +++ b/frontend/app/admin/newuser/new.user.admin.component.ts @@ -1,16 +1,13 @@ import {Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from "ng2-material/all"; -import {MdDialogRef} from "ng2-material/components/dialog/dialog_ref"; @Component({ selector: 'admin-new-user', templateUrl: 'app/admin/newuser/new.user.admin.component.html', - styleUrls:['app/admin/newuser/new.user.admin.component.css'], - directives:[MATERIAL_DIRECTIVES] + styleUrls:['app/admin/newuser/new.user.admin.component.css'] }) export class NewUserComponent{ - constructor(private dialog: MdDialogRef) { + constructor() { } } diff --git a/frontend/app/app.component.ts b/frontend/app/app.component.ts index d2c8d554..48b1ce68 100644 --- a/frontend/app/app.component.ts +++ b/frontend/app/app.component.ts @@ -10,9 +10,7 @@ import {User} from "../../common/entities/User"; import {Router} from "angular2/router"; import {HTTP_PROVIDERS} from "angular2/http"; import {UserService} from "./model/network/user.service.ts"; -import {GalleryService} from "./gallery/gallery.service"; -import {MATERIAL_BROWSER_PROVIDERS} from "ng2-material/all"; -import {ViewportHelper} from "ng2-material/core/util/viewport"; +import {GalleryService} from "./gallery/gallery.service"; import {AdminComponent} from "./admin/admin.component"; @@ -25,9 +23,7 @@ import {AdminComponent} from "./admin/admin.component"; ROUTER_PROVIDERS, UserService, GalleryService, - AuthenticationService,MATERIAL_BROWSER_PROVIDERS,ViewportHelper - - ] + AuthenticationService] }) @RouteConfig([ { diff --git a/frontend/app/frame/frame.component.html b/frontend/app/frame/frame.component.html index 26cb95a4..44d164ef 100644 --- a/frontend/app/frame/frame.component.html +++ b/frontend/app/frame/frame.component.html @@ -1,59 +1,21 @@ - - - - -

PiGallery2

- - - - - - - - - - - -
- - - - -
- - \ No newline at end of file + PiGallery2 + + + + + \ No newline at end of file diff --git a/frontend/app/frame/frame.component.ts b/frontend/app/frame/frame.component.ts index c5158806..a9f71ae8 100644 --- a/frontend/app/frame/frame.component.ts +++ b/frontend/app/frame/frame.component.ts @@ -1,25 +1,18 @@ /// import {Component, ViewEncapsulation} from 'angular2/core'; -import {Router, RouterLink} from "angular2/router"; -import {MATERIAL_DIRECTIVES} from "ng2-material/all"; -import {MATERIAL_BROWSER_PROVIDERS} from "ng2-material/all"; -import {ViewportHelper} from "ng2-material/all"; -import {SidenavService} from "ng2-material/all"; +import {RouterLink} from "angular2/router"; @Component({ selector: 'app-frame', templateUrl: 'app/frame/frame.component.html', - directives:[RouterLink,MATERIAL_DIRECTIVES], - providers: [SidenavService], + directives:[RouterLink], encapsulation: ViewEncapsulation.Emulated }) export class FrameComponent { - constructor( private _router: Router, public sidenav: SidenavService) { + constructor() { } - public showSideNav(){ - this.sidenav.show("menu"); - } + } diff --git a/frontend/app/gallery/directory/directory.gallery.component.ts b/frontend/app/gallery/directory/directory.gallery.component.ts index 9fe0ec25..a676d463 100644 --- a/frontend/app/gallery/directory/directory.gallery.component.ts +++ b/frontend/app/gallery/directory/directory.gallery.component.ts @@ -4,15 +4,11 @@ import {Component, Input, OnInit} from 'angular2/core'; import {Directory} from "../../../../common/entities/Directory"; import {RouterLink} from "angular2/router"; import {Utils} from "../../../../common/Utils"; -import {MATERIAL_BROWSER_PROVIDERS} from "ng2-material/all"; -import {ViewportHelper} from "ng2-material/all"; -import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'gallery-directory', templateUrl: 'app/gallery/directory/directory.gallery.component.html', - directives:[RouterLink,MATERIAL_DIRECTIVES], - providers:[MATERIAL_BROWSER_PROVIDERS, ViewportHelper] + directives:[RouterLink], }) export class GalleryDirectoryComponent{ @Input() directory: Directory; diff --git a/frontend/app/gallery/gallery.component.html b/frontend/app/gallery/gallery.component.html index 9c0e378b..c7bc3f16 100644 --- a/frontend/app/gallery/gallery.component.html +++ b/frontend/app/gallery/gallery.component.html @@ -1,8 +1,9 @@ - + +
- - + +
\ No newline at end of file diff --git a/frontend/app/gallery/gallery.component.ts b/frontend/app/gallery/gallery.component.ts index 3999bdab..f3102466 100644 --- a/frontend/app/gallery/gallery.component.ts +++ b/frontend/app/gallery/gallery.component.ts @@ -8,7 +8,6 @@ import {Directory} from "../../../common/entities/Directory"; import {Message} from "../../../common/entities/Message"; import {GalleryDirectoryComponent} from "./directory/directory.gallery.component"; import {GalleryGridComponent} from "./grid/grid.gallery.component"; -import {MATERIAL_DIRECTIVES} from "ng2-material/all"; import {FrameComponent} from "../frame/frame.component"; import {GalleryLightboxComponent} from "./lightbox/lightbox.gallery.component"; @@ -19,8 +18,7 @@ import {GalleryLightboxComponent} from "./lightbox/lightbox.gallery.component"; directives:[GalleryGridComponent, GalleryDirectoryComponent, GalleryLightboxComponent, - FrameComponent, - MATERIAL_DIRECTIVES] + FrameComponent] }) export class GalleryComponent implements OnInit{ diff --git a/frontend/app/login/login.component.html b/frontend/app/login/login.component.html index f0563d95..9c89e100 100644 --- a/frontend/app/login/login.component.html +++ b/frontend/app/login/login.component.html @@ -1,26 +1,13 @@ - - - -
- - Login - -
- - - - - - - - -
- - - - - +
+
+
- +
diff --git a/frontend/app/login/login.component.ts b/frontend/app/login/login.component.ts index 0353c17e..70dffcf6 100644 --- a/frontend/app/login/login.component.ts +++ b/frontend/app/login/login.component.ts @@ -3,18 +3,14 @@ import {Component, OnInit} from 'angular2/core'; import {LoginCredential} from '../../../common/entities/LoginCredential'; import {AuthenticationService} from "../model/network/authentication.service.ts"; -import {Router} from "angular2/router"; -import {MATERIAL_DIRECTIVES} from "ng2-material/all"; -import {FORM_DIRECTIVES} from "angular2/common"; -import {MATERIAL_BROWSER_PROVIDERS} from "ng2-material/all"; -import {ViewportHelper} from "ng2-material/all"; +import {Router} from "angular2/router"; +import {FORM_DIRECTIVES} from "angular2/common"; @Component({ selector: 'login', templateUrl: 'app/login/login.component.html', styleUrls:['app/login/login.component.css'], - directives:[MATERIAL_DIRECTIVES,FORM_DIRECTIVES], - providers:[MATERIAL_BROWSER_PROVIDERS, ViewportHelper] + directives:[FORM_DIRECTIVES] }) export class LoginComponent implements OnInit{ loginCredential: LoginCredential; diff --git a/frontend/icon_inv.png b/frontend/icon_inv.png new file mode 100644 index 00000000..32d122dc Binary files /dev/null and b/frontend/icon_inv.png differ diff --git a/frontend/index.ejs b/frontend/index.ejs index 1c7151a7..4a023843 100644 --- a/frontend/index.ejs +++ b/frontend/index.ejs @@ -6,7 +6,9 @@ PiGallery2 - + diff --git a/package.json b/package.json index 490d071b..72ee3157 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "mongoose": "^4.4.14", "morgan": "^1.7.0", "ng2-cookies": "^0.1.5", - "ng2-material": "^0.3.7", "optimist": "^0.6.1", "rxjs": "5.0.0-beta.6", "ts-loader": "^0.8.2",