fix the repo

ji-ethics · May 11, 2019 · 9ab445e · 9ab445e
2 parents 6ad30bd + d785469
commit 9ab445e
Show file tree

Hide file tree

Showing 130 changed files with 7,255 additions and 1,610 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.env.example b/.env.example
@@ -0,0 +1,35 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_LOG_LEVEL=debug
+APP_URL=http://localhost
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
diff --git a/.gitignore b/.gitignore
@@ -4,13 +4,9 @@
 /storage/*.key
 /vendor
 /.idea
-/.vscode
 /.vagrant
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
-
-/public/js/app.js
-/public/css/app.css
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -3,6 +3,8 @@
 namespace App\Exceptions;
 
 use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Auth;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -29,6 +31,8 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
      * @param  \Exception  $exception
      * @return void
      */
@@ -48,4 +52,5 @@ public function render($request, Exception $exception)
     {
         return parent::render($request, $exception);
     }
+
 }
diff --git a/app/Http/Controllers/Admin/IndexController.php b/app/Http/Controllers/Admin/IndexController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class IndexController extends Controller
+{
+    public function admin_index()
+    {
+        return view('admin.AdminHomepage');
+    }
+}
diff --git a/app/Http/Controllers/Admin/LoginController.php b/app/Http/Controllers/Admin/LoginController.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\http\request;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+
+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 AuthenticatesUsers;
+
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/admin';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest:admin')->except('logout');
+    }
+
+//    public function mylogin(Request $request)
+//    {
+//        if (Auth::attempt(['email' => $request->input('email'), 'password' => $request->input('password'), 'is_active' => 1])) {
+//            return redirect()->intended('/');
+//        }
+//
+//    }
+    public function showLoginForm()
+    {
+        return view('admin.auth.login');
+    }
+
+    protected function guard()
+    {
+        return \Auth::guard('admin');
+    }
+
+    public function logout(Request $request)
+    {
+        $this->guard()->logout();
+
+        $request->session()->flush();
+
+        $request->session()->regenerate();
+
+        return redirect('/');
+    }
+}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -2,7 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Validation;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\http\request;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller
@@ -36,4 +39,21 @@ public function __construct()
     {
         $this->middleware('guest')->except('logout');
     }
