Worked on task list. -Joe

Author: jsalzano92

app/Http/Controllers/CommentController.php

@@ -10,9 +10,15 @@ public function createComment(request $request)
 	{
 		$comment = new Comment();
 		$comment->data = $request['data'];
-		$comment->post_id = $request->id;
-		$comment->user_id = $request->user()->id;
+		$comment->post_id = $request['post_id'];
+		$comment->user_id = $request['user_id'];
 		$comment->save();
-		return redirect('/news_post/'.$request->id);
+		
+		return array('success' => 'true');
+	}
+	
+	public function deleteComment(request $request) {
+		Comment::Find($request['id'])->delete();
+		return array('success' => 'true');
 	}
 }

app/Http/Controllers/PostController.php

@@ -2,6 +2,7 @@
 namespace SoftwareHerd\Http\Controllers;
 
 use SoftwareHerd\Post;
+use SoftwareHerd\Project;
 use Illuminate\Http\Request;
 
 class PostController extends Controller
@@ -14,11 +15,33 @@ public function createPost(request $request)
 		$post->info = $request['info'];
 		$post->posting_project = $request['project_id'];
 		$post->save();
-		return redirect('/project/'.$request['project_id']);
+		return redirect('/news_post/'.$post->id);
 	}
 
 	public function post($id) {
 		$post = Post::find($id);
-		return view('news_post', array('post' => $post));
+		$project = Project::find($post->posting_project);
+		return view('news_post', array('post' => $post, 'project' => $project));
+	}
+	
+	public function getPostForEdit(request $request) {
+		$post = Post::find($request['id']);
+		return array('title' => $post->title, 'summary' => $post->summary, 'info' => $post->info);
+	}
+
+	public function updatePost(request $request)
+	{
+		$post = Post::find($request['post_id']);
+		$post->title = $request['title'];
+		$post->summary = $request['summary'];
+		$post->info = $request['info'];
+		$post->save();
+		
+		return redirect('/news_post/'.$request['post_id']);
+	}
+	
+	public function deletePost(request $request) {
+		Post::Find($request['id'])->delete();
+		return array('success' => 'true');
 	}
 }

app/Http/Controllers/ProjectController.php

@@ -2,6 +2,7 @@
 namespace SoftwareHerd\Http\Controllers;
 
 use SoftwareHerd\Project;
+use SoftwareHerd\User;
 use SoftwareHerd\User_Projects;
 use SoftwareHerd\User_Project_Requests;
 use Illuminate\Http\Request;
@@ -58,34 +59,44 @@ public function admin($id) {
 		$project = Project::find($id);
 		if(!\Auth::user()->can('admin', $project))
 			return redirect('/project_library');
-		return view('project_admin', array('project' => $project));
+		$users = User_Projects::get()->where('project_id', $id);
+		$user_requests = User_Project_Requests::get()->where('project_id', $id);
+		return view('project_admin/admin', array('project' => $project, 'users' => $users, 'user_requests' => $user_requests));
 	}
 
 	public function promote(request $request) {
 		$level = \DB::table('user_projects')->where('user_id', $request['user'])->where('project_id', $request['project'])->value('level');
+		
+		if($level > 2)
+			return;
+		
 		$level = $level + 1;
 		\DB::table('user_projects')->where('user_id', $request['user'])
 				->where('project_id', $request['project'])
 				->update(['level' => $level]);
 
-		return redirect('/project_admin/'.$request['project']);
+		return array('success'=>'true');
 	}
 	public function demote(request $request) {
 		$level = \DB::table('user_projects')->where('user_id', $request['user'])->where('project_id', $request['project'])->value('level');
+		
+		if($level < 1)
+			return;
+		
 		$level = $level - 1;
 		\DB::table('user_projects')->where('user_id', $request['user'])
 				->where('project_id', $request['project'])
 				->update(['level' => $level]);
 
-		return redirect('/project_admin/'.$request['project']);
+		return array('success'=>'true');
 	}
 
 	public function removeMember(request $request) {
 		\DB::table('user_projects')->where('user_id', $request['user'])
 				->where('project_id', $request['project'])
 				->delete();
 
-		return redirect('/project_admin/'.$request['project']);
+		return array('success'=>'true');
 	}
 
 	public function acceptMember(request $request) {
@@ -102,12 +113,18 @@ public function acceptMember(request $request) {
 
 		\DB::table('user_project_requests')->where('user_id', $request['user'])
 				->where('project_id', $request['project'])->delete();
-		return redirect('/project_admin/'.$request['project']);
+		return array('success'=>'true');
 	}
 
 	public function declineMember(request $request) {
 		\DB::table('user_project_requests')->where('user_id', $request['user'])
 				->where('project_id', $request['project'])->delete();
-		return redirect('/project_admin/'.$request['project']);
+		return array('success'=>'true');
+	}
+	
+	public function deleteProject(request $request) {
+		$project = Project::find($request['id']);
+		$project->delete();
+		return array('success'=>'true');
 	}
 }

