diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php index 593c40f..4b76111 100644 --- a/app/Http/Controllers/ApplicationController.php +++ b/app/Http/Controllers/ApplicationController.php @@ -17,4 +17,9 @@ class ApplicationController extends Controller return view('dashboard.user.deniedapplications'); } + public function showApprovedApps() + { + return view('dashboard.user.approvedapplications'); + } + } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 815a14c..4d0587a 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -6,5 +6,12 @@ use Illuminate\Http\Request; class ProfileController extends Controller { - // + + public function index() + { + + return view('dashboard.user.profile.userprofile'); + + } + } diff --git a/public/css/profile.css b/public/css/profile.css new file mode 100644 index 0000000..cfbd62f --- /dev/null +++ b/public/css/profile.css @@ -0,0 +1,17 @@ +/* HIDE RADIO */ +[type=radio] { + position: absolute; + opacity: 0; + width: 0; + height: 0; +} + +/* IMAGE STYLES */ +[type=radio] + img { + cursor: pointer; +} + +/* CHECKED STYLES */ +[type=radio]:checked + img { + outline: 2px solid #4cc633; +} diff --git a/public/img/gravatar.png b/public/img/gravatar.png new file mode 100644 index 0000000..9afa455 Binary files /dev/null and b/public/img/gravatar.png differ diff --git a/public/img/mojang-logo.png b/public/img/mojang-logo.png new file mode 100644 index 0000000..33eec11 Binary files /dev/null and b/public/img/mojang-logo.png differ diff --git a/resources/views/dashboard/user/approvedapplications.blade.php b/resources/views/dashboard/user/approvedapplications.blade.php new file mode 100644 index 0000000..6b22fbc --- /dev/null +++ b/resources/views/dashboard/user/approvedapplications.blade.php @@ -0,0 +1,82 @@ +@extends('adminlte::page') + +@section('title', 'Raspberry Network | Applications') + +@section('content_header') + +

My Account / Approved Applications

+ +@stop + +@section('content') + +
+ +
+ +
+
Info on approved applications
+ +

Your approved applications will appear here. Approved applicants will be promoted and notified automatically by the system.

+

Moderators will be able to review other applications.

+
+ +
+ +
+ +
+ +
+ +
+
+

My Denied Applications

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
#ApplicantApplication DateApproval DateStatusActions
1.Jonathan Smith2020-04-282020-04-30Approved + + + +
+ +
+ + + +
+ +
+ +
+ +@stop diff --git a/resources/views/dashboard/user/deniedapplications.blade.php b/resources/views/dashboard/user/deniedapplications.blade.php index 09dcadf..1490c99 100644 --- a/resources/views/dashboard/user/deniedapplications.blade.php +++ b/resources/views/dashboard/user/deniedapplications.blade.php @@ -43,6 +43,7 @@ Applicant Application Date Denial Date + Status Actions @@ -52,7 +53,6 @@ Jonathan Smith 2020-04-28 2020-04-30 - Denied diff --git a/resources/views/dashboard/user/profile/userprofile.blade.php b/resources/views/dashboard/user/profile/userprofile.blade.php new file mode 100644 index 0000000..52428d0 --- /dev/null +++ b/resources/views/dashboard/user/profile/userprofile.blade.php @@ -0,0 +1,194 @@ +@extends('adminlte::page') + +@section('title', 'Raspberry Network | Profile') + +@section('content_header') + +

My Profile / Settings

+ +@stop + +@section('css') + + + +@stop + +@section('content') + + +
+ +
+ +
+ +
+ +
+
+
+ User profile picture +
+ +

{{Auth::user()->name}}

+ +

[short bio]

+
+ + + + +
+ +
+ + +
+ + +
+ +
+ + +
+ +
+ +
+ +
+ +
+ +

Basic Information

+ +
+ +
+ +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ +
+ + + + +
+ +
+ + + +

Github-flavored Markdown supported

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+

Preferences & Media

+
+ +
+ + + +
+ + + + + +
+ + + +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + +
+ +
+ +
+ +@stop diff --git a/routes/web.php b/routes/web.php index d3c38aa..6564d17 100644 --- a/routes/web.php +++ b/routes/web.php @@ -21,12 +21,20 @@ Route::post('/form/contact', 'ContactController@create') Route::group(['middleware' => 'auth'], function(){ - Route::get('/dashboard', 'DashboardController@index'); - Route::group(['prefix' => '/applications'], function (){ - Route::get('/pending', 'ApplicationController@showPendingUserApps'); - Route::get('/denied', 'ApplicationController@showDeniedUserApps'); + Route::get('/pending', 'ApplicationController@showPendingUserApps') + ->name('userPendingApps'); + Route::get('/denied', 'ApplicationController@showDeniedUserApps') + ->name('userDeniedApps'); + Route::get('/approved', 'ApplicationController@showApprovedApps') + ->name('userApprovedApps'); + + }); + + Route::group(['prefix' => '/profile'], function (){ + + Route::get('/settings', 'ProfileController@index'); });