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

triggering travis

Browse Source
This commit is contained in:
Patrik J. Braun 2019-01-27 14:58:56 -05:00
parent 2150807d3f
commit 116410c44d
9 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/app/admin/admin.component.html
View File

@ -50,7 +50,8 @@
<app-settings-share #share [hidden]="!share.hasAvailableSettings"
[simplifiedMode]="simplifiedMode"></app-settings-share>
<app-settings-map #map [hidden]="!map.hasAvailableSettings" [simplifiedMode]="simplifiedMode"></app-settings-map>
<app-settings-meta-file #metaFile [hidden]="!metaFile.hasAvailableSettings" [simplifiedMode]="simplifiedMode"></app-settings-meta-file>
<app-settings-meta-file #metaFile [hidden]="!metaFile.hasAvailableSettings"
[simplifiedMode]="simplifiedMode"></app-settings-meta-file>
<app-settings-other #other [hidden]="!other.hasAvailableSettings"
[simplifiedMode]="simplifiedMode"></app-settings-other>
<app-settings-random-photo #random [hidden]="!random.hasAvailableSettings"

6
frontend/app/app.component.ts
View File

@ -1,4 +1,4 @@
import {Component, OnDestroy, OnInit, ViewContainerRef} from '@angular/core';
import {Component, OnDestroy, OnInit} from '@angular/core';
import {AuthenticationService} from './model/network/authentication.service';
import {UserDTO} from '../../common/entities/UserDTO';
import {Router} from '@angular/router';
@ -10,9 +10,7 @@ import {Subscription} from 'rxjs';
@Component({
selector: 'app-pi-gallery2',
template: `
<router-outlet></router-outlet>`,
template: `<router-outlet></router-outlet>`
})
export class AppComponent implements OnInit, OnDestroy {

10
frontend/app/frame/frame.component.html
View File

@ -22,13 +22,14 @@
<li class="nav-item ml-2">
<app-language class="navbar-btn" isDark="true"></app-language>
</li>
<div class="btn-group" dropdown placement="bottom right" container="body"
*ngIf="isAdmin() || authenticationRequired">
<div class="btn-group" dropdown placement="bottom right" container="body"
*ngIf="isAdmin() || authenticationRequired">
<button id="button-basic" dropdownToggle
type="button" class="btn btn-dark dropdown-toggle"
aria-controls="dropdown-basic">
<span class="oi oi-menu"></span>
<span *ngIf="isAdmin() && notificationService.notifications.length>0" class="navbar-badge badge badge-warning">{{notificationService.notifications.length}}</span>
<span *ngIf="isAdmin() && notificationService.notifications.length>0"
class="navbar-badge badge badge-warning">{{notificationService.notifications.length}}</span>
</button>
<ul id="dropdown-basic" *dropdownMenu
@ -44,7 +45,8 @@
<li role="menuitem" *ngIf="isAdmin()">
<a class="dropdown-item" href="#" [routerLink]="['/admin']">
<span class="oi oi-wrench"></span>
<span *ngIf="notificationService.notifications.length>0" class="badge">{{notificationService.notifications.length}}</span>
<span *ngIf="notificationService.notifications.length>0"
class="badge">{{notificationService.notifications.length}}</span>
<ng-container i18n>Settings</ng-container>
</a>
</li>

3
frontend/app/frame/frame.component.ts
View File

@ -1,11 +1,10 @@
import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
import {Component, ViewEncapsulation} from '@angular/core';
import {RouterLink} from '@angular/router';
import {AuthenticationService} from '../model/network/authentication.service';
import {UserDTO, UserRoles} from '../../../common/entities/UserDTO';
import {Config} from '../../../common/config/public/Config';
import {BehaviorSubject} from 'rxjs';
import {NotificationService} from '../model/notification.service';
import {ShareService} from '../gallery/share.service';
import {QueryService} from '../model/query.service';
@Component({

1
frontend/app/gallery/Media.ts
View File

@ -1,4 +1,3 @@
import {PhotoDTO} from '../../../common/entities/PhotoDTO';
import {Utils} from '../../../common/Utils';
import {MediaIcon} from './MediaIcon';
import {Config} from '../../../common/config/public/Config';

1
frontend/app/gallery/MediaIcon.ts
View File

@ -1,4 +1,3 @@
import {PhotoDTO} from '../../../common/entities/PhotoDTO';
import {Utils} from '../../../common/Utils';
import {Config} from '../../../common/config/public/Config';
import {MediaDTO} from '../../../common/entities/MediaDTO';

2
frontend/app/model/notification.service.ts
View File

@ -1,4 +1,4 @@
import {Injectable, ViewContainerRef} from '@angular/core';
import {Injectable} from '@angular/core';
import {ToastrService} from 'ngx-toastr';
import {NetworkService} from './network/network.service';
import {AuthenticationService} from './network/authentication.service';

1
frontend/app/model/query.service.ts
View File

@ -1,6 +1,5 @@
import {Injectable} from '@angular/core';
import {ShareService} from '../gallery/share.service';
import {PhotoDTO} from '../../../common/entities/PhotoDTO';
import {MediaDTO} from '../../../common/entities/MediaDTO';
import {QueryParams} from '../../../common/QueryParams';
import {Utils} from '../../../common/Utils';

1
frontend/app/pipes/FileSizePipe.ts
View File

@ -1,5 +1,4 @@
import {Pipe, PipeTransform} from '@angular/core';
import {I18n} from '@ngx-translate/i18n-polyfill';
@Pipe({name: 'fileSize'})