diff --git a/src/components/channels/ChannelsList.vue b/src/components/channels/ChannelsList.vue index 5dd5057..f740b7c 100644 --- a/src/components/channels/ChannelsList.vue +++ b/src/components/channels/ChannelsList.vue @@ -2,10 +2,24 @@
-
+
+ +
+
+
+ + + + +
+
No Channels
+
Add an encrypted channel to send broadcast messages.
+
+
+
diff --git a/src/components/contacts/ContactsList.vue b/src/components/contacts/ContactsList.vue index 517e830..490df02 100644 --- a/src/components/contacts/ContactsList.vue +++ b/src/components/contacts/ContactsList.vue @@ -44,10 +44,23 @@
-
+
+ +
+
+
+ + + +
+
No Contacts
+
If someone Adverts, they will show up here.
+
+
+
@@ -58,10 +71,12 @@ import IconButton from "../IconButton.vue"; import DropDownMenu from "../DropDownMenu.vue"; import DropDownMenuItem from "../DropDownMenuItem.vue"; import ContactListItem from "./ContactListItem.vue"; +import ConnectButtons from "../connect/ConnectButtons.vue"; export default { name: 'ContactsList', components: { + ConnectButtons, ContactListItem, DropDownMenuItem, DropDownMenu, diff --git a/src/components/pages/MainPage.vue b/src/components/pages/MainPage.vue index 9bb1e89..c3ad9e5 100644 --- a/src/components/pages/MainPage.vue +++ b/src/components/pages/MainPage.vue @@ -5,7 +5,7 @@
-
+
Contacts
Channels
@@ -13,13 +13,13 @@
-
+
-
+
diff --git a/src/js/Connection.js b/src/js/Connection.js index 651e719..957f533 100644 --- a/src/js/Connection.js +++ b/src/js/Connection.js @@ -61,6 +61,7 @@ class Connection { // clear previous connection state GlobalState.selfInfo = null; GlobalState.contacts = []; + GlobalState.channels = []; GlobalState.batteryPercentage = null; // update connection and listen for events @@ -156,6 +157,7 @@ class Connection { // fetch data after database is ready await this.loadContacts(); + await this.loadChannels(); await this.syncMessages(); await this.updateBatteryPercentage(); @@ -178,6 +180,17 @@ class Connection { GlobalState.contacts = await GlobalState.connection.getContacts(); } + static async loadChannels() { + // todo fetch from device when implemented in firmware + GlobalState.channels = [ + { + idx: 0, + name: "Public Channel", + description: "This is the default public channel.", + }, + ]; + } + static async updateBatteryPercentage() { if(GlobalState.connection){ try { diff --git a/src/js/GlobalState.js b/src/js/GlobalState.js index b715c74..013ade5 100644 --- a/src/js/GlobalState.js +++ b/src/js/GlobalState.js @@ -8,13 +8,7 @@ const globalState = reactive({ batteryPercentage: null, batteryPercentageInterval: null, contacts: [], - channels: [ - { - idx: 0, - name: "Public Channel", - description: "This is the default public channel.", - }, - ], + channels: [], }); export default globalState;