CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: rename gui/webcam to gui/webcams store

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2021-11-07 15:58:14 +01:00
parent b6fa2e3d83
commit a24c6bd90e
16 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/TheSettingsMenu.vue
View File

@ -106,7 +106,7 @@ export default class TheSettingsMenu extends Mixins(BaseMixin) {
title: this.$t('Settings.DashboardTab.Dashboard')
},
{
icon: 'mdi-webcam',
icon: 'mdi-webcams',
name: 'webcam',
title: this.$t('Settings.WebcamTab.Webcams')
},

2
src/components/panels/WebcamPanel.vue
View File

@ -76,7 +76,7 @@ import Component from 'vue-class-component'
import {Mixins, Prop} from 'vue-property-decorator'
import BaseMixin from '../mixins/base'
import Panel from '@/components/ui/Panel.vue'
import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
@Component({
components: {

10
src/components/settings/SettingsWebcamTab.vue
View File

@ -157,7 +157,7 @@
import {Component, Mixins} from 'vue-property-decorator'
import BaseMixin from '../mixins/base'
import SettingsRow from '@/components/settings/SettingsRow.vue'
import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
interface webcamForm {
bool: boolean
@ -207,7 +207,7 @@ export default class SettingsWebcamTab extends Mixins(BaseMixin) {
{ value: 'mdi-printer-3d', text: this.$t('Settings.WebcamTab.IconPrinter') },
{ value: 'mdi-printer-3d-nozzle', text: this.$t('Settings.WebcamTab.IconNozzle') },
{ value: 'mdi-radiator-disabled', text: this.$t('Settings.WebcamTab.IconBed') },
{ value: 'mdi-webcam', text: this.$t('Settings.WebcamTab.IconCam') },
{ value: 'mdi-webcams', text: this.$t('Settings.WebcamTab.IconCam') },
{ value: 'mdi-album', text: this.$t('Settings.WebcamTab.IconFilament') },
{ value: 'mdi-door', text: this.$t('Settings.WebcamTab.IconDoor') },
{ value: 'mdi-raspberry-pi', text: this.$t('Settings.WebcamTab.IconMcu') },
@ -292,11 +292,11 @@ export default class SettingsWebcamTab extends Mixins(BaseMixin) {
this.form.bool = false
this.form.id = null
this.form.name = ''
this.form.icon = 'mdi-webcam'
this.form.icon = 'mdi-webcams'
this.form.service = 'mjpegstreamer-adaptive'
this.form.targetFps = 15
this.form.urlStream = '/webcam/?action=stream'
this.form.urlSnapshot = '/webcam/?action=snapshot'
this.form.urlStream = '/webcams/?action=stream'
this.form.urlSnapshot = '/webcams/?action=snapshot'
this.form.flipX = false
this.form.flipY = false
}

2
src/components/webcams/Uv4lMjpeg.vue
View File

@ -20,7 +20,7 @@
<script lang="ts">
import {Component, Mixins, Prop} from 'vue-property-decorator'
import BaseMixin from '@/components/mixins/base'
import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
@Component
export default class Uv4lMjpeg extends Mixins(BaseMixin) {

2
src/components/webcams/WebcamGrid.vue
View File

@ -37,7 +37,7 @@ import Mjpegstreamer from '@/components/webcams/Mjpegstreamer.vue'
import MjpegstreamerAdaptive from '@/components/webcams/MjpegstreamerAdaptive.vue'
import Uv4lMjpeg from '@/components/webcams/Uv4lMjpeg.vue'
import Ipstreamer from '@/components/webcams/Ipstreamer.vue'
import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
@Component({
components: {

2
src/plugins/helpers.ts
View File

@ -38,7 +38,7 @@ export const convertPanelnameToIcon = (name: string): string => {
if (name.startsWith('macrogroup_')) return 'mdi-code-tags'
switch (name) {
case 'webcam': return 'mdi-webcam'
case 'webcam': return 'mdi-webcams'
case 'zoffset': return 'mdi-arrow-collapse-vertical'
case 'control': return 'mdi-gamepad'
case 'macros': return 'mdi-code-tags'

2
src/store/farm/printer/getters.ts
View File

@ -2,7 +2,7 @@ import {defaultLogoColor, themeDir, thumbnailBigMin} from '@/store/variables'
import {convertName} from '@/plugins/helpers'
import {GetterTree} from 'vuex'
import {FarmPrinterState} from '@/store/farm/printer/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
// eslint-disable-next-line
export const getters: GetterTree<FarmPrinterState, any> = {

2
src/store/farm/printer/types.ts
View File

@ -1,6 +1,6 @@
import { GuiState } from '@/store/gui/types'
import { FileStateFile } from '@/store/files/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
export interface FarmPrinterState {
_namespace: string

2
src/store/gui/actions.ts
View File

@ -25,7 +25,7 @@ export const actions: ActionTree<GuiState, RootState> = {
//added in V2.1
if (payload.value.webcam) {
window.console.debug('convert old webcam')
window.console.debug('convert old webcams')
if (payload.value.webcam.configs && payload.value.webcam.configs.length) {
payload.value.webcam.configs.forEach((oldWebcam: any) => {

2
src/store/gui/index.ts
View File

@ -6,7 +6,7 @@ import { getters } from '@/store/gui/getters'
import {defaultLogoColor, defaultPrimaryColor} from '@/store/variables'
// load modules
import { webcam } from '@/store/gui/webcam'
import { webcam } from '@/store/gui/webcams'
import { presets } from '@/store/gui/presets'
export const getDefaultState = (): GuiState => {

6
src/store/gui/webcam/actions.ts → src/store/gui/webcams/actions.ts
View File

@ -1,6 +1,6 @@
import { ActionTree } from 'vuex'
import {RootState} from '@/store/types'
import {GuiWebcamState} from '@/store/gui/webcam/types'
import {GuiWebcamState} from '@/store/gui/webcams/types'
import { v4 as uuidv4 } from 'uuid'
import Vue from 'vue'
@ -10,8 +10,8 @@ export const actions: ActionTree<GuiWebcamState, RootState> = {
},
init() {
window.console.debug('init gui/webcam')
Vue.$socket.emit('server.database.get_item', { namespace: 'webcams' }, { action: 'gui/webcam/initStore' })
window.console.debug('init gui/webcams')
Vue.$socket.emit('server.database.get_item', { namespace: 'webcams' }, { action: 'gui/webcams/initStore' })
},
initStore({ commit }, payload) {

2
src/store/gui/webcam/getters.ts → src/store/gui/webcams/getters.ts
View File

@ -1,5 +1,5 @@
import { GetterTree } from 'vuex'
import {GuiWebcamState, GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
import {GuiWebcamState, GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
// eslint-disable-next-line
export const getters: GetterTree<GuiWebcamState, any> = {

8
src/store/gui/webcam/index.ts → src/store/gui/webcams/index.ts
View File

@ -1,8 +1,8 @@
import { Module } from 'vuex'
import { actions } from '@/store/gui/webcam/actions'
import { mutations } from '@/store/gui/webcam/mutations'
import { getters } from '@/store/gui/webcam/getters'
import {GuiWebcamState} from '@/store/gui/webcam/types'
import { actions } from '@/store/gui/webcams/actions'
import { mutations } from '@/store/gui/webcams/mutations'
import { getters } from '@/store/gui/webcams/getters'
import {GuiWebcamState} from '@/store/gui/webcams/types'
export const getDefaultState = (): GuiWebcamState => {
return {

2
src/store/gui/webcam/mutations.ts → src/store/gui/webcams/mutations.ts
View File

@ -1,6 +1,6 @@
import { getDefaultState } from './index'
import {MutationTree} from 'vuex'
import {GuiWebcamState} from '@/store/gui/webcam/types'
import {GuiWebcamState} from '@/store/gui/webcams/types'
import Vue from 'vue'
export const mutations: MutationTree<GuiWebcamState> = {

0
src/store/gui/webcam/types.ts → src/store/gui/webcams/types.ts
View File

2
src/store/server/actions.ts
View File

@ -30,7 +30,7 @@ export const actions: ActionTree<ServerState, RootState> = {
dispatch('printer/init', null, { root: true })
}
if (payload.namespaces?.includes('webcams')) dispatch('gui/webcam/init', null, { root: true })
if (payload.namespaces?.includes('webcams')) dispatch('gui/webcams/init', null, { root: true })
if (payload.namespaces?.includes('mainsail_presets')) dispatch('gui/presets/init', null, { root: true })
},