app/Http/Kernel.php

@@ -52,5 +52,6 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \SoftwareHerd\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'admin' => \justAmerican\Http\Middleware\checkAdmin::class,
     ];
 }

app/Http/Middleware/checkAdmin.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace SoftwareHerd\Http\Middleware;
+
+use Closure;
+
+class checkAdmin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if(!\Auth::user())
+            return redirect('/home');
+        if(!(\Auth::user()->isSuperAdmin())){
+            return redirect('/home');
+        }
+        return $next($request);
+    }
+}

app/Policies/CommentPolicy.php

@@ -10,27 +10,8 @@ class CommentPolicy
 {
     use HandlesAuthorization;
 
-    /**
-     * Determine whether the user can update the comment.
-     *
-     * @param  \SoftwareHerd\User  $user
-     * @param  \SoftwareHerd\Comment  $comment
-     * @return mixed
-     */
-    public function update(User $user, Comment $comment)
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can delete the comment.
-     *
-     * @param  \SoftwareHerd\User  $user
-     * @param  \SoftwareHerd\Comment  $comment
-     * @return mixed
-     */
     public function delete(User $user, Comment $comment)
     {
-        //
+        return $user->id === $comment->user_id;
     }
-}
+}

app/Policies/ProjectPolicy.php

@@ -9,7 +9,14 @@
 class ProjectPolicy
 {
     use HandlesAuthorization;
-
+    
+    public function before($user, $ability)
+    {
+        if ($user->isSuperAdmin()) {
+            return true;
+        }
+    }
+    
     public function member(User $user, Project $project)
     {
         $user_projects = \DB::table('user_projects')->where('project_id', $project->id)->where('user_id', $user->id)->first();

app/User.php

@@ -18,6 +18,11 @@ public function comments()
     {
         return $this->hasMany('SoftwareHerd\Comment');
     }
+    
+    public function isSuperAdmin()
+    {
+        return $this->admin;
+    }
 
     /**
      * The attributes that are mass assignable.

database/migrations/2017_01_12_061354_add_admin_to_users.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAdminToUsers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('admin')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('admin');
+        });
+    }
+}

public/css/admin.css

@@ -0,0 +1,48 @@
+a{
+    cursor: pointer;
+}
+
+a:hover{
+    text-decoration: none;
+}
+
+#adminButtons a{
+    border-top-left-radius: 10px;
+    border-bottom-left-radius: 10px;
+    text-align: right;
+    padding:5px;
+    color: #777;
+    display: block;
+    height: 30px;
+	cursor: pointer;
+}
+
+#adminButtons a:hover{
+    color: #000;
+    text-decoration: none;
+}
+
+.active{
+    border: 1px #EEE;
+    background-color: #F5F5F5;
+    padding: 0;
+    color: #000 !important;
+}
+
+#adminContent{
+    min-height: 400px;
+    padding: 5px;
+    border: solid 1px #EEE;
+    color: #000;
+}
+
+.table-fixed{
+    table-layout:fixed;
+}
+
+.table-fixed .no-overflow{
+    word-break:break-all;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}