voting comments feature

casparwylie · 69a1503cb2dcaf304a7614fc55a3e7936834d321 · casparwylie committed May 3, 2017 · May 3, 2017 · 69a1503
1 parent c740448
commit 69a1503cb2dcaf304a7614fc55a3e7936834d321
diff --git a/Astral.xcodeproj/project.pbxproj b/Astral.xcodeproj/project.pbxproj
diff --git a/Strands/.DS_Store → Astral/.DS_Store b/Strands/.DS_Store → Astral/.DS_Store
diff --git a/Strands/AppDelegate.swift → Astral/AppDelegate.swift b/Strands/AppDelegate.swift → Astral/AppDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/Strands/Base.lproj/LaunchScreen.storyboard → Astral/Base.lproj/LaunchScreen.storyboard b/Strands/Base.lproj/LaunchScreen.storyboard → Astral/Base.lproj/LaunchScreen.storyboard
diff --git a/Strands/Base.lproj/Main.storyboard → Astral/Base.lproj/Main.storyboard b/Strands/Base.lproj/Main.storyboard → Astral/Base.lproj/Main.storyboard
diff --git a/Strands/Info.plist → Astral/Info.plist b/Strands/Info.plist → Astral/Info.plist
diff --git a/Strands/ViewController.swift → Astral/ViewController.swift b/Strands/ViewController.swift → Astral/ViewController.swift
diff --git a/Network.swift b/Network.swift
@@ -28,6 +28,7 @@ import SwiftyJSON
     @objc optional func focalCommentsResponse(_ responseStr: String);
     @objc optional func postedCommentResponse(_ responseStr: String);
     @objc optional func updatedUserDataResponse(_ responseStr: String);
+    @objc optional func votedCommentResponse(_ responseStr: String);
     
 }
 
@@ -86,6 +87,8 @@ class NetworkSocketHandler{
                     self.networkResponseDelegate?.postedCommentResponse!(responseString);
                 case "updatedUserData":
                     self.networkResponseDelegate?.updatedUserDataResponse!(responseString);
+                case "votedComment":
+                    self.networkResponseDelegate?.votedCommentResponse!(responseString);
                 default:
                     print("failed");
 
@@ -165,4 +168,9 @@ class NetworkRequestHandler{
         
     }
     
+    func newVoteComment(_ socket: WebSocket, vote: Int, cID: Int, uID: Int){
+        let organisedRelevantData = ["commentID": String(cID), "userID": String(uID), "vote": String(vote)];
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "newVoteCommentRequest", relevantData: organisedRelevantData);
+    }
+    
 }
diff --git a/Scene.swift b/Scene.swift
@@ -135,13 +135,13 @@ class Scene{
             //initiate focals
             if(tempFocal == false){
                 let focal = DAEtoSCNNodeWithText("focalpost.dae", focalDisplayInfo: focalDisplayInfo);
-                focal.name = "s_" + String(renderID);
+                focal.name = "f_" + String(renderID);
                 focal.position = SCNVector3(x: Float(focalCoord.x), y: 0, z:  Float(focalCoord.y));
                 focals.append(focal);
                 self.scene.rootNode.addChildNode(focals.last!);
             }else{
                 tempFocalNode = DAEtoSCNNodeWithText("focalpost.dae", focalDisplayInfo: focalDisplayInfo);
-                tempFocalNode.name = "s_" + String(renderID);
+                tempFocalNode.name = "f_" + String(renderID);
                 tempFocalNode.position = SCNVector3(x: Float(focalCoord.x), y: 0, z:  Float(focalCoord.y));
                 self.scene.rootNode.addChildNode(tempFocalNode);
             }
diff --git a/Strands.xcworkspace/contents.xcworkspacedata b/Strands.xcworkspace/contents.xcworkspacedata
diff --git a/Strands.xcworkspace/xcshareddata/Strands.xcscmblueprint b/Strands.xcworkspace/xcshareddata/Strands.xcscmblueprint
@@ -10,7 +10,7 @@
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "218D7884-8F4E-419F-B5E6-D3EEB123C3A7",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D" : "..\/startest\/Starscream",
-    "E21098224036A3BEF7D8C72B51F8239D224C53F3" : "Strands\/"
+    "E21098224036A3BEF7D8C72B51F8239D224C53F3" : "Astral\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Strands",
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,
diff --git a/Strands.xcworkspace/xcuserdata/casparwylie.xcuserdatad/UserInterfaceState.xcuserstate b/Strands.xcworkspace/xcuserdata/casparwylie.xcuserdatad/UserInterfaceState.xcuserstate