Skip to content

Commit 7c1891b

Browse files
authored
Merge pull request #34 from codeHack-s/LastCodehack
Last codehack
2 parents 36c1488 + fb31c5e commit 7c1891b

File tree

174 files changed

+2185
-11084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+2185
-11084
lines changed

.env.swp

-12 KB
Binary file not shown.

app/Http/Controllers/AdminController.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/Http/Controllers/Auth/AuthenticatedSessionController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public function store(LoginRequest $request): RedirectResponse
2929

3030
$request->session()->regenerate();
3131

32-
Auth::user()->update(['last_login_at' => now()]);
33-
3432
return redirect()->intended(RouteServiceProvider::HOME);
3533
}
3634

app/Http/Controllers/Auth/RegisteredUserController.php

Lines changed: 9 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -11,115 +11,41 @@
1111
use Illuminate\Support\Facades\Auth;
1212
use Illuminate\Support\Facades\Hash;
1313
use Illuminate\Validation\Rules;
14-
use Illuminate\Validation\ValidationException;
1514
use Illuminate\View\View;
1615

1716
class RegisteredUserController extends Controller
1817
{
1918
/**
2019
* Display the registration view.
2120
*/
22-
public function create(Request $request, $type = null): View
21+
public function create(): View
2322
{
24-
if ($type === 'campus') {
25-
return view('auth.register');
26-
} elseif ($type === 'innovate') {
27-
return view('auth.innovate.register');
28-
} else {
29-
return view('auth.select-account-type');
30-
}
23+
return view('auth.register');
3124
}
3225

3326
/**
3427
* Handle an incoming registration request.
3528
*
36-
* @throws ValidationException
29+
* @throws \Illuminate\Validation\ValidationException
3730
*/
3831
public function store(Request $request): RedirectResponse
3932
{
40-
$this->storeValidation($request);
41-
42-
$user = User::create([
43-
'first_name' => $request->first_name,
44-
'last_name' => $request->last_name,
45-
'username' => $request->username,
46-
'email' => $request->email,
47-
'password' => Hash::make($request->password),
48-
'phone_number' => $request->phone_number,
49-
'user_type' => 'campus',
33+
$request->validate([
34+
'name' => ['required', 'string', 'max:255'],
35+
'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:'.User::class],
36+
'password' => ['required', 'confirmed', Rules\Password::defaults()],
5037
]);
5138

52-
event(new Registered($user));
53-
54-
Auth::login($user);
55-
Auth::user()->update(['last_login_at' => now()]);
56-
57-
// Send verification email
58-
if(!$user->hasVerifiedEmail()) {
59-
$user->sendEmailVerificationNotification();
60-
}
61-
62-
return redirect()->route('verification.notice');
63-
}
64-
65-
public function store_innovate(Request $request): RedirectResponse
66-
{
67-
$this->storeValidation($request);
68-
6939
$user = User::create([
70-
'first_name' => $request->first_name,
71-
'last_name' => $request->last_name,
72-
'username' => $request->username,
40+
'name' => $request->name,
7341
'email' => $request->email,
7442
'password' => Hash::make($request->password),
75-
'phone_number' => $request->phone_number,
76-
'user_type' => 'innovate',
7743
]);
7844

7945
event(new Registered($user));
8046

8147
Auth::login($user);
82-
Auth::user()->update(['last_login_at' => now()]);
8348

84-
// Send verification email
85-
if(!$user->hasVerifiedEmail()) {
86-
$user->sendEmailVerificationNotification();
87-
}
88-
89-
return redirect()->route('verification.notice');
49+
return redirect(RouteServiceProvider::HOME);
9050
}
91-
92-
/**
93-
* @param Request $request
94-
* @return void
95-
*/
96-
public function storeValidation(Request $request): void
97-
{
98-
$request->validate([
99-
'first_name' => ['required', 'string', 'max:255'],
100-
'last_name' => ['required', 'string', 'max:255'],
101-
'username' => ['required', 'string', 'max:255', 'unique:' . User::class],
102-
'email' => ['required', 'string', 'email', 'max:255', 'unique:' . User::class],
103-
'password' => ['required', 'confirmed', Rules\Password::defaults()],
104-
'phone_number' => ['nullable', 'string', 'max:255'],
105-
]);
106-
107-
$contact = $request->contact;
108-
109-
//remove the first character if it's a '+'
110-
if (str_starts_with($contact, '+')) {
111-
$contact = substr($contact, 1);
112-
}
113-
114-
//dd($contact);
115-
116-
// Check if the first character of the string is '0'
117-
if (str_starts_with($contact, '0')) {
118-
// Replace the first character '0' with '254'
119-
$contact = '254' . substr($contact, 1);
120-
}
121-
122-
$request->merge(['contact' => $contact]);
123-
}
124-
12551
}

app/Http/Controllers/ConnectController.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

app/Http/Controllers/CourseController.php

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)