Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,502 changes: 1,316 additions & 1,186 deletions src/package-lock.json

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,36 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^20.0.0",
"@angular/cdk": "^20.0.1",
"@angular/common": "^20.0.0",
"@angular/compiler": "^20.0.0",
"@angular/core": "^20.0.0",
"@angular/forms": "^20.0.0",
"@angular/material": "^20.0.1",
"@angular/platform-browser": "^20.0.0",
"@angular/platform-browser-dynamic": "^20.0.0",
"@angular/router": "^20.0.0",
"@angular/animations": "^20.0.2",
"@angular/cdk": "^20.0.2",
"@angular/common": "^20.0.2",
"@angular/compiler": "^20.0.2",
"@angular/core": "^20.0.2",
"@angular/forms": "^20.0.2",
"@angular/material": "^20.0.2",
"@angular/platform-browser": "^20.0.2",
"@angular/platform-browser-dynamic": "^20.0.2",
"@angular/router": "^20.0.2",
"rxjs": "~7.8.2",
"tslib": "^2.8.1",
"webpack-dev-middleware": ">=7.4.2",
"zone.js": "~0.15.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^20.0.0",
"@angular-eslint/builder": "19.6.0",
"@angular-eslint/eslint-plugin": "19.6.0",
"@angular-eslint/eslint-plugin-template": "19.6.0",
"@angular-eslint/schematics": "19.6.0",
"@angular-eslint/template-parser": "19.6.0",
"@angular/build": "^20.0.0",
"@angular/cli": "^20.0.0",
"@angular/compiler-cli": "^20.0.0",
"@angular-devkit/build-angular": "^20.0.1",
"@angular-eslint/builder": "20.0.0",
"@angular-eslint/eslint-plugin": "20.0.0",
"@angular-eslint/eslint-plugin-template": "20.0.0",
"@angular-eslint/schematics": "20.0.0",
"@angular-eslint/template-parser": "20.0.0",
"@angular/build": "^20.0.1",
"@angular/cli": "^20.0.1",
"@angular/compiler-cli": "^20.0.2",
"@types/jasmine": "~5.1.8",
"@typescript-eslint/eslint-plugin": "^8.33.0",
"@typescript-eslint/parser": "^8.33.0",
"eslint": "^9.27.0",
"jasmine-core": "~5.7.1",
"@typescript-eslint/eslint-plugin": "^8.34.0",
"@typescript-eslint/parser": "^8.34.0",
"eslint": "^9.28.0",
"jasmine-core": "~5.8.0",
"karma": "~6.4.4",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.1",
Expand All @@ -52,6 +52,6 @@
"webpack-dev-middleware": ">=7.4.2"
},
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "^4.41.1"
"@rollup/rollup-linux-x64-gnu": "^4.42.0"
}
}
9 changes: 4 additions & 5 deletions src/src/app/common/components/logo/logo.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Input} from '@angular/core';
import { Component, Input, inject } from '@angular/core';
import {Router} from '@angular/router';

