This commit is contained in:
saeid
2019-04-29 19:24:18 +04:30
parent 9c28dc5538
commit a8a6780c17
49 changed files with 76186 additions and 1157 deletions
@@ -1,49 +0,0 @@
<?php␍
namespace App\Http\Controllers\Auth;␍
use App\Http\Controllers\Controller;␍
use App\Transformers\Json;␍
use App\User;␍
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;␍
use Illuminate\Http\Request;␍
class ForgotPasswordController extends Controller␍
{␍
/*␍
|--------------------------------------------------------------------------␍
| Password Reset Controller␍
|--------------------------------------------------------------------------␍
|␍
| This controller is responsible for handling password reset emails and␍
| includes a trait which assists in sending these notifications from␍
| your application to your users. Feel free to explore this trait.␍
|␍
*/␍
use SendsPasswordResetEmails;␍
/**␍
* Create a new controller instance.␍
*␍
* @return void␍
*/␍
public function __construct()␍
{␍
$this->middleware('guest');␍
}␍
/**␍
* Send a reset link to the given user.␍
*␍
* @param \Illuminate\Http\Request $request␍
* @return \Illuminate\Http\Response␍
*/␍
public function getResetToken(Request $request)␍
{␍
dd($request->all());␍
$this->validate($request, ['email' => 'required|email']);␍
if ($request->wantsJson()) {␍
$user = User::where('email', $request->input('email'))->first();␍
if (!$user) {␍
return response()->json(Json::response(null, trans('passwords.user')), 400);␍
}␍
$token = $this->broker()->createToken($user);␍
return response()->json(Json::response(['token' => $token]));␍
}␍
}␍
}␍
@@ -1,100 +0,0 @@
<?php
namespace App\Http\Controllers\Api;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\User;
// use Illuminate\Support\Facades\Auth;
// use App\Appended\Traites\Auth\Verification;
use Lcobucci\JWT\Parser;
use Validator;
class PassportController extends Controller
{
// use Verification;
protected $field;
/**
* login api
*
* @return \Illuminate\Http\Response
*/
public function login(Request $request)
{
$this->validate($request, $this->rules(), $this->validationErrorMessages());
$request = Request::create('/oauth/token', 'POST', [
'grant_type' => 'password',
'client_id' => config('services.vue_client.id'),
'client_secret' => config('services.vue_client.secret'),
'username' => $request->cell_number,
'password' => $request->password,
]);
return app()->handle($request);
// $user = User::where('cell_number', $request->cell_number)->first();
// if ($user && \Hash::check($request->password, $user->password)) {
// $token = $user->createToken('Laravel password Grant Client')->accessToken;
// $response = ['token' => $token];
// return response()->json($response, 200);
// } else {
// return response()->json(trans('auth.failed'), 422);
// }
}
public function logout(Request $request)
{
$value = $request->bearerToken();
$id = (new Parser())->parse($value)->getHeader('jti');
$token = $request->user()->tokens->find($id);
$token->revoke();
return response()->json(trans('auth.logout_success'), 200);
}
/**
* Register api
*
* @return \Illuminate\Http\Response
*/
public function register(Request $request)
{
$validator = Validator::make($request->all(), [
'name' => 'required|string|max:255',
'medical_center_id' => 'required',
'email' => 'email|max:255|unique:users',
'cell_number' => 'required|digits_between:10,11|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
if ($validator->fails()) {
return response()->json(['error' => $validator->errors()], 401);
}
$input = $request->all();
$input['password'] = bcrypt($input['password']);
$input['status'] = 'Registered';
$user = User::create($input);
$this->phone_confirmation($user);
$success['token'] = $user->createToken('MyApp')->accessToken;
$success['name'] = $user->name;
return response()->json(['success' => $success], 200);
}
public function resetCode(Request $request)
{
$user = User::where('cell_number', $request->cell_number)->where('verified', 0)->first();
if ($user) {
$this->phone_confirmation($user);
return response()->json(['success' => true], 200);
}
return response()->json(['success' => false], 403);
}
public function sendLinkEmail(Request $request)
{
return response()->json(app('App\Http\Controllers\Auth\ForgotPasswordController')->sendResetLinkEmail($request));
}
}
@@ -1,61 +0,0 @@
<?php␍
namespace App\Http\Controllers\Auth;␍
use App\Http\Controllers\Controller;␍
use App\Transformers\Json;␍
use Illuminate\Foundation\Auth\ResetsPasswords;␍
use Illuminate\Http\Request;␍
use Illuminate\Support\Facades\Password;␍
class ResetPasswordController extends Controller␍
{␍
/*␍
|--------------------------------------------------------------------------␍
| Password Reset Controller␍
|--------------------------------------------------------------------------␍
|␍
| This controller is responsible for handling password reset requests␍
| and uses a simple trait to include this behavior. You're free to␍
| explore this trait and override any methods you wish to tweak.␍
|␍
*/␍
use ResetsPasswords;␍
/**␍
* Create a new controller instance.␍
*␍
* @return void␍
*/␍
public function __construct()␍
{␍
$this->middleware('guest');␍
}␍
/**␍
* Reset the given user's password.␍
*␍
* @param \Illuminate\Http\Request $request␍
* @return \Illuminate\Http\Response␍
*/␍
public function reset(Request $request)␍
{␍
$this->validate($request, $this->rules(), $this->validationErrorMessages());␍
// Here we will attempt to reset the user's password. If it is successful we␍
// will update the password on an actual user model and persist it to the␍
// database. Otherwise we will parse the error and return the response.␍
$response = $this->broker()->reset(␍
$this->credentials($request), function ($user, $password) {␍
$this->resetPassword($user, $password);␍
}␍
);␍
if ($request->wantsJson()) {␍
if ($response == Password::PASSWORD_RESET) {␍
return response()->json(Json::response(null, trans('passwords.reset')));␍
} else {␍
return response()->json(Json::response($request->input('email'), trans($response), 202));␍
}␍
}␍
// If the password was successfully reset, we will redirect the user back to␍
// the application's home authenticated view. If there is an error we can␍
// redirect them back to where they came from with their error message.␍
return $response == Password::PASSWORD_RESET␍
? $this->sendResetResponse($response)␍
: $this->sendResetFailedResponse($request, $response);␍
}␍
}␍
@@ -1,32 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset emails and
| includes a trait which assists in sending these notifications from
| your application to your users. Feel free to explore this trait.
|
*/
use SendsPasswordResetEmails;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
}
@@ -1,124 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\RedirectsUsers;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Validation\ValidationException;
use Illuminate\Support\Facades\Hash;
class LoginController extends Controller
{
/*
|--------------------------------------------------------------------------
| Login Controller
|--------------------------------------------------------------------------
|
| This controller handles authenticating users for the application and
| redirecting them to your home screen. The controller uses a trait
| to conveniently provide its functionality to your applications.
|
*/
use RedirectsUsers, ThrottlesLogins;
protected $redirectTo = '/';
public function __construct()
{
$this->middleware('guest')->except('logout');
}
public function showLoginForm()
{
return view('auth.login');
}
public function login(Request $request)
{
$this->validateLogin($request);
if ($this->hasTooManyLoginAttempts($request)) {
$this->fireLockoutEvent($request);
return $this->sendLockoutResponse($request);
}
if ($this->attemptLogin($request)) {
return $this->sendLoginResponse($request);
}
$this->incrementLoginAttempts($request);
return $this->sendFailedLoginResponse($request);
}
protected function validateLogin(Request $request)
{
$this->validate($request, [
$this->username() => 'required|string',
'password' => 'required|string',
]);
}
protected function attemptLogin(Request $request)
{
return $this->guard()->attempt(
$this->credentials($request), $request->filled('remember')
);
}
protected function credentials(Request $request)
{
return $request->only($this->username(), 'password');
}
protected function sendLoginResponse(Request $request)
{
$request->session()->regenerate();
$this->clearLoginAttempts($request);
// $request->session()->put(['user_status'=> 'user logged in!']);
return $this->authenticated($request, $this->guard()->user())
?: redirect()->intended($this->redirectTo);
}
protected function authenticated(Request $request, $user)
{
//
}
protected function sendFailedLoginResponse(Request $request)
{
$errors = [$this->username() => trans('auth.failed')];
if ($request->expectsJson()) {
return response()->json($errors, 422);
}
return redirect()->back()
->withInput($request->only($this->username(), 'remember'))
->withErrors($errors);
}
public function username()
{
return 'cell_number';
}
public function logout(Request $request)
{
$this->guard()->logout();
$request->session()->invalidate();
return redirect('/');
}
protected function guard()
{
return Auth::guard();
}
}
@@ -1,141 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
// use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;
use Illuminate\Auth\Events\Registered;
use Illuminate\Support\Facades\Auth;
use App\Appended\Traites\Auth\Verification;
use Illuminate\Support\Facades\Cache;
use App\Appended\Traites\Auth\Mc;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/
use Verification;
// use RegistersUsers;
/**
* Where to redirect users after registration.
*
* @var string
*/
protected $redirectTo = '/';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
// $this->middleware('guest');
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|string|max:255',
'medical_center_id' => 'required',
'email' => 'email|max:255|unique:users',
'cell_number' => 'required|digits_between:10,11|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\User
*/
protected function create(array $data)
{
$userData = [
'name' => $data['name'],
'password' => bcrypt($data['password']),
'email' => $data['email'],
'cell_number' => $data['cell_number'],
'medical_center_id' => $data['medical_center_id'],
'status' => 'Registered',
];
$userData['email'] ==="" ? $userData['email'] = null : null;
$userData['cell_number'] ==="" ? $userData['cell_number'] = null : null;
// $answer=$data['mathcaptcha'];
$user = User::create($userData);
if ($data['cell_number']) {
session(['temp_user' => $user]);
// $this->phone_confirmation($user);
} else
throw new \Exception('لطفا شماره همراه خود را وارد نمایید.');
return $user;
// $user = User::create($userData);
// dd($user);
// if (!empty($userData['email'])) {
// $this->mail_confirmation($user,'register');
// } else {
// $this->phone_confirmation($user);
// }
}
public function showRegistrationForm()
{
return view('auth.register');
}
public function register(Request $request)
{
$this->validator($request->all())->validate();
event(new Registered($user = $this->create($request->all())));
\Auth::loginUsingId($user->id);
return $this->registered($request, $user)
?: response()->json(['url' => $this->redirectTo, 'message' => 'ثبت نام شما با موفقیت انجام شد.']);
}
/**
* Get the guard to be used during registration.
*
* @return \Illuminate\Contracts\Auth\StatefulGuard
*/
protected function guard()
{
return Auth::guard();
}
protected function registered(Request $request, $user)
{
//
}
}
@@ -1,39 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset requests
| and uses a simple trait to include this behavior. You're free to
| explore this trait and override any methods you wish to tweak.
|
*/
use ResetsPasswords;
/**
* Where to redirect users after resetting their password.
*
* @var string
*/
protected $redirectTo = '/home';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
}
@@ -1,41 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\VerifiesEmails;
class VerificationController extends Controller
{
/*
|--------------------------------------------------------------------------
| Email Verification Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling email verification for any
| user that recently registered with the application. Emails may also
| be re-sent if the user didn't receive the original email message.
|
*/
use VerifiesEmails;
/**
* Where to redirect users after verification.
*
* @var string
*/
protected $redirectTo = '/home';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
$this->middleware('signed')->only('verify');
$this->middleware('throttle:6,1')->only('verify', 'resend');
}
}
@@ -13,7 +13,7 @@ class TestResultController extends Controller
{
public function index()
{
$TestResult = TestResult::with('test_type')->paginate(10);
$TestResult = TestResult::with('test_type', 'user', 'user.medical_center')->paginate(10);
return \MessageResponse::data($TestResult);
}
@@ -107,9 +107,10 @@ class TestResultController extends Controller
//
}
public function edit($id)
//Todo:: pass Inputs
public function edit(TestResult $TestResult)
{
//
return \MessageResponse::data($TestResult);
}
public function update(StoreTestResultRequest $request, TestResult $TestResult)
+19 -5
View File
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\TestType;
use App\TestResult;
use App\Input;
use App\Option;
use App\Http\Requests\StoreTestTypeRequest;
@@ -328,9 +329,16 @@ class TestTypeController extends Controller
/////////////////////////////////////////////////////////////////////////////////////
public function getInputs(Request $request)
{
$TestType = TestType::where('name', $request->name)->orWhere('unique_code', $request->unique_code)->first();
if ($TestType) {
$Inputs = Input::select('id','name','type','size','parent_id')->with(
if($request->test_result_id !== '') {
$testTypeId = TestResult::find($request->test_result_id);
}
if (isset($testTypeId) && $testTypeId) {
$testType = TestType::select('id', 'name', 'unique_code')->find($testTypeId->test_type_id);
} else {
$testType = TestType::where('name', $request->name)->orWhere('unique_code', $request->unique_code)->select('id', 'name', 'unique_code')->first();
}
if (isset($testType) && $testType) {
$inputs = Input::select('id','name','type','size','parent_id')->with(
['options' => function ($query) {
$query->select('id', 'title','input_id');
}],
@@ -340,12 +348,18 @@ class TestTypeController extends Controller
['children.options' => function ($query) {
$query->select('id', 'title','input_id');
}]
)->whereNull('parent_id')->where('test_type_id',$TestType->id)->get();
)->whereNull('parent_id')->where('test_type_id',$testType->id)->get();
return \MessageResponse::data($Inputs);
return \MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
}
return \MessageResponse::error();
}
public function listNames()
{
$testType = TestType::pluck('name');
return \MessageResponse::data($testType);
}
public function destroy($id)
{