+
+    public function mylogin(Request $request)
+    {
+        $this->validate(request(),[
+            'email' => 'required|email',
+            'password' => 'required',
+        ]);
+        if (Auth::attempt(['email' => $request->input('email'), 'password' => $request->input('password'), 'is_active' => 1])) {
+            return redirect('/');
+            //return redirect()->intended('/');
+        }
+        else {
+            throw \Illuminate\Validation\ValidationException::withMessages([
+                $this->username() => [trans('auth.failed')],
+            ]);
+        }
+    }
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -4,9 +4,9 @@
 
 use App\Models\User;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Validation\Rule;
 
 class RegisterController extends Controller
 {
@@ -28,7 +28,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/register/agreement';
 
     /**
      * Create a new controller instance.
@@ -49,9 +49,13 @@ public function __construct()
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255|unique:users',
+            'user_name' => 'required|string|max:255',
+            'email' => ['required', 'string', 'email', 'max:255',Rule::unique('users')->where(function ($query) {
+                $query->where('is_active', 1);
+            })],
             'password' => 'required|string|min:6|confirmed',
+            'first_name' => 'required|string|max:255',
+            'last_name' => 'required|string|max:255',
         ]);
     }
 
@@ -64,9 +68,13 @@ protected function validator(array $data)
     protected function create(array $data)
     {
         return User::create([
-            'name' => $data['name'],
+            'user_name' => $data['user_name'],
             'email' => $data['email'],
-            'password' => Hash::make($data['password']),
+            'password' => bcrypt($data['password']),
+            'first_name' => $data['first_name'],
+            'last_name' => $data['last_name'],
+//            'last_login' => now(),
+            'is_active' => 0
         ]);
     }
 }
diff --git a/app/Http/Controllers/CaseStudyController.php b/app/Http/Controllers/CaseStudyController.php
@@ -6,11 +6,14 @@
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\Console\Helper\Table;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+
 
 class CaseStudyController extends Controller
 {
     public function chapter($id,$step_id)
     {
+        $user_id = Auth::id();
         $chapters = DB::table('chapters')
             ->select('chapters.id','chapters.title')
             ->orderBy('chapters.id')->get();
@@ -19,10 +22,10 @@ public function chapter($id,$step_id)
             ->select('case_study_material.id','case_study_material.title','case_study_material.details','case_study_material.reference')
             ->orderBy('case_study_material.id')->get();
 
-        $case_question = DB::table('case_study_step')
-            ->select('case_study_step.question_id','case_study_step.question_detail','case_study_step.step_id')
-            ->orderBy('case_study_step.step_id')
-            ->orderBy('case_study_step.question_id')->get();
+        $case_question = DB::table('case_study_question')
+            ->select('case_study_question.question_rank as question_id','case_study_question.detail as question_detail','case_study_question.step_id')
+            ->orderBy('case_study_question.step_id')
+            ->orderBy('case_study_question.question_rank')->get();
 
         $principle = DB::table('ethical_principles')
             ->join('detail_principles','ethical_principles.id','=','detail_principles.title_id')
@@ -31,60 +34,71 @@ public function chapter($id,$step_id)
             ->orderBy('detail_principles.detail_id')->get();
 
         $answer = DB::table('case_study_answer')
-            ->select('case_study_answer.question_answer','case_study_answer.step_id','case_study_answer.user_id','case_study_answer.question_id')
-            ->where('case_study_answer.case_id','=',$id)
-            ->orderBy('case_study_answer.step_id')
-            ->orderBy('case_study_answer.question_id')->get();
+            ->join('case_to_question','case_study_answer.id','=','case_to_question.id')
+            ->join('case_study_question','case_study_question.id','=','case_to_question.question_id')
+            ->select('case_study_answer.answer as question_answer','case_study_question.step_id','case_study_question.question_rank as question_id')
+            ->where('case_to_question.case_id','=',$id)
+            ->where('case_study_answer.user_id','=',$user_id)
+            ->orderBy('case_study_question.step_id')
+            ->orderBy('case_study_question.question_rank')->get();
 
-        return view('CaseStudy', compact('case_study','chapters','case_question','principle','id','step_id','answer'));
+        return view('CaseStudy', compact('case_study','chapters','case_question','principle','id','step_id','answer','user_id'));
     }//
     public function useransweredit()
     {
+        $user_id = Auth::id();
         foreach($_POST["question_id"] as $pointer)
         {
-        $user_id = $_POST["user_id"][$pointer-1];
-        $case_id = $_POST["case_id"][$pointer-1];
-        $case_step_id = $_POST["step_id"][$pointer-1];
-        $question_id = $_POST["question_id"][$pointer-1];
-        $question_answer = $_POST["question_answer"][$pointer-1];
-
-        $answer = DB::table('case_study_answer')
-            ->select('case_study_answer.user_id')
-            ->where('case_study_answer.user_id','=',$user_id)
-            ->where('case_study_answer.case_id','=',$case_id)
-            ->where('case_study_answer.step_id','=',$case_step_id)
-            ->where('case_study_answer.question_id','=',$question_id)
-            ->get();
-
-        if(count($answer) == 0) {
-            DB::transaction(function () use ($user_id, $case_id, $case_step_id, $question_id, $question_answer) {
-                DB::table('case_study_answer')
-                    ->insert([
-                        'case_study_answer.user_id' => $user_id,
-                        'case_study_answer.case_id' => $case_id,
-                        'case_study_answer.step_id' => $case_step_id,
-                        'case_study_answer.question_id' => $question_id,
-                        'case_study_answer.question_answer' => $question_answer
-                    ]);
-            });
+            $case_id = $_POST["case_id"][$pointer-1];
+            $case_step_id = $_POST["step_id"][$pointer-1];
+            $question_id = $_POST["question_id"][$pointer-1];
+            $question_answer = $_POST["question_answer"][$pointer-1];
+
+            $case_question_id = DB::table('case_study_question')
+                ->join('case_to_question','case_study_question.id','=','case_to_question.question_id')
+                ->select('case_to_question.id')
+                ->where('case_to_question.case_id','=',$case_id)
+                ->where('case_study_question.step_id','=',$case_step_id)
+                ->where('case_study_question.question_rank','=',$question_id)
+                ->get();
+            $case_question_id = json_decode($case_question_id,true);
+            $id = $case_question_id[0]['id'];
+
+            $answer = DB::table('case_study_answer')
+                ->select('case_study_answer.user_id')
+                ->where('case_study_answer.id','=',$id)
+                ->where('case_study_answer.user_id','=',$user_id)
+                ->get();
+
+            if(count($answer) == 0) {
+                DB::transaction(function () use ($user_id,$id, $question_answer) {
+                    DB::table('case_study_answer')
+                        ->insert([
+                            'case_study_answer.user_id' => $user_id,
+                            'case_study_answer.id' => $id,
+                            'case_study_answer.answer' => $question_answer
+                        ]);
+                });
+            }
+            elseif(count($answer) != 0){
+                DB::transaction(function () use ($user_id,$id, $question_answer) {
+                    DB::table('case_study_answer')
+                        ->where('case_study_answer.user_id', '=', $user_id)
+                        ->where('case_study_answer.id', '=', $id)
+                        ->update([
+                            'case_study_answer.answer' => $question_answer
+                        ]);
+                });
             }
-                elseif(count($answer) != 0){
-                    DB::transaction(function () use ($user_id, $case_id, $case_step_id, $question_id, $question_answer) {
-                        DB::table('case_study_answer')
-                            ->where('case_study_answer.user_id', '=', $user_id)
-                            ->where('case_study_answer.case_id', '=', $case_id)
-                            ->where('case_study_answer.step_id', '=', $case_step_id)
-                            ->where('case_study_answer.question_id', '=', $question_id)
-                            ->update([
-                                'case_study_answer.question_answer' => $question_answer
-                            ]);
-                    });
-                    }
         }
+        if(!$case_step_id ==10){
+            $case_step_id = $case_step_id+1;
+
+        }
+        return redirect("/casestudy/$case_id/step/$case_step_id");
 
 
-
-        }
+    }