wip #92

Author: previ

src/components/Settings.vue

@@ -381,10 +381,9 @@
                     </div>
                     <div class="cardContent">
                       <v-radio-group v-model="settings.wifiMode" column
-                        @change="v$.settings.wifiMode.$touch"
                       >
-                        <v-radio v-bind:label="$t('message.settings_network_mode_ap')" value="ap"></v-radio>
-                        <v-radio v-bind:label="$t('message.settings_network_mode_client')" value="client"></v-radio>
+                        <v-radio v-bind:label="$t('message.settings_network_mode_ap')" value="ap" @change="v$.settings.wifiMode.$touch"></v-radio>
+                        <v-radio v-bind:label="$t('message.settings_network_mode_client')" value="client" @change="v$.settings.wifiMode.$touch"></v-radio>
                       </v-radio-group>
                       <div v-if="settings.wifiMode=='client'">
                         <v-select 
@@ -436,22 +435,6 @@
                         </v-dialog>
                       </v-card-actions-->
                     </div>
-                    <template>
-                      <div class="text-center">
-                        <v-dialog
-                          v-model="wifi_overlay"
-                          persistent
-                        >
-                          <v-card>
-                            <v-card-text>
-                              <div class="text-center">
-                                {{ $t('message.settings_network_wait') }}
-                              </div>
-                            </v-card-text>
-                          </v-card>
-                        </v-dialog>
-                      </div>
-                    </template>
                   </v-card>
                 </v-col>
               </v-layout>
@@ -952,26 +935,26 @@ export default {
           this.v$.settings.$reset();
           console.log('set dirty false');
         });
+        console.log("wifi dirty state: ", this.v$.settings.wifiMode.$dirty || this.v$.settings.wifiSSID.$dirty || this.v$.settings.wifiPsw.$dirty);
         if (this.v$.settings.wifiMode.$dirty || this.v$.settings.wifiSSID.$dirty || this.v$.settings.wifiPsw.$dirty) {
           if(this.settings.wifiMode=="client") {
             const network = this.networks.find(item => { return item.ssid==this.settings.wifiSSID });
             if(network != null) {
-              this.wifi_overlay = true;
+              console.log("connecting");
               this.$wifi_connect.connect(network.ssid, network.conn_type, this.settings.wifiUser, this.settings.wifiPsw)
                 .then((result) => {
+                  console.log("connected: ", result.data);
                   this.snackText = this.$i18n.t('message.settings_network_updated');
                   this.snackbar = true;
-                  this.wifi_overlay = false;
                 })
                 .catch((error) => {
                   console.error(error);
-                  this.wifi_overlay = false;
                 });
             }
           } else {
-            console.log("disconnecting")
+            console.log("disconnecting");
             this.$wifi_connect.disconnect().then((result) => {
-              console.log(result);
+              console.log("disconnected: ", result.data);
             });
           }
         }
@@ -1106,7 +1089,6 @@ export default {
       networks: [],
       wifi_status: null,
       wifi_pwd_show: false,
-      wifi_overlay: false,
       programList: [],
     };
   },