@@ -8,10 +8,10 @@ |
||
| 8 | 8 | class RoleController extends Controller |
| 9 | 9 | { |
| 10 | 10 | public function index() { |
| 11 | - return auth()->user()->getRoleNames(); |
|
| 11 | + return auth()->user()->getRoleNames(); |
|
| 12 | 12 | } |
| 13 | 13 | public function getRole(Request $request) { |
| 14 | - $query = Role::query(); |
|
| 14 | + $query = Role::query(); |
|
| 15 | 15 | |
| 16 | 16 | if($request->has('searchTerm')) { |
| 17 | 17 | $columnsToSearch = ['name']; |
@@ -9,22 +9,22 @@ |
||
| 9 | 9 | |
| 10 | 10 | class ProfileController extends Controller |
| 11 | 11 | { |
| 12 | - public function changePassword(Request $request) { |
|
| 13 | - $request->validate([ |
|
| 12 | + public function changePassword(Request $request) { |
|
| 13 | + $request->validate([ |
|
| 14 | 14 | 'old_password' => ['required', new MatchOldPassword], |
| 15 | 15 | 'new_password' => ['required'], |
| 16 | 16 | 'password_confirmation' => ['same:new_password'], |
| 17 | 17 | ]); |
| 18 | - $user = User::find(auth()->user()->id); |
|
| 18 | + $user = User::find(auth()->user()->id); |
|
| 19 | 19 | $user->password = bcrypt($request->new_password); |
| 20 | 20 | $user->save(); |
| 21 | - } |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - public function changeProfile(Request $request) { |
|
| 24 | - $user = User::find(auth()->user()->id); |
|
| 25 | - $user->first_name = $request->first_name; |
|
| 23 | + public function changeProfile(Request $request) { |
|
| 24 | + $user = User::find(auth()->user()->id); |
|
| 25 | + $user->first_name = $request->first_name; |
|
| 26 | 26 | $user->last_name = $request->last_name; |
| 27 | - $user->email = $request->email; |
|
| 28 | - $user->save(); |
|
| 29 | - } |
|
| 27 | + $user->email = $request->email; |
|
| 28 | + $user->save(); |
|
| 29 | + } |
|
| 30 | 30 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | { |
| 71 | 71 | $request->validate([ |
| 72 | 72 | 'refn' => 'required' |
| 73 | - ]); |
|
| 73 | + ]); |
|
| 74 | 74 | |
| 75 | 75 | return Refn::create([ |
| 76 | 76 | 'group' => $request->group, |
@@ -12,18 +12,18 @@ discard block |
||
| 12 | 12 | { |
| 13 | 13 | |
| 14 | 14 | public function login(Request $request) { |
| 15 | - $request->validate([ |
|
| 16 | - "email" => ["required"], |
|
| 17 | - "password" => ["required"] |
|
| 18 | - ]); |
|
| 15 | + $request->validate([ |
|
| 16 | + "email" => ["required"], |
|
| 17 | + "password" => ["required"] |
|
| 18 | + ]); |
|
| 19 | 19 | |
| 20 | - if(Auth::attempt($request->only(["email", "password"]))) { |
|
| 21 | - return response()->json(auth()->user(), 200); |
|
| 22 | - } |
|
| 20 | + if(Auth::attempt($request->only(["email", "password"]))) { |
|
| 21 | + return response()->json(auth()->user(), 200); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - throw ValidationException::withMessages([ |
|
| 25 | - 'email' => ['The provided credentials are incorrect.'] |
|
| 26 | - ]); |
|
| 24 | + throw ValidationException::withMessages([ |
|
| 25 | + 'email' => ['The provided credentials are incorrect.'] |
|
| 26 | + ]); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
@@ -96,6 +96,6 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | public function logout(Request $request) { |
| 99 | - Auth::logout(); |
|
| 99 | + Auth::logout(); |
|
| 100 | 100 | } |
| 101 | 101 | } |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | foreach ($dnas as $dna) { |
| 42 | 42 | // system('/usr/bin/python3 /home/genealogia/public_html/dna.py ' . $this->var_name . ' ' . $dna->variable_name . ' ' . '/home/genealogia/public_html/storage/app/dna/'. $this->file_name . ' ' . '/home/genealogia/public_html/storage/app/dna/'. $dna->file_name); |
| 43 | 43 | chdir('/var/www/api.familytree365.com/app'); |
| 44 | - exec('python3 dna.py ' . $this->var_name . ' ' . $dna->variable_name . ' ' . $this->file_name . ' ' . $dna->file_name); |
|
| 44 | + exec('python3 dna.py ' . $this->var_name . ' ' . $dna->variable_name . ' ' . $this->file_name . ' ' . $dna->file_name); |
|
| 45 | 45 | $dm = new DM(); |
| 46 | 46 | $dm->user_id = $user->id; |
| 47 | 47 | $dm->image = 'shared_dna_' . $this->var_name . '_' . $dna->variable_name . '.png'; |