merge changes

diff --git a/src/render/components/bubble.vue b/src/render/components/bubble.vue
index fe71f9486af5e5366a3239163dfef6ad0a444864..f664310e701d6b20fff5e2670a09c0a4747dd81b 100644 (file)
--- a/src/render/components/bubble.vue
+++ b/src/render/components/bubble.vue
@@ -13,10 +13,6 @@
 
   props: ["modifier", "content", "child"],
 
-  setup() {
-
-  }
-
  })
 
 </script>
@@ -74,28 +70,4 @@
   border-top-right-radius: 9px;
 }
 
-// .notify {
-//   position: absolute;
-//   width: 12px;
-//   height: 12px;
-//   border-radius: 50%;
-//   background-color: #58D9FF;
-//   top: -5px;
-//   left: -5px;
-//   border: 2px solid #EBEBEB;
-//   transform: scale(0);
-
-//   animation-name: notify-anim;
-//   animation-duration: 5s;
-// }
-
-// @keyframes notify-anim {
-//   0%, 90% {
-//     transform: scale(1);
-//   }
-//   100% {
-//     transform: scale(0);
-//   }
-// }
-
 </style>
\ No newline at end of file

diff --git a/src/render/shared/messages.ts b/src/render/shared/messages.ts
index 71871a3dcfb26ecc50de40ff060e2914b0cf0787..acf24e45da63efa47a59711988ea93a9cc5c82fb 100644 (file)
--- a/src/render/shared/messages.ts
+++ b/src/render/shared/messages.ts
@@ -56,17 +56,9 @@ export const deleteMessage: IpcListenerCallback<string> = (payload) => {
 
 }
 
-
-// setTimeout(() => {
-
-//     console.log("updating message");
-
-//     updateMessage({
-//         content: ["show contacts", "msg"],
-//         context: "show contacts",
-//         uid: "ee2819a3-1125-4881-9942-ca5b3d0ad502"
-//     });
-
-
-
-// }, 2000);
+export default {
+    messages,
+    setMessages,
+    addMessage,
+    updateMessage
+};