From 7283e3f6f97dc950f2130c6f65191058ccbc00a1 Mon Sep 17 00:00:00 2001
From: Andrew Gundersen <gundersena@xavier.edu>
Date: Wed, 30 Jun 2021 08:06:11 -0500
Subject: [PATCH] merge changes

---
 src/render/components/bubble.vue | 28 ----------------------------
 src/render/shared/messages.ts    | 20 ++++++--------------
 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/src/render/components/bubble.vue b/src/render/components/bubble.vue
index fe71f94..f664310 100644
--- 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 71871a3..acf24e4 100644
--- 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
+};
-- 
2.43.0