Skip to content

Commit

Permalink
Merge branch 'feat/reminder-panel-pr' into reminder-panel
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/components/panels/HistoryListPanel.vue
#	src/plugins/helpers.ts
#	src/store/gui/index.ts
#	src/store/gui/notifications/getters.ts
#	src/store/server/history/types.ts
  • Loading branch information
meteyou committed Mar 17, 2024
2 parents 494e425 + 5e86793 commit 70551a3
Show file tree
Hide file tree
Showing 64 changed files with 3,541 additions and 1,269 deletions.
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,47 @@
# Changelog
All notable changes to Mainsail will be documented in this file.

## [2.10.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.10.0) - 2024-02-15
### Features

- **history**: Add interrupted state to history job ([#1738](https://github.com/mainsail-crew/mainsail/pull/1738))
- Add ability to re-arrange job queue's items ([#1692](https://github.com/mainsail-crew/mainsail/pull/1692))
- Add sum + eta in jobqueue panel ([#1770](https://github.com/mainsail-crew/mainsail/pull/1770))
- Add devices dialog in editor ([#1765](https://github.com/mainsail-crew/mainsail/pull/1765))
- Add ability to add history items to job queue ([#1778](https://github.com/mainsail-crew/mainsail/pull/1778))

### Bug Fixes and Improvements

- **console**: Fix color of autocomplete and command list ([#1733](https://github.com/mainsail-crew/mainsail/pull/1733))
- **timelapse**: Fix issue with changing timelapse settings ([#1745](https://github.com/mainsail-crew/mainsail/pull/1745))
- Incorrect scaling of images in dialogImage ([#1746](https://github.com/mainsail-crew/mainsail/pull/1746))
- Show extruder extra menu without load/unload macros ([#1747](https://github.com/mainsail-crew/mainsail/pull/1747))
- Fix ETA calculation from jobqueue during print preheat ([#1773](https://github.com/mainsail-crew/mainsail/pull/1773))
- File upload rate displays `NaN` instead of an actual value ([#1777](https://github.com/mainsail-crew/mainsail/pull/1777))

### Performance

- Batch gcode file metadata requests ([#1737](https://github.com/mainsail-crew/mainsail/pull/1737))

### Refactor

- Refactor spoolman integration to support v2 response ([#1749](https://github.com/mainsail-crew/mainsail/pull/1749))
- Refactor heightmap page ([#1759](https://github.com/mainsail-crew/mainsail/pull/1759))

### Localization

- **da**: Update danish translation ([#1757](https://github.com/mainsail-crew/mainsail/pull/1757))
- **de**: Update german locale ([#1772](https://github.com/mainsail-crew/mainsail/pull/1772))
- **en**: Fix typo in DescriptionPreviouslyThrottled ([#1776](https://github.com/mainsail-crew/mainsail/pull/1776))
- **it**: Update italian translation ([#1763](https://github.com/mainsail-crew/mainsail/pull/1763))
- **zh**: Update chinese locale ([#1767](https://github.com/mainsail-crew/mainsail/pull/1767))

### Other

- **deps**: Update @sindarius/gcodeviewer ([#1755](https://github.com/mainsail-crew/mainsail/pull/1755))
- Update github issue bot text ([#1743](https://github.com/mainsail-crew/mainsail/pull/1743))
- Fix typo in bot text ([#1748](https://github.com/mainsail-crew/mainsail/pull/1748))

## [2.9.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.9.1) - 2023-12-31
### Bug Fixes and Improvements

Expand Down
152 changes: 76 additions & 76 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mainsail",
"version": "2.9.1",
"version": "2.10.0",
"private": true,
"decription": "a klipper web interface",
"author": {
Expand Down Expand Up @@ -33,7 +33,7 @@
"@codemirror/view": "^6.0.3",
"@jaames/iro": "^5.5.2",
"@lezer/highlight": "^1.0.0",
"@sindarius/gcodeviewer": "^3.7.6",
"@sindarius/gcodeviewer": "^3.7.8",
"@uiw/codemirror-theme-vscode": "^4.19.11",
"axios": "^1.6.0",
"codemirror": "^6.0.1",
Expand Down
17 changes: 16 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<the-sidebar />
<the-topbar />
<v-main id="content" :style="mainStyle">
<v-container id="page-container" fluid class="container px-3 px-sm-6 py-sm-6 mx-auto">
<v-container id="page-container" fluid :class="containerClasses">
<router-view />
</v-container>
</v-main>
Expand Down Expand Up @@ -44,6 +44,7 @@ import TheBedScrewsDialog from '@/components/dialogs/TheBedScrewsDialog.vue'
import TheScrewsTiltAdjustDialog from '@/components/dialogs/TheScrewsTiltAdjustDialog.vue'
import { setAndLoadLocale } from './plugins/i18n'
import TheMacroPrompt from '@/components/dialogs/TheMacroPrompt.vue'
import { AppRoute } from '@/routes'
Component.registerHooks(['metaInfo'])
Expand Down Expand Up @@ -172,6 +173,20 @@ export default class App extends Mixins(BaseMixin, ThemeMixin) {
return Math.floor(this.$store.getters['printer/getPrintPercent'] * 100)
}
get containerClasses() {
const currentRouteOptions = this.$router.options.routes?.find(
(route) => route.name === this.$route.name
) as AppRoute
return {
'px-3': true,
'px-sm-6': true,
'py-sm-6': true,
'mx-auto': true,
fullscreen: currentRouteOptions?.fullscreen ?? false,
}
}
@Watch('language')
async languageChanged(newVal: string): Promise<void> {
await setAndLoadLocale(newVal)
Expand Down
4 changes: 4 additions & 0 deletions src/assets/styles/page.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ body {
max-width: 1800px;
}

#page-container.fullscreen {
max-width: none;
}

.overflowingContentWidgets {
visibility: hidden;
}
Expand Down
Loading

0 comments on commit 70551a3

Please sign in to comment.