From cbbe6d7f9f2baaf12d58e27b81bfd82eb9e82c43 Mon Sep 17 00:00:00 2001
From: RakhithaRR <rakhitharr@live.com>
Date: Sat, 10 Mar 2018 14:08:13 +0530
Subject: [PATCH] Further improvements on sockets.

---
 .idea/workspace.xml                           | 67 ++++++++++---------
 .../src/components/Projects/ViewProjects.vue  | 34 ++++++----
 Server/app.js                                 | 22 +++---
 3 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b64e3e0..075cb9d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="914f09dc-6ab9-43ad-8130-e2041972fb27" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/package.json" afterPath="$PROJECT_DIR$/Client/package.json" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/components/Projects/ViewProjects.vue" afterPath="$PROJECT_DIR$/Client/src/components/Projects/ViewProjects.vue" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/app.js" afterPath="$PROJECT_DIR$/Server/app.js" />
     </list>
@@ -22,7 +21,7 @@
       <file leaf-file-name="project.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Server/routes/project.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1278">
+            <state relative-caret-position="254">
               <caret line="71" column="0" lean-forward="false" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
               <folding />
             </state>
@@ -32,7 +31,7 @@
       <file leaf-file-name="user.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Server/routes/user.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1782">
+            <state relative-caret-position="324">
               <caret line="99" column="7" lean-forward="false" selection-start-line="99" selection-start-column="7" selection-end-line="99" selection-end-column="7" />
               <folding />
             </state>
@@ -42,11 +41,11 @@
       <file leaf-file-name="ViewProjects.vue" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Client/src/components/Projects/ViewProjects.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="318" column="48" lean-forward="false" selection-start-line="318" selection-start-column="48" selection-end-line="318" selection-end-column="48" />
+            <state relative-caret-position="-1438">
+              <caret line="197" column="39" lean-forward="false" selection-start-line="197" selection-start-column="39" selection-end-line="197" selection-end-column="39" />
               <folding>
                 <element signature="n#style#0;n#v-container#0;n#div#1;n#v-flex#0;n#v-content#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="e#6040#6066#0" expanded="true" />
+                <element signature="e#6073#6099#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -55,8 +54,8 @@
       <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Server/app.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="488">
-              <caret line="28" column="7" lean-forward="false" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
+            <state relative-caret-position="166">
+              <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
               <folding />
             </state>
           </provider>
@@ -303,14 +302,7 @@
       <workItem from="1520490148122" duration="6113000" />
       <workItem from="1520504805160" duration="2351000" />
       <workItem from="1520577269941" duration="8664000" />
-      <workItem from="1520656284367" duration="4075000" />
-    </task>
-    <task id="LOCAL-00005" summary="Added home page.">
-      <created>1517661350342</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1517661350343</updated>
+      <workItem from="1520656284367" duration="10822000" />
     </task>
     <task id="LOCAL-00006" summary="Started working on Register page.">
       <created>1517665055691</created>
@@ -648,11 +640,18 @@
       <option name="project" value="LOCAL" />
       <updated>1520582144942</updated>
     </task>
-    <option name="localTasksCounter" value="54" />
+    <task id="LOCAL-00054" summary="Initialized Socket.IO">
+      <created>1520661615363</created>
+      <option name="number" value="00054" />
+      <option name="presentableId" value="LOCAL-00054" />
+      <option name="project" value="LOCAL" />
+      <updated>1520661615363</updated>
+    </task>
+    <option name="localTasksCounter" value="55" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="303065000" />
+    <option name="totallyTimeSpent" value="309812000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -665,6 +664,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1098" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21205711" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297414" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -672,7 +672,7 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297414" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21982759" sideWeight="0.49814913" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23706897" sideWeight="0.49814913" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -738,7 +738,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Started on search projects." />
     <MESSAGE value="Searching projects." />
     <MESSAGE value="Searching project updates." />
     <MESSAGE value="Done with search." />
@@ -763,7 +762,8 @@
     <MESSAGE value="Trying on socket.io" />
     <MESSAGE value="Added viewing projects on profile." />
     <MESSAGE value="Done with My Projects." />
-    <option name="LAST_COMMIT_MESSAGE" value="Done with My Projects." />
+    <MESSAGE value="Initialized Socket.IO" />
+    <option name="LAST_COMMIT_MESSAGE" value="Initialized Socket.IO" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1061,44 +1061,45 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/routes/project.js">
+    <entry file="file://$PROJECT_DIR$/Client/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1278">
-          <caret line="71" column="0" lean-forward="false" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
+        <state relative-caret-position="252">
+          <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Server/routes/user.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1782">
+        <state relative-caret-position="324">
           <caret line="99" column="7" lean-forward="false" selection-start-line="99" selection-start-column="7" selection-end-line="99" selection-end-column="7" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/package.json">
