Added permissions

app/Course.php

@@ -19,10 +19,14 @@ class Course extends Model
 
     public $timestamps = false;
 
-    public function dept() {
+    public function department() {
         return $this->belongsTo(Department::class);
     }
 
+    public function faculty() {
+        return $this->department->faculty();
+    }
+
     public function semesters() {
         return $this->belongsToMany(Semester::class, 'sections');
     }

app/Department.php

@@ -8,7 +8,6 @@ class Department extends Model
 {
     public $timestamps = false;
 
-
     public function courses() {
         return $this->hasMany(Course::class);
     }

app/Http/Controllers/CourseController.php

@@ -3,10 +3,13 @@
 namespace App\Http\Controllers;
 
 use App\Course;
+use App\Permission;
 use App\Semester;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Storage;
 
@@ -19,10 +22,18 @@ class CourseController extends Controller
      */
     public function index(Request $request)
     {
-        // if ($request->session()->has('department'))
-        // $courses = Course::whereIn('dept_id')
+
+        $courses = Course::with('sections:id,course_id,semester_code')->select('courses.id', 'courses.code', 'courses.title', 'courses.syllabus');
+        // Filter courses by faculty or id
+        if ($request->session()->get('filter') === 'f') {
+            $courses->join('departments', 'courses.dept_id', '=', 'departments.id')->where('faculty_id', '=', $request->session()->get('faculty'));
+        } else if ($request->session()->get('filter') === 'd') {
+            $courses->where('dept_id', '=', $request->session()->get('department'));
+        }
+        // dd($courses->toSql());
+        // dd($courses->get());
         return view('courses.index', [
-            'courses' => Course::where('dept_id', '=', $request->session()->get('department'))->with('sections:id,course_id,semester_code')->get()->sort('cmpCourseCode'),
+            'courses' => $courses->get()->sort('cmpCourseCode'),
             'semesters' => Semester::orderBy('code', 'asc')->get(),
         ]);
     }

app/Http/Controllers/DashboardController.php

@@ -30,7 +30,7 @@ class DashboardController extends Controller
      */
     public function index()
     {
-        return view('dashboard', [
+        return view('dashboard.index', [
             'professors' => Professor::orderBy('last_name')->get(),
             'semesters' => Semester::orderBy('code')->get()
         ]);
@@ -133,8 +133,6 @@ class DashboardController extends Controller
     /**
      */
     public function addUser(Request $request) {
-        $data = $request->validate(['email' => ['required', 'email', 'regex:/.+@upr\.edu$/']]);
-        User::create($data);
-        return redirect()->back();
+        return view('dashboard.user');
     }
 }

app/Http/Controllers/ProfessorController.php

@@ -17,8 +17,15 @@ class ProfessorController extends Controller
     public function index(Request $request)
     {
         // dd(Professor::where('dept_id', '=', 1)->with(['sections:semester_code,credits,student_count', 'semesters:semester_code,admin_load,investigative_load'])->orderBy('professors.last_name')->get());
+
+        $professors = Professor::with(['sections:semester_code,credits,student_count', 'semesters:semester_code,admin_load,investigative_load,other'])->select('professors.id', 'first_name', 'last_name');
+        if ($request->session()->get('filter') === 'f') {
+            $professors->join('departments', 'professors.dept_id', '=', 'departments.id')->where('faculty_id', '=', $request->session()->get('faculty'));
+        } else if ($request->session()->get('filter') === 'd') {
+            $professors->where('dept_id', '=', $request->session()->get('department'));
+        }
         return view('professors.index', [
-            'professors' => Professor::where('dept_id', '=', $request->session()->get('department'))->with(['sections:semester_code,credits,student_count', 'semesters:semester_code,admin_load,investigative_load,other'])->orderBy('professors.last_name')->get(),
+            'professors' => $professors->orderBy('professors.last_name')->get(),
             'semesters' => Semester::orderBy('semesters.code', 'asc')->get(),
         ]);
     }

app/Http/Controllers/UserController.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Department;
+use App\Faculty;
+use App\User;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+
+class UserController 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()
+    {
+        // DB::enableQueryLog();
+        $user = Auth::user()->loadMissing(['faculties.departments', 'departments']);
+        if ($user->is_admin) {
+            $faculties = Faculty::all();
+            $departments = Department::all();
+        } else {
+            $faculties = $user->faculties;
+            $departments = $user->departments->keyBy('id');
+            foreach($faculties as $faculty) {
+                $departments = $departments->union($faculty->departments->keyBy('id'));
+            }
+        }
+        return view('dashboard.register', compact('faculties', 'departments'));
+
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        // dump($request);
+        $userData = $request->validate([
+            'email' => ['required', 'email', 'regex:/.+@upr\.edu$/'],
+        ]);
+        // TODO: Uncomment when added_by column is added to table
+        $userData['added_by'] = Auth::user()->id;
+        try {
+            if (User::where('email', '=', $userData['email'])->get()->isNotEmpty()) {
+                throw new Exception('User with that email already exists.');
+            }
+            $user = User::create($userData);
+
+        } catch (Exception $e) {
+            return redirect()->back()->withErrors(['Failed to add user.', $e->getMessage()]);
+        }
+
+        $permissionData = $request->validate([
+            'departments'   => ['nullable', 'array'],
+            'departments.*' => ['exists:departments,id'],
+            'faculties'     => ['nullable', 'array'],
+            'faculties.*'   => ['exists:faculties,id'],
+            'admin'         => ['nullable', 'boolean'],
+        ]);
+
+
+        // dd($permissionData);
+        if (isset($permissionData['departments'])) {
+            foreach($permissionData['departments'] as $department_id) {
+                if (Gate::allows('add-permission', [1, $department_id])) {
+                    $user->permissions()->firstOrCreate([
+                        'level'         => 1,
+                        'division_id'   => $department_id,
+                    ]);
+                } else {
+                    return redirect()->back()->withErrors('You do not have permission to department ' . Department::find($department_id)->title . '.');
+                }
+            }
+        }
+        if (isset($permissionData['faculties'])) {
+            foreach($permissionData['faculties'] as $faculty_id) {
+                if (Gate::allows('add-permission', [2, $faculty_id])) {
+                    $user->permissions()->firstOrCreate([
+                        'level'         => 2,
+                        'division_id'   => $faculty_id,
+                    ]);
+                } else {
+                    return redirect()->back()->withErrors('You do not have permission to faculty ' . Faculty::find($faculty_id)->name . '.');
+                }
+            }
+        }
+        if (isset($permissionData['admin']) && $permissionData['admin']) {
+            if (Gate::allows('add-permission', [3, 0])) {
+                $user->permissions()->firstOrCreate([
+                    'level'         => 3,
+                    'division_id'   => 0,
+                ]);
+            } else {
+                return redirect()->back()->withErrors('You do not have campus-wide permissions.');
+            }
+        }
+
+        return redirect('/dashboard');
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\User  $user
+     * @return \Illuminate\Http\Response
+     */
+    public function show(User $user)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\User  $user
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(User $user)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\User  $user
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, User $user)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\User  $user
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(User $user)
+    {
+        //
+    }
+}

app/Http/Middleware/SetDept.php

@@ -16,16 +16,16 @@ class SetDept
     public function handle($request, Closure $next)
     {
         if ($request->has('f')) {
-            $data = $request->validate(['filter' => 'regex:/[df]/']);
-            $request->session()->put('filter', $data['filter']);
+            $data = $request->validate(['f' => 'regex:/[df]/']);
+            $request->session()->put('filter', $data['f']);
         }
         if ($request->has('fclt')) {
-            $data = $request->validate(['setfclt' => 'integer|exists:faculties,id']);
-            $request->session()->put('faculty', $data['setfclt']);
+            $data = $request->validate(['fclt' => 'integer|exists:faculties,id']);
+            $request->session()->put('faculty', $data['fclt']);
         }
         if ($request->has('dept')) {
-            $data = $request->validate(['setdept' => 'integer|exists:departments,id']);
-            $request->session()->put('department', $data['setdept']);
+            $data = $request->validate(['dept' => 'integer|exists:departments,id']);
+            $request->session()->put('department', $data['dept']);
         }
         if (!$request->session()->has('filter')) {
             $request->session()->put('filter', 'd');

app/Permission.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Permission extends Model
+{
+    public $timestamps = false;
+
+    protected $fillable = [
+        'user_id',
+        'level',
+        'division_id'
+    ];
+
+    public function division() {
+        if ($this->level === 1) {
+            return $this->belongsTo(Department::class, 'division_id');
+        } else if ($this->level === 2) {
+            return $this->belongsTo(Faculty::class, 'division_id');
+        }
+        return null;
+    }
+}

app/Policies/CoursePolicy.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+use App\Course;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class CoursePolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can view any courses.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function viewAny(User $user)
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the course.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Course  $course
+     * @return mixed
+     */
+    public function update(User $user, Course $course)
+    {
+        return $user->departments->where('id', '=', $course->dept_id)->isNotEmpty()
+            || $user->faculties->where('id', '=', $course->faculty->id)->isNotEmpty();
+    }
+
+    /**
+     * Determine whether the user can delete the course.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Course  $course
+     * @return mixed
+     */
+    public function delete(User $user, Course $course)
+    {
+        return $user->departments->where('id', '=', $course->dept_id)->isNotEmpty()
+            || $user->faculties->where('id', '=', $course->faculty->id)->isNotEmpty();
+    }
+}

app/Policies/ProfessorPolicy.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+use App\Professor;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class ProfessorPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can view any professors.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function viewAny(User $user)
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the professor.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Professor  $professor
+     * @return mixed
+     */
+    public function update(User $user, Professor $professor)
+    {
+        return $user->departments->where('id', '=', $professor->dept_id)->isNotEmpty()
+            || $user->faculties->where('id', '=', $professor->faculty->id)->isNotEmpty();
+    }
+
+    /**
+     * Determine whether the user can delete the professor.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Professor  $professor
+     * @return mixed
+     */
+    public function delete(User $user, Professor $professor)
+    {
+        return $user->departments->where('id', '=', $professor->dept_id)->isNotEmpty()
+            || $user->faculties->where('id', '=', $professor->faculty->id)->isNotEmpty();
+    }
+
+}

app/Policies/UserPolicy.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class UserPolicy
+{
+    use HandlesAuthorization;
+    
+    /**
+     * Determine whether the user can view any models.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function viewAny(User $user)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $model
+     * @return mixed
+     */
+    public function view(User $user, User $model)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can create models.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $model
+     * @return mixed
+     */
+    public function update(User $user, User $model)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $model
+     * @return mixed
+     */
+    public function delete(User $user, User $model)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $model
+     * @return mixed
+     */
+    public function restore(User $user, User $model)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $model
+     * @return mixed
+     */
+    public function forceDelete(User $user, User $model)
+    {
+        //
+    }
+}

app/Professor.php

@@ -17,6 +17,13 @@ class Professor extends Model
         'dept_id'
     ];
 
+    public function department() {
+        return $this->belongsTo(Department::class);
+    }
+
+    public function faculty() {
+        return $this->department->faculty();
+    }
 
     public function sections() {
         return $this->belongsToMany(Section::class)->withPivot('percent', 'schedule', 'eval');

app/Providers/AuthServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace App\Providers;
 
+use App\Course;
+use App\Policies\CoursePolicy;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
@@ -14,6 +16,7 @@ class AuthServiceProvider extends ServiceProvider
      */
     protected $policies = [
         // 'App\Model' => 'App\Policies\ModelPolicy',
+        Course::class => CoursePolicy::class,
     ];
 
     /**
@@ -25,6 +28,17 @@ class AuthServiceProvider extends ServiceProvider
     {
         $this->registerPolicies();
 
-        //
+        Gate::define('add-permission', function ($user, $level, $division_id) {
+            $user->loadMissing(['departments', 'faculties.departments']);
+            return $user->is_admin
+                || ($level === 1) &&
+                    ($user->departments->contains($division_id)
+                    || $user->faculties->contains(function ($faculty, $key) use ($division_id) {
+                        return $faculty->departments->contains($division_id);
+                    }))
+                || ($level === 2 && $user->faculties->contains($division_id));
+        });
+
+        // Gate::define('')
     }
 }

app/User.php

@@ -16,7 +16,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password', 'google_id',
+        'name', 'email', 'password', 'google_id', 'added_by',
     ];
 
     /**
@@ -36,4 +36,20 @@ class User extends Authenticatable
     protected $casts = [
         'email_verified_at' => 'datetime',
     ];
+
+    public function permissions() {
+        return $this->hasMany(Permission::class);
+    }
+
+    public function departments() {
+        return $this->belongsToMany(Department::class, 'permissions', 'user_id', 'division_id')->wherePivot('level', '=', 1);
+    }
+
+    public function faculties() {
+        return $this->belongsToMany(Faculty::class, 'permissions', 'user_id', 'division_id')->wherePivot('level', '=', 2);
+    }
+
+    public function getIsAdminAttribute() {
+        return $this->permissions->where('level', '=', 3)->isNotEmpty();
+    }
 }

database/migrations/2014_10_12_000000_create_users_table.php

@@ -18,9 +18,11 @@ class CreateUsersTable extends Migration
             $table->string('email')->unique();
             $table->string('name')->nullable();
             $table->string('google_id')->nullable();
-            $table->timestamp('email_verified_at')->nullable();
+            $table->unsignedBigInteger('added_by')->nullable();
             $table->rememberToken();
             $table->timestamps();
+
+            $table->foreign('added_by')->references('id')->on('users');
         });
     }
 

database/migrations/2019_11_13_185313_create_permissions_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePermissionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('permissions', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('user_id');
+            $table->unsignedTinyInteger('level');
+            $table->unsignedBigInteger('division_id');
+
+            $table->unique(['user_id', 'level', 'division_id']);
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade')->onUpdate('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('permissions');
+    }
+}

resources/js/app.js

@@ -1,2 +1,16 @@
 const mdc = require('material-components-web');
 mdc.autoInit();
+
+$("ul.dropdown-menu [data-toggle='dropdown']").on("click", function(event) {
+    event.preventDefault();
+    event.stopPropagation();
+
+    $(this).siblings().toggleClass("show");
+
+    if (!$(this).next().hasClass('show')) {
+        $(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
+    }
+    $(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function(e) {
+        $('.dropdown-submenu .show').removeClass("show");
+    });
+});

resources/sass/app.scss

@@ -2,25 +2,25 @@
 // @import url('https://fonts.googleapis.com/css?family=Nunito');
 
 // Variables
-@import 'variables';
+@import "variables";
 
 // Bootstrap
-@import '~bootstrap/scss/bootstrap';
+@import "~bootstrap/scss/bootstrap";
 
 // Material Design
 // @import "material-components-web/material-components-web";
-@import '@material/typography/mdc-typography';
-@import '@material/layout-grid/mdc-layout-grid';
-@import '@material/elevation/mdc-elevation';
-@import '@material/button/mdc-button';
-@import '@material/icon-button/mdc-icon-button';
-@import '@material/checkbox/mdc-checkbox';
-@import '@material/card/mdc-card';
-@import '@material/select/mdc-select';
+@import "@material/typography/mdc-typography";
+@import "@material/layout-grid/mdc-layout-grid";
+@import "@material/elevation/mdc-elevation";
+@import "@material/button/mdc-button";
+@import "@material/icon-button/mdc-icon-button";
+@import "@material/checkbox/mdc-checkbox";
+@import "@material/card/mdc-card";
+@import "@material/select/mdc-select";
 @import "@material/list/mdc-list";
 @import "@material/textfield/mdc-text-field";
 @import "@material/textfield/helper-text/mdc-text-field-helper-text";
-@import '@material/data-table/mdc-data-table';
+@import "@material/data-table/mdc-data-table";
 
 body {
     padding-top: 80px;
@@ -29,13 +29,20 @@ body {
 
 /* Rules for sizing the icon. */
 .material-icons {
-    .md-18 { font-size: 18px; }
-    .md-24 { font-size: 24px; }
-    .md-36 { font-size: 36px; }
-    .md-48 { font-size: 48px; }
+    .md-18 {
+        font-size: 18px;
+    }
+    .md-24 {
+        font-size: 24px;
+    }
+    .md-36 {
+        font-size: 36px;
+    }
+    .md-48 {
+        font-size: 48px;
+    }
 }
 
-
 .landing-page-grid {
     // @include mdc-layout-grid-inner('desktop', 10vw, 32px);
     @media screen and (min-width: map-get($mdc-layout-grid-breakpoints, desktop)) {
@@ -57,29 +64,36 @@ body {
 
 // MDC card media
 #home-button-course {
-    background-image: url('/images/course_1312478.png');
+    background-image: url("/images/course_1312478.png");
 }
 #home-button-professor {
-    background-image: url('/images/chalkboard-teacher-solid.png');
+    background-image: url("/images/chalkboard-teacher-solid.png");
 }
 #home-button-dashboard {
-    background-image: url('/images/file-alt-regular.png');
+    background-image: url("/images/file-alt-regular.png");
 }
 #dash-button-csv {
-    background-image: url('/images/file-csv.png');
+    background-image: url("/images/file-csv.png");
 }
 #dash-button-schedule {
-    background-image: url('/images/calendar-alt.png')
+    background-image: url("/images/calendar-alt.png");
 }
 
-
 /* Rules for using icons as black on a light background. */
-.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
-.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
+.material-icons.md-dark {
+    color: rgba(0, 0, 0, 0.54);
+}
+.material-icons.md-dark.md-inactive {
+    color: rgba(0, 0, 0, 0.26);
+}
 
 /* Rules for using icons as white on a dark background. */
-.material-icons.md-light { color: rgba(255, 255, 255, 1); }
-.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
+.material-icons.md-light {
+    color: rgba(255, 255, 255, 1);
+}
+.material-icons.md-light.md-inactive {
+    color: rgba(255, 255, 255, 0.3);
+}
 
 .center-text {
     vertical-align: middle;
@@ -91,7 +105,7 @@ body {
 // Apply to table wrapper
 .table-fixed-col-head {
     overflow-y: scroll;
-    table thead th{
+    table thead th {
         position: -webkit-sticky;
         position: sticky;
         top: 0;
@@ -118,7 +132,6 @@ body {
     }
 }
 
-
 .mdc-data-table {
     th {
         font-weight: bold;
@@ -134,7 +147,6 @@ body {
     font-weight: bold;
 }
 
-
 .table--fit-screen {
     height: 80vh;
     width: 96vw;
@@ -153,6 +165,24 @@ body {
     right: 0;
 }
 
+.dropdown-submenu {
+    position: relative;
+}
+
+.dropdown-submenu > a:after {
+    content: "\f0da";
+    float: right;
+    border: none;
+    font-family: "FontAwesome";
+}
+
+.dropdown-submenu > .dropdown-menu {
+    top: 0;
+    left: 100%;
+    margin-top: 0px;
+    margin-left: 0px;
+}
+
 [onclick] {
     cursor: pointer;
 }
@@ -162,26 +192,27 @@ body {
 }
 
 h1 {
-    @include mdc-typography(headline1)
+    @include mdc-typography(headline1);
+    font-size: 4.25rem;
 }
 h2 {
-    @include mdc-typography(headline2)
+    @include mdc-typography(headline2);
 }
 h3 {
-    @include mdc-typography(headline3)
+    @include mdc-typography(headline3);
 }
 h4 {
-    @include mdc-typography(headline4)
+    @include mdc-typography(headline4);
 }
 h5 {
-    @include mdc-typography(headline5)
+    @include mdc-typography(headline5);
 }
 h6 {
-    @include mdc-typography(headline6)
+    @include mdc-typography(headline6);
 }
 button {
-    @include mdc-typography(button)
+    @include mdc-typography(button);
 }
 p {
-    @include mdc-typography(body1)
+    @include mdc-typography(body1);
 }

resources/views/dashboard.blade.php → resources/views/dashboard/index.blade.php

@@ -54,7 +54,7 @@
                 </a>
             </div>
             <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-2">
-                <a data-toggle="modal" data-target="#modal-user-add">
+                <a href="{{ route('user.create') }}" style="text-decoration: none; color: inherit;">
                     <div class="mdc-card">
                         <div class="mdc-card__primary-action" tabindex="0">
                             <div id="dash-button-schedule" class="mdc-card__media mdc-card__media--square"></div>

resources/views/dashboard/register.blade.php

@@ -0,0 +1,132 @@
+@extends('layouts.app')
+
+@section('title', 'Nuevo Usuario | Gerencia Docente')
+
+@section('content')
+<div class="mdc-layout-grid__inner dashboard-grid">
+    <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
+        <div class="mdc-layout-grid__inner">
+            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12-desktop mdc-layout-grid__cell--span-8-tablet mdc-layout-grid__cell--span-4-phone">
+                <h2 class="mdc-typography--heading1">Usuario Nuevo</h2>
+            </div>
+        </div>
+        @if ($errors->any())
+            <div class="mdc-layout-grid__inner">
+                <div class="alert alert-danger alert-dismissible fade show mdc-layout-grid__cell mdc-layout-grid__cell--span-12" role="alert">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                    <ul class="mdc-list">
+                        @foreach ($errors->all() as $error)
+                            <li class="mcd-list-item"><span class="mdc-list-item__text">{{ $error }}</span></li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+            <br>
+        @endif
+        <div class="mdc-layout-grid__inner">
+            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
+                <br>
+                <form method="POST" action="{{ route('user.store') }}">
+                    @csrf
+                    <div class="mdc-layout-grid__inner">
+                        <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
+                            <div class="form-field">
+                                <div class="mdc-text-field" data-mdc-auto-init="MDCTextField">
+                                    <input type="email" id="email-field" class="mdc-text-field__input" name="email">
+                                    <label class="mdc-floating-label" for="email-field">E-mail</label>
+                                    <div class="mdc-line-ripple"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <hr class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
+                        <h3 class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12 mdc-layout-grid__cell--span-4-mobile">
+                            Permisos
+                        </h3>
+                        @if (Auth::user()->is_admin)
+                            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
+                                <div class="mdc-form-field">
+                                    <div class="mdc-checkbox" data-mdc-auto-init="MDCCheckbox">
+                                        <input type="checkbox" class="mdc-checkbox__native-control" id="checkbox-admin" name="admin" value="1">
+                                        <div class="mdc-checkbox__background">
+                                            <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
+                                                <path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
+                                            </svg>
+                                            <div class="mdc-checkbox__mixedmark"></div>
+                                        </div>
+                                        <div class="mdc-checkbox__ripple"></div>
+                                    </div>
+                                    <label for="checkbox-admin">Nivel recinto</label>
+                                </div>
+                            </div>
+                        @endif
+                        @if ($faculties->isNotEmpty())
+                            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-6">
+                                <div class="mdc-layout-grid__inner">
+                                    <h4 class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">Facultades</h4>
+                                    @foreach ($faculties->sortBy('name') as $faculty)
+                                        <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-6">
+                                            <div class="mdc-form-field">
+                                                <div class="mdc-checkbox">
+                                                    <input type="checkbox" class="mdc-checkbox__native-control" id="checkbox-f-{{ $loop->index }}" name="faculties[]" value="{{ $faculty->id }}">
+                                                    <div class="mdc-checkbox__background">
+                                                        <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
+                                                            <path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
+                                                        </svg>
+                                                        <div class="mdc-checkbox__mixedmark"></div>
+                                                    </div>
+                                                    <div class="mdc-checkbox__ripple"></div>
+                                                </div>
+                                                <label for="checkbox-f-{{ $loop->index }}">{{ $faculty->name }}</label>
+                                            </div>
+                                        </div>
+                                    @endforeach
+                                </div>
+                            </div>
+                        @endif
+                        @if ($departments->isNotEmpty())
+                            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-6">
+                                <div class="mdc-layout-grid__inner">
+                                    <h4 class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">Departamentos</h4>
+                                    @foreach ($departments->sortBy('title') as $department)
+                                        <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-6">
+                                            <div class="mdc-form-field">
+                                                <div class="mdc-checkbox" data-auto-init="MDCCheckbox">
+                                                    <input type="checkbox" class="mdc-checkbox__native-control" id="checkbox-d-{{ $loop->index }}" name="departments[]" value="{{ $department->id }}">
+                                                    <div class="mdc-checkbox__background">
+                                                        <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
+                                                            <path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
+                                                        </svg>
+                                                        <div class="mdc-checkbox__mixedmark"></div>
+                                                    </div>
+                                                    <div class="mdc-checkbox__ripple"></div>
+                                                </div>
+                                                <label for="checkbox-d-{{ $loop->index }}">{{ $department->title ?: $department->name }}</label>
+                                            </div>
+                                        </div>
+                                    @endforeach
+                                </div>
+                            </div>
+                        @endif
+                        <hr class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
+                        <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
+                            <input type="submit" class="mdc-button mdc-button--raised" value="Añadir usuario">
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('modals')
+    @include('modal.semester')
+    @include('modal.semester-clone')
+    @include('modal.user-add')
+@endsection
+
+@section('scripts')
+    <script type="text/javascript" src="/js/dashboard.js"></script>
+@endsection

resources/views/layouts/app.blade.php

@@ -49,14 +49,28 @@
                         <a class="nav-link dropdown-toggle mdc-typography--body1" href="#" data-toggle="dropdown">
                             {{ $department->title ?: $department->name ?? 'Departamento' }} <span class="caret"></span>
                         </a>
-                        <div class="dropdown-menu">
+                        <ul class="dropdown-menu">
                             @foreach (App\Faculty::orderBy('name')->get() as $faculty)
-                                <a class="dropdown-item mdc-typography--body1" href="{{ url()->current() }}?setfac={{ $faculty->id }}">{{ $faculty->name }}</a>
-                                @foreach ($faculty->departments as $dept)
-                                    <a class="dropdown-item mdc-typography--body2" href="{{ url()->current() }}?setdept={{ $dept->id }}" style="padding-left:4em;">{{ $dept->title ?: $dept->name }}</a>
-                                @endforeach
+                                @if (!$faculty->departments->isEmpty())
+                                    <li class="dropdown-submenu">
+                                        <a class="dropdown-item dropdown-toggle mdc-typography--body1" href="#" data-toggle="dropdown">{{ $faculty->name }}</a>
+                                        <ul class="dropdown-menu">
+                                            @foreach ($faculty->departments as $dept)
+                                                <li class="mdc-typography--body2">
+                                                    <a class="dropdown-item" href="{{ url()->current() }}?f=d&dept={{ $dept->id }}">
+                                                        {{ $dept->title ?: $dept->name }}
+                                                    </a>
+                                                </li>
+                                            @endforeach
+                                        </ul>
+                                    </li>
+                                @else
+                                    <li>
+                                        <a class="dropdown-item" href="{{ url()->current() }}?f=f&fclt={{ $faculty->id }}">{{ $faculty->name }}</a>
+                                    </li>
+                                @endif
                             @endforeach
-                        </div>
+                        </ul>
                     </li>
                 </ul>
 

routes/web.php

@@ -24,14 +24,17 @@ Route::resource('professor', 'ProfessorController')->except([
 Route::resource('section', 'SectionController')->only([
     'store', 'update', 'destroy'
 ]);
+Route::resource('user', 'UserController')->only([
+    'create', 'store',
+]);
 
 // Auth::routes();
 
 Route::get('/dashboard', 'DashboardController@index')->name('dashboard');
+Route::get('/dashboard/add-user', 'DashboardController@addUser')->name('addUser');
 Route::post('/dashboard/schedule/{semester}', 'DashboardController@schedule')->name('schedule');
 Route::post('/dashboard/export/{semester}', 'DashboardController@export')->name('export');
 Route::post('/dashboard/clone/{semester}', 'DashboardController@cloneSemester')->name('cloneSemester');
-Route::post('/dashboard/add-user', 'DashboardController@addUser')->name('addUser');
 Route::get('/dashboard/export-courses', 'DashboardController@exportCourses')->name('exportCourses');
 
 Route::get('/login', 'Auth\LoginController@redirectToProvider')->name('login');