studycloud · aryarm · May 4, 2018 · Apr 18, 2017 · Apr 18, 2017 · Apr 18, 2017
diff --git a/app/Helpers/NodesAndConnections.php b/app/Helpers/NodesAndConnections.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Helpers;
+
+/**
+ * A class for converting data with relationships to the nodes/connections format.
+ */
+class NodesAndConnections
+{
+	/**
+	 * convert data to the nodes/connections format
+	 * Note: your nodes must have a pivot attribute
+	 * @param  array $old_nodes the data that needs to be converted
+	 * @return Illuminate\Database\Eloquent\Collection        the reformated data as a collection with keys "node" and "connections"
+	 */
+	public static function convertTo($old_nodes)
+	{
+		$nodes = collect();
+		$connections = collect();
+
+		foreach ($old_nodes as $node) {
+			// check whether the node has been added already before adding it
+			if (!$nodes->pluck('id')->contains($node['id']))
+			{
+				// add the node without its pivot
+				$nodes->push($node->except(['pivot']));
+			}
+			// add any connections the node may have
+			if (!is_null($node['pivot']))
+			{
+				$connections->push(collect($node['pivot']));
+			}
+		}
+
+		return collect(["nodes" => $nodes, "connections" => $connections]);
+	}
+}
diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php
@@ -43,7 +43,7 @@ public function index()
      */
     public function create()
     {
-        //
+
     }
 
     /**
@@ -56,7 +56,7 @@ public function store(Request $request)
     {
         $newResource = new Resource;
         $newResource->name = $request->name;
-        $newResource->author_id = $request->author_id;
+        $newResource->author_id = Auth::id();
         $newResource->use_id = $request->use_id;
 
         $newResource->save();
@@ -69,8 +69,10 @@ public function store(Request $request)
      * @return \Illuminate\Http\Response
      */
     public function show(Resource $resource)
-    {
-        return view('resource', ['resource' : $resource->name]    )
+    {	
+
+    	return view('resource', ['resource' => $resource]    );
+
     }
 
     /**
@@ -95,10 +97,27 @@ public function update(Request $request, Resource $resource)
     {
         //Request must have information about name, author_id, and use_id.
         $resource->name = $request->name;
-        $resource->author_id = $request->author_id;
+        $resource->author_id = Auth::id();
         $resource->use_id = $request->use_id;
+
+        $resource->save();
+    }
+
+    /**
+     *Moves the resource under a specific named topic
+     * 
+     * @param \App\Resource $resource
+     * @param \App\Topic $topic
+     * @return \Illuminate\Http\Response
+     *
+     *  
+     */
+    public function move(Resource $resource, Topic $topic)
+    {
+
     }
 
+
     /**
      * Remove the specified resource from storage.
      *
@@ -107,8 +126,8 @@ public function update(Request $request, Resource $resource)
      */
     public function destroy(Resource $resource)
     {
-        $deletedResource = $resource->id;
-        $deletedResource->delete();
+
+        $resource->delete();
 
     }
 }
diff --git a/app/Http/Controllers/TopicController.php b/app/Http/Controllers/TopicController.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Topic;
+use Illuminate\Http\Request;
+
+class TopicController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $newTopic = new Topic;
+        $newTopic->name = $request->name;
+        $newTopic->author_id = Auth::id();
+
+        $newTopic->save();
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Topic  $topic
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Topic $topic)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Topic  $topic
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Topic $topic)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Topic  $topic
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Topic $topic)
+    {
+        $topic->name = $request->name;
+        $topic->author_id = Auth::id();
+
+        $topic->save();
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Topic  $topic
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Topic $topic)
+    {
+        $topic->delete();
+    }
+
+}