Merge pull request #156 from mowolf/sebi-fix-sharing

Sebi fix sharing

.github/workflows/deployment.yml

@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
+
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
@@ -22,3 +24,4 @@ jobs:
           token: ${{ secrets.DEPLOY_KEY }}
           branch: gh-pages # The branch the action should deploy to.
           folder: dist # The folder the action should deploy.
+          clean-exclude: "CNAME"

.github/workflows/husky.yml

@@ -12,7 +12,7 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  lint-and-prettify:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 

components/FileHandler.vue

@@ -133,7 +133,7 @@ export default {
         .async("string");
     },
 
-    readMultipleFiles(files) {
+    readSharedFiles(files) {
       function findChatFile(files) {
         let chatRegex = new RegExp(/.*(?:chat|whatsapp).*\.txt$/i);
         return files.find((file) => {
@@ -200,14 +200,15 @@ export default {
         value: "0",
       });
     },
-    processFileList(fileList) {
+    processFileList(fileList, shared = false) {
       this.isDragging = false;
       this.processing = true;
       this.isSuccess = false;
       this.wrongFile = false;
-      if (fileList.length > 1) {
+
+      if (shared || fileList.length > 1) {
         //do multiple here
-        this.readMultipleFiles(fileList);
+        this.readSharedFiles(fileList);
       } else {
         let file = fileList[0];
         // do singles here
@@ -243,12 +244,12 @@ export default {
       this.processFileList(fileList);
     },
   },
-  mounted() {
+  created() {
     fetch("/chat_example.txt")
       .then((response) => response.text())
       .then(parseString)
       .then((messages) => {
-        messages = { messages: messages };
+        messages = { messages: messages, default: true };
         this.extendDataStructure(messages);
         return messages;
       })

components/charts/ExampleGraphs.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="chat_">
     <v-col v-if="$vuetify.breakpoint.smAndUp">
       <v-row>
         <v-col cols="12" sm="6">

components/charts/Results.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="text-center py-10">
+  <div v-if="chat" class="text-center py-10">
     <ChatVisualization :chat="chat" :attachments="attachments" />
     <div class="text-h2 font-weight-bold py-10">Chat Timeline</div>
     <div>Messages per Day</div>

nuxt.config.js

@@ -59,7 +59,7 @@ export default {
     },
     icon: {
       source: "/assets",
-      fileName: "whatsanalyze-logo-black.png",
+      fileName: "whatsanalyze-logo-green.png",
     },
   },
 

package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "NUXT_ENV_LOCAL=1 nuxt",
     "local": "NUXT_ENV_LOCAL=1 nuxt generate && NUXT_ENV_LOCAL=1 nuxt start",
-    "deploy": "nuxt generate && push-dir --dir=dist --branch=gh-pages --cleanup"
+    "deploy": "nuxt generate && push-dir --dir=dist --branch=gh-pages --cleanup",
+    "deploy-sebi": "nuxt generate && rm dist/CNAME && push-dir --remote=https://github.com/fellnerse/fellnerse.github.io.git --dir=dist --branch=gh-pages --cleanup"
   },
   "husky": {
     "hooks": {

pages/index.vue

@@ -86,16 +86,19 @@ export default {
   data() {
     return {
       isShowingChats: false,
-      chat_: new Chat(),
+      chat_: undefined,
       downloading: false,
       attachments: undefined,
     };
   },
   methods: {
     Chat,
     newMessages(chatObject) {
-      this.attachments = chatObject.attachments;
-      this.chat_ = new Chat(chatObject.messages);
+      // we only update with default chat object if chat_ is undefined
+      if (!chatObject.default || this.chat_ === undefined) {
+        this.attachments = chatObject.attachments;
+        this.chat_ = new Chat(chatObject.messages);
+      }
     },
     downloadImage() {
       this.downloading = true;
@@ -123,13 +126,11 @@ export default {
             workbox.addEventListener("message", (m) => {
               // eslint-disable-next-line no-prototype-builtins
               if (_this.$route.query.hasOwnProperty("receiving-file-share")) {
-                console.log(m.data.file); //contains the file(s)
                 console.log("index message wb", m);
-                console.log("current route", _this.$route);
                 let files = m.data.file;
                 // currently only the first file, but ultimately we want to pass all files
-                if (Array.isArray(files)) files = files[0];
-                _this.$refs.filehandler.processFile(files);
+                // if (Array.isArray(files)) files = files[0];
+                _this.$refs.filehandler.processFileList(files, true);
               }
             });
             workbox.messageSW("SHARE_READY");