@Component({
Expand All @@ -7,14 +7,13 @@ import {Router} from '@angular/router';
templateUrl: './logo.component.html',
styleUrl: './logo.component.scss'
})
export class LogoComponent {
export class LogoComponent {
private router = inject(Router);

@Input() height: number = 50;
@Input() fontSize: number = 35;
@Input() words: string[] = ['inside ;', 'tests ;', 'inside ;', 'quality ;'];

constructor(private router: Router) {
}

sendToIndex() {
this.router.navigate(['/']);
}
Expand Down
8 changes: 4 additions & 4 deletions src/src/app/service/nullinside-null.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Injectable} from '@angular/core';
import { Injectable, inject } from '@angular/core';
import {Observable} from 'rxjs';
import {environment} from '../../environments/environment';
import {HttpClient} from '@angular/common/http';
Expand All @@ -7,9 +7,9 @@ import {ImdbSearch} from '../common/interface/imdb-search';
@Injectable({
providedIn: 'root'
})
export class NullinsideNullService {
constructor(private httpClient: HttpClient) {
}
export class NullinsideNullService {
private httpClient = inject(HttpClient);


getImdbSearchQuick(search: string): Observable<ImdbSearch> {
return this.httpClient.get<ImdbSearch>(`${environment.nullApiUrl}/imdb/search/quick?search=${search}`);
Expand Down
8 changes: 4 additions & 4 deletions src/src/app/service/nullinside-twitch-bot.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Injectable} from '@angular/core';
import { Injectable, inject } from '@angular/core';
import {HttpClient} from "@angular/common/http";
import {Observable} from "rxjs";
import {environment} from "../../environments/environment";
Expand All @@ -8,9 +8,9 @@ import {TwitchBotConfig} from "../common/interface/twitch-bot-config";
@Injectable({
providedIn: 'root'
})
export class NullinsideTwitchBotService {
constructor(private httpClient: HttpClient) {
}
export class NullinsideTwitchBotService {
private httpClient = inject(HttpClient);


getIsMod(): Observable<TwitchBotIsModResponse> {
return this.httpClient.get<TwitchBotIsModResponse>(`${environment.twitchBotApiUrl}/bot/mod`);
Expand Down
7 changes: 3 additions & 4 deletions src/src/app/service/nullinside.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Injectable} from '@angular/core';
import { Injectable, inject } from '@angular/core';
import {HttpClient} from "@angular/common/http";
import {Observable} from "rxjs";
import {environment} from "../../environments/environment";
Expand All @@ -9,10 +9,9 @@ import {FeatureToggleResponse} from "../common/interface/feature-toggle-response
@Injectable({
providedIn: 'root'
})
export class NullinsideService {
export class NullinsideService {
private httpClient = inject(HttpClient);

constructor(private httpClient: HttpClient) {
}

validateToken(token: string): Observable<boolean> {
return this.httpClient.post<boolean>(`${environment.apiUrl}/user/token/validate`, {token: token});
Expand Down
11 changes: 5 additions & 6 deletions src/src/app/view/home/home.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnInit} from '@angular/core';
import { Component, OnInit, inject } from '@angular/core';
import {NullinsideService} from "../../service/nullinside.service";
import {VM_ADMIN} from "../../common/constants";
import {WebsiteApp} from "../../common/interface/website-app";
Expand All @@ -17,7 +17,10 @@ import {UserRolesResponse} from "../../common/interface/user-roles-response";
templateUrl: './home.component.html',
styleUrl: './home.component.scss'
})
export class HomeComponent implements OnInit {
export class HomeComponent implements OnInit {
private api = inject(NullinsideService);
private router = inject(Router);

public roles: string[] | null = null;
public error: string | null = null;
public userIsLoggedIn: boolean = false;
Expand All @@ -38,10 +41,6 @@ export class HomeComponent implements OnInit {
}
];

constructor(private api: NullinsideService,
private router: Router) {
}

ngOnInit(): void {
this.userIsLoggedIn = null !== localStorage.getItem('auth-token');

Expand Down
10 changes: 4 additions & 6 deletions src/src/app/view/imdb-search/imdb-search.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnDestroy} from '@angular/core';
import { Component, OnDestroy, inject } from '@angular/core';
import {LogoComponent} from '../../common/components/logo/logo.component';
import {NullinsideNullService} from '../../service/nullinside-null.service';
import {MatFormFieldModule} from '@angular/material/form-field';
Expand All @@ -20,16 +20,14 @@ import {ImdbSearchItems} from '../../common/interface/imdb-search';
templateUrl: './imdb-search.component.html',
styleUrl: './imdb-search.component.scss'
})
export class ImdbSearchComponent implements OnDestroy {
export class ImdbSearchComponent implements OnDestroy {
private api = inject(NullinsideNullService);

searching: boolean = false;
quickSubscription: Subscription | null = null;
longSubscription: Subscription | null = null;
public rows: ImdbSearchItems[] = [];

constructor(private api: NullinsideNullService) {

}

ngOnDestroy(): void {
if (this.quickSubscription) {
this.quickSubscription.unsubscribe();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnInit} from '@angular/core';
import { Component, OnInit, inject } from '@angular/core';
import {NullinsideService} from "../../service/nullinside.service";
import {ActivatedRoute, ParamMap} from "@angular/router";
import {Errors} from "../login-landing/errors";
Expand All @@ -20,14 +20,14 @@ import {CdkCopyToClipboard} from "@angular/cdk/clipboard";
templateUrl: './login-landing-desktop.component.html',
styleUrl: './login-landing-desktop.component.scss'
})
export class LoginLandingDesktopComponent implements OnInit {
export class LoginLandingDesktopComponent implements OnInit {
private api = inject(NullinsideService);
private route = inject(ActivatedRoute);

error: string = '';
oAuth: OAuth | null = null;
loading: boolean = true;

constructor(private api: NullinsideService, private route: ActivatedRoute) {
}

ngOnInit(): void {
this.route.queryParamMap.subscribe({
next: (params: ParamMap) => {
Expand Down
11 changes: 6 additions & 5 deletions src/src/app/view/login-landing/login-landing.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import {NullinsideService} from "../../service/nullinside.service";
import {LogoComponent} from "../../common/components/logo/logo.component";
import {LoadingIconComponent} from "../../common/components/loading-icon/loading-icon.component";
Expand All @@ -16,13 +16,14 @@ import {Errors} from "./errors";
templateUrl: './login-landing.component.html',
styleUrl: './login-landing.component.scss'
})
export class LoginLandingComponent implements OnInit, OnDestroy {
export class LoginLandingComponent implements OnInit, OnDestroy {
private api = inject(NullinsideService);
private route = inject(ActivatedRoute);
private router = inject(Router);

timerId: number = -1;
error: string = '';

constructor(private api: NullinsideService, private route: ActivatedRoute, private router: Router) {
}

ngOnDestroy(): void {
if (this.timerId !== -1) {
clearTimeout(this.timerId);
Expand Down
10 changes: 7 additions & 3 deletions src/src/app/view/login/login.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnInit} from '@angular/core';
import { Component, OnInit, inject } from '@angular/core';
import {LogoComponent} from "../../common/components/logo/logo.component";
import {environment} from "../../../environments/environment";
import {NullinsideService} from "../../service/nullinside.service";
Expand All @@ -17,15 +17,19 @@ import {TwitchLoginComponent} from '../../common/components/twitch-login/twitch-
templateUrl: './login.component.html',
styleUrl: './login.component.scss'
})
export class LoginComponent implements OnInit {
export class LoginComponent implements OnInit {
private api = inject(NullinsideService);
private router = inject(Router);
private route = inject(ActivatedRoute);

loginUrl: string;
checkingLogin = false;
showGmail = true;
pageDestinations = [
'/home'
];

constructor(private api: NullinsideService, private router: Router, private route: ActivatedRoute) {
constructor() {
this.loginUrl = `${environment.apiUrl}/user/login`;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import {LogoComponent} from '../../../common/components/logo/logo.component';
import {MatButton} from '@angular/material/button';
import {NullinsideTwitchBotService} from "../../../service/nullinside-twitch-bot.service";
Expand Down Expand Up @@ -29,7 +29,14 @@ import {Location} from "@angular/common";
templateUrl: './twitch-bot-config.component.html',
styleUrl: './twitch-bot-config.component.scss'
})
export class TwitchBotConfigComponent implements OnInit, OnDestroy {
export class TwitchBotConfigComponent implements OnInit, OnDestroy {
private twitchBotApi = inject(NullinsideTwitchBotService);
private api = inject(NullinsideService);
private snackBar = inject(MatSnackBar);
private location = inject(Location);
private router = inject(Router);
private route = inject(ActivatedRoute);

public botIsMod: boolean | null = null;
public timerId: number = -1;
public error: string = '';
Expand All @@ -38,14 +45,6 @@ export class TwitchBotConfigComponent implements OnInit, OnDestroy {
public banKnownBots = true;
public waitingForSave = false;

constructor(private twitchBotApi: NullinsideTwitchBotService,
private api: NullinsideService,
private snackBar: MatSnackBar,
private location: Location,
private router: Router,
private route: ActivatedRoute) {
}

ngOnDestroy(): void {
if (this.timerId !== -1) {
clearTimeout(this.timerId);
Expand Down
9 changes: 4 additions & 5 deletions src/src/app/view/vm-manager/vm-manager.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import {LogoComponent} from '../../common/components/logo/logo.component';
import {NullinsideService} from '../../service/nullinside.service';
import {MatIcon} from '@angular/material/icon';
Expand All @@ -18,14 +18,13 @@ import {ActionableDockerResource} from './interface/ActionableDockerResource';
templateUrl: './vm-manager.component.html',
styleUrl: './vm-manager.component.scss'
})
export class VmManagerComponent implements OnInit, OnDestroy {
export class VmManagerComponent implements OnInit, OnDestroy {
private api = inject(NullinsideService);

public vms: ActionableDockerResource[] | null = null;
public error: string | null = null;
private timer: Subscription | null = null;

constructor(private api: NullinsideService) {
}

ngOnInit(): void {
this.getVms();

Expand Down