Skip to content

Commit 3e8a902

Browse files
Code refactor
1 parent b101fa4 commit 3e8a902

File tree

1 file changed

+50
-42
lines changed

1 file changed

+50
-42
lines changed

Client/src/App.vue

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,36 @@
55
<n-card>
66
<n-form :model="userModel" ref="userRef" :rules="userRules">
77
<n-form-item-row label="Peer" path="peer">
8-
<n-mention :options="peerOptions" default-value="@" v-model:value="userModel.peer" />
8+
<n-mention
9+
:options="peerOptions"
10+
default-value="@"
11+
v-model:value="userModel.peer"
12+
/>
913
</n-form-item-row>
1014
<n-form-item-row label="Router" path="router">
11-
<n-mention :options="routerOptions" default-value="@" v-model:value="userModel.router" />
15+
<n-mention
16+
:options="routerOptions"
17+
default-value="@"
18+
v-model:value="userModel.router"
19+
/>
1220
</n-form-item-row>
1321
<n-form-item-row label="Message">
14-
<n-input maxlength="30" show-count clearable v-model:value="userModel.message" />
22+
<n-input
23+
maxlength="30"
24+
show-count
25+
clearable
26+
v-model:value="userModel.message"
27+
/>
1528
</n-form-item-row>
1629
</n-form>
17-
<n-button type="primary" v-on:click="formSubmit()">Connect and Send</n-button>
30+
<n-button type="primary" v-on:click="formSubmit()"
31+
>Connect and Send</n-button
32+
>
1833
</n-card>
1934
</n-space>
2035

2136
<n-card title="Messaging">
22-
<n-log
23-
:rows="5"
24-
:log="userLog"
25-
/>
37+
<n-log :rows="5" :log="userLog" />
2638
</n-card>
2739
</div>
2840
</template>
@@ -49,36 +61,34 @@ import { ref } from "vue";
4961
import { useMessage } from "naive-ui";
5062
5163
const formModelRef = ref({
52-
peer: '@',
53-
router: '@',
54-
message: ''
55-
})
64+
peer: "@",
65+
router: "@",
66+
message: "",
67+
});
5668
5769
const userRules = {
58-
peer: {
59-
trigger: ['input', 'blur'],
60-
required: true,
61-
message: 'Peer is required',
62-
validator() {
63-
if(formModelRef.value.peer == "@") {
64-
return Error('Peer is required')
65-
}
66-
}
67-
},
68-
router: {
69-
router: ['input', 'blur'],
70-
required: true,
71-
message: 'Router is required',
72-
validator () {
73-
if (formModelRef.value.router == "@") {
74-
return Error('Only one router allowed')
75-
}
76-
}
77-
},
78-
message: {
79-
70+
peer: {
71+
trigger: ["input", "blur"],
72+
required: true,
73+
message: "Peer is required",
74+
validator() {
75+
if (formModelRef.value.peer == "@") {
76+
return Error("Peer is required");
77+
}
78+
},
79+
},
80+
router: {
81+
router: ["input", "blur"],
82+
required: true,
83+
message: "Router is required",
84+
validator() {
85+
if (formModelRef.value.router == "@") {
86+
return Error("Only one router allowed");
8087
}
81-
}
88+
},
89+
},
90+
message: {},
91+
};
8292
8393
export default {
8494
name: "App",
@@ -131,14 +141,12 @@ export default {
131141
};
132142
},
133143
methods: {
134-
formSubmit: function() {
144+
formSubmit: function () {
135145
const { peer, router, message } = formModelRef.value;
136-
if(peer.length == 1 || router.length == 1 || message.length < 1) return alert('Form not completed');
137-
console.log({ peer, router, message });
138-
this.userLog = `${(new Date().toTimeString().substring(0, 8))} Sending message '${message}' to peer ${peer} through router ${router}.\n` + this.userLog;
139-
}
140-
}
141-
};
146+
if (peer.length == 1 || router.length == 1 || message.length < 1)
147+
return alert("Form not completed");
148+
// console.log({ peer, router, message });
149+
142150
if (!this.hasFirstRouter) {
143151
this.getInformationFromSwitcher();
144152

0 commit comments

Comments
 (0)