Skip to content
This repository was archived by the owner on Oct 18, 2021. It is now read-only.

Commit b8af652

Browse files
InspectorGadgetInspectorGadget
committed
Added Event Modal & Member Profile
1 parent 2786502 commit b8af652

File tree

9 files changed

+161
-12
lines changed

9 files changed

+161
-12
lines changed

‎app/Http/Controllers/Auth/AuthController.php

+26
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Http\Controllers\Auth;
44

5+
use App\Member;
56
use App\User;
67
use Illuminate\Http\Request;
78
use App\Http\Controllers\Controller;
@@ -71,6 +72,31 @@ public function updateAdminProfile(Request $request) {
7172
}
7273
}
7374

75+
public function updateMemberPassword(Request $request) {
76+
$validate = Validator::make($request->all(), [
77+
'password' => 'required',
78+
'confirm' => 'required'
79+
]);
80+
81+
if (!$validate) return back()->with('error', 'Malformed Request!');
82+
83+
$password = trim(strtolower($request->input('password')));
84+
$confirm = trim(strtolower($request->input('confirm')));
85+
86+
if ($password !== $confirm) return back()->with('error', 'Both your Password isn\' the same!');
87+
88+
$user = Member::all()->find(Auth::user()->id);
89+
$user->password = Hash::make(trim($request->input('password')));
90+
$user->save();
91+
92+
if ($user) {
93+
auth('member')->logout();
94+
return redirect(route('member.login'))->with('message', 'Please login with your new Password!');
95+
} else {
96+
return back()->with('error', 'Unable to update your Password!');
97+
}
98+
}
99+
74100
public function logoutAsMember() {
75101
\auth('member')->logout();
76102
return redirect(route('member.login'));

‎app/Http/Controllers/Event/EventController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class EventController extends Controller
1818

1919
public function getActiveEvents() {
2020
$events = DB::table('events')
21-
->select('id', 'title', 'expiry', 'organisation', 'identifier', 'registration')
21+
->select('id', 'title', 'expiry', 'organisation', 'identifier', 'registration', 'file', 'description')
2222
->where('expiry', '>', Carbon::now()->toDateString())
2323
->get();
2424

@@ -27,7 +27,7 @@ public function getActiveEvents() {
2727

2828
public function getExpiredEvents() {
2929
$events = DB::table('events')
30-
->select('id', 'title', 'expiry', 'organisation', 'identifier', 'registration')
30+
->select('id', 'title', 'expiry', 'organisation', 'identifier', 'registration', 'file', 'description')
3131
->where('expiry', '<=', Carbon::now()->toDateString())
3232
->get();
3333

‎app/Http/Controllers/Route/RouteController.php

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public function showAdminProfile() {
5959
return view('admin.profile.index');
6060
}
6161

62+
public function showMemberProfile() {
63+
return view('member.profile.index');
64+
}
65+
6266
public function showEvents() {
6367
return view('admin.events.index');
6468
}

‎resources/views/admin/events/create.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<div class="row form-group">
5050
<div class="col col-md-3">
51-
<label for="registration-input" class=" form-control-label">Registration Form (Optional)</label>
51+
<label for="registration-input" class=" form-control-label">Embedded Registration Form (Optional)</label>
5252
</div>
5353
<div class="col-12 col-md-9">
5454
<input type="text" class="form-control" id="registration-input" name="registration" placeholder="Paste Link">
@@ -81,7 +81,7 @@
8181
<div class="form-check">
8282
<div class="checkbox">
8383
<label for="checkbox1" class="form-check-label">
84-
<input type="checkbox" value="1" name="attendance">Built-in Attendance
84+
<input type="checkbox" value="1" name="attendance"><span style="padding-left: 10px">Built-in Attendance</span>
8585
</label>
8686
</div>
8787
</div>

‎resources/views/layouts/member.blade.php

+26-6
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@
5454
<span class="bot-line"></span>
5555
</a>
5656
</li>
57+
58+
<li>
59+
<a href="{{ route('member.dashboard.profile') }}">
60+
<i class="fas fa-user"></i>My Profile
61+
<span class="bot-line"></span>
62+
</a>
63+
</li>
5764
</ul>
5865
</div>
5966
<div class="header__tool">
@@ -71,12 +78,12 @@
7178
</h5>
7279
<span class="email">{{ auth()->user()->email }}</span>
7380
</div>
74-
{{-- <div class="account-dropdown__body">--}}
75-
{{-- <div class="account-dropdown__item">--}}
76-
{{-- <a href="#">--}}
77-
{{-- <i class="zmdi zmdi-account"></i>Account</a>--}}
78-
{{-- </div>--}}
79-
{{-- </div>--}}
81+
<div class="account-dropdown__body">
82+
<div class="account-dropdown__item">
83+
<a href="{{ route('member.dashboard.profile') }}">
84+
<i class="zmdi zmdi-account"></i>Account</a>
85+
</div>
86+
</div>
8087
<div class="account-dropdown__footer">
8188
<a href="{{ route('member.logout') }}">
8289
<i class="zmdi zmdi-power"></i>Logout</a>
@@ -114,6 +121,13 @@
114121
<i class="fas fa-tachometer-alt"></i>Dashboard
115122
</a>
116123
</li>
124+
125+
<li>
126+
<a href="{{ route('member.dashboard.profile') }}">
127+
<i class="fas fa-user"></i>My Profile
128+
<span class="bot-line"></span>
129+
</a>
130+
</li>
117131
</ul>
118132
</div>
119133
</nav>
@@ -133,6 +147,12 @@
133147
</h5>
134148
<span class="email">{{ auth()->user()->email }}</span>
135149
</div>
150+
<div class="account-dropdown__body">
151+
<div class="account-dropdown__item">
152+
<a href="{{ route('member.dashboard.profile') }}">
153+
<i class="zmdi zmdi-account"></i>Account</a>
154+
</div>
155+
</div>
136156
<div class="account-dropdown__footer">
137157
<a href="{{ route('member.logout') }}">
138158
<i class="zmdi zmdi-power"></i>Logout</a>

‎resources/views/login/member.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@foreach ($activeEvents as $e)
1919
<tr>
2020
<td>{{ $e->title }}</td>
21-
<td>{{ \Carbon\Carbon::parse($e->expiry)->diffInDays() }} Day(s)</td>
21+
<td>{{ \Carbon\Carbon::parse($e->expiry)->diffForHumans() }}</td>
2222
</tr>
2323
@endforeach
2424
</tbody>

‎resources/views/member/index.blade.php

+30-1
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,38 @@
5858
<span class="block-email" style="color: red;">{{ $event->title }}</span>
5959
</td>
6060
<td>{{ \Carbon\Carbon::parse($event->expiry)->diffForHumans() < 3 ? \Carbon\Carbon::parse($event->expiry)->format('d/m/Y H:i') : \Carbon\Carbon::parse($event->expiry)->format('d/m/Y H:i') }}</td>
61-
<td><a href="{{ $event->registration !== null ? $event->registration : "#" }}" target="_blank" class="btn btn-success {{ $event->registration !== null ? "" : "disabled" }}">Register!</a></td>
61+
<td><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">View Event</button></td>
6262
</tr>
6363
<tr class="spacer"></tr>
64+
65+
<!-- The Modal -->
66+
<div class="modal fade" id="myModal">
67+
<div class="modal-dialog modal-lg">
68+
<div class="modal-content">
69+
70+
<!-- Modal Header -->
71+
<div class="modal-header">
72+
<h4 class="modal-title">{{ $event->title }}</h4>
73+
<button type="button" class="close" data-dismiss="modal">&times;</button>
74+
</div>
75+
76+
<!-- Modal body -->
77+
<div class="modal-body">
78+
<img class="card-img-top" src="{{ asset('storage' . '/posters/' . $event->file) }}" alt="Image is broken">
79+
<hr />
80+
81+
<h5>{!! $event->description !!}</h5>
82+
</div>
83+
84+
<!-- Modal footer -->
85+
<div class="modal-footer">
86+
<a href="{{ $event->registration }}" target="_blank" type="button" class="btn btn-primary">Register</a>
87+
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
88+
</div>
89+
90+
</div>
91+
</div>
92+
</div>
6493
@endforeach
6594
@else
6695
<tr class="tr-shadow">

‎resources/views/member/profile/index.blade.php

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
@extends('layouts.admin')
2+
3+
@section('title', 'My Profile')
4+
5+
@section('content')
6+
<div class="section__content section__content--p30">
7+
<div class="container-fluid">
8+
<div class="text-center">
9+
<a class="btn btn-primary" href="{{ route('member.dashboard') }}">Go Back</a>
10+
</div>
11+
<hr />
12+
13+
<div class="card">
14+
<div class="card-header">
15+
<strong class="card-title mb-3">Your Profile</strong>
16+
</div>
17+
<div class="card-body">
18+
<div class="mx-auto d-block">
19+
<img class="rounded-circle mx-auto d-block border border-danger shadow-lg" src="{{ asset('img/user_icon.png') }}" style="max-width: 120px;" alt="Profile Image Broken">
20+
<hr />
21+
<h5 class="text-sm-center mt-2 mb-1 text-center">{{ auth()->user()->name }}</h5>
22+
<div class="location text-center">
23+
<i class="fa fa-envelope"></i> {{ auth()->user()->email }}
24+
</div>
25+
</div>
26+
</div>
27+
</div>
28+
29+
<div class="card">
30+
<div class="card-body card-block">
31+
<form method="post" action="{{ route('member.dashboard.profile') }}" class="form-horizontal">
32+
{{ csrf_field() }}
33+
34+
<div class="row form-group">
35+
<div class="col col-md-3">
36+
<label for="password-input" class=" form-control-label">Password</label>
37+
</div>
38+
<div class="col-12 col-md-9">
39+
<input type="password" id="password-input" name="password" placeholder="Enter Password" class="form-control">
40+
</div>
41+
</div>
42+
43+
<div class="row form-group">
44+
<div class="col col-md-3">
45+
<label for="password-input" class=" form-control-label">Confirm Password</label>
46+
</div>
47+
<div class="col-12 col-md-9">
48+
<input type="password" id="password-input" name="confirm" placeholder="Confirm Password" class="form-control">
49+
</div>
50+
</div>
51+
52+
<div class="card-footer">
53+
<button type="submit" class="btn btn-primary btn-sm">
54+
<i class="fa fa-dot-circle-o"></i> Submit
55+
</button>
56+
<button type="reset" class="btn btn-danger btn-sm">
57+
<i class="fa fa-ban"></i> Reset
58+
</button>
59+
</div>
60+
</form>
61+
</div>
62+
</div>
63+
</div>
64+
</div>
65+
@stop

‎routes/web.php

+5
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@
9999
/** Sign [Attendance] */
100100
Route::get('/api/attendance/{id}/sign', ['as' => 'member.attendance.sign', 'uses' => 'Event\EventController@signAttendance']);
101101

102+
/** [Profile] */
103+
Route::get('/member/dashboard/profile', ['as' => 'member.dashboard.profile', 'uses' => 'Route\RouteController@showMemberProfile']);
104+
Route::post('/member/dashboard/profile', ['as' => 'member.dashboard.profile', 'uses' => 'Auth\AuthController@updateMemberPassword']);
105+
/** End [Member] Profile */
106+
102107
/** Logout [Member] */
103108
Route::get('/member/dashboard/logout', ['as' => 'member.logout', 'uses' => 'Auth\AuthController@logoutAsMember']);
104109
});

0 commit comments

Comments
 (0)