mirror of
https://github.com/bpatrik/pigallery2.git
synced 2025-02-03 13:22:05 +02:00
triggering travis
This commit is contained in:
parent
2150807d3f
commit
116410c44d
@ -50,7 +50,8 @@
|
|||||||
<app-settings-share #share [hidden]="!share.hasAvailableSettings"
|
<app-settings-share #share [hidden]="!share.hasAvailableSettings"
|
||||||
[simplifiedMode]="simplifiedMode"></app-settings-share>
|
[simplifiedMode]="simplifiedMode"></app-settings-share>
|
||||||
<app-settings-map #map [hidden]="!map.hasAvailableSettings" [simplifiedMode]="simplifiedMode"></app-settings-map>
|
<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"
|
<app-settings-other #other [hidden]="!other.hasAvailableSettings"
|
||||||
[simplifiedMode]="simplifiedMode"></app-settings-other>
|
[simplifiedMode]="simplifiedMode"></app-settings-other>
|
||||||
<app-settings-random-photo #random [hidden]="!random.hasAvailableSettings"
|
<app-settings-random-photo #random [hidden]="!random.hasAvailableSettings"
|
||||||
|
@ -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 {AuthenticationService} from './model/network/authentication.service';
|
||||||
import {UserDTO} from '../../common/entities/UserDTO';
|
import {UserDTO} from '../../common/entities/UserDTO';
|
||||||
import {Router} from '@angular/router';
|
import {Router} from '@angular/router';
|
||||||
@ -10,9 +10,7 @@ import {Subscription} from 'rxjs';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-pi-gallery2',
|
selector: 'app-pi-gallery2',
|
||||||
template: `
|
template: `<router-outlet></router-outlet>`
|
||||||
<router-outlet></router-outlet>`,
|
|
||||||
|
|
||||||
})
|
})
|
||||||
export class AppComponent implements OnInit, OnDestroy {
|
export class AppComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
|
@ -28,7 +28,8 @@
|
|||||||
type="button" class="btn btn-dark dropdown-toggle"
|
type="button" class="btn btn-dark dropdown-toggle"
|
||||||
aria-controls="dropdown-basic">
|
aria-controls="dropdown-basic">
|
||||||
<span class="oi oi-menu"></span>
|
<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>
|
</button>
|
||||||
<ul id="dropdown-basic" *dropdownMenu
|
<ul id="dropdown-basic" *dropdownMenu
|
||||||
@ -44,7 +45,8 @@
|
|||||||
<li role="menuitem" *ngIf="isAdmin()">
|
<li role="menuitem" *ngIf="isAdmin()">
|
||||||
<a class="dropdown-item" href="#" [routerLink]="['/admin']">
|
<a class="dropdown-item" href="#" [routerLink]="['/admin']">
|
||||||
<span class="oi oi-wrench"></span>
|
<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>
|
<ng-container i18n>Settings</ng-container>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
@ -1,11 +1,10 @@
|
|||||||
import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
|
import {Component, ViewEncapsulation} from '@angular/core';
|
||||||
import {RouterLink} from '@angular/router';
|
import {RouterLink} from '@angular/router';
|
||||||
import {AuthenticationService} from '../model/network/authentication.service';
|
import {AuthenticationService} from '../model/network/authentication.service';
|
||||||
import {UserDTO, UserRoles} from '../../../common/entities/UserDTO';
|
import {UserDTO, UserRoles} from '../../../common/entities/UserDTO';
|
||||||
import {Config} from '../../../common/config/public/Config';
|
import {Config} from '../../../common/config/public/Config';
|
||||||
import {BehaviorSubject} from 'rxjs';
|
import {BehaviorSubject} from 'rxjs';
|
||||||
import {NotificationService} from '../model/notification.service';
|
import {NotificationService} from '../model/notification.service';
|
||||||
import {ShareService} from '../gallery/share.service';
|
|
||||||
import {QueryService} from '../model/query.service';
|
import {QueryService} from '../model/query.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import {PhotoDTO} from '../../../common/entities/PhotoDTO';
|
|
||||||
import {Utils} from '../../../common/Utils';
|
import {Utils} from '../../../common/Utils';
|
||||||
import {MediaIcon} from './MediaIcon';
|
import {MediaIcon} from './MediaIcon';
|
||||||
import {Config} from '../../../common/config/public/Config';
|
import {Config} from '../../../common/config/public/Config';
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import {PhotoDTO} from '../../../common/entities/PhotoDTO';
|
|
||||||
import {Utils} from '../../../common/Utils';
|
import {Utils} from '../../../common/Utils';
|
||||||
import {Config} from '../../../common/config/public/Config';
|
import {Config} from '../../../common/config/public/Config';
|
||||||
import {MediaDTO} from '../../../common/entities/MediaDTO';
|
import {MediaDTO} from '../../../common/entities/MediaDTO';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import {Injectable, ViewContainerRef} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {ToastrService} from 'ngx-toastr';
|
import {ToastrService} from 'ngx-toastr';
|
||||||
import {NetworkService} from './network/network.service';
|
import {NetworkService} from './network/network.service';
|
||||||
import {AuthenticationService} from './network/authentication.service';
|
import {AuthenticationService} from './network/authentication.service';
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import {Injectable} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {ShareService} from '../gallery/share.service';
|
import {ShareService} from '../gallery/share.service';
|
||||||
import {PhotoDTO} from '../../../common/entities/PhotoDTO';
|
|
||||||
import {MediaDTO} from '../../../common/entities/MediaDTO';
|
import {MediaDTO} from '../../../common/entities/MediaDTO';
|
||||||
import {QueryParams} from '../../../common/QueryParams';
|
import {QueryParams} from '../../../common/QueryParams';
|
||||||
import {Utils} from '../../../common/Utils';
|
import {Utils} from '../../../common/Utils';
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import {Pipe, PipeTransform} from '@angular/core';
|
import {Pipe, PipeTransform} from '@angular/core';
|
||||||
import {I18n} from '@ngx-translate/i18n-polyfill';
|
|
||||||
|
|
||||||
|
|
||||||
@Pipe({name: 'fileSize'})
|
@Pipe({name: 'fileSize'})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user