+
Update Firmware
+ [auto]="true" chooseLabel="Browse" chooseIcon="pi-plus" [disabled]="isUpdating">
(bitforgeos.bin)
diff --git a/main/http_server/forge-os/src/app/components/settings/settings.component.scss b/main/http_server/forge-os/src/app/components/settings/settings.component.scss
index 997fc9b..4c967dd 100644
--- a/main/http_server/forge-os/src/app/components/settings/settings.component.scss
+++ b/main/http_server/forge-os/src/app/components/settings/settings.component.scss
@@ -83,6 +83,31 @@
margin-bottom: 2rem;
}
+.settings-update-grid {
+ align-items: stretch;
+}
+
+.settings-update-column {
+ display: flex;
+}
+
+.settings-update-card {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+}
+
+.settings-upload-card {
+ h2 {
+ margin-bottom: 1rem;
+ }
+
+ small {
+ margin-top: 0.5rem;
+ }
+}
+
// Version and Update Cards
.version-card, .update-card {
@extend %base-card;
@@ -186,6 +211,19 @@ select {
}
}
+::ng-deep .settings-upload-card {
+ .p-fileupload-basic {
+ justify-content: flex-start;
+ min-height: 3rem;
+ }
+
+ .p-fileupload-choose-button.p-button {
+ min-height: 2.75rem;
+ padding: 0.75rem 1.5rem;
+ line-height: 1;
+ }
+}
+
// Progress Bar for Updates
.update-progress {
margin-top: 1rem;
diff --git a/main/http_server/forge-os/src/app/components/settings/settings.component.ts b/main/http_server/forge-os/src/app/components/settings/settings.component.ts
index 9422a9c..22c82ef 100644
--- a/main/http_server/forge-os/src/app/components/settings/settings.component.ts
+++ b/main/http_server/forge-os/src/app/components/settings/settings.component.ts
@@ -11,9 +11,10 @@ import { eASICModel } from 'src/models/enum/eASICModel';
import { ModalComponent } from '../modal/modal.component';
@Component({
- selector: 'app-settings',
- templateUrl: './settings.component.html',
- styleUrls: ['./settings.component.scss']
+ selector: 'app-settings',
+ templateUrl: './settings.component.html',
+ styleUrls: ['./settings.component.scss'],
+ standalone: false
})
export class SettingsComponent implements OnDestroy {
diff --git a/main/http_server/forge-os/src/app/components/swarm/swarm.component.ts b/main/http_server/forge-os/src/app/components/swarm/swarm.component.ts
index d7c488e..3300d64 100644
--- a/main/http_server/forge-os/src/app/components/swarm/swarm.component.ts
+++ b/main/http_server/forge-os/src/app/components/swarm/swarm.component.ts
@@ -13,9 +13,10 @@ const SWARM_REFRESH_TIME = 'SWARM_REFRESH_TIME';
type SwarmDevice = { IP: string; ASICModel: string; deviceModel: string; swarmColor: string; asicCount: number; [key: string]: any };
@Component({
- selector: 'app-swarm',
- templateUrl: './swarm.component.html',
- styleUrls: ['./swarm.component.scss']
+ selector: 'app-swarm',
+ templateUrl: './swarm.component.html',
+ styleUrls: ['./swarm.component.scss'],
+ standalone: false
})
export class SwarmComponent implements OnInit, OnDestroy {
diff --git a/main/http_server/forge-os/src/app/layout/app.footer.component.ts b/main/http_server/forge-os/src/app/layout/app.footer.component.ts
index 0c96a45..d3daeeb 100644
--- a/main/http_server/forge-os/src/app/layout/app.footer.component.ts
+++ b/main/http_server/forge-os/src/app/layout/app.footer.component.ts
@@ -3,7 +3,8 @@ import { LayoutService } from "./service/app.layout.service";
@Component({
selector: 'app-footer',
- templateUrl: './app.footer.component.html'
+ templateUrl: './app.footer.component.html',
+ standalone: false
})
export class AppFooterComponent {
constructor(public layoutService: LayoutService) { }
diff --git a/main/http_server/forge-os/src/app/layout/app.layout.component.ts b/main/http_server/forge-os/src/app/layout/app.layout.component.ts
index c83096d..c750f88 100644
--- a/main/http_server/forge-os/src/app/layout/app.layout.component.ts
+++ b/main/http_server/forge-os/src/app/layout/app.layout.component.ts
@@ -7,7 +7,8 @@ import { AppTopBarComponent } from './app.topbar.component';
@Component({
selector: 'app-layout',
- templateUrl: './app.layout.component.html'
+ templateUrl: './app.layout.component.html',
+ standalone: false
})
export class AppLayoutComponent implements OnDestroy {
diff --git a/main/http_server/forge-os/src/app/layout/app.menu.component.ts b/main/http_server/forge-os/src/app/layout/app.menu.component.ts
index 2a7a67a..22e45f4 100644
--- a/main/http_server/forge-os/src/app/layout/app.menu.component.ts
+++ b/main/http_server/forge-os/src/app/layout/app.menu.component.ts
@@ -7,7 +7,8 @@ import { LayoutService } from './service/app.layout.service';
@Component({
selector: 'app-menu',
- templateUrl: './app.menu.component.html'
+ templateUrl: './app.menu.component.html',
+ standalone: false
})
export class AppMenuComponent implements OnInit {
diff --git a/main/http_server/forge-os/src/app/layout/app.menuitem.component.ts b/main/http_server/forge-os/src/app/layout/app.menuitem.component.ts
index 2ec9c92..000e28e 100644
--- a/main/http_server/forge-os/src/app/layout/app.menuitem.component.ts
+++ b/main/http_server/forge-os/src/app/layout/app.menuitem.component.ts
@@ -45,7 +45,8 @@ import { LayoutService } from './service/app.layout.service';
})),
transition('collapsed <=> expanded', animate('400ms cubic-bezier(0.86, 0, 0.07, 1)'))
])
- ]
+ ],
+ standalone: false
})
export class AppMenuitemComponent implements OnInit, OnDestroy {
diff --git a/main/http_server/forge-os/src/app/layout/app.sidebar.component.ts b/main/http_server/forge-os/src/app/layout/app.sidebar.component.ts
index c48f9bb..b58e8e8 100644
--- a/main/http_server/forge-os/src/app/layout/app.sidebar.component.ts
+++ b/main/http_server/forge-os/src/app/layout/app.sidebar.component.ts
@@ -3,7 +3,8 @@ import { LayoutService } from "./service/app.layout.service";
@Component({
selector: 'app-sidebar',
- templateUrl: './app.sidebar.component.html'
+ templateUrl: './app.sidebar.component.html',
+ standalone: false
})
export class AppSidebarComponent {
constructor(public layoutService: LayoutService, public el: ElementRef) { }
diff --git a/main/http_server/forge-os/src/app/layout/app.topbar.component.ts b/main/http_server/forge-os/src/app/layout/app.topbar.component.ts
index d4d67de..3448d8d 100644
--- a/main/http_server/forge-os/src/app/layout/app.topbar.component.ts
+++ b/main/http_server/forge-os/src/app/layout/app.topbar.component.ts
@@ -9,7 +9,8 @@ import type { ISystemInfo } from '../../models/ISystemInfo';
@Component({
selector: 'app-topbar',
- templateUrl: './app.topbar.component.html'
+ templateUrl: './app.topbar.component.html',
+ standalone: false
})
export class AppTopBarComponent {
diff --git a/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/_components.scss b/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/_components.scss
index 82d48fa..f8b473d 100644
--- a/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/_components.scss
+++ b/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/_components.scss
@@ -2,7 +2,7 @@
@import "_colors";
-@layer primeng {
+@layer forge-os {
@import "_common";
//Input
diff --git a/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/button/_button.scss b/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/button/_button.scss
index c9a228e..c7fca48 100644
--- a/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/button/_button.scss
+++ b/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/button/_button.scss
@@ -94,19 +94,19 @@
}
.p-button-icon-left {
- margin-right: $inlineSpacing;
+ margin-right: 0;
}
.p-button-icon-right {
- margin-left: $inlineSpacing;
+ margin-left: 0;
}
.p-button-icon-bottom {
- margin-top: $inlineSpacing;
+ margin-top: 0;
}
.p-button-icon-top {
- margin-bottom: $inlineSpacing;
+ margin-bottom: 0;
}
.p-badge {
diff --git a/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/input/_dropdown.scss b/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/input/_dropdown.scss
index d83a562..b76d70a 100644
--- a/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/input/_dropdown.scss
+++ b/main/http_server/forge-os/src/app/layout/styles/theme/theme-base/components/input/_dropdown.scss
@@ -63,6 +63,67 @@
}
}
+.p-select {
+ background: $inputBg;
+ border: $inputBorder;
+ transition: $formElementTransition;
+ border-radius: $borderRadius;
+ color: $inputTextColor;
+
+ &:not(.p-disabled):hover {
+ border-color: $inputHoverBorderColor;
+ }
+
+ &:not(.p-disabled).p-focus {
+ @include focused-input();
+ }
+
+ .p-select-label {
+ background: transparent;
+ border: 0 none;
+ color: $inputTextColor;
+
+ &.p-placeholder {
+ color: $inputPlaceholderTextColor;
+ }
+
+ &:focus,
+ &:enabled:focus {
+ outline: 0 none;
+ box-shadow: none;
+ }
+ }
+
+ .p-select-dropdown {
+ background: transparent;
+ color: $inputIconColor;
+ width: $inputGroupAddOnMinWidth;
+ border-top-right-radius: $borderRadius;
+ border-bottom-right-radius: $borderRadius;
+ }
+
+ .p-select-clear-icon {
+ color: $inputIconColor;
+ right: $inputGroupAddOnMinWidth;
+ }
+
+ &.p-invalid.p-component {
+ @include invalid-input();
+ }
+
+ &.p-variant-filled {
+ background-color: $inputFilledBg;
+
+ &:enabled:hover {
+ background-color: $inputFilledHoverBg;
+ }
+
+ &:enabled:focus {
+ background-color: $inputFilledFocusBg;
+ }
+ }
+}
+
.p-dropdown-panel {
background: $inputOverlayBg;
color: $inputListTextColor;
@@ -144,8 +205,94 @@
}
}
+.p-select-overlay,
+.p-dropdown-panel.p-select-overlay {
+ background: $inputOverlayBg;
+ color: $inputListTextColor;
+ border: $inputOverlayBorder;
+ border-radius: $borderRadius;
+ box-shadow: $inputOverlayShadow;
+}
+
+.p-select-header {
+ padding: $inputListHeaderPadding;
+ border-bottom: $inputListHeaderBorder;
+ color: $inputListHeaderTextColor;
+ background: $inputOverlayHeaderBg;
+ margin: $inputListHeaderMargin;
+ border-top-right-radius: $borderRadius;
+ border-top-left-radius: $borderRadius;
+}
+
+.p-select-filter {
+ background: $inputBg;
+ color: $inputTextColor;
+ border: $inputBorder;
+}
+
+.p-select-list-container {
+ background: $inputOverlayBg;
+ color: $inputListTextColor;
+}
+
+.p-select-list {
+ padding: $inputListPadding;
+ background: $inputOverlayBg;
+}
+
+.p-select-option {
+ margin: $inputListItemMargin;
+ padding: $inputListItemPadding;
+ border: $inputListItemBorder;
+ color: $inputListItemTextColor;
+ background: $inputListItemBg;
+ transition: $listItemTransition;
+ border-radius: $inputListItemBorderRadius;
+
+ &:first-child {
+ margin-top: 0;
+ }
+
+ &.p-select-option-selected {
+ color: $highlightTextColor;
+ background: $highlightBg;
+
+ &.p-focus {
+ background: $highlightFocusBg;
+ }
+ }
+
+ &:not(.p-select-option-selected):not(.p-disabled) {
+ &.p-focus {
+ color: $inputListItemTextFocusColor;
+ background: $inputListItemFocusBg;
+ }
+
+ &:hover {
+ color: $inputListItemTextHoverColor;
+ background: $inputListItemHoverBg;
+ }
+ }
+}
+
+.p-select-option-group,
+.p-select-option-group-label {
+ margin: $submenuHeaderMargin;
+ padding: $submenuHeaderPadding;
+ color: $submenuHeaderTextColor;
+ background: $submenuHeaderBg;
+ font-weight: $submenuHeaderFontWeight;
+}
+
+.p-select-empty-message {
+ padding: $inputListItemPadding;
+ color: $inputListItemTextColor;
+ background: $inputListItemBg;
+}
+
.p-input-filled {
- .p-dropdown {
+ .p-dropdown,
+ .p-select {
background: $inputFilledBg;
&:not(.p-disabled):hover {
@@ -162,6 +309,8 @@
}
}
-p-dropdown.ng-dirty.ng-invalid > .p-dropdown {
+p-dropdown.ng-dirty.ng-invalid > .p-dropdown,
+p-dropdown.ng-dirty.ng-invalid > .p-select,
+p-select.ng-dirty.ng-invalid > .p-select {
@include invalid-input();
-}
\ No newline at end of file
+}
diff --git a/main/http_server/forge-os/src/app/pipes/ansi.pipe.ts b/main/http_server/forge-os/src/app/pipes/ansi.pipe.ts
index ec2df0d..e5b5be4 100644
--- a/main/http_server/forge-os/src/app/pipes/ansi.pipe.ts
+++ b/main/http_server/forge-os/src/app/pipes/ansi.pipe.ts
@@ -1,8 +1,9 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
- name: 'ANSI',
- pure: true
+ name: 'ANSI',
+ pure: true,
+ standalone: false
})
export class ANSIPipe implements PipeTransform {
diff --git a/main/http_server/forge-os/src/app/pipes/date-ago.pipe.ts b/main/http_server/forge-os/src/app/pipes/date-ago.pipe.ts
index 5807281..280719f 100644
--- a/main/http_server/forge-os/src/app/pipes/date-ago.pipe.ts
+++ b/main/http_server/forge-os/src/app/pipes/date-ago.pipe.ts
@@ -1,8 +1,9 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
- name: 'dateAgo',
- pure: true
+ name: 'dateAgo',
+ pure: true,
+ standalone: false
})
export class DateAgoPipe implements PipeTransform {
diff --git a/main/http_server/forge-os/src/app/pipes/diff-suffix.pipe.ts b/main/http_server/forge-os/src/app/pipes/diff-suffix.pipe.ts
index 37b85d2..ba3211c 100644
--- a/main/http_server/forge-os/src/app/pipes/diff-suffix.pipe.ts
+++ b/main/http_server/forge-os/src/app/pipes/diff-suffix.pipe.ts
@@ -1,8 +1,9 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
- name: 'diffSuffix',
- pure: true
+ name: 'diffSuffix',
+ pure: true,
+ standalone: false
})
export class DiffSuffixPipe implements PipeTransform {
diff --git a/main/http_server/forge-os/src/app/pipes/hash-suffix.pipe.ts b/main/http_server/forge-os/src/app/pipes/hash-suffix.pipe.ts
index a2684ab..f15fcc0 100644
--- a/main/http_server/forge-os/src/app/pipes/hash-suffix.pipe.ts
+++ b/main/http_server/forge-os/src/app/pipes/hash-suffix.pipe.ts
@@ -1,7 +1,8 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
- name: 'hashSuffix'
+ name: 'hashSuffix',
+ standalone: false
})
export class HashSuffixPipe implements PipeTransform {
diff --git a/main/http_server/forge-os/src/app/pipes/truncate-middle.pipe.ts b/main/http_server/forge-os/src/app/pipes/truncate-middle.pipe.ts
index bee16c7..5e82ff9 100644
--- a/main/http_server/forge-os/src/app/pipes/truncate-middle.pipe.ts
+++ b/main/http_server/forge-os/src/app/pipes/truncate-middle.pipe.ts
@@ -1,7 +1,8 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
- name: 'truncateMiddle'
+ name: 'truncateMiddle',
+ standalone: false
})
export class TruncateMiddlePipe implements PipeTransform {
transform(value: string, startChars: number = 10, endChars: number = 8): string {
diff --git a/main/http_server/forge-os/src/app/prime-ng.module.ts b/main/http_server/forge-os/src/app/prime-ng.module.ts
index 6f33a8c..7b83342 100644
--- a/main/http_server/forge-os/src/app/prime-ng.module.ts
+++ b/main/http_server/forge-os/src/app/prime-ng.module.ts
@@ -7,7 +7,7 @@ import { FileUploadModule } from 'primeng/fileupload';
import { InputGroupModule } from 'primeng/inputgroup';
import { InputGroupAddonModule } from 'primeng/inputgroupaddon';
import { InputTextModule } from 'primeng/inputtext';
-import { InputTextareaModule } from 'primeng/inputtextarea';
+import { TextareaModule } from 'primeng/textarea';
import { ProgressBarModule } from 'primeng/progressbar';
import { SidebarModule } from 'primeng/sidebar';
import { SliderModule } from 'primeng/slider';
@@ -16,7 +16,7 @@ import { TabViewModule } from 'primeng/tabview';
const primeNgModules = [
SidebarModule,
InputTextModule,
- InputTextareaModule,
+ TextareaModule,
CheckboxModule,
DropdownModule,
SliderModule,
diff --git a/main/http_server/forge-os/src/app/services/dialog.service.ts b/main/http_server/forge-os/src/app/services/dialog.service.ts
index 9188cac..9fdc928 100644
--- a/main/http_server/forge-os/src/app/services/dialog.service.ts
+++ b/main/http_server/forge-os/src/app/services/dialog.service.ts
@@ -37,7 +37,7 @@ export class DialogService {
}
@Component({
- template: `
+ template: `