add publish module

app/Http/Controllers/Settings/CategoryController.php

@@ -1,13 +1,12 @@
 <?php
 namespace App\Http\Controllers\Settings;
 
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use App\Project;
 use App\Http\Requests\ProjectRequest;
-use Illuminate\View\View;
+use App\Project;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
 
 class CategoryController extends Controller
 {
@@ -17,7 +16,7 @@ class CategoryController extends Controller
         $this->middleware('auth');
     }
 
-    public function index() : View
+    public function index(): View
     {
         $projects = Project::get();
         return view('settings.project.category', compact('projects'));
@@ -28,12 +27,12 @@ class CategoryController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function add() : View
+    public function add(): View
     {
         return view('settings.project.add');
     }
 
-    public function store(ProjectRequest $request) : RedirectResponse
+    public function store(ProjectRequest $request): RedirectResponse
     {
         $input = $request->all();
         Project::create($input);
@@ -47,7 +46,7 @@ class CategoryController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit($id) : View
+    public function edit($id): View
     {
         $project = Project::findOrFail($id);
         return view('settings.project.edit', compact('project'));
@@ -60,7 +59,7 @@ class CategoryController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update($id, ProjectRequest $request) : RedirectResponse
+    public function update($id, ProjectRequest $request): RedirectResponse
     {
         $project = Project::findOrFail($id);
         $input = $request->all();
@@ -75,16 +74,16 @@ class CategoryController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function delete($id) : RedirectResponse
+    public function delete($id): RedirectResponse
     {
         $project = Project::with('documents')->findOrFail($id);
         if ($project->documents->count() > 0) {
             session()->flash(
                 'flash_message',
                 'You cannot delete this project!'
-                    . ' There are '
-                    . $project->documents->count()
-                    . ' documents in this project!'
+                . ' There are '
+                . $project->documents->count()
+                . ' documents in this project!'
             );
             return redirect()->route('settings.project');
         } else {

app/Http/Controllers/Settings/CollectionController.php

@@ -0,0 +1,96 @@
+<?php
+namespace App\Http\Controllers\Settings;
+
+use Illuminate\Http\Request;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\Collection;
+
+class CollectionController extends Controller
+{
+
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //$collections = Collection::take(10)->get();
+        //$collections = Collection::get();
+        $collections = Collection::with('documents')
+        ->paginate(8); //get();
+        return view('settings.collection.collection', compact('collections'));
+    }
+
+    /**
+     * 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)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
+}

app/Http/Controllers/Settings/DatasetController.php

@@ -5,7 +5,7 @@ use App\Http\Controllers\Controller;
 use App\Dataset;
 use App\Project;
 use App\License;
-use App\Title;
+use App\Models\Title;
 use App\Http\Requests\DocumentRequest;
 use Illuminate\View\View;
 use Illuminate\Http\RedirectResponse;
@@ -27,7 +27,14 @@ class DatasetController extends Controller
         //$registers = array();
 
         $filter = $request->input('search');
-        $state =  (strlen($request->input('state')) > 0) ? $request->input('state') : "published";
+        
+        if (null !== ($request->input('state'))) {
+            $state = $request->input('state');
+        } else {
+            $state =  "published";
+        }
+        
+       
 
         $data =  $request->all();
 
@@ -131,7 +138,10 @@ class DatasetController extends Controller
         // for($jahr = 1990; $jahr <= $nowYear; $jahr++){
         // $years[$jahr] = $jahr;
         // }
-        return view('settings.document.edit', compact('document', 'projects', 'options', 'checkeds', 'years', 'languages'));
+        return view(
+            'settings.document.edit',
+            compact('document', 'projects', 'options', 'checkeds', 'years', 'languages')
+        );
     }
 
     //https://stackoverflow.com/questions/17480200/using-laravel-how-do-i-create-a-view-that-will-update-a-one-to-many-relationshi?rq=1
@@ -145,18 +155,18 @@ class DatasetController extends Controller
      */
     public function update(DocumentRequest $request, $id) : RedirectResponse
     {
-        $document = Dataset::findOrFail($id);
+        $dataset = Dataset::findOrFail($id);
         //$input = $request->all();
         $input = $request->except('licenses', 'titles');
-        $document->update($input);
-        // $document->type = $input['type'];
-        // $document->thesis_year_accepted = $input['thesis_year_accepted'];
-        // $document->project_id = $input['project_id'];
-        // $document->save();
+        $dataset->update($input);
+        // $dataset->type = $input['type'];
+        // $dataset->thesis_year_accepted = $input['thesis_year_accepted'];
+        // $dataset->project_id = $input['project_id'];
+        // $dataset->save();
 
         $licenses = $request->input('licenses');
         //$licenses = $input['licenses'];
-        $document->licenses()->sync($licenses);
+        $dataset->licenses()->sync($licenses);
 
         //save the titles:
         $titles = $request->input('titles');

app/Http/Controllers/Settings/HomeController.php

@@ -0,0 +1,27 @@
+<?php
+namespace App\Http\Controllers\Settings;
+
+use App\Http\Controllers\Controller;
+use Illuminate\View\View;
+
+class HomeController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(): View
+    {
+        return view('settings.home.index');
+    }
+}

app/Http/Controllers/Settings/LicenseController.php

@@ -35,8 +35,20 @@ class LicenseController extends Controller
         return view('settings.license.edit', compact('license', 'languages'));
     }
 
-    public function update($id, LicenseRequest $request): RedirectResponse
+    public function update(Request $request, $id): RedirectResponse
     {
+        $validatedData = $this->validate($request, [
+            'desc_text' =>  'max:4000',
+            'language' =>  'max:3',
+            'link_licence' => 'required|url:max:255',
+            'link_logo' => 'url|max:255',
+            'mime_type' =>  'max:30',
+            'name_long' =>  'required|min:5|max:255',
+            'sort_order' => 'required|integer',
+            'active' => 'required|boolean',
+            'pod_allowed' => 'required|boolean',
+        ]);
+
         $license = License::findOrFail($id);
         $input = $request->all();
         $license->update($input);

app/Http/Controllers/Settings/PersonController.php

@@ -73,7 +73,7 @@ class PersonController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update($id, PersonRequest $request)
+    public function update(PersonRequest $request, $id)
     {
         $person = Person::findOrFail($id);
         $input = $request->all();

app/Http/Controllers/Settings/RoleController.php

@@ -1,8 +1,8 @@
 <?php
 namespace App\Http\Controllers\Settings;
 
-use App\Role;
-use App\Permission;
+use App\Models\Role;
+use App\Models\Permission;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -38,7 +38,28 @@ class RoleController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $this->validate($request, [
+            'name' => 'required',
+            'display_name' => 'max:255',
+            'description' => 'max:255'
+        ]);
+        //$input = $request->all();
+        $input = $request->except('permissions');
+        //$input = $request->only(['name']); //Retreive the name field
+        $role = Role::create($input);
+
+        $permissions = $request['permissions']; //Retrieving permissions
+        //Checking if a role was selected
+        if (isset($permissions)) {
+            foreach ($permissions as $permission) {
+                $permission_r = Permission::where('id', '=', $permission)->firstOrFail();
+                $role->attachPermission($permission_r); //Assigning permission to role
+            }
+        }
+
+        return redirect()
+        ->route('role.index')
+        ->with('success', 'Role has been created successfully');
     }
 
     /**
@@ -64,7 +85,7 @@ class RoleController extends Controller
         $permissions = Permission::all('id', 'name');
 
         //$userRoles = $user->roles->pluck('name','name')->all();
-        $checkeds = $role->permissions->pluck('id')->toArray();
+        $checkeds = $role->perms->pluck('id')->toArray();
         return view('settings.role.edit', compact('role', 'permissions', 'checkeds'));
     }
 
@@ -78,7 +99,9 @@ class RoleController extends Controller
     public function update(Request $request, $id)
     {
         $this->validate(request(), [
-            'name' => 'required'
+            'name' => 'required',
+            'display_name' => 'max:255',
+            'description' => 'max:255'
         ]);
         $role = Role::findOrFail($id);
         $role->update($request->except('permissions'));
@@ -86,9 +109,9 @@ class RoleController extends Controller
         $permissions = $request->input('permissions') ? $request->input('permissions') : [];
         //$role->syncPermissions($permissions);
         if (isset($permissions)) {
-            $role->permissions()->sync($permissions);//If one or more role is selected associate user to roles
+            $role->perms()->sync($permissions);//If one or more role is selected associate user to roles
         } else {
-            $role->permissions()->detach(); //If no role is selected remove exisiting role associated to a user
+            $role->perms()->detach(); //If no role is selected remove exisiting role associated to a user
         }
 
         return redirect()->route('role.index')

app/Http/Controllers/Settings/UserController.php

@@ -1,15 +1,18 @@
 <?php
 namespace App\Http\Controllers\Settings;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Models\Role;
 use App\User;
-//use Spatie\Permission\Models\Role;
-use App\Role;
-use Illuminate\Support\Facades\Gate;
+use Illuminate\Http\Request;
 
 class UserController extends Controller
 {
+    // public function __construct()
+    // {
+    //     $this->middleware('permission:settings');
+    // }
+
     /**
      * Display a listing of the resource.
      *
@@ -22,9 +25,11 @@ class UserController extends Controller
         //    return abort(401, 'Unauthorized action.');
         //}
 
-        $users = User::orderBy('id', 'DESC')->paginate(5);
+        $users = User::with('roles')
+        ->orderBy('id', 'DESC')
+        ->paginate(5);
         return view('settings.user.user', compact('users'))
-                ->with('i', ($request->input('page', 1) - 1) * 5);
+            ->with('i', ($request->input('page', 1) - 1) * 5);
     }
 
     /**
@@ -35,7 +40,7 @@ class UserController extends Controller
     public function create()
     {
         //$roles = Role::pluck('name','name')->all();
-         $roles = Role::all('id', 'name');
+        $roles = Role::all('id', 'name');
         return view('settings.user.create', compact('roles'));
     }
 
@@ -56,7 +61,7 @@ class UserController extends Controller
         $this->validate($request, [
             'login' => 'required',
             'email' => 'required|email|unique:accounts',
-            'password' => 'required|min:6|confirmed'
+            'password' => 'required|min:6|confirmed',
             //'roles' => 'required'
         ]);
 
@@ -64,14 +69,13 @@ class UserController extends Controller
         $input = $request->only(['login', 'email', 'password']); //Retreive the name, email and password fields
         $input['password'] = bcrypt($input['password']);
         $user = User::create($input);
-       
 
-        $roles = $request['roles']; //Retrieving the roles field
+        $roles = $request['roles']; //Retrieving roles
         //Checking if a role was selected
         if (isset($roles)) {
             foreach ($roles as $role) {
                 $role_r = Role::where('id', '=', $role)->firstOrFail();
-                $user->assignRole($role_r); //Assigning role to user
+                $user->attachRole($role_r); //Assigning role to user
             }
         }
 
@@ -122,11 +126,11 @@ class UserController extends Controller
         $this->validate(request(), [
             'login' => 'required',
             'email' => 'required|email|unique:accounts,email,' . $id,
-            'password' => 'required|min:6|confirmed'
+            'password' => 'required|min:6|confirmed',
         ]);
-       
-         $user = User::findOrFail($id);
-         // $input = $request->except('roles');
+
+        $user = User::findOrFail($id);
+        // $input = $request->except('roles');
         // $user->fill($input)->save();
 
         $input = $request->only(['login', 'email', 'password']); //Retreive the name, email and password fields
@@ -139,11 +143,11 @@ class UserController extends Controller
         $roles = $request['roles']; //Retreive all roles
 
         if (isset($roles)) {
-            $user->roles()->sync($roles);//If one or more role is selected associate user to roles
+            $user->roles()->sync($roles); //If one or more role is selected associate user to roles
         } else {
             $user->roles()->detach(); //If no role is selected remove exisiting role associated to a user
         }
-             
+
         //return back()->with('flash_message', 'user successfully updated.');
         return redirect()
             ->route('user.index')