diff --git a/src/App.vue b/src/App.vue index cdde20358..352c6207d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,7 +41,7 @@ - - + diff --git a/src/components/TheThrottledStates.vue b/src/components/TheThrottledStates.vue deleted file mode 100644 index ee12a791f..000000000 --- a/src/components/TheThrottledStates.vue +++ /dev/null @@ -1,96 +0,0 @@ - - - - - diff --git a/src/components/TheTopbar.vue b/src/components/TheTopbar.vue index 427dbda93..edd62c8ed 100644 --- a/src/components/TheTopbar.vue +++ b/src/components/TheTopbar.vue @@ -47,7 +47,6 @@ {{ printerName }} - {{ mdiAlertCircleOutline }} {{ $t('App.TopBar.EmergencyStop') }} + @@ -142,10 +142,10 @@ import axios from 'axios' import { formatFilesize } from '@/plugins/helpers' import TheTopCornerMenu from '@/components/TheTopCornerMenu.vue' import TheSettingsMenu from '@/components/TheSettingsMenu.vue' -import TheThrottledStates from '@/components/TheThrottledStates.vue' import Panel from '@/components/ui/Panel.vue' import PrinterSelector from '@/components/ui/PrinterSelector.vue' import MainsailLogo from '@/components/ui/MainsailLogo.vue' +import TheNotificationMenu from '@/components/notifications/TheNotificationMenu.vue' import { topbarHeight } from '@/store/variables' import { mdiAlertCircleOutline, mdiContentSave, mdiFileUpload, mdiClose, mdiCloseThick } from '@mdi/js' @@ -165,11 +165,11 @@ type uploadSnackbar = { @Component({ components: { Panel, - TheThrottledStates, TheSettingsMenu, TheTopCornerMenu, PrinterSelector, MainsailLogo, + TheNotificationMenu, }, }) export default class TheTopbar extends Mixins(BaseMixin) { diff --git a/src/components/mixins/base.ts b/src/components/mixins/base.ts index 9de25dc10..269fd007c 100644 --- a/src/components/mixins/base.ts +++ b/src/components/mixins/base.ts @@ -40,7 +40,8 @@ export default class BaseMixin extends Vue { } get printer_state(): string { - const printer_state = this.$store.state.printer.print_stats?.state ?? '' + const printer_state = + this.$store.state.printer.print_stats?.state ?? this.$store.state.printer.idle_timeout?.state ?? '' const timelapse_pause = this.$store.state.printer['gcode_macro TIMELAPSE_TAKE_FRAME']?.is_paused ?? false return printer_state === 'paused' && timelapse_pause ? 'printing' : printer_state } diff --git a/src/components/notifications/NotificationMenuEntry.vue b/src/components/notifications/NotificationMenuEntry.vue new file mode 100644 index 000000000..a8439715f --- /dev/null +++ b/src/components/notifications/NotificationMenuEntry.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/components/notifications/TheNotificationMenu.vue b/src/components/notifications/TheNotificationMenu.vue new file mode 100644 index 000000000..7db315d79 --- /dev/null +++ b/src/components/notifications/TheNotificationMenu.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/components/panels/DependenciesPanel.vue b/src/components/panels/DependenciesPanel.vue deleted file mode 100644 index 3b91dddfc..000000000 --- a/src/components/panels/DependenciesPanel.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - diff --git a/src/components/panels/KlipperWarningsPanel.vue b/src/components/panels/KlipperWarningsPanel.vue deleted file mode 100644 index a281c1e8d..000000000 --- a/src/components/panels/KlipperWarningsPanel.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - diff --git a/src/components/panels/MinSettingsPanel.vue b/src/components/panels/MinSettingsPanel.vue index 4bd1e672b..e17ab9c49 100644 --- a/src/components/panels/MinSettingsPanel.vue +++ b/src/components/panels/MinSettingsPanel.vue @@ -30,7 +30,7 @@ - + {{ mdiInformation }} {{ $t('Panels.MinSettingsPanel.MoreInformation') }} diff --git a/src/components/panels/MoonrakerStatePanel.vue b/src/components/panels/MoonrakerStatePanel.vue deleted file mode 100644 index bd4609549..000000000 --- a/src/components/panels/MoonrakerStatePanel.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue index 6005168ba..e61774681 100644 --- a/src/components/panels/StatusPanel.vue +++ b/src/components/panels/StatusPanel.vue @@ -6,11 +6,8 @@