Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: rename and clean up AboutModal #1090

Merged
merged 2 commits into from
Sep 17, 2022
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
6 changes: 3 additions & 3 deletions src/components/TheSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<template #append>
<v-list-item class="small-list-item mb-2">
<v-list-item-icon class="menu-item-icon">
<about-modal></about-modal>
<about-dialog></about-dialog>
</v-list-item-icon>
</v-list-item>
</template>
Expand All @@ -144,15 +144,15 @@ import { Mixins } from 'vue-property-decorator'
import BaseMixin from '@/components/mixins/base'
import { PrinterStateKlipperConfig } from '@/store/printer/types'
import TheSelectPrinterDialog from '@/components/TheSelectPrinterDialog.vue'
import AboutModal from '@/components/modals/AboutModal.vue'
import AboutDialog from '@/components/dialogs/AboutDialog.vue'
import { navigationWidth, topbarHeight } from '@/store/variables'
import MainsailLogo from '@/components/ui/MainsailLogo.vue'
import { mdiViewDashboardOutline } from '@mdi/js'

@Component({
components: {
TheSelectPrinterDialog,
AboutModal,
AboutDialog,
MainsailLogo,
},
})
Expand Down
59 changes: 59 additions & 0 deletions src/components/dialogs/AboutDialog.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<template>
<v-tooltip right color="panel">
<template #activator="{ on, attrs }">
<v-icon v-bind="attrs" v-on="on">
{{ mdiHelpCircleOutline }}
</v-icon>
</template>
<v-container class="version-container pa-0">
<div><img height="12" src="/img/logo.svg" alt="mainsail-logo" /></div>
<div>v{{ mainsailVersion }}</div>
<div>
<v-icon small class="moonraker-logo">{{ mdiMoonWaningCrescent }}</v-icon>
</div>
<div>{{ moonrakerVersion }}</div>
<div><img height="12" src="/img/klipper.svg" class="klipper-logo" alt="klipper-logo" /></div>
<div>{{ klipperVersion }}</div>
</v-container>
</v-tooltip>
</template>

<script lang="ts">
import BaseMixin from '../mixins/base'
import { Mixins } from 'vue-property-decorator'
import Component from 'vue-class-component'
import { mdiCloseThick, mdiHelpCircleOutline, mdiMoonWaningCrescent } from '@mdi/js'

@Component({})
export default class AboutDialog extends Mixins(BaseMixin) {
mdiHelpCircleOutline = mdiHelpCircleOutline
mdiCloseThick = mdiCloseThick
mdiMoonWaningCrescent = mdiMoonWaningCrescent

get mainsailVersion(): string {
return this.$store.state.packageVersion
}

get klipperVersion(): string {
return this.$store.state.printer?.software_version ?? ''
}

get moonrakerVersion(): string {
return this.$store.state.server?.moonraker_version ?? ''
}
}
</script>

<style scoped>
.klipper-logo {
transform: rotate(90deg);
}
.moonraker-logo {
transform: rotate(45deg);
color: #ebc815;
}
.version-container {
display: grid;
grid-template-columns: 20px auto;
}
</style>
93 changes: 0 additions & 93 deletions src/components/modals/AboutModal.vue

This file was deleted.