add profile, messages, and connectionStatus shared state

diff --git a/src/render/App.vue b/src/render/App.vue
index 7337147409ff92ed34094033de6d9cdcaaf1d219..ba56bac5ed0cbeefd59d96eeeeb2e73df57a66e8 100644 (file)
--- a/src/render/App.vue
+++ b/src/render/App.vue
@@ -29,7 +29,7 @@ import Messenger from "@/render/components/messenger.vue";
 import Login from "@/render/components/login.vue";
 import Header from "@/render/components/header.vue";
 
-import { profile, authComplete } from "@/render/composables/useProfile";
+import { profile, authComplete } from "@/render/shared/profile";
 import { postAppMount } from "@/render/ipc";
 
 export default defineComponent({

diff --git a/src/render/components/login.vue b/src/render/components/login.vue
index bece6eaf8cec0dddc0c73dc7023a96819be33b75..1de47cac4f7b0312ce8c8a62522482fe2483cd9a 100644 (file)
--- a/src/render/components/login.vue
+++ b/src/render/components/login.vue
@@ -35,7 +35,7 @@
 <script lang="ts">
 
 import { defineComponent, ref } from "vue";
-import { setProfile } from '@/render/composables/useProfile';
+import { setProfile } from '@/render/shared/profile';
 import { invokeLogin } from "@/render/ipc";
 
 export default defineComponent({

diff --git a/src/render/components/messenger.vue b/src/render/components/messenger.vue
index ee565491d723ca0b8e9c2472e502a742351491b3..8a7f6adec5b71e71cddf5c93b7c4609745b40433 100644 (file)
--- a/src/render/components/messenger.vue
+++ b/src/render/components/messenger.vue
@@ -24,8 +24,8 @@ import InputItem from "@/render/components/inputItem.vue";
 import Settings from "@/render/components/settings.vue";
 import Bubble from "@/render/components/bubble.vue";
 
-import { profile } from "@/render/composables/useProfile";
-import { messages } from "@/render/composables/useMessages";
+import { profile } from "@/render/shared/profile";
+import { messages } from "@/render/shared/messages";
 
 export default defineComponent({
   name: "Messenger",

diff --git a/src/render/components/settings.vue b/src/render/components/settings.vue
index cf881c33441ad5485442e30cd718067fd0ea79d9..b0025bd08aa838642c131f7f94a4b30bc2f44a4b 100644 (file)
--- a/src/render/components/settings.vue
+++ b/src/render/components/settings.vue
@@ -28,7 +28,7 @@
 <script lang="ts">
 
   import { defineComponent, ref } from "vue";
-  import { clearProfile } from "@/render/composables/useProfile"
+  import { clearProfile } from "@/render/shared/profile"
   import { invokeLogout } from "@/render/ipc";
 
   export default defineComponent({

diff --git a/src/render/listeners.ts b/src/render/listeners.ts
index 876d206db7bb99600fcdbbbada268a527cabeed9..0a0520857e2eb46b11adb114f956dbc32bd5a721 100644 (file)
--- a/src/render/listeners.ts
+++ b/src/render/listeners.ts
@@ -1,7 +1,11 @@
 
 import { IpcRendererListener } from "./composables/useIpcRend"
-import { setProfile } from "./composables/useProfile";
-import { setMessages, addMessage, updateMessage } from "./composables/useMessages";
+/*
+ * Shared state imports
+ * */
+import { setProfile } from "./shared/profile";
+import { setMessages, addMessage, updateMessage } from "./shared/messages";
+import { setConnectionStatus } from "./shared/connectionStatus";
 
 const SET_PROFILE_CHANNEL = "set-profile";
 
@@ -30,3 +34,8 @@ export const updateMessagesListener = new IpcRendererListener({
     listenerCallback: updateMessage
 });
 
+export const connectionStatusListener = new IpcRendererListener({
+    channel: UPDATE_MESSAGE_CHANNEL,
+    listenerCallback: setConnectionStatus
+});
+

diff --git a/src/render/shared/connectionStatus.ts b/src/render/shared/connectionStatus.ts
new file mode 100644 (file)
index 0000000..8e675dd
--- /dev/null
+++ b/src/render/shared/connectionStatus.ts
@@ -0,0 +1,18 @@
+// shared
+import { ref } from "vue";
+
+export const isAlive = ref(false);
+export const loading = ref(true);
+
+export const setConnectionStatus: IpcListenerCallback<boolean | null> = (payload) => {
+    if (payload) {
+        isAlive.value = payload;
+    } else {
+        loading.value = true;
+    }
+
+};
+
+export default {
+    isAlive
+};

diff --git a/src/render/composables/useMessages.ts b/src/render/shared/messages.ts
similarity index 100%
rename from src/render/composables/useMessages.ts
rename to src/render/shared/messages.ts

diff --git a/src/render/composables/useProfile.ts b/src/render/shared/profile.ts
similarity index 100%
rename from src/render/composables/useProfile.ts
rename to src/render/shared/profile.ts

diff --git a/src/session.ts b/src/session.ts
index 15d0ed9f243a24bee2e0aba6335ff5e8fa5228cc..01a105c394d75c0f8b636b9382d6795680b19c15 100644 (file)
--- a/src/session.ts
+++ b/src/session.ts
@@ -45,23 +45,23 @@ const onMessageCallback = (payload: string) => {
     return
 
     /* on init, platform sends state, used to init canvas */
-    if (isInitMessage(message)) {
-        ipcEmit("init-messages", message)
-    }
+    // if (isInitMessage(message)) {
+    //     ipcEmit("init-messages", message)
+    // }
 
 
-    else if (isAddMessage(message)) {
-        ipcEmit("add-messages", message)
-    }
+    // else if (isAddMessage(message)) {
+    //     ipcEmit("add-messages", message)
+    // }
 
-    else {
-        ipcEmit("update-messages", message)
-    }
+    // else {
+    //     ipcEmit("update-messages", message)
+    // }
 
 }
 
 const onConnectionStatusCallback = (alive: boolean) => {
-    // console.log('[Session]: Connection Alive: ', alive);
+    console.log('[Session]: Connection Alive: ', alive);
     // ipcEmit('connection-state', alive);
 }