+    <entry file="file://$PROJECT_DIR$/Server/routes/project.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
+        <state relative-caret-position="254">
+          <caret line="71" column="0" lean-forward="false" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Server/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="488">
-          <caret line="28" column="7" lean-forward="false" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
+        <state relative-caret-position="166">
+          <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/components/Projects/ViewProjects.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="318" column="48" lean-forward="false" selection-start-line="318" selection-start-column="48" selection-end-line="318" selection-end-column="48" />
+        <state relative-caret-position="-1438">
+          <caret line="197" column="39" lean-forward="false" selection-start-line="197" selection-start-column="39" selection-end-line="197" selection-end-column="39" />
           <folding>
             <element signature="n#style#0;n#v-container#0;n#div#1;n#v-flex#0;n#v-content#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="e#6040#6066#0" expanded="true" />
+            <element signature="e#6073#6099#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/Client/src/components/Projects/ViewProjects.vue b/Client/src/components/Projects/ViewProjects.vue
index f14ea3b..64d0a76 100644
--- a/Client/src/components/Projects/ViewProjects.vue
+++ b/Client/src/components/Projects/ViewProjects.vue
@@ -169,16 +169,15 @@
             <v-list two-line>
               <template v-for="(item, index) in messages">
                 <v-list-tile
-                  @click="toggle(index)"
-                  :key="item.title"
+                  :key="index"
                 >
                   <v-list-tile-content>
-                    <v-list-tile-title>{{ item.title }}</v-list-tile-title>
+                    <v-list-tile-title>{{ item.username }}</v-list-tile-title>
                     <v-list-tile-sub-title class="text--primary">{{ item.headline }}</v-list-tile-sub-title>
-                    <v-list-tile-sub-title>{{ item.subtitle }}</v-list-tile-sub-title>
+                    <v-list-tile-sub-title>{{ item.text }}</v-list-tile-sub-title>
                   </v-list-tile-content>
                   <v-list-tile-action>
-                    <v-list-tile-action-text>{{ item.action }}</v-list-tile-action-text>
+                    <v-list-tile-action-text>{{ }}</v-list-tile-action-text>
                   </v-list-tile-action>
                 </v-list-tile>
                 <v-divider v-if="index + 1 < messages.length" :key="index"></v-divider>
@@ -189,12 +188,15 @@
         <div class="layout row">
           <v-flex md11>
             <v-text-field
+              v-model="textMessage"
               label="Enter your message here"
             ></v-text-field>
           </v-flex>
           <v-flex md1>
             <div class="text-xs-right">
-              <v-btn>Send</v-btn>
+              <v-btn
+                @click="startConnection"
+              >Send</v-btn>
             </div>
           </v-flex>
         </div>
@@ -220,6 +222,7 @@
         date1: new Date(Date.now()).toISOString().slice(0, 10),
         events: [],
 
+        textMessage: '',
         messages: []
 
       }
@@ -307,22 +310,29 @@
             this.events.push(obj.deadline);
           }
         }
+      },
+
+      startConnection() {
+        const socket = io('http://localhost:3000');
+        socket.emit('my other event', {username: this.cUser.Username, text: this.textMessage});
+        socket.on('hello', (data) => {
+          console.log(data.messages[0]);
+          this.messages.push(data.messages[0]);
+        });
       }
 
     },
 
     mounted() {
       this.getProject();
-      const socket = io('http://localhost:3000');
-      socket.on('hello', (data) => {
-        console.log(data);
-        socket.emit('my other event', {my: 'data'})
-      });
+      this.startConnection();
 
 
     },
 
-    computed: {}
+    computed: {
+
+    }
   }
 
 </script>
diff --git a/Server/app.js b/Server/app.js
index c9d42ac..5b229c8 100644
--- a/Server/app.js
+++ b/Server/app.js
@@ -20,10 +20,14 @@ app.use(bodyParser.json());
 const io = socketIO(server);
 
 //socket.io connection
-io.on('connection',(socket)=>{
-    socket.emit('hello', {
-        greeting: 'Hello Rakhitha'
-    })
+io.on('connection', (socket) => {
+    var projRef = firebase.database.ref('/messages');
+    projRef.once("value", (snapshot) => {
+        socket.emit('hello', {
+            messages: snapshot.val()
+        })
+    });
+
     socket.on('my other event', function (data) {
         console.log(data);
     });
@@ -33,22 +37,22 @@ io.on('connection',(socket)=>{
 const users = require('./routes/user');
 const project = require('./routes/project');
 
-app.use('/users',users);
+app.use('/users', users);
 app.use('/project', project);
 
 
-app.get('/',(req,res) => {
+app.get('/', (req, res) => {
     res.send("Invalid Endpoint");
 });
 
 
 //firebase connection check
 var fireConnection = firebase.database.ref('.info/connected');
-fireConnection.on("value", (con) =>{
-    if(con.val() === true){
+fireConnection.on("value", (con) => {
+    if (con.val() === true) {
         console.log("Connected to Firebase...");
     }
-    else{
+    else {
         console.log("Not connected to Firebase!");
     }
 });