Liosha/jambotron
1
0
Fork 0
Code Issues 1 Pull Requests Actions 3 Packages Projects 1 Releases Wiki Activity

ci/cd + any fixes

Browse Source
This commit is contained in:
Liosha
2026-04-24 19:58:29 +03:00
parent 857dbce662
commit 82cae4e556
17 changed files with 3369 additions and 8049 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hetzner.md
+32
View File
@@ -0,0 +1,32 @@
hetzner
user:root
password:Lio$ha84
domen name:
https://www.spaceship.com/application/domain-list-application/
login:liosha84
password:Lio$ha84
----smtp-----
SMTP Server
smtp-relay.brevo.com
Port
587
Login
a8cae8001@smtp-brevo.com
Сервис,Адрес,Роль в созидании
Caddy,jambotron.com,Вратарь и защитник (SSL)
Portainer,manage.jambotron.com,Твои «руки» (управление Docker)
Grafana,jambotron.com/monitor,Твои «глаза» (метрики ресурсов)
Gitea,gitea.jambotron.com,Твоя «память» (хранилище кода)
---------
portainer
user:admin
password:Z*N3p8&iI,a70"ER45GT9}fBAu2/^Q)C
jambotron-ui/angular.json
+9 -7
View File
@@ -15,11 +15,12 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular/build:application",
"options": {
"outputPath": "dist/jambotron-ui",
"outputPath": {
"base": "dist/jambotron-ui"
},
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": [
"zone.js"
],
@@ -67,7 +68,8 @@
"node_modules/jquery/dist/jquery.js",
"node_modules/bootstrap-markdown/js/bootstrap-markdown.js"
]
],
"browser": "src/main.ts"
},
"configurations": {
@@ -108,20 +110,20 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"configurations": {
"production": {
"buildTarget": "jambotron-ui:build:production"
},
"development": {
"disableHostCheck": true,
"allowedHosts": ["all"],
"buildTarget": "jambotron-ui:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n"
"builder": "@angular/build:extract-i18n"
},
"test": {
"builder": "@angular/build:karma",
jambotron-ui/package-lock.json
Generated
+3006 -7723
View File
File diff suppressed because it is too large Load Diff
jambotron-ui/package.json
+13 -13
View File
@@ -13,17 +13,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^20.0.4",
"@angular/animations": "^21.2.9",
"@angular/cdk": "^20.1.6",
"@angular/common": "^20.0.0",
"@angular/compiler": "^20.0.0",
"@angular/core": "^20.0.0",
"@angular/forms": "^20.0.0",
"@angular/common": "^21.2.9",
"@angular/compiler": "^21.2.9",
"@angular/core": "^21.2.9",
"@angular/forms": "^21.2.9",
"@angular/material": "^20.1.6",
"@angular/platform-browser": "^20.0.0",
"@angular/platform-server": "^20.0.0",
"@angular/router": "^20.0.0",
"@angular/ssr": "^20.0.2",
"@angular/platform-browser": "^21.2.9",
"@angular/platform-server": "^21.2.9",
"@angular/router": "^21.2.9",
"@angular/ssr": "^21.2.7",
"@material/material-color-utilities": "^0.3.0",
"@ng-bootstrap/ng-bootstrap": "19.0.0",
"@popperjs/core": "2.11.8",
@@ -40,9 +40,9 @@
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^20.0.2",
"@angular/cli": "^20.0.2",
"@angular/compiler-cli": "^20.0.0",
"@angular/build": "^21.2.7",
"@angular/cli": "^21.2.7",
"@angular/compiler-cli": "^21.2.9",
"@types/express": "^5.0.1",
"@types/file-saver": "^2.0.7",
"@types/jasmine": "~5.1.0",
@@ -53,6 +53,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.8.2"
"typescript": "~5.9.3"
}
}
jambotron-ui/src/app/components/file-browser-with-tree-component/file-browser-with-tree-component.html
+18 -6
View File
@@ -34,12 +34,14 @@
Root
</button>
</li>
<li *ngFor="let segment of pathSegments; let i = index" class="breadcrumb-item">
@for (segment of pathSegments; track segment; let i = $index) {
<li class="breadcrumb-item">
<mat-icon>chevron_right</mat-icon>
<button mat-button (click)="navigateToPath(i)" class="path-button">
{{ segment }}
</button>
</li>
}
</ol>
</nav>
<div class="header-actions">
@@ -89,13 +91,17 @@
<!-- Progress Bar -->
<mat-progress-bar *ngIf="loading" mode="indeterminate"></mat-progress-bar>
@if (loading) {
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
}
<!-- Upload Progress -->
<div *ngIf="uploading" class="upload-progress">
@if (uploading) {
<div class="upload-progress">
<mat-progress-bar mode="determinate" [value]="uploadProgress"></mat-progress-bar>
<span class="progress-text">Uploading... {{uploadProgress}}%</span>
</div>
}
<!-- File Table -->
<div class="table-container">
@@ -155,21 +161,25 @@
<!-- Actions Column -->
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef>
<button *ngIf="selection.size > 0"
@if (selection.size > 0) {
<button
mat-icon-button
color="warn"
(click)="deleteSelected()"
matTooltip="Delete Selected">
<mat-icon>delete</mat-icon>
</button>
}
</th>
<td mat-cell *matCellDef="let file">
<button *ngIf="file.type === 'file'"
@if (file.type === 'file') {
<button
mat-icon-button
(click)="downloadFile(file)"
matTooltip="Download">
<mat-icon>download</mat-icon>
</button>
}
<button mat-icon-button
(click)="deleteFile(file)"
color="warn"
@@ -185,11 +195,13 @@
</div>
<!-- Empty State -->
<div *ngIf="!loading && dataSource.data.length === 0" class="empty-state">
@if (!loading && dataSource.data.length === 0) {
<div class="empty-state">
<mat-icon>{{ searchQuery ? 'search_off' : 'folder_open' }}</mat-icon>
<h3>{{ searchQuery ? 'No results found' : 'This folder is empty' }}</h3>
<p>{{ searchQuery ? 'Try adjusting your search terms' : 'Upload files or create folders to get started.' }}</p>
</div>
}
</mat-card-content>
</mat-card>
</mat-sidenav-content>
jambotron-ui/src/app/components/file-browser-with-tree-component/file-browser-with-tree-component.ts
+2 -9
View File
@@ -1,5 +1,5 @@
import {Component, CUSTOM_ELEMENTS_SCHEMA, Input, OnInit, ViewChild} from '@angular/core';
import {DatePipe, NgForOf, NgIf} from '@angular/common';
import { DatePipe } from '@angular/common';
import {
MatCell,
MatCellDef, MatColumnDef,
@@ -29,7 +29,6 @@ import {FileSystemTreeComponent} from '../file-system-tree-component/file-system
@Component({
selector: 'app-file-browser-with-tree-component',
imports: [
NgIf,
MatIcon,
MatHeaderRowDef,
MatRowDef,
@@ -45,10 +44,7 @@ import {FileSystemTreeComponent} from '../file-system-tree-component/file-system
MatCheckbox,
MatTable,
MatProgressBar,
FormsModule,
NgForOf,
MatButton,
MatCardContent,
MatSidenavContent,
@@ -57,11 +53,8 @@ import {FileSystemTreeComponent} from '../file-system-tree-component/file-system
MatCardTitle,
MatSidenav,
MatSidenavContainer,
DatePipe,
FileSystemTreeComponent,
FileSystemTreeComponent
],
templateUrl: './file-browser-with-tree-component.html',
styleUrl: './file-browser-with-tree-component.scss',
jambotron-ui/src/app/components/file-system-tree-component/file-system-tree-component.ts
+1 -1
View File
@@ -15,7 +15,7 @@ import {MatProgressBarModule} from '@angular/material/progress-bar';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
import {MatTreeModule} from '@angular/material/tree';
import {NgIf} from '@angular/common';
import {FileBrowserTreeService, FileItem} from '../../services/file-browser-tree.service';
import {MatTooltip} from '@angular/material/tooltip';
jambotron-ui/src/app/components/photo-edit.component/photo-edit.component.scss
+1 -1
View File
@@ -1,4 +1,4 @@
@import "~node_modules/cropperjs/dist/cropper.css";
@import "node_modules/cropperjs/dist/cropper.css";
.ngx-pe-overlay-container {
width: 100%;
jambotron-ui/src/app/components/vertical-nav.component/vertical-nav.component.ts
+2 -4
View File
@@ -11,7 +11,7 @@ import {
} from '@angular/core';
import {Route, Router, RouterLink, RouterLinkActive} from '@angular/router';
import {MatListItem, MatListItemIcon, MatListItemTitle, MatNavList} from '@angular/material/list';
import {NgForOf} from '@angular/common';
import {MatIconButton} from '@angular/material/button';
import {MatTooltip} from '@angular/material/tooltip';
import {MatIcon} from '@angular/material/icon';
@@ -36,9 +36,7 @@ export interface NavItem {
RouterLink,
MatListItem,
MatNavList,
NgForOf,
MatIconButton,
MatIconButton
],
templateUrl: './vertical-nav.component.html',
styleUrl: './vertical-nav.component.scss',
jambotron-ui/src/app/modules/admin-module/components/json-dump.component/json-dump.component.html
+8 -11
View File
@@ -1,6 +1,6 @@
<div class="json-dump-container" *ngIf="!loading; else loadingTpl">
@if (!loading) {
<div class="json-dump-container">
<h2>JSON Dump Management</h2>
<!-- Entity-specific Export/Import -->
<!-- <div class="entity-actions" *ngFor="let entity of entityTypes">
<h3>{{ entity | titlecase }}</h3>
@@ -49,17 +49,14 @@
<mat-header-cell *matHeaderCellDef> File Name </mat-header-cell>
<mat-cell *matCellDef="let file">{{ file.fileName }}</mat-cell>
</ng-container>
<ng-container matColumnDef="size">
<mat-header-cell *matHeaderCellDef> Size </mat-header-cell>
<mat-cell *matCellDef="let file">{{ jsonDumpService.formatFileSize(file.size) }}</mat-cell>
</ng-container>
<ng-container matColumnDef="lastModified">
<mat-header-cell *matHeaderCellDef> Last Modified </mat-header-cell>
<mat-cell *matCellDef="let file">{{ jsonDumpService.formatDate(file.lastModified) }}</mat-cell>
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-cell *matCellDef="let file">
@@ -71,18 +68,18 @@
</button>
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="['fileName', 'size', 'lastModified', 'actions']"></mat-header-row>
<mat-row *matRowDef="let row; columns: ['fileName', 'size', 'lastModified', 'actions']"></mat-row>
</mat-table>
<!-- Archives -->
<h3>Archives</h3>
<mat-list>
<mat-list-item *ngFor="let archive of archives">{{ archive }}</mat-list-item>
@for (archive of archives; track archive) {
<mat-list-item>{{ archive }}</mat-list-item>
}
</mat-list>
</div>
<ng-template #loadingTpl>
} @else {
<mat-spinner></mat-spinner>
</ng-template>
}
jambotron-ui/src/app/modules/admin-module/components/json-dump.component/json-dump.component.ts
+1 -3
View File
@@ -12,7 +12,7 @@ import {
MatRowDef, MatTable
} from '@angular/material/table';
import {MatIconButton} from '@angular/material/button';
import {NgForOf, NgIf, TitleCasePipe} from '@angular/common';
import { TitleCasePipe } from '@angular/common';
import {MatProgressSpinner} from '@angular/material/progress-spinner';
import {MatIcon} from '@angular/material/icon';
import {MatTooltip} from '@angular/material/tooltip';
@@ -41,8 +41,6 @@ import {MatLabel} from '@angular/material/input';
MatCellDef,
MatTable,
TitleCasePipe,
NgIf,
NgForOf,
MatToolbar,
MatToolbarRow,
MatLabel
jambotron-ui/src/app/modules/main-module/main.component/main.component.ts
+1 -2
View File
@@ -7,7 +7,7 @@ import {Subscription} from 'rxjs';
import {TokenStorageService} from '../../../services/token-storage.service';
import {AuthService} from '../../../services/auth.service';
import {EventBusService} from '../../../_shared/event-bus.service';
import {CommonModule} from '@angular/common';
import {MatIcon} from '@angular/material/icon';
import {MatMenu, MatMenuItem, MatMenuTrigger} from '@angular/material/menu';
import {MatTooltip} from '@angular/material/tooltip';
@@ -26,7 +26,6 @@ import {GlobalConstants} from '../../../global-constants';
MatButton,
RouterLink,
RouterOutlet,
CommonModule,
MatIcon,
MatMiniFabButton,
MatMenuTrigger,
jambotron-ui/src/app/modules/user-module/docker-management-component/docker-management-component.html
+14 -7
View File
@@ -6,8 +6,10 @@
<h3>Running Containers</h3>
<button (click)="refreshContainers()" class="btn btn-secondary">Refresh</button>
<div class="container-list" *ngIf="containers.length > 0; else noContainers">
<div class="container-item" *ngFor="let container of containers">
@if (containers.length > 0) {
<div class="container-list">
@for (container of containers; track container) {
<div class="container-item">
<div class="container-info">
<strong>{{container.name}}</strong>
<span class="image">{{container.image}}</span>
@@ -28,11 +30,12 @@
class="btn btn-info">Logs</button>
</div>
</div>
}
</div>
<ng-template #noContainers>
} @else {
<p>No containers found</p>
</ng-template>
}
</div>
<!-- Run New Container -->
@@ -85,7 +88,8 @@
</div>
<!-- Command Output -->
<div class="output-section" *ngIf="lastCommandResult">
@if (lastCommandResult) {
<div class="output-section">
<h3>Command Output</h3>
<div class="output-box"
[class.success]="lastCommandResult.success"
@@ -93,9 +97,11 @@
<pre>{{getOutputText(lastCommandResult.output)}}</pre>
</div>
</div>
}
<!-- Container Logs Modal -->
<div class="logs-modal" *ngIf="selectedContainerLogs">
@if (selectedContainerLogs) {
<div class="logs-modal">
<div class="modal-content">
<div class="modal-header">
<h3>Container Logs: {{selectedContainer}}</h3>
@@ -106,4 +112,5 @@
</div>
</div>
</div>
}
</div>
jambotron-ui/src/app/modules/user-module/docker-management-component/docker-management-component.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import {NgForOf, NgIf} from '@angular/common';
import {Subject, takeUntil} from 'rxjs';
import {FormBuilder, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
import {ContainerInfo, DockerResult, DockerService} from '../docker.service';
@@ -7,9 +7,7 @@ import {ContainerInfo, DockerResult, DockerService} from '../docker.service';
@Component({
selector: 'app-docker-management-component',
imports: [
NgIf,
ReactiveFormsModule,
NgForOf
ReactiveFormsModule
],
templateUrl: './docker-management-component.html',
styleUrl: './docker-management-component.scss'
jambotron-ui/src/environments/environment.prod.ts
+2 -1
View File
@@ -3,6 +3,7 @@ export const environment = {
port: 8081,
production: true,
fromWeb: true,
host_name: 'https://jambotron.run.place',
//host_name: 'https://jambotron.run.place',
host_name:'http://localhost',
title: 'JAMBOTRON.RUN.PLACE'
};
src/main/resources/application-prod.properties
+1 -1
View File
@@ -2,7 +2,7 @@ spring.config.import=classpath:/yml_properties/application_production.yml
spring.application.name=jambotron
server.port=443
server.port=8081
#============Localhost Configurations========================
spring.datasource.url= jdbc:postgresql://localhost:5432/jambotronDB
src/main/resources/application.properties
+2 -2
View File
@@ -1,4 +1,4 @@
#bootJar with profile prod
#spring.profiles.active=prod
spring.profiles.active=prod
spring.profiles.active=dev
#spring.profiles.active=dev