diff --git a/app/Http/Controllers/NodeJS/Student/DashboardController.php b/app/Http/Controllers/NodeJS/Student/DashboardController.php index d80f77e..37e50b8 100644 --- a/app/Http/Controllers/NodeJS/Student/DashboardController.php +++ b/app/Http/Controllers/NodeJS/Student/DashboardController.php @@ -15,13 +15,13 @@ public function index(Request $request) $user = $request->user(); $projects = Project::skip(0)->take(3)->get(); if ($request->ajax()) { - $data = DB::connection('nodejsDB')->table('projects') + $data = DB::table('projects') ->select('projects.id', 'projects.title', DB::raw('COUNT(submissions.id) as submission_count')) ->leftJoin('submissions', function ($join) use ($user) { $join->on('projects.id', '=', 'submissions.project_id') ->where('submissions.user_id', '=', $user->id); }) - ->groupBy('projects.id'); + ->groupBy('projects.id', 'projects.title'); return Datatables::of($data) diff --git a/app/Http/Controllers/NodeJS/Student/ProfileController.php b/app/Http/Controllers/NodeJS/Student/ProfileController.php index 9ca2427..77f1c4b 100644 --- a/app/Http/Controllers/NodeJS/Student/ProfileController.php +++ b/app/Http/Controllers/NodeJS/Student/ProfileController.php @@ -16,7 +16,7 @@ class ProfileController extends Controller */ public function edit(Request $request): View { - return view('profile.edit', [ + return view('nodejs.profile.edit', [ 'user' => $request->user(), ]); } diff --git a/app/Http/Controllers/NodeJS/Student/ProjectController.php b/app/Http/Controllers/NodeJS/Student/ProjectController.php index 1da0936..1f2c68c 100644 --- a/app/Http/Controllers/NodeJS/Student/ProjectController.php +++ b/app/Http/Controllers/NodeJS/Student/ProjectController.php @@ -32,9 +32,7 @@ public function showPDF(Request $request) { if ($request->ajax()) { if ($request->id) { - $mediaModel = new Media(); - $mediaModel->setConnection('nodejsDB'); - $media = $mediaModel->find($request->id); + $media = Media::find($request->id); if ($media) { $path = $media->getUrl(); return response()->json($path, 200); @@ -60,7 +58,7 @@ public function download(Request $request, $project_id) return response()->json($zipMedia->getUrl(), 200); } else { $guides = $project->getMedia('project_guides'); - $tempDir = storage_path('app/public/assets/nodejs/projects/' . $project->title . '/zips'); + $tempDir = storage_path('app/public/assets/projects/' . $project->title . '/zips'); if (!is_dir($tempDir)) mkdir($tempDir); foreach ($guides as $guide) { $path = $guide->getPath(); @@ -70,7 +68,7 @@ public function download(Request $request, $project_id) $zipPath = $tempDir . '/guides.zip'; $zip = new ZipArchive; if ($zip->open($zipPath, ZipArchive::CREATE) === TRUE) { - $files = Storage::files('public/assets/nodejs/projects/' . $project->title . '/zips'); + $files = Storage::files('public/assets/projects/' . $project->title . '/zips'); foreach ($files as $file) { $zip->addFile(storage_path('app/' . $file), basename($file)); } @@ -81,7 +79,7 @@ public function download(Request $request, $project_id) } else { throw new Exception('Failed to create zip archive'); } - $media = $project->addMedia($zipPath)->toMediaCollection('project_zips', 'nodejs_public_projects_files'); + $media = $project->addMedia($zipPath)->toMediaCollection('project_zips', 'public_projects_files'); return response()->json($media->getUrl(), 200); } break; @@ -91,7 +89,7 @@ public function download(Request $request, $project_id) return response()->json($zipMedia->getUrl(), 200); } else { $supplements = $project->getMedia('project_supplements'); - $tempDir = storage_path('app/public/assets/nodejs/projects/' . $project->title . '/zips'); + $tempDir = storage_path('app/public/assets/projects/' . $project->title . '/zips'); if (!is_dir($tempDir)) mkdir($tempDir); foreach ($supplements as $supplement) { $path = $supplement->getPath(); @@ -101,7 +99,7 @@ public function download(Request $request, $project_id) $zipPath = $tempDir . '/supplements.zip'; $zip = new ZipArchive; if ($zip->open($zipPath, ZipArchive::CREATE) === TRUE) { - $files = Storage::files('public/assets/nodejs/projects/' . $project->title . '/zips'); + $files = Storage::files('public/assets/projects/' . $project->title . '/zips'); foreach ($files as $file) { $zip->addFile(storage_path('app/' . $file), basename($file)); } @@ -112,7 +110,7 @@ public function download(Request $request, $project_id) } else { throw new Exception('Failed to create zip archive'); } - $media = $project->addMedia($zipPath)->toMediaCollection('project_zips', 'nodejs_public_projects_files'); + $media = $project->addMedia($zipPath)->toMediaCollection('project_zips', 'public_projects_files'); return response()->json($media->getUrl(), 200); } break; @@ -125,7 +123,7 @@ public function download(Request $request, $project_id) $tests_web = $project->getMedia('project_tests_web'); $tests_images = $project->getMedia('project_tests_images'); - $tempDir = storage_path('app/public/assets/nodejs/projects/' . $project->title . '/zips'); + $tempDir = storage_path('app/public/assets/projects/' . $project->title . '/zips'); if (!is_dir($tempDir)) mkdir($tempDir); if (!is_dir($tempDir . '/tests')) mkdir($tempDir . '/tests'); if (!is_dir($tempDir . '/tests/api')) mkdir($tempDir . '/tests/api'); @@ -154,15 +152,15 @@ public function download(Request $request, $project_id) $zip->addEmptyDir('api'); $zip->addEmptyDir('web'); $zip->addEmptyDir('web/images'); - $api_files = Storage::files('public/assets/nodejs/projects/' . $project->title . '/zips/tests/api'); + $api_files = Storage::files('public/assets/projects/' . $project->title . '/zips/tests/api'); foreach ($api_files as $file) { $zip->addFile(storage_path('app/' . $file), 'api/' . basename($file)); } - $api_files = Storage::files('public/assets/nodejs/projects/' . $project->title . '/zips/tests/web'); + $api_files = Storage::files('public/assets/projects/' . $project->title . '/zips/tests/web'); foreach ($api_files as $file) { $zip->addFile(storage_path('app/' . $file), 'web/' . basename($file)); } - $image_files = Storage::files('public/assets/nodejs/projects/' . $project->title . '/zips/tests/web/images'); + $image_files = Storage::files('public/assets/projects/' . $project->title . '/zips/tests/web/images'); foreach ($image_files as $file) { $zip->addFile(storage_path('app/' . $file), 'web/images/' . basename($file)); } @@ -172,7 +170,7 @@ public function download(Request $request, $project_id) } else { throw new Exception('Failed to create zip archive'); } - $media = $project->addMedia($zipPath)->toMediaCollection('project_zips', 'nodejs_public_projects_files'); + $media = $project->addMedia($zipPath)->toMediaCollection('project_zips', 'public_projects_files'); return response()->json($media->getUrl(), 200); } break; diff --git a/app/Http/Controllers/NodeJS/Student/SubmissionController.php b/app/Http/Controllers/NodeJS/Student/SubmissionController.php index 7ee818e..1231024 100644 --- a/app/Http/Controllers/NodeJS/Student/SubmissionController.php +++ b/app/Http/Controllers/NodeJS/Student/SubmissionController.php @@ -1,4 +1,4 @@ -.user(); $projects = Project::all(); if ($request->ajax()) { - $data = DB::connection('nodejsDB')->table('projects') + $data = DB::table('projects') ->select( 'projects.id', 'projects.title', - // DB::raw('(SELECT COUNT(DISTINCT submissions.id) FROM submissions WHERE submissions.project_id = projects.id AND submissions.user_id = ?) as submission_count'), DB::raw('(SELECT COUNT(*) FROM submission_histories INNER JOIN submissions ON submissions.id = submission_histories.submission_id WHERE submissions.project_id = projects.id AND submissions.user_id = ?) as attempts_count'), DB::raw('(SELECT status FROM submissions WHERE submissions.project_id = projects.id AND submissions.user_id = ? ORDER BY id DESC LIMIT 1) as submission_status') ) ->groupBy('projects.id', 'projects.title') ->setBindings([ - // $user->id, $user->id, $user->id ]); @@ -50,7 +48,7 @@ public function index(Request $request) return DataTables::of($data) ->addIndexColumn() ->addColumn('title', function ($row) { - $title_button = '' . $row->title . ''; + $title_button = '' . $row->title . ''; return $title_button; }) ->addColumn('submission_status', function ($row) { @@ -64,29 +62,29 @@ public function index(Request $request) $submission = Submission::where('project_id', $row->id)->where('user_id', $user->id)->orderBy('id', 'DESC')->first(); $buttons = '
-
- -
-