Skip to content

Commit 8d04cbb

Browse files
previprevi
committed
wip #90 
1 parent 2ad726f commit 8d04cbb

File tree

2 files changed

+66
-44
lines changed

2 files changed

+66
-44
lines changed

‎src/components/Settings.vue‎

Lines changed: 64 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<br>
4747
<h3 class="text-xs-left"> {{ $t('message.settings_actions') }} </h3>
4848
<v-card>
49-
<div class="cardContent text-xs-center">
49+
<div class="d-flex justify-space-around align-center">
5050
<v-btn @click="shutdown" color="info">
5151
<v-icon icon="mdi-power"></v-icon> {{ $t('message.settings_actions_off') }}
5252
</v-btn>
@@ -56,42 +56,35 @@
5656
<v-btn @click="restoreConfig" color="warning">
5757
<v-icon icon="mdi-restore"></v-icon> {{ $t('message.settings_actions_reset') }}
5858
</v-btn>
59+
<v-btn slot="activator" color="error" dark @click="dialog_reset = true">
60+
<v-icon icon="mdi-store-cog"></v-icon> {{ $t('message.settings_actions_reset_factory') }}
61+
</v-btn>
62+
<v-btn slot="activator" color="warning" dark @click="dialog_logs = true">
63+
<v-icon icon="mdi-format-list-text"></v-icon> {{ $t('message.settings_actions_show_logs') }}
64+
</v-btn>
5965
<!-- ** Restore button + dialog box** -->
60-
<v-dialog v-model="dialog" width="500">
61-
<!-- eslint-disable-next-line vue/no-unused-vars -->
62-
<template v-slot:activator="data">
63-
<v-btn slot="activator" color="error" dark>
64-
<v-icon icon="mdi-store-cog"></v-icon> {{ $t('message.settings_actions_reset_factory') }}
65-
</v-btn>
66+
<v-dialog v-model="dialog_reset" width="500">
6667
<v-card>
6768
<v-card-title class="headline grey lighten-2" primary-title>
6869
<h3>CoderBot - {{ $t('message.settings_actions_reset_factory_title') }}</h3>
6970
</v-card-title>
7071
<v-card-text>
7172
{{ $t('message.settings_actions_reset_factory_text_1') }}
72-
<br>
73-
<h3><b>{{ $t('message.settings_actions_reset_factory_text_1') }}</b></h3>
7473
</v-card-text>
7574
<v-divider></v-divider>
7675
<v-card-actions>
7776
<v-spacer></v-spacer>
78-
<v-btn color="primary" @click="dialog = false">
77+
<v-btn color="primary" @click="dialog_reset = false">
7978
{{ $t('message.cancel') }}
8079
</v-btn>
8180
<v-btn color="error" @click="restore">
8281
<b>{{ $t('message.settings_actions_reset_factory_restore') }}</b>
8382
</v-btn>
8483
</v-card-actions>
8584
</v-card>
86-
</template>
8785
</v-dialog>
8886
<!-- Logs -->
8987
<v-dialog v-model="dialog_logs" width="700">
90-
<!-- eslint-disable-next-line vue/no-unused-vars -->
91-
<template v-slot:activator="data">
92-
<v-btn slot="activator" color="warning" dark>
93-
<v-icon icon="mdi-format-list-text"></v-icon> {{ $t('message.settings_actions_show_logs') }}
94-
</v-btn>
9588
<v-card>
9689
<v-card-title class="headline grey lighten-2" primary-title>
9790
<h3>CoderBot - {{ $t('message.settings_actions_show_logs_title') }}</h3>
@@ -109,12 +102,14 @@
109102
</v-btn>
110103
</v-card-actions>
111104
</v-card>
112-
</template>
113105
</v-dialog>
114106
</div>
115107
</v-card>
116-
<h3 class="text-xs-left"> {{ $t('message.settings_actions_update_title') }} </h3>
108+
<br>
117109
<v-card>
110+
<v-card-title>
111+
<h3 class="text-xs-left"> {{ $t('message.settings_actions_update_title') }} </h3>
112+
</v-card-title>
118113
<div class="cardContent">
119114
<template v-if="updateStatus==1">
120115
{{ $t('message.settings_update_upload') }}
@@ -133,10 +128,11 @@
133128
</template>
134129
</div>
135130
</v-card>
136-
<br/><br/>
137-
<br><br>
138-
<h3 class="text-xs-left">{{ $t('message.settings_admin_password_title') }}</h3>
131+
<br>
139132
<v-card>
133+
<v-card-title>
134+
<h3 class="text-xs-left">{{ $t('message.settings_admin_password_title') }}</h3>
135+
</v-card-title>
140136
<div class="cardContent">
141137
<v-text-field v-model="settings.adminPassword"
142138
v-bind:label="$t('message.settings_admin_password')"
@@ -153,8 +149,10 @@
153149
<v-layout row wrap>
154150
<!-- Column A -->
155151
<v-col xs12 md6 offset-md3>
156-
<h3 class="text-xs-left">{{ $t('message.settings_movement_control') }}</h3>
157152
<v-card>
153+
<v-card-title>
154+
<h3 class="text-xs-left">{{ $t('message.settings_movement_control') }}</h3>
155+
</v-card-title>
158156
<div class="cardContent">
159157
<v-text-field v-model="settings.ctrlFwdSpeed"
160158
v-bind:label="$t('message.settings_movement_control_forward_speed')"
@@ -178,9 +176,11 @@
178176
/>
179177
</div>
180178
</v-card>
181-
<br><br>
182-
<h3 class="text-xs-left">{{ $t('message.settings_movement_program') }}</h3>
179+
<br>
183180
<v-card>
181+
<v-card-title>
182+
<h3 class="text-xs-left">{{ $t('message.settings_movement_program') }}</h3>
183+
</v-card-title>
184184
<div class="cardContent">
185185
<v-text-field v-model="settings.moveFwdSpeed"
186186
v-bind:label="$t('message.settings_movement_program_forward_speed')"
@@ -204,9 +204,11 @@
204204
/>
205205
</div>
206206
</v-card>
207-
<br><br>
208-
<h3 class="text-xs-left">{{ $t('message.settings_movement_parameters') }}</h3>
207+
<br>
209208
<v-card>
209+
<v-card-title>
210+
<h3 class="text-xs-left">{{ $t('message.settings_movement_parameters') }}</h3>
211+
</v-card-title>
210212
<div class="cardContent">
211213
<v-text-field v-model="settings.motorMode"
212214
v-bind:label="$t('message.settings_movement_parameters_mode')"
@@ -237,8 +239,10 @@
237239
<v-layout row wrap>
238240
<!-- Column A -->
239241
<v-col xs12 md6 offset-md3>
240-
<h3 class="text-xs-left">{{ $t('message.settings_camera_title') }}</h3>
241242
<v-card>
243+
<v-card-title>
244+
<h3 class="text-xs-left">{{ $t('message.settings_camera_title') }}</h3>
245+
</v-card-title>
242246
<div class="cardContent">
243247
<v-select
244248
v-model="settings.camera_exposure_mode"
@@ -270,9 +274,11 @@
270274
/>
271275
</div>
272276
</v-card>
273-
<br><br>
274-
<h3 class="text-xs-left">{{ $t('message.settings_camera_cv_title') }}</h3>
277+
<br>
275278
<v-card>
279+
<v-card-title>
280+
<h3 class="text-xs-left">{{ $t('message.settings_camera_cv_title') }}</h3>
281+
</v-card-title>
276282
<div class="cardContent">
277283
{{ $t("message.settings_camera_cv_image_factor") }}:
278284
<span v-text="settings.cv_image_factor"></span>
@@ -317,8 +323,10 @@
317323
<v-layout row wrap>
318324
<!-- Column A -->
319325
<v-col xs12 md6 offset-md3>
320-
<h3 class="text-xs-left">{{ $t('message.settings_sounds_title') }}</h3>
321326
<v-card>
327+
<v-card-title>
328+
<h3 class="text-xs-left">{{ $t('message.settings_sounds_title') }}</h3>
329+
</v-card-title>
322330
<div class="cardContent">
323331
<v-text-field v-model="settings.startSound" v-bind:label="$t('message.settings_sounds_start')"
324332
@input="v$.settings.startSound.$touch"
@@ -340,8 +348,10 @@
340348
<v-layout row wrap>
341349
<!-- Column A -->
342350
<v-col xs12 md6 offset-md3>
343-
<h3 class="text-xs-left">{{ $t('message.settings_button_title') }}</h3>
344351
<v-card>
352+
<v-card-title>
353+
<h3 class="text-xs-left">{{ $t('message.settings_button_title') }}</h3>
354+
</v-card-title>
345355
<div class="cardContent">
346356
<v-radio-group v-model="settings.btnFun" column
347357
>
@@ -351,8 +361,10 @@
351361
</div>
352362
</v-card>
353363
<br>
354-
<h3 class="text-xs-left">{{ $t('message.settings_load_at_start_title') }}</h3>
355364
<v-card>
365+
<v-card-title>
366+
<h3 class="text-xs-left">{{ $t('message.settings_load_at_start_title') }}</h3>
367+
</v-card-title>
356368
<div class="cardContent">
357369
<v-text-field v-model="settings.startupProgram" v-bind:label="$t('message.settings_load_at_start_title')"
358370
@input="v$.settings.startupProgram.$touch"
@@ -367,8 +379,10 @@
367379
<v-container grid-list-md text-xs-center>
368380
<v-layout row wrap>
369381
<v-col xs12 md6 offset-md3>
370-
<h3 class="text-xs-left">{{ $t('message.settings_network_title') }}</h3>
371382
<v-card>
383+
<v-card-title>
384+
<h3 class="text-xs-left">{{ $t('message.settings_network_title') }}</h3>
385+
</v-card-title>
372386
<div class="cardContent">
373387
<v-radio-group v-model="settings.wifiMode" column
374388
@change="v$.settings.wifiMode.$touch"
@@ -414,9 +428,10 @@
414428
<v-container grid-list-md text-xs-center>
415429
<v-layout row wrap align-center>
416430
<v-col xs12 md6 offset-md3>
417-
<h3 class="text-xs-left">{{ $t('message.settings_component_test_title') }}</h3>
418431
<v-card>
419-
432+
<v-card-title>
433+
<h3 class="text-xs-left">{{ $t('message.settings_component_test_title') }}</h3>
434+
</v-card-title>
420435
<div class="cardContent">
421436
<div id='test_array'>
422437
<!-- SONAR -->
@@ -567,8 +582,10 @@
567582
<v-container grid-list-md text-xs-center>
568583
<v-layout row wrap align-center>
569584
<v-col xs12 md6 offset-md3>
570-
<h3 class="text-xs-left">{{ $t('message.settings_audio_title') }}</h3>
571585
<v-card>
586+
<v-card-title>
587+
<h3 class="text-xs-left">{{ $t('message.settings_audio_title') }}</h3>
588+
</v-card-title>
572589
<div class="cardContent">
573590
{{ $t('message.settings_audio_volume') }}
574591
<v-text-field v-model="settings.audioLevel" v-bind:label="$t('message.settings_audio_volume')"
@@ -580,29 +597,34 @@
580597
</v-layout>
581598
</v-container>
582599
</v-window-item>
583-
584600
<!-- PACKAGE MANAGER -->
585601
<v-window-item>
586602
<v-container grid-list-md text-xs-center>
587603
<v-layout row wrap align-center>
588604
<v-col xs12 md6 offset-md3>
605+
<v-card>
606+
<v-card-title>
589607
<h3 class="text-xs-left">{{ $t('message.settings_music_packages_title') }}</h3>
590608
<br>
591-
<h3 class="text-xs-left"> {{ $t('message.settings_music_packages_installed') }}</h3>
592-
<v-card v-for="pkgnames in settings.packagesInstalled" v-bind:key="pkgnames.key">
609+
<h4 class="text-xs-left"> {{ $t('message.settings_music_packages_installed') }}</h4>
610+
</v-card-title>
611+
<v-card-text v-for="pkgnames in settings.packagesInstalled" v-bind:key="pkgnames.key">
593612
<div class="cardContent">
594-
<li> nome: <b>{{pkgnames[0][0]}}</b> {{ $t('message.settings_music_packages_type') }} <b>{{pkgnames[1]}} </b><span
613+
<b>{{pkgnames[0][0]}}</b> {{ $t('message.settings_music_packages_type') }} <b>{{pkgnames[1]}} </b><span
595614
style="display: flex; justify-content: flex-end">
596615
<v-btn @click="deletePkg(pkgnames[0][1])" color="red" dark>
597616
<v-icon icon="mdi-delete"></v-icon> {{ $t('message.settings_music_packages_remove') }}
598617
</v-btn>
599618
</span>
600-
</li>
601619
</div>
620+
</v-card-text>
602621
</v-card>
603622
<br>
604623
<h3 class="text-xs-left"> {{ $t('message.settings_music_packages_add') }} </h3>
605624
<v-card>
625+
<v-card-title>
626+
<h3 class="text-xs-left"> {{ $t('message.settings_music_packages_add') }} </h3>
627+
</v-card-title>
606628
<div class="cardContent">
607629
<template v-if="updateStatus==1">
608630
<b>{{ $t('message.settings_music_package_installed') }}</b>
@@ -958,7 +980,7 @@ export default {
958980
formdata: null,
959981
files: null,
960982
status: null,
961-
dialog: false,
983+
dialog_reset: false,
962984
dialog_logs: false,
963985
lastCommit: process.env.lastCommit,
964986
CB: process.env.CB_ENDPOINT + process.env.APIv2,

‎src/i18n/locales/it/messages.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"settings_network_mode_client": "Connetti ad una rete WiFi già esistente (client)",
201201
"settings_network_mode_ap": "Lascia che CoderBot configuri la propria rete WiFi locale (ad-hoc)",
202202
"settings_network_ssid": "Nome rete WiFi (SSID)",
203-
"settings_network_password": "Passowrd rete WiFi",
203+
"settings_network_password": "Password rete WiFi",
204204
"settings_network_save_title": "Attenzione!",
205205
"settings_network_save_text_1": "Questa operazione cambierà la configurazione di CoderBot che sarà poi riavviato.",
206206
"settings_component_test_title": "Test componenti",
@@ -270,7 +270,7 @@
270270
"settings_admin_password_verify_title": "Accesso riservato",
271271
"settings_admin_password_verify": "Inserire la password di amministrazione.",
272272
"settings_admin_password_title": "Password di amministrazione.",
273-
"settings_admin_password": "passoword",
273+
"settings_admin_password": "password",
274274
"validation_integer": "Inserire un numero intero (1234)",
275275
"validation_decimal": "Inserire un numero decimale (12.34)",
276276
"validation_integer_positive": "Inserire un numero intero maggiore o uguale a 0",

0 commit comments

Comments
 (0)