Merge pull request #873 from Tzahi12345/pre-4.3.1-bug-fixes

Pre 4.3.1 bug fixes
This commit is contained in:
Glassed Silver
2023-04-28 10:26:11 +02:00
committed by GitHub
24 changed files with 811 additions and 376 deletions

View File

@@ -25,7 +25,7 @@
-webkit-line-clamp: 2;
}
::ng-deep .ngx-file-drop__content {
:host ::ng-deep .ngx-file-drop__content {
width: 100%;
top: -12px;
position: relative;

View File

@@ -76,8 +76,9 @@ export class RecentVideosComponent implements OnInit {
constructor(public postsService: PostsService, private router: Router) {
// get cached file count
if (localStorage.getItem('cached_file_count')) {
this.cached_file_count = +localStorage.getItem('cached_file_count') <= 10 ? +localStorage.getItem('cached_file_count') : 10;
const sub_id_appendix = this.sub_id ? `_${this.sub_id}` : ''
if (localStorage.getItem(`cached_file_count${sub_id_appendix}`)) {
this.cached_file_count = +localStorage.getItem(`cached_file_count${sub_id_appendix}`) <= 10 ? +localStorage.getItem(`cached_file_count${sub_id_appendix}`) : 10;
this.loading_files = Array(this.cached_file_count).fill(0);
}

View File

@@ -63,7 +63,7 @@
<ng-container i18n="Update binary to">Update binary to:</ng-container>&nbsp;{{element.data}}
</ng-container>
<ng-container *ngIf="element.key == 'delete_old_files'">
<ng-container i18n="Delete old files">Delete old files:</ng-container>&nbsp;{{element.data.uids.length}}
<ng-container i18n="Delete old files">Delete old files:</ng-container>&nbsp;{{element.data.files_to_remove.length}}
</ng-container>
</button>
</ng-container>

View File

@@ -31,6 +31,6 @@ mat-header-cell, mat-cell {
border-radius: 16px 16px 16px 16px !important;
}
::ng-deep mat-row {
:host ::ng-deep mat-row {
height: fit-content !important;
}

View File

@@ -171,6 +171,6 @@
}
::ng-deep.mat-mdc-menu-panel {
:host ::ng-deep.mat-mdc-menu-panel {
max-width: none !important;
}

View File

@@ -8,10 +8,10 @@
top: -12px;
}
::ng-deep.mat-menu-panel {
:host ::ng-deep.mat-menu-panel {
max-width: none !important;
}
::ng-deep.mdc-list-item__primary-text {
:host ::ng-deep.mdc-list-item__primary-text {
width: 100%;
}

View File

@@ -1,5 +1,5 @@
import { Component, OnInit, Inject } from '@angular/core';
import filesize from 'filesize';
import { filesize } from 'filesize';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
import { PostsService } from 'app/posts.services';
import { Category, DatabaseFile } from 'api-types';

View File

@@ -385,6 +385,13 @@
<mat-hint>Place endpoint URL here to integrate with services like Zapier and Automatisch.</mat-hint>
</mat-form-field>
</div>
<div class="col-12 mb-2 mt-3">
<mat-form-field class="text-field" color="accent">
<mat-label i18n="Discord webhook URL">Discord Webhook URL</mat-label>
<input placeholder="https://discord.com/api/webhooks/<webhook_id>/<webhook_token>" [(ngModel)]="new_config['API']['discord_webhook_URL']" matInput>
<mat-hint><a target="_blank" href="https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks"><ng-container i18n="Gotify API setting hint">See docs here.</ng-container></a></mat-hint>
</mat-form-field>
</div>
<div class="col-12 mt-3">
<mat-checkbox color="accent" [disabled]="!new_config['Extra']['enable_notifications']" [(ngModel)]="new_config['API']['use_ntfy_API']"><ng-container i18n="Use ntfy API setting">Use ntfy API</ng-container></mat-checkbox>
</div>

View File

@@ -7,7 +7,7 @@
margin-top: 15px;
}
::ng-deep .mat-mdc-tab-body {
:host ::ng-deep .mat-mdc-tab-body {
margin-left: 15px;
}

View File

@@ -41,7 +41,7 @@ export class SettingsComponent implements OnInit {
latestGithubRelease = null;
CURRENT_VERSION = CURRENT_VERSION
tabs = ['main', 'downloader', 'extra', 'database', 'advanced', 'users', 'logs'];
tabs = ['main', 'downloader', 'extra', 'database', 'notifications', 'advanced', 'users', 'logs'];
tabIndex = 0;
INDEX_TO_TAB = Object.assign({}, this.tabs);