btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
Rahul
2020-03-12 00:00:56 +05:30
parent 49bb77c098
commit 7d465ca489
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en-US.js
View File

@@ -276,6 +276,7 @@ export default {
notes: "Notes", notes: "Notes",
socketio: "Socket.IO", socketio: "Socket.IO",
event_name: "Event Name", event_name: "Event Name",
mqtt: "MQTT",
mqtt_topic: "Topic", mqtt_topic: "Topic",
mqtt_topic_title: "Publish / Subscribe topic", mqtt_topic_title: "Publish / Subscribe topic",
mqtt_publish: "Publish", mqtt_publish: "Publish",

21
pages/realtime.vue
View File

@@ -27,7 +27,9 @@
> >
{{ !connectionState ? $t("connect") : $t("disconnect") }} {{ !connectionState ? $t("connect") : $t("disconnect") }}
<span> <span>
<i class="material-icons">{{ !connectionState ? "sync" : "sync_disabled" }}</i> <i class="material-icons">{{
!connectionState ? "sync" : "sync_disabled"
}}</i>
</span> </span>
</button> </button>
</li> </li>
@@ -92,7 +94,9 @@
> >
{{ !connectionSSEState ? $t("start") : $t("stop") }} {{ !connectionSSEState ? $t("start") : $t("stop") }}
<span> <span>
<i class="material-icons">{{ !connectionSSEState ? "sync" : "sync_disabled" }}</i> <i class="material-icons">{{
!connectionSSEState ? "sync" : "sync_disabled"
}}</i>
</span> </span>
</button> </button>
</li> </li>
@@ -113,17 +117,10 @@
<tab :id="'socketio'" :label="$t('socketio')"> <tab :id="'socketio'" :label="$t('socketio')">
<socketio /> <socketio />
</tab> </tab>
<tab :id="'mqtt'" :label="$t('mqtt')">
<mqtt />
</tab>
</tabs> </tabs>
<input id="tab-three" type="radio" name="options" />
<label for="tab-three">{{ $t("socketio") }}</label>
<div class="tab">
<socketio />
</div>
<input id="tab-four" type="radio" name="options" />
<label for="tab-four">{{ $t("mqtt") }}</label>
<div class="tab">
<mqtt />
</div>
</section> </section>
</div> </div>
</template> </template>